Merge pull request #2651 from jroweboy/configmoved

citra-qt: Move config dialog code to its own directory
master
Mat M 2017-04-04 13:14:08 +07:00 committed by GitHub
commit b29239506f
25 changed files with 41 additions and 41 deletions

@ -3,7 +3,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS set(SRCS
config.cpp configuration/config.cpp
configuration/configure_audio.cpp
configuration/configure_debug.cpp
configuration/configure_dialog.cpp
configuration/configure_general.cpp
configuration/configure_graphics.cpp
configuration/configure_input.cpp
configuration/configure_system.cpp
debugger/callstack.cpp debugger/callstack.cpp
debugger/disassembler.cpp debugger/disassembler.cpp
debugger/graphics/graphics.cpp debugger/graphics/graphics.cpp
@ -19,13 +26,6 @@ set(SRCS
util/spinbox.cpp util/spinbox.cpp
util/util.cpp util/util.cpp
bootmanager.cpp bootmanager.cpp
configure_audio.cpp
configure_debug.cpp
configure_dialog.cpp
configure_general.cpp
configure_graphics.cpp
configure_system.cpp
configure_input.cpp
game_list.cpp game_list.cpp
hotkeys.cpp hotkeys.cpp
main.cpp main.cpp
@ -35,7 +35,14 @@ set(SRCS
) )
set(HEADERS set(HEADERS
config.h configuration/config.h
configuration/configure_audio.h
configuration/configure_debug.h
configuration/configure_dialog.h
configuration/configure_general.h
configuration/configure_graphics.h
configuration/configure_input.h
configuration/configure_system.h
debugger/callstack.h debugger/callstack.h
debugger/disassembler.h debugger/disassembler.h
debugger/graphics/graphics.h debugger/graphics/graphics.h
@ -52,13 +59,6 @@ set(HEADERS
util/spinbox.h util/spinbox.h
util/util.h util/util.h
bootmanager.h bootmanager.h
configure_audio.h
configure_debug.h
configure_dialog.h
configure_general.h
configure_graphics.h
configure_system.h
configure_input.h
game_list.h game_list.h
game_list_p.h game_list_p.h
hotkeys.h hotkeys.h
@ -67,16 +67,16 @@ set(HEADERS
) )
set(UIS set(UIS
configuration/configure.ui
configuration/configure_audio.ui
configuration/configure_debug.ui
configuration/configure_general.ui
configuration/configure_graphics.ui
configuration/configure_input.ui
configuration/configure_system.ui
debugger/callstack.ui debugger/callstack.ui
debugger/disassembler.ui debugger/disassembler.ui
debugger/registers.ui debugger/registers.ui
configure.ui
configure_audio.ui
configure_debug.ui
configure_general.ui
configure_graphics.ui
configure_system.ui
configure_input.ui
hotkeys.ui hotkeys.ui
main.ui main.ui
) )

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QSettings> #include <QSettings>
#include "citra_qt/config.h" #include "citra_qt/configuration/config.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "input_common/main.h" #include "input_common/main.h"

@ -64,37 +64,37 @@
<customwidget> <customwidget>
<class>ConfigureGeneral</class> <class>ConfigureGeneral</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_general.h</header> <header>configuration/configure_general.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureSystem</class> <class>ConfigureSystem</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_system.h</header> <header>configuration/configure_system.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureAudio</class> <class>ConfigureAudio</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_audio.h</header> <header>configuration/configure_audio.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureDebug</class> <class>ConfigureDebug</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_debug.h</header> <header>configuration/configure_debug.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureInput</class> <class>ConfigureInput</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_input.h</header> <header>configuration/configure_input.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ConfigureGraphics</class> <class>ConfigureGraphics</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>configure_graphics.h</header> <header>configuration/configure_graphics.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

@ -6,7 +6,7 @@
#include "audio_core/audio_core.h" #include "audio_core/audio_core.h"
#include "audio_core/sink.h" #include "audio_core/sink.h"
#include "audio_core/sink_details.h" #include "audio_core/sink_details.h"
#include "citra_qt/configure_audio.h" #include "citra_qt/configuration/configure_audio.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_audio.h" #include "ui_configure_audio.h"

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "citra_qt/configure_debug.h" #include "citra_qt/configuration/configure_debug.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_debug.h" #include "ui_configure_debug.h"

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "citra_qt/config.h" #include "citra_qt/configuration/config.h"
#include "citra_qt/configure_dialog.h" #include "citra_qt/configuration/configure_dialog.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure.h" #include "ui_configure.h"

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "citra_qt/configure_general.h" #include "citra_qt/configuration/configure_general.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
#include "core/core.h" #include "core/core.h"
#include "core/settings.h" #include "core/settings.h"

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "citra_qt/configure_graphics.h" #include "citra_qt/configuration/configure_graphics.h"
#include "core/core.h" #include "core/core.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_graphics.h" #include "ui_configure_graphics.h"

@ -6,8 +6,8 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <QTimer> #include <QTimer>
#include "citra_qt/config.h" #include "citra_qt/configuration/config.h"
#include "citra_qt/configure_input.h" #include "citra_qt/configuration/configure_input.h"
#include "common/param_package.h" #include "common/param_package.h"
#include "input_common/main.h" #include "input_common/main.h"

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "citra_qt/configure_system.h" #include "citra_qt/configuration/configure_system.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/service/cfg/cfg.h" #include "core/hle/service/cfg/cfg.h"

@ -14,8 +14,8 @@
#include <QtGui> #include <QtGui>
#include <QtWidgets> #include <QtWidgets>
#include "citra_qt/bootmanager.h" #include "citra_qt/bootmanager.h"
#include "citra_qt/config.h" #include "citra_qt/configuration/config.h"
#include "citra_qt/configure_dialog.h" #include "citra_qt/configuration/configure_dialog.h"
#include "citra_qt/debugger/callstack.h" #include "citra_qt/debugger/callstack.h"
#include "citra_qt/debugger/disassembler.h" #include "citra_qt/debugger/disassembler.h"
#include "citra_qt/debugger/graphics/graphics.h" #include "citra_qt/debugger/graphics/graphics.h"