Skip to content

Commit

Permalink
Qt Debugger: Remove texture viewer.
Browse files Browse the repository at this point in the history
No longer worked anyway.  Being replaced by WebSocket debugger.
  • Loading branch information
unknownbrackets committed Jun 6, 2018
1 parent cf33e85 commit ec398cb
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 312 deletions.
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
60 changes: 0 additions & 60 deletions Qt/Debugger/debugger_memorytex.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions Qt/Debugger/debugger_memorytex.h

This file was deleted.

177 changes: 0 additions & 177 deletions Qt/Debugger/debugger_memorytex.ui

This file was deleted.

20 changes: 1 addition & 19 deletions Qt/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -139,8 +138,6 @@ void MainWindow::bootDone()
if(g_Config.bFullScreen != isFullScreen())
fullscrAct();

memoryTexWindow = new Debugger_MemoryTex(this);

if (nextState == CORE_RUNNING)
runAct();
updateMenus();
Expand All @@ -162,9 +159,6 @@ void MainWindow::closeAct()
{
updateMenus();

if(memoryTexWindow && memoryTexWindow->isVisible())
memoryTexWindow->close();

NativeMessageReceived("stop", "");
SetGameTitle("");
}
Expand Down Expand Up @@ -244,9 +238,6 @@ void MainWindow::resetAct()
{
updateMenus();

if(memoryTexWindow)
memoryTexWindow->close();

NativeMessageReceived("reset", "");
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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"));
Expand Down
5 changes: 0 additions & 5 deletions Qt/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -91,7 +89,6 @@ private slots:
void dumpNextAct();
void takeScreen() { g_TakeScreenshot = true; }
void consoleAct();
void memviewTexAct();

// Options
// Core
Expand Down Expand Up @@ -156,8 +153,6 @@ private slots:
CoreState nextState;
GlobalUIState lastUIState;

Debugger_MemoryTex *memoryTexWindow;

QActionGroup *anisotropicGroup, *screenGroup, *displayLayoutGroup,
*defaultLogGroup, *g3dLogGroup, *hleLogGroup;

Expand Down
Loading

0 comments on commit ec398cb

Please sign in to comment.