Permalink
Browse files

Qt Debugger: Remove texture viewer.

No longer worked anyway.  Being replaced by WebSocket debugger.
  • Loading branch information...
unknownbrackets committed Jun 3, 2018
1 parent cf33e85 commit ec398cbb1fa0fb041736dda5f4ed8db1da4b679d
View
@@ -756,20 +756,13 @@ elseif(USING_QT_UI)
if(NOT SDL2_FOUND)
find_package(Qt5 COMPONENTS Multimedia)
endif(NOT SDL2_FOUND)
set(Qt_UI
Qt/Debugger/debugger_memorytex.ui
)
qt5_wrap_ui(QT_UI_GEN ${Qt_UI})
list(APPEND NativeAppSource
${QT_UI_GEN}
Qt/QtMain.cpp
Qt/QtMain.h
Qt/QtHost.cpp
Qt/QtHost.h
Qt/mainwindow.cpp
Qt/mainwindow.h
Qt/Debugger/debugger_memorytex.cpp
Qt/Debugger/debugger_memorytex.h
)
add_definitions(-DUSING_QT_UI)
include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt Qt/Debugger)

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -20,8 +20,7 @@ MainWindow::MainWindow(QWidget *parent, bool fullscreen) :
QMainWindow(parent),
currentLanguage("en"),
nextState(CORE_POWERDOWN),
lastUIState(UISTATE_MENU),
memoryTexWindow(0)
lastUIState(UISTATE_MENU)
{
QDesktopWidget *desktop = QApplication::desktop();
int screenNum = QProcessEnvironment::systemEnvironment().value("SDL_VIDEO_FULLSCREEN_HEAD", "0").toInt();
@@ -139,8 +138,6 @@ void MainWindow::bootDone()
if(g_Config.bFullScreen != isFullScreen())
fullscrAct();
memoryTexWindow = new Debugger_MemoryTex(this);
if (nextState == CORE_RUNNING)
runAct();
updateMenus();
@@ -162,9 +159,6 @@ void MainWindow::closeAct()
{
updateMenus();
if(memoryTexWindow && memoryTexWindow->isVisible())
memoryTexWindow->close();
NativeMessageReceived("stop", "");
SetGameTitle("");
}
@@ -244,9 +238,6 @@ void MainWindow::resetAct()
{
updateMenus();
if(memoryTexWindow)
memoryTexWindow->close();
NativeMessageReceived("reset", "");
}
@@ -305,15 +296,8 @@ void MainWindow::consoleAct()
LogManager::GetInstance()->GetConsoleListener()->Show(LogManager::GetInstance()->GetConsoleListener()->Hidden());
}
void MainWindow::memviewTexAct()
{
if(memoryTexWindow)
memoryTexWindow->show();
}
void MainWindow::raiseTopMost()
{
setWindowState( (windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
raise();
activateWindow();
@@ -488,8 +472,6 @@ void MainWindow::createMenus()
debugMenu->addSeparator();
debugMenu->add(new MenuAction(this, SLOT(consoleAct()), QT_TR_NOOP("Log Console")))
->addDisableState(UISTATE_MENU);
debugMenu->add(new MenuAction(this, SLOT(memviewTexAct()),QT_TR_NOOP("Memory View Texture")))
->addDisableState(UISTATE_MENU);
// Options
MenuTree* optionsMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Options"));
View
@@ -12,7 +12,6 @@
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Debugger/debugger_memorytex.h"
#include "Qt/QtMain.h"
extern bool g_TakeScreenshot;
@@ -34,7 +33,6 @@ class MainWindow : public QMainWindow
explicit MainWindow(QWidget *parent = 0, bool fullscreen=false);
~MainWindow() { };
Debugger_MemoryTex* GetDialogMemoryTex() { return memoryTexWindow; }
CoreState GetNextState() { return nextState; }
void updateMenus();
@@ -91,7 +89,6 @@ private slots:
void dumpNextAct();
void takeScreen() { g_TakeScreenshot = true; }
void consoleAct();
void memviewTexAct();
// Options
// Core
@@ -156,8 +153,6 @@ private slots:
CoreState nextState;
GlobalUIState lastUIState;
Debugger_MemoryTex *memoryTexWindow;
QActionGroup *anisotropicGroup, *screenGroup, *displayLayoutGroup,
*defaultLogGroup, *g3dLogGroup, *hleLogGroup;
Oops, something went wrong.

0 comments on commit ec398cb

Please sign in to comment.