Skip to content

Commit

Permalink
update code for version 2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
marticliment committed Jul 18, 2023
1 parent 484c2f6 commit 2eab702
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions WingetUI.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions wingetui-version-file
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion wingetui/data/contributors.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{
"name": "marticliment",
"link": "https://github.com/marticliment",
"contributions": 1732
"contributions": 1735
},
{
"name": "ppvnf",
Expand Down
6 changes: 3 additions & 3 deletions wingetui/data/versions.py
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 6 additions & 5 deletions wingetui/uiSections.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

"""



Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 2eab702

Please sign in to comment.