Fixes tab order

4 files changed, 86 insertions, 17 deletions

diff --git a/src/dialogs/certificatemanagementdialog.ui b/src/dialogs/certificatemanagementdialog.ui
index 82dd788..db5c241 100644
--- a/src/dialogs/certificatemanagementdialog.ui
+++ b/src/dialogs/certificatemanagementdialog.ui
@@ -14,7 +14,8 @@
    <string>Certificate Manager</string>
   </property>
   <property name="windowIcon">
-   <iconset theme="certificate"/>
+   <iconset theme="certificate">
+    <normaloff>.</normaloff>.</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -54,7 +55,8 @@
             <string>Create...</string>
            </property>
            <property name="icon">
-            <iconset theme="create-new"/>
+            <iconset theme="create-new">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
@@ -67,7 +69,8 @@
             <string>Import...</string>
            </property>
            <property name="icon">
-            <iconset theme="save-import"/>
+            <iconset theme="save-import">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
@@ -96,7 +99,8 @@
             <string>Export...</string>
            </property>
            <property name="icon">
-            <iconset theme="save-export"/>
+            <iconset theme="save-export">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
@@ -112,7 +116,8 @@
             <string>Delete</string>
            </property>
            <property name="icon">
-            <iconset theme="delete-alert"/>
+            <iconset theme="delete-alert">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
@@ -256,6 +261,20 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>certificates</tabstop>
+  <tabstop>create_cert_button</tabstop>
+  <tabstop>import_cert_button</tabstop>
+  <tabstop>export_cert_button</tabstop>
+  <tabstop>delete_cert_button</tabstop>
+  <tabstop>cert_display_name</tabstop>
+  <tabstop>cert_common_name</tabstop>
+  <tabstop>cert_expiration_date</tabstop>
+  <tabstop>cert_host_filter</tabstop>
+  <tabstop>cert_auto_enable</tabstop>
+  <tabstop>cert_fingerprint</tabstop>
+  <tabstop>cert_notes</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/dialogs/certificateselectiondialog.ui b/src/dialogs/certificateselectiondialog.ui
index d6128f9..1bc167f 100644
--- a/src/dialogs/certificateselectiondialog.ui
+++ b/src/dialogs/certificateselectiondialog.ui
@@ -14,7 +14,7 @@
    <string>Select client certificate</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="icons.qrc">
+   <iconset>
     <normaloff>:/icons/certificate.svg</normaloff>:/icons/certificate.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -56,7 +56,7 @@
         <string>Create new identity</string>
        </property>
        <property name="icon">
-        <iconset resource="icons.qrc">
+        <iconset>
          <normaloff>:/icons/plus.svg</normaloff>:/icons/plus.svg</iconset>
        </property>
       </widget>
@@ -148,9 +148,7 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="icons.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/dialogs/newidentitiydialog.ui b/src/dialogs/newidentitiydialog.ui
index 556ac93..7e9511a 100644
--- a/src/dialogs/newidentitiydialog.ui
+++ b/src/dialogs/newidentitiydialog.ui
@@ -14,7 +14,7 @@
    <string>Create new certificate</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="icons.qrc">
+   <iconset>
     <normaloff>:/icons/certificate.svg</normaloff>:/icons/certificate.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -78,9 +78,13 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="icons.qrc"/>
- </resources>
+ <tabstops>
+  <tabstop>group</tabstop>
+  <tabstop>display_name</tabstop>
+  <tabstop>common_name</tabstop>
+  <tabstop>expiration_date</tabstop>
+ </tabstops>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/dialogs/settingsdialog.ui b/src/dialogs/settingsdialog.ui
index 9acbca6..4e92ab8 100644
--- a/src/dialogs/settingsdialog.ui
+++ b/src/dialogs/settingsdialog.ui
@@ -21,7 +21,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="generic">
       <attribute name="icon">
@@ -896,6 +896,54 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>ui_theme</tabstop>
+  <tabstop>start_page</tabstop>
+  <tabstop>enable_gemini</tabstop>
+  <tabstop>enable_gopher</tabstop>
+  <tabstop>enable_finger</tabstop>
+  <tabstop>enable_http</tabstop>
+  <tabstop>enable_https</tabstop>
+  <tabstop>fancypants_on</tabstop>
+  <tabstop>fancypants_off</tabstop>
+  <tabstop>texthl_on</tabstop>
+  <tabstop>texthl_off</tabstop>
+  <tabstop>gophermap_icon</tabstop>
+  <tabstop>gophermap_text</tabstop>
+  <tabstop>scheme_os_default</tabstop>
+  <tabstop>scheme_error</tabstop>
+  <tabstop>max_redirects</tabstop>
+  <tabstop>redirection_mode</tabstop>
+  <tabstop>network_timeout</tabstop>
+  <tabstop>bg_change_color</tabstop>
+  <tabstop>style_preview</tabstop>
+  <tabstop>std_change_font</tabstop>
+  <tabstop>std_change_color</tabstop>
+  <tabstop>pre_change_font</tabstop>
+  <tabstop>pre_change_color</tabstop>
+  <tabstop>h1_change_font</tabstop>
+  <tabstop>h1_change_color</tabstop>
+  <tabstop>h2_change_font</tabstop>
+  <tabstop>h2_change_color</tabstop>
+  <tabstop>h3_change_font</tabstop>
+  <tabstop>h3_change_color</tabstop>
+  <tabstop>link_local_change_color</tabstop>
+  <tabstop>link_foreign_change_color</tabstop>
+  <tabstop>link_cross_change_color</tabstop>
+  <tabstop>link_local_prefix</tabstop>
+  <tabstop>link_foreign_prefix</tabstop>
+  <tabstop>quote_change_color</tabstop>
+  <tabstop>auto_theme</tabstop>
+  <tabstop>page_margin</tabstop>
+  <tabstop>presets</tabstop>
+  <tabstop>preset_new</tabstop>
+  <tabstop>preset_save</tabstop>
+  <tabstop>preset_load</tabstop>
+  <tabstop>preset_import</tabstop>
+  <tabstop>preset_export</tabstop>
+  <tabstop>preview_url</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -932,9 +980,9 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="buttonGroup"/>
-  <buttongroup name="textHighlightsBtnGroup"/>
   <buttongroup name="gophermapBtnGroup"/>
+  <buttongroup name="textHighlightsBtnGroup"/>
   <buttongroup name="textRenderingBtnGroup"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>