From 2934d8a339cf23ac97162054343368b8d2d38217 Mon Sep 17 00:00:00 2001
From: Denis Spiridonov <ds@calculate.ru>
Date: Fri, 22 Jun 2012 11:32:43 +0400
Subject: [PATCH] fix translate TrayIcon, changed Icon

---
 consolegui/application/ConnectionTabs.py | 2 ++
 consolegui/application/MainClass.py      | 4 ----
 consolegui/application/TrayIcon.py       | 6 +++---
 consolegui/application/View_Process.py   | 1 -
 data/cl-console-gui.desktop              | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/consolegui/application/ConnectionTabs.py b/consolegui/application/ConnectionTabs.py
index 2282a07..234c86d 100644
--- a/consolegui/application/ConnectionTabs.py
+++ b/consolegui/application/ConnectionTabs.py
@@ -413,6 +413,8 @@ class ToolTabWidget(QtGui.QTabWidget):
 
     def translate(self, lang = None):
         self.new_con_txt = _('New connection')
+        if hasattr(self, 'tray'):
+            self.tray.translate()
 
     def set_localhost(self, ClientObj):
         self.localhost_ClientObj = ClientObj
diff --git a/consolegui/application/MainClass.py b/consolegui/application/MainClass.py
index 10a8efd..bcd03db 100755
--- a/consolegui/application/MainClass.py
+++ b/consolegui/application/MainClass.py
@@ -122,10 +122,6 @@ class ApiClient(QtGui.QWidget):
             self.MainWidget.topmenu.refresh()
         except AttributeError:
             pass
-        try:
-            self._parent.tray.translate()
-        except AttributeError:
-            pass
 
         self._parent.translate(self.lang)
 
diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py
index 4ede35c..1008c11 100644
--- a/consolegui/application/TrayIcon.py
+++ b/consolegui/application/TrayIcon.py
@@ -157,14 +157,14 @@ class TrayIcon (QtGui.QSystemTrayIcon):
     def translate(self):
         # Translate left click menu
         self.left_menu.windowVisible.setText(_('Show/Hide Window'))
-        self.left_menu.sys_update.setText(_('Update system'))
+#        self.left_menu.sys_update.setText(_('Update system'))
         self.left_menu.exit_action.setText(_('Exit program'))
-        
+
         # Translate right click menu
         self.right_menu.about_action.setText(_('About Program'))
         self.right_menu.bug_action.setText(_('Report Bug'))
         self.right_menu.tools_action.setText(_('Program settings'))
-        self.right_menu.sys_update.setText(_('Update system'))
+#        self.right_menu.sys_update.setText(_('Update system'))
         self.right_menu.exit_action.setText(_('Exit program'))
         
     def help(self):
diff --git a/consolegui/application/View_Process.py b/consolegui/application/View_Process.py
index e368466..2179fa9 100755
--- a/consolegui/application/View_Process.py
+++ b/consolegui/application/View_Process.py
@@ -159,7 +159,6 @@ class ViewProc(QtGui.QWidget):
                     break
         return wrapper
 
-
     def kill_process(self, pid, x, y):
         def wrapper():
             sid = get_sid(self.client)
diff --git a/data/cl-console-gui.desktop b/data/cl-console-gui.desktop
index e0e4803..a92023a 100644
--- a/data/cl-console-gui.desktop
+++ b/data/cl-console-gui.desktop
@@ -3,7 +3,7 @@ Name=Calculate Console
 Name[ru]=Консоль Calculate
 Comment=Calculate Utilities console
 Exec=cl-console-gui
-Icon=calculate3
+Icon=cl-core
 Terminal=false
 Type=Application
 Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
\ No newline at end of file