winMain: get rid of CamelCase.

also remove some unneeded code.

2 files changed, 29 insertions, 49 deletions

diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index d4a248e..bd620f0 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -67,7 +67,7 @@ class Plugin(QtCore.QObject):
         self.logger.info('loading')
         self._load()
         opts = QtGui.QDockWidget.DockWidgetClosable|QtGui.QDockWidget.DockWidgetMovable
-        QtGui.QApplication.instance().main_win.addDock(self.get_dock_widget(opts))
+        QtGui.QApplication.instance().main_win.add_dock(self.get_dock_widget(opts))
         QtGui.QApplication.instance().main_win.restore_layout()
         self.connect(self.mpclient, QtCore.SIGNAL('connect_changed'), self.set_enabled)
         self._loaded = True
@@ -78,7 +78,7 @@ class Plugin(QtCore.QObject):
         self._unload()
         dock_widget = self.get_dock_widget()
         if dock_widget:
-            QtGui.QApplication.instance().main_win.removeDock(dock_widget)
+            QtGui.QApplication.instance().main_win.remove_dock(dock_widget)
         self._dock_widget     = None
         self._settingsWidget = None
         self.disconnect(self.mpclient, QtCore.SIGNAL('connect_changed'), self.set_enabled)
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 7a59dd5..024bd8f 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -32,7 +32,7 @@ class winMain(QtGui.QMainWindow):
     " menus"
     mConnect    = None
     mDisconnect = None
-    mLayout     = None
+    __layout_menu     = None
 
     wConnect  = None
 
@@ -86,15 +86,15 @@ class winMain(QtGui.QMainWindow):
         m.addAction("Settings", QtGui.QApplication.instance().show_settings_win).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
 
         # menu layout
-        self.mLayout=mBar.addMenu("Layout")
-        self.mLayout.setTearOffEnabled(True)
+        self.__layout_menu=mBar.addMenu("Layout")
+        self.__layout_menu.setTearOffEnabled(True)
 
         # create a toolbar for the main menu
         menu_toolbar = QtGui.QToolBar('Main menu', self)
         menu_toolbar.addWidget(mBar)
         self.addToolBar(QtCore.Qt.TopToolBarArea, menu_toolbar)
 
-        self.updateLayoutMenu()
+        self.__update_layout_menu()
         self.setDockOptions(QtGui.QMainWindow.AllowNestedDocks \
                 |QtGui.QMainWindow.AllowTabbedDocks \
                 |QtGui.QMainWindow.VerticalTabs)
@@ -115,25 +115,26 @@ class winMain(QtGui.QMainWindow):
     def on_quit(self):
         self.settings.setValue('geometry', QVariant(self.saveGeometry()))
 
-    def updateLayoutMenu(self):
-        self.mLayout.clear()
-        self.mLayout.addAction('Save layout', self.saveLayout)
-        self.mLayout.addAction('Restore layout', self.restore_layout)
-        self.mLayout.addSeparator()
+    def __update_layout_menu(self):
+        self.__layout_menu.clear()
+        self.__layout_menu.addAction('Save layout', self.save_layout)
+        self.__layout_menu.addAction('Restore layout', self.restore_layout)
+        self.__layout_menu.addSeparator()
         # create checkable menu
-        a=QtGui.QAction('Show titlebars', self)
+        a = QtGui.QAction('Show titlebars', self)
         a.setCheckable(True)
         a.setChecked(self.settings.value('show_titlebars', QVariant(True)).toBool())
-        self.toggleTitleBars(a.isChecked())
-        self.connect(a, QtCore.SIGNAL('toggled(bool)'), self.toggleTitleBars)
-        self.mLayout.addAction(a)
-        self.mLayout.addSeparator()
-        # can not use iterators, as that gives some creepy error 'bout c++
-        actions=self.createPopupMenu().actions()
-        for i in xrange(len(actions)):
-            self.mLayout.addAction(actions[i])
-
-    def toggleTitleBars(self, val):
+        self.__toggle_titlebars(a.isChecked())
+        self.connect(a, QtCore.SIGNAL('toggled(bool)'), self.__toggle_titlebars)
+        self.__layout_menu.addAction(a)
+        self.__layout_menu.addSeparator()
+
+        m = self.createPopupMenu()
+        if m:
+           for action in m.actions():
+            self.__layout_menu.addAction(action)
+
+    def __toggle_titlebars(self, val):
         if val:
             self.settings.setValue('show_titlebars', QVariant(True))
         else:
@@ -143,45 +144,24 @@ class winMain(QtGui.QMainWindow):
                 dock.setTitleBarWidget(None)
             else:
                 dock.setTitleBarWidget(QtGui.QWidget())
-    def addDock(self, dock):
+    def add_dock(self, dock):
         if dock:
             self.docks.append(dock)
             self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock)
-            self.updateLayoutMenu()
-    def removeDock(self, dock):
+            self.__update_layout_menu()
+    def remove_dock(self, dock):
         if dock:
             if dock in self.docks:
                 self.docks.remove(dock)
             self.removeDockWidget(dock)
-            self.updateLayoutMenu()
-
-    mMenuVisible=None
-    def createPopupMenu(self):
-        ret=QtGui.QMenu('Test', self)
-        if self.mMenuVisible==None:
-            # create checkable menu
-            a=QtGui.QAction('Menubar', self)
-            a.setCheckable(True)
-            a.setChecked(True)
-            self.connect(a, QtCore.SIGNAL('toggled(bool)'), self.switchMenubar)
-
-            self.mMenuVisible=a
-        ret.addAction(self.mMenuVisible)
-        ret.addSeparator()
-        menu = QtGui.QMainWindow.createPopupMenu(self)
-        if menu:
-            actions = menu.actions()
-            for i in xrange(len(actions)-1):
-                ret.addAction(actions[i])
-        return ret
-    def switchMenubar(self, val):
-        self.menuBar().setVisible(val)
+            self.__update_layout_menu()
+
     def setStatus(self, status):
         """Set the text of the statusbar."""
         self.statusBar().showMessage(status, 5000)
         logging.info(status)
 
-    def saveLayout(self):
+    def save_layout(self):
         self.settings.setValue('layout', QVariant(self.saveState()))
     def restore_layout(self):
         layout = self.settings.value('layout').toByteArray()