From 234a347bb9cb8dfdb52f73083b04b6fb81ce1264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 26 Sep 2018 09:51:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=B0=20cl-consol?=
 =?UTF-8?q?e-gui=20=D0=B2=20systray?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/cl-console-gui                     |  1 +
 pym/consolegui/application/TrayIcon.py | 27 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/cl-console-gui b/bin/cl-console-gui
index c789401..9157649 100755
--- a/bin/cl-console-gui
+++ b/bin/cl-console-gui
@@ -73,6 +73,7 @@ def main():
         pass
 
     app = qt.QApplication(sys.argv)
+    app.setApplicationName(_("Calculate Console"))
 
     second = False
     for run_commands in filter(lambda x:'cl-console-gui' in x[0],getRunProc()):
diff --git a/pym/consolegui/application/TrayIcon.py b/pym/consolegui/application/TrayIcon.py
index 26b746b..7d979f2 100644
--- a/pym/consolegui/application/TrayIcon.py
+++ b/pym/consolegui/application/TrayIcon.py
@@ -155,14 +155,13 @@ class TrayIcon(qt.QSystemTrayIcon):
         self._parent = parent
         self.actions = []
 
-        self.setIcon(get_icon(
-            '/usr/share/pixmaps/calculate-console-offline.svg'))
+        icon = qt.QIcon()
+        icon.addPixmap(qt.QPixmap('/usr/share/pixmaps/calculate-console-offline.svg'))
+        self.setIcon(icon)
 
         self.is_online_icon = False
 
-        # для решения странного размера иконки в mate
-        self.hide()
-        self.show()
+        self.setVisible(True)
         self.generation_actions()
         self.right_menu = self.create_menu('help', 'bug_report', None, 'tools',
                                            'update_system', None, 'exit')
@@ -237,19 +236,19 @@ class TrayIcon(qt.QSystemTrayIcon):
     def set_icon(self, online, has_update=None):
         if online:
             if not self.is_online_icon:
-                self.setIcon(get_icon(
-                    '/usr/share/pixmaps/calculate-console-online.svg'))
-                # для решения странного размера иконки в mate
-                self.hide()
-                self.show()
+                icon = qt.QIcon()
+                icon.addPixmap(qt.QPixmap('/usr/share/pixmaps/calculate-console-online.svg'))
+                self.setIcon(icon)
+                self.setVisible(True)
                 self.is_online_icon = True
         else:
             if self.is_online_icon:
-                self.setIcon(get_icon(
-                    '/usr/share/pixmaps/calculate-console-offline.svg'))
+                icon = qt.QIcon()
+                icon.addPixmap(qt.QPixmap('/usr/share/pixmaps/calculate-console-offline.svg'))
+                self.setIcon(icon)
                 # для решения странного размера иконки в mate
-                self.hide()
-                self.show()
+                #self.hide()
+                self.setVisible(True)
                 self.is_online_icon = False
 
     def translate(self):