From d07a2db555ffa5bf06117f16c236c6da2e86e536 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 24 Dec 2010 18:03:08 +0000 Subject: added icons for udisks/hal devices git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2016 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/hal/halplugin.cpp | 14 +++++++++++++- src/plugins/General/hal/translations/hal_plugin_cs.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_de.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_es.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_it.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_ja.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_lt.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_nl.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_pl.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_ru.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_tr.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_uk_UA.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_zh_CN.ts | 4 ++-- src/plugins/General/hal/translations/hal_plugin_zh_TW.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_cs.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_de.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_es.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_it.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_ja.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_lt.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_nl.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_pl.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_ru.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_tr.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_uk_UA.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_zh_CN.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_zh_TW.ts | 4 ++-- src/plugins/General/udisks/udisksplugin.cpp | 13 +++++++++++++ 28 files changed, 78 insertions(+), 53 deletions(-) (limited to 'src/plugins/General') diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp index 205fd49b7..7d17b037d 100644 --- a/src/plugins/General/hal/halplugin.cpp +++ b/src/plugins/General/hal/halplugin.cpp @@ -20,7 +20,8 @@ #include #include - +#include +#include #include #include #include @@ -168,6 +169,17 @@ void HalPlugin::updateActions() } action->setText(actionText); action->setData(dev_path); + + if (caps.contains("volume.disc")) + { + if(device->property("volume.fstype").toString() == "iso9660") + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon)); + else + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveCDIcon)); + } + else + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon)); + m_actions->addAction(action); GeneralHandler::instance()->addAction(action, GeneralHandler::TOOLS_MENU); addPath(dev_path); diff --git a/src/plugins/General/hal/translations/hal_plugin_cs.ts b/src/plugins/General/hal/translations/hal_plugin_cs.ts index 0d27139b8..9b9d0a58f 100644 --- a/src/plugins/General/hal/translations/hal_plugin_cs.ts +++ b/src/plugins/General/hal/translations/hal_plugin_cs.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Přidat CD „%1“ - + Add Volume "%1" Přidat svazek „%1“ diff --git a/src/plugins/General/hal/translations/hal_plugin_de.ts b/src/plugins/General/hal/translations/hal_plugin_de.ts index 3f4864ea3..82eb4b199 100644 --- a/src/plugins/General/hal/translations/hal_plugin_de.ts +++ b/src/plugins/General/hal/translations/hal_plugin_de.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" CD „%1“ hinzufügen - + Add Volume "%1" Gerät „%1“ hinzufügen diff --git a/src/plugins/General/hal/translations/hal_plugin_es.ts b/src/plugins/General/hal/translations/hal_plugin_es.ts index 079d78f36..b3aa0a3ba 100644 --- a/src/plugins/General/hal/translations/hal_plugin_es.ts +++ b/src/plugins/General/hal/translations/hal_plugin_es.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Añadir CD "%1" - + Add Volume "%1" Añadir volumen "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_it.ts b/src/plugins/General/hal/translations/hal_plugin_it.ts index 480075d32..dfddc25e8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_it.ts +++ b/src/plugins/General/hal/translations/hal_plugin_it.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Aggiungi CD "%1" - + Add Volume "%1" Aggiungi libreria "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_ja.ts b/src/plugins/General/hal/translations/hal_plugin_ja.ts index 8c0860d20..ee178c8d0 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ja.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ja.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Cd "%1" を追加 - + Add Volume "%1" 量目 "%1" を追加 diff --git a/src/plugins/General/hal/translations/hal_plugin_lt.ts b/src/plugins/General/hal/translations/hal_plugin_lt.ts index 0feaa3374..3ba021f18 100644 --- a/src/plugins/General/hal/translations/hal_plugin_lt.ts +++ b/src/plugins/General/hal/translations/hal_plugin_lt.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Pridėti CD "%1" - + Add Volume "%1" Pridėti tomą "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_nl.ts b/src/plugins/General/hal/translations/hal_plugin_nl.ts index 3166b4ee8..12095d8e8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_nl.ts +++ b/src/plugins/General/hal/translations/hal_plugin_nl.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Voeg CD "%1" toe - + Add Volume "%1" Voeg Station "%1" toe diff --git a/src/plugins/General/hal/translations/hal_plugin_pl.ts b/src/plugins/General/hal/translations/hal_plugin_pl.ts index ecbc1e0de..9a4bcb7ca 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pl.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pl.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Dodaj CD "%1" - + Add Volume "%1" Dodaj urządzenie "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_ru.ts b/src/plugins/General/hal/translations/hal_plugin_ru.ts index a171f86cf..73e1444e2 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ru.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ru.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Добавить CD "%1" - + Add Volume "%1" Добавить том "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_tr.ts b/src/plugins/General/hal/translations/hal_plugin_tr.ts index 5a0507613..f40d338f0 100644 --- a/src/plugins/General/hal/translations/hal_plugin_tr.ts +++ b/src/plugins/General/hal/translations/hal_plugin_tr.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" CD "%1" Ekle - + Add Volume "%1" "%1" Aygıtını Ekle diff --git a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts index b03395f57..0584acdaa 100644 --- a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts +++ b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" Додати CD "%1" - + Add Volume "%1" Додати том "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts index 264040eca..ceacdc389 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts index a997a9591..1a2daa78d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts @@ -37,12 +37,12 @@ HalPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts index 9b755342f..31491ff2b 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Přidat CD „%1“ - + Add Volume "%1" Přidat svazek „%1“ diff --git a/src/plugins/General/udisks/translations/udisks_plugin_de.ts b/src/plugins/General/udisks/translations/udisks_plugin_de.ts index f56d92baf..e1b0bad1b 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_de.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_de.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" CD „%1“ hinzufügen - + Add Volume "%1" Gerät „%1“ hinzufügen diff --git a/src/plugins/General/udisks/translations/udisks_plugin_es.ts b/src/plugins/General/udisks/translations/udisks_plugin_es.ts index a3504ed58..af7275355 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_es.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_es.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Añadir CD "%1" - + Add Volume "%1" Añadir volumen "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_it.ts b/src/plugins/General/udisks/translations/udisks_plugin_it.ts index 592016e2d..35c20d780 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_it.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_it.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Aggiungi CD "%1" - + Add Volume "%1" Aggiungi libreria "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts index 718167d68..b5d6eace7 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" CD "%1" を追加 - + Add Volume "%1" 量目 "%1" を追加 diff --git a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts index f0fc54afb..5bb89e186 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Pridėti CD "%1" - + Add Volume "%1" Pridėti tomą "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts index 5616f54f6..b88402003 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Voeg CD "%1" toe - + Add Volume "%1" Voeg Station "%1" toe diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pl.ts b/src/plugins/General/udisks/translations/udisks_plugin_pl.ts index 51d3e54f6..ca13efffe 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_pl.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_pl.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Dodaj CD "%1" - + Add Volume "%1" Dodaj urządzenie "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts index e91a0b17c..2fe869191 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Добавить CD "%1" - + Add Volume "%1" Добавить том "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts index c1e26b5fc..32e59229e 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" CD "%1" Ekle - + Add Volume "%1" "%1" Aygıtını Ekle diff --git a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts index 9d37e0fd8..becfe7f2e 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" Додати CD "%1" - + Add Volume "%1" Додати том "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts index 705f3a591..0580b4a47 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts index d144806a8..bb21e5e47 100644 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts +++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts @@ -70,12 +70,12 @@ UDisksPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp index fd228319f..471d64a41 100644 --- a/src/plugins/General/udisks/udisksplugin.cpp +++ b/src/plugins/General/udisks/udisksplugin.cpp @@ -20,6 +20,8 @@ #include #include +#include +#include #include #include #include @@ -158,6 +160,17 @@ void UDisksPlugin::updateActions() name = dev_path; actionText = QString(tr("Add Volume \"%1\"")).arg(name); } + + if (device->property("DeviceIsOpticalDisc").toBool()) + { + if(device->property("IdType").toString() == "iso9660") + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon)); + else + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveCDIcon)); + } + else + action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon)); + action->setText(actionText); action->setData(dev_path); m_actions->addAction(action); -- cgit v1.2.3-13-gbd6f