[Uml-devel] KDE

[Jakob Petsovits]

SVN commit 756293 by jpetso:

Icon renaming (code changes - KDE/):
color-fill -> format-fill-color
color-line -> format-stroke-color


 M  +2 -2      kdeedu/kig/modes/popup.cc  
 M  +2 -2      kdeedu/ktouch/src/ktouch.cpp  
 M  +2 -2      kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp  
 M  +3 -3      kdenetwork/kopete/kopete/chatwindow/kopeteemailwindow.cpp  
 M  +2 -2      kdepim/kmail/kmcomposewin.cpp  
 M  +3 -3      kdesdk/umbrello/umbrello/listpopupmenu.cpp  
 M  +1 -1      kdeutils/kcalc/kcalc.cpp  
 M  +5 -4      kdeutils/kjots/KJotsMain.cpp  


--- trunk/KDE/kdeedu/kig/modes/popup.cc #756292:756293
@@ -259,8 +259,8 @@
       "test",
       QString(),
       "system-run",
-      "kig_text",
-      "color-fill",
+      "kig_text", // <- draw-text... hope I manage to rename it in time
+      "format-fill-color",
 //      "colorize",
       "sizer",
       "draw-brush",
--- trunk/KDE/kdeedu/ktouch/src/ktouch.cpp #756292:756293
@@ -658,12 +658,12 @@
 
     action = actionCollection()->addAction( "file_editcolors" );
     action->setText( i18n("&Edit Color Scheme...") );
-    action->setIcon( KIcon("color-fill") );
+    action->setIcon( KIcon("format-fill-color") );
     connect(action, SIGNAL(triggered(bool)), SLOT(fileEditColors()));
 
     action = actionCollection()->addAction( "file_editkeyboard" );
     action->setText( i18n("&Edit Keyboard Layout...") );
-    action->setIcon( KIcon("preferences-desktop-keyboard") );
+    action->setIcon( KIcon("preferences-desktop-keyboard-layout") );
     connect(action, SIGNAL(triggered(bool)), SLOT(fileEditKeyboard()));
 
     KStandardAction::quit(this, SLOT(fileQuit()), actionCollection());
--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp #756292:756293
@@ -423,11 +423,11 @@
         coll->addAction( "format_font", action );
 	connect( action, SIGNAL(triggered(bool)), this, SLOT(slotSetFont()) );
 
-	action = new KAction( KIcon("color-line"), i18n( "Set Default Text &Color..." ), coll );
+	action = new KAction( KIcon("format-stroke-color"), i18n( "Set Default Text &Color..." ), coll );
         coll->addAction( "format_fgcolor", action );
 	connect( action, SIGNAL(triggered(bool)), this, SLOT(slotSetFgColor()) );
 
-	action = new KAction( KIcon("color-fill"), i18n( "Set &Background Color..." ), coll );
+	action = new KAction( KIcon("format-fill-color"), i18n( "Set &Background Color..." ), coll );
         coll->addAction( "format_bgcolor", action );
 	connect( action, SIGNAL(triggered()), this, SLOT(slotSetBgColor()) );
 
--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/kopeteemailwindow.cpp #756292:756293
@@ -229,15 +229,15 @@
 	KStandardAction::paste( d->editPart->widget(), SLOT( paste() ), coll );
 
 	KAction* action;
-	action = new KAction( KIcon("character-set"), i18n( "&Set Font..." ), coll );
+	action = new KAction( KIcon("preferences-desktop-font"), i18n( "&Set Font..." ), coll );
         coll->addAction( "format_font", action );
 	connect( action, SIGNAL(triggered(bool)), d->editPart, SLOT(setFont()) );
 
-	action = new KAction( KIcon("draw-freehand"), i18n( "Set Text &Color..." ), coll );
+	action = new KAction( KIcon("format-stroke-color"), i18n( "Set Text &Color..." ), coll );
         coll->addAction( "format_color", action );
 	connect( action, SIGNAL(triggered()), d->editPart, SLOT(setForegroundColorColor()) );
 
-	action = new KAction( KIcon("color-fill"), i18n( "Set &Background Color..." ), coll );
+	action = new KAction( KIcon("format-fill-color"), i18n( "Set &Background Color..." ), coll );
         coll->addAction( "format_bgcolor", action );
 	connect( action, SIGNAL(triggered()), d->editPart, SLOT(setBackgroundColorColor()) );
 
--- trunk/KDE/kdepim/kmail/kmcomposewin.cpp #756292:756293
@@ -1052,7 +1052,7 @@
 
   mRecentAction->loadEntries( KMKernel::config()->group( QString() ) );
 
