Hello community, here is the log from the commit of package WoeUSB for openSUSE:Factory checked in at 2019-04-25 16:20:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/WoeUSB (Old) and /work/SRC/openSUSE:Factory/.WoeUSB.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WoeUSB" Thu Apr 25 16:20:27 2019 rev:12 rq:697502 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/WoeUSB/WoeUSB.changes 2019-04-04 12:08:35.393373127 +0200 +++ /work/SRC/openSUSE:Factory/.WoeUSB.new.5536/WoeUSB.changes 2019-04-25 16:20:51.198072218 +0200 @@ -1,0 +2,8 @@ +Sun Apr 21 12:35:20 UTC 2019 - Yunhe Guo <[email protected]> + +- Version 3.3.0 + * Improvements to the WoeUSB GUI + * The option of using the NTFS filesystem as the target filesystem + has now being provided in the GUI + +------------------------------------------------------------------- Old: ---- WoeUSB-3.2.12.tar.gz New: ---- WoeUSB-3.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ WoeUSB.spec ++++++ --- /var/tmp/diff_new_pack.mUos6I/_old 2019-04-25 16:20:51.574072151 +0200 +++ /var/tmp/diff_new_pack.mUos6I/_new 2019-04-25 16:20:51.578072151 +0200 @@ -17,7 +17,7 @@ Name: WoeUSB -Version: 3.2.12 +Version: 3.3.0 Release: 0 Summary: Windows USB installation media creator License: GPL-3.0-or-later ++++++ WoeUSB-3.2.12.tar.gz -> WoeUSB-3.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WoeUSB-3.2.12/src/MainPanel.cpp new/WoeUSB-3.3.0/src/MainPanel.cpp --- old/WoeUSB-3.2.12/src/MainPanel.cpp 2018-12-24 09:28:06.000000000 +0100 +++ new/WoeUSB-3.3.0/src/MainPanel.cpp 2019-03-26 03:34:51.000000000 +0100 @@ -39,37 +39,42 @@ MainPanel::MainPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { // Controls - wxBoxSizer *MainSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer *MainSizer = new wxBoxSizer( wxVERTICAL ); - // Iso / CD - MainSizer->Add(new wxStaticText(this, wxID_ANY, _("Source :")), 0, wxALL, 3); + // Iso / CD + MainSizer->Add(new wxStaticText(this, wxID_ANY, _("Source :")), 0, wxALL, 3); // Iso - m_isoChoice = new wxRadioButton(this, wxID_ANY, _("From a disk image (iso)")); - MainSizer->Add(m_isoChoice, 0, wxALL, 3); + m_isoChoice = new wxRadioButton(this, wxID_ANY, _("From a disk image (iso)")); + MainSizer->Add(m_isoChoice, 0, wxALL, 3); - wxBoxSizer *tmpSizer = new wxBoxSizer( wxHORIZONTAL ); - tmpSizer->AddSpacer(20); - m_isoFile = new wxFilePickerCtrl(this, wxID_ANY, _T(""), _("Please select a disk image"), _T("Iso images (*.iso)|*.iso;*.ISO|All files|*")); - tmpSizer->Add(m_isoFile, 1, wxLEFT | wxRIGHT | wxBOTTOM, 3); - MainSizer->Add(tmpSizer, 0, wxEXPAND, 0); + wxBoxSizer *tmpSizer = new wxBoxSizer( wxHORIZONTAL ); + tmpSizer->AddSpacer(20); + m_isoFile = new wxFilePickerCtrl(this, wxID_ANY, _T(""), _("Please select a disk image"), _T("Iso images (*.iso)|*.iso;*.ISO|All files|*")); + tmpSizer->Add(m_isoFile, 1, wxLEFT | wxRIGHT | wxBOTTOM, 3); + MainSizer->Add(tmpSizer, 0, wxEXPAND, 0); // DVD - MainSizer->Add(m_dvdChoice = new wxRadioButton(this, wxID_ANY, _("From a CD/DVD drive")), 0, wxALL, 3); + MainSizer->Add(m_dvdChoice = new wxRadioButton(this, wxID_ANY, _("From a CD/DVD drive")), 0, wxALL, 3); // List - tmpSizer = new wxBoxSizer( wxHORIZONTAL ); - tmpSizer->AddSpacer(20); + tmpSizer = new wxBoxSizer( wxHORIZONTAL ); + tmpSizer->AddSpacer(20); m_dvdDriveList = new wxListBox(this, wxID_ANY); tmpSizer->Add(m_dvdDriveList, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 3); - MainSizer->Add(tmpSizer, 1, wxEXPAND, 0); + MainSizer->Add(tmpSizer, 1, wxEXPAND, 0); + + // File system + wxString rbxFs[] = { wxT("FAT"), wxT("NTFS") }; + m_fsRadio = new wxRadioBox(this, wxID_ANY, _("File system"), wxDefaultPosition, wxDefaultSize, WXSIZEOF(rbxFs), rbxFs); + MainSizer->Add(m_fsRadio, 0, wxEXPAND | wxALL | wxALIGN_CENTER, 20); // Target MainSizer->AddSpacer(30); MainSizer->Add(new wxStaticText(this, wxID_ANY, _("Target device :")), 0, wxALL, 3); - // List + // List m_usbStickList = new wxListBox(this, wxID_ANY); MainSizer->Add(m_usbStickList, 1, wxEXPAND | wxALL, 3); @@ -83,26 +88,26 @@ MainSizer->Add(BtSizer, 0, wxALIGN_RIGHT, 0); // Finition - SetSizer(MainSizer); + SetSizer(MainSizer); /*m_popupMenu = new wxMenu; m_popupMenu->Append(m_menuItemAddManually = MenuAddItem(m_popupMenu, wxString(_("Add Manually")) + _T("\tCtrl+N"), _T("add.png"))); m_popupMenu->Append(m_menuItemAddAutodetect = MenuAddItem(m_popupMenu, wxString(_("Add with autodection")), _T("add.png")));*/ - // Events - m_usbStickList->Connect( wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); - m_dvdDriveList->Connect( wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); - m_isoFile->Connect( wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); - - m_btInstall->Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainPanel::OnInstall), NULL, this); - m_btRefresh->Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainPanel::OnRefresh), NULL, this); - - m_isoChoice->Connect( wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(MainPanel::OnSourceOptionChanged), NULL, this); - m_dvdChoice->Connect( wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(MainPanel::OnSourceOptionChanged), NULL, this); - - // Content - RefreshListContent(); - wxCommandEvent tmp; + // Events + m_usbStickList->Connect( wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); + m_dvdDriveList->Connect( wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); + m_isoFile->Connect( wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler(MainPanel::OnListOrFileModified), NULL, this); + + m_btInstall->Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainPanel::OnInstall), NULL, this); + m_btRefresh->Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainPanel::OnRefresh), NULL, this); + + m_isoChoice->Connect( wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(MainPanel::OnSourceOptionChanged), NULL, this); + m_dvdChoice->Connect( wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(MainPanel::OnSourceOptionChanged), NULL, this); + + // Content + RefreshListContent(); + wxCommandEvent tmp; OnSourceOptionChanged(tmp); m_btInstall->Enable(IsInstallOk()); } @@ -240,7 +245,7 @@ iso = m_dvdDriveDevList.at(m_dvdDriveList->GetSelection()); } - PipeManager pipe(std::string("pkexec sh -c 'woeusb --no-color --for-gui --device \"") + iso + "\" \"" + device + "\" 2>&1'"); + PipeManager pipe(std::string("pkexec sh -c 'woeusb --no-color --for-gui --target-filesystem " + StrWxToStd(m_fsRadio->GetString(m_fsRadio->GetSelection())) + " --device \"" + iso + "\" \"" + device + "\" 2>&1'")); wxProgressDialog *dialog = new wxProgressDialog(_("Installing..."), _("Please wait..."), 100, GetParent(), wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WoeUSB-3.2.12/src/MainPanel.hpp new/WoeUSB-3.3.0/src/MainPanel.hpp --- old/WoeUSB-3.2.12/src/MainPanel.hpp 2018-12-24 09:28:06.000000000 +0100 +++ new/WoeUSB-3.3.0/src/MainPanel.hpp 2019-03-26 03:34:51.000000000 +0100 @@ -76,6 +76,8 @@ wxRadioButton *m_isoChoice, *m_dvdChoice; + wxRadioBox *m_fsRadio; + //std::vector<std::pair<std::string, std::string> > m_list; };
