Browse Source

Update icon names for KDE 3.94.0: file-find->system-search, drop edit-find-replace hack (the icon loader now automatically falls back to edit-find if it isn't present), compfile->run-build-file, make-kdevelop->run-build.

git-svn-id: file:///var/svn/tigccpp/trunk@1229 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 16 years ago
parent
commit
6f4f38bb90
2 changed files with 12 additions and 24 deletions
  1. 8 14
      ktigcc/mainform.cpp
  2. 4 10
      ktigcc/srcfilewin.cpp

+ 8 - 14
ktigcc/mainform.cpp

@@ -1207,17 +1207,14 @@ MainForm::MainForm(QWidget* parent, const char* name, Qt::WindowFlags fl)
     editCopyAction->setIcon(KIcon("edit-copy"));
     editPasteAction->setIcon(KIcon("edit-paste"));
     projectAddFilesAction->setIcon(KIcon("edit-add"));
-    projectCompileAction->setIcon(KIcon("compfile"));
-    projectMakeAction->setIcon(KIcon("make-kdevelop"));
+    projectCompileAction->setIcon(KIcon("run-build-file"));
+    projectMakeAction->setIcon(KIcon("run-build"));
     projectBuildAction->setIcon(KIcon("rebuild"));
     helpContentsAction->setIcon(KIcon("help-contents"));
     helpDocumentationAction->setIcon(KIcon("help-contents"));
-    helpSearchAction->setIcon(KIcon("file-find"));
+    helpSearchAction->setIcon(KIcon("system-search"));
     findFindAction->setIcon(KIcon("edit-find"));
-    if (KIconLoader::global()->iconPath("edit-find-replace",KIconLoader::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(KIcon("file-find"));
-    else
-      findReplaceAction->setIcon(KIcon("edit-find-replace"));
+    findReplaceAction->setIcon(KIcon("edit-find-replace"));
     helpIndexAction->setIcon(KIcon("fileview-text"));
     editUndoAction->setIcon(KIcon("edit-undo"));
     editRedoAction->setIcon(KIcon("edit-redo"));
@@ -2693,17 +2690,14 @@ void MainForm::filePreferences()
       editCopyAction->setIcon(KIcon("edit-copy"));
       editPasteAction->setIcon(KIcon("edit-paste"));
       projectAddFilesAction->setIcon(KIcon("edit-add"));
-      projectCompileAction->setIcon(KIcon("compfile"));
-      projectMakeAction->setIcon(KIcon("make-kdevelop"));
+      projectCompileAction->setIcon(KIcon("run-build-file"));
+      projectMakeAction->setIcon(KIcon("run-build"));
       projectBuildAction->setIcon(KIcon("rebuild"));
       helpContentsAction->setIcon(KIcon("help-contents"));
       helpDocumentationAction->setIcon(KIcon("help-contents"));
-      helpSearchAction->setIcon(KIcon("file-find"));
+      helpSearchAction->setIcon(KIcon("system-search"));
       findFindAction->setIcon(KIcon("edit-find"));
-      if (KIconLoader::global()->iconPath("edit-find-replace",KIconLoader::Small,TRUE).isEmpty())
-        findReplaceAction->setIcon(KIcon("file-find"));
-      else
-        findReplaceAction->setIcon(KIcon("edit-find-replace"));
+      findReplaceAction->setIcon(KIcon("edit-find-replace"));
       helpIndexAction->setIcon(KIcon("fileview-text"));
       editUndoAction->setIcon(KIcon("edit-undo"));
       editRedoAction->setIcon(KIcon("edit-redo"));

+ 4 - 10
ktigcc/srcfilewin.cpp

@@ -276,7 +276,7 @@ SourceFileWindow::SourceFileWindow(MainForm *mainfrm, const QString &fn,
     setIconSize(QSize(toolbarIconSize,toolbarIconSize));
     fileSaveAction->setIcon(KIcon("document-save"));
     fileAddToProjectAction->setIcon(KIcon("edit-add"));
-    fileCompileAction->setIcon(KIcon("compfile"));
+    fileCompileAction->setIcon(KIcon("run-build-file"));
     filePrintAction->setIcon(KIcon("document-print"));
     filePrintQuicklyAction->setIcon(KIcon("document-print"));
     editClearAction->setIcon(KIcon("edit-delete"));
@@ -284,10 +284,7 @@ SourceFileWindow::SourceFileWindow(MainForm *mainfrm, const QString &fn,
     editCopyAction->setIcon(KIcon("edit-copy"));
     editPasteAction->setIcon(KIcon("edit-paste"));
     findFindAction->setIcon(KIcon("edit-find"));
-    if (KIconLoader::global()->iconPath("edit-find-replace",KIconLoader::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(KIcon("file-find"));
-    else
-      findReplaceAction->setIcon(KIcon("edit-find-replace"));
+    findReplaceAction->setIcon(KIcon("edit-find-replace"));
     editUndoAction->setIcon(KIcon("edit-undo"));
     editRedoAction->setIcon(KIcon("edit-redo"));
     findFunctionsAction->setIcon(KIcon("view-tree"));
@@ -672,7 +669,7 @@ void SourceFileWindow::applyPreferences()
     setIconSize(QSize(toolbarIconSize,toolbarIconSize));
     fileSaveAction->setIcon(KIcon("document-save"));
     fileAddToProjectAction->setIcon(KIcon("edit-add"));
-    fileCompileAction->setIcon(KIcon("compfile"));
+    fileCompileAction->setIcon(KIcon("run-build-file"));
     filePrintAction->setIcon(KIcon("document-print"));
     filePrintQuicklyAction->setIcon(KIcon("document-print"));
     editClearAction->setIcon(KIcon("edit-delete"));
@@ -680,10 +677,7 @@ void SourceFileWindow::applyPreferences()
     editCopyAction->setIcon(KIcon("edit-copy"));
     editPasteAction->setIcon(KIcon("edit-paste"));
     findFindAction->setIcon(KIcon("edit-find"));
-    if (KIconLoader::global()->iconPath("edit-find-replace",KIconLoader::Small,TRUE).isEmpty())
-      findReplaceAction->setIcon(KIcon("file-find"));
-    else
-      findReplaceAction->setIcon(KIcon("edit-find-replace"));
+    findReplaceAction->setIcon(KIcon("edit-find-replace"));
     editUndoAction->setIcon(KIcon("edit-undo"));
     editRedoAction->setIcon(KIcon("edit-redo"));
     findFunctionsAction->setIcon(KIcon("view-tree"));