Browse Source

Switch from image collection to the new Qt 4 resource system.

git-svn-id: file:///var/svn/tigccpp/trunk@1004 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 years ago
parent
commit
63ce131eb3

+ 0 - 1
ktigcc/customstyle.ui

@@ -181,7 +181,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <includes>
     <include location="local" >klineedit.h</include>
     <include location="local" >klineedit.h</include>

+ 0 - 1
ktigcc/errorlist.ui

@@ -170,7 +170,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>K3ListView</class>

+ 0 - 1
ktigcc/functions.ui

@@ -87,7 +87,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <includes>
     <include location="local" >kpushbutton.h</include>
     <include location="local" >kpushbutton.h</include>

+ 47 - 0
ktigcc/icons.qrc

@@ -0,0 +1,47 @@
+<RCC version="1.0">
+  <qresource prefix="">
+    <file>images/00</file>
+    <file>images/01</file>
+    <file>images/02</file>
+    <file>images/03</file>
+    <file>images/04</file>
+    <file>images/05</file>
+    <file>images/06</file>
+    <file>images/07</file>
+    <file>images/08</file>
+    <file>images/09</file>
+    <file>images/10</file>
+    <file>images/11</file>
+    <file>images/12</file>
+    <file>images/13</file>
+    <file>images/14</file>
+    <file>images/15</file>
+    <file>images/16</file>
+    <file>images/17</file>
+    <file>images/18</file>
+    <file>images/19</file>
+    <file>images/20</file>
+    <file>images/21</file>
+    <file>images/22</file>
+    <file>images/23</file>
+    <file>images/24</file>
+    <file>images/25</file>
+    <file>images/26</file>
+    <file>images/27</file>
+    <file>images/tpr.png</file>
+    <file>images/folder1.png</file>
+    <file>images/folder2.png</file>
+    <file>images/filec.png</file>
+    <file>images/fileh.png</file>
+    <file>images/fileo.png</file>
+    <file>images/files.png</file>
+    <file>images/filet.png</file>
+    <file>images/filex.png</file>
+    <file>images/icon.png</file>
+    <file>images/filereplace.png</file>
+    <file>images/error.png</file>
+    <file>images/warning.png</file>
+    <file>images/info.png</file>
+    <file>images/ktigcc.png</file>
+  </qresource>
+</RCC>

+ 2 - 6
ktigcc/ktigcc.cpp

@@ -32,6 +32,7 @@
 #include <qtextcodec.h>
 #include <qicon.h>
 #include <qsize.h> 
+#include <QPixmap>
 #include <kglobal.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -39,8 +40,6 @@
 #include <glib.h>
 #include "mainform.h"
 using namespace std;
