Merge lp:~suutari-olli/openlp/ui-messages-part-1-latest-commit into lp:openlp

Proposed by Azaziah
Status: Work in progress
Proposed branch: lp:~suutari-olli/openlp/ui-messages-part-1-latest-commit
Merge into: lp:openlp
Diff against target: 167 lines (+30/-25)
6 files modified
openlp/core/ui/advancedtab.py (+2/-2)
openlp/core/ui/exceptiondialog.py (+1/-1)
openlp/core/ui/exceptionform.py (+11/-6)
openlp/core/ui/mainwindow.py (+13/-13)
openlp/plugins/media/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
To merge this branch: bzr merge lp:~suutari-olli/openlp/ui-messages-part-1-latest-commit
Reviewer Review Type Date Requested Status
Tim Bentley Pending
Review via email: mp+302698@code.launchpad.net

This proposal supersedes a proposal from 2016-08-11.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Please stop changing remotes as I am deleting it.

I know it is not of your making but I needed to read the code a few times to work out what it was doing! Can we have it a bit more logical please.

Needs tests !

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal

"- This is the latest commit of the ui-messages-part-1
  branch which was merged recently,

for some reason the latest commit which included
the most recent fixes was not merged."

Please stop changing remotes as I am deleting it.

// I removed the changes to remotes in the last commit of the merged branch, but...

I know it is not of your making but I needed to read the code a few times to work out what it was doing! Can we have it a bit more logical please.

// I simplified it.

Needs tests !

//
This was supposed to be merged already in the ui-messages-part-1 branch,
but due to some weird error it was not.

I am unwilling write a new test just to get this last commit merged.

If I must write a new test I'm going to turn this into ui-messages-part-2
and change a lot of other things as well.

Unmerged revisions

2657. By Azaziah

