refactor: mv src/lib/gui/dialogs/SettingsDialog => src/gui/src/dialogs/SettingsDialpg

This commit is contained in:
sithlord48
2024-11-06 23:17:03 -05:00
parent 3822336db2
commit dc5c2b9422
6 changed files with 2 additions and 48 deletions

View File

@ -22,12 +22,12 @@
#include "ServerConfigDialog.h"
#include "common/constants.h"
#include "dialogs/AboutDialog.h"
#include "dialogs/SettingsDialog.h"
#include "gui/Logger.h"
#include "gui/config/ConfigScopes.h"
#include "gui/constants.h"
#include "gui/core/CoreProcess.h"
#include "gui/diagnostic.h"
#include "gui/dialogs/SettingsDialog.h"
#include "gui/messages.h"
#include "gui/string_utils.h"
#include "gui/styles.h"

View File

@ -25,7 +25,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
file(GLOB_RECURSE sources *.cpp)
file(GLOB_RECURSE headers *.h)
file(GLOB_RECURSE ui_files *.ui)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
file(GLOB mac_sources *.mm)
@ -39,7 +38,7 @@ endif()
# generated includes
include_directories(${PROJECT_BINARY_DIR}/config)
add_library(${target} STATIC ${sources} ${ui_files} ${qrc_file})
add_library(${target} STATIC ${sources} ${qrc_file})
target_link_libraries(
${target}

View File

@ -1,45 +0,0 @@
/*
* Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2024 Symless Ltd.
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file LICENSE that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// `TestQtFullApp` freezes on Windows CI, so exclude this test for now.
#ifndef WIN32
#include "gui/core/CoreProcess.h"
#include "gui/dialogs/SettingsDialog.h"
#include "shared/gui/TestQtFullApp.h"
#include "shared/gui/mocks/AppConfigMock.h"
#include "shared/gui/mocks/ServerConfigMock.h"
#include <gtest/gtest.h>
using namespace testing;
using namespace deskflow::gui;
TEST(SettingsDialogTests, ctor_getsScreenName)
{
TestQtFullApp app;
NiceMock<AppConfigMock> appConfig;
NiceMock<ServerConfigMock> serverConfig;
auto cpDeps = std::make_shared<CoreProcess::Deps>();
CoreProcess coreProcess(appConfig, serverConfig, cpDeps);
EXPECT_CALL(appConfig, screenName()).Times(1);
SettingsDialog settingsDialog(nullptr, appConfig, serverConfig, coreProcess);
}
#endif