summaryrefslogtreecommitdiff
path: root/winMain.py
diff options
context:
space:
mode:
Diffstat (limited to 'winMain.py')
-rw-r--r--winMain.py40
1 files changed, 37 insertions, 3 deletions
diff --git a/winMain.py b/winMain.py
index 83a9c2f..c01d3ac 100644
--- a/winMain.py
+++ b/winMain.py
@@ -2,13 +2,14 @@ from PyQt4 import QtGui, QtCore, QtSvg
from traceback import print_exc
import time
import sys
+import copy
from misc import *
from clSettings import settings
from clMonty import monty
from winConnect import winConnect
-from winSettings import winSettings
+from winSettings import showSettingsWindow
from wgSongList import SongList
from wgPlaylist import Playlist
@@ -186,7 +187,9 @@ class winMain(QtGui.QMainWindow):
lstPlaylist=None
" control buttons"
- lstResize=None
+ " menus"
+ mConnect=None
+ mDisconnect=None
" system tray object"
sysTray=None
@@ -237,6 +240,34 @@ class winMain(QtGui.QMainWindow):
self.addDockWidget(QtCore.Qt.BottomDockWidgetArea, dockPlaylist)
self.statusBar() # create a statusbar
+ mBar=self.menuBar() # create a menubar
+ # menu file
+ m=mBar.addMenu("File")
+ m.setTearOffEnabled(True)
+ # connect
+ self.mConnect=m.addAction('Connect', monty.connect)
+ self.mConnect.setIcon(QtGui.QIcon('gfx/connect.png'))
+ # disconnect
+ self.mDisconnect=m.addAction('Disconnect', monty.disconnect)
+ self.mDisconnect.setIcon(QtGui.QIcon('gfx/disconnect.png'))
+ # separator
+ m.addSeparator()
+ # quit
+ m.addAction("Quit", QtCore.QCoreApplication.exit).setIcon(QtGui.QIcon('gfx/gtk-quit.svg'))
+
+ # menu options
+ m=mBar.addMenu("Options")
+ m.setTearOffEnabled(True)
+ # settings
+ m.addAction("Settings", showSettingsWindow).setIcon(QtGui.QIcon('gfx/gtk-preferences.svg'))
+
+ # menu docks
+ m=mBar.addMenu("Docks")
+ m.setTearOffEnabled(True)
+ # can not use iterators, as that gives some creepy error 'bout c++
+ for i in xrange(len(self.createPopupMenu().actions())-1):
+ m.addAction(self.createPopupMenu().actions()[i])
+
self.setDockOptions(QtGui.QMainWindow.AllowNestedDocks \
|QtGui.QMainWindow.AllowTabbedDocks \
|QtGui.QMainWindow.VerticalTabs)
@@ -270,7 +301,6 @@ class winMain(QtGui.QMainWindow):
doEvents()
-
def setStatus(self, status):
"""Set the text of the statusbar."""
self.statusBar().showMessage(status)
@@ -352,6 +382,8 @@ class winMain(QtGui.QMainWindow):
def onConnect(self, params):
self.setStatus('Restoring library and playlist ...')
+ self.mDisconnect.setEnabled(True)
+ self.mConnect.setEnabled(False)
doEvents()
def initialiseData(self):
@@ -375,6 +407,8 @@ class winMain(QtGui.QMainWindow):
def onDisconnect(self, params):
+ self.mDisconnect.setEnabled(False)
+ self.mConnect.setEnabled(True)
map(lambda o: o.setEnabled(False), self.controlObjects)
def fillPlaylist(self):