mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-11 18:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: Update to match rest of emu.

Browse source
This commit is contained in:
Sacha 2014-07-09 02:26:31 +10:00
commit 2ba5ada9f8
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/rpcs3qt/qml/main.qml
View file

@ -6,16 +6,16 @@ import GLViewer 1.0
ApplicationWindow { ApplicationWindow {
visible: true visible: true
title: qsTr("RPCS3 Qt") title: qsTr("RPCS3 Qt")
width: 500 width: Screen.desktopAvailableWidth / 2
height: 500 height: Screen.desktopAvailableHeight / 2
menuBar: MenuBar { menuBar: MenuBar {
Menu { Menu {
title: qsTr("&Boot") title: qsTr("&Boot")
MenuItem { text: qsTr("&Boot Game...") } MenuItem { text: qsTr("&Boot Game...") }
MenuItem { text: qsTr("&Boot Game and Start...") }
MenuItem { text: qsTr("&Install PKG") } MenuItem { text: qsTr("&Install PKG") }
MenuSeparator {} MenuSeparator {}
MenuItem { text: qsTr("Boot &ELF") } MenuItem { text: qsTr("Boot &(S)ELF") }
MenuItem { text: qsTr("Boot &SELF") }
MenuSeparator {} MenuSeparator {}
MenuItem { text: qsTr("E\&xit"); onTriggered: Qt.quit() } MenuItem { text: qsTr("E\&xit"); onTriggered: Qt.quit() }
} }
@ -30,6 +30,7 @@ ApplicationWindow {
Menu { Menu {
title: qsTr("&Config") title: qsTr("&Config")
MenuItem { text: qsTr("&Settings") } MenuItem { text: qsTr("&Settings") }
MenuItem { text: qsTr("&PAD Settings") }
MenuSeparator {} MenuSeparator {}
MenuItem { text: qsTr("Virtual &File System Manager") } MenuItem { text: qsTr("Virtual &File System Manager") }
MenuItem { text: qsTr("Virtual &HDD Manager") } MenuItem { text: qsTr("Virtual &HDD Manager") }
@ -38,6 +39,7 @@ ApplicationWindow {
title: qsTr("&Tools") title: qsTr("&Tools")
MenuItem { text: qsTr("&ELF Compiler") } MenuItem { text: qsTr("&ELF Compiler") }
MenuItem { text: qsTr("&Memory Viewer") } MenuItem { text: qsTr("&Memory Viewer") }
MenuItem { text: qsTr("&RSX Debugger") }
} }
Menu { Menu {
title: qsTr("&Help") title: qsTr("&Help")

2
rpcs3/rpcs3qt/rpcs3qt.pro
View file

@ -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 QT += gui opengl quick
CONFIG += c++11 CONFIG += c++11

6
rpcs3/stdafx.h
View file

@ -50,6 +50,10 @@
#endif // _DEBUG #endif // _DEBUG
#endif // MSVC_CRT_MEMLEAK_DETECTION #endif // MSVC_CRT_MEMLEAK_DETECTION
// This header should be frontend-agnostic, so don't assume wx includes everything
#include <cstdio>
#include <cstring>
#include <cassert>
#include <cstdint> #include <cstdint>
typedef unsigned int uint; typedef unsigned int uint;
@ -302,7 +306,9 @@ enum Status
#include "Emu/FS/vfsStreamMemory.h" #include "Emu/FS/vfsStreamMemory.h"
#include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsFile.h"
#include "Emu/FS/vfsDir.h" #include "Emu/FS/vfsDir.h"
#ifndef QT_UI
#include "rpcs3.h" #include "rpcs3.h"
#endif
#define _PRGNAME_ "RPCS3" #define _PRGNAME_ "RPCS3"
#define _PRGVER_ "0.0.0.4" #define _PRGVER_ "0.0.0.4"