Get rid off obsolete icons.qrc references in ui files

diff --git a/src/qtui/settingspages/aliasessettingspage.ui b/src/qtui/settingspages/aliasessettingspage.ui
index 4948c4f..fa254ba 100644 (file)
--- a/src/qtui/settingspages/aliasessettingspage.ui
+++ b/src/qtui/settingspages/aliasessettingspage.ui
@@ -27,7 +27,7 @@
         <string>New</string>
        </property>
        <property name="icon" >
         <string>New</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>
       </widget>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
        </property>
       </widget>


@@ -41,7 +41,7 @@
         <string>Delete</string>
        </property>
        <property name="icon" >
         <string>Delete</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>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
        </property>
       </widget>


@@ -63,8 +63,6 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/settingspages/bufferviewsettingspage.ui b/src/qtui/settingspages/bufferviewsettingspage.ui
index 0131e08..b37e45d 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.ui
+++ b/src/qtui/settingspages/bufferviewsettingspage.ui
@@ -30,7 +30,8 @@
         <string>Re&amp;name...</string>
        </property>
        <property name="icon" >
         <string>Re&amp;name...</string>
        </property>
        <property name="icon" >

-        <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+        <iconset>
+         <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>


@@ -46,7 +47,8 @@
         <string>&amp;Add...</string>
        </property>
        <property name="icon" >
         <string>&amp;Add...</string>
        </property>
        <property name="icon" >

-        <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+        <iconset>
+         <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>

        </property>
        <property name="iconSize" >
         <size>
        </property>
        <property name="iconSize" >
         <size>


@@ -68,7 +70,8 @@
         <string>De&amp;lete</string>
        </property>
        <property name="icon" >
         <string>De&amp;lete</string>
        </property>
        <property name="icon" >

-        <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+        <iconset>
+         <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>

        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>


@@ -187,7 +190,7 @@
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>

-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >

          <size>
           <width>20</width>
           <height>40</height>
          <size>
           <width>20</width>
           <height>40</height>


@@ -221,8 +224,6 @@
    <header>bufferview.h</header>
   </customwidget>
  </customwidgets>
    <header>bufferview.h</header>
   </customwidget>
  </customwidgets>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index 917d42f..ce1eb46 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -36,7 +36,7 @@
           <string>...</string>
          </property>
          <property name="icon" >
           <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" >
            <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" >
           <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" >
            <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" >
           <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" >
            <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" >


@@ -165,7 +165,7 @@
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
                  <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" >
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                 </property>
                 <property name="iconSize" >


@@ -191,7 +191,7 @@
                  <string>Remove</string>
                 </property>
                 <property name="icon" >
                  <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>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                 </property>
                </widget>


@@ -211,7 +211,7 @@
                  <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >
                  <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>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
                 </property>
                </widget>


@@ -246,7 +246,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <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>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                   </property>
                  </widget>


@@ -260,7 +260,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <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>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                   </property>
                  </widget>


@@ -489,7 +489,6 @@
              </layout>
             </item>
            </layout>
              </layout>
             </item>
            </layout>

-           <zorder>detachAwayEnabled</zorder>

           </widget>
          </item>
          <item>
           </widget>
          </item>
          <item>


@@ -626,9 +625,7 @@
   <tabstop>partReason</tabstop>
   <tabstop>quitReason</tabstop>
  </tabstops>
   <tabstop>partReason</tabstop>
   <tabstop>quitReason</tabstop>
  </tabstops>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>awayNickEnabled</sender>
  <connections>
   <connection>
    <sender>awayNickEnabled</sender>

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 120f3f1..4c1563e 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -37,7 +37,7 @@
         <string>Re&amp;name...</string>
        </property>
        <property name="icon" >
         <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>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
        </property>
       </widget>


@@ -54,7 +54,7 @@
         <string>&amp;Add...</string>
        </property>
        <property name="icon" >
         <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" >
          <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
        </property>
        <property name="iconSize" >


@@ -77,7 +77,7 @@
         <string>De&amp;lete</string>
        </property>
        <property name="icon" >
         <string>De&amp;lete</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>
          <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
        </property>
       </widget>


