From 07096fbc4cb7ab38bc2cf1058879b44fb35719dd Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 21 Jun 2009 12:57:04 +0200 Subject: winMain: mark some more vars private. --- nephilim/winMain.py | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'nephilim') diff --git a/nephilim/winMain.py b/nephilim/winMain.py index 024bd8f..61d5948 100644 --- a/nephilim/winMain.py +++ b/nephilim/winMain.py @@ -27,8 +27,8 @@ DEFAULT_LAYOUT_FILE = 'default_layout' class winMain(QtGui.QMainWindow): """The winMain class is mpc's main window, showing the playlists and control-interface""" - docks = [] - + mpclient = None + settings = None " menus" mConnect = None mDisconnect = None @@ -36,13 +36,13 @@ class winMain(QtGui.QMainWindow): wConnect = None - mpclient = None - settings = None # Statusbar objects - statuslabel = None - time_slider = None - time_label = None + __statuslabel = None + __time_slider = None + __time_label = None + + __docks = [] def __init__(self, mpclient): QtGui.QWidget.__init__(self) @@ -53,16 +53,16 @@ class winMain(QtGui.QMainWindow): # statusbar self.statusBar() - self.statuslabel = QtGui.QLabel() - self.time_slider = QtGui.QSlider(QtCore.Qt.Horizontal, self) - self.time_slider.setMaximumWidth(self.width()/4) - self.connect(self.time_slider, QtCore.SIGNAL('sliderReleased()'), self.__on_time_slider_change) - self.time_label = QtGui.QLabel() - self.time_label.duration = '0:00' + self.__statuslabel = QtGui.QLabel() + self.__time_slider = QtGui.QSlider(QtCore.Qt.Horizontal, self) + self.__time_slider.setMaximumWidth(self.width()/4) + self.connect(self.__time_slider, QtCore.SIGNAL('sliderReleased()'), self.__on___time_slider_change) + self.__time_label = QtGui.QLabel() + self.__time_label.duration = '0:00' - self.statusBar().addWidget(self.statuslabel) - self.statusBar().addPermanentWidget(self.time_label) - self.statusBar().addPermanentWidget(self.time_slider) + self.statusBar().addWidget(self.__statuslabel) + self.statusBar().addPermanentWidget(self.__time_label) + self.statusBar().addPermanentWidget(self.__time_slider) mBar = QtGui.QMenuBar() # create a menubar # File menu @@ -139,20 +139,20 @@ class winMain(QtGui.QMainWindow): self.settings.setValue('show_titlebars', QVariant(True)) else: self.settings.setValue('show_titlebars', QVariant(False)) - for dock in self.docks: + for dock in self.__docks: if val: dock.setTitleBarWidget(None) else: dock.setTitleBarWidget(QtGui.QWidget()) def add_dock(self, dock): if dock: - self.docks.append(dock) + self.__docks.append(dock) self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock) self.__update_layout_menu() def remove_dock(self, dock): if dock: - if dock in self.docks: - self.docks.remove(dock) + if dock in self.__docks: + self.__docks.remove(dock) self.removeDockWidget(dock) self.__update_layout_menu() @@ -189,22 +189,22 @@ class winMain(QtGui.QMainWindow): state = 'playing' if state == 'play' else 'paused' if state == 'pause' else 'stopped' if song: self.setWindowTitle('%s by %s - %s [%s]'%(song.title(), song.artist(), APPNAME, state)) - self.statuslabel.setText('%s by %s on %s [%s]'%(song.title(), song.artist(),song.album(), state)) + self.__statuslabel.setText('%s by %s on %s [%s]'%(song.title(), song.artist(),song.album(), state)) else: self.setWindowTitle(APPNAME) - self.statuslabel.setText('') + self.__statuslabel.setText('') - def __on_time_slider_change(self): - self.mpclient.seek(self.time_slider.value()) + def __on___time_slider_change(self): + self.mpclient.seek(self.__time_slider.value()) def __on_song_change(self): status = self.mpclient.status() - self.time_slider.setMaximum(status['length']) - self.time_slider.setEnabled(True) - self.time_label.duration = sec2min(status['length']) + self.__time_slider.setMaximum(status['length']) + self.__time_slider.setEnabled(True) + self.__time_label.duration = sec2min(status['length']) self.__update_state_messages() def __on_time_change(self, new_time): - if not self.time_slider.isSliderDown(): - self.time_slider.setValue(new_time) - self.time_label.setText(sec2min(new_time) + '/' + self.time_label.duration) + if not self.__time_slider.isSliderDown(): + self.__time_slider.setValue(new_time) + self.__time_label.setText(sec2min(new_time) + '/' + self.__time_label.duration) -- cgit v1.2.3