Save window size, current load order to the settings file and more changes

README.md

@@ -32,22 +32,18 @@ Rocket Launcher 2.0 also features a new tab allowing you to configure each engin
 
 ### Qt Framework
 
-This allows for this project to be cross platform, including support for Linux and OSX. For windows I provide a static build, which means it's provided as a single executable with no additional DLL's required or frameworks to install.
+This allows for this project to be cross platform, including support for Linux and Windows.
 
 ### Installation
 
-#### Windows
+#### Windows (7 or later)
 
-Download executable here: https://github.com/Hypnotoad90/RocketLauncher2/releases/download/0.1.0.1/RocketLauncher2_v0101.zip
+Download executable here: https://github.com/paynworth/RocketLauncher2/releases/download/v1.1/RocketLauncherPW_v1.1.zip
 
 #### Linux
 
 No binaries available as of yet. To compile, simply grab Qt5-default package, then run qmake, followed by make, on the source code.
 
-#### Mac
-
-Coming soon.
-
 ### Thanks to:
 <br>
 Blzut3: for helping me with some Qt queries.<br>

RocketLauncher2.pro

@@ -18,15 +18,18 @@ SOURCES += main.cpp\
     dndfilesystemlistview.cpp \
     hyp_commonfunc.cpp \
     configs.cpp \
-    enginesetup.cpp
+    enginesetup.cpp \
+    commandlinedialog.cpp
 
 HEADERS  += rocketlauncher2.h \
     abstractmodels.h \
     dndfilesystemlistview.h \
     hyp_commonfunc.h \
-    configs.h
+    configs.h \
+    commandlinedialog.h
 
-FORMS    += rocketlauncher2.ui
+FORMS    += rocketlauncher2.ui \
+    commandlinedialog.ui
 
 RESOURCES += \
     resources.qrc

abstractmodels.cpp

@@ -216,6 +216,10 @@ int EngineListModel::SearchEngines(const QString name)
     return -1;
 }
 
+bool EngineListModel::isEmpty(){
+    return Engines_.isEmpty();
+}
+
 void EngineListModel::LoadEngineData()
 {
     int size = EngineSettings.beginReadArray("Engines");
@@ -242,7 +246,9 @@ void EngineListModel::LoadEngineData()
 
 void EngineListModel::SaveEngineData()
 {
+
     EngineSettings.beginWriteArray("Engines");
+    EngineSettings.clear();
     for (int i = 0; i < Engines_.count(); i++)
     {
         EngineSettings.setArrayIndex(i);
@@ -338,6 +344,24 @@ void EngineListModel::removeRow(int row, const QModelIndex &parent)
     QAbstractListModel::removeRow(row, parent);
 }
 
+void EngineListModel::moveRowDown(int row, const QModelIndex &parent)
+{
+       if  (!Engines_.isEmpty() && (row < Engines_.size()-1)){
+           Engines_.move(row, row+1);
+           QModelIndex sibling = parent.sibling(row+1, parent.column());
+           QAbstractListModel::moveRow(parent, row, sibling, row+1);
+       }
+}
+
+void EngineListModel::moveRowUp(int row, const QModelIndex &parent)
+{
+    if  (!Engines_.isEmpty() && (row > 0)){
+        Engines_.move(row, row-1);
+        QModelIndex sibling = parent.sibling(row-1, parent.column());
+        QAbstractListModel::moveRow(parent, row, sibling, row-1);
+    }
+}
+
 void EngineListModel::addDefaultEngine(QString path)
 {
     QFileInfo tempfile(path);
@@ -346,11 +370,11 @@ void EngineListModel::addDefaultEngine(QString path)
         QMessageBox::information(NULL,"Error",QString("Failed to add executable."));
         return;
     }
-
-    EngineInfo newengine = {path, "Custom engine", Engine_Default, Pic_Default};
+    QString fileName(tempfile.fileName());
+    EngineInfo newengine = {path, fileName, Engine_Default, Pic_Default};
     Engines_ << newengine;
     QMessageBox::information(NULL,"Executable Added",QString("Custom engine added!"));
-    emit updateCombo("Custom engine");
+    emit updateCombo(fileName);
     emit dataChanged(QModelIndex(),QModelIndex());
     SaveEngineData();
 }

abstractmodels.h

@@ -53,7 +53,8 @@ enum EnginePic
     Pic_Retro,
     Pic_Vavoom,
     Pic_Doomsday,
-    Pic_Edge
+    Pic_Edge,
+    Pic_LZdoom
 };
 
 struct EngineInfo
@@ -90,9 +91,12 @@ class EngineListModel : public QAbstractListModel {
     QString updateEngine(QString engine, QString path, EngineType type, EnginePic pic, bool known);
     bool EngineSet;
     void LoadEngineData();
+    bool isEmpty();
     EngineType getEngineType();
     QString DoomExePath;
     void removeRow(int row, const QModelIndex &parent = QModelIndex());
+    void moveRowDown(int row, const QModelIndex &parent = QModelIndex());
+    void moveRowUp(int row, const QModelIndex &parent = QModelIndex());
     QSettings EngineSettings;
     void SaveEngineData();
     EngineType getEngineTypeFromIndex(const QModelIndex &index);

commandlinedialog.cpp

@@ -0,0 +1,22 @@
+#include "commandlinedialog.h"
+#include "ui_commandlinedialog.h"
+
+CommandLineDialog::CommandLineDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::CommandLineDialog)
+{
+    ui->setupUi(this);
+
+    connect(ui->button_copycmd, SIGNAL(pressed()), this, SLOT(copyText()));
+
+}
+
+void CommandLineDialog::setTextBox(QString cmdargs){
+    ui->text_cmd->setPlainText(cmdargs);
+    ui->text_cmd->setReadOnly(true);
+}
+void CommandLineDialog::copyText(){
+    ui->text_cmd->selectAll();
+    ui->text_cmd->copy();
+
+}

commandlinedialog.h

@@ -0,0 +1,26 @@
+#ifndef COMMANDLINEDIALOG_H
+#define COMMANDLINEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class CommandLineDialog;
+}
+
+class CommandLineDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit CommandLineDialog(QWidget *parent = 0);
+
+private:
+    Ui::CommandLineDialog *ui;
+
+signals:
+
+public slots:
+    void setTextBox(const QString cmdargs);
+    void copyText();
+};
+
+#endif // COMMANDLINEDIALOG_H

commandlinedialog.ui

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CommandLineDialog</class>
+ <widget class="QDialog" name="CommandLineDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Doomseeker - Copy Text</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="lblDescription">
+     <property name="text">
+      <string>Text to copy:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPlainTextEdit" name="text_cmd"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="button_copycmd">
+       <property name="text">
+        <string>Copy to clipboard</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CommandLineDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CommandLineDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>