- Simplified the expection desc. counter.
- Removed changes to remotes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2016-08-10 18:50:40 +0000
+++ openlp/core/ui/advancedtab.py 2016-08-11 17:21:49 +0000
@@ -257,7 +257,7 @@
257 self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))257 self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
258 self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))258 self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))
259 self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',259 self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
260 'Open the last used Library category on startup'))260 'Open the last used Library tab on startup'))
261 self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',261 self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
262 'Double-click to send items straight to Live'))262 'Double-click to send items straight to Live'))
263 self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',263 self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
@@ -265,7 +265,7 @@
265 self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',265 self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
266 'Preview items when clicked in Service'))266 'Preview items when clicked in Service'))
267 self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',267 self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
268 'Expand new Service items on creation'))268 'Expand new service items on creation'))
269 self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',269 self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
270 'Max height for non-text slides\nin slide controller:'))270 'Max height for non-text slides\nin slide controller:'))
271 self.slide_max_height_combo_box.setItemText(0, translate('OpenLP.AdvancedTab', 'Disabled'))271 self.slide_max_height_combo_box.setItemText(0, translate('OpenLP.AdvancedTab', 'Disabled'))
272272
=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py 2016-05-10 11:13:41 +0000
+++ openlp/core/ui/exceptiondialog.py 2016-08-11 17:21:49 +0000
@@ -106,7 +106,7 @@
106 translate('OpenLP.ExceptionDialog', '{first_part}'106 translate('OpenLP.ExceptionDialog', '{first_part}'
107 '<strong>No email app? </strong> You can <strong>save</strong> this '107 '<strong>No email app? </strong> You can <strong>save</strong> this '
108 'information to a <strong>file</strong> and<br>'108 'information to a <strong>file</strong> and<br>'
109 'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'109 'send it from your <strong>mail on browser</strong> via an <strong>attachment.</strong><br><br>'
110 '<strong>Thank you<strong> for being part of making OpenLP better!<br>'110 '<strong>Thank you<strong> for being part of making OpenLP better!<br>'
111 ).format(first_part=exception_part1))111 ).format(first_part=exception_part1))
112 self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))112 self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
113113
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2016-08-10 18:31:33 +0000
+++ openlp/core/ui/exceptionform.py 2016-08-11 17:21:49 +0000
@@ -195,15 +195,20 @@
195 """195 """
196 Update the minimum number of characters needed in the description.196 Update the minimum number of characters needed in the description.
197 """197 """
198 count = int(20 - len(self.description_text_edit.toPlainText()))198 count = int(len(self.description_text_edit.toPlainText()))
199 if count < 0:199 if count > 19:
200 count = 0
201 self.__button_state(True)200 self.__button_state(True)
201 self.description_word_count.setText(
202 translate('OpenLP.ExceptionDialog', '<strong>Thank you for your description!</strong>'))
203 elif count == 0:
204 self.__button_state(False)
205 self.description_word_count.setText(
206 translate('OpenLP.ExceptionDialog', '<strong>Tell us what you were doing when this happened.</strong>'))
202 else:207 else:
203 self.__button_state(False)208 self.__button_state(False)
204 self.description_word_count.setText(209 self.description_word_count.setText(
205 translate('OpenLP.ExceptionDialog', '{count} characters remaining from the minimum description.'210 translate('OpenLP.ExceptionDialog', '<strong>Please enter a more detailed description of the situation'
206 ).format(count=count))211 ))
207212
208 def on_attach_file_button_clicked(self):213 def on_attach_file_button_clicked(self):
209 """214 """
210215
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2016-08-10 18:50:40 +0000
+++ openlp/core/ui/mainwindow.py 2016-08-11 17:21:49 +0000
@@ -429,13 +429,13 @@
429 translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))429 translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
430 self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))430 self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
431 self.settings_import_item.setStatusTip(431 self.settings_import_item.setStatusTip(
432 translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '432 translate('OpenLP.MainWindow', 'Import settings from a *.config file previously exported from '
433 'this or an another machine.'))433 'this or another machine.'))
434 self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))434 self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
435 self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))435 self.view_projector_manager_item.setText(translate('OpenLP.MainWindow', '&Projectors'))
436 self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))436 self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
437 self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',437 self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
438 'Toggle the visibility of the Projectors.'))438 'Toggle visibility of the Projectors.'))
439 self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))439 self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
440 self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))440 self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
441 self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',441 self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
@@ -443,22 +443,22 @@
443 self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))443 self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
444 self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show themes'))444 self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show themes'))
445 self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',445 self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
446 'Toggle the visibility of the Themes.'))446 'Toggle visibility of the Themes.'))
447 self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))447 self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
448 self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))448 self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
449 self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',449 self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
450 'Toggle the visibility of the Service.'))450 'Toggle visibility of the Service.'))
451 self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))451 self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
452 self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))452 self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
453 self.view_preview_panel.setStatusTip(453 self.view_preview_panel.setStatusTip(
454 translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))454 translate('OpenLP.MainWindow', 'Toggle visibility of the Preview.'))
455 self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))455 self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))
456 self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))456 self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
457 self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))457 self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
458 self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))458 self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
459 self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))459 self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle visibility of the Live.'))
460 self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))460 self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
461 self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'461 self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can enable and disable plugins '
462 'from here.'))462 'from here.'))
463 self.about_item.setText(translate('OpenLP.MainWindow', '&About'))463 self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
464 self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))464 self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
@@ -487,9 +487,9 @@
487 self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images'))487 self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images'))
488 self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',488 self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
489 'Update the preview images for all themes.'))489 'Update the preview images for all themes.'))
490 self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default'))490 self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Show all'))
491 self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the '491 self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface back to the '
492 'default settings.'))492 'default layout and show all the panels.'))
493 self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))493 self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))
494 self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'494 self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'
495 ' up the Service.'))495 ' up the Service.'))
@@ -954,7 +954,7 @@
954 self,954 self,
955 translate('OpenLP.MainWindow', 'Export Settings File'),955 translate('OpenLP.MainWindow', 'Export Settings File'),
956 '',956 '',
957 translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))957 translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)'))
958 if not export_file_name:958 if not export_file_name:
959 return959 return
960 # Make sure it's a .conf file.960 # Make sure it's a .conf file.
961961
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2016-07-24 20:20:25 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2016-08-11 17:21:49 +0000
@@ -133,7 +133,7 @@
133 disable_optical_button_text = True133 disable_optical_button_text = True
134 optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')134 optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
135 optical_button_tooltip = translate('MediaPlugin.MediaItem',135 optical_button_tooltip = translate('MediaPlugin.MediaItem',
136 'CD/DVD Playback is only supported if VLC is installed and enabled.')136 'CD/DVD playback is only supported if VLC is installed and enabled.')
137 self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,137 self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,
138 text=optical_button_text,138 text=optical_button_text,
139 tooltip=optical_button_tooltip,139 tooltip=optical_button_tooltip,
140140
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2016-07-24 20:20:25 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2016-08-11 17:21:49 +0000
@@ -125,11 +125,11 @@
125 translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))125 translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
126 self.ppt_slide_click_check_box.setText(126 self.ppt_slide_click_check_box.setText(
127 translate('PresentationPlugin.PresentationTab',127 translate('PresentationPlugin.PresentationTab',
128 'Clicking on current slide advances to the next effect'))128 'Clicking on the current slide advances to the next effect'))
129 self.ppt_window_check_box.setText(129 self.ppt_window_check_box.setText(
130 translate('PresentationPlugin.PresentationTab',130 translate('PresentationPlugin.PresentationTab',
131 'Let PowerPoint control the size and monitor of the presentations\n'131 'Let PowerPoint control the size and monitor of the presentations\n'
132 '(This may fixes PowerPoint scaling issues in Windows 8 and 10)'))132 '(This may fix PowerPoint scaling issues in Windows 8 and 10)'))
133 self.pdf_program_check_box.setText(133 self.pdf_program_check_box.setText(
134 translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))134 translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
135135