summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-11 18:45:44 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-11 18:45:44 -0500
commit698f1e18f500baa2ab8e01aeb4eb23a36e5e2ab4 (patch)
tree37aa5d102964d1748ff592bdc7c7480ae3a0b3b6
parent14f13fa0f977690a81491bd2bf4c13eaa2f036eb (diff)
downloaddigikam-698f1e18f500baa2ab8e01aeb4eb23a36e5e2ab4.tar.gz
digikam-698f1e18f500baa2ab8e01aeb4eb23a36e5e2ab4.zip
Bring camera icons into XDG compliance
-rw-r--r--digikam/digikam/digikamapp.cpp4
-rw-r--r--digikam/imageplugins/coreplugin/iccprooftool.cpp2
-rw-r--r--digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp2
-rw-r--r--digikam/utilities/cameragui/camerafolderview.h4
-rw-r--r--digikam/utilities/cameragui/camerainfodialog.cpp2
-rw-r--r--digikam/utilities/cameragui/cameraui.cpp2
-rw-r--r--digikam/utilities/setup/setupicc.cpp4
7 files changed, 10 insertions, 10 deletions
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 463d7eb..642214d 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -1480,7 +1480,7 @@ void DigikamApp::slotDownloadImages()
{
TDEAction *cAction = new TDEAction(
i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
- "camera",
+ "camera-photo",
0,
TQT_TQOBJECT(this),
TQT_SLOT(slotDownloadImages()),
@@ -1540,7 +1540,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype)
{
if (!ctype) return;
- TDEAction *cAction = new TDEAction(ctype->title(), "camera", 0,
+ TDEAction *cAction = new TDEAction(ctype->title(), "camera-photo", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()),
actionCollection(),
ctype->title().utf8());
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 3ecc1a8..9c7c3fe 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -286,7 +286,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
//---------- "Input" Page Setup ----------------------------------
- m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile"));
+ m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera-photo"), i18n("Input Profile"));
TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
"Profiles.</p>"));
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index 7a07eee..fb0f8d7 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -272,7 +272,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
//---------- "Input" Page Setup ----------------------------------
- m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile"));
+ m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera-photo"), i18n("Input Profile"));
TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
"Profiles.</p>"));
diff --git a/digikam/utilities/cameragui/camerafolderview.h b/digikam/utilities/cameragui/camerafolderview.h
index 939e9a4..37df132 100644
--- a/digikam/utilities/cameragui/camerafolderview.h
+++ b/digikam/utilities/cameragui/camerafolderview.h
@@ -50,10 +50,10 @@ public:
CameraFolderView(TQWidget* parent);
~CameraFolderView();
- void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera"));
+ void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera-photo"));
void addRootFolder(const TQString& folder, int nbItems, const TQPixmap& pixmap=SmallIcon("folder"));
- CameraFolderItem* addFolder(const TQString& folder, const TQString& subFolder, int nbItems,
+ CameraFolderItem* addFolder(const TQString& folder, const TQString& subFolder, int nbItems,
const TQPixmap& pixmap=SmallIcon("folder"));
CameraFolderItem* findFolder(const TQString& folderPath);
diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp
index f101260..ba565a5 100644
--- a/digikam/utilities/cameragui/camerainfodialog.cpp
+++ b/digikam/utilities/cameragui/camerainfodialog.cpp
@@ -69,7 +69,7 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co
// ----------------------------------------------------------
- TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", TDEIcon::SizeMedium) );
+ TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera-photo", TDEIcon::SizeMedium) );
TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 6e458fd..61ae725 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -451,7 +451,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
TQPushButton *helpButton = actionButton( Help );
d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false);
- d->helpMenu->menu()->insertItem(SmallIcon("camera"), i18n("Camera Information"),
+ d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"),
this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0);
helpButton->setPopup( d->helpMenu->menu() );
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index f76ec24..454fb0e 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@@ -7,7 +7,7 @@
* Description : Color management setup tab.
*
* Copyright (C) 2005-2007 by F.J. Cruz <fj.cruz@supercable.es>
- * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -257,7 +257,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
grid2->addMultiCellWidget(d->infoWorkProfiles, 2, 2, 3, 3);
TQLabel *inIcon = new TQLabel(d->profilesGB);
- inIcon->setPixmap(SmallIcon("camera"));
+ inIcon->setPixmap(SmallIcon("camera-photo"));
TQLabel *inProfiles = new TQLabel(i18n("Input:"), d->profilesGB);
d->inProfilesKC = new SqueezedComboBox(d->profilesGB);
inProfiles->setBuddy(d->inProfilesKC);