X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.ui;h=26f29d1a0d335378b8d997fe86b7e1b2e56fdec1;hp=c2a643b91a0f75149b77118b6a18d0ebeea9d7e7;hb=932ab289c1482a8069cc320a16aca9216058523a;hpb=a9cc264bc4ee3e51ede21b79276704d4043e3656

diff --git a/src/qtui/settingspages/appearancesettingspage.ui b/src/qtui/settingspages/appearancesettingspage.ui
index c2a643b9..26f29d1a 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>463</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,47 +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>Fallback icon theme:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="iconThemeComboBox">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Supported themes are Breeze, Breeze Dark and Oxygen, all of KDE fame.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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>true</bool>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">/UiStyle/Icons/OverrideSystemTheme</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>true</bool>
+       </property>
+      </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>
@@ -144,47 +151,44 @@
      </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="1" column="2">
+      <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>20</width>
+         <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
-      <widget class="QCheckBox" name="minimizeOnClose">
+     <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="useSystemTrayIcon">
        <property name="text">
-        <string>Hide to tray on close button</string>
+        <string>Show system tray icon</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
        </property>
        <property name="settingsKey" stdset="0">
-        <string notr="true">MinimizeOnClose</string>
+        <string notr="true">UseSystemTrayIcon</string>
+       </property>
+       <property name="defaultValue" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="invertSystrayColors">
+       <property name="text">
+        <string>Invert brightness</string>
+       </property>
+       <property name="settingsKey" stdset="0">
+        <string notr="true">/UiStyle/Icons/InvertTray</string>
        </property>
        <property name="defaultValue" stdset="0">
         <bool>false</bool>
@@ -192,7 +196,7 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <spacer name="horizontalSpacer_4">
+      <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -207,19 +211,32 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="animateSystrayIcon">
-       <property name="styleSheet">
-        <string notr="true"/>
+     <item row="2" column="0">
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
+      </spacer>
+     </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="minimizeOnClose">
        <property name="text">
-        <string>Enable animations</string>
+        <string>Hide to tray on close button</string>
        </property>
        <property name="settingsKey" stdset="0">
-        <string notr="true">/Notification/Systray/Animate</string>
+        <string notr="true">MinimizeOnClose</string>
        </property>
        <property name="defaultValue" stdset="0">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -230,7 +247,10 @@
      <property name="title">
       <string>Message Redirection</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,1">
+      <property name="horizontalSpacing">
+       <number>20</number>
+      </property>
       <item row="1" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
@@ -357,6 +377,19 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="4">
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>1</width>
+          <height>1</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -376,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>
@@ -402,60 +438,60 @@
    <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>
+     <x>321</x>
+     <y>171</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>useCustomStyleSheet</sender>
    <signal>toggled(bool)</signal>
-   <receiver>label</receiver>
+   <receiver>chooseStyleSheet</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>45</x>
-     <y>80</y>
+     <x>91</x>
+     <y>166</y>
     </hint>
     <hint type="destinationlabel">
-     <x>38</x>
-     <y>113</y>
+     <x>747</x>
+     <y>172</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>useCustomStyleSheet</sender>
+   <sender>useSystemTrayIcon</sender>
    <signal>toggled(bool)</signal>
-   <receiver>chooseStyleSheet</receiver>
+   <receiver>minimizeOnClose</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>84</x>
-     <y>80</y>
+     <x>98</x>
+     <y>206</y>
     </hint>
     <hint type="destinationlabel">
-     <x>525</x>
-     <y>117</y>
+     <x>125</x>
+     <y>238</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>useSystemTrayIcon</sender>
    <signal>toggled(bool)</signal>
-   <receiver>minimizeOnClose</receiver>
+   <receiver>invertSystrayColors</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>91</x>
-     <y>143</y>
+     <x>45</x>
+     <y>197</y>
     </hint>
     <hint type="destinationlabel">
-     <x>92</x>
-     <y>174</y>
+     <x>70</x>
+     <y>291</y>
     </hint>
    </hints>
   </connection>