aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/General/scrobbler/scrobbler.cpp7
-rw-r--r--src/plugins/General/scrobbler/scrobbler.h1
-rw-r--r--src/plugins/General/scrobbler/settingsdialog.cpp7
-rw-r--r--src/plugins/General/scrobbler/settingsdialog.ui82
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts14
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts12
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts11
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts14
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts14
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts14
-rw-r--r--src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts14
11 files changed, 132 insertions, 58 deletions
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index e5e92415c..38210b8a7 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -32,7 +32,7 @@
#include "scrobbler.h"
-#define SCROBBLER_HS_URL "post.audioscrobbler.com"
+//#define SCROBBLER_HS_URL "post.audioscrobbler.com"
#define PROTOCOL_VER "1.2"
#define CLIENT_ID "qmm"
#define CLIENT_VER "0.2"
@@ -42,12 +42,13 @@ Scrobbler::Scrobbler(QObject *parent)
: General(parent)
{
m_http = new QHttp(this);
- m_http->setHost(SCROBBLER_HS_URL, 80);
+ m_http->setHost(m_server, 80);
m_state = Qmmp::Stopped;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("Scrobbler");
m_login = settings.value("login").toString();
m_passw = settings.value("password").toString();
+ m_server = settings.value("server", "post.audioscrobbler.com").toString();
settings.endGroup();
//load global proxy settings
if (Qmmp::useProxy())
@@ -311,7 +312,7 @@ void Scrobbler::handshake()
.arg(QString(auth));
qDebug("Scrobbler: request url: %s",qPrintable(url));
- m_http->setHost(SCROBBLER_HS_URL, 80);
+ m_http->setHost(m_server, 80);
m_handshakeid = m_http->get(url);
}
diff --git a/src/plugins/General/scrobbler/scrobbler.h b/src/plugins/General/scrobbler/scrobbler.h
index 8e831ef7e..6a6158509 100644
--- a/src/plugins/General/scrobbler/scrobbler.h
+++ b/src/plugins/General/scrobbler/scrobbler.h
@@ -100,6 +100,7 @@ private:
int m_notificationid;
QByteArray m_array;
bool m_disabled;
+ QString m_server;
};
diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp
index 9e0e8f69f..f1f934e58 100644
--- a/src/plugins/General/scrobbler/settingsdialog.cpp
+++ b/src/plugins/General/scrobbler/settingsdialog.cpp
@@ -31,7 +31,13 @@ SettingsDialog::SettingsDialog(QWidget *parent)
settings.beginGroup("Scrobbler");
ui.userLineEdit->setText(settings.value("login").toString());
ui.passwordLineEdit->setText(settings.value("password").toString());
+ ui.serviceComboBox->addItem ("last.fm", "post.audioscrobbler.com");
+ ui.serviceComboBox->addItem ("libre.fm", "turtle.libre.fm");
+ int i = ui.serviceComboBox->findData(settings.value("server", "post.audioscrobbler.com").toString());
+ if(i >= 0)
+ ui.serviceComboBox->setCurrentIndex (i);
settings.endGroup();
+
}
@@ -44,6 +50,7 @@ void SettingsDialog::accept()
settings.beginGroup("Scrobbler");
settings.setValue("login",ui.userLineEdit->text());
settings.setValue("password",ui.passwordLineEdit->text());
+ settings.setValue("server", ui.serviceComboBox->itemData(ui.serviceComboBox->currentIndex()));
settings.endGroup();
QDialog::accept();
}
diff --git a/src/plugins/General/scrobbler/settingsdialog.ui b/src/plugins/General/scrobbler/settingsdialog.ui
index 90d2fa481..6b751b952 100644
--- a/src/plugins/General/scrobbler/settingsdialog.ui
+++ b/src/plugins/General/scrobbler/settingsdialog.ui
@@ -1,50 +1,76 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="SettingsDialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>250</width>
- <height>101</height>
+ <width>265</width>
+ <height>121</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Scrobbler Plugin Settings</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>6</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Service:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="serviceComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>User name:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="userLineEdit" />
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="userLineEdit"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Password:</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="passwordLineEdit" >
- <property name="echoMode" >
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item row="3" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>136</width>
<height>18</height>
@@ -53,8 +79,8 @@
</spacer>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
@@ -71,11 +97,11 @@
<receiver>SettingsDialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>156</x>
<y>77</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>16</x>
<y>69</y>
</hint>
@@ -87,11 +113,11 @@
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>216</x>
<y>81</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>75</x>
<y>81</y>
</hint>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts
index 1793f7613..f94d96943 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="cs">
+<!DOCTYPE TS>
+<TS version="2.0" language="cs">
<context>
<name>ScrobblerFactory</name>
<message>
@@ -26,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Nastavení modulu Scrobbler</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>Uživatelské jméno:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>Heslo:</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts
index f45de5665..a0e848be0 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="de">
-<defaultcodec></defaultcodec>
<context>
<name>ScrobblerFactory</name>
<message>
@@ -28,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Einstellungen des Scrobbler-Plugins</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>Benutzername:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts
index 5bab430c4..288d68ba0 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts
@@ -27,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Ustawienia wtyczki Scrobbler</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>Nazwa użytkownika:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>Hasło:</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
index 2451035bc..2d49d9c15 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ru">
+<!DOCTYPE TS>
+<TS version="2.0" language="ru">
<context>
<name>ScrobblerFactory</name>
<message>
@@ -26,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Настройки модуля scrobbler</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation>Сервис:</translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>Имя пользователя:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>Пароль:</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts
index 4b1d97fb8..f288c65fa 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="uk">
+<!DOCTYPE TS>
+<TS version="2.0" language="uk">
<context>
<name>ScrobblerFactory</name>
<message>
@@ -26,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Налаштування модуля scrobbler</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>Ім&apos;я користувача:</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>Пароль:</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts
index eda1a26a5..a79a971f8 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="zh_CN">
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
<context>
<name>ScrobblerFactory</name>
<message>
@@ -26,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Scrobbler 插件设置</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>用户名：</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>密码：</translation>
</message>
diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts
index 8cd34e54f..ed102a957 100644
--- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts
+++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="zh_TW">
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_TW">
<context>
<name>ScrobblerFactory</name>
<message>
@@ -26,17 +27,22 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.ui" line="13"/>
+ <location filename="../settingsdialog.ui" line="14"/>
<source>Scrobbler Plugin Settings</source>
<translation>Scrobbler 插件設定</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="19"/>
+ <location filename="../settingsdialog.ui" line="35"/>
+ <source>Service:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="45"/>
<source>User name:</source>
<translation>用戶名：</translation>
</message>
<message>
- <location filename="../settingsdialog.ui" line="29"/>
+ <location filename="../settingsdialog.ui" line="55"/>
<source>Password:</source>
<translation>密碼：</translation>
</message>
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 22:34:28 +0000