瀏覽代碼

Set the correct pixmaps for the error messages.

git-svn-id: file:///var/svn/tigccpp/trunk@635 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 18 年之前
父節點
當前提交
89455a7bde
共有 6 個文件被更改,包括 34 次插入5 次删除
  1. 4 1
      ktigcc/KTIGCC.prj
  2. 二進制
      ktigcc/images/error.png
  3. 二進制
      ktigcc/images/info.png
  4. 二進制
      ktigcc/images/warning.png
  5. 4 1
      ktigcc/ktigcc.pro
  6. 26 3
      ktigcc/mainform.ui.h

+ 4 - 1
ktigcc/KTIGCC.prj

@@ -134,7 +134,10 @@ module.pixmap.files=\
 	images/26\
 	images/27\
 	images/icon.png\
-	images/filereplace.png
+	images/filereplace.png\
+	images/error.png\
+	images/warning.png\
+	images/info.png
 
 module.data.name=.
 module.data.type=

二進制
ktigcc/images/error.png


二進制
ktigcc/images/info.png


二進制
ktigcc/images/warning.png


+ 4 - 1
ktigcc/ktigcc.pro

@@ -59,7 +59,10 @@ IMAGES	= images/00 \
 	images/filet.png \
 	images/filex.png \
 	images/icon.png \
-	images/filereplace.png
+	images/filereplace.png \
+	images/error.png \
+	images/warning.png \
+	images/info.png
 
 # If this is not used, a build from /usr/.... will generate
 # Makefiles with relative paths for install.  This totally

+ 26 - 3
ktigcc/mainform.ui.h

@@ -125,7 +125,7 @@ enum {TIGCCOpenProjectFileFilter,TIGCCAddFilesFilter};
 #define CURRENT_VIEW (static_cast<Kate::View *>(widgetStack->visibleWidget()))
 
 #define LOAD_ICON(name) (QIconSet(KGlobal::iconLoader()->loadIcon((name),KIcon::Small),KGlobal::iconLoader()->loadIcon((name),KIcon::MainToolbar)))
-#define SYSICON(sysname,name) (preferences.useSystemIcons?KGlobal::iconLoader()->loadIcon((sysname),KIcon::Small):QPixmap::fromMimeSource((name)))
+#define SYSICON(sysname,name) (preferences.useSystemIcons?KGlobal::iconLoader()->loadIcon((sysname),KIcon::Small,KIcon::SizeSmall):QPixmap::fromMimeSource((name)))
 
 // For some reason, this flag is not in the public ConfigFlags enum.
 #define CF_REMOVE_TRAILING_DYN 0x4000000
@@ -628,8 +628,17 @@ class ErrorListItem : public KListViewItem {
   {
     QString errMessage=errMsg.stripWhiteSpace();
     if (!errMessage.isEmpty()) errMessage[0]=errMessage[0].upper();
-    // TODO: Set the correct pixmap.
-    setPixmap(0,SYSICON("unknown","filex.png"));
+    switch(errType) {
+      case etError:
+        setPixmap(0,SYSICON("messagebox_critical","error.png"));
+        break;
+      case etWarning:
+        setPixmap(0,SYSICON("messagebox_warning","warning.png"));
+        break;
+      default:
+        setPixmap(0,SYSICON("messagebox_info","info.png"));
+        break;
+    }
     setText(0,errMessage);
     setText(1,errFile);
     setText(2,errFunc=="__exit"?"_exit":
@@ -2101,6 +2110,20 @@ void MainForm::filePreferences()
       toolsConfigureAction->setIconSet(QIconSet(QPixmap::fromMimeSource("26")));
       debugResetAction->setIconSet(QIconSet(QPixmap::fromMimeSource("27")));
     }
+    it=QListViewItemIterator(errorList->errorListView);
+    for (item=it.current();item;item=(++it).current()) {
+      switch(item->rtti()) {
+        case etError:
+          item->setPixmap(0,SYSICON("messagebox_critical","error.png"));
+          break;
+        case etWarning:
+          item->setPixmap(0,SYSICON("messagebox_warning","warning.png"));
+          break;
+        default:
+          item->setPixmap(0,SYSICON("messagebox_info","info.png"));
+          break;
+      }
+    }
     // Apply the preferences to the source file windows.
     QPtrListIterator<SourceFile> sfit(sourceFiles);
     SourceFile *sourceFile;