diff --git a/rpcs3/rpcs3qt/qml/main.qml b/rpcs3/rpcs3qt/qml/main.qml index 0231af1a73..e6307bc49b 100644 --- a/rpcs3/rpcs3qt/qml/main.qml +++ b/rpcs3/rpcs3qt/qml/main.qml @@ -6,16 +6,16 @@ import GLViewer 1.0 ApplicationWindow { visible: true title: qsTr("RPCS3 Qt") - width: 500 - height: 500 + width: Screen.desktopAvailableWidth / 2 + height: Screen.desktopAvailableHeight / 2 menuBar: MenuBar { Menu { title: qsTr("&Boot") MenuItem { text: qsTr("&Boot Game...") } + MenuItem { text: qsTr("&Boot Game and Start...") } MenuItem { text: qsTr("&Install PKG") } MenuSeparator {} - MenuItem { text: qsTr("Boot &ELF") } - MenuItem { text: qsTr("Boot &SELF") } + MenuItem { text: qsTr("Boot &(S)ELF") } MenuSeparator {} MenuItem { text: qsTr("E\&xit"); onTriggered: Qt.quit() } } @@ -30,6 +30,7 @@ ApplicationWindow { Menu { title: qsTr("&Config") MenuItem { text: qsTr("&Settings") } + MenuItem { text: qsTr("&PAD Settings") } MenuSeparator {} MenuItem { text: qsTr("Virtual &File System Manager") } MenuItem { text: qsTr("Virtual &HDD Manager") } @@ -38,6 +39,7 @@ ApplicationWindow { title: qsTr("&Tools") MenuItem { text: qsTr("&ELF Compiler") } MenuItem { text: qsTr("&Memory Viewer") } + MenuItem { text: qsTr("&RSX Debugger") } } Menu { title: qsTr("&Help") diff --git a/rpcs3/rpcs3qt/rpcs3qt.pro b/rpcs3/rpcs3qt/rpcs3qt.pro index 977c740315..6bdf680161 100644 --- a/rpcs3/rpcs3qt/rpcs3qt.pro +++ b/rpcs3/rpcs3qt/rpcs3qt.pro @@ -1,4 +1,4 @@ -# Qt5.1+ project for rpcs3. Works on Windows, Linux and Mac OSX +# Qt5.2+ project for rpcs3. Works on Windows, Linux and Mac OSX QT += gui opengl quick CONFIG += c++11 diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 77a9cac9b3..4fbb2d8d3e 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -50,6 +50,10 @@ #endif // _DEBUG #endif // MSVC_CRT_MEMLEAK_DETECTION +// This header should be frontend-agnostic, so don't assume wx includes everything +#include +#include +#include #include typedef unsigned int uint; @@ -302,7 +306,9 @@ enum Status #include "Emu/FS/vfsStreamMemory.h" #include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsDir.h" +#ifndef QT_UI #include "rpcs3.h" +#endif #define _PRGNAME_ "RPCS3" #define _PRGVER_ "0.0.0.4"