Branch: master

a2541c11 2014-10-13 00:16:45 Timothy Pearson
Bring up, down, top, and bottom icons into XDG compliance
M kimagemapeditor/arealistview.cpp
M klinkstatus/src/actionmanager.cpp
M quanta/components/csseditor/fontfamilychooser.cpp
M quanta/project/projectprivate.cpp
M quanta/project/uploadprofiles.cpp
M quanta/src/viewmanager.cpp
M quanta/treeviews/projecttreeview.cpp
M quanta/treeviews/servertreeview.cpp
M tdefilereplace/tdefilereplaceview.cpp
diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index f285999..568d8ed 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -52,10 +52,10 @@
 
   TQHBox *hbox= new TQHBox(this);
   upBtn= new TQPushButton("",hbox);
-  upBtn->setIconSet(SmallIconSet("up"));
+  upBtn->setIconSet(SmallIconSet("go-up"));
 
   downBtn= new TQPushButton("",hbox);
-  downBtn->setIconSet(SmallIconSet("down"));
+  downBtn->setIconSet(SmallIconSet("go-down"));
 
 }
 
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 5156957..8eb08a6 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -147,10 +147,10 @@
     toggle_action->setChecked(KLSConfig::followLastLinkChecked());
 
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
-    toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "bottom", "Ctrl+h",
+    toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "go-bottom", "Ctrl+h",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()),
                                       TQT_TQOBJECT(d->actionCollection), "hide_search_bar");
-    KGuiItem item(i18n("&Show Search Panel"), "top", "Show Search Panel");
+    KGuiItem item(i18n("&Show Search Panel"), "go-top", "Show Search Panel");
     toggle_action->setCheckedState(item);
     
     new TDEAction(i18n("&Reset Search Options"), "reload", "F5",
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 7f62599..8a64d58 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -61,11 +61,11 @@
   pbRemove->setIconSet(iconSet);
   pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-   iconSet = SmallIconSet(TQString::fromLatin1("up"));
+   iconSet = SmallIconSet(TQString::fromLatin1("go-up"));
   pbMoveUp->setIconSet(iconSet);
   pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-  iconSet = SmallIconSet(TQString::fromLatin1("down"));
+  iconSet = SmallIconSet(TQString::fromLatin1("go-down"));
   pbMoveDown->setIconSet(iconSet);
   pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
 
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 08f0f4b..f74f4a3 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -134,7 +134,7 @@
                         parent, TQT_SLOT( slotRescanPrjDir() ),
                         ac, "project_rescan" );
 
-  uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "up", Key_F8,
+  uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8,
                         parent, TQT_SLOT( slotUpload() ),
                         ac, "project_upload" );
 
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index 8c4c4db..4524512 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -86,7 +86,7 @@
   if (kurl.isValid() && ! kurl.isEmpty())
   {
     widget = new ServerTreeView(quantaApp->config(), quantaApp, kurl, TQString("ServerTreeView" + profile.name).ascii());
-    widget->setIcon(SmallIcon("up"));
+    widget->setIcon(SmallIcon("go-up"));
     widget->setCaption( i18n("Upload Profile") + ": " + profile.name );
     quantaApp->addToolWindow(widget, quantaApp->prevDockPosition(widget, KDockWidget::DockRight), quantaApp->getMainDockWidget());
   }
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index f76973d..18c1345 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -71,7 +71,7 @@
     m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs()));
     m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll()));
     m_tabPopup->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID);
-    m_tabPopup->insertItem(SmallIcon("up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID);
+    m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID);
     m_tabPopup->insertItem(SmallIcon("editdelete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID);
     m_tabPopup->insertSeparator();
     m_fileListPopup = new TDEPopupMenu(quantaApp);
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index a8a59a4..ae08fd2 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -130,8 +130,8 @@
   m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
   m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL()));
-  m_fileMenu->insertItem(SmallIcon("up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL()));
+  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL()));
+  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
   m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
@@ -147,8 +147,8 @@
 
   m_folderMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL()));
-  m_folderMenu->insertItem(SmallIcon("up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL()));
+  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL()));
+  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL()));
   m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
   m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
@@ -161,7 +161,7 @@
   m_projectMenu = new TDEPopupMenu(this);
   m_projectMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
   m_projectMenu->insertSeparator();
-  m_projectMenu->insertItem(SmallIcon("up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject()));
+  m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject()));
   m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan()));
   m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions()));
   m_projectMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 88b4533..d0d6d64 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -148,7 +148,7 @@
   KURL branchURL = url;
   branchURL.adjustPath(+1);
   BaseTreeBranch* newBrnch = 0;
-  newBrnch = new ServerTreeBranch(this, branchURL, branchURL.prettyURL(), SmallIcon("up"), true);
+  newBrnch = new ServerTreeBranch(this, branchURL, branchURL.prettyURL(), SmallIcon("go-up"), true);
   newBrnch->setShowingDotFiles(qConfig.showHiddenFiles);
   addBranch(newBrnch);
   return newBrnch;
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 44aad1f..f0924b2 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -517,7 +517,7 @@
                                TQT_SLOT(slotResultEdit()));
     }
 
-  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("up")),
+  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("go-up")),
                            i18n("Open Parent &Folder"),
                            this,
                            TQT_SLOT(slotResultDirOpen()));