Rename OptionsDialog to InitialOptionsDialog

And move InitialOptions to InitialOptions.h

src/AnalTask.cpp

@@ -1,7 +1,7 @@
 #include "Cutter.h"
 #include "AnalTask.h"
 #include "MainWindow.h"
-#include "dialogs/OptionsDialog.h"
+#include "dialogs/InitialOptionsDialog.h"
 #include <QJsonArray>
 #include <QDebug>
 #include <QCheckBox>

src/AnalTask.h

@@ -3,43 +3,11 @@
 
 #include "utils/AsyncTask.h"
 #include "Cutter.h"
+#include "utils/InitialOptions.h"
 
 class CutterCore;
 class MainWindow;
-class OptionsDialog;
-
-struct InitialOptions
-{
-	enum class Endianness { Auto, Little, Big };
-
-	QString filename;
-
-	bool useVA = true;
-	RVA binLoadAddr = RVA_INVALID;
-	RVA mapAddr = RVA_INVALID;
-
-	QString arch;
-	QString cpu;
-	int bits = 0;
-	QString os;
-
-	Endianness endian;
-
-	bool writeEnabled = false;
-	bool loadBinInfo = true;
-	QString forceBinPlugin;
-
-	bool demangle = true;
-
-	QString pdbFile;
-	QString script;
-
-	int bbsize = 0;
-
-	QList<QString> analCmd;
-
-	QString shellcode;
-};
+class InitialOptionsDialog;
 
 class AnalTask : public AsyncTask
 {

src/Cutter.pro

@@ -98,7 +98,7 @@ SOURCES += \
     Cutter.cpp \
     widgets/DisassemblerGraphView.cpp \
     utils/RichTextPainter.cpp \
-    dialogs/OptionsDialog.cpp \
+    dialogs/InitialOptionsDialog.cpp \
     dialogs/AboutDialog.cpp \
     dialogs/CommentsDialog.cpp \
     dialogs/EditInstructionDialog.cpp \
@@ -203,7 +203,7 @@ HEADERS  += \
     MainWindow.h \
     utils/Highlighter.h \
     utils/MdHighlighter.h \
-    dialogs/OptionsDialog.h \
+    dialogs/InitialOptionsDialog.h \
     dialogs/NewFileDialog.h \
     AnalTask.h \
     widgets/CommentsWidget.h \
@@ -278,7 +278,8 @@ HEADERS  += \
     dialogs/BreakpointsDialog.h \
     dialogs/AttachProcDialog.h \
     widgets/RegisterRefsWidget.h \
-    dialogs/SetToDataDialog.h
+    dialogs/SetToDataDialog.h \
+    utils/InitialOptions.h
 
 FORMS    += \
     dialogs/AboutDialog.ui \
@@ -289,7 +290,7 @@ FORMS    += \
     dialogs/RenameDialog.ui \
     dialogs/XrefsDialog.ui \
     dialogs/NewfileDialog.ui \
-    dialogs/OptionsDialog.ui \
+    dialogs/InitialOptionsDialog.ui \
     MainWindow.ui \
     widgets/CommentsWidget.ui \
     widgets/ConsoleWidget.ui \

src/MainWindow.cpp

@@ -39,7 +39,7 @@
 #include "utils/ProgressIndicator.h"
 
 #include "dialogs/NewFileDialog.h"
-#include "dialogs/OptionsDialog.h"
+#include "dialogs/InitialOptionsDialog.h"
 #include "dialogs/SaveProjectDialog.h"
 #include "dialogs/CommentsDialog.h"
 #include "dialogs/AboutDialog.h"
@@ -363,7 +363,7 @@ void MainWindow::closeNewFileDialog()
 
 void MainWindow::displayAnalysisOptionsDialog(int analLevel, QList<QString> advancedOptions, const QString &script, const QString &shellcode)
 {
-    OptionsDialog *o = new OptionsDialog(this);
+    InitialOptionsDialog *o = new InitialOptionsDialog(this);
     o->setAttribute(Qt::WA_DeleteOnClose);
     o->setInitialScript(script);
     o->setShellcode(shellcode);

src/dialogs/InitialOptionsDialog.cpp

@@ -1,8 +1,8 @@
 
 #include "utils/AsyncTask.h"
 
-#include "OptionsDialog.h"
-#include "ui_OptionsDialog.h"
+#include "InitialOptionsDialog.h"
+#include "ui_InitialOptionsDialog.h"
 #include "MainWindow.h"
 #include "dialogs/NewFileDialog.h"
 #include "dialogs/AsyncTaskDialog.h"
@@ -12,9 +12,9 @@
 #include <QFileInfo>
 #include <QFileDialog>
 
-OptionsDialog::OptionsDialog(MainWindow *main):
+InitialOptionsDialog::InitialOptionsDialog(MainWindow *main):
     QDialog(0), // parent must not be main
-    ui(new Ui::OptionsDialog),
+    ui(new Ui::InitialOptionsDialog),
     main(main),
     core(Core()),
     defaultAnalLevel(1)
@@ -63,9 +63,9 @@ OptionsDialog::OptionsDialog(MainWindow *main):
     ui->programLineEdit->setText(main->getFilename());
 }
 
-OptionsDialog::~OptionsDialog() {}
+InitialOptionsDialog::~InitialOptionsDialog() {}
 
-void OptionsDialog::updateCPUComboBox()
+void InitialOptionsDialog::updateCPUComboBox()
 {
     QString currentText = ui->cpuComboBox->lineEdit()->text();
     ui->cpuComboBox->clear();
@@ -82,7 +82,7 @@ void OptionsDialog::updateCPUComboBox()
     ui->cpuComboBox->lineEdit()->setText(currentText);
 }
 
-void OptionsDialog::setInitialScript(const QString &script)
+void InitialOptionsDialog::setInitialScript(const QString &script)
 {
     ui->scriptCheckBox->setChecked(!script.isEmpty());
     ui->scriptLineEdit->setText(script);
@@ -91,18 +91,18 @@ void OptionsDialog::setInitialScript(const QString &script)
     }
 }
 
