Merge branch 'master' into tarball-safe

README.md

@@ -1,5 +1,5 @@
 # WoeUSB-ng
-![brand](https://raw.githubusercontent.com/WoeUSB/WoeUSB-ng/master/WoeUSB/data/woeusb-logo.png)
+![brand](.github/woeusb-logo.png)
 
 _A Linux program to create a Windows USB stick installer from a real Windows DVD or image._
 
@@ -88,14 +88,3 @@ sudo rmdir /usr/share/icons/WoeUSB-ng/
 
 ## License
 WoeUSB-ng is distributed under the [GPL license](https://github.com/WoeUSB/WoeUSB-ng/blob/master/COPYING).
-
-# Help needed
-We need somebody with knowledge how to create .deb package (or other packages for other linux distributions).
-Currently WoeUSB-ng is distributed via PyPi which does not exactly suit ours needs.
-What will package need to do? 
-- Move `woeusb` and `woeusbgui` scripts to `/bin` or equivalent set by system
-- If needed, edit path do `woeusb` and `woeusbgui` in `com.github.woeusb.woeusb-ng.policy`
-- Move `com.github.woeusb.woeusb-ng.policy` to `/usr/share/polkit-1/actions`
-- Create entry in menu
-- Move `core.py`, `gui.py`, `list_devices.py`, `utils.py`, `workaround.py` to `<python_path>/site-packages`
-- When uninstalling, remove and revert every change made to user system while installing

WoeUSB/__init__.py

@@ -3,6 +3,4 @@
     list_devices, \
     utils, \
     workaround, \
-    i18n
-
-__version__ = "0.2.6"
+    miscellaneous

WoeUSB/core.py

@@ -14,12 +14,12 @@
 
 import WoeUSB.utils as utils
 import WoeUSB.workaround as workaround
-import WoeUSB.i18n as i18n
+import WoeUSB.miscellaneous as miscellaneous
 
-_ = i18n.i18n
+_ = miscellaneous.i18n
 
 application_name = 'WoeUSB'
-application_version = '@@WOEUSB_VERSION@@'
+application_version = miscellaneous.__version__
 DEFAULT_NEW_FS_LABEL = 'Windows USB'
 
 application_site_url = 'https://github.com/slacka/WoeUSB'
@@ -373,13 +373,13 @@ def install_uefi_ntfs_support_partition(uefi_ntfs_partition, download_directory)
     utils.check_kill_signal()
 
     try:
-        file = urllib.request.urlretrieve("https://github.com/pbatard/rufus/raw/master/res/uefi/", "uefi-ntfs.img")[0]
+        fileName = urllib.request.urlretrieve("https://github.com/pbatard/rufus/raw/master/res/uefi/uefi-ntfs.img", "uefi-ntfs.img")[0] #[local_filename, headers]
     except (urllib.error.ContentTooShortError, urllib.error.HTTPError, urllib.error.URLError):
         utils.print_with_color(
             _("Warning: Unable to download UEFI:NTFS partition image from GitHub, installation skipped.  Target device might not be bootable if the UEFI firmware doesn't support NTFS filesystem."), "yellow")
         return 1
 
-    shutil.move(file, download_directory + "/" + file)  # move file to download_directory
+    shutil.move(fileName, download_directory + "/" + fileName)  # move file to download_directory
 
     shutil.copy2(download_directory + "/uefi-ntfs.img", uefi_ntfs_partition)
 

WoeUSB/gui.py

@@ -8,16 +8,15 @@
 import wx.adv
 
 
-import WoeUSB
 import WoeUSB.core as core
 import WoeUSB.list_devices as list_devices
-import WoeUSB.i18n as i18n
+import WoeUSB.miscellaneous as miscellaneous
 
 data_directory = os.path.dirname(__file__) + "/data/"
 
 app = wx.App()
 
-_ = i18n.i18n
+_ = miscellaneous.i18n
 
 
 class MainFrame(wx.Frame):
@@ -288,7 +287,7 @@ def __init__(self, parent, ID=wx.ID_ANY, title=_("About"), pos=wx.DefaultPositio
         sizer_all = wx.BoxSizer(wx.VERTICAL)
         sizer_img = wx.BoxSizer(wx.HORIZONTAL)
 
-        img = wx.Image(data_directory + "icon.ico", wx.BITMAP_TYPE_PNG)
+        img = wx.Image(data_directory + "icon.ico", wx.BITMAP_TYPE_ICO).Scale(48, 48, wx.IMAGE_QUALITY_BILINEAR)
         self.__bitmapIcone = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(img), wx.DefaultPosition, wx.Size(48, 48))
         sizer_img.Add(self.__bitmapIcone, 0, wx.ALL, 5)
 
@@ -299,7 +298,7 @@ def __init__(self, parent, ID=wx.ID_ANY, title=_("About"), pos=wx.DefaultPositio
         self.__staticTextTitre.SetForegroundColour(wx.Colour(0, 60, 118))
         sizer_text.Add(self.__staticTextTitre, 0, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
 
-        self.__staticTextVersion = wx.StaticText(self, wx.ID_ANY, WoeUSB.__version__)
+        self.__staticTextVersion = wx.StaticText(self, wx.ID_ANY, miscellaneous.__version__)
         self.__staticTextVersion.SetFont(wx.Font(10, 74, 90, 92, False, "Sans"))
         self.__staticTextVersion.SetForegroundColour(wx.Colour(69, 141, 196))
         sizer_text.Add(self.__staticTextVersion, 0, wx.LEFT, 5)
@@ -309,8 +308,8 @@ def __init__(self, parent, ID=wx.ID_ANY, title=_("About"), pos=wx.DefaultPositio
         self.__NotebookAutorLicence = wx.Notebook(self, wx.ID_ANY)
 
         self.__NotebookAutorLicence.AddPage(
-            PanelNoteBookAutors(self.__NotebookAutorLicence, wx.ID_ANY, "slacka et al.", data_directory + "woeusb-logo.png",
-                                "github.com/slacka/WoeUSB"), _("Authors"), True)
+            PanelNoteBookAutors(self.__NotebookAutorLicence, wx.ID_ANY, "slacka \nLin-Buo-Ren\nWaxyMocha", data_directory + "woeusb-logo.png",
+                                "github.com/WoeUSB/WoeUSB-ng"), _("Authors"), True)
         self.__NotebookAutorLicence.AddPage(
             PanelNoteBookAutors(self.__NotebookAutorLicence, wx.ID_ANY, "Colin GILLE / Congelli501",
                                 data_directory + "c501-logo.png", "www.congelli.eu"), _("Original WinUSB Developer"), False)