From 1c19b51fda59a42602d4137dd4fe142ac12099c5 Mon Sep 17 00:00:00 2001 From: Alexander Shaduri Date: Wed, 22 May 2024 11:46:02 +0400 Subject: [PATCH] Moved application GUI source files to gui subdirectory. --- {src => data/doxygen}/doxy_main_page.h | 0 po/POTFILES.in | 14 ++-- po/cs.po | 74 +++++++++---------- src/CMakeLists.txt | 66 +---------------- src/gui/CMakeLists.txt | 70 ++++++++++++++++++ src/{ => gui}/gsc_about_dialog.cpp | 0 src/{ => gui}/gsc_about_dialog.h | 0 src/{ => gui}/gsc_add_device_window.cpp | 0 src/{ => gui}/gsc_add_device_window.h | 0 src/{ => gui}/gsc_executor_error_dialog.cpp | 0 src/{ => gui}/gsc_executor_error_dialog.h | 0 src/{ => gui}/gsc_executor_log_window.cpp | 0 src/{ => gui}/gsc_executor_log_window.h | 0 src/{ => gui}/gsc_info_window.cpp | 0 src/{ => gui}/gsc_info_window.h | 0 src/{ => gui}/gsc_init.cpp | 16 ++-- src/{ => gui}/gsc_init.h | 0 src/{ => gui}/gsc_main.cpp | 0 src/{ => gui}/gsc_main_window.cpp | 0 src/{ => gui}/gsc_main_window.h | 0 src/{ => gui}/gsc_main_window_iconview.h | 0 src/{ => gui}/gsc_preferences_window.cpp | 0 src/{ => gui}/gsc_preferences_window.h | 0 src/{ => gui}/gsc_startup_settings.h | 0 src/{ => gui}/gsc_text_window.h | 0 src/{ => gui}/gsc_winres.in.rc | 0 src/{ => gui}/gsmartcontrol.exe.in.manifest | 0 src/{ => gui}/ui/CMakeLists.txt | 0 src/{ => gui}/ui/gsc_about_dialog.glade | 0 src/{ => gui}/ui/gsc_add_device_window.glade | 0 .../ui/gsc_executor_log_window.glade | 0 src/{ => gui}/ui/gsc_info_window.glade | 0 src/{ => gui}/ui/gsc_main_window.glade | 0 src/{ => gui}/ui/gsc_preferences_window.glade | 0 src/{ => gui}/ui/gsc_text_window.glade | 0 35 files changed, 125 insertions(+), 115 deletions(-) rename {src => data/doxygen}/doxy_main_page.h (100%) create mode 100644 src/gui/CMakeLists.txt rename src/{ => gui}/gsc_about_dialog.cpp (100%) rename src/{ => gui}/gsc_about_dialog.h (100%) rename src/{ => gui}/gsc_add_device_window.cpp (100%) rename src/{ => gui}/gsc_add_device_window.h (100%) rename src/{ => gui}/gsc_executor_error_dialog.cpp (100%) rename src/{ => gui}/gsc_executor_error_dialog.h (100%) rename src/{ => gui}/gsc_executor_log_window.cpp (100%) rename src/{ => gui}/gsc_executor_log_window.h (100%) rename src/{ => gui}/gsc_info_window.cpp (100%) rename src/{ => gui}/gsc_info_window.h (100%) rename src/{ => gui}/gsc_init.cpp (98%) rename src/{ => gui}/gsc_init.h (100%) rename src/{ => gui}/gsc_main.cpp (100%) rename src/{ => gui}/gsc_main_window.cpp (100%) rename src/{ => gui}/gsc_main_window.h (100%) rename src/{ => gui}/gsc_main_window_iconview.h (100%) rename src/{ => gui}/gsc_preferences_window.cpp (100%) rename src/{ => gui}/gsc_preferences_window.h (100%) rename src/{ => gui}/gsc_startup_settings.h (100%) rename src/{ => gui}/gsc_text_window.h (100%) rename src/{ => gui}/gsc_winres.in.rc (100%) rename src/{ => gui}/gsmartcontrol.exe.in.manifest (100%) rename src/{ => gui}/ui/CMakeLists.txt (100%) rename src/{ => gui}/ui/gsc_about_dialog.glade (100%) rename src/{ => gui}/ui/gsc_add_device_window.glade (100%) rename src/{ => gui}/ui/gsc_executor_log_window.glade (100%) rename src/{ => gui}/ui/gsc_info_window.glade (100%) rename src/{ => gui}/ui/gsc_main_window.glade (100%) rename src/{ => gui}/ui/gsc_preferences_window.glade (100%) rename src/{ => gui}/ui/gsc_text_window.glade (100%) diff --git a/src/doxy_main_page.h b/data/doxygen/doxy_main_page.h similarity index 100% rename from src/doxy_main_page.h rename to data/doxygen/doxy_main_page.h diff --git a/po/POTFILES.in b/po/POTFILES.in index e0b99de..ec20832 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,12 +1,12 @@ src/hz/format_unit.h -src/ui/gsc_about_dialog.glade -src/ui/gsc_add_device_window.glade -src/ui/gsc_executor_log_window.glade -src/ui/gsc_info_window.glade -src/ui/gsc_main_window.glade -src/ui/gsc_preferences_window.glade -src/ui/gsc_text_window.glade +src/gui/ui/gsc_about_dialog.glade +src/gui/ui/gsc_add_device_window.glade +src/gui/ui/gsc_executor_log_window.glade +src/gui/ui/gsc_info_window.glade +src/gui/ui/gsc_main_window.glade +src/gui/ui/gsc_preferences_window.glade +src/gui/ui/gsc_text_window.glade src/gsc_add_device_window.cpp src/gsc_main_window.cpp diff --git a/po/cs.po b/po/cs.po index 7d6bfdf..300ca0b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -17,150 +17,150 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/ui/gsc_main_window.glade:70 +#: src/gui/ui/gsc_main_window.glade:70 msgid "Drive information:" msgstr "Informace o disku:" -#: src/ui/gsc_main_window.glade:85 +#: src/gui/ui/gsc_main_window.glade:85 msgid "Basic health check:" msgstr "Základní kontrola stavu:" -#: src/ui/gsc_main_window.glade:100 +#: src/gui/ui/gsc_main_window.glade:100 msgid "Model family:" msgstr "Řada modelu:" -#: src/ui/gsc_main_window.glade:195 +#: src/gui/ui/gsc_main_window.glade:195 msgid "enable smart (action-replaced text)" msgstr "Zapnout SMART" -#: src/ui/gsc_add_device_window.glade:29 +#: src/gui/ui/gsc_add_device_window.glade:29 msgid "Add Device - GSmartControl" msgstr "Přidat zařízení - GSmartControl" -#: src/ui/gsc_add_device_window.glade:51 +#: src/gui/ui/gsc_add_device_window.glade:51 msgid "The <a href=\"%1\">smartctl man page</a> contains information on what you can enter here." msgstr "<a href=\"%1\">smartctl man page</a> obsahuje informace o tom, co zde můžete zadat." -#: src/ui/gsc_add_device_window.glade:89 +#: src/gui/ui/gsc_add_device_window.glade:89 msgid "Browse..." msgstr "Procházet..." -#: src/ui/gsc_add_device_window.glade:112 +#: src/gui/ui/gsc_add_device_window.glade:112 msgid "Device type:" msgstr "Typ zařízení:" -#: src/ui/gsc_add_device_window.glade:124 +#: src/gui/ui/gsc_add_device_window.glade:124 msgid "Additional smartctl parameters" msgstr "Dodatečné paramentry smartctl" -#: src/ui/gsc_add_device_window.glade:126 +#: src/gui/ui/gsc_add_device_window.glade:126 msgid "Smartctl parameters:" msgstr "Paramentry smartctl:" -#: src/ui/gsc_add_device_window.glade:190 +#: src/gui/ui/gsc_add_device_window.glade:190 msgid "Note: To make this change permanent, you'll have to add the gsmartcontrol --add-device command line option to its shortcut." msgstr "Poznámka: Chcete-li tuto změnu provést trvale, musíte do terminálu přidat příkaz: gsmartcontrol --add-device." -#: src/ui/gsc_info_window.glade:52 +#: src/gui/ui/gsc_info_window.glade:52 msgid "Device Information - GSmartControl" msgstr "Informace o zařízení - GSmartControl" -#: src/ui/gsc_info_window.glade:175 +#: src/gui/ui/gsc_info_window.glade:175 msgid "_General" msgstr "_Obecné" -#: src/ui/gsc_info_window.glade:242 +#: src/gui/ui/gsc_info_window.glade:242 msgid "Attributes" msgstr "Atributy" -#: src/ui/gsc_info_window.glade:240 +#: src/gui/ui/gsc_info_window.glade:240 msgid "SMART Attributes" msgstr "Atributy SMARTu" -#: src/ui/gsc_info_window.glade:309 +#: src/gui/ui/gsc_info_window.glade:309 msgid "Drive Statistics" msgstr "Statistiky disku" -#: src/ui/gsc_info_window.glade:311 +#: src/gui/ui/gsc_info_window.glade:311 msgid "Statistics" msgstr "Statistiky" -#: src/ui/gsc_info_window.glade:338 +#: src/gui/ui/gsc_info_window.glade:338 msgid "Self-tests are built-in tests within the drive designed to recognize drive fault conditions. All self-tests are safe to user data. The tests can be performed during normal system operation, but will take longer to complete if the drive is not idle." msgstr "Selt-Testy jsou vestavěné testy jednotky určené k rozpoznání chybových stavů jednotky. Všechny Self-Testy jsou bezpečné, co se týče uživatelských dat. Testy lze provádět za běžného provozu systému, ale jejich dokončení bude trvat déle, pokud jednotka není v nečinnosti." -#: src/ui/gsc_info_window.glade:477 +#: src/gui/ui/gsc_info_window.glade:477 msgid "Test type: <" msgstr "Typ testu: <" -#: src/ui/gsc_info_window.glade:492 +#: src/gui/ui/gsc_info_window.glade:492 msgid "Choose a test type" msgstr "Vyberte typ testu" -#: src/ui/gsc_info_window.glade:396 +#: src/gui/ui/gsc_info_window.glade:396 msgid "Test progress" msgstr "Stav testu" -#: src/ui/gsc_info_window.glade:412 +#: src/gui/ui/gsc_info_window.glade:412 msgid "Abort the test" msgstr "Přeskočit test" -#: src/ui/gsc_info_window.glade:432 +#: src/gui/ui/gsc_info_window.glade:432 msgid "Test description" msgstr "Popis testu" -#: src/ui/gsc_info_window.glade:453 +#: src/gui/ui/gsc_info_window.glade:453 msgid "Perform selected test" msgstr "Spustit" -#: src/ui/gsc_info_window.glade:636 +#: src/gui/ui/gsc_info_window.glade:636 msgid "Self-Test Log" msgstr "Protokol Self-Testu" -#: src/ui/gsc_info_window.glade:741 +#: src/gui/ui/gsc_info_window.glade:741 msgid "Complete error log information" msgstr "Kompletní informace z protokolu o chybách" -#: src/ui/gsc_info_window.glade:784 +#: src/gui/ui/gsc_info_window.glade:784 msgid "SMART error log contains most recent non-trivial errors the hard drive has encountered" msgstr "Protokol chyb SMART neobsahuje triviální chyby, se kterými se pevný disk setkal." -#: src/ui/gsc_info_window.glade:786 +#: src/gui/ui/gsc_info_window.glade:786 msgid "Error Log" msgstr "Protokol chyb" -#: src/ui/gsc_info_window.glade:848 +#: src/gui/ui/gsc_info_window.glade:848 msgid "Current temperature and history" msgstr "Aktuální teplota a historie" -#: src/ui/gsc_info_window.glade:850 +#: src/gui/ui/gsc_info_window.glade:850 msgid "Temperature Log" msgstr "Teplota" -#: src/ui/gsc_info_window.glade:893 +#: src/gui/ui/gsc_info_window.glade:893 msgid "Capabilities" msgstr "Schopnosti" -#: src/ui/gsc_info_window.glade:850 +#: src/gui/ui/gsc_info_window.glade:850 msgid "Error Recovery" msgstr "Obnova Chyb" -#: src/ui/gsc_info_window.glade:958 +#: src/gui/ui/gsc_info_window.glade:958 msgid "Selective Self-Test Log" msgstr "Protokol Self-Testu" -#: src/ui/gsc_info_window.glade:991 +#: src/gui/ui/gsc_info_window.glade:991 msgid "Physical" msgstr "Fyzický" -#: src/ui/gsc_info_window.glade:1024 +#: src/gui/ui/gsc_info_window.glade:1024 msgid "Directory" msgstr "Umíštění" -#: src/ui/gsc_info_window.glade:1048 +#: src/gui/ui/gsc_info_window.glade:1048 msgid "Advanced parameters and logs" msgstr "Pokročilé paramentry a protokoly" -#: src/ui/gsc_info_window.glade:1050 +#: src/gui/ui/gsc_info_window.glade:1050 msgid "Advanced" msgstr "Pokročilé" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e417606..08ee213 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,75 +4,13 @@ # (C) 2021 Alexander Shaduri ############################################################################### -# gsmartcontrol binary -add_executable(gsmartcontrol WIN32) - -target_sources(gsmartcontrol PRIVATE - doxy_main_page.h - gsc_about_dialog.cpp - gsc_about_dialog.h - gsc_add_device_window.cpp - gsc_add_device_window.h - gsc_executor_error_dialog.cpp - gsc_executor_error_dialog.h - gsc_executor_log_window.cpp - gsc_executor_log_window.h - gsc_info_window.cpp - gsc_info_window.h - gsc_init.cpp - gsc_init.h - gsc_main.cpp - gsc_main_window.cpp - gsc_main_window.h - gsc_main_window_iconview.h - gsc_preferences_window.cpp - gsc_preferences_window.h - gsc_startup_settings.h - gsc_text_window.h - local_glibmm.h -) - -# Win32 resource file -if (WIN32) - configure_file("gsc_winres.in.rc" "${CMAKE_CURRENT_BINARY_DIR}/gsc_winres.rc" ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS) - file(COPY "${CMAKE_SOURCE_DIR}/data/gsmartcontrol.ico" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") # required by winres - target_sources(gsmartcontrol PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/gsc_winres.rc") -endif() - -# Win32 manifest -if (WIN32) - set(WINDOWS_ARCH "x86") # Needed for manifest .in file - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - set(WINDOWS_ARCH "amd64") - endif() - configure_file("gsmartcontrol.exe.in.manifest" "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest" - ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS) - - # We link the manifest into the binary instead of installing it. - # install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest" DESTINATION "${CMAKE_INSTALL_SBINDIR}/") - target_sources(gsmartcontrol PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest") -endif() - - -target_link_libraries(gsmartcontrol - PRIVATE - applib - app_gtkmm_interface - build_config -) - -if (WIN32) - install(TARGETS gsmartcontrol DESTINATION .) -else() - install(TARGETS gsmartcontrol DESTINATION "${CMAKE_INSTALL_SBINDIR}/") -endif() - add_subdirectory(build_config) + add_subdirectory(applib) +add_subdirectory(gui) add_subdirectory(hz) add_subdirectory(libdebug) add_subdirectory(rconfig) -add_subdirectory(ui) add_subdirectory(test_all) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt new file mode 100644 index 0000000..eb8ae7f --- /dev/null +++ b/src/gui/CMakeLists.txt @@ -0,0 +1,70 @@ +############################################################################### +# License: BSD Zero Clause License file +# Copyright: +# (C) 2021 - 2024 Alexander Shaduri +############################################################################### + +# gsmartcontrol binary +add_executable(gsmartcontrol WIN32) + +target_sources(gsmartcontrol PRIVATE + gsc_about_dialog.cpp + gsc_about_dialog.h + gsc_add_device_window.cpp + gsc_add_device_window.h + gsc_executor_error_dialog.cpp + gsc_executor_error_dialog.h + gsc_executor_log_window.cpp + gsc_executor_log_window.h + gsc_info_window.cpp + gsc_info_window.h + gsc_init.cpp + gsc_init.h + gsc_main.cpp + gsc_main_window.cpp + gsc_main_window.h + gsc_main_window_iconview.h + gsc_preferences_window.cpp + gsc_preferences_window.h + gsc_startup_settings.h + gsc_text_window.h +) + +# Win32 resource file +if (WIN32) + configure_file("gsc_winres.in.rc" "${CMAKE_CURRENT_BINARY_DIR}/gsc_winres.rc" ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS) + file(COPY "${CMAKE_SOURCE_DIR}/data/gsmartcontrol.ico" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") # required by winres + target_sources(gsmartcontrol PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/gsc_winres.rc") +endif() + +# Win32 manifest +if (WIN32) + set(WINDOWS_ARCH "x86") # Needed for manifest .in file + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(WINDOWS_ARCH "amd64") + endif() + configure_file("gsmartcontrol.exe.in.manifest" "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest" + ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS) + + # We link the manifest into the binary instead of installing it. + # install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest" DESTINATION "${CMAKE_INSTALL_SBINDIR}/") + target_sources(gsmartcontrol PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.exe.manifest") +endif() + + +target_link_libraries(gsmartcontrol + PRIVATE + applib + app_gtkmm_interface + build_config +) + +if (WIN32) + install(TARGETS gsmartcontrol DESTINATION .) +else() + install(TARGETS gsmartcontrol DESTINATION "${CMAKE_INSTALL_SBINDIR}/") +endif() + + +add_subdirectory(ui) + diff --git a/src/gsc_about_dialog.cpp b/src/gui/gsc_about_dialog.cpp similarity index 100% rename from src/gsc_about_dialog.cpp rename to src/gui/gsc_about_dialog.cpp diff --git a/src/gsc_about_dialog.h b/src/gui/gsc_about_dialog.h similarity index 100% rename from src/gsc_about_dialog.h rename to src/gui/gsc_about_dialog.h diff --git a/src/gsc_add_device_window.cpp b/src/gui/gsc_add_device_window.cpp similarity index 100% rename from src/gsc_add_device_window.cpp rename to src/gui/gsc_add_device_window.cpp diff --git a/src/gsc_add_device_window.h b/src/gui/gsc_add_device_window.h similarity index 100% rename from src/gsc_add_device_window.h rename to src/gui/gsc_add_device_window.h diff --git a/src/gsc_executor_error_dialog.cpp b/src/gui/gsc_executor_error_dialog.cpp similarity index 100% rename from src/gsc_executor_error_dialog.cpp rename to src/gui/gsc_executor_error_dialog.cpp diff --git a/src/gsc_executor_error_dialog.h b/src/gui/gsc_executor_error_dialog.h similarity index 100% rename from src/gsc_executor_error_dialog.h rename to src/gui/gsc_executor_error_dialog.h diff --git a/src/gsc_executor_log_window.cpp b/src/gui/gsc_executor_log_window.cpp similarity index 100% rename from src/gsc_executor_log_window.cpp rename to src/gui/gsc_executor_log_window.cpp diff --git a/src/gsc_executor_log_window.h b/src/gui/gsc_executor_log_window.h similarity index 100% rename from src/gsc_executor_log_window.h rename to src/gui/gsc_executor_log_window.h diff --git a/src/gsc_info_window.cpp b/src/gui/gsc_info_window.cpp similarity index 100% rename from src/gsc_info_window.cpp rename to src/gui/gsc_info_window.cpp diff --git a/src/gsc_info_window.h b/src/gui/gsc_info_window.h similarity index 100% rename from src/gsc_info_window.h rename to src/gui/gsc_info_window.h diff --git a/src/gsc_init.cpp b/src/gui/gsc_init.cpp similarity index 98% rename from src/gsc_init.cpp rename to src/gui/gsc_init.cpp index 7cb061e..25be175 100644 --- a/src/gsc_init.cpp +++ b/src/gui/gsc_init.cpp @@ -1,8 +1,10 @@ -/****************************************************************************** -License: GNU General Public License v3.0 only -Copyright: - (C) 2008 - 2021 Alexander Shaduri -******************************************************************************/ +/* + ***************************************************************************** + License: GNU General Public License v3.0 only + Copyright: + (C) 2024 Alexander Shaduri + ***************************************************************************** + */ /// \file /// \author Alexander Shaduri /// \ingroup gsc @@ -456,13 +458,13 @@ bool app_init_and_loop(int& argc, char**& argv) if (is_from_source) { if constexpr(BuildEnv::debug_build()) { hz::data_file_add_search_directory("icons", hz::fs_path_from_string(BuildEnv::package_top_source_dir()) / "data"); - hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_top_source_dir()) / "src/ui"); + hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_top_source_dir()) / "src/gui/ui"); hz::data_file_add_search_directory("doc", hz::fs_path_from_string(BuildEnv::package_top_source_dir()) / "doc"); } else { // Assume the source is the parent directory (standard cmake build with the build directory as a subdirectory of source directory, // and the executables placed directly in the build directory). hz::data_file_add_search_directory("icons", application_dir.parent_path() / "data"); - hz::data_file_add_search_directory("ui", application_dir.parent_path() / "src/ui"); + hz::data_file_add_search_directory("ui", application_dir.parent_path() / "src/gui/ui"); hz::data_file_add_search_directory("doc", application_dir.parent_path() / "doc"); } } else { diff --git a/src/gsc_init.h b/src/gui/gsc_init.h similarity index 100% rename from src/gsc_init.h rename to src/gui/gsc_init.h diff --git a/src/gsc_main.cpp b/src/gui/gsc_main.cpp similarity index 100% rename from src/gsc_main.cpp rename to src/gui/gsc_main.cpp diff --git a/src/gsc_main_window.cpp b/src/gui/gsc_main_window.cpp similarity index 100% rename from src/gsc_main_window.cpp rename to src/gui/gsc_main_window.cpp diff --git a/src/gsc_main_window.h b/src/gui/gsc_main_window.h similarity index 100% rename from src/gsc_main_window.h rename to src/gui/gsc_main_window.h diff --git a/src/gsc_main_window_iconview.h b/src/gui/gsc_main_window_iconview.h similarity index 100% rename from src/gsc_main_window_iconview.h rename to src/gui/gsc_main_window_iconview.h diff --git a/src/gsc_preferences_window.cpp b/src/gui/gsc_preferences_window.cpp similarity index 100% rename from src/gsc_preferences_window.cpp rename to src/gui/gsc_preferences_window.cpp diff --git a/src/gsc_preferences_window.h b/src/gui/gsc_preferences_window.h similarity index 100% rename from src/gsc_preferences_window.h rename to src/gui/gsc_preferences_window.h diff --git a/src/gsc_startup_settings.h b/src/gui/gsc_startup_settings.h similarity index 100% rename from src/gsc_startup_settings.h rename to src/gui/gsc_startup_settings.h diff --git a/src/gsc_text_window.h b/src/gui/gsc_text_window.h similarity index 100% rename from src/gsc_text_window.h rename to src/gui/gsc_text_window.h diff --git a/src/gsc_winres.in.rc b/src/gui/gsc_winres.in.rc similarity index 100% rename from src/gsc_winres.in.rc rename to src/gui/gsc_winres.in.rc diff --git a/src/gsmartcontrol.exe.in.manifest b/src/gui/gsmartcontrol.exe.in.manifest similarity index 100% rename from src/gsmartcontrol.exe.in.manifest rename to src/gui/gsmartcontrol.exe.in.manifest diff --git a/src/ui/CMakeLists.txt b/src/gui/ui/CMakeLists.txt similarity index 100% rename from src/ui/CMakeLists.txt rename to src/gui/ui/CMakeLists.txt diff --git a/src/ui/gsc_about_dialog.glade b/src/gui/ui/gsc_about_dialog.glade similarity index 100% rename from src/ui/gsc_about_dialog.glade rename to src/gui/ui/gsc_about_dialog.glade diff --git a/src/ui/gsc_add_device_window.glade b/src/gui/ui/gsc_add_device_window.glade similarity index 100% rename from src/ui/gsc_add_device_window.glade rename to src/gui/ui/gsc_add_device_window.glade diff --git a/src/ui/gsc_executor_log_window.glade b/src/gui/ui/gsc_executor_log_window.glade similarity index 100% rename from src/ui/gsc_executor_log_window.glade rename to src/gui/ui/gsc_executor_log_window.glade diff --git a/src/ui/gsc_info_window.glade b/src/gui/ui/gsc_info_window.glade similarity index 100% rename from src/ui/gsc_info_window.glade rename to src/gui/ui/gsc_info_window.glade diff --git a/src/ui/gsc_main_window.glade b/src/gui/ui/gsc_main_window.glade similarity index 100% rename from src/ui/gsc_main_window.glade rename to src/gui/ui/gsc_main_window.glade diff --git a/src/ui/gsc_preferences_window.glade b/src/gui/ui/gsc_preferences_window.glade similarity index 100% rename from src/ui/gsc_preferences_window.glade rename to src/gui/ui/gsc_preferences_window.glade diff --git a/src/ui/gsc_text_window.glade b/src/gui/ui/gsc_text_window.glade similarity index 100% rename from src/ui/gsc_text_window.glade rename to src/gui/ui/gsc_text_window.glade