aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-20 07:22:50 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-20 07:22:50 +0000
commit2eff41971d3776c7c4ac1ea9fa9a6f5a4f1513ab (patch)
tree82cb2228dd4aa5f9cdc0985ad5d6c6a7ce5947f6
parentbfe01d737226a5034010bc3db19b99c46d062387 (diff)
downloadqmmp-2eff41971d3776c7c4ac1ea9fa9a6f5a4f1513ab.tar.gz
qmmp-2eff41971d3776c7c4ac1ea9fa9a6f5a4f1513ab.tar.bz2
qmmp-2eff41971d3776c7c4ac1ea9fa9a6f5a4f1513ab.zip
improved kde4 notification (added embedded covers support and templates)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1634 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/General/kdenotify/kdenotify.cpp59
-rw-r--r--src/plugins/General/kdenotify/kdenotify.h6
-rw-r--r--src/plugins/General/kdenotify/settingsdialog.cpp14
-rw-r--r--src/plugins/General/kdenotify/settingsdialog.h6
-rw-r--r--src/plugins/General/kdenotify/settingsdialog.ui53
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts28
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts26
-rw-r--r--src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts26
15 files changed, 218 insertions, 182 deletions
diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp
index 419189f3a..af8e87db6 100644
--- a/src/plugins/General/kdenotify/kdenotify.cpp
+++ b/src/plugins/General/kdenotify/kdenotify.cpp
@@ -27,7 +27,7 @@
#include <QDebug>
#include <QTimer>
#include <QImage>
-
+#include <qmmpui/metadataformatter.h>
#include <qmmp/soundcore.h>
#include <qmmp/metadatamanager.h>
#include "kdenotify.h"
@@ -35,12 +35,13 @@
KdeNotify::KdeNotify(QObject *parent) : General(parent),m_UseFreedesktopSpec(false)
{
notifier = new QDBusInterface("org.kde.VisualNotifications",
- "/VisualNotifications", "org.kde.VisualNotifications");
+ "/VisualNotifications", "org.kde.VisualNotifications",
+ QDBusConnection::sessionBus(), this);
if(notifier->lastError().type() != QDBusError::NoError)
{
delete(notifier);
qWarning() << "KdeNotify: unable to create dbus interface."
- << "Have you got KDE SC 4.4 or newer? Lets try...";
+ << "Have you got KDE SC 4.4 or newer? Lets try...";
notifier = new QDBusInterface("org.freedesktop.Notifications",
"/org/freedesktop/Notifications","org.freedesktop.Notifications");
@@ -58,6 +59,8 @@ KdeNotify::KdeNotify(QObject *parent) : General(parent),m_UseFreedesktopSpec(fal
settings.beginGroup("Kde_Notifier");
m_NotifyDelay = settings.value("notify_delay",10000).toInt();
m_ShowCovers = settings.value("show_covers",true).toBool();
+ m_template = settings.value("template", DEFAULT_TEMPLATE).toString();
+ m_template.remove("\n");
settings.endGroup();
QTimer *timer = new QTimer(this);
@@ -71,7 +74,6 @@ KdeNotify::~KdeNotify()
{
QDir dir(QDir::home());
dir.remove(m_ConfigDir + "/cover.jpg");
- delete notifier;
}
QString KdeNotify::totalTimeString()
@@ -80,8 +82,8 @@ QString KdeNotify::totalTimeString()
if(time >= 3600)
{
- return QString("%1:%2:%3").arg(time/3600,2,10,QChar('0')).arg(time%3600/60,2,10,QChar('0'))
- .arg(time%60,2,10,QChar('0'));
+ return QString("%1:%2:%3").arg(time/3600,2,10,QChar('0')).arg(time%3600/60,2,10,QChar('0'))
+ .arg(time%60,2,10,QChar('0'));
}
return QString("%1:%2").arg(time/60,2,10,QChar('0')).arg(time%60,2,10,QChar('0'));
}
@@ -91,14 +93,9 @@ QList<QVariant> KdeNotify::prepareNotification()
SoundCore *core = SoundCore::instance();
if(core->metaData(Qmmp::URL).isEmpty()) //prevent show empty notification
{
- return QList<QVariant>();
+ return QList<QVariant>();
}
QList<QVariant> args;
- QString body(""); //metadata set
- QString title(core->metaData(Qmmp::TITLE));
- QString artist(core->metaData(Qmmp::ARTIST));
- QString album(core->metaData(Qmmp::ALBUM));
-
args.append("Qmmp"); //app-name
args.append(0U); //replaces-id
if(!m_UseFreedesktopSpec)
@@ -106,36 +103,24 @@ QList<QVariant> KdeNotify::prepareNotification()
args.append(m_ConfigDir + "/app_icon.png"); //app-icon(path to icon on disk)
args.append(tr("Qmmp now playing:")); //summary (notification title)
- if(title.isEmpty())
- {
- title = QFileInfo(core->metaData(Qmmp::URL)).completeBaseName();
- }
- body.append("<b>" + title + "</b> (" + totalTimeString() +")<br>");
+ MetaDataFormatter f(m_template);
+ QString body = f.parse(core->metaData(), core->totalTime()/1000);
- if(!artist.isEmpty())
+ QString coverPath;
+ if(m_ShowCovers)
{
- body.append(tr("by ") + artist + "<br>");
+ QPixmap cover = MetaDataManager::instance()->instance()->getCover(core->metaData(Qmmp::URL));
+ if(!cover.isNull())
+ {
+ coverPath = m_ConfigDir + "/cover.jpg";
+ cover.scaled(100,100,Qt::IgnoreAspectRatio,Qt::SmoothTransformation).save(coverPath);
+ }
}
+ if(coverPath.isEmpty())
+ coverPath = m_ConfigDir + "/empty_cover.png";
- if(!album.isEmpty())
- {
- body.append(tr("on ") + album);
- }
QString nBody;
-
- QString coverPath = MetaDataManager::instance()->getCoverPath(core->metaData(Qmmp::URL));
- if(!coverPath.isEmpty() && m_ShowCovers)
- {
- QImage image(coverPath);
- image.scaled(100,100,Qt::IgnoreAspectRatio,Qt::SmoothTransformation).save(m_ConfigDir + "/cover.jpg","JPG");
- coverPath = m_ConfigDir + "/cover.jpg";
- }
- else if(coverPath.isEmpty() || !m_ShowCovers)
- {
- coverPath = m_ConfigDir + "/empty_cover.png";
- }
-
nBody.append("<table padding=\"3px\"><tr><td width=\"80px\" height=\"80px\" padding=\"3px\">");
nBody.append("<img height=\"80\" width=\"80\" src=\"%1\"></td><td width=\"10\"></td><td>%2</td></tr><table>");
nBody = nBody.arg(coverPath,body);
@@ -152,5 +137,5 @@ void KdeNotify::showMetaData()
{
QList<QVariant> n = prepareNotification();
if(!n.isEmpty())
- notifier->callWithArgumentList(QDBus::NoBlock,"Notify",n);
+ notifier->callWithArgumentList(QDBus::NoBlock,"Notify",n);
}
diff --git a/src/plugins/General/kdenotify/kdenotify.h b/src/plugins/General/kdenotify/kdenotify.h
index 58317d61d..e928c27ab 100644
--- a/src/plugins/General/kdenotify/kdenotify.h
+++ b/src/plugins/General/kdenotify/kdenotify.h
@@ -27,6 +27,8 @@
#include "qmmpui/general.h"
#include "qmmp/qmmp.h"
+#define DEFAULT_TEMPLATE "<b>%if(%t,%t,%f)</b>\n%if(%p,<br>%p,)\n%if(%a,<br>%a,)\n%if(%l,<br><b>%l</b>,)"
+
class QDBusInterface;
class KdeNotify : public General
@@ -43,11 +45,11 @@ private:
int m_NotifyDelay;
bool m_ShowCovers;
bool m_UseFreedesktopSpec;
+ QString m_template;
+
private slots:
void showMetaData();
QString totalTimeString();
-
-
};
#endif // KDENOTIFY_H
diff --git a/src/plugins/General/kdenotify/settingsdialog.cpp b/src/plugins/General/kdenotify/settingsdialog.cpp
index f1acc18e7..7bc7399bf 100644
--- a/src/plugins/General/kdenotify/settingsdialog.cpp
+++ b/src/plugins/General/kdenotify/settingsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Artur Guzik *
+ * Copyright (C) 2009-2010 by Artur Guzik *
* a.guzik88@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -20,7 +20,9 @@
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
+#include "kdenotify.h"
#include <qmmp/qmmp.h>
+#include <qmmpui/templateeditor.h>
#include <QSettings>
@@ -34,6 +36,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
settings.beginGroup("Kde_Notifier");
ui->kNotifyDelaySpinBox->setValue(settings.value("notify_delay",10000).toInt());
ui->showCoversCheckBox->setChecked(settings.value("show_covers",true).toBool());
+ m_template = settings.value("template", DEFAULT_TEMPLATE).toString();
settings.endGroup();
}
@@ -48,6 +51,7 @@ void SettingsDialog::accept()
settings.beginGroup("Kde_Notifier");
settings.setValue("notify_delay",ui->kNotifyDelaySpinBox->value());
settings.setValue("show_covers",ui->showCoversCheckBox->isChecked());
+ settings.setValue("template",m_template);
settings.endGroup();
QDialog::accept();
}
@@ -63,3 +67,11 @@ void SettingsDialog::changeEvent(QEvent *e)
break;
}
}
+
+void SettingsDialog::on_templateButton_clicked()
+{
+ QString t = TemplateEditor::getTemplate(this, tr("Notification Template"), m_template,
+ DEFAULT_TEMPLATE);
+ if(!t.isEmpty())
+ m_template = t;
+}
diff --git a/src/plugins/General/kdenotify/settingsdialog.h b/src/plugins/General/kdenotify/settingsdialog.h
index 07e7669cd..7e0f8d4a6 100644
--- a/src/plugins/General/kdenotify/settingsdialog.h
+++ b/src/plugins/General/kdenotify/settingsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Artur Guzik *
+ * Copyright (C) 2009-2010 by Artur Guzik *
* a.guzik88@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -38,11 +38,15 @@ public:
public slots:
virtual void accept();
+private slots:
+ virtual void on_templateButton_clicked();
+
protected:
void changeEvent(QEvent *e);
private:
Ui::SettingsDialog *ui;
+ QString m_template;
};
#endif // SETTINGSDIALOG_H
diff --git a/src/plugins/General/kdenotify/settingsdialog.ui b/src/plugins/General/kdenotify/settingsdialog.ui
index 0f7ec7f4f..67785333d 100644
--- a/src/plugins/General/kdenotify/settingsdialog.ui
+++ b/src/plugins/General/kdenotify/settingsdialog.ui
@@ -6,14 +6,23 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>104</height>
+ <width>296</width>
+ <height>125</height>
</rect>
</property>
<property name="windowTitle">
<string>KDE 4 Notification Plugin Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -31,7 +40,38 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="showCoversCheckBox">
+ <property name="text">
+ <string>Show covers</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="templateButton">
+ <property name="text">
+ <string>Change template</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -41,13 +81,6 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="showCoversCheckBox">
- <property name="text">
- <string>Show covers</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<resources/>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts
index c3205d308..bd8fbd8c8 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Qmmp nyní přehrává:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>- </translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>- </translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation>Nastavení notifikačního modulu pro KDE4</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Prodleva notifikace [ms]:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts
index a35e8c10a..f9ce9c765 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Qmmp spielt zurzeit:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>von</translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>auf</translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation>Einstellungen KDE-4-Benachrichtigungsmodul</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Benachrichtigungsdauer (ms):</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation>Cover anzeigen</translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts
index 2b2fe5a2a..dba21edac 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Qmmp ora in esecuzione:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>di </translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>su </translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation>Impostazioni del plugin di notificazione per KDE 4</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Ritardo notificazione [ms]: </translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation>Mostra copertine</translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts
index d6ea24065..32df41ab7 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Qmmp dabar groja:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -47,14 +37,24 @@
<translation>KDE 4 pranešimų įskiepio nustatymai</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Pranešimo užlaikymas [ms]:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts
index d464615aa..a975d06d8 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Qmmp teraz odtwarza:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>przez </translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>na </translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -47,14 +37,24 @@
<translation>Ustawienia wtyczki Powiadamianie KDE 4</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Czas zanikania [ms]:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts
index 6aa6fe232..3bc81f68d 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Играет:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>исполнитель</translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>на</translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -47,14 +37,24 @@
<translation>Настройки модуля уведомлений KDE4</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Задержка уведомления [мс]:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
- <translation type="unfinished"></translation>
+ <translation>Показывать обложки</translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation>Изменить шаблон</translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation>Шаблон уведомления</translation>
</message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts
index 6d4e10a3f..15e7d6c89 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts
index ea4ded89d..71e4c772b 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation>Відтворюється:</translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation>виконавець</translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation>на</translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -47,14 +37,24 @@
<translation>Налаштування модуля повідомлень KDE4</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation>Час показу [мс]:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation>Показати обкладинки</translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts
index 6d4e10a3f..15e7d6c89 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts
index 6d4e10a3f..15e7d6c89 100644
--- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts
+++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts
@@ -4,20 +4,10 @@
<context>
<name>KdeNotify</name>
<message>
- <location filename="../kdenotify.cpp" line="107"/>
+ <location filename="../kdenotify.cpp" line="104"/>
<source>Qmmp now playing:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../kdenotify.cpp" line="117"/>
- <source>by </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../kdenotify.cpp" line="122"/>
- <source>on </source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KdeNotifyFactory</name>
@@ -46,14 +36,24 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="20"/>
+ <location filename="../settingsdialog.ui" line="29"/>
<source>Notification delay [ms]:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="47"/>
+ <location filename="../settingsdialog.ui" line="46"/>
<source>Show covers</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="55"/>
+ <source>Change template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.cpp" line="73"/>
+ <source>Notification Template</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>