From b7494bfb2e3e4b2736a2d549e24989f8831e44a0 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Mon, 1 Jan 2018 20:23:40 +0100 Subject: Cleanup: Rename preferences ui file names according the standard Signed-off-by: Stefan Fuchs --- desktop-widgets/preferences/CMakeLists.txt | 4 +- .../preferences/preferences_georeference.cpp | 2 +- .../preferences/preferences_georeference.ui | 93 +++++++ .../preferences/preferences_language.cpp | 2 +- .../preferences/preferences_language.ui | 272 +++++++++++++++++++++ desktop-widgets/preferences/prefs_georeference.ui | 93 ------- desktop-widgets/preferences/prefs_language.ui | 272 --------------------- 7 files changed, 369 insertions(+), 369 deletions(-) create mode 100644 desktop-widgets/preferences/preferences_georeference.ui create mode 100644 desktop-widgets/preferences/preferences_language.ui delete mode 100644 desktop-widgets/preferences/prefs_georeference.ui delete mode 100644 desktop-widgets/preferences/prefs_language.ui (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/CMakeLists.txt b/desktop-widgets/preferences/CMakeLists.txt index 7a934a2a5..01b6b906b 100644 --- a/desktop-widgets/preferences/CMakeLists.txt +++ b/desktop-widgets/preferences/CMakeLists.txt @@ -9,8 +9,8 @@ set(SUBSURFACE_PREFERENCES_UI preferences_graph.ui preferences_network.ui preferences_units.ui - prefs_georeference.ui - prefs_language.ui + preferences_georeference.ui + preferences_language.ui ) qt5_wrap_ui(SUBSURFACE_PREFERENCES_UI_HDRS ${SUBSURFACE_PREFERENCES_UI}) diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp index 314a37c94..a0a72dbd3 100644 --- a/desktop-widgets/preferences/preferences_georeference.cpp +++ b/desktop-widgets/preferences/preferences_georeference.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_georeference.h" -#include "ui_prefs_georeference.h" +#include "ui_preferences_georeference.h" #include "core/prefs-macros.h" #include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" diff --git a/desktop-widgets/preferences/preferences_georeference.ui b/desktop-widgets/preferences/preferences_georeference.ui new file mode 100644 index 000000000..e3e7fe4c7 --- /dev/null +++ b/desktop-widgets/preferences/preferences_georeference.ui @@ -0,0 +1,93 @@ + + + PreferencesGeoreference + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + Dive site layout + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + / + + + + + + + + 0 + 0 + + + + + + + + / + + + + + + + + 0 + 0 + + + + + + + + + + + Qt::Vertical + + + + 20 + 109 + + + + + + + + + diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index 687be1399..0738392a5 100644 --- a/desktop-widgets/preferences/preferences_language.cpp +++ b/desktop-widgets/preferences/preferences_language.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_language.h" -#include "ui_prefs_language.h" +#include "ui_preferences_language.h" #include "core/helpers.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" diff --git a/desktop-widgets/preferences/preferences_language.ui b/desktop-widgets/preferences/preferences_language.ui new file mode 100644 index 000000000..b51dd083f --- /dev/null +++ b/desktop-widgets/preferences/preferences_language.ui @@ -0,0 +1,272 @@ + + + PreferencesLanguage + + + + 0 + 0 + 621 + 523 + + + + Form + + + + + + + 0 + 0 + + + + UI language + + + + + + Use system default + + + + + + + + + + Qt::Horizontal + + + + 203 + 20 + + + + + + + + Filter + + + + + + + + + + + + + + 0 + 0 + + + + Date format + + + + + + Use UI language default + + + + + + + + + + This is used in places where there is less space to show the full date + + + Short format + + + + + + + Qt::Horizontal + + + + 203 + 20 + + + + + + + + <html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html> + + + true + + + + + + + + + + + 0 + 0 + + + + Time format + + + + + + Use UI language default + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html> + + + true + + + + + + + Qt::Horizontal + + + + 203 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + + + languageSystemDefault + toggled(bool) + languageDropdown + setDisabled(bool) + + + 73 + 273 + + + 179 + 273 + + + + + languageSystemDefault + toggled(bool) + languageFilter + setDisabled(bool) + + + 73 + 273 + + + 539 + 273 + + + + + dateFormatSystemDefault + toggled(bool) + shortDateFormatEntry + setDisabled(bool) + + + 99 + 132 + + + 293 + 169 + + + + + dateFormatSystemDefault + toggled(bool) + dateFormatEntry + setDisabled(bool) + + + 89 + 103 + + + 273 + 103 + + + + + timeFormatSystemDefault + toggled(bool) + timeFormatEntry + setDisabled(bool) + + + 89 + 190 + + + 273 + 190 + + + + + diff --git a/desktop-widgets/preferences/prefs_georeference.ui b/desktop-widgets/preferences/prefs_georeference.ui deleted file mode 100644 index e3e7fe4c7..000000000 --- a/desktop-widgets/preferences/prefs_georeference.ui +++ /dev/null @@ -1,93 +0,0 @@ - - - PreferencesGeoreference - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - Dive site layout - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - / - - - - - - - - 0 - 0 - - - - - - - - / - - - - - - - - 0 - 0 - - - - - - - - - - - Qt::Vertical - - - - 20 - 109 - - - - - - - - - diff --git a/desktop-widgets/preferences/prefs_language.ui b/desktop-widgets/preferences/prefs_language.ui deleted file mode 100644 index b51dd083f..000000000 --- a/desktop-widgets/preferences/prefs_language.ui +++ /dev/null @@ -1,272 +0,0 @@ - - - PreferencesLanguage - - - - 0 - 0 - 621 - 523 - - - - Form - - - - - - - 0 - 0 - - - - UI language - - - - - - Use system default - - - - - - - - - - Qt::Horizontal - - - - 203 - 20 - - - - - - - - Filter - - - - - - - - - - - - - - 0 - 0 - - - - Date format - - - - - - Use UI language default - - - - - - - - - - This is used in places where there is less space to show the full date - - - Short format - - - - - - - Qt::Horizontal - - - - 203 - 20 - - - - - - - - <html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html> - - - true - - - - - - - - - - - 0 - 0 - - - - Time format - - - - - - Use UI language default - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html> - - - true - - - - - - - Qt::Horizontal - - - - 203 - 20 - - - - - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - languageSystemDefault - toggled(bool) - languageDropdown - setDisabled(bool) - - - 73 - 273 - - - 179 - 273 - - - - - languageSystemDefault - toggled(bool) - languageFilter - setDisabled(bool) - - - 73 - 273 - - - 539 - 273 - - - - - dateFormatSystemDefault - toggled(bool) - shortDateFormatEntry - setDisabled(bool) - - - 99 - 132 - - - 293 - 169 - - - - - dateFormatSystemDefault - toggled(bool) - dateFormatEntry - setDisabled(bool) - - - 89 - 103 - - - 273 - 103 - - - - - timeFormatSystemDefault - toggled(bool) - timeFormatEntry - setDisabled(bool) - - - 89 - 190 - - - 273 - 190 - - - - - -- cgit v1.2.3-70-g09d2