|
 |
2e43cdd |
From 9ff4b76168a7c64e4a2de7be5158618fbb1242a2 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: =?UTF-8?q?Quentin=20P=C3=A2ris?= <github@playonlinux.com>
|
|
 |
2e43cdd |
Date: Sun, 17 May 2020 16:15:30 +0200
|
|
 |
2e43cdd |
Subject: [PATCH 01/13] Update CHANGELOG.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
CHANGELOG.md | 3 +++
|
|
 |
2e43cdd |
1 file changed, 3 insertions(+)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
|
 |
2e43cdd |
index a589625c3..cde2d82c4 100644
|
|
 |
2e43cdd |
--- a/CHANGELOG.md
|
|
 |
2e43cdd |
+++ b/CHANGELOG.md
|
|
 |
2e43cdd |
@@ -1,3 +1,6 @@
|
|
 |
2e43cdd |
+# 4.4
|
|
 |
2e43cdd |
+* Python 3 support
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
# 4.3.4
|
|
 |
2e43cdd |
* Fixed some bugs in the wineversion process
|
|
 |
2e43cdd |
* Begining of code cleaning and refactoring
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 788fad16eff4904193e4e9c52b23672535a23c33 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: Gilles <gilles.wiber@gmail.com>
|
|
 |
2e43cdd |
Date: Sat, 30 May 2020 11:19:35 +0200
|
|
 |
2e43cdd |
Subject: [PATCH 02/13] Removing SetSpacing funtion
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
python/configurewindow/ConfigureWindow.py | 2 +-
|
|
 |
2e43cdd |
python/configurewindow/ConfigureWindowNotebook.py | 2 +-
|
|
 |
2e43cdd |
python/debug.py | 2 +-
|
|
 |
2e43cdd |
python/install/InstallWindow.py | 2 +-
|
|
 |
2e43cdd |
python/mainwindow.py | 2 +-
|
|
 |
2e43cdd |
python/options.py | 2 +-
|
|
 |
2e43cdd |
python/setupwindow/POL_SetupFrame.py | 2 +-
|
|
 |
2e43cdd |
python/wine_versions/WineVersionsNotebook.py | 4 ++--
|
|
 |
2e43cdd |
8 files changed, 9 insertions(+), 9 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/configurewindow/ConfigureWindow.py b/python/configurewindow/ConfigureWindow.py
|
|
 |
2e43cdd |
index 30f779db1..a26321437 100755
|
|
 |
2e43cdd |
--- a/python/configurewindow/ConfigureWindow.py
|
|
 |
2e43cdd |
+++ b/python/configurewindow/ConfigureWindow.py
|
|
 |
2e43cdd |
@@ -75,7 +75,7 @@ def __init__(self,parent,id,title,shortcut, isPrefix = False):
|
|
 |
2e43cdd |
self.Bind(wx.EVT_BUTTON, self.DeletePrefix, id=1002)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
- self.list_game.SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.list_game.SetSpacing(0)
|
|
 |
2e43cdd |
self.list_game.SetImageList(self.images)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
index 8b4e387ea..973d9bbd3 100644
|
|
 |
