Change hambuger menu/submenu layouts

paolostivanin · Mar 8, 2024 · f12b962 · f12b962
1 parent 619d7dd
commit f12b962
Showing 1 changed file with 112 additions and 30 deletions.
diff --git a/src/ui/settings_popover.ui b/src/ui/settings_popover.ui
@@ -168,7 +168,7 @@
  </object>
  <packing>
  <property name="submenu">import_menu</property>
- <property name="position">1</property>
+ <property name="position">0</property>
  </packing>
  </child>
  <child>
@@ -321,7 +321,7 @@
  </object>
  <packing>
  <property name="submenu">export_menu</property>
- <property name="position">2</property>
+ <property name="position">1</property>
  </packing>
  </child>
  <child>
@@ -330,12 +330,14 @@
  <property name="can-focus">False</property>
  <property name="orientation">vertical</property>
  <child>
- <object class="GtkModelButton" id="import_model_btn_id">
+ <object class="GtkModelButton" id="db_submenu_back_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="text" translatable="yes">Import</property>
- <property name="menu-name">import_menu</property>
+ <property name="inverted">True</property>
+ <property name="centered">True</property>
+ <property name="menu-name">main</property>
+ <property name="text" translatable="yes">Back</property>
  </object>
  <packing>
  <property name="expand">False</property>
@@ -344,12 +346,12 @@
  </packing>
  </child>
  <child>
- <object class="GtkModelButton" id="export_model_btn_id">
+ <object class="GtkModelButton" id="newdb_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="text" translatable="yes">Export</property>
- <property name="menu-name">export_menu</property>
+ <property name="action-name">settings_menu.create_newdb</property>
+ <property name="text" translatable="yes">New DB</property>
  </object>
  <packing>
  <property name="expand">False</property>
@@ -358,12 +360,12 @@
  </packing>
  </child>
  <child>
- <object class="GtkModelButton" id="newdb_model_btn_id">
+ <object class="GtkModelButton" id="change_db_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="action-name">settings_menu.create_newdb</property>
- <property name="text" translatable="yes">New database</property>
+ <property name="action-name">settings_menu.change_db</property>
+ <property name="text" translatable="yes">Change DB</property>
  </object>
  <packing>
  <property name="expand">False</property>
@@ -372,12 +374,12 @@
  </packing>
  </child>
  <child>
- <object class="GtkModelButton" id="change_db_model_btn_id">
+ <object class="GtkModelButton" id="change_pwd_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="action-name">settings_menu.change_db</property>
- <property name="text" translatable="yes">Change database</property>
+ <property name="action-name">settings_menu.change_pwd</property>
+ <property name="text" translatable="yes">Change DB password</property>
  </object>
  <packing>
  <property name="expand">False</property>
@@ -386,31 +388,58 @@
  </packing>
  </child>
  <child>
- <object class="GtkModelButton" id="change_pwd_model_btn_id">
+ <object class="GtkModelButton" id="dbinfo_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="action-name">settings_menu.change_pwd</property>
- <property name="text" translatable="yes">Change password</property>
+ <property name="action-name">settings_menu.dbinfo</property>
+ <property name="text" translatable="yes">DB info</property>
  </object>
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
  <property name="position">4</property>
  </packing>
  </child>
+ </object>
+ <packing>
+ <property name="submenu">db_menu</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkModelButton" id="row_submenu_back_btn_id">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="inverted">True</property>
+ <property name="centered">True</property>
+ <property name="menu-name">main</property>
+ <property name="text" translatable="yes">Back</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
  <child>
  <object class="GtkModelButton" id="edit_row_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
  <property name="action-name">settings_menu.edit_row</property>
- <property name="text" translatable="yes">Edit row</property>
+ <property name="text" translatable="yes">Edit data</property>
  </object>
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">1</property>
  </packing>
  </child>
  <child>
@@ -424,21 +453,74 @@
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">2</property>
  </packing>
  </child>
+ </object>
+ <packing>
+ <property name="submenu">row_menu</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
  <child>
- <object class="GtkModelButton" id="settings_model_btn_id">
+ <object class="GtkModelButton" id="import_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="action-name">settings_menu.settings</property>
- <property name="text" translatable="yes">Settings</property>
+ <property name="text" translatable="yes">Import</property>
+ <property name="menu-name">import_menu</property>
  </object>
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkModelButton" id="export_model_btn_id">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="text" translatable="yes">Export</property>
+ <property name="menu-name">export_menu</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkModelButton" id="db_model_btn_id">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="text" translatable="yes">Database Mgmt</property>
+ <property name="menu-name">db_menu</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkModelButton" id="row_model_btn_id">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="text" translatable="yes">Row Mgmt</property>
+ <property name="menu-name">row_menu</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
  </packing>
  </child>
  <child>
@@ -452,21 +534,21 @@
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">7</property>
  </packing>
  </child>
  <child>
- <object class="GtkModelButton" id="dbinfo_model_btn_id">
+ <object class="GtkModelButton" id="settings_model_btn_id">
  <property name="visible">True</property>
  <property name="can-focus">True</property>
  <property name="receives-default">True</property>
- <property name="action-name">settings_menu.dbinfo</property>
- <property name="text" translatable="yes">Database info</property>
+ <property name="action-name">settings_menu.settings</property>
+ <property name="text" translatable="yes">Settings</property>
  </object>
  <packing>
  <property name="expand">False</property>
  <property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">8</property>
  </packing>
  </child>
  <child>
@@ -545,4 +627,4 @@
  </packing>
  </child>
  </object>
-</interface>
+</interface>