Settings: Hide frame containing encoder combobo if the label and the combobox are not visible: move settings to inifile: fix path for custom vehicles: fix the build configuration and remove unnecesry qt parts.

Author: chepe263

src/RGSettingsDialog.cpp

@@ -39,6 +39,11 @@ RGSettingsDialog::RGSettingsDialog(RGEncVideo *videoSettings,QWidget *parent)
 	ui.encoderSelectionLabel->setVisible(false);
 #endif
 
+    if (!ui.encoderSelectionCB->isVisible() && !ui.encoderSelectionLabel->isVisible()){
+        ui.groupBox_2->setVisible(false);
+
+    }
+
 
   mGenerateBeginEndFramesCB = ui.mIconLessBeginEndFramesCB;
   mSmoothLengthSB = ui.mSmoothLengthSB;
@@ -55,7 +60,7 @@ RGSettingsDialog::RGSettingsDialog(RGEncVideo *videoSettings,QWidget *parent)
 
 RGSettingsDialog::~RGSettingsDialog()
 {
-  ui.tabWidget->widget(0)->setParent(NULL);
+  ui.tabWidget->widget(0)->setParent(nullptr);
 }
 
 int RGSettingsDialog::getSmoothCoef()
@@ -81,8 +86,8 @@ void RGSettingsDialog::on_encoderSelectionCB_activated(const QString &text)
 void RGSettingsDialog::accept()
 {
   //Advanced settings
-	if (mVideoEncoder->encoderName() != ui.encoderSelectionCB->currentText())
-	{
+    if (ui.encoderSelectionCB->isVisible() && mVideoEncoder->encoderName() != ui.encoderSelectionCB->currentText())
+    {
 			QMessageBox::StandardButton answer = QMessageBox::question (this, "Encoder changed",
 		"Changing the encoder will reset the movie generation codec settings. Continue?",
                                            QMessageBox::Yes | QMessageBox::No,
@@ -97,7 +102,7 @@ void RGSettingsDialog::accept()
 			ui.encoderSelectionCB->setCurrentIndex(ui.encoderSelectionCB->findText(RGSettings::getVideoEncoder()));
 			return;
 		}
-	}
+    }
 
   RGSettings::setVideoEncoder(ui.encoderSelectionCB->currentText());
   RGSettings::setSmoothLength(mSmoothLengthSB->value());

src/RGVehicleList.cpp

@@ -45,7 +45,7 @@ RGVehicleList::RGVehicleList()
 
   //Also look in user's local data directory for custom vehicles
   //TODO: Should also be working on linux: check! then above linux dependent block can be removed!
-  vehicleDir.setPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)  + "/vehicles");
+  vehicleDir.setPath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)  + "/vehicles");
   if (vehicleDir.exists())
   {
     vehicles.append(vehicleDir.entryInfoList());

src/main.cpp

@@ -23,6 +23,7 @@
 #include <QMessageBox>
 #include <QFile>
 #include <QFileDialog>
+#include <QSettings>
 
 #include "RGApplicationName.h"
 #include "RGMainWindow.h"
@@ -73,16 +74,20 @@
  *  v1.7.1  FFMpeg default converter and provided with the installation
  */
 
-extern const QString applicationName("Route Generator version 1.7.1");
+extern const QString applicationName("Route Generator version 1.7.1a");
 
 int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
   //For storing application settings
+  QSettings::setDefaultFormat(QSettings::IniFormat);
+  //ToDo: Make a self contained settings inside the app executable directory
+  //for a portable version of the app
   app.setOrganizationName("MJProductions");
   app.setApplicationName("Route Generator");
 
+
   RGMainWindow *mainWindow = new RGMainWindow;
   mainWindow->setWindowTitle(applicationName);
 

src/routegen.pro

@@ -3,15 +3,18 @@
 ######################################################################
 
 TEMPLATE = app
-CONFIG += debug release
-TARGET = routegen
+CONFIG += debug_and_release
+CONFIG(debug, debug|release) {
+    TARGET = "routegen_debug"
+} else {
+    TARGET = "routegen"
+}
 DEPENDPATH += .
 INCLUDEPATH += .
 MOC_DIR = ./build/moc
 OBJECTS_DIR = ./build/obj
 UI_DIR = ./build/ui
-#QT += webkit
-QT += gui core webengine widgets webenginewidgets
+QT += webenginewidgets
 
 # Input
 HEADERS += RGMainWindow.h RGVehicleDialog.h RGSettings.h RGSettingsDialog.h RGGoogleMap.h \