Cleaned up the gui/ directory by moving all *.ui files in a subdirectory.

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 997c656..4d6297e 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -5,7 +5,12 @@ SET(gui_MOCS channelwidget.h channelwidgetinput.h mainwin.h serverlist.h identit
 SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
              nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui)
 
-QT4_WRAP_UI(_UIC ${gui_UICS})
+# This prepends ui/ to the UIC names, so we don't have to do this ourselves.
+FOREACH(ui ${gui_UICS})
+  SET(gui_UICS_UI ${gui_UICS_UI} "ui/${ui}")
+ENDFOREACH(ui)
+
+QT4_WRAP_UI(_UIC ${gui_UICS_UI})
 QT4_WRAP_CPP(_MOC ${gui_MOCS})
 
 # We need to work around a dependency bug with out-of-source builds...

diff --git a/gui/channelwidget-old.ui b/gui/channelwidget-old.ui
deleted file mode 100644 (file)
index 3905977..0000000
--- a/gui/channelwidget-old.ui
+++ /dev/null
@@ -1,112 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>ChannelWidget</class>
- <widget class="QWidget" name="ChannelWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>243</height>
-   </rect>
-  </property>
-  <property name="minimumSize" >
-   <size>
-    <width>16</width>
-    <height>16</height>
-   </size>
-  </property>
-  <property name="windowTitle" >
-   <string>#quassel</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>8</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <widget class="QSplitter" name="" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>8</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-     </layout>
-     <widget class="QTextBrowser" name="textBrowser" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>7</hsizetype>
-        <vsizetype>7</vsizetype>
-        <horstretch>4</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-     <widget class="QListWidget" name="listWidget" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>7</hsizetype>
-        <vsizetype>7</vsizetype>
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize" >
-       <size>
-        <width>75</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="maximumSize" >
-       <size>
-        <width>4000</width>
-        <height>4000</height>
-       </size>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="lineEdit" />
-   </item>
-  </layout>
-  <widget class="QSplitter" name="" >
-   <property name="geometry" >
-    <rect>
-     <x>-10</x>
-     <y>20</y>
-     <width>530</width>
-     <height>192</height>
-    </rect>
-   </property>
-   <property name="orientation" >
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="QSplitter" name="splitter" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>518</width>
-     <height>52</height>
-    </rect>
-   </property>
-   <property name="orientation" >
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
- </widget>
- <pixmapfunction></pixmapfunction>
- <resources/>
- <connections/>
-</ui>

diff --git a/gui/channelwidget.ui b/gui/ui/channelwidget.ui
similarity index 100%
rename from gui/channelwidget.ui
rename to gui/ui/channelwidget.ui

diff --git a/gui/coreconnectdlg.ui b/gui/ui/coreconnectdlg.ui
similarity index 100%
rename from gui/coreconnectdlg.ui
rename to gui/ui/coreconnectdlg.ui

diff --git a/gui/identitiesdlg.ui b/gui/ui/identitiesdlg.ui
similarity index 100%
rename from gui/identitiesdlg.ui
rename to gui/ui/identitiesdlg.ui

diff --git a/gui/identitieseditdlg.ui b/gui/ui/identitieseditdlg.ui
similarity index 100%
rename from gui/identitieseditdlg.ui
rename to gui/ui/identitieseditdlg.ui

diff --git a/gui/ircwidget.ui b/gui/ui/ircwidget.ui
similarity index 100%
rename from gui/ircwidget.ui
rename to gui/ui/ircwidget.ui

diff --git a/gui/mainwin.ui b/gui/ui/mainwin.ui
similarity index 100%
rename from gui/mainwin.ui
rename to gui/ui/mainwin.ui

diff --git a/gui/networkeditdlg.ui b/gui/ui/networkeditdlg.ui
similarity index 100%
rename from gui/networkeditdlg.ui
rename to gui/ui/networkeditdlg.ui

diff --git a/gui/networkwidget.ui b/gui/ui/networkwidget.ui
similarity index 100%
rename from gui/networkwidget.ui
rename to gui/ui/networkwidget.ui

diff --git a/gui/nickeditdlg.ui b/gui/ui/nickeditdlg.ui
similarity index 100%
rename from gui/nickeditdlg.ui
rename to gui/ui/nickeditdlg.ui

diff --git a/gui/servereditdlg.ui b/gui/ui/servereditdlg.ui
similarity index 100%
rename from gui/servereditdlg.ui
rename to gui/ui/servereditdlg.ui

diff --git a/gui/serverlistdlg.ui b/gui/ui/serverlistdlg.ui
similarity index 100%
rename from gui/serverlistdlg.ui
rename to gui/ui/serverlistdlg.ui

diff --git a/gui/settingsdlg.ui b/gui/ui/settingsdlg.ui
similarity index 100%
rename from gui/settingsdlg.ui
rename to gui/ui/settingsdlg.ui