TDE
/
digikam
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/digikam
0
0
Fork 0
Code Issues Releases Wiki Activity

Bring camera icons into XDG compliance

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 14f13fa0f9
commit 698f1e18f5
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
digikam/digikam/digikamapp.cpp
Unescape View File

@ -1480,7 +1480,7 @@ void DigikamApp::slotDownloadImages()
{ {
TDEAction *cAction = new TDEAction( TDEAction *cAction = new TDEAction(
i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()), i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
"camera", "camera-photo",
0, 0,
TQT_TQOBJECT(this), TQT_TQOBJECT(this),
TQT_SLOT(slotDownloadImages()), TQT_SLOT(slotDownloadImages()),
@ -1540,7 +1540,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype)
{ {
if (!ctype) return; 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()), TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()),
actionCollection(), actionCollection(),
ctype->title().utf8()); ctype->title().utf8());

2
digikam/imageplugins/coreplugin/iccprooftool.cpp
Unescape View File

@ -286,7 +286,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
//---------- "Input" Page Setup ---------------------------------- //---------- "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 " TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
"Profiles.</p>")); "Profiles.</p>"));

2
digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
Unescape View File

@ -272,7 +272,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
//---------- "Input" Page Setup ---------------------------------- //---------- "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 " TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color "
"Profiles.</p>")); "Profiles.</p>"));

4
digikam/utilities/cameragui/camerafolderview.h
Unescape View File

@ -50,10 +50,10 @@ public:
CameraFolderView(TQWidget* parent); CameraFolderView(TQWidget* parent);
~CameraFolderView(); ~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")); 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")); const TQPixmap& pixmap=SmallIcon("folder"));
CameraFolderItem* findFolder(const TQString& folderPath); CameraFolderItem* findFolder(const TQString& folderPath);

2
digikam/utilities/cameragui/camerainfodialog.cpp
Unescape View File

@ -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 ); TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3); TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);

2
digikam/utilities/cameragui/cameraui.cpp
Unescape View File

@ -451,7 +451,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
TQPushButton *helpButton = actionButton( Help ); TQPushButton *helpButton = actionButton( Help );
d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false); 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); this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0);
helpButton->setPopup( d->helpMenu->menu() ); helpButton->setPopup( d->helpMenu->menu() );

4
digikam/utilities/setup/setupicc.cpp
Unescape View File

@ -7,7 +7,7 @@
* Description : Color management setup tab. * Description : Color management setup tab.
* *
* Copyright (C) 2005-2007 by F.J. Cruz <fj.cruz@supercable.es> * 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 * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General * 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); grid2->addMultiCellWidget(d->infoWorkProfiles, 2, 2, 3, 3);
TQLabel *inIcon = new TQLabel(d->profilesGB); TQLabel *inIcon = new TQLabel(d->profilesGB);
inIcon->setPixmap(SmallIcon("camera")); inIcon->setPixmap(SmallIcon("camera-photo"));
TQLabel *inProfiles = new TQLabel(i18n("Input:"), d->profilesGB); TQLabel *inProfiles = new TQLabel(i18n("Input:"), d->profilesGB);
d->inProfilesKC = new SqueezedComboBox(d->profilesGB); d->inProfilesKC = new SqueezedComboBox(d->profilesGB);
inProfiles->setBuddy(d->inProfilesKC); inProfiles->setBuddy(d->inProfilesKC);

Write Preview
Loading…
Cancel
Save