openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Diff comments:

> === modified file 'openlp/core/ui/advancedtab.py'
> --- openlp/core/ui/advancedtab.py	2016-04-05 17:30:20 +0000
> +++ openlp/core/ui/advancedtab.py	2016-04-12 13:30:46 +0000
> @@ -273,15 +273,15 @@
>          self.tab_title_visible = UiStrings().Advanced
>          self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
>          self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
> -        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
> +        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))
>          self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                      'Remember active media manager tab on startup'))
> +                                                      'Open the last used library category on startup'))
>          self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
>                                                             'Double-click to send items straight to live'))
>          self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                              'Preview items when clicked in Media Manager'))
> +                                                              'Preview items when clicked in library'))

I agree with you.  Things should be capitals.

>          self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                                      'Preview items when clicked in Service Manager'))
> +                                                                      'Preview items when clicked in service'))
>          self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
>                                                               'Expand new service items on creation'))
>          self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
> 
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py	2016-04-04 19:53:54 +0000
> +++ openlp/core/ui/mainwindow.py	2016-04-12 13:30:46 +0000
> @@ -416,7 +416,7 @@
>          self.print_service_order_item.setText(UiStrings().PrintService)
>          self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.'))
>          self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit'))
> -        self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP'))
> +        self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Close OpenLP - Shut down the program.'))

Ah me bad thought it was the button text.  No issue then!

>          self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
>          self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language'))
>          self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
> @@ -425,41 +425,42 @@
>          self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...'))
>          self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...'))
>          self.settings_export_item.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file'))
> +            translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
>          self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
>          self.settings_import_item.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously '
> -                                           'exported on this or another machine'))
> +            translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
> +                                           'this or an another machine.'))
>          self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
> -        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager'))
> -        self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager'))
> +        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))
> +        self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
>          self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                                'Toggle the visibility of the Projector Manager'))
> -        self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager'))
> -        self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager'))
> +                                                                'Toggle the visibility of the Projectors.'))
> +        self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
> +        self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
>          self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                  'Toggle the visibility of the media manager.'))
> -        self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager'))
> -        self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
> +                                                  'Toggle the visibility of the Library.'))
> +        self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
> +        self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes'))
>          self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                  'Toggle the visibility of the theme manager.'))
> -        self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager'))
> -        self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager'))
> +                                                  'Toggle the visibility of the Themes.'))
> +        self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
> +        self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
>          self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                    'Toggle the visibility of the service manager.'))
> -        self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel'))
> -        self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
> +                                                    'Toggle the visibility of the Service.'))
> +        self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
> +        self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
>          self.view_preview_panel.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.'))
> -        self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel'))
> -        self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel'))
> -        self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels'))
> -        self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.'))
> -        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.'))
> +            translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))
> +        self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))

4 is 3 too many so that needs to be sorted.  Ok with the change then

> +        self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
> +        self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
> +        self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
> +        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))
>          self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
> -        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins'))
> +        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
> +                                                                                   'from here.'))
>          self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
> -        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP'))
> +        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
>          if is_win() or is_macosx():
>              self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide'))
>          self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help'))
> 
> === modified file 'openlp/plugins/presentations/presentationplugin.py'
> --- openlp/plugins/presentations/presentationplugin.py	2016-01-08 13:47:52 +0000
> +++ openlp/plugins/presentations/presentationplugin.py	2016-04-12 13:30:46 +0000
> @@ -40,8 +40,8 @@
>                          'presentations/enable_pdf_program': QtCore.Qt.Unchecked,
>                          'presentations/pdf_program': '',
>                          'presentations/Impress': QtCore.Qt.Checked,
> -                        'presentations/Powerpoint': QtCore.Qt.Checked,

Nervious on this and do not have windows.  Would prefer it to be a separate issue.
Settings.py manages settings across the whole app.  You are changing the input.  What you are doing is added a new setting and not copying the old values across and deleting the old setting.

> -                        'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
> +                        'presentations/PowerPoint': QtCore.Qt.Checked,
> +                        'presentations/PowerPoint Viewer': QtCore.Qt.Checked,
>                          'presentations/Pdf': QtCore.Qt.Checked,
>                          'presentations/presentations files': [],
>                          'presentations/thumbnail_scheme': '',


-- 
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628
Your team OpenLP Core is subscribed to branch lp:openlp.