Skip to content

Commit

Permalink
GUI: Fix some fixme's
Browse files Browse the repository at this point in the history
- Use more logging
- logAppend -> log
- Pop status in one place
  • Loading branch information
fdde authored and DrMcCoy committed Dec 27, 2017
1 parent 7eb7879 commit 45b2b65
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
5 changes: 3 additions & 2 deletions src/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ MainWindow::MainWindow(QWidget *parent, const char *title, const QSize &size, co
QObject::connect(_ui.actionClose, &QAction::triggered, this, &MainWindow::slotCloseDir);
QObject::connect(_ui.actionQuit, &QAction::triggered, this, &MainWindow::slotQuit);
QObject::connect(_resInfo, &PanelResourceInfo::loadModel, this, &MainWindow::setTreeViewModel);
QObject::connect(_resInfo, &PanelResourceInfo::logAppend, this, &MainWindow::slotLogAppend);
QObject::connect(_resInfo, &PanelResourceInfo::log, this, &MainWindow::slotLog);
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);
QObject::connect(_panelPreviewText, &PanelPreviewText::log, this, &MainWindow::slotLog);

_ui.actionAbout->setShortcut(QKeySequence(tr("F1")));

Expand All @@ -80,7 +81,7 @@ MainWindow::MainWindow(QWidget *parent, const char *title, const QSize &size, co
MainWindow::~MainWindow() {
}

void MainWindow::slotLogAppend(const QString &text) {
void MainWindow::slotLog(const QString &text) {
_ui.log->append(text);
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private /*slots*/:
void slotOpenFile();
void slotCloseDir();
void slotQuit();
void slotLogAppend(const QString &text);
void slotLog(const QString &text);
void saveItem();
void exportTGA();
void exportBMUMP3();
Expand Down
8 changes: 4 additions & 4 deletions src/gui/panelpreviewtext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ void PanelPreviewText::setItem(const ResourceTreeItem *item) {
item->getFileType() != Aurora::FileType::kFileTypeINI)
return;

if (item->getSize() > 1000000) // 1 MB
return; // fixme: exception
if (item->getSize() > 1000000) { // 1 MB
emit log(tr("ERROR: File size too large for '%1' (> 1MB)").arg(item->getName()));
return;
}

_currentItem = item;

Expand All @@ -36,8 +38,6 @@ void PanelPreviewText::setItem(const ResourceTreeItem *item) {
QTextStream textStream(&file);

setText(textStream.readAll());

return; // fixme: exception
}

} // End of namespace GUI
3 changes: 3 additions & 0 deletions src/gui/panelpreviewtext.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ class PanelPreviewText : public QFrame

void setText(const QString &text);
void setItem(const ResourceTreeItem *item);

void log(const QString &text)
W_SIGNAL(log, text)
};

} // End of namespace GUI
Expand Down
2 changes: 1 addition & 1 deletion src/gui/panelresourceinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void PanelResourceInfo::slotLoadKotorDir() {
if (dir.exists())
emit loadModel(myKotorPath);
else
emit logAppend("Failed: /home/mike/kotor is doesn't exist.");
emit log("ERROR: /home/mike/kotor doesn't exist.");
}

void PanelResourceInfo::slotCloseDir() {
Expand Down
4 changes: 2 additions & 2 deletions src/gui/panelresourceinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public /*signals*/:
void loadModel(const QString &path)
W_SIGNAL(loadModel, path)

void logAppend(const QString &text)
W_SIGNAL(logAppend, text)
void log(const QString &text)
W_SIGNAL(log, text)

void closeDirClicked()
W_SIGNAL(closeDirClicked)
Expand Down
2 changes: 1 addition & 1 deletion src/gui/resourcetree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void ResourceTree::loadKEYDataFiles(Aurora::KEYFile &key) {
} catch (Common::Exception &e) {
e.add("Failed to load KEY data file \"%s\"", dataFiles[i].c_str());

// GetStatusBar()->PopStatusText(); // fixme
_mainWindow->status()->pop();
Common::printException(e, "WARNING: ");
}
}
Expand Down

0 comments on commit 45b2b65

Please sign in to comment.