diff --git a/openlp/core/api/endpoint/controller.py b/openlp/core/api/endpoint/controller.py index 4e897f370..cf7153145 100644 --- a/openlp/core/api/endpoint/controller.py +++ b/openlp/core/api/endpoint/controller.py @@ -117,12 +117,11 @@ def controller_set(request): return {'results': {'success': True}} -@controller_endpoint.route('{action:next|previous}') +@controller_endpoint.route('{controller}/{action:next|previous}') @requires_auth def controller_direction(request, controller, action): """ Handles requests for setting service items in the slide controller -11 :param request: The http request object. :param controller: the controller slides forward or backward. :param action: the controller slides forward or backward. @@ -137,7 +136,7 @@ def controller_direction(request, controller, action): def controller_direction_api(request, controller, action): """ Handles requests for setting service items in the slide controller -11 + :param request: The http request object. :param controller: the controller slides forward or backward. :param action: the controller slides forward or backward. diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py index faa481455..1d8ce5f01 100644 --- a/openlp/core/ui/firsttimewizard.py +++ b/openlp/core/ui/firsttimewizard.py @@ -127,9 +127,6 @@ class UiFirstTimeWizard(object): self.media_check_box.setChecked(True) self.media_check_box.setObjectName('media_check_box') self.plugin_layout.addWidget(self.media_check_box) - self.remote_check_box = QtWidgets.QCheckBox(self.plugin_page) - self.remote_check_box.setObjectName('remote_check_box') - self.plugin_layout.addWidget(self.remote_check_box) self.song_usage_check_box = QtWidgets.QCheckBox(self.plugin_page) self.song_usage_check_box.setChecked(True) self.song_usage_check_box.setObjectName('song_usage_check_box') @@ -138,13 +135,6 @@ class UiFirstTimeWizard(object): self.alert_check_box.setChecked(True) self.alert_check_box.setObjectName('alert_check_box') self.plugin_layout.addWidget(self.alert_check_box) - self.projectors_check_box = QtWidgets.QCheckBox(self.plugin_page) - # If visibility setting for projector panel is True, check the box. - if Settings().value('projector/show after wizard'): - self.projectors_check_box.setChecked(True) - self.projectors_check_box.setObjectName('projectors_check_box') - self.projectors_check_box.clicked.connect(self.on_projectors_check_box_clicked) - self.plugin_layout.addWidget(self.projectors_check_box) first_time_wizard.setPage(FirstTimePage.Plugins, self.plugin_page) # The song samples page self.songs_page = QtWidgets.QWizardPage() @@ -256,13 +246,9 @@ class UiFirstTimeWizard(object): self.presentation_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Presentations – Show .ppt, .odp and .pdf files')) self.media_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Media – Playback of Audio and Video files')) - self.remote_check_box.setText(str(UiStrings().WebDownloadText)) self.song_usage_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Song Usage Monitor')) self.alert_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Alerts – Display informative messages while showing other slides')) - self.projectors_check_box.setText(translate('OpenLP.FirstTimeWizard', - 'Projector Controller – Control PJLink compatible projects on your' - ' network from OpenLP')) self.no_internet_page.setTitle(translate('OpenLP.FirstTimeWizard', 'No Internet Connection')) self.no_internet_page.setSubTitle( translate('OpenLP.FirstTimeWizard', 'Unable to detect an Internet connection.'))