| 00da9ebc | 2014-10-13 20:09:59 | 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 src/circuitview.cpp M src/electronics/components/piccomponent.cpp M src/katemdi.cpp M src/ktechlab.cpp M src/textview.cpp |
||
diff --git a/src/circuitview.cpp b/src/circuitview.cpp
index 14c3a5f..5e90448 100644
--- a/src/circuitview.cpp
+++ b/src/circuitview.cpp
@@ -39,8 +39,8 @@
ra->setExclusiveGroup("orientation");
new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQT_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" );
- new TDEAction( i18n("Rotate Clockwise"), "rotate_cw", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
- new TDEAction( i18n("Rotate Counter-Clockwise"), "rotate_ccw", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
+ new TDEAction( i18n("Rotate Clockwise"), "object-rotate-right", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
+ new TDEAction( i18n("Rotate Counter-Clockwise"), "object-rotate-left", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQT_SLOT(itemFlip()), ac, "edit_flip" );
//END Item Control Actions
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 30f946f..83038c1 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -82,8 +82,8 @@
m_bLoadingProgram = false;
m_pGpsim = 0L;
- addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", TDEIcon::Small ) );
- addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", TDEIcon::Small ) );
+ addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "media-playback-start", TDEIcon::Small ) );
+ addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "media-playback-pause", TDEIcon::Small ) );
addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ) );
addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) );
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index 961dd8e..6fa7781 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -400,7 +400,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/src/ktechlab.cpp b/src/ktechlab.cpp
index 0c5d76e..0149939 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -448,7 +448,7 @@
//BEGIN Project Actions
ProjectManager *pm = ProjectManager::self(this);
- new TDEAction( i18n("New Project.."), "window_new", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()), ac, "project_new" );
+ new TDEAction( i18n("New Project.."), "window-new", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()), ac, "project_new" );
new TDEAction( i18n("Open Project..."), "project_open", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotOpenProject()), ac, "project_open" );
// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), TQT_TQOBJECT(ProjectManager::self()), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
@@ -470,12 +470,12 @@
new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
- TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "player_play", TQt::Key_F10, 0, 0, ac, "simulation_run" );
+ TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "media-playback-start", TQt::Key_F10, 0, 0, ac, "simulation_run" );
ta->setChecked(true);
connect( ta, TQT_SIGNAL(toggled(bool )), Simulator::self(), TQT_SLOT(slotSetSimulating(bool )) );
#if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
- ta->setCheckedState( KGuiItem( i18n("Pause Simulation"), "player_pause", 0 ) );
+ ta->setCheckedState( KGuiItem( i18n("Pause Simulation"), "media-playback-pause", 0 ) );
# endif
#endif
diff --git a/src/textview.cpp b/src/textview.cpp
index 396382f..f763c23 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -73,7 +73,7 @@
//BEGIN Debug Actions
new TDEAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
- new TDEAction( i18n("Interrupt"), "player_pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
+ new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" );
new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" );
|
||
| 9b37da6b | 2014-10-13 20:11:04 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/ktechlab |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||