2e43cdd |
--- a/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
+++ b/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
@@ -269,7 +269,7 @@ def Packages(self, nom):
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
self.Menu = wx.TreeCtrl(self.panelPackages, 99, pos=(15, 75), size=(530, 260),
|
|
 |
2e43cdd |
style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
|
|
 |
2e43cdd |
- self.Menu.SetSpacing(0);
|
|
 |
2e43cdd |
+ #self.Menu.SetSpacing(0);
|
|
 |
2e43cdd |
self.Menu.SetImageList(self.imagePackages)
|
|
 |
2e43cdd |
self.imagePackages.RemoveAll()
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/debug.py b/python/debug.py
|
|
 |
2e43cdd |
index 0221e89c0..43e8cf021 100755
|
|
 |
2e43cdd |
--- a/python/debug.py
|
|
 |
2e43cdd |
+++ b/python/debug.py
|
|
 |
2e43cdd |
@@ -60,7 +60,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
|
|
 |
2e43cdd |
self.Bind(wx.EVT_TREE_SEL_CHANGED, self.analyseLog, id=900)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
- self.list_game.SetSpacing(0);
|
|
 |
2e43cdd |
+ #self.list_game.SetSpacing(0);
|
|
 |
2e43cdd |
self.list_game.SetImageList(self.images)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py
|
|
 |
2e43cdd |
index 27a6b51a5..5b584774d 100755
|
|
 |
2e43cdd |
--- a/python/install/InstallWindow.py
|
|
 |
2e43cdd |
+++ b/python/install/InstallWindow.py
|
|
 |
2e43cdd |
@@ -183,7 +183,7 @@ def _createAppNavigation(self):
|
|
 |
2e43cdd |
self.appsList = wx.TreeCtrl(self.appNavigationPanel, 106,
|
|
 |
2e43cdd |
style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
|
|
 |
2e43cdd |
self.appsList.SetImageList(self.imagesapps)
|
|
 |
2e43cdd |
- self.appsList.SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.appsList.SetSpacing(0)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
self.appNavigationSizer.AddSpacer(10)
|
|
 |
2e43cdd |
self.appNavigationSizer.Add(self.appsList, 4, wx.EXPAND, 5)
|
|
 |
2e43cdd |
diff --git a/python/mainwindow.py b/python/mainwindow.py
|
|
 |
2e43cdd |
index 7c21142df..8df1ff14b 100755
|
|
 |
2e43cdd |
--- a/python/mainwindow.py
|
|
 |
2e43cdd |
+++ b/python/mainwindow.py
|
|
 |
2e43cdd |
@@ -240,7 +240,7 @@ def __init__(self, parent, id, title):
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
## List game
|
|
 |
2e43cdd |
self.list_game = wx.TreeCtrl(self, 105, style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT)
|
|
 |
2e43cdd |
- self.list_game.SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.list_game.SetSpacing(0)
|
|
 |
2e43cdd |
self.list_game.SetIndent(5)
|
|
 |
2e43cdd |
self.list_game.SetImageList(self.images)
|
|
 |
2e43cdd |
self.menu_gauche = wx.Panel(self, -1)
|
|
 |
2e43cdd |
diff --git a/python/options.py b/python/options.py
|
|
 |
2e43cdd |
index a54c11000..723073ce4 100755
|
|
 |
2e43cdd |
--- a/python/options.py
|
|
 |
2e43cdd |
+++ b/python/options.py
|
|
 |
2e43cdd |
@@ -187,7 +187,7 @@ def Plugins(self, nom):
|
|
 |
2e43cdd |
self.txtPlugin = wx.StaticText(self.panelPlugins, -1, _("Installed plugins"), size=wx.DefaultSize)
|
|
 |
2e43cdd |
self.txtPlugin.SetFont(self.fontTitle)
|
|
 |
2e43cdd |
self.pluginlist = wx.TreeCtrl(self.panelPlugins, 220, style=Variables.widget_borders|wx.TR_HIDE_ROOT|wx.TR_FULL_ROW_HIGHLIGHT)
|
|
 |
2e43cdd |
- self.pluginlist.SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.pluginlist.SetSpacing(0)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
self.pluginImgList = wx.ImageList(16,16)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/setupwindow/POL_SetupFrame.py b/python/setupwindow/POL_SetupFrame.py
|
|
 |
2e43cdd |
index 66bee8533..33d73d38a 100755
|
|
 |
2e43cdd |
--- a/python/setupwindow/POL_SetupFrame.py
|
|
 |
2e43cdd |
+++ b/python/setupwindow/POL_SetupFrame.py
|
|
 |
2e43cdd |
@@ -212,7 +212,7 @@ def _createUI(self):
|
|
 |
2e43cdd |
style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders,
|
|
 |
2e43cdd |
pos=(25, 25), size=(460, 220))
|
|
 |
2e43cdd |
self.MenuGames.SetImageList(self.images)
|
|
 |
2e43cdd |
- self.MenuGames.SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.MenuGames.SetSpacing(0)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
# Login
|
|
 |
2e43cdd |
self.login = wx.StaticText(self.contentPanel, -1, _("Login: "), pos=(20, 40), size=(460, 20))
|
|
 |
2e43cdd |
diff --git a/python/wine_versions/WineVersionsNotebook.py b/python/wine_versions/WineVersionsNotebook.py
|
|
 |
2e43cdd |
index e088abeb2..ec5f12535 100644
|
|
 |
2e43cdd |
--- a/python/wine_versions/WineVersionsNotebook.py
|
|
 |
2e43cdd |
+++ b/python/wine_versions/WineVersionsNotebook.py
|
|
 |
2e43cdd |
@@ -39,7 +39,7 @@ def _createInstalledWineVersionsPanel(self, arch):
|
|
 |
2e43cdd |
self.installedWineVersionsTreeSelector[arch] = wx.TreeCtrl(installedWineVersionsPanel, 107 + self.calculateEventDelta(arch),
|
|
 |
2e43cdd |
style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders)
|
|
 |
2e43cdd |
self.installedWineVersionsTreeSelector[arch].SetImageList(self.imagesapps_i[arch])
|
|
 |
2e43cdd |
- self.installedWineVersionsTreeSelector[arch].SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.installedWineVersionsTreeSelector[arch].SetSpacing(0)
|
|
 |
2e43cdd |
installedWineVersionsSizer.Add(self.installedWineVersionsTreeSelector[arch], 1, wx.EXPAND)
|
|
 |
2e43cdd |
installedWineVersionsSizer.AddSpacer(10)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
@@ -55,7 +55,7 @@ def _createAvailableWineVersionsPanel(self, arch):
|
|
 |
2e43cdd |
style=wx.TR_HIDE_ROOT | wx.TR_FULL_ROW_HIGHLIGHT | Variables.widget_borders,
|
|
 |
2e43cdd |
size=(320, 300), pos=(10, 35))
|
|
 |
