X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.ui;h=d88df569366495ab39f6dfc268ff204caaaac747;hb=77397f5e999830077fee13187c6a1ee044d92545;hp=3dfcb645637358ad5dca444e640e45517f7bee4e;hpb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e;p=quassel.git

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index 3dfcb645..d88df569 100644
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>495</width>
-    <height>417</height>
+    <width>602</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -36,7 +36,7 @@
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <iconset>
            <normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>
          </property>
          <property name="iconSize" >
@@ -56,7 +56,7 @@
           <string>Add...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <iconset>
            <normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
          </property>
          <property name="iconSize" >
@@ -79,7 +79,7 @@
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <iconset>
            <normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
          </property>
          <property name="iconSize" >
@@ -95,15 +95,15 @@
      <item>
       <widget class="QTabWidget" name="tabWidget" >
        <property name="currentIndex" >
-        <number>2</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="generalTab" >
         <property name="geometry" >
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>463</width>
-          <height>314</height>
+          <width>570</width>
+          <height>355</height>
          </rect>
         </property>
         <attribute name="title" >
@@ -173,7 +173,7 @@
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                 </property>
                 <property name="iconSize" >
@@ -199,7 +199,7 @@
                  <string>Remove</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                 </property>
                </widget>
@@ -219,19 +219,13 @@
                  <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
                 </property>
                </widget>
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <item>
                  <spacer>
                   <property name="orientation" >
@@ -254,7 +248,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                   </property>
                  </widget>
@@ -268,7 +262,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                   </property>
                  </widget>
@@ -313,70 +307,122 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>100</width>
-          <height>30</height>
+          <width>570</width>
+          <height>355</height>
          </rect>
         </property>
         <attribute name="title" >
          <string>A&amp;way</string>
         </attribute>
-        <layout class="QVBoxLayout" >
+        <layout class="QVBoxLayout" name="verticalLayout_4" >
          <item>
-          <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>0</number>
+          <widget class="QGroupBox" name="groupBox_2" >
+           <property name="title" >
+            <string>Default Away Settings</string>
            </property>
-           <property name="spacing" >
-            <number>6</number>
+           <layout class="QVBoxLayout" name="verticalLayout_3" >
+            <item>
+             <layout class="QGridLayout" >
+              <item row="0" column="1" >
+               <widget class="QLineEdit" name="awayNick" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Nick to be used when being away</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" >
+               <widget class="QCheckBox" name="awayReasonEnabled" >
+                <property name="toolTip" >
+                 <string>Default away reason</string>
+                </property>
+                <property name="text" >
+                 <string>Away Reason</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1" >
+               <widget class="QLineEdit" name="awayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Default away reason</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0" >
+               <widget class="QCheckBox" name="awayNickEnabled" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Nick to be used when being away</string>
+                </property>
+                <property name="text" >
+                 <string>Away Nick</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="detachAwayEnabled" >
+           <property name="toolTip" >
+            <string>Set away when all clients have detached from the core</string>
            </property>
-           <item row="0" column="1" >
-            <widget class="QLineEdit" name="awayNick" >
-             <property name="enabled" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0" >
-            <widget class="QCheckBox" name="awayReasonEnabled" >
-             <property name="text" >
-              <string>Away Reason</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1" >
-            <widget class="QLineEdit" name="awayReason" >
-             <property name="enabled" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0" >
-            <widget class="QCheckBox" name="returnMessageEnabled" >
-             <property name="text" >
-              <string>Return Message</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1" >
-            <widget class="QLineEdit" name="returnMessage" >
-             <property name="enabled" >
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0" >
-            <widget class="QCheckBox" name="awayNickEnabled" >
-             <property name="text" >
-              <string>Away Nick</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+           <property name="title" >
+            <string>Away On Detach</string>
+           </property>
+           <property name="checkable" >
+            <bool>true</bool>
+           </property>
+           <property name="checked" >
+            <bool>false</bool>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout" >
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout" >
+              <item>
+               <widget class="QCheckBox" name="detachAwayReasonEnabled" >
+                <property name="toolTip" >
+                 <string>Override default away reason for auto-away on detach</string>
+                </property>
+                <property name="text" >
+                 <string>Away Reason</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="detachAwayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Override default away reason for auto-away on detach</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
          </item>
          <item>
           <widget class="QGroupBox" name="autoAwayEnabled" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="toolTip" >
+            <string>Not implemented yet</string>
+           </property>
            <property name="title" >
