| 8b77ddcc | 2014-10-13 15:43:50 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M src/common/gui/purl_gui.cpp M src/devices/gui/memory_editor.cpp M src/libgui/device_gui.cpp M src/libgui/editor_manager.cpp M src/libgui/log_view.cpp M src/libgui/new_dialogs.cpp M src/libgui/project_manager.cpp M src/libgui/toplevel.cpp |
||
diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp
index 3f5a742..fb7aacc 100644
--- a/src/common/gui/purl_gui.cpp
+++ b/src/common/gui/purl_gui.cpp
@@ -106,7 +106,7 @@
connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed()));
top->addWidget(_edit);
TDEIconLoader loader;
- TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar);
+ TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
TQPushButton *button = new KPushButton(iconset, TQString(), this);
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(buttonClicked()));
top->addWidget(button);
diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index c33891a..c5d06f3 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -272,7 +272,7 @@
//-----------------------------------------------------------------------------
const Device::ActionData Device::ACTION_DATA[Nb_Actions] = {
- { I18N_NOOP("&Clear"), "fileclose", NeedWrite },
+ { I18N_NOOP("&Clear"), "window-close", NeedWrite },
{ I18N_NOOP("&Zero"), 0, NeedWrite },
{ I18N_NOOP("For checksum check"), 0, NeedWrite },
{ I18N_NOOP("Re&load"), "reload", SeparatorAfter | NeedModified },
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index 2066b06..8b2f5f4 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -346,7 +346,7 @@
connect(_combo, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
hbox->addWidget(_combo);
TDEIconLoader loader;
- TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar);
+ TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
KPushButton *button = new KPushButton(iconset, TQString(), this);
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(chooseDevice()));
hbox->addWidget(button);
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index 53e47bf..14da332 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -154,7 +154,7 @@
{
TDEIconLoader loader;
TQPixmap def = loader.loadIcon("piklab", TDEIcon::Small);
- TQPixmap modified = loader.loadIcon("filesave", TDEIcon::Small);
+ TQPixmap modified = loader.loadIcon("document-save", TDEIcon::Small);
TQPixmap chip = loader.loadIcon("piklab_chip", TDEIcon::Small);
TQValueList<Editor *>::iterator it = _editors.begin();
for (; it!=_editors.end(); ++it) {
@@ -393,9 +393,9 @@
if ( editor==0 ) return;
TDEIconLoader loader;
- TQPixmap closeIcon = loader.loadIcon("fileclose", TDEIcon::Small);
- TQPixmap saveIcon = loader.loadIcon("filesave", TDEIcon::Small);
- TQPixmap saveAsIcon = loader.loadIcon("filesaveas", TDEIcon::Small);
+ TQPixmap closeIcon = loader.loadIcon("window-close", TDEIcon::Small);
+ TQPixmap saveIcon = loader.loadIcon("document-save", TDEIcon::Small);
+ TQPixmap saveAsIcon = loader.loadIcon("document-save-as", TDEIcon::Small);
TQPixmap reloadIcon = loader.loadIcon("reload", TDEIcon::Small);
TDEPopupMenu *popup = new TDEPopupMenu;
popup->insertTitle(title(*editor));
diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp
index 582f311..3c3d75c 100644
--- a/src/libgui/log_view.cpp
+++ b/src/libgui/log_view.cpp
@@ -76,9 +76,9 @@
updateDebugLevel();
_popup = TQTextEdit::createPopupMenu(pos);
TDEIconLoader loader;
- TQIconSet iset = loader.loadIconSet("filesave", TDEIcon::Small, 0);
+ TQIconSet iset = loader.loadIconSet("document-save", TDEIcon::Small, 0);
_popup->insertItem(iset, "Save As...", this, TQT_SLOT(saveAs()));
- iset = loader.loadIconSet("fileclose", TDEIcon::Small, 0);
+ iset = loader.loadIconSet("window-close", TDEIcon::Small, 0);
_popup->insertItem(iset, "Clear", this, TQT_SLOT(clear()));
_popup->insertSeparator();
FOR_EACH(DebugLevel, level) {
diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp
index a60be74..2ffc16f 100644
--- a/src/libgui/new_dialogs.cpp
+++ b/src/libgui/new_dialogs.cpp
@@ -35,7 +35,7 @@
connect(_dir, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed()));
_top->addMultiCellWidget(_dir, 1,1, 1,2);
TDEIconLoader loader;
- TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar);
+ TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
KPushButton *button = new KPushButton(iconset, TQString(), mainWidget());
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(browse()));
_top->addWidget(button, 1, 3);
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index 2aff5a0..18cc33c 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -164,7 +164,7 @@
if ( _project==0 || Main::toolGroup().linkerScriptType()==PURL::Nb_FileTypes ) return;
pop.insertTitle(i18n("Linker Script"));
pop.insertItem("piklab_addfile", i18n("Set Custom..."));
- if ( !_project->customLinkerScript().isEmpty() ) pop.insertItem("editdelete", i18n("Set Default"));
+ if ( !_project->customLinkerScript().isEmpty() ) pop.insertItem("edit-delete", i18n("Set Default"));
switch( pop.exec(p) ) {
case 1: {
PURL::Url url = PURL::getOpenUrl(":custom_linker_script", PURL::filter(Main::toolGroup().linkerScriptType()), this, i18n("Select Linker Script"));
@@ -194,7 +194,7 @@
pop.insertItem("piklab_compile", i18n("Build Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(buildProject()));
pop.insertItem("trashcan_empty", i18n("Clean Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(cleanBuild()));
pop.insertSeparator();
- pop.insertItem("filenew", i18n("New Source File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile()));
+ pop.insertItem("document-new", i18n("New Source File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile()));
pop.insertItem("piklab_addfile", i18n("Add Source Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertSourceFiles()));
pop.insertItem("piklab_addfile", i18n("Add Object Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertObjectFiles()));
if ( Main::currentEditor() ) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), TQT_TQOBJECT(this), TQT_SLOT(insertCurrentFile()));
@@ -205,7 +205,7 @@
FileItem *fi = static_cast<FileItem *>(item);
if ( isExternalFile(fi->url()) ) return;
pop.insertTitle(item->text(0));
- pop.insertItem("editdelete", i18n("Remove From Project"));
+ pop.insertItem("edit-delete", i18n("Remove From Project"));
if ( pop.exec(p)==1 ) removeFile(fi->url());
} else if ( item->rtti()==HeaderRtti ) {
if ( _project==0 ) return;
@@ -215,11 +215,11 @@
pop.exec(p);
} else if ( group==SourceGroup || group==HeaderGroup ) {
pop.insertTitle(i18n("Sources"));
- pop.insertItem("filenew", i18n("New File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile()));
+ pop.insertItem("document-new", i18n("New File..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(newSourceFile()));
pop.insertItem("piklab_addfile", i18n("Add Source Files..."), TQT_TQOBJECT(this), TQT_SLOT(insertSourceFiles()));
pop.exec(p);
} else if ( group==DeviceGroup ) {
- pop.insertItem("filenew", i18n("Select Device..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(showDeviceInfo()));
+ pop.insertItem("document-new", i18n("Select Device..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(showDeviceInfo()));
pop.exec(p);
}
}
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index bd51af2..3382dfd 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -181,7 +181,7 @@
// file actions
TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newSourceFile()), actionCollection());
a->setText(i18n("&New Source File..."));
- (void)new TDEAction(i18n("New hex File..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newHexFile()),
+ (void)new TDEAction(i18n("New hex File..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newHexFile()),
actionCollection(), "file_new_hex");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection());
TDERecentFilesAction *recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecentFile(const KURL &)), actionCollection());
@@ -233,7 +233,7 @@
recent->loadEntries(kapp->config(), "recent-projects");
(void)new TDEAction(i18n("Project Options..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(configureProject()), actionCollection(), "project_options");
- (void)new TDEAction(i18n("Close Project"), "fileclose", 0,
+ (void)new TDEAction(i18n("Close Project"), "window-close", 0,
TQT_TQOBJECT(this), TQT_SLOT(closeProject()), actionCollection(), "project_close");
(void)new TDEAction(i18n("Add Source File..."), "piklab_addfile", 0,
TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file");
|
||