2e43cdd |
self.availableWineVersionsTreeSelector[arch].SetImageList(self.imagesapps[arch])
|
|
 |
2e43cdd |
- self.availableWineVersionsTreeSelector[arch].SetSpacing(0)
|
|
 |
2e43cdd |
+ #self.availableWineVersionsTreeSelector[arch].SetSpacing(0)
|
|
 |
2e43cdd |
availableWineVersionsSizer.Add(self.availableWineVersionsTreeSelector[arch], 1, wx.EXPAND)
|
|
 |
2e43cdd |
availableWineVersionsSizer.AddSpacer(10)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 77a3ca3be293ebcafa2400703a5dd4079a5f200b Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: Gilles <gilles.wiber@gmail.com>
|
|
 |
2e43cdd |
Date: Sat, 30 May 2020 11:32:13 +0200
|
|
 |
2e43cdd |
Subject: [PATCH 03/13] Solving pluging manager issue (extension management)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
python/options.py | 11 ++++++-----
|
|
 |
2e43cdd |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/options.py b/python/options.py
|
|
 |
2e43cdd |
index 723073ce4..f40f26a70 100755
|
|
 |
2e43cdd |
--- a/python/options.py
|
|
 |
2e43cdd |
+++ b/python/options.py
|
|
 |
2e43cdd |
@@ -229,9 +229,9 @@ def generateExts(self):
|
|
 |
2e43cdd |
line = line.replace("\n","")
|
|
 |
2e43cdd |
line = line.split("=")
|
|
 |
2e43cdd |
liner = "Line %s" % i
|
|
 |
2e43cdd |
- self.list_ext.InsertStringItem(i, liner)
|
|
 |
2e43cdd |
- self.list_ext.SetStringItem(i, 0, line[0])
|
|
 |
2e43cdd |
- self.list_ext.SetStringItem(i, 1, line[1])
|
|
 |
2e43cdd |
+ self.list_ext.InsertItem(i, liner)
|
|
 |
2e43cdd |
+ self.list_ext.SetItem(i, 0, line[0])
|
|
 |
2e43cdd |
+ self.list_ext.SetItem(i, 1, line[1])
|
|
 |
2e43cdd |
i += 1
|
|
 |
2e43cdd |
self.app_installed_text.Hide()
|
|
 |
2e43cdd |
self.app_installed.Hide()
|
|
 |
2e43cdd |
@@ -249,8 +249,9 @@ def editExt(self, event):
|
|
 |
