From 5156c66b26ae1141db29e806ce663022828872b4 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 9 Jan 2021 14:27:51 +0100 Subject: [PATCH] add warning if translation cannot be found (#99) * add warning if translation cannot be found * extract displaying message boxes to separate function --- src/advanced-scene-switcher.cpp | 19 +++++++++++++++++++ src/general.cpp | 9 ++------- src/headers/advanced-scene-switcher.hpp | 1 + src/switch-sequence.cpp | 9 ++------- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp index dcc5afca..0c389ef0 100644 --- a/src/advanced-scene-switcher.cpp +++ b/src/advanced-scene-switcher.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -28,8 +29,19 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent) loadUI(); } +bool translationAvailable() +{ + return !!strcmp(obs_module_text("AdvSceneSwitcher.pluginName"), + "AdvSceneSwitcher.pluginName"); +} + void AdvSceneSwitcher::loadUI() { + if (!translationAvailable()) { + DisplayMessage("Failed to find plug-in's 'data' directory.\n" + "Please check installation instructions!"); + } + #if __APPLE__ setMinimumHeight(700); #endif @@ -55,6 +67,13 @@ void AdvSceneSwitcher::loadUI() /******************************************************************************** * UI helpers ********************************************************************************/ +void AdvSceneSwitcher::DisplayMessage(QString msg) +{ + QMessageBox Msgbox; + Msgbox.setWindowTitle("Advanced Scene Switcher"); + Msgbox.setText(msg); + Msgbox.exec(); +} void addSelectionEntry(QComboBox *sel, const char *description, const char *tooltip = "") diff --git a/src/general.cpp b/src/general.cpp index a9bbb5ad..ed6c353e 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -1,5 +1,4 @@ #include -#include #include "headers/advanced-scene-switcher.hpp" #include "headers/utility.hpp" @@ -349,10 +348,8 @@ void AdvSceneSwitcher::on_importSettings_clicked() file.fileName().toUtf8().constData()); if (!obj) { - QMessageBox Msgbox; - Msgbox.setText(obs_module_text( + DisplayMessage(obs_module_text( "AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail")); - Msgbox.exec(); return; } @@ -373,10 +370,8 @@ void AdvSceneSwitcher::on_importSettings_clicked() obs_data_release(obj); - QMessageBox Msgbox; - Msgbox.setText(obs_module_text( + DisplayMessage(obs_module_text( "AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess")); - Msgbox.exec(); close(); } diff --git a/src/headers/advanced-scene-switcher.hpp b/src/headers/advanced-scene-switcher.hpp index 1b710cba..763121e8 100644 --- a/src/headers/advanced-scene-switcher.hpp +++ b/src/headers/advanced-scene-switcher.hpp @@ -56,6 +56,7 @@ public: void setupAudioTab(); void setTabOrder(); + void DisplayMessage(QString msg); static void populateSceneSelection(QComboBox *sel, bool addPrevious = false, bool addSelect = true); diff --git a/src/switch-sequence.cpp b/src/switch-sequence.cpp index eb1a1079..07035641 100644 --- a/src/switch-sequence.cpp +++ b/src/switch-sequence.cpp @@ -1,6 +1,5 @@ #include #include -#include #include "headers/advanced-scene-switcher.hpp" #include "headers/utility.hpp" @@ -126,10 +125,8 @@ void AdvSceneSwitcher::on_sceneSequenceLoad_clicked() file.fileName().toUtf8().constData()); if (!obj) { - QMessageBox Msgbox; - Msgbox.setText(obs_module_text( + DisplayMessage(obs_module_text( "AdvSceneSwitcher.sceneSequenceTab.loadFail")); - Msgbox.exec(); return; } @@ -146,10 +143,8 @@ void AdvSceneSwitcher::on_sceneSequenceLoad_clicked() obs_data_release(obj); - QMessageBox Msgbox; - Msgbox.setText(obs_module_text( + DisplayMessage(obs_module_text( "AdvSceneSwitcher.sceneSequenceTab.loadSuccess")); - Msgbox.exec(); close(); }