-void OptionsDialog::setShellcode(const QString &shellcode)
+void InitialOptionsDialog::setShellcode(const QString &shellcode)
 {
     this->shellcode = shellcode;
 }
 
-QString OptionsDialog::getSelectedArch()
+QString InitialOptionsDialog::getSelectedArch()
 {
     QVariant archValue = ui->archComboBox->currentData();
     return archValue.isValid() ? archValue.toString() : nullptr;
 }
 
-QString OptionsDialog::getSelectedCPU()
+QString InitialOptionsDialog::getSelectedCPU()
 {
     QString cpu = ui->cpuComboBox->currentText();
     if (cpu.isNull() || cpu.isEmpty())
@@ -110,7 +110,7 @@ QString OptionsDialog::getSelectedCPU()
     return cpu;
 }
 
-int OptionsDialog::getSelectedBits()
+int InitialOptionsDialog::getSelectedBits()
 {
     QString sel_bits = ui->bitsComboBox->currentText();
     if (sel_bits != "Auto") {
@@ -120,7 +120,7 @@ int OptionsDialog::getSelectedBits()
     return 0;
 }
 
-int OptionsDialog::getSelectedBBSize()
+int InitialOptionsDialog::getSelectedBBSize()
 {
     QString sel_bbsize = ui->entry_analbb->text();
     bool ok;
@@ -130,7 +130,7 @@ int OptionsDialog::getSelectedBBSize()
     return 1024;
 }
 
-InitialOptions::Endianness OptionsDialog::getSelectedEndianness()
+InitialOptions::Endianness InitialOptionsDialog::getSelectedEndianness()
 {
     switch (ui->endiannessComboBox->currentIndex()) {
     case 1:
@@ -142,13 +142,13 @@ InitialOptions::Endianness OptionsDialog::getSelectedEndianness()
     }
 }
 
-QString OptionsDialog::getSelectedOS()
+QString InitialOptionsDialog::getSelectedOS()
 {
     QVariant os = ui->kernelComboBox->currentData();
     return os.isValid() ? os.toString() : nullptr;
 }
 
-QList<QString> OptionsDialog::getSelectedAdvancedAnalCmds()
+QList<QString> InitialOptionsDialog::getSelectedAdvancedAnalCmds()
 {
     QList<QString> advanced = QList<QString>();
     if (ui->analSlider->value() == 3) {
@@ -195,7 +195,7 @@ QList<QString> OptionsDialog::getSelectedAdvancedAnalCmds()
     return advanced;
 }
 
-void OptionsDialog::setupAndStartAnalysis(int level, QList<QString> advanced)
+void InitialOptionsDialog::setupAndStartAnalysis(int level, QList<QString> advanced)
 {
     ui->analSlider->setValue(level);
 
@@ -273,18 +273,18 @@ void OptionsDialog::setupAndStartAnalysis(int level, QList<QString> advanced)
     done(0);
 }
 
-void OptionsDialog::on_okButton_clicked()
+void InitialOptionsDialog::on_okButton_clicked()
 {
     ui->okButton->setEnabled(false);
     setupAndStartAnalysis(ui->analSlider->value(), getSelectedAdvancedAnalCmds());
 }
 
-void OptionsDialog::closeEvent(QCloseEvent *event)
+void InitialOptionsDialog::closeEvent(QCloseEvent *event)
 {
     event->accept();
 }
 
-QString OptionsDialog::analysisDescription(int level)
+QString InitialOptionsDialog::analysisDescription(int level)
 {
     //TODO: replace this with meaningful descriptions
     switch (level) {
@@ -301,7 +301,7 @@ QString OptionsDialog::analysisDescription(int level)
     }
 }
 
-void OptionsDialog::on_analSlider_valueChanged(int value)
+void InitialOptionsDialog::on_analSlider_valueChanged(int value)
 {
     ui->analDescription->setText(tr("Level") + QString(": %1").arg(analysisDescription(value)));
     if (value == 0) {
@@ -318,7 +318,7 @@ void OptionsDialog::on_analSlider_valueChanged(int value)
     }
 }
 
-void OptionsDialog::on_AdvOptButton_clicked()
+void InitialOptionsDialog::on_AdvOptButton_clicked()
 {
     if (ui->AdvOptButton->isChecked()) {
         ui->hideFrame->setVisible(true);
@@ -329,24 +329,24 @@ void OptionsDialog::on_AdvOptButton_clicked()
     }
 }
 
-void OptionsDialog::on_analCheckBox_clicked(bool checked)
+void InitialOptionsDialog::on_analCheckBox_clicked(bool checked)
 {
     if (!checked)
         defaultAnalLevel = ui->analSlider->value();
     ui->analSlider->setValue(checked ? defaultAnalLevel : 0);
 }
 
-void OptionsDialog::on_archComboBox_currentIndexChanged(int)
+void InitialOptionsDialog::on_archComboBox_currentIndexChanged(int)
 {
     updateCPUComboBox();
 }
 
-void OptionsDialog::updatePDBLayout()
+void InitialOptionsDialog::updatePDBLayout()
 {
     ui->pdbWidget->setEnabled(ui->pdbCheckBox->isChecked());
 }
 
-void OptionsDialog::on_pdbSelectButton_clicked()
+void InitialOptionsDialog::on_pdbSelectButton_clicked()
 {
     QFileDialog dialog(this);
     dialog.setWindowTitle(tr("Select PDB file"));
@@ -364,12 +364,12 @@ void OptionsDialog::on_pdbSelectButton_clicked()
 }
 
 
-void OptionsDialog::updateScriptLayout()
+void InitialOptionsDialog::updateScriptLayout()
 {
     ui->scriptWidget->setEnabled(ui->scriptCheckBox->isChecked());
 }
 
-void OptionsDialog::on_scriptSelectButton_clicked()
+void InitialOptionsDialog::on_scriptSelectButton_clicked()
 {
     QFileDialog dialog(this);
     dialog.setWindowTitle(tr("Select radare2 script file"));
@@ -387,7 +387,7 @@ void OptionsDialog::on_scriptSelectButton_clicked()
 }
 
 
-void OptionsDialog::reject()
+void InitialOptionsDialog::reject()
 {
     done(0);
     NewFileDialog *n = new NewFileDialog(nullptr);

src/dialogs/InitialOptionsDialog.h

@@ -8,17 +8,21 @@
 #include <memory>
 #include "Cutter.h"
 #include "AnalTask.h"
-#include "ui_OptionsDialog.h"
+
+namespace Ui
+{
+class InitialOptionsDialog;
+}
 
 class MainWindow;
 
-class OptionsDialog : public QDialog
+class InitialOptionsDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit OptionsDialog(MainWindow *main);
-    ~OptionsDialog();
+    explicit InitialOptionsDialog(MainWindow *main);
+    ~InitialOptionsDialog();
 
     QStringList    asm_plugins;
 
@@ -40,7 +44,7 @@ protected:
     void closeEvent(QCloseEvent *event) override;
 
 private:
-    std::unique_ptr<Ui::OptionsDialog> ui;
+    std::unique_ptr<Ui::InitialOptionsDialog> ui;
 
     MainWindow *main;
     CutterCore *core;

src/dialogs/InitialOptionsDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OptionsDialog</class>
- <widget class="QDialog" name="OptionsDialog">
+ <class>InitialOptionsDialog</class>
+ <widget class="QDialog" name="InitialOptionsDialog">
   <property name="geometry">
    <rect>
     <x>0</x>

src/dialogs/NewFileDialog.cpp

@@ -1,4 +1,4 @@
-#include "OptionsDialog.h"
+#include "InitialOptionsDialog.h"
 #include "MainWindow.h"
 #include "dialogs/NewFileDialog.h"
 #include "dialogs/AboutDialog.h"
@@ -354,7 +354,7 @@ void NewFileDialog::loadFile(const QString &filename)
 
     settings.setValue("recentFileList", files);
 
-    // Close dialog and open MainWindow/OptionsDialog
+    // Close dialog and open MainWindow/InitialOptionsDialog
     MainWindow *main = new MainWindow();
     QString ioFile = "";
     if (ui->ioPlugin->currentIndex()) {

src/utils/InitialOptions.h

@@ -0,0 +1,40 @@
+
+#ifndef CUTTER_INITIALOPTIONS_H
+#define CUTTER_INITIALOPTIONS_H
+
+#include "Cutter.h"
+
+struct InitialOptions
+{
+    enum class Endianness { Auto, Little, Big };
+
+    QString filename;
+
+    bool useVA = true;
+    RVA binLoadAddr = RVA_INVALID;
+    RVA mapAddr = RVA_INVALID;
+
+    QString arch;
+    QString cpu;
+    int bits = 0;
+    QString os;
+
+    Endianness endian;
+
+    bool writeEnabled = false;
+    bool loadBinInfo = true;
+    QString forceBinPlugin;
+
+    bool demangle = true;
+
+    QString pdbFile;
+    QString script;
+
+    int bbsize = 0;
+
+    QList<QString> analCmd;
+
+    QString shellcode;
+};
+
+#endif //CUTTER_INITIALOPTIONS_H