@@ -160,20 +160,12 @@
          <string/>
         </property>
         <property name="currentIndex" >
          <string/>
         </property>
         <property name="currentIndex" >

-         <number>0</number>
+         <number>2</number>

         </property>
         <widget class="QWidget" name="serversTab" >
          <property name="enabled" >
           <bool>true</bool>
          </property>
         </property>
         <widget class="QWidget" name="serversTab" >
          <property name="enabled" >
           <bool>true</bool>
          </property>

-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>

          <attribute name="title" >
           <string>Servers</string>
          </attribute>
          <attribute name="title" >
           <string>Servers</string>
          </attribute>


@@ -225,7 +217,7 @@
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
                  <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>
                </widget>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                 </property>
                </widget>


@@ -242,7 +234,7 @@
                  <string>De&amp;lete</string>
                 </property>
                 <property name="icon" >
                  <string>De&amp;lete</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>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                 </property>
                </widget>


@@ -271,7 +263,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <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>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                   </property>
                  </widget>


@@ -285,7 +277,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <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>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                   </property>
                  </widget>


@@ -335,14 +327,6 @@
          </layout>
         </widget>
         <widget class="QWidget" name="performTab" >
          </layout>
         </widget>
         <widget class="QWidget" name="performTab" >

-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>

          <attribute name="title" >
           <string>Perform</string>
          </attribute>
          <attribute name="title" >
           <string>Perform</string>
          </attribute>


@@ -429,14 +413,6 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
          </layout>
         </widget>
         <widget class="QWidget" name="advancedTab" >
          </layout>
         </widget>
         <widget class="QWidget" name="advancedTab" >

-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>

          <attribute name="title" >
           <string>Advanced</string>
          </attribute>
          <attribute name="title" >
           <string>Advanced</string>
          </attribute>


@@ -657,9 +633,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>unlimitedRetries</sender>
  <connections>
   <connection>
    <sender>unlimitedRetries</sender>

diff --git a/src/qtui/settingspages/saveidentitiesdlg.ui b/src/qtui/settingspages/saveidentitiesdlg.ui
index 0ddb058..4d364c3 100644 (file)
--- a/src/qtui/settingspages/saveidentitiesdlg.ui
+++ b/src/qtui/settingspages/saveidentitiesdlg.ui
@@ -33,7 +33,7 @@
        <property name="orientation" >
         <enum>Qt::Vertical</enum>
        </property>
        <property name="orientation" >
         <enum>Qt::Vertical</enum>
        </property>

-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >

         <size>
          <width>20</width>
          <height>40</height>
         <size>
          <width>20</width>
          <height>40</height>


@@ -47,7 +47,7 @@
         <number>0</number>
        </property>
        <property name="value" >
         <number>0</number>
        </property>
        <property name="value" >

-        <number>0</number>
+        <number>32</number>

        </property>
        <property name="invertedAppearance" >
         <bool>false</bool>
        </property>
        <property name="invertedAppearance" >
         <bool>false</bool>


@@ -61,7 +61,7 @@
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>

-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >

           <size>
            <width>40</width>
            <height>20</height>
           <size>
            <width>40</width>
            <height>20</height>


@@ -81,7 +81,8 @@
           <string>Abort</string>
          </property>
          <property name="icon" >
           <string>Abort</string>
          </property>
          <property name="icon" >

-          <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/dialog-cancel.png</iconset>
+          <iconset>
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/dialog-cancel.png</normaloff>:/22x22/actions/oxygen/22x22/actions/dialog-cancel.png</iconset>

          </property>
         </widget>
        </item>
          </property>
         </widget>
        </item>


@@ -90,7 +91,7 @@
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>

-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >

           <size>
            <width>40</width>
            <height>20</height>
           <size>
            <width>40</width>
            <height>20</height>


@@ -104,9 +105,7 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>abort</sender>
  <connections>
   <connection>
    <sender>abort</sender>

diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index 1a48d59..d538539 100644 (file)
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -107,9 +107,7 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>buttonBox</sender>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
index 4fd9578..3f32fb7 100644 (file)
--- a/src/qtui/ui/aboutdlg.ui
+++ b/src/qtui/ui/aboutdlg.ui
@@ -203,10 +203,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
-  <include location="../../icons/quassel-icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>buttonBox</sender>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/qtui/ui/channellistdlg.ui b/src/qtui/ui/channellistdlg.ui
index 5993d40..941a578 100644 (file)
--- a/src/qtui/ui/channellistdlg.ui
+++ b/src/qtui/ui/channellistdlg.ui
@@ -131,7 +131,7 @@ Advanced mode allows to pass search strings to the IRC Server.</string>
       <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 &lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
       <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 &lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }

-&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">

 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p>
 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">&lt;/p>&lt;/body>&lt;/html></string>
      </property>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">SUPER EVIL CATASTROPHIC ERROR!!11&lt;/p>
 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;">&lt;/p>&lt;/body>&lt;/html></string>
      </property>


@@ -156,8 +156,6 @@ p, li { white-space: pre-wrap; }
    <header location="global" >clickablelabel.h</header>
   </customwidget>
  </customwidgets>
    <header location="global" >clickablelabel.h</header>
   </customwidget>
  </customwidgets>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/chatviewsearchbar.ui b/src/qtui/ui/chatviewsearchbar.ui
index d24b470..672230c 100644 (file)
--- a/src/qtui/ui/chatviewsearchbar.ui
+++ b/src/qtui/ui/chatviewsearchbar.ui
@@ -19,7 +19,7 @@
       <string>...</string>
      </property>
      <property name="icon" >
       <string>...</string>
      </property>
      <property name="icon" >

-      <iconset resource="../../icons/icons.qrc" >
+      <iconset>

        <normaloff>:/16x16/actions/oxygen/16x16/actions/application-exit.png</normaloff>:/16x16/actions/oxygen/16x16/actions/application-exit.png</iconset>
      </property>
     </widget>
        <normaloff>:/16x16/actions/oxygen/16x16/actions/application-exit.png</normaloff>:/16x16/actions/oxygen/16x16/actions/application-exit.png</iconset>
      </property>
     </widget>


@@ -33,7 +33,7 @@
       <string>...</string>
      </property>
      <property name="icon" >
       <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>
        <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
      </property>
     </widget>


@@ -44,7 +44,7 @@
       <string>...</string>
      </property>
      <property name="icon" >
       <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>
        <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
      </property>
     </widget>


@@ -108,8 +108,6 @@
    <header location="global" >clearablelineedit.h</header>
   </customwidget>
  </customwidgets>
    <header location="global" >clearablelineedit.h</header>
   </customwidget>
  </customwidgets>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/coreaccounteditdlg.ui b/src/qtui/ui/coreaccounteditdlg.ui
index be88b7a..587bba8 100644 (file)
--- a/src/qtui/ui/coreaccounteditdlg.ui
+++ b/src/qtui/ui/coreaccounteditdlg.ui
@@ -208,9 +208,7 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>buttonBox</sender>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 574609e..915f2f7 100644 (file)
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -35,14 +35,6 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="accountPage" >
       <number>0</number>
      </property>
      <widget class="QWidget" name="accountPage" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>539</width>
-        <height>332</height>
-       </rect>
-      </property>

       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox" >
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox" >


@@ -141,14 +133,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="loginPage" >
       </layout>
      </widget>
      <widget class="QWidget" name="loginPage" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>539</width>
-        <height>332</height>
-       </rect>
-      </property>

       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >


@@ -252,14 +236,6 @@ space</string>
              <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >

-             <property name="geometry" >
-              <rect>
-               <x>0</x>
-               <y>0</y>
-               <width>501</width>
-               <height>146</height>
-              </rect>
-             </property>

              <layout class="QVBoxLayout" >
               <item>
                <spacer>
              <layout class="QVBoxLayout" >
               <item>
                <spacer>


@@ -347,14 +323,6 @@ space</string>
              </layout>
             </widget>
             <widget class="QWidget" name="coreConfigPage" >
              </layout>
             </widget>
             <widget class="QWidget" name="coreConfigPage" >