2e43cdd |
self.app_installed.Show()
|
|
 |
2e43cdd |
self.delete_ext.Show()
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
- self.app_selected = self.exts[event.m_itemIndex].split("=")[1]
|
|
 |
2e43cdd |
- self.ext_selected = self.exts[event.m_itemIndex].split("=")[0]
|
|
 |
2e43cdd |
+ ind = event.GetIndex()
|
|
 |
2e43cdd |
+ self.app_selected = self.list_ext.GetItem(ind,1).GetText()
|
|
 |
2e43cdd |
+ self.ext_selected = self.list_ext.GetItem(ind,0).GetText()
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
self.app_installed.SetValue(self.app_selected.replace("\n","").replace("\r",""))
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From a656f5b2bdd23375e3d9547a9c38ccf99e2dc670 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: Gilles <gilles.wiber@gmail.com>
|
|
 |
2e43cdd |
Date: Sat, 30 May 2020 14:34:28 +0200
|
|
 |
2e43cdd |
Subject: [PATCH 04/13] Solving different issue on debug window
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
python/debug.py | 7 ++++---
|
|
 |
2e43cdd |
python/lib/Variables.py | 2 +-
|
|
 |
2e43cdd |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/debug.py b/python/debug.py
|
|
 |
2e43cdd |
index 43e8cf021..1e344edc8 100755
|
|
 |
2e43cdd |
--- a/python/debug.py
|
|
 |
2e43cdd |
+++ b/python/debug.py
|
|
 |
2e43cdd |
@@ -38,7 +38,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
wx.Frame.__init__(self, parent, -1, title, size = (810, 600+Variables.windows_add_size), style = wx.CLOSE_BOX | wx.CAPTION | wx.MINIMIZE_BOX)
|
|
 |
2e43cdd |
self.SetIcon(wx.Icon(Variables.playonlinux_env+"/etc/playonlinux.png", wx.BITMAP_TYPE_ANY))
|
|
 |
2e43cdd |
- self.SetTitle(_('{0} debugger').format(os.environ["APPLICATION_TITLE"]))
|
|
 |
2e43cdd |
+ self.SetTitle(title)
|
|
 |
2e43cdd |
#self.panelFenp = wx.Panel(self, -1)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
self.prefixes_item = {}
|
|
 |
2e43cdd |
@@ -79,7 +79,7 @@ def __init__(self,parent,id,title,logcheck="/dev/null",logtype=None):
|
|
 |
2e43cdd |
self.log_reader = wx.TextCtrl(self.panelText, 100, "", size=wx.Size(590,500), pos=(2,2), style=Variables.widget_borders|wx.TE_RICH2|wx.TE_READONLY|wx.TE_MULTILINE)
|
|
 |
2e43cdd |
self.log_reader.Bind(wx.EVT_SET_FOCUS, self.OnFocus)
|
|
 |
2e43cdd |
self.openTextEdit = wx.Button(self.panelNotEmpty, 101, _("Locate this logfile"), size=(400,30), pos=(70,512))
|
|
 |
2e43cdd |
- self.reportProblem = wx.Button(self.panelNotEmpty, 102, "", size=(400,30), pos=(70,552))
|
|
 |
2e43cdd |
+ self.reportProblem = wx.Button(self.panelNotEmpty, 102, _("Bug report"), size=(400,30), pos=(70,552))
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
if(logcheck == "/dev/null"):
|
|
 |
2e43cdd |
self.HideLogFile()
|
|
 |
2e43cdd |
@@ -95,7 +95,8 @@ def bugReport(self, event):
|
|
 |
2e43cdd |
new_env = os.environ
|
|
 |
2e43cdd |
new_env["LOGTITLE"] = self.logname
|
|
 |
2e43cdd |
subprocess.Popen(["bash", Variables.playonlinux_env+"/bash/bug_report"], env=new_env)
|
|
 |
2e43cdd |
- self.reportProblem.Enable(False)
|
|
 |
2e43cdd |
+ # Doesn't work if cancel on POL Window : need to find another way ...
|
|
 |
2e43cdd |
+ #self.reportProblem.Enable(False)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
def locate(self, event):
|
|
 |
