Change naming of Window Position to Courtroom Window

Less ambiguous name that is slightly longer. In case a similar feature is made for lobby or otherwise.
AttorneyOnline · Jan 18, 2024 · 0b6f5b1 · 0b6f5b1
1 parent f46f810
commit 0b6f5b1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/include/options.h b/include/options.h
@@ -259,8 +259,8 @@ class Options {
   bool evidenceDoubleClickEdit() const;
   void setEvidenceDoubleClickEdit(bool value);
 
-  bool saveWindowPositionEdit() const;
-  void setSaveWindowPositionEdit(bool value);
+  bool restoreCourtroomWindowPositionEdit() const;
+  void setRestoreCourtroomWindowPositionEdit(bool value);
 
   // Supplies an alternative masterserver URL
   QString alternativeMasterserver() const;
@@ -290,8 +290,8 @@ class Options {
   QString getUIAsset(QString f_asset_name);
 
   // Window Position
-  void setWindowPosition(QPoint value);
-  QPoint getWindowPosition();
+  void setCourtroomWindowPosition(QPoint value);
+  QPoint getCourtroomWindowPosition();
 };
 
 #endif // OPTIONS_H
diff --git a/include/widgets/aooptionsdialog.h b/include/widgets/aooptionsdialog.h
@@ -50,7 +50,7 @@ class AOOptionsDialog : public QDialog {
   QPushButton *ui_theme_reload_button;
   QPushButton *ui_theme_folder_button;
   QCheckBox *ui_evidence_double_click_cb;
-  QCheckBox *ui_set_save_window_position_cb;
+  QCheckBox *ui_set_restore_courtroom_window_position_cb;
   QCheckBox *ui_animated_theme_cb;
   QSpinBox *ui_stay_time_spinbox;
   QCheckBox *ui_instant_objection_cb;

diff --git a/resource/ui/options_dialog.ui b/resource/ui/options_dialog.ui
@@ -39,9 +39,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-480</y>
+            <y>-502</y>
             <width>394</width>
-            <height>798</height>
+            <height>819</height>
            </rect>
           </property>
           <layout class="QFormLayout" name="formLayout">
@@ -573,19 +573,19 @@
             </widget>
            </item>
            <item row="32" column="1">
-            <widget class="QCheckBox" name="save_window_position_cb">
+            <widget class="QCheckBox" name="restore_courtroom_window_position_cb">
              <property name="text">
               <string/>
              </property>
             </widget>
            </item>
            <item row="32" column="0">
-            <widget class="QLabel" name="save_window_position_lbl">
+            <widget class="QLabel" name="restore_courtroom_window_position_lbl">
              <property name="toolTip">
               <string>If checked, window will go to the same position on the screen when you re-open the game.</string>
              </property>
              <property name="text">
-              <string>Save Window Position:</string>
+              <string>Restore Courtroom Window Position:</string>
              </property>
             </widget>
            </item>

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
@@ -1308,8 +1308,8 @@ void Courtroom::done_received()
   set_mute_list();
   set_pair_list();
 
-  if (Options::getInstance().saveWindowPositionEdit()) {
-      move(Options::getInstance().getWindowPosition());
+  if (Options::getInstance().restoreCourtroomWindowPositionEdit()) {
+      move(Options::getInstance().getCourtroomWindowPosition());
   }
 
 
@@ -5834,6 +5834,6 @@ Courtroom::~Courtroom()
 
 void Courtroom::closeEvent(QCloseEvent *event)
 {
-    Options::getInstance().setWindowPosition(pos());
+    Options::getInstance().setCourtroomWindowPosition(pos());
     QMainWindow::closeEvent(event);
 }
diff --git a/src/options.cpp b/src/options.cpp
@@ -539,14 +539,14 @@ void Options::setEvidenceDoubleClickEdit(bool value)
   config.setValue("evidence_double_click", value);
 }
 
-bool Options::saveWindowPositionEdit() const
+bool Options::restoreCourtroomWindowPositionEdit() const
 {
-  return config.value("save_window_position", true).toBool();
+  return config.value("restore_courtroom_window_position", true).toBool();
 }
 
-void Options::setSaveWindowPositionEdit(bool value)
+void Options::setRestoreCourtroomWindowPositionEdit(bool value)
 {
-  config.setValue("save_window_position", value);
+  config.setValue("restore_courtroom_window_position", value);
 }
 
 QString Options::alternativeMasterserver() const
@@ -583,12 +583,12 @@ void Options::setCallwords(QStringList value)
   config.setValue("callwords", value);
 }
 
-void Options::setWindowPosition(QPoint value)
+void Options::setCourtroomWindowPosition(QPoint value)
 {
   config.setValue("Window/WindowPos", value);
 }
 
-QPoint Options::getWindowPosition()
+QPoint Options::getCourtroomWindowPosition()
 {
   return config.value("Window/WindowPos").toPoint();
 }

diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
@@ -362,7 +362,7 @@ void AOOptionsDialog::setupUI()
   FROM_UI(QCheckBox, category_stop_cb)
   FROM_UI(QCheckBox, sfx_on_idle_cb)
   FROM_UI(QCheckBox, evidence_double_click_cb)
-  FROM_UI(QCheckBox, set_save_window_position_cb)
+  FROM_UI(QCheckBox, set_restore_courtroom_window_position_cb)
 
   registerOption<QCheckBox, bool>("animated_theme_cb",
                                   &Options::animatedThemeEnabled,
@@ -437,9 +437,9 @@ void AOOptionsDialog::setupUI()
   registerOption<QCheckBox, bool>("evidence_double_click_cb",
                                   &Options::evidenceDoubleClickEdit,
                                   &Options::setEvidenceDoubleClickEdit);
-  registerOption<QCheckBox, bool>("save_window_position_cb",
-                                  &Options::saveWindowPositionEdit,
-                                  &Options::setSaveWindowPositionEdit);
+  registerOption<QCheckBox, bool>("restore_courtroom_window_position_cb",
+                                  &::Options::restoreCourtroomWindowPositionEdit,
+                                  &Options::setRestoreCourtroomWindowPositionEdit);
 
 
   // Callwords tab. This could just be a QLineEdit, but no, we decided to allow