nephilim_app: style cleanup

1 files changed, 29 insertions, 25 deletions

diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py
index da7050b..64a6fd1 100644
--- a/nephilim/nephilim_app.py
+++ b/nephilim/nephilim_app.py
@@ -26,22 +26,24 @@ import plugins
 import icons
 
 class NephilimApp(QtGui.QApplication):
-    # public, constant
-    "main window object"
+    #### PUBLIC ####
+    # those don't change while the program is running
+    """main window object"""
     main_win     = None
-    "MPD layer"
+    """"MPD layer"""
     mpclient     = None
-    "plugins interface"
+    """"plugins interface"""
     plugins      = None
-    "settings object"
+    """settings object"""
     settings     = None
 
-    # private
-    "settings window"
-    __settings_win = None
-    "connection window"
-    __connect_win  = None
+    #### PRIVATE ####
+    """settings window"""
+    _settings_win = None
+    """connection window"""
+    _connect_win  = None
 
+    #### PUBLIC ####
     def __init__(self, argv):
         QtGui.QApplication.__init__(self, argv)
 
@@ -57,7 +59,7 @@ class NephilimApp(QtGui.QApplication):
         self.settings = QtCore.QSettings()
 
         #init connection window
-        self.__connect_win = ConnectWidget()
+        self._connect_win = ConnectWidget()
 
         #init main window
         self.main_win = MainWindow(self.mpclient)
@@ -71,35 +73,37 @@ class NephilimApp(QtGui.QApplication):
             if int(self.settings.value(plugin.name + '/load', 0)):
                 self.plugins.load(plugin.name)
 
-        self.aboutToQuit.connect(self.__cleanup)
+        self.aboutToQuit.connect(self._cleanup)
 
 
         if show_settings:
             self.show_settings_win()
         self.main_win.restore_layout()
-        self.__connect_win.monitor()
+        self._connect_win.monitor()
 
         QtGui.QApplication.exec_()
 
-    def __cleanup(self):
-        # unload all plugins
-        for plugin in self.plugins.loaded_plugins():
-            plugin.unload()
-
-        self.main_win.on_quit()
-        self.settings.sync()
 
     def show_settings_win(self):
-        if not self.__settings_win:
-            self.__settings_win = SettingsWidget(self.mpclient, self.plugins)
+        if not self._settings_win:
+            self._settings_win = SettingsWidget(self.mpclient, self.plugins)
 
-        self.__settings_win.show()
-        self.__settings_win.raise_()
+        self._settings_win.show()
+        self._settings_win.raise_()
 
     def show_connect_win(self):
-        self.__connect_win.monitor()
+        self._connect_win.monitor()
 
     def expand_tags(self, str):
         ret = str
         ret = ret.replace('${musicdir}', self.settings.value('MPD/music_dir'))
         return ret
+
+    #### PRIVATE ####
+    def _cleanup(self):
+        # unload all plugins
+        for plugin in self.plugins.loaded_plugins():
+            plugin.unload()
+
+        self.main_win.on_quit()
+        self.settings.sync()