From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/CMakeLists.txt | 25 ++++++----------------- src/qmmpui/aboutdialog.cpp | 4 ++-- src/qmmpui/aboutdialog_p.h | 4 ++-- src/qmmpui/commandlinemanager.cpp | 4 ++-- src/qmmpui/configdialog.cpp | 2 +- src/qmmpui/detailsdialog.cpp | 2 +- src/qmmpui/images/logo-qmmp.png | Bin 19678 -> 20058 bytes src/qmmpui/playlistparser.cpp | 2 +- src/qmmpui/playlisttask.cpp | 5 +++-- src/qmmpui/qmmpui.pc.in | 2 +- src/qmmpui/qmmpui.pro | 3 +-- src/qmmpui/qtfiledialog.cpp | 4 +++- src/qmmpui/radioitemdelegate.cpp | 4 ++-- src/qmmpui/translations/libqmmpui_bg.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_cs.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_de.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_el.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_en.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_es.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_fi.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_fr.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_gl_ES.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_he.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_hu.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_id.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_it.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_ja.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_kk.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_lt.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_nl.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_pl_PL.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_pt.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_pt_BR.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_ru.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_sk.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_sr_BA.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_sr_RS.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_tr.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_uk_UA.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_zh_CN.ts | 20 +++++++++---------- src/qmmpui/translations/libqmmpui_zh_TW.ts | 20 +++++++++---------- src/qmmpui/uihelper.cpp | 31 +++++------------------------ 42 files changed, 310 insertions(+), 342 deletions(-) (limited to 'src/qmmpui') diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index 1167ebb7c..9142f6fe0 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -1,16 +1,5 @@ project(libqmmpui) -SET(QT_USE_QTNETWORK TRUE) -INCLUDE(FindQt4) -include(${QT_USE_FILE}) - -# qt lib -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # libqmmp @@ -124,22 +113,20 @@ SET(libqmmpui_UIS forms/columneditor.ui ) -QT4_WRAP_UI(libqmmpui_UIS_H ${libqmmpui_UIS}) +QT5_WRAP_UI(libqmmpui_UIS_H ${libqmmpui_UIS}) -QT4_ADD_RESOURCES(libqmmpui_RCC_SRCS translations/libqmmpui_locales.qrc txt/txt.qrc images/qmmpui_images.qrc) +QT5_ADD_RESOURCES(libqmmpui_RCC_SRCS translations/libqmmpui_locales.qrc txt/txt.qrc images/qmmpui_images.qrc) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_RCC_SRCS} ${libqmmpui_UIS_H} ${libqmmpui_HDRS}) -target_link_libraries(qmmpui ${QT_LIBRARIES} libqmmp) +target_link_libraries(qmmpui Qt5::Widgets Qt5::Network -lqmmp) add_dependencies(qmmpui libqmmp) SET_TARGET_PROPERTIES(qmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION}) install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${LIB_DIR}) -IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin) - install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) +install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc DESTINATION ${LIB_DIR}/pkgconfig) -ENDIF() +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc DESTINATION ${LIB_DIR}/pkgconfig) diff --git a/src/qmmpui/aboutdialog.cpp b/src/qmmpui/aboutdialog.cpp index ceaec2678..723e259b5 100644 --- a/src/qmmpui/aboutdialog.cpp +++ b/src/qmmpui/aboutdialog.cpp @@ -34,8 +34,8 @@ #include "aboutdialog_p.h" -AboutDialog::AboutDialog(QWidget* parent, Qt::WFlags fl) - : QDialog( parent, fl ) +AboutDialog::AboutDialog(QWidget* parent) + : QDialog(parent) { setupUi(this); setAttribute(Qt::WA_QuitOnClose, false); diff --git a/src/qmmpui/aboutdialog_p.h b/src/qmmpui/aboutdialog_p.h index 5004cf2c3..3857c48e6 100644 --- a/src/qmmpui/aboutdialog_p.h +++ b/src/qmmpui/aboutdialog_p.h @@ -1,5 +1,5 @@ /*************************************************************************** -* Copyright (C) 2006-2013 by Ilya Kotov * +* Copyright (C) 2006-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,7 +33,7 @@ class AboutDialog : public QDialog, private Ui::AboutDialog { Q_OBJECT public: - AboutDialog(QWidget* parent = 0, Qt::WFlags fl = 0 ); + AboutDialog(QWidget* parent = 0); ~AboutDialog(); private: diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index c8292f786..e50baaa9b 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -18,11 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index c38902ce3..de0e271f3 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -59,7 +59,7 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) m_ui->preferencesButton->setEnabled(false); m_ui->informationButton->setEnabled(false); m_ui->treeWidget->setItemDelegate(new RadioItemDelegate(this)); - m_ui->treeWidget->header()->setMovable(false); + m_ui->treeWidget->header()->setSectionsMovable(false); connect (this, SIGNAL(rejected()),SLOT(saveSettings())); m_ui->replayGainModeComboBox->addItem (tr("Track"), QmmpSettings::REPLAYGAIN_TRACK); m_ui->replayGainModeComboBox->addItem (tr("Album"), QmmpSettings::REPLAYGAIN_ALBUM); diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index dbeaa57a5..91d5fa23b 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -71,7 +71,7 @@ void DetailsDialog:: on_directoryButton_clicked() } else return; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 QProcess::execute("xdg-open", QStringList() << dir_path); //works with lxde #else QDesktopServices::openUrl(QUrl::fromLocalFile(dir_path)); diff --git a/src/qmmpui/images/logo-qmmp.png b/src/qmmpui/images/logo-qmmp.png index 88923cb57..d977e28ad 100644 Binary files a/src/qmmpui/images/logo-qmmp.png and b/src/qmmpui/images/logo-qmmp.png differ diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index c6cf7a189..4b5dfc1c8 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -85,7 +85,7 @@ PlayListFormat *PlayListParser::findByPath(const QString &filePath) PlayListFormat *PlayListParser::findByUrl(const QUrl &url) { - QString path = url.encodedPath(); + QString path = url.path(QUrl::FullyEncoded); return findByPath(path); } diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index f0ec75ce4..8ca027ade 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "qmmpuisettings.h" #include "metadatahelper_p.h" @@ -308,9 +309,9 @@ void PlayListTask::run() } if(m_reverted) - qStableSort(begin,end,compareGreaterFunc); + std::stable_sort(begin,end,compareGreaterFunc); else - qStableSort(begin,end,compareLessFunc); + std::stable_sort(begin,end,compareLessFunc); //align track list by group name (optimization) if(m_align_groups) diff --git a/src/qmmpui/qmmpui.pc.in b/src/qmmpui/qmmpui.pc.in index 76d87143c..19a82a4d5 100644 --- a/src/qmmpui/qmmpui.pc.in +++ b/src/qmmpui/qmmpui.pc.in @@ -6,6 +6,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include Name: qmmpui Description: qmmp user interface library Version: @QMMP_VERSION@ -Requires: QtCore QtGui QtNetwork qmmp +Requires: Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp Libs: -L${libdir} -lqmmpui Cflags: -I${includedir} diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro index 636371339..7c4ca8132 100644 --- a/src/qmmpui/qmmpui.pro +++ b/src/qmmpui/qmmpui.pro @@ -179,7 +179,6 @@ unix { CONFIG += create_pc create_prl no_install_prl QMAKE_PKGCONFIG_NAME = qmmpui QMAKE_PKGCONFIG_DESCRIPTION = qmmp user interface library - QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork qmmp + QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_DISTCLEAN += -r pkgconfig } diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp index 5a452768c..e81330c60 100644 --- a/src/qmmpui/qtfiledialog.cpp +++ b/src/qmmpui/qtfiledialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2017 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include "qtfiledialog_p.h" @@ -54,6 +55,7 @@ QtFileDialog::~QtFileDialog() QStringList QtFileDialog::exec(QWidget *parent, const QString &dir, FileDialog::Mode mode, const QString &caption, const QString &filter, QString *selectedFilter) { + QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::LanguageChange); //prevents crash when using KDE file dialog QStringList list; if(mode == AddFile) { diff --git a/src/qmmpui/radioitemdelegate.cpp b/src/qmmpui/radioitemdelegate.cpp index d725995f9..992ba7fe8 100644 --- a/src/qmmpui/radioitemdelegate.cpp +++ b/src/qmmpui/radioitemdelegate.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2014 by Ilya Kotov * + * Copyright (C) 2012-2016 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,7 +32,7 @@ void RadioItemDelegate::paint(QPainter *painter, { if (hasRadioButton(index)) { - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; initStyleOption(&opt, index); diff --git a/src/qmmpui/translations/libqmmpui_bg.ts b/src/qmmpui/translations/libqmmpui_bg.ts index 1842bdfdc..574fd0479 100644 --- a/src/qmmpui/translations/libqmmpui_bg.ts +++ b/src/qmmpui/translations/libqmmpui_bg.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts index 561a4c4d0..76f952725 100644 --- a/src/qmmpui/translations/libqmmpui_cs.ts +++ b/src/qmmpui/translations/libqmmpui_cs.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Souborový dialog Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Všechny podporované formáty - + Select one or more files to open Vyberte jeden či více souborů k otevření - + Select one or more files to play - + Choose a directory Výberte adresář - - + + Playlist Files Seznamy skladeb - + Open Playlist Načíst seznam skladeb - + Save Playlist Uložit seznam skladeb diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts index 2ba931391..ce4bcfe93 100644 --- a/src/qmmpui/translations/libqmmpui_de.ts +++ b/src/qmmpui/translations/libqmmpui_de.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt Datei-Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Alle unterstützten Datenströme - + Select one or more files to open Dateien hinzufügen - + Select one or more files to play Wählen Sie eine oder mehrere Dateien zur Wiedergabe aus - + Choose a directory Verzeichnis wählen - - + + Playlist Files Wiedergabelisten - + Open Playlist Wiedergabeliste öffnen - + Save Playlist Wiedergabeliste speichern diff --git a/src/qmmpui/translations/libqmmpui_el.ts b/src/qmmpui/translations/libqmmpui_el.ts index e83963f1e..f50bdc054 100644 --- a/src/qmmpui/translations/libqmmpui_el.ts +++ b/src/qmmpui/translations/libqmmpui_el.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Διάλογος αρχείων Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Όλα τα υποστηριζόμενα δυφιορρεύματα - + Select one or more files to open Επιλογή ανοίγματος ενός ή περισσοτέρων αρχείων - + Select one or more files to play Επιλογή αναπαραγωγής ενός ή περισσοτέρων αρχείων - + Choose a directory Επιλογή ενός καταλόγου - - + + Playlist Files Αρχεία της λίστα αναπαραγωγής - + Open Playlist Άνοιγμα λίστα αναπαραγωγής - + Save Playlist Αποθήκευση της λίστας αναπαραγωγής diff --git a/src/qmmpui/translations/libqmmpui_en.ts b/src/qmmpui/translations/libqmmpui_en.ts index c28fe121b..d31ff3415 100644 --- a/src/qmmpui/translations/libqmmpui_en.ts +++ b/src/qmmpui/translations/libqmmpui_en.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_es.ts b/src/qmmpui/translations/libqmmpui_es.ts index 028676f3c..aa8f27b0a 100644 --- a/src/qmmpui/translations/libqmmpui_es.ts +++ b/src/qmmpui/translations/libqmmpui_es.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Diálogo de archivos Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Todos los flujos de bits soportados - + Select one or more files to open Seleccione uno o más archivos a abrir - + Select one or more files to play Seleccione uno o más archivos a reproducir - + Choose a directory Elija un directorio - - + + Playlist Files Archivos listas de reproducción - + Open Playlist Abrir lista de reproducción - + Save Playlist Guardar lista de reproducción diff --git a/src/qmmpui/translations/libqmmpui_fi.ts b/src/qmmpui/translations/libqmmpui_fi.ts index d08f38bfe..40e789d0a 100644 --- a/src/qmmpui/translations/libqmmpui_fi.ts +++ b/src/qmmpui/translations/libqmmpui_fi.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt-tiedostoikkuna @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open Valitse yksi tai useampi tiedosto avausta varten - + Select one or more files to play Valitse yksi tai useampi toistettava tiedosto - + Choose a directory Valitse kansio - - + + Playlist Files Soittolistatiedostot - + Open Playlist Avaa soittolista - + Save Playlist Tallenna soittolista diff --git a/src/qmmpui/translations/libqmmpui_fr.ts b/src/qmmpui/translations/libqmmpui_fr.ts index 5e248d01e..ef391a329 100644 --- a/src/qmmpui/translations/libqmmpui_fr.ts +++ b/src/qmmpui/translations/libqmmpui_fr.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Fenêtre de fichier Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Tous les Bitstreams supportés - + Select one or more files to open Sélectionner un fichier ou plus à ouvrir - + Select one or more files to play Sélectionner un fichier ou plus à jouer - + Choose a directory Choisissez un répertoire - - + + Playlist Files Fichiers de playlist - + Open Playlist Ouvrir une playlist - + Save Playlist Sauvegarder la playlist diff --git a/src/qmmpui/translations/libqmmpui_gl_ES.ts b/src/qmmpui/translations/libqmmpui_gl_ES.ts index c965c4537..d7c3abc80 100644 --- a/src/qmmpui/translations/libqmmpui_gl_ES.ts +++ b/src/qmmpui/translations/libqmmpui_gl_ES.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Diálogo de ficheiro Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Tódolos bitstreams soportados - + Select one or more files to open Selecciona un ou máis ficheiros para abrir - + Select one or more files to play Seleccione un ou máis arquivos a reproducir - + Choose a directory Escolla un directorio - - + + Playlist Files Arquivos de lista de reprodución - + Open Playlist Abrir lista de reprodución - + Save Playlist Gardar a lista de reprodución diff --git a/src/qmmpui/translations/libqmmpui_he.ts b/src/qmmpui/translations/libqmmpui_he.ts index 5a1719188..9f5a39f4c 100644 --- a/src/qmmpui/translations/libqmmpui_he.ts +++ b/src/qmmpui/translations/libqmmpui_he.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog דו שיח קובץ Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams כל זרמי הסביות הנתמכים - + Select one or more files to open בחר קובץ אחד או יותר לפתיחה - + Select one or more files to play בחר קובץ אחד או יותר לניגון - + Choose a directory בחר מדור - - + + Playlist Files קבצי רשימת נגינה - + Open Playlist פתח רשימת נגינה - + Save Playlist שמור רשימת נגינה diff --git a/src/qmmpui/translations/libqmmpui_hu.ts b/src/qmmpui/translations/libqmmpui_hu.ts index b68b69d24..7b82d77d0 100644 --- a/src/qmmpui/translations/libqmmpui_hu.ts +++ b/src/qmmpui/translations/libqmmpui_hu.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_id.ts b/src/qmmpui/translations/libqmmpui_id.ts index 19376428d..af7c51454 100644 --- a/src/qmmpui/translations/libqmmpui_id.ts +++ b/src/qmmpui/translations/libqmmpui_id.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Dialog File Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Semua Bitstreams Yang Didukung - + Select one or more files to open Pilih satu atau lebih banyak file untuk buka - + Select one or more files to play Pilih satu atau lebih banyak file untuk play - + Choose a directory Memilih sebuah direktori - - + + Playlist Files File Playlist - + Open Playlist Buka Playlist - + Save Playlist Simpan Playlist diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts index 0e4b9cf08..d569370fa 100644 --- a/src/qmmpui/translations/libqmmpui_it.ts +++ b/src/qmmpui/translations/libqmmpui_it.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Menu brani Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_ja.ts b/src/qmmpui/translations/libqmmpui_ja.ts index 6b05e71be..3e803117c 100644 --- a/src/qmmpui/translations/libqmmpui_ja.ts +++ b/src/qmmpui/translations/libqmmpui_ja.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt ファイルダイアログ @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams サポート対象のすべてのデジタル録音物 - + Select one or more files to open 開きたいファイルを選ぶ (複数可) - + Select one or more files to play 再生したいファイルを 1 つ以上選ぶ - + Choose a directory ディレクトリを選択 - - + + Playlist Files プレイリストファイル - + Open Playlist プレイリストを開く - + Save Playlist プレイリストを保存 diff --git a/src/qmmpui/translations/libqmmpui_kk.ts b/src/qmmpui/translations/libqmmpui_kk.ts index 36dc733bb..ede770a7e 100644 --- a/src/qmmpui/translations/libqmmpui_kk.ts +++ b/src/qmmpui/translations/libqmmpui_kk.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts index 047423b4e..2a40d0621 100644 --- a/src/qmmpui/translations/libqmmpui_lt.ts +++ b/src/qmmpui/translations/libqmmpui_lt.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt bylų langas @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Palaikomi bylų tipai - + Select one or more files to open Pasirinkite vieną ar kelias bylas atvėrimui - + Select one or more files to play Pasirink vieną ar daugiau bylų grojimui - + Choose a directory Pasirinkite aplanką - - + + Playlist Files Grojaraščio bylos - + Open Playlist Atverti grojaraštį - + Save Playlist Išsaugoti grojaraštį diff --git a/src/qmmpui/translations/libqmmpui_nl.ts b/src/qmmpui/translations/libqmmpui_nl.ts index 839dfd8c3..7bbd6f3c5 100644 --- a/src/qmmpui/translations/libqmmpui_nl.ts +++ b/src/qmmpui/translations/libqmmpui_nl.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt Bestandsdialoog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Alle Ondersteunde Bitstromen - + Select one or more files to open Kies één of meerdere bestanden om te openen - + Select one or more files to play Kies één of meerdere bestanden om af te spelen - + Choose a directory Kies een map - - + + Playlist Files Afspeellijst Bestanden - + Open Playlist Open Afspeellijst - + Save Playlist Bewaar Afspeellijst diff --git a/src/qmmpui/translations/libqmmpui_pl_PL.ts b/src/qmmpui/translations/libqmmpui_pl_PL.ts index 696953f61..d514f9aed 100644 --- a/src/qmmpui/translations/libqmmpui_pl_PL.ts +++ b/src/qmmpui/translations/libqmmpui_pl_PL.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Okno dialogowe QT @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Wszystkie wspierane formaty - + Select one or more files to open Wybierz jeden lub więcej plików do otwarcia - + Select one or more files to play Wybierz jedne lub więcej plików do odtwarzania - + Choose a directory Wybierz katalog - - + + Playlist Files Pliki listy odtwarzania - + Open Playlist Otwórz listę odtwarzania - + Save Playlist Zapisz listę odtwarzania diff --git a/src/qmmpui/translations/libqmmpui_pt.ts b/src/qmmpui/translations/libqmmpui_pt.ts index 82c8600c3..73ee699a9 100644 --- a/src/qmmpui/translations/libqmmpui_pt.ts +++ b/src/qmmpui/translations/libqmmpui_pt.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Diálogo de ficheiro Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Todas as emissões suportadas - + Select one or more files to open Selecione um ou mais ficheiros a abrir - + Select one or more files to play Selecione um ou mais ficheiros a reproduzir - + Choose a directory Selecione um diretório - - + + Playlist Files Ficheiros de lista de reprodução - + Open Playlist Abrir lista de reprodução - + Save Playlist Guardar lista de reprodução diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts index d04e28362..305e8588e 100644 --- a/src/qmmpui/translations/libqmmpui_pt_BR.ts +++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Diálogo de arquivo Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Todos os formatos suportados - + Select one or more files to open Selecione um ou mais arquivos para abrir - + Select one or more files to play Selecione um ou mais arquivos para reproduzir - + Choose a directory Selecione uma pasta - - + + Playlist Files Arquivos de lista de reprodução - + Open Playlist Abrir lista de reprodução - + Save Playlist Salvar lista de reprodução diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts index 16e1d8481..1edd2e071 100644 --- a/src/qmmpui/translations/libqmmpui_ru.ts +++ b/src/qmmpui/translations/libqmmpui_ru.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Файловый диалог Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Все форматы - + Select one or more files to open Выберите один или несколько файлов - + Select one or more files to play Выберите один или несколько файлов для воспроизведения - + Choose a directory Выберите директорию - - + + Playlist Files Файлы списков - + Open Playlist Открыть список - + Save Playlist Сохранить список diff --git a/src/qmmpui/translations/libqmmpui_sk.ts b/src/qmmpui/translations/libqmmpui_sk.ts index 7559765bf..ce262f2e4 100644 --- a/src/qmmpui/translations/libqmmpui_sk.ts +++ b/src/qmmpui/translations/libqmmpui_sk.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_sr_BA.ts b/src/qmmpui/translations/libqmmpui_sr_BA.ts index 59de390c2..1df72e8e4 100644 --- a/src/qmmpui/translations/libqmmpui_sr_BA.ts +++ b/src/qmmpui/translations/libqmmpui_sr_BA.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Кут дијалог фајлова @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Сви подржани формати - + Select one or more files to open Изаберите један или више фајлова за отварање - + Select one or more files to play Изаберите један или више фајлова за пуштање - + Choose a directory Изаберите фасциклу - - + + Playlist Files Фајлови листа нумера - + Open Playlist Отварање листе нумера - + Save Playlist Уписивање листе нумера diff --git a/src/qmmpui/translations/libqmmpui_sr_RS.ts b/src/qmmpui/translations/libqmmpui_sr_RS.ts index c05fd3b9e..3a47d3b56 100644 --- a/src/qmmpui/translations/libqmmpui_sr_RS.ts +++ b/src/qmmpui/translations/libqmmpui_sr_RS.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Кут дијалог фајлова @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Сви подржани формати - + Select one or more files to open Изаберите један или више фајлова за отварање - + Select one or more files to play Изаберите један или више фајлова за пуштање - + Choose a directory Изаберите фасциклу - - + + Playlist Files Фајлови листа нумера - + Open Playlist Отварање листе нумера - + Save Playlist Уписивање листе нумера diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts index d9425cbe5..f99e69868 100644 --- a/src/qmmpui/translations/libqmmpui_tr.ts +++ b/src/qmmpui/translations/libqmmpui_tr.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qt Dosya Diyaloğu @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts index a26ac4300..5515185e4 100644 --- a/src/qmmpui/translations/libqmmpui_uk_UA.ts +++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Файловий діалог Qt @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams Усі формати - + Select one or more files to open Виберіть один чи декілька файлів для відкриття - + Select one or more files to play Виберіть один чи декілька файлів для відтвореня - + Choose a directory Виберіть теку - - + + Playlist Files Файли списків - + Open Playlist Відкрити список - + Save Playlist Зберегти список diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts index 761f1770f..1f6fc1f31 100644 --- a/src/qmmpui/translations/libqmmpui_zh_CN.ts +++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qmmp 文件对话 @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams 所有被支持格式的媒体流 - + Select one or more files to open 选择一个或多个文件并打开 - + Select one or more files to play 选择一个或多个文件并播放 - + Choose a directory 选择文件夹 - - + + Playlist Files 播放列表文件 - + Open Playlist 打开播放列表 - + Save Playlist 保存播放列表 diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts index e5e6ee7ea..6c8bf36f2 100644 --- a/src/qmmpui/translations/libqmmpui_zh_TW.ts +++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts @@ -995,7 +995,7 @@ QtFileDialogFactory - + Qt File Dialog Qmmp 檔案會話 @@ -1091,39 +1091,39 @@ UiHelper - - + + All Supported Bitstreams - + Select one or more files to open - + Select one or more files to play - + Choose a directory 選取一個目錄 - - + + Playlist Files - + Open Playlist - + Save Playlist diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp index 44b450bad..4a6bd6bc2 100644 --- a/src/qmmpui/uihelper.cpp +++ b/src/qmmpui/uihelper.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include "filedialog.h" @@ -245,34 +246,12 @@ void UiHelper::showMainWindow() void UiHelper::exit() { -#if QT_VERSION < 0x040700 - bool closed = true; - QWidget *w; + //send non-spontaneous close event + //for all windows + foreach (QWidget *widget, qApp->topLevelWidgets()) + widget->close(); - while ((w = qApp->activeModalWidget()) && closed) - { - if (!w->isVisible()) - break; - - closed = w->close(); - } - - QWidgetList list = qApp->topLevelWidgets(); - - while (closed && !list.isEmpty()) - { - w = list.takeLast(); - - if (w->isVisible() && w->windowType() != Qt::Desktop) - { - closed = w->close(); - list = qApp->topLevelWidgets(); - list.removeOne(w); - } - } -#else qApp->closeAllWindows(); -#endif qApp->quit(); } -- cgit v1.2.3-13-gbd6f