| 5f89ac0b | 2014-10-13 15:43:49 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M ksquirrel/ksquirrel.cpp M ksquirrel/ksquirrelpart/ksquirrelpart.cpp M ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp M ksquirrel/sidebar/sq_categoriesview.cpp M ksquirrel/sidebar/sq_treeviewmenu.cpp M ksquirrel/sq_diroperator.cpp M ksquirrel/sq_externaltools.ui.h M ksquirrel/sq_filters.ui.h M ksquirrel/sq_glview.cpp M ksquirrel/sq_glwidget_stuff.cpp M ksquirrel/sq_navigatordropmenu.cpp M ksquirrel/sq_pluginsinfo.ui.h |
||
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index f8a08b5..c4fd896 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -796,8 +796,8 @@
pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
- pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "fileopen", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
- pAOpen = new TDEAction(i18n("Open file"), "fileopen", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
+ pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
+ pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
pASelectAll = KStdAction::selectAll(0, 0, actionCollection(), "SQ Select All");
pADeselectAll = KStdAction::deselect(0, 0, actionCollection(), "SQ Deselect All");
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 3edde9b..92cc629 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -108,10 +108,10 @@
// copy/move
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
- new TDEAction(i18n("Copy to..."), "editcopy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
+ new TDEAction(i18n("Copy to..."), "edit-copy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7));
- new TDEAction(i18n("Move to..."), "editcut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
+ new TDEAction(i18n("Move to..."), "edit-cut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6));
new TDEAction(i18n("Copy to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
@@ -120,7 +120,7 @@
new TDEAction(i18n("Move to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S));
- new TDEAction(i18n("Save As..."), "filesaveas", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
+ new TDEAction(i18n("Save As..."), "document-save-as", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
sa->setEditable(true);
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index be7572d..d1e2f92 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -869,7 +869,7 @@
#define SQ_ADD_KACTION(b) \
(new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
- id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+ id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
#ifndef KSQUIRREL_PART
menuFile->insertSeparator();
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index b8543aa..93aa131 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -166,7 +166,7 @@
toolbar->setIconSize(TDEIcon::SizeSmall);
- toolbar->insertButton("folder_new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
+ toolbar->insertButton("folder-new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
toolbar->insertButton("info", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
toolbar->insertButton("bookmark_add", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp
index bde8120..0fa1329 100644
--- a/ksquirrel/sidebar/sq_treeviewmenu.cpp
+++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp
@@ -15,11 +15,11 @@
SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name)
{
- id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
+ id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder-new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
insertSeparator();
id_rename = insertItem(i18n("Rename"), this, TQT_SLOT(slotDirectoryRename()));
id_clear = insertItem(i18n("Clear contents"), this, TQT_SLOT(slotDirectoryClear()));
- id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
+ id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
insertSeparator();
id_prop = insertItem(i18n("Properties"), this, TQT_SLOT(slotDirectoryProperties()));
}
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index 4f608e9..70a0649 100644
--- a/ksquirrel/sq_diroperator.cpp
+++ b/ksquirrel/sq_diroperator.cpp
@@ -368,9 +368,9 @@
TDEAction *sep = actionCollection()->action("separator");
- file->insert(new TDEAction(i18n("Copy"), "editcopy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
- file->insert(new TDEAction(i18n("Cut"), "editcut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
- file->insert(new TDEAction(i18n("Paste"), "editpaste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
+ file->insert(new TDEAction(i18n("Copy"), "edit-copy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
+ file->insert(new TDEAction(i18n("Cut"), "edit-cut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
+ file->insert(new TDEAction(i18n("Paste"), "edit-paste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
file->insert(sep);
file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQT_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));
diff --git a/ksquirrel/sq_externaltools.ui.h b/ksquirrel/sq_externaltools.ui.h
index 5c4c302..c1a9f04 100644
--- a/ksquirrel/sq_externaltools.ui.h
+++ b/ksquirrel/sq_externaltools.ui.h
@@ -32,8 +32,8 @@
pushToolUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
pushToolDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
- pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
- pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+ pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("document-new", TDEIcon::Desktop, TDEIcon::SizeSmall));
+ pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall));
pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
pushHelp->setPixmap(SQ_IconLoader::instance()->loadIcon("help", TDEIcon::Desktop, TDEIcon::SizeSmall));
diff --git a/ksquirrel/sq_filters.ui.h b/ksquirrel/sq_filters.ui.h
index 199af20..138b0dc 100644
--- a/ksquirrel/sq_filters.ui.h
+++ b/ksquirrel/sq_filters.ui.h
@@ -35,8 +35,8 @@
pushFilterUp->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_up", TDEIcon::Desktop, TDEIcon::SizeSmall));
pushFilterDown->setPixmap(SQ_IconLoader::instance()->loadIcon("move_task_down", TDEIcon::Desktop, TDEIcon::SizeSmall));
- pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("filenew", TDEIcon::Desktop, TDEIcon::SizeSmall));
- pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("editdelete", TDEIcon::Desktop, TDEIcon::SizeSmall));
+ pushNew->setPixmap(SQ_IconLoader::instance()->loadIcon("document-new", TDEIcon::Desktop, TDEIcon::SizeSmall));
+ pushDelete->setPixmap(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall));
pushClearAll->setPixmap(SQ_IconLoader::instance()->loadIcon("edittrash", TDEIcon::Desktop, TDEIcon::SizeSmall));
listFilters->setCurrentItem(listFilters->firstChild());
diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp
index d659787..8b603d2 100644
--- a/ksquirrel/sq_glview.cpp
+++ b/ksquirrel/sq_glview.cpp
@@ -233,7 +233,7 @@
SQ_Config::instance()->setGroup("GL view");
if(m_tabsclose)
- tab->setIconSet(SmallIcon("fileclose"));
+ tab->setIconSet(SmallIcon("window-close"));
}
void SQ_GLView::removePage(int index)
@@ -267,7 +267,7 @@
cnt = m_tabbar->count();
for(int i = 0;i < cnt;i++)
- m_tabbar->tabAt(i)->setIconSet(m_tabsclose ? SmallIcon("fileclose") : TQPixmap());
+ m_tabbar->tabAt(i)->setIconSet(m_tabsclose ? SmallIcon("window-close") : TQPixmap());
m_tabbar->setHoverCloseButton(m_tabsclose);
m_tabbar->layoutTabs();
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index be7572d..d1e2f92 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -869,7 +869,7 @@
#define SQ_ADD_KACTION(b) \
(new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
- id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
+ id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
#ifndef KSQUIRREL_PART
menuFile->insertSeparator();
diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp
index 86b30d7..bfcb30f 100644
--- a/ksquirrel/sq_navigatordropmenu.cpp
+++ b/ksquirrel/sq_navigatordropmenu.cpp
@@ -39,7 +39,7 @@
dropmenu = new SQ_PopupMenu(0);
// "copy" action
- TDEAction *pACopy = new TDEAction(i18n("Copy here"), "editpaste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
+ TDEAction *pACopy = new TDEAction(i18n("Copy here"), "edit-paste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
// "move" action
TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQT_SLOT(slotMove()), ac, "sq_move");
diff --git a/ksquirrel/sq_pluginsinfo.ui.h b/ksquirrel/sq_pluginsinfo.ui.h
index 487ff6b..f8e7d55 100644
--- a/ksquirrel/sq_pluginsinfo.ui.h
+++ b/ksquirrel/sq_pluginsinfo.ui.h
@@ -13,8 +13,8 @@
void SQ_PluginsInfo::init()
{
- tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("fileopen", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
- tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("filesave", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
+ tableLib->setColumnText (5, SQ_IconLoader::instance()->loadIcon("document-open", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
+ tableLib->setColumnText (6, SQ_IconLoader::instance()->loadIcon("document-save", TDEIcon::Desktop, TDEIcon::SizeSmall), "");
showLibs();
}
|
||