Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP #11701

Closed
wants to merge 1 commit into from
Closed

WIP #11701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/gui/activitywidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions src/gui/generalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
13 changes: 7 additions & 6 deletions src/gui/generalsettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -122,7 +122,7 @@
</sizepolicy>
</property>
<property name="text">
<string>S&amp;how crash reporter</string>
<string>Show crash reporter</string>
</property>
</widget>
</item>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -269,6 +269,7 @@
<tabstop>moveToTrashCheckBox</tabstop>
<tabstop>ignoredFilesButton</tabstop>
<tabstop>logSettingsButton</tabstop>
<tabstop>networkSettings</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>about_pushButton</tabstop>
</tabstops>
Expand Down
10 changes: 10 additions & 0 deletions src/gui/networksettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
3 changes: 3 additions & 0 deletions src/gui/networksettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
13 changes: 0 additions & 13 deletions src/gui/networksettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading