| 14e37119 | 2014-10-13 15:43:56 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M atlantik/client/eventlogwidget.cpp M atlantik/client/selectgame_widget.cpp M kgoldrunner/src/kgoldrunner.cpp M kmahjongg/Editor.cpp M kmahjongg/HighScore.cpp M kmines/main.cpp M kolf/kolf.cpp M ksokoban/MainWindow.cpp M libtdegames/kstdgameaction.cpp |
||
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index ea80aad..eb60fa3 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -72,7 +72,7 @@
actionBox->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
- m_saveButton = new KPushButton(BarIcon("filesave", TDEIcon::SizeSmall), i18n("&Save As..."), this);
+ m_saveButton = new KPushButton(BarIcon("document-save", TDEIcon::SizeSmall), i18n("&Save As..."), this);
actionBox->addWidget(m_saveButton);
connect(m_saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 34636af..ba61c3c 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -81,7 +81,7 @@
if (game->id() == -1)
{
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(game->name()), game->description(), TQString(), TQString(), game->type() );
- item->setPixmap(0, TQPixmap(SmallIcon("filenew")));
+ item->setPixmap(0, TQPixmap(SmallIcon("document-new")));
}
else
{
diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp
index f8bfcbd..4362bb5 100644
--- a/kgoldrunner/src/kgoldrunner.cpp
+++ b/kgoldrunner/src/kgoldrunner.cpp
@@ -999,11 +999,11 @@
editToolbar->insertSeparator();
- editToolbar->insertButton ("filenew", 0, TQT_SIGNAL(clicked()), game,
+ editToolbar->insertButton ("document-new", 0, TQT_SIGNAL(clicked()), game,
TQT_SLOT(createLevel()), TRUE, i18n("&Create a Level"));
- editToolbar->insertButton ("fileopen", 1, TQT_SIGNAL(clicked()), game,
+ editToolbar->insertButton ("document-open", 1, TQT_SIGNAL(clicked()), game,
TQT_SLOT(updateLevel()), TRUE, i18n("&Edit Any Level..."));
- editToolbar->insertButton ("filesave", 2, TQT_SIGNAL(clicked()), game,
+ editToolbar->insertButton ("document-save", 2, TQT_SIGNAL(clicked()), game,
TQT_SLOT(saveLevelFile()),TRUE, i18n("&Save Edits..."));
editToolbar->insertSeparator();
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 8112dbb..87893bf 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -110,26 +110,26 @@
TDEToolBarRadioGroup *radio = new TDEToolBarRadioGroup(topToolbar);
// new game
- topToolbar->insertButton(loader->loadIcon("filenew", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("document-new", TDEIcon::Toolbar),
ID_TOOL_NEW, true, i18n("New board"));
// open game
- topToolbar->insertButton(loader->loadIcon("fileopen", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("document-open", TDEIcon::Toolbar),
ID_TOOL_LOAD, true, i18n("Open board"));
// save game
- topToolbar->insertButton(loader->loadIcon("filesave", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("document-save", TDEIcon::Toolbar),
ID_TOOL_SAVE, true, i18n("Save board"));
- topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("filesave", TDEIcon::Toolbar));
+ topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("document-save", TDEIcon::Toolbar));
#ifdef FUTURE_OPTIONS
// Select
topToolbar->insertSeparator();
topToolbar->insertButton(loader->loadIcon("rectangle_select", TDEIcon::Toolbar),
ID_TOOL_SELECT, true, i18n("Select"));
- topToolbar->insertButton(loader->loadIcon("editcut", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("edit-cut", TDEIcon::Toolbar),
ID_TOOL_CUT, true, i18n("Cut"));
- topToolbar->insertButton(loader->loadIcon("editcopy", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("edit-copy", TDEIcon::Toolbar),
ID_TOOL_COPY, true, i18n("Copy"));
- topToolbar->insertButton(loader->loadIcon("editpaste", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("edit-paste", TDEIcon::Toolbar),
ID_TOOL_PASTE, true, i18n("Paste"));
topToolbar->insertSeparator();
@@ -138,7 +138,7 @@
#endif
topToolbar->insertButton(loader->loadIcon("pencil", TDEIcon::Toolbar),
ID_TOOL_ADD, true, i18n("Add tiles"));
- topToolbar->insertButton(loader->loadIcon("editdelete", TDEIcon::Toolbar),
+ topToolbar->insertButton(loader->loadIcon("edit-delete", TDEIcon::Toolbar),
ID_TOOL_DEL, true, i18n("Remove tiles"));
topToolbar->setToggle(ID_TOOL_ADD);
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index 7240e8e..3f947b5 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -128,7 +128,7 @@
resetBtn->setAutoResize( false );
TDEIconLoader *loader = TDEGlobal::iconLoader();
- resetBtn->setPixmap(loader->loadIcon("editdelete", TDEIcon::Toolbar));
+ resetBtn->setPixmap(loader->loadIcon("edit-delete", TDEIcon::Toolbar));
diff --git a/kmines/main.cpp b/kmines/main.cpp
index eee4623..c77afa8 100644
--- a/kmines/main.cpp
+++ b/kmines/main.cpp
@@ -113,10 +113,10 @@
(void)new TDEAction(KGuiItem(i18n("Replay Log"), "player_play"),
0, TQT_TQOBJECT(_status), TQT_SLOT(replayLog()),
actionCollection(), "log_replay");
- (void)new TDEAction(KGuiItem(i18n("Save Log..."), "filesave"), 0,
+ (void)new TDEAction(KGuiItem(i18n("Save Log..."), "document-save"), 0,
TQT_TQOBJECT(_status), TQT_SLOT(saveLog()),
actionCollection(), "log_save");
- (void)new TDEAction(KGuiItem(i18n("Load Log..."), "fileopen"), 0,
+ (void)new TDEAction(KGuiItem(i18n("Load Log..."), "document-open"), 0,
TQT_TQOBJECT(_status), TQT_SLOT(loadLog()),
actionCollection(), "log_load");
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index ec7fffe..e989688 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -100,7 +100,7 @@
highScoreAction = KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighScores()), actionCollection());
editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "editing");
- newHoleAction = new TDEAction(i18n("&New"), "filenew", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "newhole");
+ newHoleAction = new TDEAction(i18n("&New"), "document-new", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "newhole");
clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "clearhole");
resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "resethole");
undoShotAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "undoshot");
@@ -110,7 +110,7 @@
holeAction = new TDEListAction(i18n("Switch to Hole"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "switchhole");
nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "nexthole");
prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "prevhole");
- firstAction = new TDEAction(i18n("&First Hole"), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "firsthole");
+ firstAction = new TDEAction(i18n("&First Hole"), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "firsthole");
lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "lasthole");
randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "randhole");
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index a75fcd7..ef8c448 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -89,7 +89,7 @@
menu_ = new KMenuBar(this, "menubar" );
game_ = new TQPopupMenu(0,"game menu");
- pixmap = SmallIcon("fileopen");
+ pixmap = SmallIcon("document-open");
game_->insertItem(TQIconSet(pixmap), i18n("&Load Levels..."), this, TQT_SLOT(loadLevels()));
pixmap = SmallIcon("forward");
game_->insertItem(TQIconSet(pixmap), i18n("&Next Level"), playField_, TQT_SLOT(nextLevel()), Key_N);
diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp
index ea963ef..a4b81d2 100644
--- a/libtdegames/kstdgameaction.cpp
+++ b/libtdegames/kstdgameaction.cpp
@@ -57,16 +57,16 @@
const KStdGameActionInfo g_rgActionInfo[] = {
// "game" menu
- { KStdGameAction::New, TDEStdAccel::New, 0, "game_new", I18N_NOOP2("new game", "&New"), 0, "filenew" },
- { KStdGameAction::Load, TDEStdAccel::Open, 0, "game_load", I18N_NOOP("&Load..."), 0, "fileopen" },
+ { KStdGameAction::New, TDEStdAccel::New, 0, "game_new", I18N_NOOP2("new game", "&New"), 0, "document-new" },
+ { KStdGameAction::Load, TDEStdAccel::Open, 0, "game_load", I18N_NOOP("&Load..."), 0, "document-open" },
{ KStdGameAction::LoadRecent, TDEStdAccel::AccelNone, 0, "game_load_recent", I18N_NOOP("Load &Recent"), 0, 0 },
{ KStdGameAction::Restart, TDEStdAccel::Reload, 0, "game_restart", I18N_NOOP("Restart &Game"), 0, "reload" },
- { KStdGameAction::Save, TDEStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "filesave" },
- { KStdGameAction::SaveAs, TDEStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" },
- { KStdGameAction::End, TDEStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "fileclose" },
+ { KStdGameAction::Save, TDEStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "document-save" },
+ { KStdGameAction::SaveAs, TDEStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" },
+ { KStdGameAction::End, TDEStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "window-close" },
{ KStdGameAction::Pause, TDEStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" },
{ KStdGameAction::Highscores, TDEStdAccel::AccelNone, TQt::CTRL+TQt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" },
- { KStdGameAction::Print, TDEStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "fileprint" },
+ { KStdGameAction::Print, TDEStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "document-print" },
{ KStdGameAction::Quit, TDEStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "exit" },
// "move" menu
{ KStdGameAction::Repeat, TDEStdAccel::AccelNone, 0, "move_repeat", I18N_NOOP("Repeat"), 0, 0 },
|
||