From 389c8a38c25e28c67b83d1ff59345046656d5ff0 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik@verbruggen.consulting>
Date: Thu, 13 Jun 2024 16:38:34 +0200
Subject: [PATCH] WIP

---
 src/gui/activitywidget.ui   |  3 +++
 src/gui/generalsettings.cpp |  3 +++
 src/gui/generalsettings.ui  | 13 +++++++------
 src/gui/networksettings.cpp | 10 ++++++++++
 src/gui/networksettings.h   |  3 +++
 src/gui/networksettings.ui  | 13 -------------
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/gui/activitywidget.ui b/src/gui/activitywidget.ui
index 21f615d86f6..daef477253c 100644
--- a/src/gui/activitywidget.ui
+++ b/src/gui/activitywidget.ui
@@ -87,6 +87,9 @@
         <property name="contextMenuPolicy">
          <enum>Qt::CustomContextMenu</enum>
         </property>
+        <property name="accessibleName">
+         <string>Server activity table</string>
+        </property>
         <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 16629d6fc95..e99fee8ef2e 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -84,6 +84,9 @@ GeneralSettings::GeneralSettings(QWidget *parent)
     if (!Theme::instance()->aboutShowCopyright()) {
         _ui->copyrightLabel->hide();
     }
+
+    setTabOrder(_ui->scrollArea, _ui->networkSettings->lastTabAbleWidget());
+    _ui->networkSettings->setTabOrder(_ui->networkSettings->firstTabAbleWidget(), _ui->logSettingsButton);
 }
 
 GeneralSettings::~GeneralSettings()
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
index c77c9d097aa..f1946abae7a 100644
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -38,21 +38,21 @@
           <item row="1" column="0">
            <widget class="QCheckBox" name="monoIconsCheckBox">
             <property name="text">
-             <string>Use &amp;Monochrome Icons in the system tray</string>
+             <string>Use Monochrome Icons in the system tray</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QCheckBox" name="desktopNotificationsCheckBox">
             <property name="text">
-             <string>Show &amp;Desktop Notifications</string>
+             <string>Show Desktop Notifications</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QCheckBox" name="autostartCheckBox">
             <property name="text">
-             <string>Start on &amp;Login</string>
+             <string>Start on Login</string>
             </property>
            </widget>
           </item>
@@ -122,7 +122,7 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string>S&amp;how crash reporter</string>
+               <string>Show crash reporter</string>
               </property>
              </widget>
             </item>
@@ -138,7 +138,7 @@
               <item>
                <widget class="QPushButton" name="ignoredFilesButton">
                 <property name="text">
-                 <string>Edit &amp;Ignored Files</string>
+                 <string>Edit Ignored Files</string>
                 </property>
                </widget>
               </item>
@@ -176,7 +176,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="NetworkSettings" name="widget" native="true"/>
+           <widget class="NetworkSettings" name="networkSettings" native="true"/>
           </item>
          </layout>
         </widget>
@@ -269,6 +269,7 @@
   <tabstop>moveToTrashCheckBox</tabstop>
   <tabstop>ignoredFilesButton</tabstop>
   <tabstop>logSettingsButton</tabstop>
+  <tabstop>networkSettings</tabstop>
   <tabstop>scrollArea</tabstop>
   <tabstop>about_pushButton</tabstop>
  </tabstops>
diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
index 6774be81e80..902f95f9062 100644
--- a/src/gui/networksettings.cpp
+++ b/src/gui/networksettings.cpp
@@ -106,6 +106,16 @@ NetworkSettings::~NetworkSettings()
     delete _ui;
 }
 
+QWidget *NetworkSettings::firstTabAbleWidget() const
+{
+    return _ui->pauseSyncWhenMeteredCheckbox;
+}
+
+QWidget *NetworkSettings::lastTabAbleWidget() const
+{
+    return _ui->uploadSpinBox;
+}
+
 
 void NetworkSettings::loadProxySettings()
 {
diff --git a/src/gui/networksettings.h b/src/gui/networksettings.h
index aaf47641f06..a658ea3bd15 100644
--- a/src/gui/networksettings.h
+++ b/src/gui/networksettings.h
@@ -38,6 +38,9 @@ class NetworkSettings : public QWidget
     explicit NetworkSettings(QWidget *parent = nullptr);
     ~NetworkSettings() override;
 
+    QWidget *firstTabAbleWidget() const;
+    QWidget *lastTabAbleWidget() const;
+
 private Q_SLOTS:
     void saveProxySettings();
     void saveBWLimitSettings();
diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui
index b94f79a6426..17cc71f3596 100644
--- a/src/gui/networksettings.ui
+++ b/src/gui/networksettings.ui
@@ -294,19 +294,6 @@
           </item>
          </layout>
         </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>147</width>
-            <height>25</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
      </item>