From 182ef900d74aef818eaad1488acbcdb3f818a6a4 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Wed, 2 Sep 2020 23:14:33 +0200 Subject: [PATCH 1/4] Full path to pyw Or windows fucks it up --- windows/ss.iss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/ss.iss b/windows/ss.iss index af7f394..61b215d 100755 --- a/windows/ss.iss +++ b/windows/ss.iss @@ -40,11 +40,11 @@ Source: "samples\*"; DestDir: "{app}\samples"; Flags: ignoreversion recursesubdi [Icons] -Name: "{group}\Relational"; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}" +Name: "{group}\Relational"; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" Name: "{group}\{cm:ProgramOnTheWeb,Relational}"; Filename: "https://ltworf.github.io/relational/" Name: "{group}\{cm:UninstallProgram,Relational}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\Relational"; Tasks: desktopicon; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}" -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Relational"; Tasks: quicklaunchicon; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}" +Name: "{commondesktop}\Relational"; Tasks: desktopicon; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Relational"; Tasks: quicklaunchicon; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" [Run] -Description: "{cm:LaunchProgram,Relational}"; Flags: nowait postinstall skipifsilent; Filename: "pyw"; Parameters: "relational.py"; WorkingDir: "{app}" +Description: "{cm:LaunchProgram,Relational}"; Flags: nowait postinstall skipifsilent; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" From 398bf50eb9301d073232412bca911f13c6ad3331 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Wed, 2 Sep 2020 23:54:01 +0200 Subject: [PATCH 2/4] Change background instead of foreground MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It turned out invisible on windows… --- relational_gui/guihandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index b590126..d989082 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -254,7 +254,7 @@ class relForm(QtWidgets.QMainWindow): elif isinstance(k, (int, float)): item.setForeground(j, QtGui.QPalette().link()) elif not isinstance(k, str): - item.setForeground(j, QtGui.QPalette().brightText()) + item.setBackground(j, QtGui.QBrush(QtCore.Qt.darkGreen, QtCore.Qt.Dense4Pattern)) item.setText(j, str(k)) self.ui.table.addTopLevelItem(item) From 4aa42dc69da6d9057b50d50b140b655f0126be98 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Thu, 3 Sep 2020 00:04:39 +0200 Subject: [PATCH 3/4] Use normal shell as powershell needs magic permissions --- windows/ss.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/ss.iss b/windows/ss.iss index 61b215d..23bbe02 100755 --- a/windows/ss.iss +++ b/windows/ss.iss @@ -26,7 +26,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip ; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here ; the conditional installation Check Filename: "{tmp}\python-3.8.5-amd64.exe"; Parameters: "/passive InstallAllUsers=1"; -Filename: "powershell"; Parameters: "-file {tmp}\pipscript.bat" +Filename: "{tmp}\pipscript.bat" [Files] ; NOTE: Don't use "Flags: ignoreversion" on any shared system files From d65273881a83072ca65941a953097728a8bd63e2 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Thu, 3 Sep 2020 00:21:53 +0200 Subject: [PATCH 4/4] Remove quick launch --- windows/ss.iss | 2 -- 1 file changed, 2 deletions(-) diff --git a/windows/ss.iss b/windows/ss.iss index 23bbe02..2e6e8c0 100755 --- a/windows/ss.iss +++ b/windows/ss.iss @@ -20,7 +20,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Run] ; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here @@ -44,7 +43,6 @@ Name: "{group}\Relational"; Filename: "{win}\pyw.exe"; Parameters: "relational.p Name: "{group}\{cm:ProgramOnTheWeb,Relational}"; Filename: "https://ltworf.github.io/relational/" Name: "{group}\{cm:UninstallProgram,Relational}"; Filename: "{uninstallexe}" Name: "{commondesktop}\Relational"; Tasks: desktopicon; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Relational"; Tasks: quicklaunchicon; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}" [Run] Description: "{cm:LaunchProgram,Relational}"; Flags: nowait postinstall skipifsilent; Filename: "{win}\pyw.exe"; Parameters: "relational.py"; WorkingDir: "{app}"