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 on 2016-08-11

- 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
1=== modified file 'openlp/core/ui/advancedtab.py'
2--- openlp/core/ui/advancedtab.py 2016-08-10 18:50:40 +0000
3+++ openlp/core/ui/advancedtab.py 2016-08-11 17:21:49 +0000
4@@ -257,7 +257,7 @@
5 self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
6 self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))
7 self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
8- 'Open the last used Library category on startup'))
9+ 'Open the last used Library tab on startup'))
10 self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
11 'Double-click to send items straight to Live'))
12 self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
13@@ -265,7 +265,7 @@
14 self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
15 'Preview items when clicked in Service'))
16 self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
17- 'Expand new Service items on creation'))
18+ 'Expand new service items on creation'))
19 self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
20 'Max height for non-text slides\nin slide controller:'))
21 self.slide_max_height_combo_box.setItemText(0, translate('OpenLP.AdvancedTab', 'Disabled'))
22
23=== modified file 'openlp/core/ui/exceptiondialog.py'
24--- openlp/core/ui/exceptiondialog.py 2016-05-10 11:13:41 +0000
25+++ openlp/core/ui/exceptiondialog.py 2016-08-11 17:21:49 +0000
26@@ -106,7 +106,7 @@
27 translate('OpenLP.ExceptionDialog', '{first_part}'
28 '<strong>No email app? </strong> You can <strong>save</strong> this '
29 'information to a <strong>file</strong> and<br>'
30- 'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
31+ 'send it from your <strong>mail on browser</strong> via an <strong>attachment.</strong><br><br>'
32 '<strong>Thank you<strong> for being part of making OpenLP better!<br>'
33 ).format(first_part=exception_part1))
34 self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
35
36=== modified file 'openlp/core/ui/exceptionform.py'
37--- openlp/core/ui/exceptionform.py 2016-08-10 18:31:33 +0000
38+++ openlp/core/ui/exceptionform.py 2016-08-11 17:21:49 +0000
39@@ -195,15 +195,20 @@
40 """
41 Update the minimum number of characters needed in the description.
42 """
43- count = int(20 - len(self.description_text_edit.toPlainText()))
44- if count < 0:
45- count = 0
46+ count = int(len(self.description_text_edit.toPlainText()))
47+ if count > 19:
48 self.__button_state(True)
49+ self.description_word_count.setText(
50+ translate('OpenLP.ExceptionDialog', '<strong>Thank you for your description!</strong>'))
51+ elif count == 0:
52+ self.__button_state(False)
53+ self.description_word_count.setText(
54+ translate('OpenLP.ExceptionDialog', '<strong>Tell us what you were doing when this happened.</strong>'))
55 else:
56 self.__button_state(False)
57- self.description_word_count.setText(
58- translate('OpenLP.ExceptionDialog', '{count} characters remaining from the minimum description.'
59- ).format(count=count))
60+ self.description_word_count.setText(
61+ translate('OpenLP.ExceptionDialog', '<strong>Please enter a more detailed description of the situation'
62+ ))
63
64 def on_attach_file_button_clicked(self):
65 """
66
67=== modified file 'openlp/core/ui/mainwindow.py'
68--- openlp/core/ui/mainwindow.py 2016-08-10 18:50:40 +0000
69+++ openlp/core/ui/mainwindow.py 2016-08-11 17:21:49 +0000
70@@ -429,13 +429,13 @@
71 translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
72 self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
73 self.settings_import_item.setStatusTip(
74- translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
75- 'this or an another machine.'))
76+ translate('OpenLP.MainWindow', 'Import settings from a *.config file previously exported from '
77+ 'this or another machine.'))
78 self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
79- self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))
80+ self.view_projector_manager_item.setText(translate('OpenLP.MainWindow', '&Projectors'))
81 self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
82 self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
83- 'Toggle the visibility of the Projectors.'))
84+ 'Toggle visibility of the Projectors.'))
85 self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
86 self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
87 self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
88@@ -443,22 +443,22 @@
89 self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
90 self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show themes'))
91 self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
92- 'Toggle the visibility of the Themes.'))
93+ 'Toggle visibility of the Themes.'))
94 self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
95 self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
96 self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
97- 'Toggle the visibility of the Service.'))
98+ 'Toggle visibility of the Service.'))
99 self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
100 self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
101 self.view_preview_panel.setStatusTip(
102- translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))
103+ translate('OpenLP.MainWindow', 'Toggle visibility of the Preview.'))
104 self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))
105 self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
106 self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
107 self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
108- self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))
109+ self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle visibility of the Live.'))
110 self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
111- self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
112+ self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can enable and disable plugins '
113 'from here.'))
114 self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
115 self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
116@@ -487,9 +487,9 @@
117 self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images'))
118 self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
119 'Update the preview images for all themes.'))
120- self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default'))
121- self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the '
122- 'default settings.'))
123+ self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Show all'))
124+ self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface back to the '
125+ 'default layout and show all the panels.'))
126 self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))
127 self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'
128 ' up the Service.'))
129@@ -954,7 +954,7 @@
130 self,
131 translate('OpenLP.MainWindow', 'Export Settings File'),
132 '',
133- translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))
134+ translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)'))
135 if not export_file_name:
136 return
137 # Make sure it's a .conf file.
138
139=== modified file 'openlp/plugins/media/lib/mediaitem.py'
140--- openlp/plugins/media/lib/mediaitem.py 2016-07-24 20:20:25 +0000
141+++ openlp/plugins/media/lib/mediaitem.py 2016-08-11 17:21:49 +0000
142@@ -133,7 +133,7 @@
143 disable_optical_button_text = True
144 optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
145 optical_button_tooltip = translate('MediaPlugin.MediaItem',
146- 'CD/DVD Playback is only supported if VLC is installed and enabled.')
147+ 'CD/DVD playback is only supported if VLC is installed and enabled.')
148 self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,
149 text=optical_button_text,
150 tooltip=optical_button_tooltip,
151
152=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
153--- openlp/plugins/presentations/lib/presentationtab.py 2016-07-24 20:20:25 +0000
154+++ openlp/plugins/presentations/lib/presentationtab.py 2016-08-11 17:21:49 +0000
155@@ -125,11 +125,11 @@
156 translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
157 self.ppt_slide_click_check_box.setText(
158 translate('PresentationPlugin.PresentationTab',
159- 'Clicking on current slide advances to the next effect'))
160+ 'Clicking on the current slide advances to the next effect'))
161 self.ppt_window_check_box.setText(
162 translate('PresentationPlugin.PresentationTab',
163 'Let PowerPoint control the size and monitor of the presentations\n'
164- '(This may fixes PowerPoint scaling issues in Windows 8 and 10)'))
165+ '(This may fix PowerPoint scaling issues in Windows 8 and 10)'))
166 self.pdf_program_check_box.setText(
167 translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
168