From 952ce9c61fce37ad998892cdb75987c806aeeb2e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 12 Oct 2014 17:47:40 -0500 Subject: [PATCH] Bring stop, lock, exit, and run icons into XDG compliance --- digikam/digikam/scanlib.cpp | 2 +- digikam/imageplugins/adjustlevels/adjustlevels.cpp | 2 +- digikam/imageplugins/adjustlevels/adjustlevelstool.cpp | 2 +- digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp | 2 +- digikam/imageplugins/whitebalance/whitebalancetool.cpp | 2 +- digikam/utilities/cameragui/cameraiconitem.cpp | 2 +- digikam/utilities/cameragui/cameraui.cpp | 2 +- digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp | 2 +- digikam/utilities/slideshow/toolbar.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 92bc395..14781b7 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -94,7 +94,7 @@ void ScanLib::startScan() { struct timeval tv1, tv2; TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon( - "run", TDEIcon::NoGroup, 32); + "system-run", TDEIcon::NoGroup, 32); TQString message = i18n("Finding non-existent Albums"); if (m_splash) m_splash->message(message); diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 930325b..5bc4a1a 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -288,7 +288,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); m_autoButton = new TQPushButton(gboxSettings); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); TQWhatsThis::add( m_autoButton, i18n("

If you press this button, all channel levels will be adjusted " "automatically.")); diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index 97a9543..186c873 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -285,7 +285,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); m_autoButton = new TQPushButton(m_gboxSettings->plainPage()); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); TQWhatsThis::add( m_autoButton, i18n("

If you press this button, all channel levels will be adjusted " "automatically.")); diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 2994084..afae201 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -281,7 +281,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) " (E.V): "), gboxSettings); m_mainExposureLabel = new TQLabel(i18n("Main:"), gboxSettings); m_autoAdjustExposure = new TQPushButton(gboxSettings); - m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("run", (TDEIcon::Group)TDEIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); TQWhatsThis::add( m_autoAdjustExposure, i18n("

With this button, you can automatically adjust Exposure " "and Black Point values.")); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 8e6da1e..47aa8a3 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -285,7 +285,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) " (E.V): "), m_gboxSettings->plainPage()); m_mainExposureLabel = new TQLabel(i18n("Main:"), m_gboxSettings->plainPage()); m_autoAdjustExposure = new TQPushButton(m_gboxSettings->plainPage()); - m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("run", (TDEIcon::Group)TDEIcon::Toolbar)); + m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar)); TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); TQWhatsThis::add( m_autoAdjustExposure, i18n("

With this button, you can automatically adjust Exposure " "and Black Point values.")); diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index fade861..ec23e2c 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -154,7 +154,7 @@ void CameraIconViewItem::paintItem() } case GPItemInfo::DownloadStarted: { - downloaded = SmallIcon( "run" ); + downloaded = SmallIcon( "system-run" ); break; } case GPItemInfo::DownloadFailed: diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 61ae725..2fdaa84 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -345,7 +345,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, TQWhatsThis::add( d->losslessFormat, i18n("

Select your preferred lossless image file format to " "convert to. Note: All metadata will be preserved during the conversion.")); - d->advBox->insertItem(CameraUIPriv::ONFLYPAGE, onFlyBox, SmallIconSet("run"), + d->advBox->insertItem(CameraUIPriv::ONFLYPAGE, onFlyBox, SmallIconSet("system-run"), i18n("On the Fly Operations (JPEG only)")); d->rightSidebar->appendTab(d->advBox, SmallIcon("configure"), i18n("Settings")); diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 3e231ec..318c2b7 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -249,7 +249,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) d->abortBtn = new TQPushButton(d->rawdecodingBox); d->abortBtn->setText(i18n("Abort")); - d->abortBtn->setIconSet(SmallIconSet("stop")); + d->abortBtn->setIconSet(SmallIconSet("process-stop")); d->abortBtn->setEnabled(false); TQToolTip::add(d->abortBtn, i18n("Abort the current Raw image preview.")); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 5239b14..6633598 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -79,7 +79,7 @@ ToolBar::ToolBar(TQWidget* parent) d->playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22)); d->prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22)); d->nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22)); - d->stopBtn->setIconSet(loader->loadIcon("stop", TDEIcon::NoGroup, 22)); + d->stopBtn->setIconSet(loader->loadIcon("process-stop", TDEIcon::NoGroup, 22)); lay->addWidget(d->playBtn); lay->addWidget(d->prevBtn);