| aa8b192b | 2014-10-13 20:10:05 | Timothy Pearson |
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance |
||
|
M kate/app/katemailfilesdialog.cpp M kate/app/katemainwindow.cpp M kate/app/katemdi.cpp M kate/app/kwritemain.cpp M kcontrol/randr/tderandrtray.cpp M kfind/kfwin.cpp M khelpcenter/mainwindow.cpp M kicker/kicker/plugins/kickoff-beagle-plugin.cpp M kicker/kicker/ui/k_new_mnu.cpp M kicker/taskmanager/taskrmbmenu.cpp M konqueror/about/konq_aboutpage.cc M konqueror/konq_mainwindow.cc M konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp M konqueror/sidebar/trees/history_module/history_module.cpp M konqueror/sidebar/trees/konq_sidebartree.cpp M konsole/konsole/konsole.cpp M konsole/konsole/konsole_part.cpp M libkonq/konq_dirpart.cc M libkonq/konq_popupmenu.cc M tdeioslave/media/libmediacommon/notifieropenaction.cpp M twin/useractions.cpp |
||
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 858caa5..2d93366 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -49,7 +49,7 @@
KGuiItem( i18n("&Show All Documents >>") ) ),
mainWindow( mainwin )
{
- setButtonGuiItem( KDialogBase::Ok, KGuiItem( i18n("&Mail..."), "mail_send") );
+ setButtonGuiItem( KDialogBase::Ok, KGuiItem( i18n("&Mail..."), "mail-send") );
mw = makeVBoxMainWidget();
mw->installEventFilter( this );
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index a1b3e90..af06170 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -257,7 +257,7 @@
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
- a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
+ a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
if ( KateApp::self()->authorize("shell_access") )
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 27035d4..adf2975 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -464,7 +464,7 @@
p->insertTitle(SmallIcon("view_remove"), i18n("Behavior"), 50);
- p->insertItem(w->persistent ? SmallIconSet("window_nofullscreen") : SmallIconSet("window_fullscreen"), w->persistent ? i18n("Make Non-Persistent") : i18n("Make Persistent"), 10);
+ p->insertItem(w->persistent ? SmallIconSet("view-restore") : SmallIconSet("view-fullscreen"), w->persistent ? i18n("Make Non-Persistent") : i18n("Make Persistent"), 10);
p->insertTitle(SmallIcon("move"), i18n("Move To"), 51);
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 75d4948..f427b00 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -150,7 +150,7 @@
actionCollection());
m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
- TDEAction *a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
+ TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create another view containing the current document"));
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 32f6f39..d6a711d 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -353,7 +353,7 @@
KRandrPassivePopup::message(
i18n("Screen configuration has changed"),
- currentScreen()->changedMessage(), SmallIcon("window_fullscreen"),
+ currentScreen()->changedMessage(), SmallIcon("view-fullscreen"),
this, "ScreenChangeNotification");
}
@@ -409,7 +409,7 @@
{
int lastIndex = 0;
- menu->insertTitle(SmallIcon("window_fullscreen"), i18n("Screen Size"));
+ menu->insertTitle(SmallIcon("view-fullscreen"), i18n("Screen Size"));
int numSizes = currentScreen()->numSizes();
int* sizeSort = new int[numSizes];
@@ -889,7 +889,7 @@
if (device->type() == TDEGenericDeviceType::Monitor) {
KRandrPassivePopup::message(
i18n("New display output options are available!"),
- i18n("A screen has been added, removed, or changed"), SmallIcon("window_fullscreen"),
+ i18n("A screen has been added, removed, or changed"), SmallIcon("view-fullscreen"),
this, "ScreenChangeNotification");
reloadDisplayConfiguration();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index c0223ea..f068d03 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -410,7 +410,7 @@
//menu = new TDEPopupMenu(item->text(0), this);
m_menu->insertTitle(item->text(0));
m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
- m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
+ m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
m_menu->insertSeparator();
m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index ab75d29..c224623 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -248,8 +248,8 @@
History::self().setupActions( actionCollection() );
new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
- new TDEAction( i18n( "Increase Font Sizes" ), "viewmag+", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
- new TDEAction( i18n( "Decrease Font Sizes" ), "viewmag-", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
+ new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
+ new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
}
void MainWindow::slotCopySelectedText()
diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
index 9763419..7ded9ee 100644
--- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
+++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
@@ -238,7 +238,7 @@
info = (*hit)[vCard_PREFEMAIL];
uri = "mailto:"+(*hit)[vCard_PREFEMAIL];
mimetype = hit->getMimeType ();
- icon = "mail_new";
+ icon = "mail-message-new";
HitMenuItem * first_item=new HitMenuItem (title, info, uri, mimetype, 0, category, icon, score);
kickoffSearchInterface()->addHitMenuItem(first_item);
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index c6ac44b..3e705ba 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2270,7 +2270,7 @@
}
hit_item = new HitMenuItem (i18n("Send Email to %1").arg(realName), (*it).preferredEmail(),
- "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail_new");
+ "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail-message-new");
insertSearchResult(hit_item);
}
@@ -2400,7 +2400,7 @@
if (emailRegExp.exactMatch(query_str)) {
categorised_hit_total[ACTIONS] ++;
HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString(),
- "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail_new");
+ "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail-message-new");
int index = getHitMenuItemPosition (hit_item);
m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, "mailto:"+query_str, max_category_id [ACTIONS], index);
}
@@ -3848,7 +3848,7 @@
if ( standby && !disableSuspend ) {
m_exitView->leftView()->insertItem(
- "player_pause",
+ "media-playback-pause",
i18n( "Standby" ),
i18n( "Pause without logging out" ),
"kicker:/standby", nId++, index++ );
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 7059bea..5868219 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -220,7 +220,7 @@
t, TQT_SLOT(toggleKeptBelowOthers()));
menu->setItemChecked(id, t->isKeptBelowOthers());
- id = menu->insertItem(SmallIconSet("window_fullscreen"),
+ id = menu->insertItem(SmallIconSet("view-fullscreen"),
i18n("&Fullscreen"),
t, TQT_SLOT(toggleFullScreen()));
menu->setItemChecked(id, t->isFullScreen());
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index c063319..a94f2d5 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -342,7 +342,7 @@
TQString locationbar_erase_icon_path =
iconloader->iconPath("locationbar_erase", TDEIcon::Small );
TQString window_fullscreen_icon_path =
- iconloader->iconPath("window_fullscreen", TDEIcon::Small );
+ iconloader->iconPath("view-fullscreen", TDEIcon::Small );
TQString view_left_right_icon_path =
iconloader->iconPath("view_left_right", TDEIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index bd2d616..225757f 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3805,7 +3805,7 @@
(void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
(void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
- (void) new TDEAction( i18n( "New &Window" ), "window_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+ (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
(void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
(void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
(void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
@@ -4110,7 +4110,7 @@
else
{
popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) );
- pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) );
+ pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) );
pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
}
}
@@ -4762,7 +4762,7 @@
actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
}
- actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+ actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
//Set tab_new_x to point to the correct icon based on NewTabsInFront
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 692241d..208fe2e 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -64,7 +64,7 @@
TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
(void) new TDEAction( i18n("Properties"), "edit", 0, this,
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, this,
+ (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 3ebb339..6f051a5 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -75,7 +75,7 @@
TQT_SLOT( slotItemExpanded( TQListViewItem * )));
m_collection = new TDEActionCollection( this, "history actions" );
- (void) new TDEAction( i18n("New &Window"), "window_new", 0, this,
+ (void) new TDEAction( i18n("New &Window"), "window-new", 0, this,
TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
(void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index f5cf661..0ce4c20 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -921,7 +921,7 @@
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
(void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
** Diff limit reached (max: 250 lines) **
|
||
| d98b88f1 | 2014-10-13 20:11:41 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase |
||
|
M cmake |
||
** Diff limit reached (max: 250 lines) ** |
||