| 6d3dca83 | 2014-10-13 20:10:12 | 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 buildtools/autotools/addapplicationdlg.cpp M buildtools/autotools/autosubprojectview.cpp M languages/cpp/debugger/dbgtoolbar.cpp M languages/cpp/debugger/debuggerpart.cpp M languages/cpp/debugger/gdboutputwidget.cpp M languages/ruby/debugger/dbgtoolbar.cpp M languages/ruby/debugger/debuggerpart.cpp M languages/ruby/debugger/rdboutputwidget.cpp M lib/widgets/kdevhtmlpart.cpp M parts/appwizard/appwizardpart.cpp M parts/fullscreen/fullscreen_part.cpp |
||
diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index a8f56a0..af275e3 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -63,7 +63,7 @@
for (it = l.begin(); it != l.end(); ++it)
new TQListViewItem(availtypes_listview, (*it)->name());
- setIcon ( SmallIcon ( "window_new" ) );
+ setIcon ( SmallIcon ( "window-new" ) );
}
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 01428eb..005ae12 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -212,7 +212,7 @@
addServiceAction->plug( m_button3 );
TQToolTip::add( m_button4, tr2i18n( "Add Application..."));
- addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, TQT_TQOBJECT(this),
+ addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window-new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotAddApplication() ), actions, "add application" );
addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>"));
addApplicationAction->plug( m_button4 );
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 6072851..05b92d8 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -299,7 +299,7 @@
DbgMoveHandle* moveHandle= new DbgMoveHandle(this);
TQPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this);
- TQPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this);
+ TQPushButton* bInterrupt = new DbgButton(BarIcon("media-playback-pause"), i18n("Interrupt"), this);
TQPushButton* bNext = new DbgButton(BarIcon("dbgnext"), TQString(), this);
TQPushButton* bNexti = new DbgButton(BarIcon("dbgnextinst"), TQString(), this);
TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), TQString(), this);
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 380e7ac..61384cb 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -213,7 +213,7 @@
action->setToolTip( i18n("Stop debugger") );
action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
- action = new TDEAction(i18n("Interrupt"), "player_pause", 0,
+ action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0,
this, TQT_SLOT(slotPause()),
actionCollection(), "debug_pause");
action->setToolTip( i18n("Interrupt application") );
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index cc41a2a..deabf2c 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -68,7 +68,7 @@
0,
m_Interrupt->sizePolicy().hasHeightForWidth())
);
- m_Interrupt->setPixmap ( SmallIcon ( "player_pause" ) );
+ m_Interrupt->setPixmap ( SmallIcon ( "media-playback-pause" ) );
userGDBCmdEntry->addWidget(m_Interrupt);
TQToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter gdb commands" ) );
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index ba433c2..7dabbd3 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -298,7 +298,7 @@
DbgMoveHandle* moveHandle= new DbgMoveHandle(this);
TQPushButton* bRun = new DbgButton(BarIcon("dbgrun"), i18n("Run"), this);
- TQPushButton* bInterrupt = new DbgButton(BarIcon("player_pause"), i18n("Interrupt"), this);
+ TQPushButton* bInterrupt = new DbgButton(BarIcon("media-playback-pause"), i18n("Interrupt"), this);
TQPushButton* bNext = new DbgButton(BarIcon("dbgnext"), i18n("Step Over"), this);
TQPushButton* bStep = new DbgButton(BarIcon("dbgstep"), i18n("Step Into"), this);
TQPushButton* bFinish = new DbgButton(BarIcon("dbgstepout"), i18n("Step Out"), this);
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index b3f91d7..bfa5de9 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -176,7 +176,7 @@
action->setToolTip( i18n("Stop debugger") );
action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger."));
- action = new TDEAction(i18n("Interrupt"), "player_pause", 0,
+ action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0,
this, TQT_SLOT(slotPause()),
actionCollection(), "debug_pause");
action->setToolTip( i18n("Interrupt application") );
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index 568ddfd..575d60a 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -71,7 +71,7 @@
0,
m_Interrupt->sizePolicy().hasHeightForWidth())
);
- m_Interrupt->setPixmap ( SmallIcon ( "player_pause" ) );
+ m_Interrupt->setPixmap ( SmallIcon ( "media-playback-pause" ) );
userRDBCmdEntry->addWidget(m_Interrupt);
TQToolTip::add ( m_Interrupt, i18n ( "Pause execution of the app to enter rdb commands" ) );
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 8d5ebd7..7c69930 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -38,7 +38,7 @@
stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0,
this, TQT_SLOT( slotStop() ), actions, "doc_stop" );
stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document."));
- duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window_new", 0,
+ duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window-new", 0,
this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" );
duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window."));
printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc");
@@ -96,7 +96,7 @@
int idNewWindow = -2;
if (!url.isEmpty() && (m_options & CanOpenInNewWindow))
{
- idNewWindow = popup.insertItem(SmallIcon("window_new"),i18n("Open in New Tab"));
+ idNewWindow = popup.insertItem(SmallIcon("window-new"),i18n("Open in New Tab"));
popup.TQMenuData::setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window."));
needSep = true;
}
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index dd2fae6..c83fc89 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -42,7 +42,7 @@
TDEAction *action;
- action = new TDEAction( i18n("&New Project..."), "window_new", 0,
+ action = new TDEAction( i18n("&New Project..."), "window-new", 0,
this, TQT_SLOT(slotNewProject()),
actionCollection(), "project_new" );
action->setToolTip( i18n("Generate a new project from a template") );
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index 22cecb4..0bdc714 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -56,7 +56,7 @@
/*m_pFullScreen->setText( i18n( "Exit Full-Screen Mode" ) );
m_pFullScreen->setToolTip( i18n( "Exit full-screen mode" ) );
- m_pFullScreen->setIcon( "window_nofullscreen" );*/
+ m_pFullScreen->setIcon( "view-restore" );*/
} else {
//mw->menuBar()->show();
@@ -64,7 +64,7 @@
/*m_pFullScreen->setText( i18n( "&Full-Screen Mode" ) );
m_pFullScreen->setToolTip(i18n("Full-screen mode"));
- m_pFullScreen->setIcon( "window_fullscreen" );*/
+ m_pFullScreen->setIcon( "view-fullscreen" );*/
}
}
|
||
| c7a22f69 | 2014-10-13 20:11:51 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||