From 2eab702a7ce1bac64853cac0b23f206b963d6d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Climent?= Date: Tue, 18 Jul 2023 09:45:14 +0200 Subject: [PATCH] update code for version 2.0.2 --- WingetUI.iss | 4 ++-- wingetui-version-file | 4 ++-- wingetui/data/contributors.py | 2 +- wingetui/data/versions.py | 6 +++--- wingetui/uiSections.py | 11 ++++++----- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/WingetUI.iss b/WingetUI.iss index 9fe02a3ee..b9e6f4d61 100644 --- a/WingetUI.iss +++ b/WingetUI.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "WingetUI" -#define MyAppVersion "2.1.0-beta" +#define MyAppVersion "2.0.2" #define MyAppPublisher "Martí Climent" #define MyAppURL "https://github.com/marticliment/WingetUI" #define MyAppExeName "WingetUI.exe" @@ -19,7 +19,7 @@ AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -VersionInfoVersion=2.1.0.0 +VersionInfoVersion=2.0.2.0 DefaultDirName="{autopf}\WingetUI" DisableProgramGroupPage=yes DisableDirPage=no diff --git a/wingetui-version-file b/wingetui-version-file index f426fd3ff..0878442f6 100644 --- a/wingetui-version-file +++ b/wingetui-version-file @@ -32,8 +32,8 @@ StringFileInfo( [ StringStruct(u'CompanyName', u'Martí Climent'), StringStruct(u'FileDescription', u'WingetUI'), - StringStruct(u'FileVersion', u'2.1.0-beta'), - StringStruct(u'ProductVersion', u'2.1.0-beta'), + StringStruct(u'FileVersion', u'2.0.2'), + StringStruct(u'ProductVersion', u'2.0.2'), StringStruct(u'InternalName', u'WingetUI'), StringStruct(u'LegalCopyright', u'Martí Climent'), StringStruct(u'OriginalFilename', u'wingetui.exe'), diff --git a/wingetui/data/contributors.py b/wingetui/data/contributors.py index d68a6bfd2..af81a49b0 100644 --- a/wingetui/data/contributors.py +++ b/wingetui/data/contributors.py @@ -28,7 +28,7 @@ { "name": "marticliment", "link": "https://github.com/marticliment", - "contributions": 1732 + "contributions": 1735 }, { "name": "ppvnf", diff --git a/wingetui/data/versions.py b/wingetui/data/versions.py index 4e6584486..d0349e63b 100644 --- a/wingetui/data/versions.py +++ b/wingetui/data/versions.py @@ -1,3 +1,3 @@ -version = 2.09 -versionName = "2.1.0-beta" -versionISS = "2.1.0.0" +version = 2.02 +versionName = "2.0.2" +versionISS = "2.0.2.0" diff --git a/wingetui/uiSections.py b/wingetui/uiSections.py index 87e7c3a88..509ea79fa 100644 --- a/wingetui/uiSections.py +++ b/wingetui/uiSections.py @@ -393,14 +393,14 @@ def addItem(self, package: Package) -> None: if self.containsQuery(item, self.query.text()): self.showableItems.append(item) - UNINSTALL: UninstallSoftwareSection = globals.uninstall + """UNINSTALL: UninstallSoftwareSection = globals.uninstall if package.Id in UNINSTALL.IdPackageReference.keys(): installedPackage: UpgradablePackage = UNINSTALL.IdPackageReference[package.Id] installedItem = installedPackage.PackageItem if installedItem in UNINSTALL.packageItems: item.setIcon(1, self.installedIcon) item.setToolTip(1, _("This package is already installed")+" - "+package.Name) - + """ @@ -829,13 +829,14 @@ def addItem(self, package: UpgradablePackage) -> None: item.setAction(action) globals.trayMenuUpdatesList.addAction(action) - UNINSTALL: UninstallSoftwareSection = globals.uninstall + """UNINSTALL: UninstallSoftwareSection = globals.uninstall if package.Id in UNINSTALL.IdPackageReference.keys(): installedPackage: UpgradablePackage = UNINSTALL.IdPackageReference[package.Id] installedItem = installedPackage.PackageItem if installedItem in UNINSTALL.packageItems: installedItem.setIcon(1, self.updateIcon) installedItem.setToolTip(1, _("This package can be updated to version {0}").format(package.NewVersion)+" - "+package.Name) + """ def finishFiltering(self, text: str): def getChecked(item: TreeWidgetItemWithQAction) -> str: @@ -1251,7 +1252,7 @@ def addItem(self, package: Package) -> None: item.setIcon(4, package.getSourceIcon()) item.setText(6, package.getFloatVersion()) - UPDATES: UpdateSoftwareSection = globals.updates + """UPDATES: UpdateSoftwareSection = globals.updates if package.hasUpdatesIgnoredPermanently(): item.setIcon(1, self.pinnedIcon) item.setToolTip(1, _("Updates for this package are ignored")+" - "+package.Name) @@ -1269,7 +1270,7 @@ def addItem(self, package: Package) -> None: if discoverableItem in DISCOVER.packageItems: discoverableItem.setIcon(1, self.installedIcon) discoverableItem.setToolTip(1, _("This package is already installed")+" - "+package.Name) - + """ self.PackageItemReference[package] = item