-  action = new KAction(KIcon("help-contents"), i18n("&Address Book"), this);
+  action = new KAction(KIcon("x-office-address-book"), i18n("&Address Book"), this);
   actionCollection()->addAction("addressbook", action );
   connect(action, SIGNAL(triggered(bool) ), SLOT(slotAddrBook()));
   action = new KAction(KIcon("mail-message-new"), i18n("&New Composer"), this);
@@ -1318,7 +1318,7 @@
   actionFormatReset = new KAction( KIcon( "draw-eraser" ), i18n("Reset Font Settings"), this );
   actionCollection()->addAction( "format_reset", actionFormatReset );
   connect( actionFormatReset, SIGNAL(triggered(bool) ), SLOT( slotFormatReset() ) );
-  actionFormatColor = new KAction( KIcon( "color-line" ), i18n("Text Color..."), this );
+  actionFormatColor = new KAction( KIcon( "format-stroke-color" ), i18n("Text Color..."), this );
   actionCollection()->addAction("format_color", actionFormatColor );
   connect( actionFormatColor, SIGNAL(triggered(bool) ),mEditor, SLOT( slotTextColor() ));
 
--- trunk/KDE/kdesdk/umbrello/umbrello/listpopupmenu.cpp #756292:756293
@@ -572,7 +572,7 @@
         m_actions[m] = addAction(SmallIcon("preferences-desktop-font"), i18n("Change Font..."));
         break;
     case mt_Line_Color:
-        m_actions[m] = addAction(SmallIcon("color-line"), i18n("Line Color..."));
+        m_actions[m] = addAction(SmallIcon("format-stroke-color"), i18n("Line Color..."));
         break;
     case mt_Expand_All:
         m_actions[m] = addAction(i18n("Expand All"));
@@ -872,8 +872,8 @@
 void ListPopupMenu::insertSubMenuColor(bool fc)
 {
     KMenu* color = new KMenu(i18n("Color"), this);
-    insert(mt_Line_Color, color, SmallIcon("color-line"), i18n("Line Color..."));
-    insert(mt_Fill_Color, color, SmallIcon("color-fill"), i18n("Fill Color..."));
+    insert(mt_Line_Color, color, SmallIcon("format-stroke-color"), i18n("Line Color..."));
+    insert(mt_Fill_Color, color, SmallIcon("format-fill-color"), i18n("Fill Color..."));
     insert(mt_Use_Fill_Color, color, i18n("Use Fill Color"), CHECKABLE);
     setActionChecked(mt_Use_Fill_Color, fc);
     addMenu(color);
--- trunk/KDE/kdeutils/kcalc/kcalc.cpp #756292:756293
@@ -1460,7 +1460,7 @@
 	// color settings
 
 	Colors *color = new Colors(0);
-	dialog->addPage(color, i18n("Colors"), "color-fill", i18n("Button & Display Colors"));
+	dialog->addPage(color, i18n("Colors"), "format-fill-color", i18n("Button & Display Colors"));
 
 	// constant settings
 
--- trunk/KDE/kdeutils/kjots/KJotsMain.cpp #756292:756293
@@ -195,6 +195,7 @@
     action->setText(i18n("New &Book..."));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N));
     action->setIcon(KIcon("x-office-address-book"));
+    // should rather be "address-book-new", use that once it exists in Oxygen
     connect(action, SIGNAL(triggered()), SLOT(createNewBook()));
 
     exportMenu = actionCollection()->add<KActionMenu>("save_to");
@@ -226,18 +227,18 @@
     action = actionCollection()->addAction("del_page");
     action->setText(i18n("&Delete Page"));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Delete));
-    action->setIcon(KIcon("list-remove"));
+    action->setIcon(KIcon("edit-delete"));
     connect(action, SIGNAL(triggered()), SLOT(deletePage()));
 
     action = actionCollection()->addAction("del_folder");
     action->setText(i18n("Delete Boo&k"));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Delete));
-    action->setIcon(KIcon("list-remove"));
+    action->setIcon(KIcon("edit-delete"));
     connect(action, SIGNAL(triggered()), SLOT(deleteBook()));
 
     action = actionCollection()->addAction("del_mult");
     action->setText(i18n("Delete Selected"));
-    action->setIcon(KIcon("list-remove"));
+    action->setIcon(KIcon("edit-delete"));
     connect(action, SIGNAL(triggered()), SLOT(deleteMultiple()));
 
     action = actionCollection()->addAction("manual_save");
@@ -328,7 +329,7 @@
     connect(action, SIGNAL(triggered()), SLOT(insertDate()));
 
     action = actionCollection()->addAction("change_color");
-    action->setIcon(KIcon("color-fill"));
+    action->setIcon(KIcon("format-fill-color"));
     action->setText(i18n("Change Color..."));
 
     KStandardAction::preferences(this, SLOT(configure()), actionCollection());