Branch: master

235c0810 2014-10-13 12:50:47 Timothy Pearson
Bring undo, redo, find, and revert icons into XDG compliance
A pics/crystalsvg/cr16-action-document-revert.png
A pics/crystalsvg/cr16-action-edit-find.png
A pics/crystalsvg/cr16-action-edit-redo.png
A pics/crystalsvg/cr16-action-edit-undo.png
A pics/crystalsvg/cr22-action-document-revert.png
A pics/crystalsvg/cr22-action-edit-find.png
A pics/crystalsvg/cr22-action-edit-redo.png
A pics/crystalsvg/cr22-action-edit-undo.png
A pics/crystalsvg/cr32-action-document-revert.png
A pics/crystalsvg/cr32-action-edit-find.png
A pics/crystalsvg/cr32-action-edit-redo.png
A pics/crystalsvg/cr32-action-edit-undo.png
M tdehtml/tdehtml_ext.cpp
M tdeparts/browserextension.cpp
M tdeprint/management/kmjobviewer.cpp
M tdeui/kcommand.cpp
M tdeui/keditcl2.cpp
M tdeui/klineedit.cpp
M tdeui/kstdaction_p.h
M tdeui/kstdguiitem.cpp
M tdeui/ktextbrowser.cpp
M tdeui/ktextedit.cpp
M tdeutils/kfinddialog.cpp
R pics/crystalsvg/cr16-action-find.png
R pics/crystalsvg/cr16-action-redo.png
R pics/crystalsvg/cr16-action-revert.png
R pics/crystalsvg/cr16-action-undo.png
R pics/crystalsvg/cr22-action-find.png
R pics/crystalsvg/cr22-action-redo.png
R pics/crystalsvg/cr22-action-revert.png
R pics/crystalsvg/cr22-action-undo.png
R pics/crystalsvg/cr32-action-find.png
R pics/crystalsvg/cr32-action-redo.png
R pics/crystalsvg/cr32-action-revert.png
R pics/crystalsvg/cr32-action-undo.png
diff --git a/pics/crystalsvg/cr16-action-document-revert.png b/pics/crystalsvg/cr16-action-document-revert.png
new file mode 100644
index 0000000..197b8a7
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-document-revert.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-edit-find.png b/pics/crystalsvg/cr16-action-edit-find.png
new file mode 100644
index 0000000..f9451cc
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-edit-find.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-edit-redo.png b/pics/crystalsvg/cr16-action-edit-redo.png
new file mode 100644
index 0000000..ec2ed78
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-edit-redo.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-edit-undo.png b/pics/crystalsvg/cr16-action-edit-undo.png
new file mode 100644
index 0000000..d2ed14f
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-edit-undo.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-find.png b/pics/crystalsvg/cr16-action-find.png
deleted file mode 100644
index f9451cc..0000000
--- a/pics/crystalsvg/cr16-action-find.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-redo.png b/pics/crystalsvg/cr16-action-redo.png
deleted file mode 100644
index ec2ed78..0000000
--- a/pics/crystalsvg/cr16-action-redo.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-revert.png b/pics/crystalsvg/cr16-action-revert.png
deleted file mode 100644
index 197b8a7..0000000
--- a/pics/crystalsvg/cr16-action-revert.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-action-undo.png b/pics/crystalsvg/cr16-action-undo.png
deleted file mode 100644
index d2ed14f..0000000
--- a/pics/crystalsvg/cr16-action-undo.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-document-revert.png b/pics/crystalsvg/cr22-action-document-revert.png
new file mode 100644
index 0000000..c28fa8a
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-document-revert.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-edit-find.png b/pics/crystalsvg/cr22-action-edit-find.png
new file mode 100644
index 0000000..20d3668
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-edit-find.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-edit-redo.png b/pics/crystalsvg/cr22-action-edit-redo.png
new file mode 100644
index 0000000..6aacd4f
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-edit-redo.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-edit-undo.png b/pics/crystalsvg/cr22-action-edit-undo.png
new file mode 100644
index 0000000..d4b682b
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-edit-undo.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-find.png b/pics/crystalsvg/cr22-action-find.png
deleted file mode 100644
index 20d3668..0000000
--- a/pics/crystalsvg/cr22-action-find.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-redo.png b/pics/crystalsvg/cr22-action-redo.png
deleted file mode 100644
index 6aacd4f..0000000
--- a/pics/crystalsvg/cr22-action-redo.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-revert.png b/pics/crystalsvg/cr22-action-revert.png
deleted file mode 100644
index c28fa8a..0000000
--- a/pics/crystalsvg/cr22-action-revert.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-action-undo.png b/pics/crystalsvg/cr22-action-undo.png
deleted file mode 100644
index d4b682b..0000000
--- a/pics/crystalsvg/cr22-action-undo.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-document-revert.png b/pics/crystalsvg/cr32-action-document-revert.png
new file mode 100644
index 0000000..5111dd0
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-document-revert.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-edit-find.png b/pics/crystalsvg/cr32-action-edit-find.png
new file mode 100644
index 0000000..176e838
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-edit-find.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-edit-redo.png b/pics/crystalsvg/cr32-action-edit-redo.png
new file mode 100644
index 0000000..a424839
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-edit-redo.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-edit-undo.png b/pics/crystalsvg/cr32-action-edit-undo.png
new file mode 100644
index 0000000..e5f15b2
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-edit-undo.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-find.png b/pics/crystalsvg/cr32-action-find.png
deleted file mode 100644
index 176e838..0000000
--- a/pics/crystalsvg/cr32-action-find.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-redo.png b/pics/crystalsvg/cr32-action-redo.png
deleted file mode 100644
index a424839..0000000
--- a/pics/crystalsvg/cr32-action-redo.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-revert.png b/pics/crystalsvg/cr32-action-revert.png
deleted file mode 100644
index 5111dd0..0000000
--- a/pics/crystalsvg/cr32-action-revert.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-action-undo.png b/pics/crystalsvg/cr32-action-undo.png
deleted file mode 100644
index e5f15b2..0000000
--- a/pics/crystalsvg/cr32-action-undo.png
+++ /dev/null
Binary files differ
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index b7dfb8a..0148d8a 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -465,7 +465,7 @@
       {
         TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
         if ( iconPath.isEmpty() )
-          icon = SmallIcon("find");
+          icon = SmallIcon("edit-find");
         else
           icon = TQPixmap( iconPath );
         name = service->name();
@@ -502,7 +502,7 @@
           {
             TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
             if ( iconPath.isEmpty() )
-              icon = SmallIcon("find");
+              icon = SmallIcon("edit-find");
             else
               icon = TQPixmap( iconPath );
             name = service->name();
diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp
index 85bfa4a..ec31eea 100644
--- a/tdeparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
@@ -483,7 +483,7 @@
     {
         if ( KMessageBox::questionYesNo( m_part->widget(),
 		    i18n( "<qt>Do you want to search the Internet for <b>%1</b>?" ).arg( TQStyleSheet::escape(url) ),
-		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "find"),
+		    i18n( "Internet Search" ), KGuiItem( i18n( "&Search" ), "edit-find"),
 		    KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
           slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
     }
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 29ba01c..b94a2a7 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -262,7 +262,7 @@
 	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
 	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
 	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
-	TDEAction *sact = new TDEAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
 	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp
index 994d126..5357e55 100644
--- a/tdeui/kcommand.cpp
+++ b/tdeui/kcommand.cpp
@@ -83,7 +83,7 @@
     d=new KCommandHistoryPrivate();
     if (withMenus)
     {
-        TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo",
+        TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo",
                                           TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Undo ) );
         connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) );
