| 642b172d | 2014-10-12 17:51:17 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M kamera/kcontrol/kamera.cpp M kdvi/fontprogress.cpp M kooka/kooka.cpp M kpdf/ui/presentationwidget.cpp M kruler/klineal.cpp M ksvg/plugin/ksvg_plugin.cpp M kviewshell/searchWidget.cpp |
||
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 8a127b8..0fc9c22 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -135,7 +135,7 @@
act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
- act = new TDEAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
+ act = new TDEAction(i18n("Cancel"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
act->setEnabled(false);
act->plug(m_toolbar);
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index 7b7b8f3..23bae48 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -30,7 +30,7 @@
{
setCursor( TQCursor( 3 ) );
- setButtonCancel(KGuiItem(i18n("Abort"), "stop", abortTip));
+ setButtonCancel(KGuiItem(i18n("Abort"), "process-stop", abortTip));
if (helpIndex.isEmpty() == false) {
setHelp(helpIndex, "kdvi");
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index bdc99ee..06e68f5 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -164,7 +164,7 @@
#ifdef TQICONSET_HONOUR_ON_OFF
/* The Toggleaction does not seem to handle the on/off icon from TQIconSet */
TQIconSet lockSet;
- lockSet.setPixmap(BarIcon("lock") , TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On );
+ lockSet.setPixmap(BarIcon("system-lock-screen") , TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On );
lockSet.setPixmap(BarIcon("unlock"), TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off);
act = new TDEToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z,
actionCollection(), "keepZoom" );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index a21bb49..6dfd2a9 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -309,7 +309,7 @@
m_topBar->setMovingEnabled( false );
m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) );
m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ) );
- m_topBar->insertButton( "exit", 1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) );
+ m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) );
m_topBar->setGeometry( 0, 0, m_width, 32 + 10 );
m_topBar->alignItemRight( 1 );
m_topBar->hide();
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index a4d7e19..9bdac1a 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -164,7 +164,7 @@
mMenu->insertSeparator();
mMenu->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), helpMenu());
mMenu->insertSeparator();
- mMenu->insertItem(SmallIcon( "exit" ), KStdGuiItem::quit().text(), kapp, TQT_SLOT(quit()), CTRL+Key_Q);
+ mMenu->insertItem(SmallIcon( "system-log-out" ), KStdGuiItem::quit().text(), kapp, TQT_SLOT(quit()), CTRL+Key_Q);
mLastClickPos = geometry().topLeft()+TQPoint(width()/2, height()/2);
}
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 6f79a96..cd94223 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -115,7 +115,7 @@
ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset");
- ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims");
+ ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims");
ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "document2", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source");
ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "document2", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory");
ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index 4387b07..a753ec4 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -46,7 +46,7 @@
layout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
stopButton = new TQPushButton(this, "stopButton");
- stopButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("stop", TDEIcon::Small, TDEIcon::SizeSmall));
+ stopButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("process-stop", TDEIcon::Small, TDEIcon::SizeSmall));
layout->addWidget(stopButton);
searchLabel = new TQLabel(this, "searchLabel");
|
||
| 9d92ddd4 | 2014-10-12 17:56:50 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics |
||
|
M cmake M kamera/pics/CMakeLists.txt M kamera/pics/Makefile.am |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c diff --git a/kamera/pics/CMakeLists.txt b/kamera/pics/CMakeLists.txt index b42c741..34b473a 100644 --- a/kamera/pics/CMakeLists.txt +++ b/kamera/pics/CMakeLists.txt @@ -9,5 +9,5 @@ # ################################################# -tde_install_icons( camera ) +tde_install_icons( camera-photo ) tde_install_icons( camera_test ) diff --git a/kamera/pics/Makefile.am b/kamera/pics/Makefile.am index b74ac1c..6fb7891 100644 --- a/kamera/pics/Makefile.am +++ b/kamera/pics/Makefile.am @@ -1 +1 @@ -KDE_ICON = camera camera_test +KDE_ICON = camera-photo camera_test |
||