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 --- .../FileDialogs/TwoPanelFileDialog/CMakeLists.txt | 19 +++---------------- .../translations/two_panel_file_dialog_plugin_bg.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_cs.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_de.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_el.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_en.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_es.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_fi.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_fr.ts | 10 +++++----- .../two_panel_file_dialog_plugin_gl_ES.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_he.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_hu.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_id.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_it.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_ja.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_kk.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_lt.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_nl.ts | 10 +++++----- .../two_panel_file_dialog_plugin_pl_PL.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_pt.ts | 10 +++++----- .../two_panel_file_dialog_plugin_pt_BR.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_ru.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_sk.ts | 10 +++++----- .../two_panel_file_dialog_plugin_sr_BA.ts | 10 +++++----- .../two_panel_file_dialog_plugin_sr_RS.ts | 10 +++++----- .../translations/two_panel_file_dialog_plugin_tr.ts | 10 +++++----- .../two_panel_file_dialog_plugin_uk_UA.ts | 10 +++++----- .../two_panel_file_dialog_plugin_zh_CN.ts | 10 +++++----- .../two_panel_file_dialog_plugin_zh_TW.ts | 10 +++++----- .../TwoPanelFileDialog/twopanelfiledialog.cpp | 2 -- .../TwoPanelFileDialog/twopanelfiledialog.h | 1 + .../TwoPanelFileDialog/twopanelfiledialogimpl.cpp | 4 ---- 32 files changed, 144 insertions(+), 162 deletions(-) (limited to 'src/plugins/FileDialogs/TwoPanelFileDialog') diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt index d7f7a7e50..22f723f9d 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt @@ -1,20 +1,7 @@ project(libtwopanelfiledialog) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -28,7 +15,7 @@ SET(libtwopanelfiledialog_SRCS SET(libtwopanelfiledialog_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libtwopanelfiledialog_RCC_SRCS ${libtwopanelfiledialog_RCCS}) +QT5_ADD_RESOURCES(libtwopanelfiledialog_RCC_SRCS ${libtwopanelfiledialog_RCCS}) # user interface @@ -37,12 +24,12 @@ SET(libtwopanelfiledialog_UIS twopanelfiledialog.ui ) -QT4_WRAP_UI(libtwopanelfiledialog_UIS_H ${libtwopanelfiledialog_UIS}) +QT5_WRAP_UI(libtwopanelfiledialog_UIS_H ${libtwopanelfiledialog_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(twopanelfiledialog MODULE ${libtwopanelfiledialog_SRCS} ${libtwopanelfiledialog_UIS_H} ${libtwopanelfiledialog_RCC_SRCS}) add_dependencies(twopanelfiledialog qmmpui) -target_link_libraries(twopanelfiledialog ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(twopanelfiledialog Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS twopanelfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs) diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts index 21f25a469..6ee21e74c 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts index 8268c5d54..09ab7b251 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Přidat - + Directories Adresáře - + Save Uložit - + %1 already exists. Do you want to replace it? %1 již existuje. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts index bf5c7fe73..1e0fe7d06 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Hinzufügen - + Directories Verzeichnisse - + Save Speichern - + %1 already exists. Do you want to replace it? %1 existiert bereits. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts index b90a239f2..949b1b335 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Προσθήκη - + Directories Καταλόγοι - + Save Αποθήκευση - + %1 already exists. Do you want to replace it? Το %1 υπάρχει ήδη. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts index 897b41ea4..e23a5ce80 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts index ce42e6e4a..ad8fc545f 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Añadir - + Directories Directorios - + Save Guardar - + %1 already exists. Do you want to replace it? %1 ya existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts index e61b8825d..0bf2b550a 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Lisää - + Directories Kansiot - + Save Tallenna - + %1 already exists. Do you want to replace it? %1 on jo olemassa. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts index 32e1d2edb..8db55303b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Ajouter - + Directories Répertoires - + Save Sauver - + %1 already exists. Do you want to replace it? %1 existe déjà. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts index a911bde37..2b54c8003 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Engadir - + Directories Directorios - + Save Gardar - + %1 already exists. Do you want to replace it? %1 xa existe diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts index fd7a685db..86b2cf7d4 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add הוסף - + Directories מדורים - + Save שמור - + %1 already exists. Do you want to replace it? %1 כבר קיים. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts index 7cce0ff78..68c55d147 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts index f696eb624..88eff103c 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Tambah - + Directories Direktori - + Save Simpan - + %1 already exists. Do you want to replace it? %1 sudah ada. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts index c3d63881c..cec174efd 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts index 49f229f46..67e854b8a 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 追加 - + Directories ディレクトリー - + Save 保存 - + %1 already exists. Do you want to replace it? %1 が既にあります。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts index 539a16ded..3a9410b3f 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts index 2ab0e8c50..1929ea8ba 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts index c323f5e42..63ad06445 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts index 1e5235b0d..5f5f58a31 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Dodaj - + Directories Katalogi - + Save Zapisz - + %1 already exists. Do you want to replace it? %1 już istnieje. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts index a190c1d2b..6d02ae318 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Adicionar - + Directories Diretórios - + Save Guardar - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts index 0ac754a99..73e5ae701 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Adicionar - + Directories Pastas - + Save Salvar - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts index 6e1a119f8..497c2d23b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Добавить - + Directories Директории - + Save Сохранить - + %1 already exists. Do you want to replace it? %1 уже существует. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts index e51e7bcf2..c0fe7fae4 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts index a421ed30e..df960dff7 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts index bcc0b7eb7..818809a93 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts index f45ef4643..7619ab81b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts index 8322bedec..d53618595 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Додати - + Directories Теки - + Save Зберегти - + %1 already exists. Do you want to replace it? %1 вже існує. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts index 0e2eedff9..d1beea248 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 添加 - + Directories 目录 - + Save 保存 - + %1 already exists. Do you want to replace it? %1 早已存在。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts index fd4e5e8d1..f09afd8ff 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 添加 - + Directories 目錄 - + Save 儲存 - + %1 already exists. Do you want to replace it? ％1早已存在。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp index e236e2a6a..9d182189b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp @@ -87,5 +87,3 @@ QTranslator *TwoPanelFileDialogFactory::createTranslator(QObject *parent) translator->load(QString(":/two_panel_file_dialog_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(TwoPanelFileDialog, TwoPanelFileDialogFactory) diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h index 61a029ca2..5cd2b7455 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h @@ -54,6 +54,7 @@ private: class TwoPanelFileDialogFactory : public QObject, public FileDialogFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.FileDialogFactoryInterface.1.0") Q_INTERFACES(FileDialogFactory) public: FileDialog* create(); diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp index bd13e462c..09828fc11 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp @@ -63,11 +63,7 @@ TwoPanelFileDialogImpl::TwoPanelFileDialogImpl(QWidget * parent) : QDialog(paren m_dirModel->setReadOnly(true); m_ui.dirListView->setModel(m_dirModel); m_dirModel->setRootPath(""); -#if (QT_VERSION >= 0x040700) m_dirModel->setFilter(QDir::AllDirs | QDir::NoDot); -#else - m_dirModel->setFilter(QDir::AllDirs); -#endif m_dirModel->setNameFilterDisables (false); connect(m_ui.dirListView->selectionModel(), -- cgit v1.2.3-13-gbd6f