Skip to content

Commit

Permalink
GUI:
Browse files Browse the repository at this point in the history
- Rename ResourceInfoPanel -> PanelResourceInfo for consistency.
- Remove old (wx) files.
  • Loading branch information
fdde authored and DrMcCoy committed Dec 27, 2017
1 parent b2b9e58 commit 64a5c7e
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 268 deletions.
73 changes: 0 additions & 73 deletions src/gui/about.cpp

This file was deleted.

47 changes: 0 additions & 47 deletions src/gui/about.h

This file was deleted.

75 changes: 0 additions & 75 deletions src/gui/eventid.h

This file was deleted.

18 changes: 9 additions & 9 deletions src/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "src/gui/panelpreviewimage.h"
#include "src/gui/panelpreviewsound.h"
#include "src/gui/panelpreviewtext.h"
#include "src/gui/resourceinfopanel.h"
#include "src/gui/panelresourceinfo.h"
#include "src/gui/resourcetree.h"
#include "src/gui/resourcetreeitem.h"
#include "src/images/dumptga.h"
Expand All @@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent, const char *version, const QSize &size,
_panelPreviewImage = new PanelPreviewImage();
_panelPreviewSound = new PanelPreviewSound();
_panelPreviewText = new PanelPreviewText();
_resInfo = new ResourceInfoPanel();
_resInfo = new PanelResourceInfo();

_ui.resBox->addWidget(_resInfo);
_ui.resLayout->addWidget(_panelPreviewEmpty);
Expand All @@ -48,13 +48,13 @@ MainWindow::MainWindow(QWidget *parent, const char *version, const QSize &size,
QObject::connect(_ui.actionOpenFile, &QAction::triggered, this, &MainWindow::slotOpenFile);
QObject::connect(_ui.actionClose, &QAction::triggered, this, &MainWindow::slotCloseDir);
QObject::connect(_ui.actionQuit, &QAction::triggered, this, &MainWindow::slotQuit);
QObject::connect(_resInfo, &ResourceInfoPanel::loadModel, this, &MainWindow::setTreeViewModel);
QObject::connect(_resInfo, &ResourceInfoPanel::logAppend, this, &MainWindow::slotLogAppend);
QObject::connect(_resInfo, &ResourceInfoPanel::closeDirClicked, this, &MainWindow::slotCloseDir);
QObject::connect(_resInfo, &ResourceInfoPanel::saveClicked, this, &MainWindow::saveItem);
QObject::connect(_resInfo, &ResourceInfoPanel::exportTGAClicked, this, &MainWindow::exportTGA);
QObject::connect(_resInfo, &ResourceInfoPanel::exportBMUMP3Clicked, this, &MainWindow::exportBMUMP3);
QObject::connect(_resInfo, &ResourceInfoPanel::exportWAVClicked, this, &MainWindow::exportWAV);
QObject::connect(_resInfo, &PanelResourceInfo::loadModel, this, &MainWindow::setTreeViewModel);
QObject::connect(_resInfo, &PanelResourceInfo::logAppend, this, &MainWindow::slotLogAppend);
QObject::connect(_resInfo, &PanelResourceInfo::closeDirClicked, this, &MainWindow::slotCloseDir);
QObject::connect(_resInfo, &PanelResourceInfo::saveClicked, this, &MainWindow::saveItem);
QObject::connect(_resInfo, &PanelResourceInfo::exportTGAClicked, this, &MainWindow::exportTGA);
QObject::connect(_resInfo, &PanelResourceInfo::exportBMUMP3Clicked, this, &MainWindow::exportBMUMP3);
QObject::connect(_resInfo, &PanelResourceInfo::exportWAVClicked, this, &MainWindow::exportWAV);
QObject::connect(_ui.actionAbout, &QAction::triggered, this, &MainWindow::slotAbout);

_ui.actionAbout->setShortcut(QKeySequence(tr("F1")));
Expand Down
4 changes: 2 additions & 2 deletions src/gui/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class PanelPreviewEmpty;
class PanelPreviewImage;
class PanelPreviewSound;
class PanelPreviewText;
class ResourceInfoPanel;
class PanelResourceInfo;
class ResourceTreeItem;
class ResourceTree;

Expand Down Expand Up @@ -77,7 +77,7 @@ private /*slots*/:
PanelPreviewImage *_panelPreviewImage;
PanelPreviewSound *_panelPreviewSound;
PanelPreviewText *_panelPreviewText;
ResourceInfoPanel *_resInfo;
PanelResourceInfo *_resInfo;
};

} // namespace GUI
Expand Down

0 comments on commit 64a5c7e

Please sign in to comment.