-void qCleanupImages_ktigcc();
-void qInitImages_ktigcc();
 
 static KCmdLineOptions options[] =
 {
@@ -91,10 +90,7 @@ int main(int argc, char *argv[])
   KCmdLineArgs::addCmdLineOptions(options);
   KCmdLineArgs::addStdCmdLineOptions();
   KApplication app;
-  // Readd the images KDE kindly removes...
-  qCleanupImages_ktigcc();
-  qInitImages_ktigcc();
-  about.setProgramLogo(qPixmapFromMimeSource("icon.png"));
+  about.setProgramLogo(QPixmap(":/images/icon.png"));
   pconfig=KGlobal::config();
   
   if ((tigcc_base = getenv("TIGCC")) == NULL) {

+ 1 - 43
ktigcc/ktigcc.pro

@@ -72,49 +72,7 @@ FORMS	= srcfilewin.ui \
 	customstyle.ui \
 	wordlist.ui
 
-IMAGES	= images/00 \
-	images/01 \
-	images/02 \
-	images/03 \
-	images/04 \
-	images/05 \
-	images/06 \
-	images/07 \
-	images/08 \
-	images/09 \
-	images/10 \
-	images/11 \
-	images/12 \
-	images/13 \
-	images/14 \
-	images/15 \
-	images/16 \
-	images/17 \
-	images/18 \
-	images/19 \
-	images/20 \
-	images/21 \
-	images/22 \
-	images/23 \
-	images/24 \
-	images/25 \
-	images/26 \
-	images/27 \
-	images/tpr.png \
-	images/folder1.png \
-	images/folder2.png \
-	images/filec.png \
-	images/fileh.png \
-	images/fileo.png \
-	images/files.png \
-	images/filet.png \
-	images/filex.png \
-	images/icon.png \
-	images/filereplace.png \
-	images/error.png \
-	images/warning.png \
-	images/info.png \
-	images/ktigcc.png
+RESOURCES += icons.qrc
 
 # If this is not used, a build from /usr/.... will generate
 # Makefiles with relative paths for install.  This totally

+ 38 - 38
ktigcc/mainform.cpp

@@ -215,7 +215,7 @@ enum {TIGCCOpenProjectFileFilter,TIGCCAddFilesFilter};
                                         othFileCount)
 #define CURRENT_VIEW (static_cast<KTextEditor::View *>(widgetStack->visibleWidget()))
 
-#define SYSICON(sysname,name) (preferences.useSystemIcons?KIconLoader::global()->loadIcon((sysname),K3Icon::Small,K3Icon::SizeSmall):qPixmapFromMimeSource((name)))
+#define SYSICON(sysname,name) (preferences.useSystemIcons?KIconLoader::global()->loadIcon((sysname),K3Icon::Small,K3Icon::SizeSmall):QPixmap(":/images/" name))
 
 #define SET_TEXT_SAFE(doc,text) do { \
     disableViewEvents=TRUE; \
@@ -987,8 +987,8 @@ bool MainForm::findSourceFile(bool &inProject, void *&srcFile, const QString &fi
 
 void MainForm::init()
 {
-  setIcon(qPixmapFromMimeSource("icon.png"));
-  KWin::setIcons(winId(),*(icon()),qPixmapFromMimeSource("ktigcc.png"));
+  setIcon(QPixmap(":/images/icon.png"));
+  KWin::setIcons(winId(),*(icon()),QPixmap(":/images/ktigcc.png"));
   ticables_library_init();
   tifiles_library_init();
   ticalcs_library_init();
@@ -1167,7 +1167,7 @@ void MainForm::init()
     helpSearchAction->setIcon(KIcon("filefind"));
     findFindAction->setIcon(KIcon("filefind"));
     if (KIconLoader::global()->iconPath("stock-find-and-replace",K3Icon::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("filereplace.png")));
+      findReplaceAction->setIcon(QIcon(QPixmap(":/images/filereplace.png")));
     else
       findReplaceAction->setIcon(KIcon("stock-find-and-replace"));
     helpIndexAction->setIcon(KIcon("contents"));
@@ -2627,7 +2627,7 @@ void MainForm::filePreferences()
       helpSearchAction->setIcon(KIcon("filefind"));
       findFindAction->setIcon(KIcon("filefind"));
       if (KIconLoader::global()->iconPath("stock-find-and-replace",K3Icon::Small,TRUE).isEmpty())
-        findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("filereplace.png")));
+        findReplaceAction->setIcon(QIcon(QPixmap(":/images/filereplace.png")));
       else
         findReplaceAction->setIcon(KIcon("stock-find-and-replace"));
       helpIndexAction->setIcon(KIcon("contents"));
@@ -2645,39 +2645,39 @@ void MainForm::filePreferences()
       debugResetAction->setIcon(KIcon("player_stop"));
     } else {
 // FIXME: action group icon
-//      fileNewActionGroup->setIcon(QIcon(qPixmapFromMimeSource("00")));
-      fileMenu->changeItem(fileMenu->idAt(0),QIcon(qPixmapFromMimeSource("00")),"&New");
-      fileOpenAction->setIcon(QIcon(qPixmapFromMimeSource("01")));
-//      fileOpenActionGroup->setIcon(QIcon(qPixmapFromMimeSource("01")));
-      fileSaveAllAction->setIcon(QIcon(qPixmapFromMimeSource("02")));
-      filePrintAction->setIcon(QIcon(qPixmapFromMimeSource("03")));
-      filePrintQuicklyAction->setIcon(QIcon(qPixmapFromMimeSource("03")));
-      editClearAction->setIcon(QIcon(qPixmapFromMimeSource("04")));
-      editCutAction->setIcon(QIcon(qPixmapFromMimeSource("05")));
-      editCopyAction->setIcon(QIcon(qPixmapFromMimeSource("06")));
-      editPasteAction->setIcon(QIcon(qPixmapFromMimeSource("07")));
-      projectAddFilesAction->setIcon(QIcon(qPixmapFromMimeSource("08")));
-      projectCompileAction->setIcon(QIcon(qPixmapFromMimeSource("09")));
-      projectMakeAction->setIcon(QIcon(qPixmapFromMimeSource("10")));
-      projectBuildAction->setIcon(QIcon(qPixmapFromMimeSource("11")));
-      helpContentsAction->setIcon(QIcon(qPixmapFromMimeSource("12")));
-      helpDocumentationAction->setIcon(QIcon(qPixmapFromMimeSource("12")));
-      helpSearchAction->setIcon(QIcon(qPixmapFromMimeSource("13")));
-      findFindAction->setIcon(QIcon(qPixmapFromMimeSource("13")));
-      findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("14")));
-      helpIndexAction->setIcon(QIcon(qPixmapFromMimeSource("15")));
-      editUndoAction->setIcon(QIcon(qPixmapFromMimeSource("16")));
-      editRedoAction->setIcon(QIcon(qPixmapFromMimeSource("17")));
-      findFunctionsAction->setIcon(QIcon(qPixmapFromMimeSource("18")));
-      editIncreaseIndentAction->setIcon(QIcon(qPixmapFromMimeSource("19")));
-      editDecreaseIndentAction->setIcon(QIcon(qPixmapFromMimeSource("20")));
-      projectStopCompilationAction->setIcon(QIcon(qPixmapFromMimeSource("21")));
-      projectForceQuitAction->setIcon(QIcon(qPixmapFromMimeSource("22")));
-      helpNewsAction->setIcon(QIcon(qPixmapFromMimeSource("23")));
-      debugRunAction->setIcon(QIcon(qPixmapFromMimeSource("24")));
-      debugPauseAction->setIcon(QIcon(qPixmapFromMimeSource("25")));
-      toolsConfigureAction->setIcon(QIcon(qPixmapFromMimeSource("26")));
-      debugResetAction->setIcon(QIcon(qPixmapFromMimeSource("27")));
+//      fileNewActionGroup->setIcon(QIcon(QPixmap(":/images/00")));
+      fileMenu->changeItem(fileMenu->idAt(0),QIcon(QPixmap(":/images/00")),"&New");
+      fileOpenAction->setIcon(QIcon(QPixmap(":/images/01")));
+//      fileOpenActionGroup->setIcon(QIcon(QPixmap(":/images/01")));
+      fileSaveAllAction->setIcon(QIcon(QPixmap(":/images/02")));
+      filePrintAction->setIcon(QIcon(QPixmap(":/images/03")));
+      filePrintQuicklyAction->setIcon(QIcon(QPixmap(":/images/03")));
+      editClearAction->setIcon(QIcon(QPixmap(":/images/04")));
+      editCutAction->setIcon(QIcon(QPixmap(":/images/05")));
+      editCopyAction->setIcon(QIcon(QPixmap(":/images/06")));
+      editPasteAction->setIcon(QIcon(QPixmap(":/images/07")));
+      projectAddFilesAction->setIcon(QIcon(QPixmap(":/images/08")));
+      projectCompileAction->setIcon(QIcon(QPixmap(":/images/09")));
+      projectMakeAction->setIcon(QIcon(QPixmap(":/images/10")));
+      projectBuildAction->setIcon(QIcon(QPixmap(":/images/11")));
+      helpContentsAction->setIcon(QIcon(QPixmap(":/images/12")));
+      helpDocumentationAction->setIcon(QIcon(QPixmap(":/images/12")));
+      helpSearchAction->setIcon(QIcon(QPixmap(":/images/13")));
+      findFindAction->setIcon(QIcon(QPixmap(":/images/13")));
+      findReplaceAction->setIcon(QIcon(QPixmap(":/images/14")));
+      helpIndexAction->setIcon(QIcon(QPixmap(":/images/15")));
+      editUndoAction->setIcon(QIcon(QPixmap(":/images/16")));
+      editRedoAction->setIcon(QIcon(QPixmap(":/images/17")));
+      findFunctionsAction->setIcon(QIcon(QPixmap(":/images/18")));
+      editIncreaseIndentAction->setIcon(QIcon(QPixmap(":/images/19")));
+      editDecreaseIndentAction->setIcon(QIcon(QPixmap(":/images/20")));
+      projectStopCompilationAction->setIcon(QIcon(QPixmap(":/images/21")));
+      projectForceQuitAction->setIcon(QIcon(QPixmap(":/images/22")));
+      helpNewsAction->setIcon(QIcon(QPixmap(":/images/23")));
+      debugRunAction->setIcon(QIcon(QPixmap(":/images/24")));
+      debugPauseAction->setIcon(QIcon(QPixmap(":/images/25")));
+      toolsConfigureAction->setIcon(QIcon(QPixmap(":/images/26")));
+      debugResetAction->setIcon(QIcon(QPixmap(":/images/27")));
     }
     it=Q3ListViewItemIterator(errorList->errorListView);
     for (item=it.current();item;item=(++it).current()) {

+ 33 - 31
ktigcc/mainform.ui

@@ -220,7 +220,7 @@
         <cstring>fileOpenAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>01</iconset>
+        <iconset resource="icons.qrc" >:/images/01</iconset>
       </property>
       <property name="iconText" >
         <string>Open File</string>
@@ -240,7 +240,7 @@
         <cstring>fileSaveAllAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>02</iconset>
+        <iconset resource="icons.qrc" >:/images/02</iconset>
       </property>
       <property name="iconText" >
         <string>Save All</string>
@@ -280,7 +280,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>03</iconset>
+        <iconset resource="icons.qrc" >:/images/03</iconset>
       </property>
       <property name="iconText" >
         <string>Print File</string>
@@ -320,7 +320,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>16</iconset>
+        <iconset resource="icons.qrc" >:/images/16</iconset>
       </property>
       <property name="iconText" >
         <string>Undo</string>
@@ -343,7 +343,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>17</iconset>
+        <iconset resource="icons.qrc" >:/images/17</iconset>
       </property>
       <property name="iconText" >
         <string>Redo</string>
@@ -366,7 +366,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>05</iconset>
+        <iconset resource="icons.qrc" >:/images/05</iconset>
       </property>
       <property name="iconText" >
         <string>Cut</string>
@@ -389,7 +389,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>06</iconset>
+        <iconset resource="icons.qrc" >:/images/06</iconset>
       </property>
       <property name="iconText" >
         <string>Copy</string>
@@ -412,7 +412,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>07</iconset>
+        <iconset resource="icons.qrc" >:/images/07</iconset>
       </property>
       <property name="iconText" >
         <string>Paste</string>
@@ -432,7 +432,7 @@
         <cstring>findFindAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>13</iconset>
+        <iconset resource="icons.qrc" >:/images/13</iconset>
       </property>
       <property name="iconText" >
         <string>Find</string>
@@ -455,7 +455,7 @@
         <cstring>helpContentsAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>12</iconset>
+        <iconset resource="icons.qrc" >:/images/12</iconset>
       </property>
       <property name="iconText" >
         <string>Contents</string>
@@ -475,7 +475,7 @@
         <cstring>helpIndexAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>15</iconset>
+        <iconset resource="icons.qrc" >:/images/15</iconset>
       </property>
       <property name="iconText" >
         <string>Index</string>
@@ -529,7 +529,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>04</iconset>
+        <iconset resource="icons.qrc" >:/images/04</iconset>
       </property>
       <property name="iconText" >
         <string>Clear</string>
@@ -569,7 +569,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>19</iconset>
+        <iconset resource="icons.qrc" >:/images/19</iconset>
       </property>
       <property name="iconText" >
         <string>Increase Indent</string>
@@ -592,7 +592,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>20</iconset>
+        <iconset resource="icons.qrc" >:/images/20</iconset>
       </property>
       <property name="iconText" >
         <string>Decrease Indent</string>
@@ -612,7 +612,7 @@
         <cstring>findReplaceAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>14</iconset>
+        <iconset resource="icons.qrc" >:/images/14</iconset>
       </property>
       <property name="iconText" >
         <string>Replace</string>
@@ -638,7 +638,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>18</iconset>
+        <iconset resource="icons.qrc" >:/images/18</iconset>
       </property>
       <property name="iconText" >
         <string>Functions...</string>
@@ -675,7 +675,7 @@
         <cstring>projectAddFilesAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>08</iconset>
+        <iconset resource="icons.qrc" >:/images/08</iconset>
       </property>
       <property name="iconText" >
         <string>Add Files</string>
@@ -692,7 +692,7 @@
         <cstring>projectCompileAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>09</iconset>
+        <iconset resource="icons.qrc" >:/images/09</iconset>
       </property>
       <property name="iconText" >
         <string>Compile</string>
@@ -712,7 +712,7 @@
         <cstring>projectMakeAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>10</iconset>
+        <iconset resource="icons.qrc" >:/images/10</iconset>
       </property>
       <property name="iconText" >
         <string>Make</string>
@@ -732,7 +732,7 @@
         <cstring>projectBuildAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>11</iconset>
+        <iconset resource="icons.qrc" >:/images/11</iconset>
       </property>
       <property name="iconText" >
         <string>Build</string>
@@ -806,7 +806,7 @@
         <cstring>debugRunAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>24</iconset>
+        <iconset resource="icons.qrc" >:/images/24</iconset>
       </property>
       <property name="iconText" >
         <string>Run</string>
@@ -826,7 +826,7 @@
         <cstring>debugPauseAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>25</iconset>
+        <iconset resource="icons.qrc" >:/images/25</iconset>
       </property>
       <property name="iconText" >
         <string>Pause</string>
@@ -846,7 +846,7 @@
         <cstring>debugResetAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>27</iconset>
+        <iconset resource="icons.qrc" >:/images/27</iconset>
       </property>
       <property name="iconText" >
         <string>Reset</string>
@@ -863,7 +863,7 @@
         <cstring>toolsConfigureAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>26</iconset>
+        <iconset resource="icons.qrc" >:/images/26</iconset>
       </property>
       <property name="iconText" >
         <string>Configure</string>
@@ -880,7 +880,7 @@
         <cstring>helpSearchAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>13</iconset>
+        <iconset resource="icons.qrc" >:/images/13</iconset>
       </property>
       <property name="iconText" >
         <string>&amp;Search</string>
@@ -897,7 +897,7 @@
         <cstring>helpNewsAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>23</iconset>
+        <iconset resource="icons.qrc" >:/images/23</iconset>
       </property>
       <property name="iconText" >
         <string>News</string>
@@ -914,7 +914,7 @@
         <cstring>helpDocumentationAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>12</iconset>
+        <iconset resource="icons.qrc" >:/images/12</iconset>
       </property>
       <property name="iconText" >
         <string>Documentation</string>
@@ -951,7 +951,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>03</iconset>
+        <iconset resource="icons.qrc" >:/images/03</iconset>
       </property>
       <property name="iconText" >
         <string>Print File</string>
@@ -968,7 +968,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>21</iconset>
+        <iconset resource="icons.qrc" >:/images/21</iconset>
       </property>
       <property name="iconText" >
         <string>Stop Compilation</string>
@@ -991,7 +991,7 @@
         <bool>false</bool>
       </property>
       <property name="icon" >
-        <iconset>22</iconset>
+        <iconset resource="icons.qrc" >:/images/22</iconset>
       </property>
       <property name="iconText" >
         <string>Force-Quit Compiler</string>
@@ -1213,7 +1213,9 @@
     </actiongroup>
   </widget>
   <layoutdefault spacing="0" margin="0" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <resources>
+    <include location="icons.qrc" />
+  </resources>
   <customwidgets>
     <customwidget>
       <class>K3ListView</class>

+ 0 - 1
ktigcc/newsdlg.ui

@@ -92,7 +92,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>K3ListBox</class>

+ 0 - 1
ktigcc/preferencesdlg.ui

@@ -1169,7 +1169,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>K3ListBox</class>

+ 0 - 1
ktigcc/programoptions.ui

@@ -1433,7 +1433,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <includes>
     <include location="local" >klineedit.h</include>
     <include location="local" >kpushbutton.h</include>

+ 0 - 1
ktigcc/programoutput.ui

@@ -85,7 +85,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <tabstops>
     <tabstop>buttonClose</tabstop>
     <tabstop>textBrowser</tabstop>

+ 0 - 1
ktigcc/projectoptions.ui

@@ -1438,7 +1438,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <includes>
     <include location="local" >klineedit.h</include>
     <include location="local" >klineedit.h</include>

+ 0 - 1
ktigcc/selectcolors.ui

@@ -121,7 +121,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>K3ListBox</class>

+ 0 - 1
ktigcc/selectstyle.ui

@@ -160,7 +160,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <tabstops>
     <tabstop>customStyle</tabstop>
     <tabstop>boldChk</tabstop>

+ 20 - 20
ktigcc/srcfilewin.cpp

@@ -164,8 +164,8 @@ class KReplaceWithSelectionS : public KReplace {
 
 void SourceFileWindow::initBase()
 {
-  setIcon(qPixmapFromMimeSource("icon.png"));
-  KWin::setIcons(winId(),*(icon()),qPixmapFromMimeSource("ktigcc.png"));
+  setIcon(QPixmap(":/images/icon.png"));
+  KWin::setIcons(winId(),*(icon()),QPixmap(":/images/ktigcc.png"));
   sourceFiles.append(THIS);
   THIS->dirWatch=new KDirWatch(this);
   setCaption(caption()+" - "+THIS->fileName);
@@ -262,7 +262,7 @@ void SourceFileWindow::initBase()
     editPasteAction->setIcon(KIcon("editpaste"));
     findFindAction->setIcon(KIcon("filefind"));
     if (KIconLoader::global()->iconPath("stock-find-and-replace",K3Icon::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("filereplace.png")));
+      findReplaceAction->setIcon(QIcon(QPixmap(":/images/filereplace.png")));
     else
       findReplaceAction->setIcon(KIcon("stock-find-and-replace"));
     editUndoAction->setIcon(KIcon("undo"));
@@ -628,7 +628,7 @@ void SourceFileWindow::applyPreferences()
     editPasteAction->setIcon(KIcon("editpaste"));
     findFindAction->setIcon(KIcon("filefind"));
     if (KIconLoader::global()->iconPath("stock-find-and-replace",K3Icon::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("filereplace.png")));
+      findReplaceAction->setIcon(QIcon(QPixmap(":/images/filereplace.png")));
     else
       findReplaceAction->setIcon(KIcon("stock-find-and-replace"));
     editUndoAction->setIcon(KIcon("undo"));
@@ -637,22 +637,22 @@ void SourceFileWindow::applyPreferences()
     editIncreaseIndentAction->setIcon(KIcon("indent"));
     editDecreaseIndentAction->setIcon(KIcon("unindent"));
   } else {
-    fileSaveAction->setIcon(QIcon(qPixmapFromMimeSource("02")));
-    fileAddToProjectAction->setIcon(QIcon(qPixmapFromMimeSource("08")));
-    fileCompileAction->setIcon(QIcon(qPixmapFromMimeSource("09")));
-    filePrintAction->setIcon(QIcon(qPixmapFromMimeSource("03")));
-    filePrintQuicklyAction->setIcon(QIcon(qPixmapFromMimeSource("03")));
-    editClearAction->setIcon(QIcon(qPixmapFromMimeSource("04")));
-    editCutAction->setIcon(QIcon(qPixmapFromMimeSource("05")));
-    editCopyAction->setIcon(QIcon(qPixmapFromMimeSource("06")));
-    editPasteAction->setIcon(QIcon(qPixmapFromMimeSource("07")));
-    findFindAction->setIcon(QIcon(qPixmapFromMimeSource("13")));
-    findReplaceAction->setIcon(QIcon(qPixmapFromMimeSource("14")));
-    editUndoAction->setIcon(QIcon(qPixmapFromMimeSource("16")));
-    editRedoAction->setIcon(QIcon(qPixmapFromMimeSource("17")));
-    findFunctionsAction->setIcon(QIcon(qPixmapFromMimeSource("18")));
-    editIncreaseIndentAction->setIcon(QIcon(qPixmapFromMimeSource("19")));
-    editDecreaseIndentAction->setIcon(QIcon(qPixmapFromMimeSource("20")));
+    fileSaveAction->setIcon(QIcon(QPixmap(":/images/02")));
+    fileAddToProjectAction->setIcon(QIcon(QPixmap(":/images/08")));
+    fileCompileAction->setIcon(QIcon(QPixmap(":/images/09")));
+    filePrintAction->setIcon(QIcon(QPixmap(":/images/03")));
+    filePrintQuicklyAction->setIcon(QIcon(QPixmap(":/images/03")));
+    editClearAction->setIcon(QIcon(QPixmap(":/images/04")));
+    editCutAction->setIcon(QIcon(QPixmap(":/images/05")));
+    editCopyAction->setIcon(QIcon(QPixmap(":/images/06")));
+    editPasteAction->setIcon(QIcon(QPixmap(":/images/07")));
+    findFindAction->setIcon(QIcon(QPixmap(":/images/13")));
+    findReplaceAction->setIcon(QIcon(QPixmap(":/images/14")));
+    editUndoAction->setIcon(QIcon(QPixmap(":/images/16")));
+    editRedoAction->setIcon(QIcon(QPixmap(":/images/17")));
+    findFunctionsAction->setIcon(QIcon(QPixmap(":/images/18")));
+    editIncreaseIndentAction->setIcon(QIcon(QPixmap(":/images/19")));
+    editDecreaseIndentAction->setIcon(QIcon(QPixmap(":/images/20")));
   }
 }
 

+ 19 - 17
ktigcc/srcfilewin.ui

@@ -97,7 +97,7 @@
         <cstring>fileSaveAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>02</iconset>
+        <iconset resource="icons.qrc" >:/images/02</iconset>
       </property>
       <property name="iconText" >
         <string>Save</string>
@@ -134,7 +134,7 @@
         <cstring>filePrintAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>03</iconset>
+        <iconset resource="icons.qrc" >:/images/03</iconset>
       </property>
       <property name="iconText" >
         <string>Print File</string>
@@ -171,7 +171,7 @@
         <cstring>editUndoAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>16</iconset>
+        <iconset resource="icons.qrc" >:/images/16</iconset>
       </property>
       <property name="iconText" >
         <string>Undo</string>
@@ -191,7 +191,7 @@
         <cstring>editRedoAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>17</iconset>
+        <iconset resource="icons.qrc" >:/images/17</iconset>
       </property>
       <property name="iconText" >
         <string>Redo</string>
@@ -211,7 +211,7 @@
         <cstring>editCutAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>05</iconset>
+        <iconset resource="icons.qrc" >:/images/05</iconset>
       </property>
       <property name="iconText" >
         <string>Cut</string>
@@ -231,7 +231,7 @@
         <cstring>editCopyAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>06</iconset>
+        <iconset resource="icons.qrc" >:/images/06</iconset>
       </property>
       <property name="iconText" >
         <string>Copy</string>
@@ -251,7 +251,7 @@
         <cstring>editPasteAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>07</iconset>
+        <iconset resource="icons.qrc" >:/images/07</iconset>
       </property>
       <property name="iconText" >
         <string>Paste</string>
@@ -271,7 +271,7 @@
         <cstring>findFindAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>13</iconset>
+        <iconset resource="icons.qrc" >:/images/13</iconset>
       </property>
       <property name="iconText" >
         <string>Find</string>
@@ -294,7 +294,7 @@
         <cstring>editClearAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>04</iconset>
+        <iconset resource="icons.qrc" >:/images/04</iconset>
       </property>
       <property name="iconText" >
         <string>Clear</string>
@@ -328,7 +328,7 @@
         <cstring>editIncreaseIndentAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>19</iconset>
+        <iconset resource="icons.qrc" >:/images/19</iconset>
       </property>
       <property name="iconText" >
         <string>Increase Indent</string>
@@ -348,7 +348,7 @@
         <cstring>editDecreaseIndentAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>20</iconset>
+        <iconset resource="icons.qrc" >:/images/20</iconset>
       </property>
       <property name="iconText" >
         <string>Decrease Indent</string>
@@ -368,7 +368,7 @@
         <cstring>findReplaceAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>14</iconset>
+        <iconset resource="icons.qrc" >:/images/14</iconset>
       </property>
       <property name="iconText" >
         <string>Replace</string>
@@ -391,7 +391,7 @@
         <cstring>findFunctionsAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>18</iconset>
+        <iconset resource="icons.qrc" >:/images/18</iconset>
       </property>
       <property name="iconText" >
         <string>Functions...</string>
@@ -425,7 +425,7 @@
         <cstring>fileAddToProjectAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>08</iconset>
+        <iconset resource="icons.qrc" >:/images/08</iconset>
       </property>
       <property name="iconText" >
         <string>Add to Project</string>
@@ -442,7 +442,7 @@
         <cstring>fileCompileAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>09</iconset>
+        <iconset resource="icons.qrc" >:/images/09</iconset>
       </property>
       <property name="iconText" >
         <string>Compile</string>
@@ -473,7 +473,7 @@
         <cstring>filePrintQuicklyAction</cstring>
       </property>
       <property name="icon" >
-        <iconset>03</iconset>
+        <iconset resource="icons.qrc" >:/images/03</iconset>
       </property>
       <property name="iconText" >
         <string>Print File</string>
@@ -484,7 +484,9 @@
     </action>
   </widget>
   <layoutdefault spacing="0" margin="0" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <resources>
+    <include location="icons.qrc" />
+  </resources>
   <connections>
     <connection>
       <sender>editClearAction</sender>

+ 0 - 1
ktigcc/toolprops.ui

@@ -175,7 +175,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <tabstops>
     <tabstop>toolTitle</tabstop>
     <tabstop>commandLine</tabstop>

+ 0 - 1
ktigcc/toolsdlg.ui

@@ -158,7 +158,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>K3ListView</class>

+ 0 - 1
ktigcc/wordlist.ui

@@ -138,7 +138,6 @@
     </layout>
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <customwidgets>
     <customwidget>
       <class>KEditListBox</class>