From 15077ec14259b2c91e348b360047df8d66570a9e Mon Sep 17 00:00:00 2001 From: agilob Date: Sun, 11 Oct 2015 18:46:35 +0100 Subject: [PATCH] reorganize generalsettings: * tab order on widgets * better spacing * consistent text * indentation for similar settings --- src/widget/form/settings/generalform.cpp | 5 +- src/widget/form/settings/generalsettings.ui | 488 +++++++++++--------- 2 files changed, 268 insertions(+), 225 deletions(-) diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp index 36d00a72c..2dd4fe2cf 100644 --- a/src/widget/form/settings/generalform.cpp +++ b/src/widget/form/settings/generalform.cpp @@ -151,12 +151,12 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) : //general connect(bodyUI->checkUpdates, &QCheckBox::stateChanged, this, &GeneralForm::onCheckUpdateChanged); connect(bodyUI->transComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onTranslationUpdated())); - connect(bodyUI->cbAutorun, &QCheckBox::stateChanged, this, &GeneralForm::onAutorunUpdated); + connect(bodyUI->cbAutorun, &QCheckBox::stateChanged, this, &GeneralForm::onAutorunUpdated);\ + connect(bodyUI->lightTrayIcon, &QCheckBox::stateChanged, this, &GeneralForm::onSetLightTrayIcon); connect(bodyUI->showSystemTray, &QCheckBox::stateChanged, this, &GeneralForm::onSetShowSystemTray); connect(bodyUI->startInTray, &QCheckBox::stateChanged, this, &GeneralForm::onSetAutostartInTray); connect(bodyUI->closeToTray, &QCheckBox::stateChanged, this, &GeneralForm::onSetCloseToTray); connect(bodyUI->minimizeToTray, &QCheckBox::stateChanged, this, &GeneralForm::onSetMinimizeToTray); - connect(bodyUI->lightTrayIcon, &QCheckBox::stateChanged, this, &GeneralForm::onSetLightTrayIcon); connect(bodyUI->statusChanges, &QCheckBox::stateChanged, this, &GeneralForm::onSetStatusChange); connect(bodyUI->autoAwaySpinBox, SIGNAL(editingFinished()), this, SLOT(onAutoAwayChanged())); connect(bodyUI->showWindow, &QCheckBox::stateChanged, this, &GeneralForm::onShowWindowChanged); @@ -236,7 +236,6 @@ void GeneralForm::onSetShowSystemTray() { Settings::getInstance().setShowSystemTray(bodyUI->showSystemTray->isChecked()); emit parent->setShowSystemTray(bodyUI->showSystemTray->isChecked()); - bodyUI->lightTrayIcon->setEnabled(bodyUI->showSystemTray->isChecked()); Settings::getInstance().saveGlobal(); } diff --git a/src/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui index 953743a95..9caa1798c 100644 --- a/src/widget/form/settings/generalsettings.ui +++ b/src/widget/form/settings/generalsettings.ui @@ -39,8 +39,8 @@ 0 0 - 639 - 1388 + 631 + 1419 @@ -99,38 +99,15 @@ - System tray + System Tray Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 0 - 0 - - - - qTox will start minimized in tray. - - - Start in tray - - - - - - - Show system tray icon - - - - + + @@ -147,17 +124,23 @@ instead of closing itself. - - + + + + + 0 + 0 + + - Enable light tray icon. + qTox will start minimized in tray. - Light icon + Start in tray - + @@ -174,21 +157,53 @@ instead of system taskbar. + + + + true + + + + 0 + 0 + + + + Show system tray icon + + + + + + + + 0 + 0 + + + + Enable light tray icon. + + + Light icon + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -283,7 +298,7 @@ instead of system taskbar. - Default directory to save files + Default directory to save files: @@ -309,50 +324,55 @@ instead of system taskbar. - - - 0 - - - - + + + + On new message: - - - - - Play a sound when you recieve message. - - - Play sound - - - - - - - Focus qTox when you receive message. - - - Focus window - - - - - - - Open qTox's window when you receive a new message and no window is open yet. - - - Open window - - - - - showWindow - showInFront - notifySound + + + + + + Open qTox's window when you receive a new message and no window is open yet. + + + Open window + + + + + + + Play a sound when you recieve message. + + + Play sound + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Focus qTox when you receive message. + + + Focus window + @@ -374,23 +394,6 @@ instead of system taskbar. - - - - Multiple windows mode - - - - - - - false - - - Open each chat in an individual window - - - @@ -422,6 +425,40 @@ will be sent to them when they appear online to you. + + + + + + false + + + Open each chat in an individual window + + + + + + + Multiple windows mode + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -466,6 +503,91 @@ will be sent to them when they appear online to you. + + + + Qt::Horizontal + + + + 80 + 20 + + + + + + + + QLayout::SetDefaultConstraint + + + + + :) + + + + + + Qt::AlignCenter + + + + + + + ;) + + + + + + Qt::AlignCenter + + + + + + + :p + + + + + + Qt::AlignCenter + + + + + + + :O + + + + + + Qt::AlignCenter + + + + + + + :'( + + + + + + Qt::AlignCenter + + + + + @@ -559,91 +681,6 @@ will be sent to them when they appear online to you. - - - - Qt::Horizontal - - - - 80 - 20 - - - - - - - - QLayout::SetDefaultConstraint - - - - - :) - - - - - - Qt::AlignCenter - - - - - - - ;) - - - - - - Qt::AlignCenter - - - - - - - :p - - - - - - Qt::AlignCenter - - - - - - - :O - - - - - - Qt::AlignCenter - - - - - - - :'( - - - - - - Qt::AlignCenter - - - - - @@ -662,7 +699,14 @@ will be sent to them when they appear online to you. 9 - + + + + + Enable IPv6 (recommended) + + + @@ -673,30 +717,17 @@ will be sent to them when they appear online to you. - - - - Enable IPv6 (recommended) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - + + + + Proxy type: + + + @@ -707,13 +738,6 @@ will be sent to them when they appear online to you. - - - - Proxy type: - - - @@ -727,7 +751,7 @@ will be sent to them when they appear online to you. - Port + Port: @@ -802,19 +826,39 @@ will be sent to them when they appear online to you. scrollArea transComboBox - groupAlwaysNotify + lightTrayIcon + showSystemTray + startInTray + minimizeToTray + closeToTray + autoAwaySpinBox + cbAutorun + checkUpdates + autoSaveFilesDir + autoacceptFiles + notifySound + showInFront + showWindow statusChanges + groupAlwaysNotify + cbGroupchatPosition + cbFauxOfflineMessaging + cbCompactLayout + cbSeparateWindow + cbDontGroupWindows useEmoticons smileyPackBrowser emoticonSize styleBrowser themeColorCBox timestamp - cbEnableUDP + dateFormats cbEnableIPv6 + cbEnableUDP proxyType proxyAddr proxyPort + reconnectButton