2e43cdd |
if(self.logtype == 0):
|
|
 |
2e43cdd |
diff --git a/python/lib/Variables.py b/python/lib/Variables.py
|
|
 |
2e43cdd |
index 055fe17f9..8bed7601b 100755
|
|
 |
2e43cdd |
--- a/python/lib/Variables.py
|
|
 |
2e43cdd |
+++ b/python/lib/Variables.py
|
|
 |
2e43cdd |
@@ -51,7 +51,7 @@
|
|
 |
2e43cdd |
windows_add_size = 0
|
|
 |
2e43cdd |
windows_add_playonmac = 0
|
|
 |
2e43cdd |
else:
|
|
 |
2e43cdd |
- windows_add_size = dpiFetcher().fetch_extra_pixel()
|
|
 |
2e43cdd |
+ windows_add_size = dpiFetcher().fetch_extra_pixel()+60
|
|
 |
2e43cdd |
windows_add_playonmac = 0
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
widget_borders = wx.RAISED_BORDER
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 02beab05d4255802c26db20a18787349e9b15bbc Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: Gilles <gilles.wiber@gmail.com>
|
|
 |
2e43cdd |
Date: Sat, 30 May 2020 15:17:33 +0200
|
|
 |
2e43cdd |
Subject: [PATCH 05/13] Solving small bugs
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
python/configurewindow/ConfigureWindowNotebook.py | 2 ++
|
|
 |
2e43cdd |
python/install/InstallWindow.py | 2 +-
|
|
 |
2e43cdd |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/configurewindow/ConfigureWindowNotebook.py b/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
index 973d9bbd3..296443e66 100644
|
|
 |
2e43cdd |
--- a/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
+++ b/python/configurewindow/ConfigureWindowNotebook.py
|
|
 |
2e43cdd |
@@ -467,6 +467,8 @@ def misc_button(self, event):
|
|
 |
2e43cdd |
self.FileDialog.ShowModal()
|
|
 |
2e43cdd |
if (self.FileDialog.GetPath() != ""):
|
|
 |
2e43cdd |
filename = self.FileDialog.GetPath()
|
|
 |
2e43cdd |
+ if not os.path.isfile(filename):
|
|
 |
2e43cdd |
+ return
|
|
 |
2e43cdd |
dirname = os.path.dirname(filename)
|
|
 |
2e43cdd |
if (self.s_isPrefix == True):
|
|
 |
2e43cdd |
subprocess.Popen(["bash", Variables.playonlinux_env + "/bash/POL_Command", "--prefix",
|
|
 |
2e43cdd |
diff --git a/python/install/InstallWindow.py b/python/install/InstallWindow.py
|
|
 |
2e43cdd |
index 5b584774d..2e49e4a18 100755
|
|
 |
2e43cdd |
--- a/python/install/InstallWindow.py
|
|
 |
2e43cdd |
+++ b/python/install/InstallWindow.py
|
|
 |
2e43cdd |
@@ -333,7 +333,7 @@ def closeapp(self, event):
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
def manual(self, event):
|
|
 |
2e43cdd |
self.live = 1
|
|
 |
2e43cdd |
- self.installapp(self)
|
|
 |
2e43cdd |
+ self.installapp(event)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
def showStars(self, stars):
|
|
 |
2e43cdd |
starWidth = 20
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From e3a924fcf4ff3409d31f0956d3802d6a65956ae2 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 19:42:50 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 06/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 49 ++++++++++++++++++++++++++++++++++---------------
|
|
 |
2e43cdd |
1 file changed, 34 insertions(+), 15 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 9b6ca31ca..97795c427 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -1,28 +1,47 @@
|
|
 |
2e43cdd |
-POL-POM-4
|
|
 |
2e43cdd |
-=========
|
|
 |
2e43cdd |
+# PlayOnLinux and PlayOnMac 4 (POL-POM-4)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-PlayOnLinux 4 repository
|
|
 |
2e43cdd |
-Note: PlayOnLinux 5 is currently under development. Please clone POL-POM-5 repository if you want to contribute
|
|
 |
2e43cdd |
+Note: [Phoenicis PlayOnLinux and PlayOnMac 5](https://www.phoenicis.org/) is currently under development. Please clone [Phoenicis PlayOnLinux and PlayOnMac 5 repository](https://github.com/PhoenicisOrg/phoenicis) if you want to contribute.
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-What is PlayOnLinux?
|
|
 |
2e43cdd |
-=====================
|
|
 |
2e43cdd |
+PlayOnLinux and PlayOnMac 4 allows you to install and use non-native applications on your favorite operating system.
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+Supported operating systems:
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+* Linux
|
|
 |
2e43cdd |
+* Mac OSX
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+Supported engines:
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+* [Wine](https://www.winehq.org/)
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+# What is PlayOnLinux?
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
PlayOnLinux is a piece of software which allows you to easily install and use numerous games and apps designed to run with Microsoft® Windows®.
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
Few games are compatible with GNU/Linux at the moment and it certainly is a factor preventing the migration to this system. PlayOnLinux brings a cost-free, accessible and efficient solution to this problem.
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-What are PlayOnLinux's features?
|
|
 |
2e43cdd |
-================================
|
|
 |
2e43cdd |
+# What are PlayOnLinux's features?
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Here is a non-exhaustive list of the interesting points to know:
|
|
 |
2e43cdd |
+* You don't have to own a Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
+* PlayOnLinux is based on [Wine](https://www.winehq.org/), and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
+* PlayOnLinux is free software.
|
|
 |
2e43cdd |
+* PlayOnLinux uses [Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) and [Python](https://en.wikipedia.org/wiki/Python_(programming_language)).
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-You don't have to own a Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
-PlayOnLinux is based on Wine, and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
-PlayOnLinux is free software.
|
|
 |
2e43cdd |
-PlayOnLinux uses Bash and Python.
|
|
 |
2e43cdd |
Nevertheless, PlayOnLinux has some bugs, as every piece of software:
|
|
 |
2e43cdd |
-
|
|
 |
2e43cdd |
-Occasional performance decrease (image may be less fluid and graphics less detailed).
|
|
 |
2e43cdd |
-Not all games are supported. Nevertheless, you can use our manual installation module.
|
|
 |
2e43cdd |
+* Occasional performance decrease (image may be less fluid and graphics less detailed).
|
|
 |
2e43cdd |
+* Not all games are supported. Nevertheless, you can use our manual installation module.
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
For more information, visit http://www.playonlinux.com
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+## Translate
|
|
 |
2e43cdd |
+PlayOnLinux/PlayOnMac 4 is localized using Launchpad: https://translations.launchpad.net/playonlinux
|
|
 |
2e43cdd |
+If your language is not listed, please create an [issue](https://github.com/PlayOnLinux/POL-POM-4/issues).
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+
|
|
 |
2e43cdd |
+## Community
|
|
 |
2e43cdd |
+* Issues or ideas: https://github.com/PhoenicisOrg/phoenicis/issues
|
|
 |
2e43cdd |
+* Forums : http://www.playonlinux.com/en/forums.html
|
|
 |
2e43cdd |
+* Slack : https://join.slack.com/phoenicis-org/shared_invite/MTkzMTMwMjM3MjcxLTE0OTY1MTQzNzktY2IzOTE2NmE3NA
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 2fb13e328861264ee3a4f6d8979bb1ee018cea79 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 19:44:16 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 07/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 4 ++--
|
|
 |
2e43cdd |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 97795c427..c1e9ed033 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -21,10 +21,10 @@ PlayOnLinux is a piece of software which allows you to easily install and use nu
|
|
 |
2e43cdd |
Few games are compatible with GNU/Linux at the moment and it certainly is a factor preventing the migration to this system. PlayOnLinux brings a cost-free, accessible and efficient solution to this problem.
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-# What are PlayOnLinux's features?
|
|
 |
2e43cdd |
+# What are PlayOnLinux’s features?
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Here is a non-exhaustive list of the interesting points to know:
|
|
 |
2e43cdd |
-* You don't have to own a Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
+* You don’t have to own a Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
* PlayOnLinux is based on [Wine](https://www.winehq.org/), and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
* PlayOnLinux is free software.
|
|
 |
2e43cdd |
* PlayOnLinux uses [Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) and [Python](https://en.wikipedia.org/wiki/Python_(programming_language)).
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From f4229ac83015a583d0c0e45445d28ee332321356 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 19:45:11 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 08/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 5 +++--
|
|
 |
2e43cdd |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index c1e9ed033..75fbc5fae 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -6,8 +6,9 @@ PlayOnLinux and PlayOnMac 4 allows you to install and use non-native application
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported operating systems:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-* Linux
|
|
 |
2e43cdd |
-* Mac OSX
|
|
 |
2e43cdd |
+* GNU/Linux
|
|
 |
2e43cdd |
+* Mac OS X
|
|
 |
2e43cdd |
+* macOS
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported engines:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 6480e694154f4f24c4bf31babc7e9271574e04ca Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 19:49:31 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 09/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 7 +++----
|
|
 |
2e43cdd |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 75fbc5fae..0d64a5962 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -6,9 +6,8 @@ PlayOnLinux and PlayOnMac 4 allows you to install and use non-native application
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported operating systems:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-* GNU/Linux
|
|
 |
2e43cdd |
-* Mac OS X
|
|
 |
2e43cdd |
-* macOS
|
|
 |
2e43cdd |
+* [GNU/Linux](https://en.wikipedia.org/wiki/Linux)
|
|
 |
2e43cdd |
+* [macOS](https://en.wikipedia.org/wiki/Apple_Macintosh_OS_X)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported engines:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
@@ -25,7 +24,7 @@ Few games are compatible with GNU/Linux at the moment and it certainly is a fact
|
|
 |
2e43cdd |
# What are PlayOnLinux’s features?
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Here is a non-exhaustive list of the interesting points to know:
|
|
 |
2e43cdd |
-* You don’t have to own a Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
+* You don’t have to own a [Microsoft Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) license to use PlayOnLinux.
|
|
 |
2e43cdd |
* PlayOnLinux is based on [Wine](https://www.winehq.org/), and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
* PlayOnLinux is free software.
|
|
 |
2e43cdd |
* PlayOnLinux uses [Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) and [Python](https://en.wikipedia.org/wiki/Python_(programming_language)).
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From c4669305f256c4c16bc68a353239cbc8c5dae7ba Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 19:50:31 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 10/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 2 +-
|
|
 |
2e43cdd |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 0d64a5962..57fadfbb6 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -26,7 +26,7 @@ Few games are compatible with GNU/Linux at the moment and it certainly is a fact
|
|
 |
2e43cdd |
Here is a non-exhaustive list of the interesting points to know:
|
|
 |
2e43cdd |
* You don’t have to own a [Microsoft Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) license to use PlayOnLinux.
|
|
 |
2e43cdd |
* PlayOnLinux is based on [Wine](https://www.winehq.org/), and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
-* PlayOnLinux is free software.
|
|
 |
2e43cdd |
+* PlayOnLinux is [free software](https://en.wikipedia.org/wiki/Free_software).
|
|
 |
2e43cdd |
* PlayOnLinux uses [Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) and [Python](https://en.wikipedia.org/wiki/Python_(programming_language)).
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Nevertheless, PlayOnLinux has some bugs, as every piece of software:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From a6cc23d43375fca0e28e900a110d195be251ee20 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Fri, 24 Jul 2020 20:12:36 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 11/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 2 +-
|
|
 |
2e43cdd |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 57fadfbb6..0fe79f3fa 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -7,7 +7,7 @@ PlayOnLinux and PlayOnMac 4 allows you to install and use non-native application
|
|
 |
2e43cdd |
Supported operating systems:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
* [GNU/Linux](https://en.wikipedia.org/wiki/Linux)
|
|
 |
2e43cdd |
-* [macOS](https://en.wikipedia.org/wiki/Apple_Macintosh_OS_X)
|
|
 |
2e43cdd |
+* [macOS](https://en.wikipedia.org/wiki/MacOS)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported engines:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 08e87ed0a78b0c7743935cd39b355db303157354 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: ovari <17465872+ovari@users.noreply.github.com>
|
|
 |
2e43cdd |
Date: Sat, 25 Jul 2020 18:31:10 +1000
|
|
 |
2e43cdd |
Subject: [PATCH 12/13] Update README.md
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
README.md | 8 ++++----
|
|
 |
2e43cdd |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/README.md b/README.md
|
|
 |
2e43cdd |
index 0fe79f3fa..3d00e65c1 100644
|
|
 |
2e43cdd |
--- a/README.md
|
|
 |
2e43cdd |
+++ b/README.md
|
|
 |
2e43cdd |
@@ -6,8 +6,8 @@ PlayOnLinux and PlayOnMac 4 allows you to install and use non-native application
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported operating systems:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
-* [GNU/Linux](https://en.wikipedia.org/wiki/Linux)
|
|
 |
2e43cdd |
-* [macOS](https://en.wikipedia.org/wiki/MacOS)
|
|
 |
2e43cdd |
+* GNU/Linux
|
|
 |
2e43cdd |
+* macOS
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Supported engines:
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
@@ -24,10 +24,10 @@ Few games are compatible with GNU/Linux at the moment and it certainly is a fact
|
|
 |
2e43cdd |
# What are PlayOnLinux’s features?
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Here is a non-exhaustive list of the interesting points to know:
|
|
 |
2e43cdd |
-* You don’t have to own a [Microsoft Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) license to use PlayOnLinux.
|
|
 |
2e43cdd |
+* You don’t have to own a Microsoft Windows license to use PlayOnLinux.
|
|
 |
2e43cdd |
* PlayOnLinux is based on [Wine](https://www.winehq.org/), and so profits from all its features yet it keeps the user from having to deal with its complexity.
|
|
 |
2e43cdd |
* PlayOnLinux is [free software](https://en.wikipedia.org/wiki/Free_software).
|
|
 |
2e43cdd |
-* PlayOnLinux uses [Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) and [Python](https://en.wikipedia.org/wiki/Python_(programming_language)).
|
|
 |
2e43cdd |
+* PlayOnLinux uses Bash and Python.
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Nevertheless, PlayOnLinux has some bugs, as every piece of software:
|
|
 |
2e43cdd |
* Occasional performance decrease (image may be less fluid and graphics less detailed).
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
From 2bf9ed2d321a26b48de83a13064f7b9f0db0dcd7 Mon Sep 17 00:00:00 2001
|
|
 |
2e43cdd |
From: rayderua <rayder.ua@gmail.com>
|
|
 |
2e43cdd |
Date: Mon, 5 Oct 2020 17:19:47 +0300
|
|
 |
2e43cdd |
Subject: [PATCH 13/13] fix split version to first 3 elements
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
ValueError: invalid literal for int() with base 10: 'post2'
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
Versions can contain not only digits (for example wx releases: 4.0.7, 4.0.7.post1, 4.0.7.post2, 4.1.0)
|
|
 |
2e43cdd |
---
|
|
 |
2e43cdd |
python/lib/playonlinux.py | 4 ++--
|
|
 |
2e43cdd |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
diff --git a/python/lib/playonlinux.py b/python/lib/playonlinux.py
|
|
 |
2e43cdd |
index 827db9202..3e87d90aa 100755
|
|
 |
2e43cdd |
--- a/python/lib/playonlinux.py
|
|
 |
2e43cdd |
+++ b/python/lib/playonlinux.py
|
|
 |
2e43cdd |
@@ -278,11 +278,11 @@ def VersionLower(version1, version2):
|
|
 |
2e43cdd |
else:
|
|
 |
2e43cdd |
return False
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
- version1 = [ int(digit) for digit in version1[0].split(".") ]
|
|
 |
2e43cdd |
+ version1 = [ int(digit) for digit in version1[0].split(".")[:3] ]
|
|
 |
2e43cdd |
while len(version1) < 3:
|
|
 |
2e43cdd |
version1.append(0)
|
|
 |
2e43cdd |
|
|
 |
2e43cdd |
- version2 = [ int(digit) for digit in version2[0].split(".") ]
|
|
 |
2e43cdd |
+ version2 = [ int(digit) for digit in version2[0].split(".")[:3] ]
|
|
 |
2e43cdd |
while len(version2) < 3:
|
|
 |
2e43cdd |
version2.append(0)
|
|
 |
2e43cdd |
|