-            <string>Auto Away</string>
+            <string>Away On Idle</string>
            </property>
            <property name="checkable" >
             <bool>true</bool>
@@ -384,25 +430,13 @@
            <property name="checked" >
             <bool>false</bool>
            </property>
-           <layout class="QVBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="margin" >
-             <number>8</number>
-            </property>
+           <layout class="QVBoxLayout" name="verticalLayout_2" >
             <item>
              <layout class="QHBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <property name="margin" >
-               <number>0</number>
-              </property>
               <item>
                <widget class="QLabel" name="autoAwayLabel_1" >
                 <property name="text" >
-                 <string>Auto away after</string>
+                 <string>Set away after</string>
                 </property>
                </widget>
               </item>
@@ -412,7 +446,7 @@
               <item>
                <widget class="QLabel" name="autoAwayLabel_2" >
                 <property name="text" >
-                 <string>minutes</string>
+                 <string>minutes of being idle</string>
                 </property>
                </widget>
               </item>
@@ -433,19 +467,6 @@
             </item>
             <item>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <item row="1" column="0" >
-               <widget class="QCheckBox" name="autoReturnMessageEnabled" >
-                <property name="text" >
-                 <string>Return Message</string>
-                </property>
-               </widget>
-              </item>
               <item row="0" column="0" >
                <widget class="QCheckBox" name="autoAwayReasonEnabled" >
                 <property name="text" >
@@ -453,11 +474,12 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="1" >
-               <widget class="QLineEdit" name="autoReturnMessage" />
-              </item>
               <item row="0" column="1" >
-               <widget class="QLineEdit" name="autoAwayReason" />
+               <widget class="QLineEdit" name="autoAwayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+               </widget>
               </item>
              </layout>
             </item>
@@ -484,8 +506,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>463</width>
-          <height>314</height>
+          <width>570</width>
+          <height>355</height>
          </rect>
         </property>
         <attribute name="title" >
@@ -518,12 +540,6 @@
            <layout class="QVBoxLayout" >
             <item>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
               <item row="1" column="0" >
                <widget class="QLabel" name="label_3" >
                 <property name="text" >
@@ -596,23 +612,17 @@
   <tabstop>awayNick</tabstop>
   <tabstop>awayReasonEnabled</tabstop>
   <tabstop>awayReason</tabstop>
-  <tabstop>returnMessageEnabled</tabstop>
-  <tabstop>returnMessage</tabstop>
   <tabstop>awayNickEnabled</tabstop>
   <tabstop>autoAwayEnabled</tabstop>
   <tabstop>autoAwayTime</tabstop>
-  <tabstop>autoReturnMessageEnabled</tabstop>
   <tabstop>autoAwayReasonEnabled</tabstop>
-  <tabstop>autoReturnMessage</tabstop>
   <tabstop>autoAwayReason</tabstop>
   <tabstop>ident</tabstop>
   <tabstop>kickReason</tabstop>
   <tabstop>partReason</tabstop>
   <tabstop>quitReason</tabstop>
  </tabstops>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>awayNickEnabled</sender>
@@ -621,12 +631,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>47</x>
-     <y>85</y>
+     <x>71</x>
+     <y>128</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>185</x>
-     <y>90</y>
+     <x>314</x>
+     <y>129</y>
     </hint>
    </hints>
   </connection>
@@ -637,28 +647,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>57</x>
-     <y>120</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>177</x>
-     <y>123</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>returnMessageEnabled</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>returnMessage</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>85</x>
-     <y>154</y>
+     <x>81</x>
+     <y>156</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>240</x>
-     <y>160</y>
+     <x>306</x>
+     <y>157</y>
     </hint>
    </hints>
   </connection>
@@ -669,28 +663,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>107</x>
-     <y>262</y>
+     <x>126</x>
+     <y>327</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>186</x>
-     <y>264</y>
+     <x>315</x>
+     <y>328</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>autoReturnMessageEnabled</sender>
+   <sender>detachAwayReasonEnabled</sender>
    <signal>toggled(bool)</signal>
-   <receiver>autoReturnMessage</receiver>
+   <receiver>detachAwayReason</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>122</x>
-     <y>292</y>
+     <x>33</x>
+     <y>214</y>
     </hint>
     <hint type="destinationlabel" >
      <x>204</x>
-     <y>299</y>
+     <y>218</y>
     </hint>
    </hints>
   </connection>