Merge pull request #10322 from ayhanyalcinsoy/master
PM:fixed update button functions
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
commit 6bea986efaca4b71056f059fcea0fcc49be9e606 (HEAD -> master, origin/master, origin/HEAD)
|
||||
Author: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
|
||||
Date: Mon May 23 14:36:34 2022 +0300
|
||||
|
||||
fixed update button function
|
||||
|
||||
diff --git a/src/mainwidget.py b/src/mainwidget.py
|
||||
index a404fc6..41300b2 100755
|
||||
--- a/src/mainwidget.py
|
||||
+++ b/src/mainwidget.py
|
||||
@@ -433,7 +433,7 @@ class MainWidget(QWidget, PM, Ui_MainWidget):
|
||||
waitCursor()
|
||||
self.statusUpdater.wait()
|
||||
|
||||
- if self.currentState == self.state.ALL or self.state.REMOVE:
|
||||
+ if self.currentState == self.state.ALL and self.state.REMOVE:
|
||||
action = {self.__remove_action:self.state.REMOVE,
|
||||
self.__install_action:self.state.INSTALL}.get(self.sender(), self.state.INSTALL)
|
||||
if action:
|
||||
diff --git a/src/packagedelegate.py b/src/packagedelegate.py
|
||||
index 28378c8..258d5b2 100755
|
||||
--- a/src/packagedelegate.py
|
||||
+++ b/src/packagedelegate.py
|
||||
@@ -57,7 +57,7 @@ LIGHTBLUE = QColor('#DEE5F2')
|
||||
DARKVIOLET = QColor('#3B414F')
|
||||
LIGHTGREEN = QColor('#F1F5EC')
|
||||
DARKGREEN = QColor('#32775F')
|
||||
-CHECK_ICON = 'list-add' #add
|
||||
+CHECK_ICON = 'check' #add
|
||||
RECT = QRect()
|
||||
DETAIL_LINE_OFFSET = 36
|
||||
ICON_PADDING = 10
|
||||
@@ -21,6 +21,9 @@
|
||||
<Dependency>intltool</Dependency>
|
||||
<Dependency>qt5-linguist</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>update_button_fixed.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -40,12 +43,17 @@
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<!--AdditionalFile permission="0644" owner="root" target="/usr/share/applications/package-manager.desktop">package-manager.desktop</AdditionalFile>
|
||||
<AdditionalFile permission="0644" owner="root" target="/usr/share/applications/packagemanager-helper.desktop">packagemanager-helper.desktop</AdditionalFile-->
|
||||
</AdditionalFiles>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="24">
|
||||
<Date>2022-05-24</Date>
|
||||
<Version>4.2.7.1</Version>
|
||||
<Comment>fixed update button functions</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="23">
|
||||
<Date>2022-05-06</Date>
|
||||
<Version>4.2.7.1</Version>
|
||||
|
||||
Reference in New Issue
Block a user