Modify: Keep the dialog size

ambiesoft · Apr 13, 2023 · 886225d · 886225d
1 parent 99a4e05
commit 886225d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,7 @@
+2023/04/14 1.22.42
+Modify: Added "Choose..." on the Exteral Tools dialog
+Modify: Keep the dialog size
+
 2023/04/12 1.22.41
 Add ${appfullpath} and ${appdirectoryfullpath} to external tool macros
 

diff --git a/src/consts.h b/src/consts.h
@@ -24,7 +24,7 @@ namespace Consts
 Q_CONSTEXPR char ORGANIZATION[] = "Ambiesoft";
 Q_CONSTEXPR char APPDOMAIN[] = "ambiesoft.com";
 Q_CONSTEXPR char APPNAME[] = "SceneExplorer";
-Q_CONSTEXPR char APPVERSION[] = "1.22.41";
+Q_CONSTEXPR char APPVERSION[] = "1.22.42";
 
 
 Q_CONSTEXPR char KEY_STYLE[] = "style";
@@ -91,6 +91,7 @@ Q_CONSTEXPR char KEY_FONT_STATUSBAR[] = "fontstatusbar";
 Q_CONSTEXPR char KEY_FONT_DOCKINGWINDOW[] = "fontdockingwindow";
 
 Q_CONSTEXPR char KEY_EXTERNALTOOLS_LASTSELECTEDEXEDIR[] = "externaltoolslastselectedexedir";
+Q_CONSTEXPR char KEY_EXTERNALTOOLS_DIALOGGEOMETRY[] = "externaltoolsdialoggeometry";
 
 Q_CONSTEXPR char KEY_EXTERNALTOOLS_COUNT[] = "externaltoolscount";
 Q_CONSTEXPR char KEY_EXTERNALTOOLS_GROUPPRIX[] = "externaltool_";
@@ -99,6 +100,8 @@ Q_CONSTEXPR char KEY_EXTERNALTOOLS_EXE[] = "externaltoolexe";
 Q_CONSTEXPR char KEY_EXTERNALTOOLS_ARG[] = "externaltoolarg";
 Q_CONSTEXPR char KEY_EXTERNALTOOLS_COUNTASOPEN[] = "externaltoolcountasopen";
 
+Q_CONSTEXPR char KEY_OPTION_DIALOGGEOMETRY[] = "optiondialoggeometry";
+
 
 Q_CONSTEXPR char KEY_RECENT_OPENDOCUMENTS[] = "recentdocuments";
 Q_CONSTEXPR char KEY_SORT[] = "sort";

diff --git a/src/mainwindow_action.cpp b/src/mainwindow_action.cpp
@@ -103,7 +103,7 @@ void MainWindow::on_tableView_doubleClicked(const QModelIndex &index)
 
 void MainWindow::on_action_Options_triggered()
 {
-    OptionDialog dlg(this);
+    OptionDialog dlg(settings_,this);
     dlg.maxgd_ = optionThreadcountGetDir();
     dlg.maxff_ = optionThreadcountThumbnail();
     dlg.thumbCount_ = optionThumbCount_;

diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
@@ -29,10 +29,12 @@
 #include "helper.h"
 #include "optiondialog.h"
 
+using namespace Consts;
 using namespace AmbiesoftQt;
 
-OptionDialog::OptionDialog(QWidget* parent)
+OptionDialog::OptionDialog(AmbiesoftQt::IniSettings& settings, QWidget* parent)
     : QDialog(parent,GetDefaultDialogFlags()),
+    settings_(settings),
       imagecache_(IC_NEVER)
 {
     ui.setupUi(this);
@@ -58,8 +60,8 @@ OptionDialog::OptionDialog(QWidget* parent)
     ui.cmbTagMenuFormat->addItem(tr("Submenu with Text"));
     ui.cmbTagMenuFormat->addItem(tr("Submenu with Yomi"));
 
-
-
+    restoreGeometry(settings.value(KEY_OPTION_DIALOGGEOMETRY).toByteArray());
+    CenterWidgets(this);
     setWindowTitle(tr("option"));
 }
 
@@ -150,6 +152,7 @@ void OptionDialog::showEvent(QShowEvent *ev)
 }
 void OptionDialog::on_buttonBox_accepted()
 {
+    settings_.setValue(KEY_OPTION_DIALOGGEOMETRY, saveGeometry());
 }
 void OptionDialog::accept()
 {

diff --git a/src/optiondialog.h b/src/optiondialog.h
@@ -19,6 +19,7 @@
 #ifndef OPTIONDIALOG_H
 #define OPTIONDIALOG_H
 
+#include "../../lsMisc/stdQt/inisettings.h"
 
 #include "ui_option.h"
 
@@ -31,12 +32,13 @@ class OptionDialog:public QDialog
 
 private:
     Ui::Option ui;
+    AmbiesoftQt::IniSettings& settings_;
     QString lastSelectedDir_;
 
     void on_setFileCommon(QLineEdit* le);
 
 public:
-    OptionDialog(QWidget* parent = nullptr);
+    OptionDialog(AmbiesoftQt::IniSettings& settings, QWidget* parent = nullptr);
 
     QString mainText_,subText_;
     ImageCacheType imagecache_;

diff --git a/src/optionexternaltoolsdialog.cpp b/src/optionexternaltoolsdialog.cpp
@@ -39,7 +39,10 @@ OptionExternalToolsDialog::OptionExternalToolsDialog(IniSettings& settings, QWid
     ui(new Ui::OptionExternalToolsDialog)
 {
     ui->setupUi(this);
+
     lastSelectedExeDir_ = settings_.valueString(KEY_EXTERNALTOOLS_LASTSELECTEDEXEDIR);
+    restoreGeometry(settings.value(KEY_EXTERNALTOOLS_DIALOGGEOMETRY).toByteArray());
+    CenterWidgets(this);
     setWindowTitle(tr("Option") + " | " + tr("External tools"));
 }
 void OptionExternalToolsDialog::showEvent(QShowEvent *ev)
@@ -274,6 +277,8 @@ void OptionExternalToolsDialog::on_buttonBox_accepted()
         ExternalToolWidgetItem* item = (ExternalToolWidgetItem*)ui->listWidget->item(i);
         items_.append(item->GetItem());
     }
+
+    settings_.setValue(KEY_EXTERNALTOOLS_DIALOGGEOMETRY,saveGeometry());
 }
 void OptionExternalToolsDialog::UpdateData()
 {