-             <property name="geometry" >
-              <rect>
-               <x>0</x>
-               <y>0</y>
-               <width>100</width>
-               <height>30</height>
-              </rect>
-             </property>

              <layout class="QVBoxLayout" >
               <item>
                <widget class="QGroupBox" name="groupBox_4" >
              <layout class="QVBoxLayout" >
               <item>
                <widget class="QGroupBox" name="groupBox_4" >


@@ -436,16 +404,7 @@ space</string>
               </item>
              </layout>
             </widget>
               </item>
              </layout>
             </widget>

-            <widget class="QWidget" name="loginEmptyPage" >
-             <property name="geometry" >
-              <rect>
-               <x>0</x>
-               <y>0</y>
-               <width>100</width>
-               <height>30</height>
-              </rect>
-             </property>
-            </widget>
+            <widget class="QWidget" name="loginEmptyPage" />

            </widget>
           </item>
          </layout>
            </widget>
           </item>
          </layout>


@@ -461,14 +420,6 @@ space</string>
       </layout>
      </widget>
      <widget class="QWidget" name="syncPage" >
       </layout>
      </widget>
      <widget class="QWidget" name="syncPage" >

-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>539</width>
-        <height>332</height>
-       </rect>
-      </property>

       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_3" >


@@ -580,9 +531,7 @@ space</string>
   <tabstop>launchCoreConfigWizard</tabstop>
   <tabstop>syncButtonBox</tabstop>
  </tabstops>
   <tabstop>launchCoreConfigWizard</tabstop>
   <tabstop>syncButtonBox</tabstop>
  </tabstops>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections>
   <connection>
    <sender>accountButtonBox</sender>
  <connections>
   <connection>
    <sender>accountButtonBox</sender>

diff --git a/src/qtui/ui/settingsdlg.ui b/src/qtui/ui/settingsdlg.ui
index 1a70467..ec69891 100644 (file)
--- a/src/qtui/ui/settingsdlg.ui
+++ b/src/qtui/ui/settingsdlg.ui
@@ -13,7 +13,7 @@
    <string>Configure Quassel</string>
   </property>
   <property name="windowIcon" >
    <string>Configure Quassel</string>
   </property>
   <property name="windowIcon" >

-   <iconset resource="../../icons/icons.qrc" >
+   <iconset>

     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" >
     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" >


@@ -59,16 +59,7 @@
        </item>
        <item>
         <widget class="QStackedWidget" name="settingsStack" >
        </item>
        <item>
         <widget class="QStackedWidget" name="settingsStack" >

-         <widget class="QWidget" name="page" >
-          <property name="geometry" >
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>509</width>
-            <height>507</height>
-           </rect>
-          </property>
-         </widget>
+         <widget class="QWidget" name="page" />

         </widget>
        </item>
       </layout>
         </widget>
        </item>
       </layout>


@@ -87,8 +78,6 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/settingspagedlg.ui b/src/qtui/ui/settingspagedlg.ui
index 2069f6a..9ceed3f 100644 (file)
--- a/src/qtui/ui/settingspagedlg.ui
+++ b/src/qtui/ui/settingspagedlg.ui
@@ -13,7 +13,7 @@
    <string>Configure Quassel</string>
   </property>
   <property name="windowIcon" >
    <string>Configure Quassel</string>
   </property>
   <property name="windowIcon" >

-   <iconset resource="../../icons/icons.qrc" >
+   <iconset>

     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
   </property>
   <layout class="QVBoxLayout" >
     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
   </property>
   <layout class="QVBoxLayout" >


@@ -65,8 +65,6 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>

diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index b1c047a..4610b01 100644 (file)
--- a/src/qtui/ui/topicwidget.ui
+++ b/src/qtui/ui/topicwidget.ui
@@ -90,7 +90,7 @@
       <string/>
      </property>
      <property name="pixmap" >
       <string/>
      </property>
      <property name="pixmap" >

-      <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-clear.png</pixmap>
+      <pixmap>:/22x22/actions/oxygen/22x22/actions/edit-clear.png</pixmap>

      </property>
     </widget>
    </item>
      </property>
     </widget>
    </item>


@@ -114,8 +114,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
    <container>1</container>
   </customwidget>
  </customwidgets>

- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>