qt: Save geometry on shutdown

SimonKagstrom · Jul 6, 2024 · 2ee9a8c · 2ee9a8c
1 parent 2461c19
commit 2ee9a8c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 31 deletions.
diff --git a/qt/emilpro/mainwindow.cc b/qt/emilpro/mainwindow.cc
@@ -6,6 +6,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QMetaType>
 #include <QScrollBar>
 #include <QShortcut>
 #include <QTextBlock>
@@ -38,21 +39,20 @@ MainWindow::MainWindow(QWidget* parent)
 
 MainWindow::~MainWindow()
 {
+    SaveSettings();
+
     delete m_instruction_view_model;
     delete m_symbol_view_model;
     delete m_ui;
 }
 
-void
-MainWindow::addHistoryEntry(uint64_t address)
-{
-}
-
 bool
 MainWindow::Init(int argc, char* argv[])
 {
     m_ui->setupUi(this);
 
+    RestoreSettings();
+
     SetupSectionView();
     SetupSymbolView();
     SetupInstructionView();
@@ -365,7 +365,6 @@ MainWindow::on_insnCurrentChanged(const QModelIndex& index, const QModelIndex& p
     {
         encoding += fmt::format("{:02x} ", x);
     }
-    m_ui->instructionEncodingLine->setText(encoding.c_str());
 
     m_instruction_item_delegate.HighlightStrings(insn.UsedRegisters());
 
@@ -723,18 +722,29 @@ MainWindow::on_symbolTimerTriggered()
 }
 
 void
-MainWindow::refresh()
+MainWindow::RestoreSettings()
 {
-}
+    QSettings settings("ska", "emilpro");
 
-void
-MainWindow::restoreState()
-{
+    settings.beginGroup("MainWindow");
+
+    if (const auto geometry = settings.value("geometry", QByteArray()).toByteArray();
+        !geometry.isEmpty())
+    {
+        restoreGeometry(geometry);
+    }
+
+    settings.endGroup();
 }
 
 void
-MainWindow::saveState()
+MainWindow::SaveSettings()
 {
+    QSettings settings("ska", "emilpro");
+
+    settings.beginGroup("MainWindow");
+    settings.setValue("geometry", saveGeometry());
+    settings.endGroup();
 }
 
 void

diff --git a/qt/emilpro/mainwindow.hh b/qt/emilpro/mainwindow.hh
@@ -9,6 +9,7 @@
 #include "jump_lane_delegate.hh"
 
 #include <QMainWindow>
+#include <QSettings>
 #include <qstandarditemmodel.h>
 
 namespace Ui
@@ -92,15 +93,11 @@ private:
 
     void SetupInfoBox();
 
-    void addHistoryEntry(uint64_t addr);
-
-    void refresh();
-
     void LoadFile(const std::string& filename);
 
-    void saveState();
+    void SaveSettings();
 
-    void restoreState();
+    void RestoreSettings();
 
     void OnHistoryIndexChanged();
 

diff --git a/qt/emilpro/mainwindow.ui b/qt/emilpro/mainwindow.ui
@@ -45,6 +45,12 @@
        <enum>Qt::Vertical</enum>
       </property>
       <widget class="QSplitter" name="splitter">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>1</verstretch>
+        </sizepolicy>
+       </property>
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
@@ -144,6 +150,12 @@
               </layout>
              </widget>
              <widget class="QWidget" name="sectionTab">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <attribute name="title">
                <string>Sections</string>
               </attribute>
@@ -220,6 +232,12 @@
               <number>1</number>
              </property>
              <widget class="QWidget" name="refersToTab">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <attribute name="title">
                <string>Refers to</string>
               </attribute>
@@ -238,6 +256,12 @@
                </property>
                <item>
                 <widget class="QTableView" name="refersToTableView">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
                  <property name="font">
                   <font>
                    <family>Courier New</family>
@@ -273,6 +297,12 @@
               </layout>
              </widget>
              <widget class="QWidget" name="referredByTab">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <attribute name="title">
                <string>Referenced by</string>
               </attribute>
@@ -368,19 +398,6 @@
            </attribute>
           </widget>
          </item>
-         <item>
-          <widget class="QLabel" name="instructionEncodingLine">
-           <property name="font">
-            <font>
-             <family>Courier New</family>
-             <pointsize>12</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </widget>