raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

removed dead code

Browse Source
This commit is contained in:
Andreas Preikschat 2013-05-09 21:38:57 +02:00
parent 4ee6d014ff
commit 32957eca0c
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openlp/core/ui/mainwindow.py
View File

@ -365,8 +365,7 @@ class Ui_MainWindow(object):
""" """
Set up the translation system Set up the translation system
""" """
main_window.mainTitle = UiStrings().OLPV2x main_window.setWindowTitle(UiStrings().OLPV2x)
main_window.setWindowTitle(main_window.mainTitle)
self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File')) self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File'))
self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import')) self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import'))
self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export'))
@ -498,7 +497,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.new_data_path = None self.new_data_path = None
self.copy_data = False self.copy_data = False
Settings().set_up_default_values() Settings().set_up_default_values()
self.service_not_saved = False
self.about_form = AboutForm(self) self.about_form = AboutForm(self)
self.media_controller = MediaController() self.media_controller = MediaController()
self.settings_form = SettingsForm(self) self.settings_form = SettingsForm(self)
@ -1076,42 +1074,20 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.live_controller.display.close() self.live_controller.display.close()
self.live_controller.display = None self.live_controller.display = None
def service_changed(self, reset=False, serviceName=None): def set_service_modified(self, modified, file_name):
"""
Hook to change the main window title when the service changes
``reset``
Shows if the service has been cleared or saved
``serviceName``
The name of the service (if it has one)
"""
if not serviceName:
service_name = u'(unsaved service)'
else:
service_name = serviceName
if reset:
self.service_not_saved = False
title = u'%s - %s' % (self.mainTitle, service_name)
else:
self.service_not_saved = True
title = u'%s - %s*' % (self.mainTitle, service_name)
self.setWindowTitle(title)
def set_service_modified(self, modified, fileName):
""" """
This method is called from the ServiceManager to set the title of the main window. This method is called from the ServiceManager to set the title of the main window.
``modified`` ``modified``
Whether or not this service has been modified. Whether or not this service has been modified.
``fileName`` ``file_name``
The file name of the service file. The file name of the service file.
""" """
if modified: if modified:
title = u'%s - %s*' % (self.mainTitle, fileName) title = u'%s - %s*' % (UiStrings().OLPV2x, file_name)
else: else:
title = u'%s - %s' % (self.mainTitle, fileName) title = u'%s - %s' % (UiStrings().OLPV2x, file_name)
self.setWindowTitle(title) self.setWindowTitle(title)
def show_status_message(self, message): def show_status_message(self, message):

6
tests/interfaces/openlp_core_ui/test_mainwindow.py
View File

@ -47,12 +47,12 @@ class TestMainWindow(TestCase):
Test if the search edit has focus after CTRL+F has been pressed. Test if the search edit has focus after CTRL+F has been pressed.
""" """
# GIVEN: Mocked widget. # GIVEN: Mocked widget.
mocked_current_widget = MagicMock() mocked_widget = MagicMock()
self.main_window.media_tool_box.currentWidget = mocked_current_widget self.main_window.media_tool_box.currentWidget.return_value = mocked_widget
# WHEN: Press the shortcut. # WHEN: Press the shortcut.
QtTest.QTest.keyPress(self.main_window, QtCore.Qt.Key_F, QtCore.Qt.ControlModifier) QtTest.QTest.keyPress(self.main_window, QtCore.Qt.Key_F, QtCore.Qt.ControlModifier)
QtTest.QTest.keyRelease(self.main_window, QtCore.Qt.Key_F, QtCore.Qt.ControlModifier) QtTest.QTest.keyRelease(self.main_window, QtCore.Qt.Key_F, QtCore.Qt.ControlModifier)
# THEN: The on_focus method should have been called. # THEN: The on_focus method should have been called.
mocked_current_widget.on_focus.assert_called_with() mocked_widget.on_focus.assert_called_with()