diff --git a/consolegui/application/Box.py b/consolegui/application/Box.py index 4a793cc..fcb5cca 100755 --- a/consolegui/application/Box.py +++ b/consolegui/application/Box.py @@ -232,7 +232,7 @@ class MainWgt(QtGui.QMainWindow): self.ClientObj._parent.connect() return 0 self.ClientObj.client = None - self.ClientObj._parent.connect_count_changed(-1) +# self.ClientObj._parent.connect_count_changed(-1) # icon_visible(self, 'Methods', False) icon_visible(self, 'Back', False) icon_visible(self, 'Disconnect', False) diff --git a/consolegui/application/ConnectionTabs.py b/consolegui/application/ConnectionTabs.py index 234c86d..e78950f 100644 --- a/consolegui/application/ConnectionTabs.py +++ b/consolegui/application/ConnectionTabs.py @@ -80,7 +80,7 @@ class SelectedMethodWgt(QtGui.QWidget): def translate(self, lang = None): return 0 - def connect_count_changed(self, count): + def connect_count_changed(self, host, port, count): pass def get_size(self): @@ -315,7 +315,7 @@ class ToolTabWidget(QtGui.QTabWidget): if self.FirstWidget.ClientObj.client: self.tray.set_icon(True) - def connect_count_changed(self, count): + def connect_count_changed(self, host, port, count): self.connect_count += count if self.connect_count: self.setWindowIcon(QtGui.QIcon \ diff --git a/consolegui/application/conf_connection.py b/consolegui/application/conf_connection.py index 39971f4..9e260b5 100755 --- a/consolegui/application/conf_connection.py +++ b/consolegui/application/conf_connection.py @@ -395,7 +395,7 @@ class FrameConnection(QtGui.QWidget): self.ClientObj._parent.set_localhost(self.ClientObj) self.ClientObj.client.server_host_name = host_name self.ClientObj.client.password = self.str_passwd - self.ClientObj._parent.connect_count_changed(1) +# self.ClientObj._parent.connect_count_changed(1) post_connect_action(self.ClientObj.client, self.ClientObj) #---------------------------------------------------- except WebFault, f: diff --git a/consolegui/application/more.py b/consolegui/application/more.py index 412b928..48c116a 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -2324,12 +2324,15 @@ def client_post_auth(client): class ClientSignal(QtCore.QThread): sid_sig = QtCore.Signal(int, int) + connect_count = QtCore.Signal(str, int, int) def __init__(self, ClientObj): QtCore.QThread.__init__(self) self.ClientObj = ClientObj + self.connect_count.connect(ClientObj._parent.connect_count_changed) def run(self): self.exit_flag = False + has_connect = None try: client_active = self.ClientObj.VarsApi.Get \ ('cl_core_client_active_period') @@ -2346,6 +2349,16 @@ class ClientSignal(QtCore.QThread): reply = 2 except Exception, e: show_msg (e.message, 'no connection to server!') + if reply == 0: + if not has_connect: + self.connect_count.emit(self.ClientObj.host_name, + self.ClientObj.port, 1) + has_connect = True + else: + if has_connect: + self.connect_count.emit(self.ClientObj.host_name, + self.ClientObj.port, -1) + has_connect = False self.sid_sig.emit(sid, reply) for i in range (5): time.sleep(float(client_active)/15.0) diff --git a/setup.py b/setup.py index 5959b3c..db6c4b6 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ data_files.append(('/usr/share/calculate/themes/install', ['data/install/conf','data/install/welcome.jpg', 'data/install/finish.jpg'])) for size in [16,22,48,64,72,96,128]: - data_files.append(('/usr/share/icons/Calculate/%dx%d' %(size,size), + data_files.append(('/usr/share/icons/Calculate/%dx%d/apps' %(size,size), glob.glob('data/%dx%d/cl-core.png' %(size,size))))