Kaydet (Commit) 9199f5d4 authored tarafından Katarina Behrens's avatar Katarina Behrens

Basic KDE5 native file picker opens now

Change-Id: I3bb5d45f3337fbe26d80acb1fac7a433de904546
üst 6b8c90a3
......@@ -48,19 +48,7 @@ KDE5FilePicker::~KDE5FilePicker()
//void KDE5FilePicker::setTitle(const QString& title) { _dialog->setWindowTitle(title); }
/*bool KDE5FilePicker::execute()
{
if (!_filters.isEmpty())
_dialog->setNameFilters(_filters);
if (!_currentFilter.isEmpty())
_dialog->selectNameFilter(_currentFilter);
_dialog->show();
//block and wait for user input
return _dialog->exec() == QFileDialog::Accepted;
}
void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
/*void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
{
_dialog->setFileMode(multiSelect ? QFileDialog::ExistingFiles : QFileDialog::ExistingFile);
}
......
......@@ -119,7 +119,17 @@ void SAL_CALL KDE5FilePicker::removeFilePickerListener(const uno::Reference<XFil
void SAL_CALL KDE5FilePicker::setTitle(const OUString& title) {}
sal_Int16 SAL_CALL KDE5FilePicker::execute() { return 0; }
sal_Int16 SAL_CALL KDE5FilePicker::execute()
{
if (!_filters.isEmpty())
_dialog->setNameFilters(_filters);
if (!_currentFilter.isEmpty())
_dialog->selectNameFilter(_currentFilter);
_dialog->show();
//block and wait for user input
return _dialog->exec() == QFileDialog::Accepted;
}
void SAL_CALL KDE5FilePicker::setMultiSelectionMode(sal_Bool multiSelect) {}
......
......@@ -26,6 +26,7 @@
#include <osl/process.h>
#include "KDE5FilePicker.hxx"
#include "KDE5SalData.hxx"
#include "KDE5SalInstance.hxx"
#include "KDE5SalFrame.hxx"
......@@ -51,7 +52,7 @@ SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nSt
uno::Reference<ui::dialogs::XFilePicker2>
KDE5SalInstance::createFilePicker(const uno::Reference<uno::XComponentContext>& xMSF)
{
return SalInstance::createFilePicker(xMSF);
return uno::Reference<ui::dialogs::XFilePicker2>(new KDE5FilePicker(xMSF));
}
bool KDE5SalInstance::IsMainThread() const { return qApp->thread() == QThread::currentThread(); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment