summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/CMakeLists.txt50
-rw-r--r--src/citra_qt/bootmanager.cpp10
-rw-r--r--src/citra_qt/bootmanager.hxx4
-rw-r--r--src/citra_qt/callstack.hxx2
-rw-r--r--src/citra_qt/citra_qt.vcxproj20
-rw-r--r--src/citra_qt/citra_qt.vcxproj.filters14
-rw-r--r--src/citra_qt/config/controller_config.hxx2
-rw-r--r--src/citra_qt/cpu_regs.cpp40
-rw-r--r--src/citra_qt/disasm.cpp16
-rw-r--r--src/citra_qt/disasm.hxx4
-rw-r--r--src/citra_qt/main.cpp10
-rw-r--r--src/citra_qt/qt-build.props4
-rw-r--r--src/citra_qt/ramview.cpp4
-rw-r--r--src/citra_qt/ui_controller_config.h (renamed from src/citra_qt/config/ui_controller_config.h)0
-rw-r--r--src/citra_qt/ui_gfx_fifo_player.h209
-rw-r--r--src/citra_qt/ui_image_info.h154
-rw-r--r--src/citra_qt/ui_welcome_wizard.h124
-rw-r--r--vsprops/qt.props4
-rw-r--r--vsprops/qt_libs_debug.props2
19 files changed, 93 insertions, 580 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index facb99e90..21b85e5b8 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -1,36 +1,36 @@
1set(SRCS 1set(SRCS
2 src/bootmanager.cpp 2 bootmanager.cpp
3 src/callstack.cpp 3 callstack.cpp
4 src/disasm.cpp 4 disasm.cpp
5 src/cpu_regs.cpp 5 cpu_regs.cpp
6 src/hotkeys.cpp 6 hotkeys.cpp
7 src/main.cpp 7 main.cpp
8 src/ramview.cpp 8 ramview.cpp
9 src/config/controller_config.cpp 9 config/controller_config.cpp
10 src/config/controller_config_util.cpp) 10 config/controller_config_util.cpp)
11 11
12qt4_wrap_ui(UI_HDRS 12qt4_wrap_ui(UI_HDRS
13 src/callstack.ui 13 callstack.ui
14 src/disasm.ui 14 disasm.ui
15 src/cpu_regs.ui 15 cpu_regs.ui
16 src/hotkeys.ui 16 hotkeys.ui
17 src/main.ui 17 main.ui
18 src/config/controller_config.ui) 18 config/controller_config.ui)
19 19
20qt4_wrap_cpp(MOC_SRCS 20qt4_wrap_cpp(MOC_SRCS
21 src/bootmanager.hxx 21 bootmanager.hxx
22 src/callstack.hxx 22 callstack.hxx
23 src/disasm.hxx 23 disasm.hxx
24 src/cpu_regs.hxx 24 cpu_regs.hxx
25 src/hotkeys.hxx 25 hotkeys.hxx
26 src/main.hxx 26 main.hxx
27 src/ramview.hxx 27 ramview.hxx
28 src/config/controller_config.hxx 28 config/controller_config.hxx
29 src/config/controller_config_util.hxx) 29 config/controller_config_util.hxx)
30 30
31# add uic results to include directories 31# add uic results to include directories
32include_directories(${CMAKE_CURRENT_BINARY_DIR}) 32include_directories(${CMAKE_CURRENT_BINARY_DIR})
33include_directories(./src/) 33include_directories(./)
34 34
35add_executable(citra-qt ${SRCS} ${MOC_SRCS} ${UI_HDRS}) 35add_executable(citra-qt ${SRCS} ${MOC_SRCS} ${UI_HDRS})
36target_link_libraries(citra-qt core common qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES}) 36target_link_libraries(citra-qt core common qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES})
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 095856dc9..75abcd8bf 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -1,11 +1,11 @@
1#include <QHBoxLayout> 1#include <QHBoxLayout>
2#include <QKeyEvent> 2#include <QKeyEvent>
3 3
4#include "common.h" 4#include "common/common.h"
5#include "bootmanager.hxx" 5#include "bootmanager.hxx"
6 6
7#include "core.h" 7#include "core/core.h"
8#include "loader.h" 8#include "core/loader.h"
9 9
10#include "version.h" 10#include "version.h"
11 11
@@ -85,8 +85,8 @@ public:
85// makeCurrent(); 85// makeCurrent();
86 } 86 }
87 void resizeEvent(QResizeEvent* ev) { 87 void resizeEvent(QResizeEvent* ev) {
88 parent_->set_client_area_width(size().width()); 88 parent_->SetClientAreaWidth(size().width());
89 parent_->set_client_area_height(size().height()); 89 parent_->SetClientAreaHeight(size().height());
90 } 90 }
91private: 91private:
92 GRenderWindow* parent_; 92 GRenderWindow* parent_;
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index b3aa1cf30..1001e1ee4 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -1,7 +1,7 @@
1#include <QThread> 1#include <QThread>
2#include <QGLWidget> 2#include <QGLWidget>
3#include "common.h" 3#include "common/common.h"
4#include "emu_window.h" 4#include "common/emu_window.h"
5 5
6class GRenderWindow; 6class GRenderWindow;
7class QKeyEvent; 7class QKeyEvent;
diff --git a/src/citra_qt/callstack.hxx b/src/citra_qt/callstack.hxx
index 60b24f236..4df1b96d5 100644
--- a/src/citra_qt/callstack.hxx
+++ b/src/citra_qt/callstack.hxx
@@ -1,6 +1,6 @@
1#include <QDockWidget> 1#include <QDockWidget>
2#include "ui_callstack.h" 2#include "ui_callstack.h"
3#include "platform.h" 3#include "common/platform.h"
4 4
5class QStandardItemModel; 5class QStandardItemModel;
6 6
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
index da8740bec..735f06e5b 100644
--- a/src/citra_qt/citra_qt.vcxproj
+++ b/src/citra_qt/citra_qt.vcxproj
@@ -142,6 +142,15 @@
142 <MOC Include="..\..\externals\qhexedit\qhexedit.h" /> 142 <MOC Include="..\..\externals\qhexedit\qhexedit.h" />
143 <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" /> 143 <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
144 <MOC Include="..\..\externals\qhexedit\xbytearray.h" /> 144 <MOC Include="..\..\externals\qhexedit\xbytearray.h" />
145 <MOC Include="config\controller_config.hxx" />
146 <MOC Include="config\controller_config_util.hxx" />
147 <MOC Include="callstack.hxx" />
148 <MOC Include="cpu_regs.hxx" />
149 <MOC Include="disasm.hxx" />
150 <MOC Include="ramview.hxx" />
151 <MOC Include="bootmanager.hxx" />
152 <MOC Include="hotkeys.hxx" />
153 <MOC Include="main.hxx" />
145 </ItemGroup> 154 </ItemGroup>
146 <ItemGroup> 155 <ItemGroup>
147 <ProjectReference Include="..\common\common.vcxproj"> 156 <ProjectReference Include="..\common\common.vcxproj">
@@ -150,26 +159,23 @@
150 <ProjectReference Include="..\core\core.vcxproj"> 159 <ProjectReference Include="..\core\core.vcxproj">
151 <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project> 160 <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
152 </ProjectReference> 161 </ProjectReference>
162 <ProjectReference Include="..\video_core\video_core.vcxproj">
163 <Project>{6678d1a3-33a6-48a9-878b-48e5d2903d27}</Project>
164 </ProjectReference>
153 </ItemGroup> 165 </ItemGroup>
154 <ItemGroup> 166 <ItemGroup>
155 <ClInclude Include="bootmanager.hxx" />
156 <ClInclude Include="callstack.hxx" /> 167 <ClInclude Include="callstack.hxx" />
157 <ClInclude Include="config\controller_config.hxx" /> 168 <ClInclude Include="config\controller_config.hxx" />
158 <ClInclude Include="config\controller_config_util.hxx" /> 169 <ClInclude Include="config\controller_config_util.hxx" />
159 <ClInclude Include="config\ui_controller_config.h" />
160 <ClInclude Include="cpu_regs.hxx" /> 170 <ClInclude Include="cpu_regs.hxx" />
161 <ClInclude Include="disasm.hxx" /> 171 <ClInclude Include="disasm.hxx" />
162 <ClInclude Include="hotkeys.hxx" />
163 <ClInclude Include="main.hxx" />
164 <ClInclude Include="ramview.hxx" /> 172 <ClInclude Include="ramview.hxx" />
165 <ClInclude Include="ui_callstack.h" /> 173 <ClInclude Include="ui_callstack.h" />
174 <ClInclude Include="ui_controller_config.h" />
166 <ClInclude Include="ui_cpu_regs.h" /> 175 <ClInclude Include="ui_cpu_regs.h" />
167 <ClInclude Include="ui_disasm.h" /> 176 <ClInclude Include="ui_disasm.h" />
168 <ClInclude Include="ui_gfx_fifo_player.h" />
169 <ClInclude Include="ui_hotkeys.h" /> 177 <ClInclude Include="ui_hotkeys.h" />
170 <ClInclude Include="ui_image_info.h" />
171 <ClInclude Include="ui_main.h" /> 178 <ClInclude Include="ui_main.h" />
172 <ClInclude Include="ui_welcome_wizard.h" />
173 <ClInclude Include="version.h" /> 179 <ClInclude Include="version.h" />
174 </ItemGroup> 180 </ItemGroup>
175 <ItemGroup> 181 <ItemGroup>
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
index 5bc29c1d7..5b292c120 100644
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ b/src/citra_qt/citra_qt.vcxproj.filters
@@ -61,13 +61,10 @@
61 </MOC> 61 </MOC>
62 </ItemGroup> 62 </ItemGroup>
63 <ItemGroup> 63 <ItemGroup>
64 <ClInclude Include="bootmanager.hxx" />
65 <ClInclude Include="hotkeys.hxx" /> 64 <ClInclude Include="hotkeys.hxx" />
66 <ClInclude Include="main.hxx" />
67 <ClInclude Include="ui_hotkeys.h" /> 65 <ClInclude Include="ui_hotkeys.h" />
68 <ClInclude Include="ui_image_info.h" /> 66 <ClInclude Include="main.hxx" />
69 <ClInclude Include="ui_main.h" /> 67 <ClInclude Include="ui_main.h" />
70 <ClInclude Include="ui_welcome_wizard.h" />
71 <ClInclude Include="version.h" /> 68 <ClInclude Include="version.h" />
72 <ClInclude Include="config\controller_config.hxx"> 69 <ClInclude Include="config\controller_config.hxx">
73 <Filter>config</Filter> 70 <Filter>config</Filter>
@@ -75,9 +72,6 @@
75 <ClInclude Include="config\controller_config_util.hxx"> 72 <ClInclude Include="config\controller_config_util.hxx">
76 <Filter>config</Filter> 73 <Filter>config</Filter>
77 </ClInclude> 74 </ClInclude>
78 <ClInclude Include="config\ui_controller_config.h">
79 <Filter>config</Filter>
80 </ClInclude>
81 <ClInclude Include="cpu_regs.hxx"> 75 <ClInclude Include="cpu_regs.hxx">
82 <Filter>debugger</Filter> 76 <Filter>debugger</Filter>
83 </ClInclude> 77 </ClInclude>
@@ -96,12 +90,12 @@
96 <ClInclude Include="ui_disasm.h"> 90 <ClInclude Include="ui_disasm.h">
97 <Filter>debugger</Filter> 91 <Filter>debugger</Filter>
98 </ClInclude> 92 </ClInclude>
99 <ClInclude Include="ui_gfx_fifo_player.h">
100 <Filter>debugger</Filter>
101 </ClInclude>
102 <ClInclude Include="callstack.hxx"> 93 <ClInclude Include="callstack.hxx">
103 <Filter>debugger</Filter> 94 <Filter>debugger</Filter>
104 </ClInclude> 95 </ClInclude>
96 <ClInclude Include="ui_controller_config.h">
97 <Filter>config</Filter>
98 </ClInclude>
105 </ItemGroup> 99 </ItemGroup>
106 <ItemGroup> 100 <ItemGroup>
107 <UIC Include="hotkeys.ui" /> 101 <UIC Include="hotkeys.ui" />
diff --git a/src/citra_qt/config/controller_config.hxx b/src/citra_qt/config/controller_config.hxx
index 9ff86a110..0e423ee50 100644
--- a/src/citra_qt/config/controller_config.hxx
+++ b/src/citra_qt/config/controller_config.hxx
@@ -3,7 +3,7 @@
3 3
4#include <QDialog> 4#include <QDialog>
5 5
6#include "ui_controller_config.h" 6//#include "ui_controller_config.h"
7 7
8/* TODO(bunnei): ImplementMe 8/* TODO(bunnei): ImplementMe
9 9
diff --git a/src/citra_qt/cpu_regs.cpp b/src/citra_qt/cpu_regs.cpp
index f2859f695..7e54e18b0 100644
--- a/src/citra_qt/cpu_regs.cpp
+++ b/src/citra_qt/cpu_regs.cpp
@@ -1,7 +1,7 @@
1#include "cpu_regs.hxx" 1#include "cpu_regs.hxx"
2 2
3#include "core.h" 3#include "core/core.h"
4#include "arm/interpreter/armdefs.h" 4#include "core/arm/interpreter/armdefs.h"
5 5
6GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent) 6GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
7{ 7{
@@ -42,22 +42,22 @@ void GARM11RegsView::OnCPUStepped()
42 ARM_Interface* app_core = Core::g_app_core; 42 ARM_Interface* app_core = Core::g_app_core;
43 43
44 for (int i = 0; i < 16; ++i) 44 for (int i = 0; i < 16; ++i)
45 registers->child(i)->setText(1, QString("0x%1").arg(app_core->Reg(i), 8, 16, QLatin1Char('0'))); 45 registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
46 46
47 CSPR->setText(1, QString("0x%1").arg(app_core->CPSR(), 8, 16, QLatin1Char('0'))); 47 CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));
48 CSPR->child(0)->setText(1, QString("b%1").arg(app_core->CPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode 48 CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
49 CSPR->child(1)->setText(1, QString("%1").arg((app_core->CPSR() >> 5) & 0x1)); // T - State 49 CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State
50 CSPR->child(2)->setText(1, QString("%1").arg((app_core->CPSR() >> 6) & 0x1)); // F - FIQ disable 50 CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable
51 CSPR->child(3)->setText(1, QString("%1").arg((app_core->CPSR() >> 7) & 0x1)); // I - IRQ disable 51 CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable
52 CSPR->child(4)->setText(1, QString("%1").arg((app_core->CPSR() >> 8) & 0x1)); // A - Imprecise abort 52 CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort
53 CSPR->child(5)->setText(1, QString("%1").arg((app_core->CPSR() >> 9) & 0x1)); // E - Data endianess 53 CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1)); // E - Data endianess
54 CSPR->child(6)->setText(1, QString("%1").arg((app_core->CPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM) 54 CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM)
55 CSPR->child(7)->setText(1, QString("%1").arg((app_core->CPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal 55 CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal
56 CSPR->child(8)->setText(1, QString("%1").arg((app_core->CPSR() >> 20) & 0xF)); // DNM - Do not modify 56 CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF)); // DNM - Do not modify
57 CSPR->child(9)->setText(1, QString("%1").arg((app_core->CPSR() >> 24) & 0x1)); // J - Java state 57 CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1)); // J - Java state
58 CSPR->child(10)->setText(1, QString("%1").arg((app_core->CPSR() >> 27) & 0x1)); // Q - Sticky overflow 58 CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1)); // Q - Sticky overflow
59 CSPR->child(11)->setText(1, QString("%1").arg((app_core->CPSR() >> 28) & 0x1)); // V - Overflow 59 CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1)); // V - Overflow
60 CSPR->child(12)->setText(1, QString("%1").arg((app_core->CPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend 60 CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend
61 CSPR->child(13)->setText(1, QString("%1").arg((app_core->CPSR() >> 30) & 0x1)); // Z - Zero 61 CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero
62 CSPR->child(14)->setText(1, QString("%1").arg((app_core->CPSR() >> 31) & 0x1)); // N - Negative/Less than 62 CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than
63} 63}
diff --git a/src/citra_qt/disasm.cpp b/src/citra_qt/disasm.cpp
index ddcbf69d8..c4f69cac0 100644
--- a/src/citra_qt/disasm.cpp
+++ b/src/citra_qt/disasm.cpp
@@ -5,13 +5,13 @@
5#include "bootmanager.hxx" 5#include "bootmanager.hxx"
6#include "hotkeys.hxx" 6#include "hotkeys.hxx"
7 7
8#include "common.h" 8#include "common/common.h"
9#include "mem_map.h" 9#include "core/mem_map.h"
10 10
11#include "core.h" 11#include "core/core.h"
12#include "break_points.h" 12#include "common/break_points.h"
13#include "arm/interpreter/armdefs.h" 13#include "core/arm/interpreter/armdefs.h"
14#include "arm/disassembler/arm_disasm.h" 14#include "core/arm/disassembler/arm_disasm.h"
15 15
16GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread) 16GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread)
17{ 17{
@@ -43,7 +43,7 @@ void GDisAsmView::Init()
43{ 43{
44 ARM_Disasm* disasm = new ARM_Disasm(); 44 ARM_Disasm* disasm = new ARM_Disasm();
45 45
46 base_addr = Core::g_app_core->PC(); 46 base_addr = Core::g_app_core->GetPC();
47 unsigned int curInstAddr = base_addr; 47 unsigned int curInstAddr = base_addr;
48 char result[255]; 48 char result[255];
49 49
@@ -112,7 +112,7 @@ void GDisAsmView::OnToggleStartStop()
112 112
113void GDisAsmView::OnCPUStepped() 113void GDisAsmView::OnCPUStepped()
114{ 114{
115 ARMword next_instr = Core::g_app_core->PC(); 115 ARMword next_instr = Core::g_app_core->GetPC();
116 116
117 if (breakpoints->IsAddressBreakPoint(next_instr)) 117 if (breakpoints->IsAddressBreakPoint(next_instr))
118 { 118 {
diff --git a/src/citra_qt/disasm.hxx b/src/citra_qt/disasm.hxx
index 0e4a0fc3d..0c5a37cac 100644
--- a/src/citra_qt/disasm.hxx
+++ b/src/citra_qt/disasm.hxx
@@ -1,8 +1,8 @@
1#include <QDockWidget> 1#include <QDockWidget>
2#include "ui_disasm.h" 2#include "ui_disasm.h"
3 3
4#include "common.h" 4#include "common/common.h"
5#include "break_points.h" 5#include "common/break_points.h"
6 6
7class QAction; 7class QAction;
8class QStandardItemModel; 8class QStandardItemModel;
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index d7104eb02..c022c28ab 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -4,8 +4,8 @@
4#include "qhexedit.h" 4#include "qhexedit.h"
5#include "main.hxx" 5#include "main.hxx"
6 6
7#include "common.h" 7#include "common/common.h"
8#include "platform.h" 8#include "common/platform.h"
9#if EMU_PLATFORM == PLATFORM_LINUX 9#if EMU_PLATFORM == PLATFORM_LINUX
10#include <unistd.h> 10#include <unistd.h>
11#endif 11#endif
@@ -19,9 +19,9 @@
19#include "callstack.hxx" 19#include "callstack.hxx"
20#include "ramview.hxx" 20#include "ramview.hxx"
21 21
22#include "system.h" 22#include "core/system.h"
23#include "loader.h" 23#include "core/loader.h"
24#include "core.h" 24#include "core/core.h"
25#include "version.h" 25#include "version.h"
26 26
27 27
diff --git a/src/citra_qt/qt-build.props b/src/citra_qt/qt-build.props
index d4600006c..c381f6bef 100644
--- a/src/citra_qt/qt-build.props
+++ b/src/citra_qt/qt-build.props
@@ -9,7 +9,7 @@
9 <UIC> 9 <UIC>
10 <QtUicExt>.hpp</QtUicExt> 10 <QtUicExt>.hpp</QtUicExt>
11 <QtUicPrefix>ui_</QtUicPrefix> 11 <QtUicPrefix>ui_</QtUicPrefix>
12 <CommandLineTemplate>%QTDIR%\bin\uic.exe [inputs] -o "[QtUicPrefix]%(FileName)[QtUicExt]"</CommandLineTemplate> 12 <CommandLineTemplate>$(QTDIR)\bin\uic.exe [inputs] -o "[QtUicPrefix]%(FileName)[QtUicExt]"</CommandLineTemplate>
13 <Outputs>[QtUicPrefix]%(FileName)[QtUicExt]</Outputs> 13 <Outputs>[QtUicPrefix]%(FileName)[QtUicExt]</Outputs>
14 <ExecutionDescription>%(FileName).ui</ExecutionDescription> 14 <ExecutionDescription>%(FileName).ui</ExecutionDescription>
15 </UIC> 15 </UIC>
@@ -33,7 +33,7 @@
33 <QtMocNoWarnings>False</QtMocNoWarnings> 33 <QtMocNoWarnings>False</QtMocNoWarnings>
34 <QtMocPfx>_moc</QtMocPfx> 34 <QtMocPfx>_moc</QtMocPfx>
35 <QtMocFilename>%(FileName)%(QtMocPfx)</QtMocFilename> 35 <QtMocFilename>%(FileName)%(QtMocPfx)</QtMocFilename>
36 <CommandLineTemplate>%QTDIR%\bin\moc.exe [QtMocNoWarnings] [QtCoreLib] [QtShared] [QtThread] [QtUnicode] [QtLargeFile] [QtKeywords] [QtOpenGLLib] [QtNoDebug] [QtGuiLib] -DWIN32 -D_MSC_VER=1500 -DWIN32 [Inputs] -o$(IntDir)%(QtMocFilename).cpp &amp;&amp; cl.exe $(IntDir)%(QtMocFilename).cpp [QtCommandLine] /c /Fo"$(IntDir)%(QtMocFilename).obj"</CommandLineTemplate> 36 <CommandLineTemplate>$(QTDIR)\bin\moc.exe [QtMocNoWarnings] [QtCoreLib] [QtShared] [QtThread] [QtUnicode] [QtLargeFile] [QtKeywords] [QtOpenGLLib] [QtNoDebug] [QtGuiLib] -DWIN32 -D_MSC_VER=1500 -DWIN32 [Inputs] -o$(IntDir)%(QtMocFilename).cpp &amp;&amp; cl.exe $(IntDir)%(QtMocFilename).cpp [QtCommandLine] /c /Fo"$(IntDir)%(QtMocFilename).obj"</CommandLineTemplate>
37 <Outputs>$(IntDir)%(QtMocFilename).obj</Outputs> 37 <Outputs>$(IntDir)%(QtMocFilename).obj</Outputs>
38 <ExecutionDescription>%(FileName).hxx</ExecutionDescription> 38 <ExecutionDescription>%(FileName).hxx</ExecutionDescription>
39 <ShowOnlyRuleProperties>true</ShowOnlyRuleProperties> 39 <ShowOnlyRuleProperties>true</ShowOnlyRuleProperties>
diff --git a/src/citra_qt/ramview.cpp b/src/citra_qt/ramview.cpp
index 8cc252af6..3f899b95e 100644
--- a/src/citra_qt/ramview.cpp
+++ b/src/citra_qt/ramview.cpp
@@ -1,7 +1,7 @@
1#include "ramview.hxx" 1#include "ramview.hxx"
2 2
3#include "common.h" 3#include "common/common.h"
4#include "memory.h" 4#include "core/mem_map.h"
5GRamView::GRamView(QWidget* parent) : QHexEdit(parent) 5GRamView::GRamView(QWidget* parent) : QHexEdit(parent)
6{ 6{
7} 7}
diff --git a/src/citra_qt/config/ui_controller_config.h b/src/citra_qt/ui_controller_config.h
index f84364a77..f84364a77 100644
--- a/src/citra_qt/config/ui_controller_config.h
+++ b/src/citra_qt/ui_controller_config.h
diff --git a/src/citra_qt/ui_gfx_fifo_player.h b/src/citra_qt/ui_gfx_fifo_player.h
deleted file mode 100644
index a65f56abd..000000000
--- a/src/citra_qt/ui_gfx_fifo_player.h
+++ /dev/null
@@ -1,209 +0,0 @@
1/********************************************************************************
2** Form generated from reading UI file 'gfx_fifo_player.ui'
3**
4** Created by: Qt User Interface Compiler version 4.8.5
5**
6** WARNING! All changes made in this file will be lost when recompiling UI file!
7********************************************************************************/
8
9#ifndef UI_GFX_FIFO_PLAYER_H
10#define UI_GFX_FIFO_PLAYER_H
11
12#include <QtCore/QVariant>
13#include <QtGui/QAction>
14#include <QtGui/QApplication>
15#include <QtGui/QButtonGroup>
16#include <QtGui/QCheckBox>
17#include <QtGui/QComboBox>
18#include <QtGui/QDockWidget>
19#include <QtGui/QGroupBox>
20#include <QtGui/QHBoxLayout>
21#include <QtGui/QHeaderView>
22#include <QtGui/QLabel>
23#include <QtGui/QPushButton>
24#include <QtGui/QRadioButton>
25#include <QtGui/QSpacerItem>
26#include <QtGui/QSpinBox>
27#include <QtGui/QVBoxLayout>
28#include <QtGui/QWidget>
29
30QT_BEGIN_NAMESPACE
31
32class Ui_GfxFifoPlayerControl
33{
34public:
35 QWidget *recordingGroup;
36 QVBoxLayout *verticalLayout;
37 QGroupBox *groupBox;
38 QVBoxLayout *verticalLayout_2;
39 QRadioButton *stopManuallyButton;
40 QHBoxLayout *horizontalLayout;
41 QRadioButton *radioButton_2;
42 QSpinBox *spinBox;
43 QComboBox *comboBox;
44 QSpacerItem *horizontalSpacer_2;
45 QSpacerItem *horizontalSpacer;
46 QCheckBox *pauseWhenDoneCheckbox;
47 QHBoxLayout *horizontalLayout_2;
48 QPushButton *startStopRecordingButton;
49 QPushButton *saveRecordingButton;
50 QGroupBox *playbackGroup;
51 QVBoxLayout *verticalLayout_3;
52 QHBoxLayout *horizontalLayout_3;
53 QLabel *label;
54 QComboBox *playbackSourceCombobox;
55 QCheckBox *checkBox_2;
56 QPushButton *startPlaybackButton;
57 QSpacerItem *verticalSpacer;
58
59 void setupUi(QDockWidget *GfxFifoPlayerControl)
60 {
61 if (GfxFifoPlayerControl->objectName().isEmpty())
62 GfxFifoPlayerControl->setObjectName(QString::fromUtf8("GfxFifoPlayerControl"));
63 GfxFifoPlayerControl->resize(275, 297);
64 recordingGroup = new QWidget();
65 recordingGroup->setObjectName(QString::fromUtf8("recordingGroup"));
66 verticalLayout = new QVBoxLayout(recordingGroup);
67 verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
68 groupBox = new QGroupBox(recordingGroup);
69 groupBox->setObjectName(QString::fromUtf8("groupBox"));
70 verticalLayout_2 = new QVBoxLayout(groupBox);
71 verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
72 stopManuallyButton = new QRadioButton(groupBox);
73 stopManuallyButton->setObjectName(QString::fromUtf8("stopManuallyButton"));
74 stopManuallyButton->setChecked(true);
75
76 verticalLayout_2->addWidget(stopManuallyButton);
77
78 horizontalLayout = new QHBoxLayout();
79 horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
80 radioButton_2 = new QRadioButton(groupBox);
81 radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
82
83 horizontalLayout->addWidget(radioButton_2);
84
85 spinBox = new QSpinBox(groupBox);
86 spinBox->setObjectName(QString::fromUtf8("spinBox"));
87 spinBox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
88 spinBox->setMinimum(1);
89 spinBox->setMaximum(99999);
90
91 horizontalLayout->addWidget(spinBox);
92
93 comboBox = new QComboBox(groupBox);
94 comboBox->setObjectName(QString::fromUtf8("comboBox"));
95
96 horizontalLayout->addWidget(comboBox);
97
98 horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
99
100 horizontalLayout->addItem(horizontalSpacer_2);
101
102 horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
103
104 horizontalLayout->addItem(horizontalSpacer);
105
106
107 verticalLayout_2->addLayout(horizontalLayout);
108
109 pauseWhenDoneCheckbox = new QCheckBox(groupBox);
110 pauseWhenDoneCheckbox->setObjectName(QString::fromUtf8("pauseWhenDoneCheckbox"));
111
112 verticalLayout_2->addWidget(pauseWhenDoneCheckbox);
113
114 horizontalLayout_2 = new QHBoxLayout();
115 horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
116 startStopRecordingButton = new QPushButton(groupBox);
117 startStopRecordingButton->setObjectName(QString::fromUtf8("startStopRecordingButton"));
118
119 horizontalLayout_2->addWidget(startStopRecordingButton);
120
121 saveRecordingButton = new QPushButton(groupBox);
122 saveRecordingButton->setObjectName(QString::fromUtf8("saveRecordingButton"));
123 saveRecordingButton->setEnabled(false);
124
125 horizontalLayout_2->addWidget(saveRecordingButton);
126
127
128 verticalLayout_2->addLayout(horizontalLayout_2);
129
130
131 verticalLayout->addWidget(groupBox);
132
133 playbackGroup = new QGroupBox(recordingGroup);
134 playbackGroup->setObjectName(QString::fromUtf8("playbackGroup"));
135 verticalLayout_3 = new QVBoxLayout(playbackGroup);
136 verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
137 horizontalLayout_3 = new QHBoxLayout();
138 horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
139 label = new QLabel(playbackGroup);
140 label->setObjectName(QString::fromUtf8("label"));
141
142 horizontalLayout_3->addWidget(label);
143
144 playbackSourceCombobox = new QComboBox(playbackGroup);
145 playbackSourceCombobox->setObjectName(QString::fromUtf8("playbackSourceCombobox"));
146
147 horizontalLayout_3->addWidget(playbackSourceCombobox);
148
149
150 verticalLayout_3->addLayout(horizontalLayout_3);
151
152 checkBox_2 = new QCheckBox(playbackGroup);
153 checkBox_2->setObjectName(QString::fromUtf8("checkBox_2"));
154
155 verticalLayout_3->addWidget(checkBox_2);
156
157 startPlaybackButton = new QPushButton(playbackGroup);
158 startPlaybackButton->setObjectName(QString::fromUtf8("startPlaybackButton"));
159
160 verticalLayout_3->addWidget(startPlaybackButton);
161
162 verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
163
164 verticalLayout_3->addItem(verticalSpacer);
165
166
167 verticalLayout->addWidget(playbackGroup);
168
169 GfxFifoPlayerControl->setWidget(recordingGroup);
170
171 retranslateUi(GfxFifoPlayerControl);
172
173 QMetaObject::connectSlotsByName(GfxFifoPlayerControl);
174 } // setupUi
175
176 void retranslateUi(QDockWidget *GfxFifoPlayerControl)
177 {
178 GfxFifoPlayerControl->setWindowTitle(QApplication::translate("GfxFifoPlayerControl", "Fifo Player", 0, QApplication::UnicodeUTF8));
179 groupBox->setTitle(QApplication::translate("GfxFifoPlayerControl", "Recording", 0, QApplication::UnicodeUTF8));
180 stopManuallyButton->setText(QApplication::translate("GfxFifoPlayerControl", "Stop manually", 0, QApplication::UnicodeUTF8));
181 radioButton_2->setText(QApplication::translate("GfxFifoPlayerControl", "Stop after", 0, QApplication::UnicodeUTF8));
182 comboBox->clear();
183 comboBox->insertItems(0, QStringList()
184 << QApplication::translate("GfxFifoPlayerControl", "Frames", 0, QApplication::UnicodeUTF8)
185 << QApplication::translate("GfxFifoPlayerControl", "Flushes", 0, QApplication::UnicodeUTF8)
186 );
187 pauseWhenDoneCheckbox->setText(QApplication::translate("GfxFifoPlayerControl", "Pause when done", 0, QApplication::UnicodeUTF8));
188 startStopRecordingButton->setText(QApplication::translate("GfxFifoPlayerControl", "Start", 0, QApplication::UnicodeUTF8));
189 saveRecordingButton->setText(QApplication::translate("GfxFifoPlayerControl", "Save to File...", 0, QApplication::UnicodeUTF8));
190 playbackGroup->setTitle(QApplication::translate("GfxFifoPlayerControl", "Playback", 0, QApplication::UnicodeUTF8));
191 label->setText(QApplication::translate("GfxFifoPlayerControl", "Playback source:", 0, QApplication::UnicodeUTF8));
192 playbackSourceCombobox->clear();
193 playbackSourceCombobox->insertItems(0, QStringList()
194 << QApplication::translate("GfxFifoPlayerControl", "Last Recording", 0, QApplication::UnicodeUTF8)
195 << QApplication::translate("GfxFifoPlayerControl", "From File...", 0, QApplication::UnicodeUTF8)
196 );
197 checkBox_2->setText(QApplication::translate("GfxFifoPlayerControl", "Loop", 0, QApplication::UnicodeUTF8));
198 startPlaybackButton->setText(QApplication::translate("GfxFifoPlayerControl", "Start", 0, QApplication::UnicodeUTF8));
199 } // retranslateUi
200
201};
202
203namespace Ui {
204 class GfxFifoPlayerControl: public Ui_GfxFifoPlayerControl {};
205} // namespace Ui
206
207QT_END_NAMESPACE
208
209#endif // UI_GFX_FIFO_PLAYER_H
diff --git a/src/citra_qt/ui_image_info.h b/src/citra_qt/ui_image_info.h
deleted file mode 100644
index a6aaa3d8d..000000000
--- a/src/citra_qt/ui_image_info.h
+++ /dev/null
@@ -1,154 +0,0 @@
1/********************************************************************************
2** Form generated from reading UI file 'image_info.ui'
3**
4** Created by: Qt User Interface Compiler version 4.8.5
5**
6** WARNING! All changes made in this file will be lost when recompiling UI file!
7********************************************************************************/
8
9#ifndef UI_IMAGE_INFO_H
10#define UI_IMAGE_INFO_H
11
12#include <QtCore/QVariant>
13#include <QtGui/QAction>
14#include <QtGui/QApplication>
15#include <QtGui/QButtonGroup>
16#include <QtGui/QDockWidget>
17#include <QtGui/QFormLayout>
18#include <QtGui/QHeaderView>
19#include <QtGui/QLabel>
20#include <QtGui/QLineEdit>
21#include <QtGui/QPlainTextEdit>
22#include <QtGui/QWidget>
23
24QT_BEGIN_NAMESPACE
25
26class Ui_ImageInfo
27{
28public:
29 QWidget *dockWidgetContents;
30 QFormLayout *formLayout;
31 QLabel *label_name;
32 QLabel *label_gameid;
33 QLabel *label_country;
34 QLabel *label_bannertext;
35 QLineEdit *line_name;
36 QLineEdit *line_gameid;
37 QLineEdit *line_country;
38 QLabel *label_banner;
39 QLabel *label_developer;
40 QLineEdit *line_developer;
41 QLabel *label_description;
42 QPlainTextEdit *edit_description;
43
44 void setupUi(QDockWidget *ImageInfo)
45 {
46 if (ImageInfo->objectName().isEmpty())
47 ImageInfo->setObjectName(QString::fromUtf8("ImageInfo"));
48 ImageInfo->resize(400, 300);
49 dockWidgetContents = new QWidget();
50 dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
51 formLayout = new QFormLayout(dockWidgetContents);
52 formLayout->setObjectName(QString::fromUtf8("formLayout"));
53 label_name = new QLabel(dockWidgetContents);
54 label_name->setObjectName(QString::fromUtf8("label_name"));
55
56 formLayout->setWidget(1, QFormLayout::LabelRole, label_name);
57
58 label_gameid = new QLabel(dockWidgetContents);
59 label_gameid->setObjectName(QString::fromUtf8("label_gameid"));
60
61 formLayout->setWidget(4, QFormLayout::LabelRole, label_gameid);
62
63 label_country = new QLabel(dockWidgetContents);
64 label_country->setObjectName(QString::fromUtf8("label_country"));
65
66 formLayout->setWidget(5, QFormLayout::LabelRole, label_country);
67
68 label_bannertext = new QLabel(dockWidgetContents);
69 label_bannertext->setObjectName(QString::fromUtf8("label_bannertext"));
70
71 formLayout->setWidget(9, QFormLayout::LabelRole, label_bannertext);
72
73 line_name = new QLineEdit(dockWidgetContents);
74 line_name->setObjectName(QString::fromUtf8("line_name"));
75 line_name->setEnabled(true);
76 line_name->setReadOnly(true);
77
78 formLayout->setWidget(1, QFormLayout::FieldRole, line_name);
79
80 line_gameid = new QLineEdit(dockWidgetContents);
81 line_gameid->setObjectName(QString::fromUtf8("line_gameid"));
82 line_gameid->setEnabled(true);
83 line_gameid->setReadOnly(true);
84
85 formLayout->setWidget(4, QFormLayout::FieldRole, line_gameid);
86
87 line_country = new QLineEdit(dockWidgetContents);
88 line_country->setObjectName(QString::fromUtf8("line_country"));
89 line_country->setEnabled(true);
90 line_country->setReadOnly(true);
91
92 formLayout->setWidget(5, QFormLayout::FieldRole, line_country);
93
94 label_banner = new QLabel(dockWidgetContents);
95 label_banner->setObjectName(QString::fromUtf8("label_banner"));
96 label_banner->setAlignment(Qt::AlignCenter);
97
98 formLayout->setWidget(9, QFormLayout::FieldRole, label_banner);
99
100 label_developer = new QLabel(dockWidgetContents);
101 label_developer->setObjectName(QString::fromUtf8("label_developer"));
102
103 formLayout->setWidget(3, QFormLayout::LabelRole, label_developer);
104
105 line_developer = new QLineEdit(dockWidgetContents);
106 line_developer->setObjectName(QString::fromUtf8("line_developer"));
107 line_developer->setReadOnly(true);
108
109 formLayout->setWidget(3, QFormLayout::FieldRole, line_developer);
110
111 label_description = new QLabel(dockWidgetContents);
112 label_description->setObjectName(QString::fromUtf8("label_description"));
113
114 formLayout->setWidget(7, QFormLayout::LabelRole, label_description);
115
116 edit_description = new QPlainTextEdit(dockWidgetContents);
117 edit_description->setObjectName(QString::fromUtf8("edit_description"));
118 edit_description->setMaximumSize(QSize(16777215, 80));
119 edit_description->setReadOnly(true);
120 edit_description->setPlainText(QString::fromUtf8(""));
121
122 formLayout->setWidget(7, QFormLayout::FieldRole, edit_description);
123
124 ImageInfo->setWidget(dockWidgetContents);
125
126 retranslateUi(ImageInfo);
127
128 QMetaObject::connectSlotsByName(ImageInfo);
129 } // setupUi
130
131 void retranslateUi(QDockWidget *ImageInfo)
132 {
133 ImageInfo->setWindowTitle(QApplication::translate("ImageInfo", "Image Info", 0, QApplication::UnicodeUTF8));
134 label_name->setText(QApplication::translate("ImageInfo", "Name", 0, QApplication::UnicodeUTF8));
135 label_gameid->setText(QApplication::translate("ImageInfo", "Game ID", 0, QApplication::UnicodeUTF8));
136 label_country->setText(QApplication::translate("ImageInfo", "Country", 0, QApplication::UnicodeUTF8));
137 label_bannertext->setText(QApplication::translate("ImageInfo", "Banner", 0, QApplication::UnicodeUTF8));
138 line_name->setText(QString());
139 line_gameid->setText(QString());
140 line_country->setText(QApplication::translate("ImageInfo", "EUROPE", 0, QApplication::UnicodeUTF8));
141 label_banner->setText(QString());
142 label_developer->setText(QApplication::translate("ImageInfo", "Developer", 0, QApplication::UnicodeUTF8));
143 label_description->setText(QApplication::translate("ImageInfo", "Description", 0, QApplication::UnicodeUTF8));
144 } // retranslateUi
145
146};
147
148namespace Ui {
149 class ImageInfo: public Ui_ImageInfo {};
150} // namespace Ui
151
152QT_END_NAMESPACE
153
154#endif // UI_IMAGE_INFO_H
diff --git a/src/citra_qt/ui_welcome_wizard.h b/src/citra_qt/ui_welcome_wizard.h
deleted file mode 100644
index 0cc5ceb49..000000000
--- a/src/citra_qt/ui_welcome_wizard.h
+++ /dev/null
@@ -1,124 +0,0 @@
1/********************************************************************************
2** Form generated from reading UI file 'welcome_wizard.ui'
3**
4** Created by: Qt User Interface Compiler version 4.8.5
5**
6** WARNING! All changes made in this file will be lost when recompiling UI file!
7********************************************************************************/
8
9#ifndef UI_WELCOME_WIZARD_H
10#define UI_WELCOME_WIZARD_H
11
12#include <QtCore/QVariant>
13#include <QtGui/QAction>
14#include <QtGui/QApplication>
15#include <QtGui/QButtonGroup>
16#include <QtGui/QHBoxLayout>
17#include <QtGui/QHeaderView>
18#include <QtGui/QLineEdit>
19#include <QtGui/QPushButton>
20#include <QtGui/QSpacerItem>
21#include <QtGui/QVBoxLayout>
22#include <QtGui/QWizard>
23#include <QtGui/QWizardPage>
24#include "path_list.hxx"
25
26QT_BEGIN_NAMESPACE
27
28class Ui_WelcomeWizard
29{
30public:
31 QWizardPage *wizardPage1;
32 QWizardPage *wizardPage2;
33 QVBoxLayout *verticalLayout_2;
34 QHBoxLayout *horizontalLayout;
35 QLineEdit *edit_path;
36 QPushButton *button_browse_path;
37 QHBoxLayout *horizontalLayout_2;
38 GPathList *path_list;
39 QVBoxLayout *verticalLayout_3;
40 QPushButton *button_add_path;
41 QSpacerItem *verticalSpacer;
42
43 void setupUi(QWizard *WelcomeWizard)
44 {
45 if (WelcomeWizard->objectName().isEmpty())
46 WelcomeWizard->setObjectName(QString::fromUtf8("WelcomeWizard"));
47 WelcomeWizard->resize(510, 300);
48 WelcomeWizard->setModal(true);
49 wizardPage1 = new QWizardPage();
50 wizardPage1->setObjectName(QString::fromUtf8("wizardPage1"));
51 WelcomeWizard->addPage(wizardPage1);
52 wizardPage2 = new QWizardPage();
53 wizardPage2->setObjectName(QString::fromUtf8("wizardPage2"));
54 verticalLayout_2 = new QVBoxLayout(wizardPage2);
55 verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
56 horizontalLayout = new QHBoxLayout();
57 horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
58 edit_path = new QLineEdit(wizardPage2);
59 edit_path->setObjectName(QString::fromUtf8("edit_path"));
60 edit_path->setReadOnly(true);
61
62 horizontalLayout->addWidget(edit_path);
63
64 button_browse_path = new QPushButton(wizardPage2);
65 button_browse_path->setObjectName(QString::fromUtf8("button_browse_path"));
66
67 horizontalLayout->addWidget(button_browse_path);
68
69
70 verticalLayout_2->addLayout(horizontalLayout);
71
72 horizontalLayout_2 = new QHBoxLayout();
73 horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
74 path_list = new GPathList(wizardPage2);
75 path_list->setObjectName(QString::fromUtf8("path_list"));
76
77 horizontalLayout_2->addWidget(path_list);
78
79 verticalLayout_3 = new QVBoxLayout();
80 verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
81 button_add_path = new QPushButton(wizardPage2);
82 button_add_path->setObjectName(QString::fromUtf8("button_add_path"));
83
84 verticalLayout_3->addWidget(button_add_path);
85
86 verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
87
88 verticalLayout_3->addItem(verticalSpacer);
89
90
91 horizontalLayout_2->addLayout(verticalLayout_3);
92
93
94 verticalLayout_2->addLayout(horizontalLayout_2);
95
96 WelcomeWizard->addPage(wizardPage2);
97
98 retranslateUi(WelcomeWizard);
99
100 QMetaObject::connectSlotsByName(WelcomeWizard);
101 } // setupUi
102
103 void retranslateUi(QWizard *WelcomeWizard)
104 {
105 WelcomeWizard->setWindowTitle(QApplication::translate("WelcomeWizard", "Welcome", 0, QApplication::UnicodeUTF8));
106 wizardPage1->setTitle(QApplication::translate("WelcomeWizard", "Welcome", 0, QApplication::UnicodeUTF8));
107 wizardPage1->setSubTitle(QApplication::translate("WelcomeWizard", "This wizard will guide you through the initial configuration.", 0, QApplication::UnicodeUTF8));
108 wizardPage2->setTitle(QApplication::translate("WelcomeWizard", "ISO paths", 0, QApplication::UnicodeUTF8));
109 wizardPage2->setSubTitle(QApplication::translate("WelcomeWizard", "If you have a collection of game images, you can add them to the path list here. Gekko will automatically show a list of your collection on startup then.", 0, QApplication::UnicodeUTF8));
110 edit_path->setText(QString());
111 edit_path->setPlaceholderText(QApplication::translate("WelcomeWizard", "Select a path to add ...", 0, QApplication::UnicodeUTF8));
112 button_browse_path->setText(QString());
113 button_add_path->setText(QString());
114 } // retranslateUi
115
116};
117
118namespace Ui {
119 class WelcomeWizard: public Ui_WelcomeWizard {};
120} // namespace Ui
121
122QT_END_NAMESPACE
123
124#endif // UI_WELCOME_WIZARD_H
diff --git a/vsprops/qt.props b/vsprops/qt.props
index f9cfb1e25..484507323 100644
--- a/vsprops/qt.props
+++ b/vsprops/qt.props
@@ -14,11 +14,11 @@
14 </ItemDefinitionGroup> 14 </ItemDefinitionGroup>
15 <ItemDefinitionGroup> 15 <ItemDefinitionGroup>
16 <UIC> 16 <UIC>
17 <QtUicPrefix>src/ui_</QtUicPrefix> 17 <QtUicPrefix>ui_</QtUicPrefix>
18 <QtUicExt>.h</QtUicExt> 18 <QtUicExt>.h</QtUicExt>
19 </UIC> 19 </UIC>
20 <MOC> 20 <MOC>
21 <QtCommandLine>/I"$(SolutionDir)src\common\src" /I"$(SolutionDir)src\core\src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit"</QtCommandLine> 21 <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit"</QtCommandLine>
22 <QtKeywords>false</QtKeywords> 22 <QtKeywords>false</QtKeywords>
23 </MOC> 23 </MOC>
24 <Link /> 24 <Link />
diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props
index dcba690f0..2b2ced9bc 100644
--- a/vsprops/qt_libs_debug.props
+++ b/vsprops/qt_libs_debug.props
@@ -9,7 +9,7 @@
9 </Link> 9 </Link>
10 <MOC> 10 <MOC>
11 <QtNoDebug>false</QtNoDebug> 11 <QtNoDebug>false</QtNoDebug>
12 <QtCommandLine>/I"$(SolutionDir)src\common\src" /I"$(SolutionDir)src\core\src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine> 12 <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine>
13 </MOC> 13 </MOC>
14 </ItemDefinitionGroup> 14 </ItemDefinitionGroup>
15 <ItemGroup /> 15 <ItemGroup />
HIC SVNT DRACONES