| 952ce9c6 | 2014-10-12 17:47:40 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M digikam/digikam/scanlib.cpp M digikam/imageplugins/adjustlevels/adjustlevels.cpp M digikam/imageplugins/adjustlevels/adjustlevelstool.cpp M digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp M digikam/imageplugins/whitebalance/whitebalancetool.cpp M digikam/utilities/cameragui/cameraiconitem.cpp M digikam/utilities/cameragui/cameraui.cpp M digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp M digikam/utilities/slideshow/toolbar.cpp |
||
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 @@
{
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 @@
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("<p>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 @@
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("<p>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 @@
" (E.V): </qt>"), 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("<p>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 @@
" (E.V): </qt>"), 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("<p>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 @@
}
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 @@
TQWhatsThis::add( d->losslessFormat, i18n("<p>Select your preferred lossless image file format to "
"convert to. <b>Note:</b> 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 @@
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 @@
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);
|
||
| 23fb399a | 2014-10-12 17:52:37 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/digikam |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||