From 9555954761bc695bf2557a756d3b5df50ab9e8ad Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Fri, 27 Aug 2010 19:52:42 +0200
Subject: main_window: add update/rescan action to server menu

also remove the now redundant update button from settings
---
 nephilim/main_window.py | 14 +++++++++-----
 nephilim/settings_wg.py | 11 -----------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/nephilim/main_window.py b/nephilim/main_window.py
index 67c8847..8f3377b 100644
--- a/nephilim/main_window.py
+++ b/nephilim/main_window.py
@@ -62,18 +62,22 @@ class MainWindow(QtGui.QMainWindow):
         self.statusBar().addPermanentWidget(self.__time_slider)
 
         mBar = QtGui.QMenuBar() # create a menubar
-        # File menu
-        m = mBar.addMenu("File")
+        # Server menu
+        m = mBar.addMenu('&Server')
         # connect
-        self.mConnect=m.addAction('Connect ...', QtGui.QApplication.instance().show_connect_win)
+        self.mConnect=m.addAction('&Connect.', QtGui.QApplication.instance().show_connect_win)
         self.mConnect.setIcon(QtGui.QIcon(appIcon))
         # disconnect
-        self.mDisconnect=m.addAction('Disconnect', self.mpclient.disconnect_mpd)
+        self.mDisconnect=m.addAction('&Disconnect', self.mpclient.disconnect_mpd)
         self.mDisconnect.setIcon(QtGui.QIcon(':icons/disconnect.png'))
         # separator
         m.addSeparator()
+        # update/rescan
+        m.addAction('&Update', self.mpclient.update_database)
+        m.addAction('&Rescan', self.mpclient.rescan_database)
+        m.addSeparator()
         # quit
-        m.addAction("Quit", QtGui.QApplication.instance().quit).setIcon(QtGui.QIcon(':icons/gtk-quit.svg'))
+        m.addAction("&Quit", QtGui.QApplication.instance().quit).setIcon(QtGui.QIcon(':icons/gtk-quit.svg'))
 
         # menu options
         m=mBar.addMenu("Options")
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index 2ea0f60..c1ae182 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -39,8 +39,6 @@ class SettingsWidget(QtGui.QWidget):
         port_txt = None
         pass_txt = None
         lib_txt  = None
-        update   = None
-        xfade    = None
 
         def __init__(self, mpclient):
             plugin.Plugin.SettingsWidget.__init__(self, None)
@@ -55,17 +53,11 @@ class SettingsWidget(QtGui.QWidget):
             self.lib_txt  = QtGui.QLineEdit(self.settings.value('music_dir', os.path.expanduser('~/music/')))
             self.settings.endGroup()
 
-            self.update = QtGui.QPushButton('Update MPD database')
-            self.update.clicked.connect(self.update_db)
-
-
-
             self.setLayout(QtGui.QVBoxLayout())
             self._add_widget(self.host_txt, 'Host', 'Host or socket to connect to')
             self._add_widget(self.port_txt, 'Port', 'Port to use (empty when using sockets)')
             self._add_widget(self.pass_txt, 'Password', 'Password')
             self._add_widget(self.lib_txt,  'Music library', 'Path to music library')
-            self.layout().addWidget(self.update)
 
         def save_settings(self):
             reconnect = False
@@ -88,9 +80,6 @@ class SettingsWidget(QtGui.QWidget):
                 self.mpclient.disconnect_mpd()
                 self.mpclient.connect_mpd(self.host_txt.text(), int(self.port_txt.text()), self.pass_txt.text())
 
-        def update_db(self):
-            self.mpclient.update_db()
-
     def __init__(self, mpclient, plugins):
         QtGui.QWidget.__init__(self, None, QtCore.Qt.Window)
         self.settings = QtCore.QSettings()
-- 
cgit v1.2.3