diff --git a/.gitignore b/.gitignore index 643ad35..71b3a1d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ Makefile* *.qmlproject.user.* # Go modules -/libsyncthing/go/pkg +/syncthing/go/pkg # Dolphin .directory @@ -47,12 +47,12 @@ testfiles/output.* scripts/ # clang-format -/libsyncthing/.clang-format +/syncthing/.clang-format /cli/.clang-format -/connector/.clang-format +/syncthingconnector/.clang-format /fileitemactionplugin/.clang-format -/model/.clang-format +/syncthingmodel/.clang-format /testhelper/.clang-format /tray/.clang-format /plasmoid/lib/.clang-format -/widgets/.clang-format +/syncthingwidgets/.clang-format diff --git a/.gitmodules b/.gitmodules index abdc928..2efff90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "libsyncthing/go/src/github.com/syncthing/syncthing"] - path = libsyncthing/go/src/github.com/syncthing/syncthing + path = syncthing/go/src/github.com/syncthing/syncthing url = https://github.com/Martchus/syncthing.git branch = libsyncthing diff --git a/CMakeLists.txt b/CMakeLists.txt index 36b67e1..2b81c66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,29 +57,26 @@ else() endif() endif() -# set the include directory used when building so the headers of the different backend libraries can be found at build time -set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") - set(PACKAGE_NAMESPACE "" CACHE STRING "sets the prefix for find_package() calls to packages configured via c++utilities") if (PACKAGE_NAMESPACE) set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-") endif () # add subdirectories -add_subdirectory(connector) +add_subdirectory(syncthingconnector) add_subdirectory(testhelper) if (NOT NO_LIBSYNCTHING) - add_subdirectory(libsyncthing) + add_subdirectory(syncthing) endif() link_directories(${LIB_SYNCTHING_CONNECTOR_BINARY_DIR}) if(NOT NO_CLI) add_subdirectory(cli) endif() if(NOT NO_MODEL) - add_subdirectory(model) + add_subdirectory(syncthingmodel) link_directories(${LIB_SYNCTHING_MODEL_BINARY_DIR}) if(NOT NO_WIDGETS) - add_subdirectory(widgets) + add_subdirectory(syncthingwidgets) if(NOT NO_TRAY) add_subdirectory(tray) endif() diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index f1e66a0..4ca1800 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -13,8 +13,8 @@ set(SRC_FILES main.cpp args.cpp application.cpp) set(TEST_HEADER_FILES) set(TEST_SRC_FILES tests/application.cpp) -# use testfiles directory from connector -set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../connector") +# use testfiles directory from syncthingconnector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") # find c++utilities find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED) diff --git a/include/syncthing b/include/syncthing deleted file mode 120000 index a1d8d5f..0000000 --- a/include/syncthing +++ /dev/null @@ -1 +0,0 @@ -../libsyncthing \ No newline at end of file diff --git a/include/syncthingconnector b/include/syncthingconnector deleted file mode 120000 index 005369a..0000000 --- a/include/syncthingconnector +++ /dev/null @@ -1 +0,0 @@ -../connector \ No newline at end of file diff --git a/include/syncthingmodel b/include/syncthingmodel deleted file mode 120000 index fe0e728..0000000 --- a/include/syncthingmodel +++ /dev/null @@ -1 +0,0 @@ -../model \ No newline at end of file diff --git a/include/syncthingwidgets b/include/syncthingwidgets deleted file mode 120000 index 7722edc..0000000 --- a/include/syncthingwidgets +++ /dev/null @@ -1 +0,0 @@ -../widgets \ No newline at end of file diff --git a/libsyncthing/CMakeLists.txt b/syncthing/CMakeLists.txt similarity index 100% rename from libsyncthing/CMakeLists.txt rename to syncthing/CMakeLists.txt diff --git a/libsyncthing/global.h b/syncthing/global.h similarity index 100% rename from libsyncthing/global.h rename to syncthing/global.h diff --git a/libsyncthing/go/src/github.com/syncthing/syncthing b/syncthing/go/src/github.com/syncthing/syncthing similarity index 100% rename from libsyncthing/go/src/github.com/syncthing/syncthing rename to syncthing/go/src/github.com/syncthing/syncthing diff --git a/libsyncthing/interface.cpp b/syncthing/interface.cpp similarity index 100% rename from libsyncthing/interface.cpp rename to syncthing/interface.cpp diff --git a/libsyncthing/interface.h b/syncthing/interface.h similarity index 100% rename from libsyncthing/interface.h rename to syncthing/interface.h diff --git a/libsyncthing/testfiles/testconfig b/syncthing/testfiles/testconfig similarity index 100% rename from libsyncthing/testfiles/testconfig rename to syncthing/testfiles/testconfig diff --git a/libsyncthing/tests/interfacetests.cpp b/syncthing/tests/interfacetests.cpp similarity index 100% rename from libsyncthing/tests/interfacetests.cpp rename to syncthing/tests/interfacetests.cpp diff --git a/libsyncthing/update.sh b/syncthing/update.sh similarity index 100% rename from libsyncthing/update.sh rename to syncthing/update.sh diff --git a/connector/CMakeLists.txt b/syncthingconnector/CMakeLists.txt similarity index 100% rename from connector/CMakeLists.txt rename to syncthingconnector/CMakeLists.txt diff --git a/connector/global.h b/syncthingconnector/global.h similarity index 100% rename from connector/global.h rename to syncthingconnector/global.h diff --git a/connector/org.freedesktop.DBus.Properties.xml b/syncthingconnector/org.freedesktop.DBus.Properties.xml similarity index 100% rename from connector/org.freedesktop.DBus.Properties.xml rename to syncthingconnector/org.freedesktop.DBus.Properties.xml diff --git a/connector/org.freedesktop.login1.LoginManager.xml b/syncthingconnector/org.freedesktop.login1.LoginManager.xml similarity index 100% rename from connector/org.freedesktop.login1.LoginManager.xml rename to syncthingconnector/org.freedesktop.login1.LoginManager.xml diff --git a/connector/org.freedesktop.systemd1.Manager.xml b/syncthingconnector/org.freedesktop.systemd1.Manager.xml similarity index 100% rename from connector/org.freedesktop.systemd1.Manager.xml rename to syncthingconnector/org.freedesktop.systemd1.Manager.xml diff --git a/connector/org.freedesktop.systemd1.Service.xml b/syncthingconnector/org.freedesktop.systemd1.Service.xml similarity index 100% rename from connector/org.freedesktop.systemd1.Service.xml rename to syncthingconnector/org.freedesktop.systemd1.Service.xml diff --git a/connector/org.freedesktop.systemd1.Unit.xml b/syncthingconnector/org.freedesktop.systemd1.Unit.xml similarity index 100% rename from connector/org.freedesktop.systemd1.Unit.xml rename to syncthingconnector/org.freedesktop.systemd1.Unit.xml diff --git a/connector/qstringhash.h b/syncthingconnector/qstringhash.h similarity index 100% rename from connector/qstringhash.h rename to syncthingconnector/qstringhash.h diff --git a/connector/syncthingcompletion.h b/syncthingconnector/syncthingcompletion.h similarity index 100% rename from connector/syncthingcompletion.h rename to syncthingconnector/syncthingcompletion.h diff --git a/connector/syncthingconfig.cpp b/syncthingconnector/syncthingconfig.cpp similarity index 100% rename from connector/syncthingconfig.cpp rename to syncthingconnector/syncthingconfig.cpp diff --git a/connector/syncthingconfig.h b/syncthingconnector/syncthingconfig.h similarity index 100% rename from connector/syncthingconfig.h rename to syncthingconnector/syncthingconfig.h diff --git a/connector/syncthingconnection.cpp b/syncthingconnector/syncthingconnection.cpp similarity index 100% rename from connector/syncthingconnection.cpp rename to syncthingconnector/syncthingconnection.cpp diff --git a/connector/syncthingconnection.h b/syncthingconnector/syncthingconnection.h similarity index 100% rename from connector/syncthingconnection.h rename to syncthingconnector/syncthingconnection.h diff --git a/connector/syncthingconnection_requests.cpp b/syncthingconnector/syncthingconnection_requests.cpp similarity index 100% rename from connector/syncthingconnection_requests.cpp rename to syncthingconnector/syncthingconnection_requests.cpp diff --git a/connector/syncthingconnectionmockhelpers.cpp b/syncthingconnector/syncthingconnectionmockhelpers.cpp similarity index 100% rename from connector/syncthingconnectionmockhelpers.cpp rename to syncthingconnector/syncthingconnectionmockhelpers.cpp diff --git a/connector/syncthingconnectionmockhelpers.h b/syncthingconnector/syncthingconnectionmockhelpers.h similarity index 100% rename from connector/syncthingconnectionmockhelpers.h rename to syncthingconnector/syncthingconnectionmockhelpers.h diff --git a/connector/syncthingconnectionsettings.cpp b/syncthingconnector/syncthingconnectionsettings.cpp similarity index 100% rename from connector/syncthingconnectionsettings.cpp rename to syncthingconnector/syncthingconnectionsettings.cpp diff --git a/connector/syncthingconnectionsettings.h b/syncthingconnector/syncthingconnectionsettings.h similarity index 100% rename from connector/syncthingconnectionsettings.h rename to syncthingconnector/syncthingconnectionsettings.h diff --git a/connector/syncthingconnectionstatus.h b/syncthingconnector/syncthingconnectionstatus.h similarity index 100% rename from connector/syncthingconnectionstatus.h rename to syncthingconnector/syncthingconnectionstatus.h diff --git a/connector/syncthingdev.cpp b/syncthingconnector/syncthingdev.cpp similarity index 100% rename from connector/syncthingdev.cpp rename to syncthingconnector/syncthingdev.cpp diff --git a/connector/syncthingdev.h b/syncthingconnector/syncthingdev.h similarity index 100% rename from connector/syncthingdev.h rename to syncthingconnector/syncthingdev.h diff --git a/connector/syncthingdir.cpp b/syncthingconnector/syncthingdir.cpp similarity index 100% rename from connector/syncthingdir.cpp rename to syncthingconnector/syncthingdir.cpp diff --git a/connector/syncthingdir.h b/syncthingconnector/syncthingdir.h similarity index 100% rename from connector/syncthingdir.h rename to syncthingconnector/syncthingdir.h diff --git a/connector/syncthingnotifier.cpp b/syncthingconnector/syncthingnotifier.cpp similarity index 100% rename from connector/syncthingnotifier.cpp rename to syncthingconnector/syncthingnotifier.cpp diff --git a/connector/syncthingnotifier.h b/syncthingconnector/syncthingnotifier.h similarity index 100% rename from connector/syncthingnotifier.h rename to syncthingconnector/syncthingnotifier.h diff --git a/connector/syncthingprocess.cpp b/syncthingconnector/syncthingprocess.cpp similarity index 99% rename from connector/syncthingprocess.cpp rename to syncthingconnector/syncthingprocess.cpp index fe6c94d..cfe42d4 100644 --- a/connector/syncthingprocess.cpp +++ b/syncthingconnector/syncthingprocess.cpp @@ -1,6 +1,5 @@ #include "./syncthingprocess.h" - -#include +#include "./syncthingconnection.h" #include #include diff --git a/connector/syncthingprocess.h b/syncthingconnector/syncthingprocess.h similarity index 100% rename from connector/syncthingprocess.h rename to syncthingconnector/syncthingprocess.h diff --git a/connector/syncthingservice.cpp b/syncthingconnector/syncthingservice.cpp similarity index 100% rename from connector/syncthingservice.cpp rename to syncthingconnector/syncthingservice.cpp diff --git a/connector/syncthingservice.h b/syncthingconnector/syncthingservice.h similarity index 100% rename from connector/syncthingservice.h rename to syncthingconnector/syncthingservice.h diff --git a/connector/testfiles/mocks/config.json b/syncthingconnector/testfiles/mocks/config.json similarity index 100% rename from connector/testfiles/mocks/config.json rename to syncthingconnector/testfiles/mocks/config.json diff --git a/connector/testfiles/mocks/connections.json b/syncthingconnector/testfiles/mocks/connections.json similarity index 100% rename from connector/testfiles/mocks/connections.json rename to syncthingconnector/testfiles/mocks/connections.json diff --git a/connector/testfiles/mocks/devicestats.json b/syncthingconnector/testfiles/mocks/devicestats.json similarity index 100% rename from connector/testfiles/mocks/devicestats.json rename to syncthingconnector/testfiles/mocks/devicestats.json diff --git a/connector/testfiles/mocks/empty.json b/syncthingconnector/testfiles/mocks/empty.json similarity index 100% rename from connector/testfiles/mocks/empty.json rename to syncthingconnector/testfiles/mocks/empty.json diff --git a/connector/testfiles/mocks/errors.json b/syncthingconnector/testfiles/mocks/errors.json similarity index 100% rename from connector/testfiles/mocks/errors.json rename to syncthingconnector/testfiles/mocks/errors.json diff --git a/connector/testfiles/mocks/events-01.json b/syncthingconnector/testfiles/mocks/events-01.json similarity index 100% rename from connector/testfiles/mocks/events-01.json rename to syncthingconnector/testfiles/mocks/events-01.json diff --git a/connector/testfiles/mocks/events-02.json b/syncthingconnector/testfiles/mocks/events-02.json similarity index 100% rename from connector/testfiles/mocks/events-02.json rename to syncthingconnector/testfiles/mocks/events-02.json diff --git a/connector/testfiles/mocks/events-03.json b/syncthingconnector/testfiles/mocks/events-03.json similarity index 100% rename from connector/testfiles/mocks/events-03.json rename to syncthingconnector/testfiles/mocks/events-03.json diff --git a/connector/testfiles/mocks/events-04.json b/syncthingconnector/testfiles/mocks/events-04.json similarity index 100% rename from connector/testfiles/mocks/events-04.json rename to syncthingconnector/testfiles/mocks/events-04.json diff --git a/connector/testfiles/mocks/events-05.json b/syncthingconnector/testfiles/mocks/events-05.json similarity index 100% rename from connector/testfiles/mocks/events-05.json rename to syncthingconnector/testfiles/mocks/events-05.json diff --git a/connector/testfiles/mocks/events-06.json b/syncthingconnector/testfiles/mocks/events-06.json similarity index 100% rename from connector/testfiles/mocks/events-06.json rename to syncthingconnector/testfiles/mocks/events-06.json diff --git a/connector/testfiles/mocks/events-07.json b/syncthingconnector/testfiles/mocks/events-07.json similarity index 100% rename from connector/testfiles/mocks/events-07.json rename to syncthingconnector/testfiles/mocks/events-07.json diff --git a/connector/testfiles/mocks/folderstats.json b/syncthingconnector/testfiles/mocks/folderstats.json similarity index 100% rename from connector/testfiles/mocks/folderstats.json rename to syncthingconnector/testfiles/mocks/folderstats.json diff --git a/connector/testfiles/mocks/folderstatus-01.json b/syncthingconnector/testfiles/mocks/folderstatus-01.json similarity index 100% rename from connector/testfiles/mocks/folderstatus-01.json rename to syncthingconnector/testfiles/mocks/folderstatus-01.json diff --git a/connector/testfiles/mocks/folderstatus-02.json b/syncthingconnector/testfiles/mocks/folderstatus-02.json similarity index 100% rename from connector/testfiles/mocks/folderstatus-02.json rename to syncthingconnector/testfiles/mocks/folderstatus-02.json diff --git a/connector/testfiles/mocks/folderstatus-03.json b/syncthingconnector/testfiles/mocks/folderstatus-03.json similarity index 100% rename from connector/testfiles/mocks/folderstatus-03.json rename to syncthingconnector/testfiles/mocks/folderstatus-03.json diff --git a/connector/testfiles/mocks/pullerrors-01.json b/syncthingconnector/testfiles/mocks/pullerrors-01.json similarity index 100% rename from connector/testfiles/mocks/pullerrors-01.json rename to syncthingconnector/testfiles/mocks/pullerrors-01.json diff --git a/connector/testfiles/mocks/status.json b/syncthingconnector/testfiles/mocks/status.json similarity index 100% rename from connector/testfiles/mocks/status.json rename to syncthingconnector/testfiles/mocks/status.json diff --git a/connector/testfiles/mocks/version.json b/syncthingconnector/testfiles/mocks/version.json similarity index 100% rename from connector/testfiles/mocks/version.json rename to syncthingconnector/testfiles/mocks/version.json diff --git a/connector/testfiles/testconfig/config.xml b/syncthingconnector/testfiles/testconfig/config.xml similarity index 100% rename from connector/testfiles/testconfig/config.xml rename to syncthingconnector/testfiles/testconfig/config.xml diff --git a/connector/tests/connectiontests.cpp b/syncthingconnector/tests/connectiontests.cpp similarity index 100% rename from connector/tests/connectiontests.cpp rename to syncthingconnector/tests/connectiontests.cpp diff --git a/connector/tests/misctests.cpp b/syncthingconnector/tests/misctests.cpp similarity index 100% rename from connector/tests/misctests.cpp rename to syncthingconnector/tests/misctests.cpp diff --git a/connector/translations/syncthingconnector_cs_CZ.ts b/syncthingconnector/translations/syncthingconnector_cs_CZ.ts similarity index 100% rename from connector/translations/syncthingconnector_cs_CZ.ts rename to syncthingconnector/translations/syncthingconnector_cs_CZ.ts diff --git a/connector/translations/syncthingconnector_de_DE.ts b/syncthingconnector/translations/syncthingconnector_de_DE.ts similarity index 100% rename from connector/translations/syncthingconnector_de_DE.ts rename to syncthingconnector/translations/syncthingconnector_de_DE.ts diff --git a/connector/translations/syncthingconnector_en_US.ts b/syncthingconnector/translations/syncthingconnector_en_US.ts similarity index 100% rename from connector/translations/syncthingconnector_en_US.ts rename to syncthingconnector/translations/syncthingconnector_en_US.ts diff --git a/connector/translations/syncthingconnector_zh_CN.ts b/syncthingconnector/translations/syncthingconnector_zh_CN.ts similarity index 100% rename from connector/translations/syncthingconnector_zh_CN.ts rename to syncthingconnector/translations/syncthingconnector_zh_CN.ts diff --git a/connector/utils.cpp b/syncthingconnector/utils.cpp similarity index 100% rename from connector/utils.cpp rename to syncthingconnector/utils.cpp diff --git a/connector/utils.h b/syncthingconnector/utils.h similarity index 100% rename from connector/utils.h rename to syncthingconnector/utils.h diff --git a/model/CMakeLists.txt b/syncthingmodel/CMakeLists.txt similarity index 100% rename from model/CMakeLists.txt rename to syncthingmodel/CMakeLists.txt diff --git a/model/colors.h b/syncthingmodel/colors.h similarity index 100% rename from model/colors.h rename to syncthingmodel/colors.h diff --git a/model/global.h b/syncthingmodel/global.h similarity index 100% rename from model/global.h rename to syncthingmodel/global.h diff --git a/model/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg b/syncthingmodel/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg similarity index 100% rename from model/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg rename to syncthingmodel/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg diff --git a/model/resources/icons/hicolor/scalable/status/syncthing-default.svg b/syncthingmodel/resources/icons/hicolor/scalable/status/syncthing-default.svg similarity index 100% rename from model/resources/icons/hicolor/scalable/status/syncthing-default.svg rename to syncthingmodel/resources/icons/hicolor/scalable/status/syncthing-default.svg diff --git a/model/resources/syncthingmodelicons.qrc b/syncthingmodel/resources/syncthingmodelicons.qrc similarity index 100% rename from model/resources/syncthingmodelicons.qrc rename to syncthingmodel/resources/syncthingmodelicons.qrc diff --git a/model/syncthingdevicemodel.cpp b/syncthingmodel/syncthingdevicemodel.cpp similarity index 100% rename from model/syncthingdevicemodel.cpp rename to syncthingmodel/syncthingdevicemodel.cpp diff --git a/model/syncthingdevicemodel.h b/syncthingmodel/syncthingdevicemodel.h similarity index 100% rename from model/syncthingdevicemodel.h rename to syncthingmodel/syncthingdevicemodel.h diff --git a/model/syncthingdirectorymodel.cpp b/syncthingmodel/syncthingdirectorymodel.cpp similarity index 100% rename from model/syncthingdirectorymodel.cpp rename to syncthingmodel/syncthingdirectorymodel.cpp diff --git a/model/syncthingdirectorymodel.h b/syncthingmodel/syncthingdirectorymodel.h similarity index 100% rename from model/syncthingdirectorymodel.h rename to syncthingmodel/syncthingdirectorymodel.h diff --git a/model/syncthingdownloadmodel.cpp b/syncthingmodel/syncthingdownloadmodel.cpp similarity index 100% rename from model/syncthingdownloadmodel.cpp rename to syncthingmodel/syncthingdownloadmodel.cpp diff --git a/model/syncthingdownloadmodel.h b/syncthingmodel/syncthingdownloadmodel.h similarity index 100% rename from model/syncthingdownloadmodel.h rename to syncthingmodel/syncthingdownloadmodel.h diff --git a/model/syncthingicons.cpp b/syncthingmodel/syncthingicons.cpp similarity index 100% rename from model/syncthingicons.cpp rename to syncthingmodel/syncthingicons.cpp diff --git a/model/syncthingicons.h b/syncthingmodel/syncthingicons.h similarity index 100% rename from model/syncthingicons.h rename to syncthingmodel/syncthingicons.h diff --git a/model/syncthingmodel.cpp b/syncthingmodel/syncthingmodel.cpp similarity index 100% rename from model/syncthingmodel.cpp rename to syncthingmodel/syncthingmodel.cpp diff --git a/model/syncthingmodel.h b/syncthingmodel/syncthingmodel.h similarity index 100% rename from model/syncthingmodel.h rename to syncthingmodel/syncthingmodel.h diff --git a/model/syncthingrecentchangesmodel.cpp b/syncthingmodel/syncthingrecentchangesmodel.cpp similarity index 100% rename from model/syncthingrecentchangesmodel.cpp rename to syncthingmodel/syncthingrecentchangesmodel.cpp diff --git a/model/syncthingrecentchangesmodel.h b/syncthingmodel/syncthingrecentchangesmodel.h similarity index 100% rename from model/syncthingrecentchangesmodel.h rename to syncthingmodel/syncthingrecentchangesmodel.h diff --git a/model/syncthingsortfiltermodel.cpp b/syncthingmodel/syncthingsortfiltermodel.cpp similarity index 100% rename from model/syncthingsortfiltermodel.cpp rename to syncthingmodel/syncthingsortfiltermodel.cpp diff --git a/model/syncthingsortfiltermodel.h b/syncthingmodel/syncthingsortfiltermodel.h similarity index 100% rename from model/syncthingsortfiltermodel.h rename to syncthingmodel/syncthingsortfiltermodel.h diff --git a/model/syncthingstatuscomputionmodel.cpp b/syncthingmodel/syncthingstatuscomputionmodel.cpp similarity index 100% rename from model/syncthingstatuscomputionmodel.cpp rename to syncthingmodel/syncthingstatuscomputionmodel.cpp diff --git a/model/syncthingstatuscomputionmodel.h b/syncthingmodel/syncthingstatuscomputionmodel.h similarity index 100% rename from model/syncthingstatuscomputionmodel.h rename to syncthingmodel/syncthingstatuscomputionmodel.h diff --git a/model/syncthingstatusselectionmodel.cpp b/syncthingmodel/syncthingstatusselectionmodel.cpp similarity index 100% rename from model/syncthingstatusselectionmodel.cpp rename to syncthingmodel/syncthingstatusselectionmodel.cpp diff --git a/model/syncthingstatusselectionmodel.h b/syncthingmodel/syncthingstatusselectionmodel.h similarity index 100% rename from model/syncthingstatusselectionmodel.h rename to syncthingmodel/syncthingstatusselectionmodel.h diff --git a/model/translations/syncthingmodel_cs_CZ.ts b/syncthingmodel/translations/syncthingmodel_cs_CZ.ts similarity index 100% rename from model/translations/syncthingmodel_cs_CZ.ts rename to syncthingmodel/translations/syncthingmodel_cs_CZ.ts diff --git a/model/translations/syncthingmodel_de_DE.ts b/syncthingmodel/translations/syncthingmodel_de_DE.ts similarity index 100% rename from model/translations/syncthingmodel_de_DE.ts rename to syncthingmodel/translations/syncthingmodel_de_DE.ts diff --git a/model/translations/syncthingmodel_en_US.ts b/syncthingmodel/translations/syncthingmodel_en_US.ts similarity index 100% rename from model/translations/syncthingmodel_en_US.ts rename to syncthingmodel/translations/syncthingmodel_en_US.ts diff --git a/model/translations/syncthingmodel_zh_CN.ts b/syncthingmodel/translations/syncthingmodel_zh_CN.ts similarity index 100% rename from model/translations/syncthingmodel_zh_CN.ts rename to syncthingmodel/translations/syncthingmodel_zh_CN.ts diff --git a/widgets/CMakeLists.txt b/syncthingwidgets/CMakeLists.txt similarity index 100% rename from widgets/CMakeLists.txt rename to syncthingwidgets/CMakeLists.txt diff --git a/widgets/global.h b/syncthingwidgets/global.h similarity index 100% rename from widgets/global.h rename to syncthingwidgets/global.h diff --git a/widgets/misc/dbusstatusnotifier.cpp b/syncthingwidgets/misc/dbusstatusnotifier.cpp similarity index 100% rename from widgets/misc/dbusstatusnotifier.cpp rename to syncthingwidgets/misc/dbusstatusnotifier.cpp diff --git a/widgets/misc/dbusstatusnotifier.h b/syncthingwidgets/misc/dbusstatusnotifier.h similarity index 100% rename from widgets/misc/dbusstatusnotifier.h rename to syncthingwidgets/misc/dbusstatusnotifier.h diff --git a/widgets/misc/direrrorsdialog.cpp b/syncthingwidgets/misc/direrrorsdialog.cpp similarity index 100% rename from widgets/misc/direrrorsdialog.cpp rename to syncthingwidgets/misc/direrrorsdialog.cpp diff --git a/widgets/misc/direrrorsdialog.h b/syncthingwidgets/misc/direrrorsdialog.h similarity index 100% rename from widgets/misc/direrrorsdialog.h rename to syncthingwidgets/misc/direrrorsdialog.h diff --git a/widgets/misc/internalerror.cpp b/syncthingwidgets/misc/internalerror.cpp similarity index 100% rename from widgets/misc/internalerror.cpp rename to syncthingwidgets/misc/internalerror.cpp diff --git a/widgets/misc/internalerror.h b/syncthingwidgets/misc/internalerror.h similarity index 100% rename from widgets/misc/internalerror.h rename to syncthingwidgets/misc/internalerror.h diff --git a/widgets/misc/internalerrorsdialog.cpp b/syncthingwidgets/misc/internalerrorsdialog.cpp similarity index 100% rename from widgets/misc/internalerrorsdialog.cpp rename to syncthingwidgets/misc/internalerrorsdialog.cpp diff --git a/widgets/misc/internalerrorsdialog.h b/syncthingwidgets/misc/internalerrorsdialog.h similarity index 100% rename from widgets/misc/internalerrorsdialog.h rename to syncthingwidgets/misc/internalerrorsdialog.h diff --git a/widgets/misc/otherdialogs.cpp b/syncthingwidgets/misc/otherdialogs.cpp similarity index 100% rename from widgets/misc/otherdialogs.cpp rename to syncthingwidgets/misc/otherdialogs.cpp diff --git a/widgets/misc/otherdialogs.h b/syncthingwidgets/misc/otherdialogs.h similarity index 100% rename from widgets/misc/otherdialogs.h rename to syncthingwidgets/misc/otherdialogs.h diff --git a/widgets/misc/statusinfo.cpp b/syncthingwidgets/misc/statusinfo.cpp similarity index 100% rename from widgets/misc/statusinfo.cpp rename to syncthingwidgets/misc/statusinfo.cpp diff --git a/widgets/misc/statusinfo.h b/syncthingwidgets/misc/statusinfo.h similarity index 100% rename from widgets/misc/statusinfo.h rename to syncthingwidgets/misc/statusinfo.h diff --git a/widgets/misc/syncthingkiller.cpp b/syncthingwidgets/misc/syncthingkiller.cpp similarity index 100% rename from widgets/misc/syncthingkiller.cpp rename to syncthingwidgets/misc/syncthingkiller.cpp diff --git a/widgets/misc/syncthingkiller.h b/syncthingwidgets/misc/syncthingkiller.h similarity index 100% rename from widgets/misc/syncthingkiller.h rename to syncthingwidgets/misc/syncthingkiller.h diff --git a/widgets/misc/syncthinglauncher.cpp b/syncthingwidgets/misc/syncthinglauncher.cpp similarity index 100% rename from widgets/misc/syncthinglauncher.cpp rename to syncthingwidgets/misc/syncthinglauncher.cpp diff --git a/widgets/misc/syncthinglauncher.h b/syncthingwidgets/misc/syncthinglauncher.h similarity index 100% rename from widgets/misc/syncthinglauncher.h rename to syncthingwidgets/misc/syncthinglauncher.h diff --git a/widgets/misc/textviewdialog.cpp b/syncthingwidgets/misc/textviewdialog.cpp similarity index 100% rename from widgets/misc/textviewdialog.cpp rename to syncthingwidgets/misc/textviewdialog.cpp diff --git a/widgets/misc/textviewdialog.h b/syncthingwidgets/misc/textviewdialog.h similarity index 100% rename from widgets/misc/textviewdialog.h rename to syncthingwidgets/misc/textviewdialog.h diff --git a/widgets/resources/icons/hicolor/scalable/actions/document-open.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/document-open.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/document-open.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/document-open.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/edit-paste.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/edit-paste.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/edit-paste.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/edit-paste.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/edit-undo.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/edit-undo.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/edit-undo.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/edit-undo.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/go-down.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/go-down.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/go-down.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/go-down.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/go-up.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/go-up.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/go-up.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/go-up.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/list-add.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/list-add.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/list-add.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/list-add.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/list-remove.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/list-remove.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/list-remove.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/list-remove.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/process-stop.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/process-stop.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/process-stop.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/process-stop.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/tools-wizard.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/tools-wizard.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/tools-wizard.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/tools-wizard.svg diff --git a/widgets/resources/icons/hicolor/scalable/actions/view-refresh.svg b/syncthingwidgets/resources/icons/hicolor/scalable/actions/view-refresh.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/actions/view-refresh.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/actions/view-refresh.svg diff --git a/widgets/resources/icons/hicolor/scalable/app/syncthingtray.svg b/syncthingwidgets/resources/icons/hicolor/scalable/app/syncthingtray.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/app/syncthingtray.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/app/syncthingtray.svg diff --git a/widgets/resources/icons/hicolor/scalable/apps/internet-web-browser.svg b/syncthingwidgets/resources/icons/hicolor/scalable/apps/internet-web-browser.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/apps/internet-web-browser.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/apps/internet-web-browser.svg diff --git a/widgets/resources/icons/hicolor/scalable/apps/preferences-other.svg b/syncthingwidgets/resources/icons/hicolor/scalable/apps/preferences-other.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/apps/preferences-other.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/apps/preferences-other.svg diff --git a/widgets/resources/icons/hicolor/scalable/apps/system-help.svg b/syncthingwidgets/resources/icons/hicolor/scalable/apps/system-help.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/apps/system-help.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/apps/system-help.svg diff --git a/widgets/resources/icons/hicolor/scalable/apps/system-run.svg b/syncthingwidgets/resources/icons/hicolor/scalable/apps/system-run.svg similarity index 100% rename from widgets/resources/icons/hicolor/scalable/apps/system-run.svg rename to syncthingwidgets/resources/icons/hicolor/scalable/apps/system-run.svg diff --git a/widgets/resources/syncthingwidgetsicons.qrc b/syncthingwidgets/resources/syncthingwidgetsicons.qrc similarity index 100% rename from widgets/resources/syncthingwidgetsicons.qrc rename to syncthingwidgets/resources/syncthingwidgetsicons.qrc diff --git a/widgets/settings/appearanceoptionpage.ui b/syncthingwidgets/settings/appearanceoptionpage.ui similarity index 100% rename from widgets/settings/appearanceoptionpage.ui rename to syncthingwidgets/settings/appearanceoptionpage.ui diff --git a/widgets/settings/applywizardpage.ui b/syncthingwidgets/settings/applywizardpage.ui similarity index 100% rename from widgets/settings/applywizardpage.ui rename to syncthingwidgets/settings/applywizardpage.ui diff --git a/widgets/settings/autostartoptionpage.ui b/syncthingwidgets/settings/autostartoptionpage.ui similarity index 100% rename from widgets/settings/autostartoptionpage.ui rename to syncthingwidgets/settings/autostartoptionpage.ui diff --git a/widgets/settings/autostartwizardpage.ui b/syncthingwidgets/settings/autostartwizardpage.ui similarity index 100% rename from widgets/settings/autostartwizardpage.ui rename to syncthingwidgets/settings/autostartwizardpage.ui diff --git a/widgets/settings/connectionoptionpage.ui b/syncthingwidgets/settings/connectionoptionpage.ui similarity index 100% rename from widgets/settings/connectionoptionpage.ui rename to syncthingwidgets/settings/connectionoptionpage.ui diff --git a/widgets/settings/iconsoptionpage.ui b/syncthingwidgets/settings/iconsoptionpage.ui similarity index 100% rename from widgets/settings/iconsoptionpage.ui rename to syncthingwidgets/settings/iconsoptionpage.ui diff --git a/widgets/settings/launcheroptionpage.ui b/syncthingwidgets/settings/launcheroptionpage.ui similarity index 100% rename from widgets/settings/launcheroptionpage.ui rename to syncthingwidgets/settings/launcheroptionpage.ui diff --git a/widgets/settings/mainconfigwizardpage.ui b/syncthingwidgets/settings/mainconfigwizardpage.ui similarity index 100% rename from widgets/settings/mainconfigwizardpage.ui rename to syncthingwidgets/settings/mainconfigwizardpage.ui diff --git a/widgets/settings/notificationsoptionpage.ui b/syncthingwidgets/settings/notificationsoptionpage.ui similarity index 100% rename from widgets/settings/notificationsoptionpage.ui rename to syncthingwidgets/settings/notificationsoptionpage.ui diff --git a/widgets/settings/settings.cpp b/syncthingwidgets/settings/settings.cpp similarity index 100% rename from widgets/settings/settings.cpp rename to syncthingwidgets/settings/settings.cpp diff --git a/widgets/settings/settings.h b/syncthingwidgets/settings/settings.h similarity index 100% rename from widgets/settings/settings.h rename to syncthingwidgets/settings/settings.h diff --git a/widgets/settings/settingsdialog.cpp b/syncthingwidgets/settings/settingsdialog.cpp similarity index 100% rename from widgets/settings/settingsdialog.cpp rename to syncthingwidgets/settings/settingsdialog.cpp diff --git a/widgets/settings/settingsdialog.h b/syncthingwidgets/settings/settingsdialog.h similarity index 100% rename from widgets/settings/settingsdialog.h rename to syncthingwidgets/settings/settingsdialog.h diff --git a/widgets/settings/setupdetection.cpp b/syncthingwidgets/settings/setupdetection.cpp similarity index 100% rename from widgets/settings/setupdetection.cpp rename to syncthingwidgets/settings/setupdetection.cpp diff --git a/widgets/settings/setupdetection.h b/syncthingwidgets/settings/setupdetection.h similarity index 100% rename from widgets/settings/setupdetection.h rename to syncthingwidgets/settings/setupdetection.h diff --git a/widgets/settings/systemdoptionpage.ui b/syncthingwidgets/settings/systemdoptionpage.ui similarity index 100% rename from widgets/settings/systemdoptionpage.ui rename to syncthingwidgets/settings/systemdoptionpage.ui diff --git a/widgets/settings/webviewoptionpage.ui b/syncthingwidgets/settings/webviewoptionpage.ui similarity index 100% rename from widgets/settings/webviewoptionpage.ui rename to syncthingwidgets/settings/webviewoptionpage.ui diff --git a/widgets/settings/wizard.cpp b/syncthingwidgets/settings/wizard.cpp similarity index 100% rename from widgets/settings/wizard.cpp rename to syncthingwidgets/settings/wizard.cpp diff --git a/widgets/settings/wizard.h b/syncthingwidgets/settings/wizard.h similarity index 100% rename from widgets/settings/wizard.h rename to syncthingwidgets/settings/wizard.h diff --git a/widgets/tests/wizard.cpp b/syncthingwidgets/tests/wizard.cpp similarity index 100% rename from widgets/tests/wizard.cpp rename to syncthingwidgets/tests/wizard.cpp diff --git a/widgets/translations/syncthingwidgets_cs_CZ.ts b/syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts similarity index 100% rename from widgets/translations/syncthingwidgets_cs_CZ.ts rename to syncthingwidgets/translations/syncthingwidgets_cs_CZ.ts diff --git a/widgets/translations/syncthingwidgets_de_DE.ts b/syncthingwidgets/translations/syncthingwidgets_de_DE.ts similarity index 100% rename from widgets/translations/syncthingwidgets_de_DE.ts rename to syncthingwidgets/translations/syncthingwidgets_de_DE.ts diff --git a/widgets/translations/syncthingwidgets_en_US.ts b/syncthingwidgets/translations/syncthingwidgets_en_US.ts similarity index 100% rename from widgets/translations/syncthingwidgets_en_US.ts rename to syncthingwidgets/translations/syncthingwidgets_en_US.ts diff --git a/widgets/translations/syncthingwidgets_zh_CN.ts b/syncthingwidgets/translations/syncthingwidgets_zh_CN.ts similarity index 100% rename from widgets/translations/syncthingwidgets_zh_CN.ts rename to syncthingwidgets/translations/syncthingwidgets_zh_CN.ts diff --git a/widgets/webview/webpage.cpp b/syncthingwidgets/webview/webpage.cpp similarity index 100% rename from widgets/webview/webpage.cpp rename to syncthingwidgets/webview/webpage.cpp diff --git a/widgets/webview/webpage.h b/syncthingwidgets/webview/webpage.h similarity index 100% rename from widgets/webview/webpage.h rename to syncthingwidgets/webview/webpage.h diff --git a/widgets/webview/webviewdefs.h b/syncthingwidgets/webview/webviewdefs.h similarity index 100% rename from widgets/webview/webviewdefs.h rename to syncthingwidgets/webview/webviewdefs.h diff --git a/widgets/webview/webviewdialog.cpp b/syncthingwidgets/webview/webviewdialog.cpp similarity index 100% rename from widgets/webview/webviewdialog.cpp rename to syncthingwidgets/webview/webviewdialog.cpp diff --git a/widgets/webview/webviewdialog.h b/syncthingwidgets/webview/webviewdialog.h similarity index 100% rename from widgets/webview/webviewdialog.h rename to syncthingwidgets/webview/webviewdialog.h diff --git a/widgets/webview/webviewincludes.h b/syncthingwidgets/webview/webviewincludes.h similarity index 100% rename from widgets/webview/webviewincludes.h rename to syncthingwidgets/webview/webviewincludes.h diff --git a/widgets/webview/webviewinterceptor.cpp b/syncthingwidgets/webview/webviewinterceptor.cpp similarity index 100% rename from widgets/webview/webviewinterceptor.cpp rename to syncthingwidgets/webview/webviewinterceptor.cpp diff --git a/widgets/webview/webviewinterceptor.h b/syncthingwidgets/webview/webviewinterceptor.h similarity index 100% rename from widgets/webview/webviewinterceptor.h rename to syncthingwidgets/webview/webviewinterceptor.h