1 files changed, 92 insertions, 55 deletions
diff --git a/src/plugins/General/statusicon/settingsdialog.ui b/src/plugins/General/statusicon/settingsdialog.ui
index 4f1040258..c6d37b4f5 100644
--- a/src/plugins/General/statusicon/settingsdialog.ui
+++ b/src/plugins/General/statusicon/settingsdialog.ui
@@ -7,14 +7,23 @@
     <x>0</x>
     <y>0</y>
     <width>340</width>
-    <height>348</height>
+    <height>237</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Status Icon Plugin Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="14" column="0" colspan="3">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item row="13" column="0" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -27,7 +36,7 @@
      </property>
     </spacer>
    </item>
-   <item row="14" column="3">
+   <item row="13" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -40,23 +49,26 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="4">
+   <item row="9" column="0" colspan="3">
     <widget class="QGroupBox" name="niceTooltipGroupBox">
      <property name="title">
-      <string>Show nice tooltip</string>
+      <string>Tooltip</string>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="1" column="0">
+      <item row="0" column="0">
        <widget class="QLabel" name="niceTooltipDelayLabel">
         <property name="text">
-         <string>Tooltip delay, ms</string>
+         <string>Delay, ms:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2">
+      <item row="0" column="1">
        <widget class="QSpinBox" name="niceTooltipDelaySpinBox">
         <property name="maximum">
          <number>10000</number>
@@ -69,40 +81,50 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="niceTooltipOpacityLabel">
+      <item row="1" column="0">
+       <widget class="QLabel" name="transparencyLabel">
         <property name="text">
-         <string>Tooltip opacity</string>
+         <string>Transparency:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QSlider" name="niceTooltipOpacitySlider">
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="tickPosition">
-         <enum>QSlider::NoTicks</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="niceTooltipOpacityValueLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>3</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>0</string>
-        </property>
-       </widget>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QSlider" name="transparencySlider">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::NoTicks</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="niceTooltipOpacityValueLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+            <horstretch>3</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="niceTooltipSplitCheckBox">
         <property name="text">
          <string>Try to split file name when no tag</string>
@@ -112,27 +134,33 @@
      </layout>
     </widget>
    </item>
-   <item row="7" column="0" colspan="4">
+   <item row="7" column="0" colspan="3">
     <widget class="QGroupBox" name="messageGroupBox">
      <property name="title">
-      <string>Show message</string>
+      <string>Balloone message</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
        <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Message delay, ms:</string>
+         <string>Delay, ms:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item>
        <widget class="QSpinBox" name="messageDelaySpinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="minimum">
          <number>100</number>
         </property>
@@ -150,14 +178,7 @@
      </layout>
     </widget>
    </item>
-   <item row="13" column="0">
-    <widget class="QCheckBox" name="toolTipCheckBox">
-     <property name="text">
-      <string>Show tooltip</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="0">
+   <item row="12" column="0" colspan="3">
     <widget class="QCheckBox" name="standardIconsCheckBox">
      <property name="text">
       <string>Use standard icons</string>
@@ -175,8 +196,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>180</x>
-     <y>102</y>
+     <x>333</x>
+     <y>230</y>
     </hint>
     <hint type="destinationlabel">
      <x>112</x>
@@ -191,8 +212,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>242</x>
-     <y>107</y>
+     <x>333</x>
+     <y>230</y>
     </hint>
     <hint type="destinationlabel">
      <x>27</x>
@@ -200,5 +221,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>transparencySlider</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>niceTooltipOpacityValueLabel</receiver>
+   <slot>setNum(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>166</x>
+     <y>127</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>309</x>
+     <y>129</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>