8413cb70 | 2014-10-11 18:45:49 | Timothy Pearson |
Bring camera icons into XDG compliance |
||
A kamera/pics/cr16-app-camera-photo.png A kamera/pics/cr16-device-camera-photo.png A kamera/pics/cr22-device-camera-photo.png A kamera/pics/cr22-filesys-camera-photo.png A kamera/pics/cr32-device-camera-photo.png A kamera/pics/cr32-filesys-camera-photo.png M kamera/kcontrol/kamera.cpp R kamera/pics/cr16-app-camera.png R kamera/pics/cr16-device-camera.png R kamera/pics/cr22-device-camera.png R kamera/pics/cr22-filesys-camera.png R kamera/pics/cr32-device-camera.png R kamera/pics/cr32-filesys-camera.png |
||
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 53b1754..8a127b8 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -54,7 +54,7 @@ m_devicePopup = new TDEPopupMenu(this); m_actions = new TDEActionCollection(this); m_config = new KSimpleConfig(KProtocolInfo::config("camera")); - + m_context = gp_context_new(); if (m_context) { @@ -118,7 +118,7 @@ // create actions TDEAction *act; - act = new TDEAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); + act = new TDEAction(i18n("Add"), "camera-photo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); act->setWhatsThis(i18n("Click this button to add a new camera.")); act->plug(m_toolbar); m_toolbar->insertLineSeparator(); @@ -147,7 +147,7 @@ CameraDevicesMap::Iterator it; for (it = m_devices.begin(); it != m_devices.end(); it++) { if (it.data()) { - new TQIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera")); + new TQIconViewItem(m_deviceSel, it.key(), DesktopIcon("camera-photo")); } } slot_deviceSelected(m_deviceSel->currentItem()); diff --git a/kamera/pics/cr16-app-camera-photo.png b/kamera/pics/cr16-app-camera-photo.png new file mode 100644 index 0000000..364167f --- /dev/null +++ b/kamera/pics/cr16-app-camera-photo.png Binary files differ diff --git a/kamera/pics/cr16-app-camera.png b/kamera/pics/cr16-app-camera.png deleted file mode 100644 index 364167f..0000000 --- a/kamera/pics/cr16-app-camera.png +++ /dev/null Binary files differ diff --git a/kamera/pics/cr16-device-camera-photo.png b/kamera/pics/cr16-device-camera-photo.png new file mode 100644 index 0000000..364167f --- /dev/null +++ b/kamera/pics/cr16-device-camera-photo.png Binary files differ diff --git a/kamera/pics/cr16-device-camera.png b/kamera/pics/cr16-device-camera.png deleted file mode 100644 index 364167f..0000000 --- a/kamera/pics/cr16-device-camera.png +++ /dev/null Binary files differ diff --git a/kamera/pics/cr22-device-camera-photo.png b/kamera/pics/cr22-device-camera-photo.png new file mode 100644 index 0000000..745affe --- /dev/null +++ b/kamera/pics/cr22-device-camera-photo.png Binary files differ diff --git a/kamera/pics/cr22-device-camera.png b/kamera/pics/cr22-device-camera.png deleted file mode 100644 index 745affe..0000000 --- a/kamera/pics/cr22-device-camera.png +++ /dev/null Binary files differ diff --git a/kamera/pics/cr22-filesys-camera-photo.png b/kamera/pics/cr22-filesys-camera-photo.png new file mode 100644 index 0000000..745affe --- /dev/null +++ b/kamera/pics/cr22-filesys-camera-photo.png Binary files differ diff --git a/kamera/pics/cr22-filesys-camera.png b/kamera/pics/cr22-filesys-camera.png deleted file mode 100644 index 745affe..0000000 --- a/kamera/pics/cr22-filesys-camera.png +++ /dev/null Binary files differ diff --git a/kamera/pics/cr32-device-camera-photo.png b/kamera/pics/cr32-device-camera-photo.png new file mode 100644 index 0000000..6876fa9 --- /dev/null +++ b/kamera/pics/cr32-device-camera-photo.png Binary files differ diff --git a/kamera/pics/cr32-device-camera.png b/kamera/pics/cr32-device-camera.png deleted file mode 100644 index 6876fa9..0000000 --- a/kamera/pics/cr32-device-camera.png +++ /dev/null Binary files differ diff --git a/kamera/pics/cr32-filesys-camera-photo.png b/kamera/pics/cr32-filesys-camera-photo.png new file mode 100644 index 0000000..6876fa9 --- /dev/null +++ b/kamera/pics/cr32-filesys-camera-photo.png Binary files differ diff --git a/kamera/pics/cr32-filesys-camera.png b/kamera/pics/cr32-filesys-camera.png deleted file mode 100644 index 6876fa9..0000000 --- a/kamera/pics/cr32-filesys-camera.png +++ /dev/null Binary files differ |