Merge pull request #9913 from 4fury-c3440d8/no

service-manager.
This commit is contained in:
Rmys
2021-11-28 11:23:52 +02:00
committed by GitHub
2 changed files with 43 additions and 4 deletions
@@ -1,6 +1,45 @@
--- a/src/servicemanager/widgets.py 2020-04-04 13:04:20.000000000 +0300
+++ b/src/servicemanager/widgets.py 2021-11-27 14:35:17.755051834 +0300
@@ -95,7 +95,7 @@
commit aef348d8629411063c3a290078aea80cca8b1493
Author: 4fury-c3440d8 <uglyside@yandex.ru>
Date: Sun Nov 28 06:42:35 2021 +0300
Icons_display_fix
diff --git a/src/service-manager.py b/src/service-manager.py
index f1b4ba0..ec89402 100755
--- a/src/service-manager.py
+++ b/src/service-manager.py
@@ -15,6 +15,8 @@
import sys
import dbus
+from PyQt5.QtGui import QIcon
+
# Application Stuff
import servicemanager.about as about
# Application Stuff
@@ -22,7 +24,7 @@ from servicemanager.base import MainManager
# Pds Stuff
from pds.quniqueapp import QUniqueApplication
-from servicemanager.context import KIcon, i18n
+from servicemanager.context import i18n
# Create a QUniqueApllication instance
app = QUniqueApplication(sys.argv, catalog=about.appName)
@@ -40,7 +42,7 @@ if __name__ == '__main__':
mainWindow.show()
mainWindow.resize(640, 480)
mainWindow.setWindowTitle(i18n(about.PACKAGE))
- mainWindow.setWindowIcon(KIcon(about.icon))
+ mainWindow.setWindowIcon(QIcon(about.icon))
# Create connection for lastWindowClosed signal to quit app
app.lastWindowClosed.connect(app.quit)
diff --git a/src/servicemanager/widgets.py b/src/servicemanager/widgets.py
index 4aec556..496c82f 100755
--- a/src/servicemanager/widgets.py
+++ b/src/servicemanager/widgets.py
@@ -95,7 +95,7 @@ class ServiceItemWidget(QtWidgets.QWidget):
self.ui.buttonStop.setEnabled(self.running)
self.ui.buttonReload.setEnabled(self.running)
+1 -1
View File
@@ -40,7 +40,7 @@
<History>
<Update release="6">
<Date>2021-11-27</Date>
<Date>2021-11-28</Date>
<Version>3.1.2</Version>
<Comment>Version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>