diff options
Diffstat (limited to 'nephilim/main_window.py')
| -rw-r--r-- | nephilim/main_window.py | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/nephilim/main_window.py b/nephilim/main_window.py index 8f3377b..441d65f 100644 --- a/nephilim/main_window.py +++ b/nephilim/main_window.py @@ -16,15 +16,15 @@ # along with Nephilim. If not, see <http://www.gnu.org/licenses/>. # -from PyQt4 import QtGui, QtCore -from PyQt4.QtCore import pyqtSlot as Slot +from PyQt5 import QtGui, QtWidgets, QtCore +from PyQt5.QtCore import pyqtSlot as Slot import logging from common import APPNAME, sec2min, appIcon import icons import data -class MainWindow(QtGui.QMainWindow): +class MainWindow(QtWidgets.QMainWindow): """ Application's main window class. """ @@ -43,15 +43,16 @@ class MainWindow(QtGui.QMainWindow): __docks = [] def __init__(self, mpclient): - QtGui.QMainWindow.__init__(self) + QtWidgets.QMainWindow.__init__(self) + self.settings = QtCore.QSettings() self.mpclient = mpclient # statusbar self.statusBar() - self.__statuslabel = QtGui.QLabel() - self.__time_slider = QtGui.QSlider(QtCore.Qt.Horizontal, self) + self.__statuslabel = QtWidgets.QLabel() + self.__time_slider = QtWidgets.QSlider(QtCore.Qt.Horizontal, self) self.__time_slider.setMaximumWidth(self.width()/4) self.__time_slider.sliderReleased.connect( self.__on___time_slider_change) self.__time_label = TimeLabel(self, mpclient) @@ -61,11 +62,11 @@ class MainWindow(QtGui.QMainWindow): self.statusBar().addPermanentWidget(self.__time_label) self.statusBar().addPermanentWidget(self.__time_slider) - mBar = QtGui.QMenuBar() # create a menubar + mBar = QtWidgets.QMenuBar() # create a menubar # Server menu m = mBar.addMenu('&Server') # connect - self.mConnect=m.addAction('&Connect.', QtGui.QApplication.instance().show_connect_win) + self.mConnect=m.addAction('&Connect.', QtWidgets.QApplication.instance().show_connect_win) self.mConnect.setIcon(QtGui.QIcon(appIcon)) # disconnect self.mDisconnect=m.addAction('&Disconnect', self.mpclient.disconnect_mpd) @@ -77,25 +78,23 @@ class MainWindow(QtGui.QMainWindow): 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", QtWidgets.QApplication.instance().quit).setIcon(QtGui.QIcon(':icons/gtk-quit.svg')) # menu options m=mBar.addMenu("Options") # settings - m.addAction("Settings", QtGui.QApplication.instance().show_settings_win).setIcon(QtGui.QIcon(':icons/gtk-preferences.svg')) + m.addAction("Settings", QtWidgets.QApplication.instance().show_settings_win).setIcon(QtGui.QIcon(':icons/gtk-preferences.svg')) # menu layout self.__layout_menu=mBar.addMenu("Layout") # create a toolbar for the main menu - menu_toolbar = QtGui.QToolBar('Main menu', self) + menu_toolbar = QtWidgets.QToolBar('Main menu', self) menu_toolbar.addWidget(mBar) self.addToolBar(QtCore.Qt.TopToolBarArea, menu_toolbar) self.__update_layout_menu() - self.setDockOptions(QtGui.QMainWindow.AllowNestedDocks \ - |QtGui.QMainWindow.AllowTabbedDocks \ - |QtGui.QMainWindow.VerticalTabs) + self.setDockOptions(self.AllowNestedDocks | self .AllowTabbedDocks | self.VerticalTabs) self.setDockNestingEnabled(True) self.restoreGeometry(self.settings.value('geometry', QtCore.QByteArray())) @@ -116,7 +115,7 @@ class MainWindow(QtGui.QMainWindow): self.__layout_menu.addAction('Restore layout', self.restore_layout) self.__layout_menu.addSeparator() # create checkable menu - a = QtGui.QAction('Show titlebars', self) + a = QtWidgets.QAction('Show titlebars', self) a.setCheckable(True) a.setChecked(int(self.settings.value('show_titlebars', 1))) self.__toggle_titlebars(a.isChecked()) @@ -138,7 +137,7 @@ class MainWindow(QtGui.QMainWindow): if val: dock.setTitleBarWidget(None) else: - dock.setTitleBarWidget(QtGui.QWidget()) + dock.setTitleBarWidget(QtWidgets.QWidget()) def add_dock(self, dock): if dock: self.__docks.append(dock) @@ -195,12 +194,12 @@ class MainWindow(QtGui.QMainWindow): if not self.__time_slider.isSliderDown(): self.__time_slider.setValue(new_time) -class TimeLabel(QtGui.QLabel): +class TimeLabel(QtWidgets.QLabel): _mpclient = None def __init__(self, parent, mpclient): - QtGui.QLabel.__init__(self, parent) + QtWidgets.QLabel.__init__(self, parent) self._mpclient = mpclient |