winMain: use new connect_changed signal.

also mark some functions as private.

1 files changed, 19 insertions, 21 deletions

diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 67a684d..953e856 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -56,7 +56,7 @@ class winMain(QtGui.QMainWindow):
         self.statuslabel = QtGui.QLabel()
         self.time_slider = QtGui.QSlider(QtCore.Qt.Horizontal, self)
         self.time_slider.setMaximumWidth(self.width()/4)
-        self.connect(self.time_slider, QtCore.SIGNAL('sliderReleased()'), self.on_time_slider_change)
+        self.connect(self.time_slider, QtCore.SIGNAL('sliderReleased()'), self.__on_time_slider_change)
         self.time_label = QtGui.QLabel()
         self.time_label.duration = '0:00'
 
@@ -102,15 +102,14 @@ class winMain(QtGui.QMainWindow):
         self.restoreGeometry(self.settings.value('geometry').toByteArray())
 
         " add event handlers"
-        self.connect(self.mpclient, QtCore.SIGNAL('connected'),       self.onConnected)
-        self.connect(self.mpclient, QtCore.SIGNAL('disconnected'),    self.onDisconnect)
-        self.connect(self.mpclient, QtCore.SIGNAL('song_changed'),    self.on_song_change)
-        self.connect(self.mpclient, QtCore.SIGNAL('state_changed'),   self.update_state_messages)
-        self.connect(self.mpclient, QtCore.SIGNAL('time_changed'),    self.on_time_change)
+        self.connect(self.mpclient, QtCore.SIGNAL('connect_changed'), self.__on_connect_changed)
+        self.connect(self.mpclient, QtCore.SIGNAL('song_changed'),    self.__on_song_change)
+        self.connect(self.mpclient, QtCore.SIGNAL('state_changed'),   self.__update_state_messages)
+        self.connect(self.mpclient, QtCore.SIGNAL('time_changed'),    self.__on_time_change)
 
         self.wConnect.monitor()
 
-        self.update_state_messages()
+        self.__update_state_messages()
         self.show()
 
     def on_quit(self):
@@ -195,17 +194,16 @@ class winMain(QtGui.QMainWindow):
         self.restoreState(layout)
 
 
-    def onConnected(self):
-        self.mDisconnect.setEnabled(True)
-        self.mConnect.setEnabled(False)
-
-    def onDisconnect(self):
-        logging.info("Disconnected from MPD")
-        self.mDisconnect.setEnabled(False)
-        self.mConnect.setEnabled(True)
-        self.setStatus("You are disconnected. Choose File->Connect to reconnect!")
+    def __on_connect_changed(self, val):
+        if val:
+            self.mDisconnect.setEnabled(True)
+            self.mConnect.setEnabled(False)
+        else:
+            self.mDisconnect.setEnabled(False)
+            self.mConnect.setEnabled(True)
 
-    def update_state_messages(self):
+    def __update_state_messages(self):
+        """Update window title and statusbar"""
         song = self.mpclient.current_song()
         state = self.mpclient.status()['state']
         state = 'playing' if state == 'play' else 'paused' if state == 'pause' else 'stopped'
@@ -216,17 +214,17 @@ class winMain(QtGui.QMainWindow):
             self.setWindowTitle(APPNAME)
             self.statuslabel.setText('')
 
-    def on_time_slider_change(self):
+    def __on_time_slider_change(self):
         self.mpclient.seek(self.time_slider.value())
 
-    def on_song_change(self):
+    def __on_song_change(self):
         status = self.mpclient.status()
         self.time_slider.setMaximum(status['length'])
         self.time_slider.setEnabled(True)
         self.time_label.duration = sec2min(status['length'])
-        self.update_state_messages()
+        self.__update_state_messages()
 
-    def on_time_change(self, new_time):
+    def __on_time_change(self, new_time):
         if not self.time_slider.isSliderDown():
             self.time_slider.setValue(new_time)
         self.time_label.setText(sec2min(new_time) + '/' + self.time_label.duration)