@@ -91,7 +91,7 @@
         m_undo = undo;
         m_undoPopup = undo->popupMenu();
 
-        TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo",
+        TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo",
                                           TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Redo ) );
         connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) );
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 4749a47..4a3a22e 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -698,7 +698,7 @@
 
 KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( parent, name, modal, i18n("Find"),
-		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "find") )
+		modal ? User1|Cancel : User1|Close, User1, false, KGuiItem( i18n("&Find"), "edit-find") )
 {
   setWFlags( WType_TopLevel );
 
@@ -830,7 +830,7 @@
   :KDialogBase( parent, name, modal, i18n("Replace"),
 		modal ? User3|User2|User1|Cancel : User3|User2|User1|Close,
                 User3, false,
-		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "find") )
+		i18n("Replace &All"), i18n("&Replace"), KGuiItem( i18n("&Find"), "edit-find") )
 {
   setWFlags( WType_TopLevel );
 
@@ -1115,8 +1115,8 @@
       menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) );
     else {
       int id = menu->idAt(0);
-      menu->changeItem( id - IdUndo, SmallIconSet("undo"), menu->text( id - IdUndo) );
-      menu->changeItem( id - IdRedo, SmallIconSet("redo"), menu->text( id - IdRedo) );
+      menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
+      menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
       menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) );
       menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) );
       menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) );
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 588746e..f41ebd2 100644
--- a/tdeui/klineedit.cpp
 ** Diff limit reached (max: 250 lines) **
43022555 2014-10-13 12:52:56 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
M configure.in.in
M tdeio/tdefile/tdefilespeedbar.cpp
 ** Diff limit reached (max: 250 lines) **