diff --git a/src/widget/form/settings/generalsettings.ui b/src/widget/form/settings/generalsettings.ui
index dbac86972..b4a747eda 100644
--- a/src/widget/form/settings/generalsettings.ui
+++ b/src/widget/form/settings/generalsettings.ui
@@ -40,7 +40,7 @@
0
0
653
- 1080
+ 1154
@@ -106,7 +106,7 @@
-
-
+
-
@@ -193,49 +193,8 @@ instead of system taskbar.
-
-
+
-
-
-
-
-
-
- <html><head/><body><p>Start qTox on operating system startup (current profile).</p></body></html>
-
-
- Autostart
-
-
-
- -
-
-
- Check for updates on startup
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- 0
-
-
-
Your status is changed to Away after set period of inactivity.
@@ -248,7 +207,7 @@ instead of system taskbar.
- -
+
-
@@ -273,7 +232,35 @@ instead of system taskbar.
- -
+
+
+ -
+
+
-
+
+
+ <html><head/><body><p>Start qTox on operating system startup (current profile).</p></body></html>
+
+
+ Autostart
+
+
+
+ -
+
+
+ Check for updates on startup
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
You can set this on a per-friend basis by right clicking them.
@@ -283,7 +270,7 @@ instead of system taskbar.
- -
+
-
@@ -308,58 +295,53 @@ instead of system taskbar.
-
-
+
0
-
-
-
+
+
On new message:
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Show qTox's window when you receive new message.
-
-
- Show window
-
-
-
- -
-
-
- Focus qTox when you receive message.
-
-
- Focus window
-
-
-
- -
-
-
- Play a sound when you recieve message.
-
-
- Play sound
-
+
+
-
+
+
+ Play a sound when you recieve message.
+
+
+ Play sound
+
+
+
+ -
+
+
+ Focus qTox when you receive message.
+
+
+ Focus window
+
+
+
+ -
+
+
+ Show qTox's window when you receive new message.
+
+
+ Show window
+
+
+
+
+ showWindow
+ showInFront
+ notifySound
+ showWindow
+ showInFront
+ notifySound
@@ -457,10 +439,26 @@ will be sent to them when they appear online to you.
-
-
+
QLayout::SetDefaultConstraint
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 120
+ 20
+
+
+
+
-
@@ -469,6 +467,9 @@ will be sent to them when they appear online to you.
+
+ Qt::AlignCenter
+
-
@@ -479,6 +480,9 @@ will be sent to them when they appear online to you.
+
+ Qt::AlignCenter
+
-
@@ -489,6 +493,9 @@ will be sent to them when they appear online to you.
+
+ Qt::AlignCenter
+
-
@@ -499,6 +506,9 @@ will be sent to them when they appear online to you.
+
+ Qt::AlignCenter
+
-
@@ -509,6 +519,9 @@ will be sent to them when they appear online to you.
+
+ Qt::AlignCenter
+
@@ -764,13 +777,8 @@ will be sent to them when they appear online to you.
scrollArea
transComboBox
- autoacceptFiles
- autoSaveFilesDir
- autoAwaySpinBox
groupAlwaysNotify
statusChanges
- showWindow
- showInFront
useEmoticons
smileyPackBrowser
emoticonSize
@@ -786,18 +794,18 @@ will be sent to them when they appear online to you.
- showSystemTray
+ showWindow
toggled(bool)
- startInTray
+ showInFront
setEnabled(bool)
- 105
- 144
+ 329
+ 349
- 119
- 177
+ 451
+ 349
@@ -834,18 +842,18 @@ will be sent to them when they appear online to you.
- showWindow
+ showSystemTray
toggled(bool)
- showInFront
+ startInTray
setEnabled(bool)
- 329
- 349
+ 105
+ 144
- 451
- 349
+ 119
+ 177
diff --git a/src/widget/form/settings/verticalonlyscroller.cpp b/src/widget/form/settings/verticalonlyscroller.cpp
index 49e6532cf..a5be4e269 100644
--- a/src/widget/form/settings/verticalonlyscroller.cpp
+++ b/src/widget/form/settings/verticalonlyscroller.cpp
@@ -15,6 +15,7 @@
*/
#include
+#include
#include "verticalonlyscroller.h"
@@ -29,3 +30,10 @@ void VerticalOnlyScroller::resizeEvent(QResizeEvent *event)
if (widget())
widget()->setMaximumWidth(event->size().width());
}
+
+void VerticalOnlyScroller::showEvent(QShowEvent *event)
+{
+ QScrollArea::showEvent(event);
+ if (widget())
+ widget()->setMaximumWidth(size().width());
+}
diff --git a/src/widget/form/settings/verticalonlyscroller.h b/src/widget/form/settings/verticalonlyscroller.h
index 089a55ca2..94ddcead6 100644
--- a/src/widget/form/settings/verticalonlyscroller.h
+++ b/src/widget/form/settings/verticalonlyscroller.h
@@ -20,6 +20,7 @@
#include
class QResizeEvent;
+class QShowEvent;
class VerticalOnlyScroller : public QScrollArea
{
@@ -29,6 +30,7 @@ public:
protected:
void resizeEvent(QResizeEvent *event);
+ void showEvent(QShowEvent *event);
};
#endif // VERTICALONLYSCROLLER_H