X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.ui;h=7b6af81fc1f81435e285fc12de89434addb1177a;hp=5d8fa77cbda6d07399ad8b272b0df07cf78a3cc5;hb=3abd4b7d5ab303f8d990c104748e5d5aef4db355;hpb=a113f73e5f8ce89c3df5c42d55528404fc7a2294

diff --git a/src/qtui/settingspages/appearancesettingspage.ui b/src/qtui/settingspages/appearancesettingspage.ui
index 5d8fa77c..7b6af81f 100644
--- a/src/qtui/settingspages/appearancesettingspage.ui
+++ b/src/qtui/settingspages/appearancesettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>549</width>
-    <height>470</height>
+    <width>755</width>
+    <height>536</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,27 +17,13 @@
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Client style:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="styleComboBox">
-       <property name="toolTip">
-        <string>Set application style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
       <widget class="QLabel" name="label_9">
        <property name="text">
         <string>Language:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="0" column="1">
       <widget class="QComboBox" name="languageComboBox">
        <property name="toolTip">
         <string>Set the application language. Requires restart!</string>
@@ -54,7 +40,7 @@
        </item>
       </widget>
      </item>
-     <item row="1" column="2">
+     <item row="0" column="2">
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -67,66 +53,68 @@
        </property>
       </spacer>
      </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Widget style:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="styleComboBox">
+       <property name="toolTip">
+        <string>Set application style</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="iconthemeLabel">
        <property name="text">
-        <string>Icon theme:</string>
+        <string>Fallback icon theme:</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QComboBox" name="iconthemeComboBox">
+      <widget class="QComboBox" name="iconThemeComboBox">
        <property name="toolTip">
-        <string>Choose from the bundled icon themes! May need restart...</string>
+        <string>Icon theme to use for icons that are not found in the current system theme. Requires the selected theme to be installed either system-wide, or as part of the Quassel installation. Supported themes are Breeze, Breeze Dark and Oxygen, all of KDE fame.</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QCheckBox" name="overrideSystemIconTheme">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, uses the selected fallback icon theme instead of the configured system theme for all icons. Recommended if you want Quassel to have a consistent look-and-feel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Override system theme</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">/UiStyle/Icons/OverrideSystemTheme</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>false</bool>
        </property>
-       <item>
-        <property name="text">
-         <string>&lt;System Default&gt;</string>
-        </property>
-       </item>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="useCustomStyleSheet">
-     <property name="text">
-      <string>Use custom stylesheet</string>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/UiStyle/UseCustomStyleSheet</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
+      <widget class="QCheckBox" name="useCustomStyleSheet">
+       <property name="text">
+        <string>Use custom stylesheet</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">/UiStyle/UseCustomStyleSheet</string>
        </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="enabled">
+       <property name="defaultValue" stdset="0">
         <bool>false</bool>
        </property>
-       <property name="text">
-        <string>Path:</string>
-       </property>
       </widget>
      </item>
      <item>
@@ -163,26 +151,36 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QCheckBox" name="useSystemTrayIcon">
-     <property name="text">
-      <string>Show system tray icon</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">UseSystemTrayIcon</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="0">
-      <spacer name="horizontalSpacer_2">
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="invertSystrayColors">
+       <property name="text">
+        <string>Invert colors</string>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">/UiStyle/Icons/InvertTray</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="0">
+      <spacer name="horizontalSpacer_6">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -197,7 +195,7 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
+     <item row="1" column="1">
       <widget class="QCheckBox" name="minimizeOnClose">
        <property name="text">
         <string>Hide to tray on close button</string>
@@ -211,7 +209,7 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <spacer name="horizontalSpacer_4">
+      <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -226,16 +224,16 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="animateSystrayIcon">
-       <property name="styleSheet">
-        <string notr="true"/>
-       </property>
+     <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="useSystemTrayIcon">
        <property name="text">
-        <string>Enable animations</string>
+        <string>Show system tray icon</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
        </property>
        <property name="settingsKey" stdset="0">
-        <string notr="true">/Notification/Systray/Animate</string>
+        <string notr="true">UseSystemTrayIcon</string>
        </property>
        <property name="defaultValue" stdset="0">
         <bool>true</bool>
@@ -411,13 +409,16 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>styleComboBox</tabstop>
   <tabstop>languageComboBox</tabstop>
+  <tabstop>styleComboBox</tabstop>
+  <tabstop>iconThemeComboBox</tabstop>
+  <tabstop>overrideSystemIconTheme</tabstop>
   <tabstop>useCustomStyleSheet</tabstop>
-  <tabstop>customStyleSheetPath</tabstop>
   <tabstop>chooseStyleSheet</tabstop>
+  <tabstop>customStyleSheetPath</tabstop>
   <tabstop>useSystemTrayIcon</tabstop>
   <tabstop>minimizeOnClose</tabstop>
+  <tabstop>invertSystrayColors</tabstop>
   <tabstop>userNoticesInDefaultBuffer</tabstop>
   <tabstop>userNoticesInStatusBuffer</tabstop>
   <tabstop>userNoticesInCurrentBuffer</tabstop>
@@ -437,28 +438,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>63</x>
-     <y>86</y>
+     <x>70</x>
+     <y>166</y>
     </hint>
     <hint type="destinationlabel">
-     <x>86</x>
-     <y>114</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useCustomStyleSheet</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>label</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>45</x>
-     <y>80</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>38</x>
-     <y>113</y>
+     <x>321</x>
+     <y>171</y>
     </hint>
    </hints>
   </connection>
@@ -469,12 +454,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>84</x>
-     <y>80</y>
+     <x>91</x>
+     <y>166</y>
     </hint>
     <hint type="destinationlabel">
-     <x>525</x>
-     <y>117</y>
+     <x>747</x>
+     <y>172</y>
     </hint>
    </hints>
   </connection>
@@ -485,28 +470,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>91</x>
-     <y>143</y>
+     <x>98</x>
+     <y>206</y>
     </hint>
     <hint type="destinationlabel">
-     <x>92</x>
-     <y>174</y>
+     <x>125</x>
+     <y>238</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>useSystemTrayIcon</sender>
    <signal>toggled(bool)</signal>
-   <receiver>animateSystrayIcon</receiver>
+   <receiver>invertSystrayColors</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>125</x>
-     <y>144</y>
+     <x>45</x>
+     <y>197</y>
     </hint>
     <hint type="destinationlabel">
-     <x>122</x>
-     <y>203</y>
+     <x>70</x>
+     <y>291</y>
     </hint>
    </hints>
   </connection>