diff --git a/mupengui-0.1/main.cpp b/mupengui-0.1/main.cpp index 9fd2bf2..ef1ae09 100755 --- a/mupengui-0.1/main.cpp +++ b/mupengui-0.1/main.cpp @@ -21,27 +21,21 @@ #include #include - - int main(int argc, char *argv[]) { QApplication a(argc, argv); MainWindow w; QTextStream out(stdout); - if (argc == 2) { QString fileName(argv[1]); w.runFile(&fileName, true); out << "Press (Ctrl + C) to quit\n"; - - // Could not execute waitForFinished, therefore need to show - //w.show(); } else if (argc > 2) { out << "Usage: mupengui \n"; exit(1); - } else { - w.show(); + } else { + w.show(); } return a.exec(); diff --git a/mupengui-0.1/mainwindow.cpp b/mupengui-0.1/mainwindow.cpp index a80d502..4db2456 100755 --- a/mupengui-0.1/mainwindow.cpp +++ b/mupengui-0.1/mainwindow.cpp @@ -23,7 +23,6 @@ #include #include #include -#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -48,12 +47,8 @@ MainWindow::~MainWindow() void MainWindow::on_actionOpen_triggered() { - const QString DEFAULT_DIR_KEY("~"); - QSettings MySettings; // Will be using application informations for correct location of your settings - - - QFileDialog fileDialog(this); + QString fileName; // FIXME: Native look is good, but this open dialog does not close itself, @@ -65,58 +60,36 @@ void MainWindow::on_actionOpen_triggered() */ fileDialog.setNameFilter(tr("File (*.*)")); - fileDialog.setDirectory(MySettings.value(DEFAULT_DIR_KEY).toString()); + fileDialog.setDirectory(mySettings.value(DEFAULT_DIR_KEY).toString()); fileDialog.setLabelText(QFileDialog::FileName, tr("Open File")); - //fileDialog.setViewMode(QFileDialog::List); - //fileDialog.setFileMode(QFileDialog::AnyFile); - //fileDialog.setOption(QFileDialog::DontUseNativeDialog, false); - - QString fileName; - - if (fileDialog.exec()) { - fileName = fileDialog.selectedFiles().at(0); - //fileName = fileDialog.getOpenFileName(this); - if (!fileName.isEmpty()) { - QDir CurrentDir; - MySettings.setValue(DEFAULT_DIR_KEY, CurrentDir.absoluteFilePath(fileName)); - runFile(&fileName, false); - } + fileName = fileDialog.selectedFiles().at(0); + //fileName = fileDialog.getOpenFileName(this); + if (!fileName.isEmpty()) { + QDir CurrentDir; + mySettings.setValue(DEFAULT_DIR_KEY, CurrentDir.absoluteFilePath(fileName)); + runFile(&fileName, false); + } } } void MainWindow::on_actionPreferences_triggered() { - //QTextStream out(stdout); - SettingsDialog settingsDialog; settingsDialog.exec(); - - - /* - QSettings MySettings; - const QString WINDOWED_FULLSCREEN("WINDOWED"); - out << "WINDOWED_FULLSCREEN: " << MySettings.value(WINDOWED_FULLSCREEN).toString(); - */ - } void MainWindow::runFile(QString *fileName, bool selfQuit) { - //QString fileName(fileNamec); + // This does not like defining in private QTextStream out(stdout); - - QSettings MySettings; - const QString WINDOWED_FULLSCREEN("WINDOWED"); - QString mode = "--fullscreen"; - if (MySettings.value(WINDOWED_FULLSCREEN).toString() == "WINDOWED") + if (mySettings.value(WINDOWED_FULLSCREEN).toString() == "WINDOWED") mode = "--windowed"; - //std::cout << fileName.toStdString(); out << "FileName: " << *fileName; if (!fileName->isEmpty()) { @@ -127,12 +100,12 @@ void MainWindow::runFile(QString *fileName, bool selfQuit) QString p_stdout = p.readAllStandardOutput(); QString p_stderr = p.readAllStandardError(); - out << "StdOut: " << p_stdout; - out << "Error: " << p_stderr; + out << "StdOut: " << p_stdout; + out << "Error: " << p_stderr; - if (selfQuit) { - out << "Exiting !! Cheers !!"; - exit(0); - } + if (selfQuit) { + out << "Exiting !! Cheers !!"; + exit(0); + } } } diff --git a/mupengui-0.1/mainwindow.h b/mupengui-0.1/mainwindow.h index bbba9a0..973bc0f 100755 --- a/mupengui-0.1/mainwindow.h +++ b/mupengui-0.1/mainwindow.h @@ -19,7 +19,10 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H +#define DEFAULT_DIR_KEY "~" + #include +#include namespace Ui { class MainWindow; @@ -40,6 +43,7 @@ public slots: private: Ui::MainWindow *ui; + QSettings mySettings; }; #endif // MAINWINDOW_H diff --git a/mupengui-0.1/mupengui.pro.user b/mupengui-0.1/mupengui.pro.user index e24587f..fba7db8 100755 --- a/mupengui-0.1/mupengui.pro.user +++ b/mupengui-0.1/mupengui.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -223,7 +223,7 @@ mupengui - Qt4ProjectManager.Qt4RunConfiguration:/home/dell/Desktop/github/mupengui-0.1/mupengui.pro + Qt4ProjectManager.Qt4RunConfiguration:/media/D/Programming/githubmupengui/mupengui-0.1/mupengui.pro 2 mupengui.pro diff --git a/mupengui-0.1/settingsdialog.cpp b/mupengui-0.1/settingsdialog.cpp index e150de7..c841b54 100755 --- a/mupengui-0.1/settingsdialog.cpp +++ b/mupengui-0.1/settingsdialog.cpp @@ -24,21 +24,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) : ui(new Ui::SettingsDialog) { ui->setupUi(this); - //connect(ui->radioWindowed, SIGNAL(toggled(bool)), this, SLOT(on_radioWindowedFullscreen_toggled())); - //connect(ui->radioFullscreen, SIGNAL(toggled(bool)), this, SLOT(on_radioWindowedFullscreen_toggled())); - //WINDOWED_FULLSCREEN = "WINDOWED"; - - WINDOWED_FULLSCREEN = "WINDOWED"; - - if (MySettings.value(WINDOWED_FULLSCREEN).toString() == "WINDOWED") { + if (mySettings.value(WINDOWED_FULLSCREEN).toString() == "WINDOWED") { ui->radioWindowed->setChecked(true); - } else if (MySettings.value(WINDOWED_FULLSCREEN).toString() == "FULLSCREEN") { + } else if (mySettings.value(WINDOWED_FULLSCREEN).toString() == "FULLSCREEN") { ui->radioFullscreen->setChecked(true); } this->setFixedSize(404, 266); - } SettingsDialog::~SettingsDialog() @@ -46,27 +39,12 @@ SettingsDialog::~SettingsDialog() delete ui; } -/* -void SettingsDialog::on_radioWindowedFullscreen_toggled() -{ - //QTextStream out(stdout); - //out << "Settings: " << MySettings.value(WINDOWED_FULLSCREEN).toString(); - - - - -} -*/ - void SettingsDialog::accept() { - //QTextStream out(stdout); - //out << "Accept " << "ACCEPTED"; - if (ui->radioFullscreen->isChecked()) { - MySettings.setValue(WINDOWED_FULLSCREEN, "FULLSCREEN"); + mySettings.setValue(WINDOWED_FULLSCREEN, "FULLSCREEN"); } else if (ui->radioWindowed->isChecked()) { - MySettings.setValue(WINDOWED_FULLSCREEN, "WINDOWED"); + mySettings.setValue(WINDOWED_FULLSCREEN, "WINDOWED"); } this->close(); diff --git a/mupengui-0.1/settingsdialog.h b/mupengui-0.1/settingsdialog.h index 8ff2db8..c49b448 100755 --- a/mupengui-0.1/settingsdialog.h +++ b/mupengui-0.1/settingsdialog.h @@ -19,6 +19,8 @@ #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H +#define WINDOWED_FULLSCREEN "WINDOWED" + #include #include #include @@ -36,14 +38,11 @@ class SettingsDialog : public QDialog ~SettingsDialog(); public slots: - //void on_radioWindowedFullscreen_toggled(); void accept(); - private: Ui::SettingsDialog *ui; - QSettings MySettings; - QString WINDOWED_FULLSCREEN; + QSettings mySettings; }; #endif // SETTINGSDIALOG_H diff --git a/mupengui_0.1-1_amd64.deb b/mupengui_0.1-1_amd64.deb deleted file mode 100755 index 304b3e9..0000000 Binary files a/mupengui_0.1-1_amd64.deb and /dev/null differ