aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-02-27 11:47:42 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-02-27 11:47:42 +0000
commitbd16af99a8475c3847cad3f8036c25ae35a7f66d (patch)
treed79d335de0bd0e03f17d2831b5ea71f34d8a3246
parent2674c40dcca4382c42572b1388f6d83a787c59dd (diff)
downloadqmmp-bd16af99a8475c3847cad3f8036c25ae35a7f66d.tar.gz
qmmp-bd16af99a8475c3847cad3f8036c25ae35a7f66d.tar.bz2
qmmp-bd16af99a8475c3847cad3f8036c25ae35a7f66d.zip
stream browser: added filter
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2641 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/General/streambrowser/streamwindow.cpp18
-rw-r--r--src/plugins/General/streambrowser/streamwindow.h3
-rw-r--r--src/plugins/General/streambrowser/streamwindow.ui34
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_pl.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts26
-rw-r--r--src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts26
-rw-r--r--src/qmmpui/jumptotrackdialog.cpp2
17 files changed, 277 insertions, 118 deletions
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index 4dbf86579..f893467fc 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -24,6 +24,7 @@
#include <QUrl>
#include <QRegExp>
#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
#include <QSettings>
#include <QDir>
#include <QMessageBox>
@@ -45,13 +46,18 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent)
ui.addPushButton->setIcon(QIcon::fromTheme("list-add"));
ui.updatePushButton->setIcon(QIcon::fromTheme("view-refresh"));
-
m_icecastModel = new QStandardItemModel(this);
m_icecastModel->setHorizontalHeaderLabels(QStringList() << tr("Name")
<< tr("Genre")
<< tr("Bitrate")
<< tr("Format"));
- ui.icecastTableView->setModel(m_icecastModel);
+ m_filterModel = new QSortFilterProxyModel(this);
+ m_filterModel->setSourceModel(m_icecastModel);
+ m_filterModel->setDynamicSortFilter(true);
+ m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
+
+ ui.icecastTableView->setModel(m_filterModel);
ui.icecastTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height());
ui.icecastTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed);
ui.icecastTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -132,12 +138,18 @@ void StreamWindow::on_addPushButton_clicked()
QStringList urls;
foreach(QModelIndex index, indexes)
{
- urls.append(m_icecastModel->item(index.row(),0)->data().toString());
+ QModelIndex source_index = m_filterModel->mapToSource(index);
+ urls.append(m_icecastModel->item(source_index.row(),0)->data().toString());
}
urls.removeDuplicates();
PlayListManager::instance()->add(urls);
}
+void StreamWindow::on_filterLineEdit_textChanged(const QString &text)
+{
+ m_filterModel->setFilterFixedString(text);
+}
+
void StreamWindow::closeEvent(QCloseEvent *)
{
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/plugins/General/streambrowser/streamwindow.h b/src/plugins/General/streambrowser/streamwindow.h
index 3bd0e69e7..b33e6f36f 100644
--- a/src/plugins/General/streambrowser/streamwindow.h
+++ b/src/plugins/General/streambrowser/streamwindow.h
@@ -26,6 +26,7 @@
class QNetworkAccessManager;
class QNetworkReply;
class QStandardItemModel;
+class QSortFilterProxyModel;
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
@@ -42,6 +43,7 @@ private slots:
void showText(QNetworkReply *reply);
void on_updatePushButton_clicked();
void on_addPushButton_clicked();
+ void on_filterLineEdit_textChanged(const QString &text);
private:
void closeEvent(QCloseEvent *);
@@ -51,6 +53,7 @@ private:
QNetworkReply *m_requestReply;
QString m_artist, m_title;
QStandardItemModel *m_icecastModel;
+ QSortFilterProxyModel *m_filterModel;
};
#endif
diff --git a/src/plugins/General/streambrowser/streamwindow.ui b/src/plugins/General/streambrowser/streamwindow.ui
index fc8c8dad7..e86e0f1e7 100644
--- a/src/plugins/General/streambrowser/streamwindow.ui
+++ b/src/plugins/General/streambrowser/streamwindow.ui
@@ -24,6 +24,20 @@
<number>6</number>
</property>
<item row="0" column="0" colspan="4">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Filter:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="filterLineEdit"/>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" colspan="4">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
@@ -82,34 +96,34 @@
</widget>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QPushButton" name="addPushButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QPushButton" name="updatePushButton">
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="standardButtons">
- <set>QDialogButtonBox::Close</set>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
+ <item row="2" column="2">
<widget class="QLabel" name="statusLabel">
<property name="text">
<string notr="true">?</string>
</property>
</widget>
</item>
+ <item row="2" column="3">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts
index c82c66426..178f0a122 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Hotovo</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Chyba</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Příjímám</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts
index a655c2adb..7f612d5ea 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Fertig</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Daten werden empfangen</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts
index 374de4cf7..483b595cb 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Hecho</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Recibiendo</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts
index 4ba29ba44..e933bb385 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Ricezione</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts
index a53bc9090..d0ccde68e 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">完了</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">事故</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">取得中</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts
index 68cd7d34a..bd2feb375 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Atlikta</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Klaida</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Gaunu</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts
index 15d8de383..13b3f6a1f 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Klaar</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Fout</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Bezig met ontvangen</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl.ts
index 5579bf0af..bff4226d6 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Gotowe</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Błąd</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Pobieranie</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts
index d229fc3fb..3dd38ad19 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation>Обзор потоков</translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation>Обзор потоков</translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation>Фильтр:</translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation>Избранное</translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation>IceCast</translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation>Обновить</translation>
</message>
@@ -85,18 +95,18 @@
<translation>Формат</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation>Готово</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation>Получение</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts
index 30b96f8a5..9dff74a6b 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Alınıyor</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts
index 754f8e7e0..b65aa9548 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">Готово</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">Помилка</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">Отримання</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts
index 43336e056..81c682e7d 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">完成</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">错误</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">接受</translation>
</message>
diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts
index ae5df051f..3cc29186d 100644
--- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts
+++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts
@@ -8,6 +8,11 @@
<source>Stream Browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../streambrowser.cpp" line="35"/>
+ <source>Ctrl+U</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StreamBrowserFactory</name>
@@ -45,22 +50,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="33"/>
+ <location filename="../streamwindow.ui" line="31"/>
+ <source>Filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../streamwindow.ui" line="47"/>
<source>Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="59"/>
+ <location filename="../streamwindow.ui" line="73"/>
<source>IceCast</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="88"/>
+ <location filename="../streamwindow.ui" line="102"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.ui" line="95"/>
+ <location filename="../streamwindow.ui" line="109"/>
<source>Update</source>
<translation type="unfinished"></translation>
</message>
@@ -85,18 +95,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="102"/>
+ <location filename="../streamwindow.cpp" line="108"/>
<source>Done</source>
<translation type="unfinished">完成</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="105"/>
- <location filename="../streamwindow.cpp" line="106"/>
+ <location filename="../streamwindow.cpp" line="111"/>
+ <location filename="../streamwindow.cpp" line="112"/>
<source>Error</source>
<translation type="unfinished">錯誤</translation>
</message>
<message>
- <location filename="../streamwindow.cpp" line="125"/>
+ <location filename="../streamwindow.cpp" line="131"/>
<source>Receiving</source>
<translation type="unfinished">接受</translation>
</message>
diff --git a/src/qmmpui/jumptotrackdialog.cpp b/src/qmmpui/jumptotrackdialog.cpp
index 7c4273394..ffc1de231 100644
--- a/src/qmmpui/jumptotrackdialog.cpp
+++ b/src/qmmpui/jumptotrackdialog.cpp
@@ -38,7 +38,7 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListModel *model, QWidget* parent)
m_pl_manager = PlayListManager::instance();
m_listModel = new QStringListModel(this);
- m_proxyModel = new QSortFilterProxyModel;
+ m_proxyModel = new QSortFilterProxyModel(this);
m_proxyModel->setDynamicSortFilter(true);
m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
m_proxyModel->setSourceModel(m_listModel);