X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FLyXFileDialog.cpp;h=5fabf915c204c357f83930394c06d6cf7205f40d;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=56fef5d74de97af004c25c20e650691b627cee72;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git diff --git a/src/frontends/qt4/LyXFileDialog.cpp b/src/frontends/qt4/LyXFileDialog.cpp index 56fef5d74d..5fabf915c2 100644 --- a/src/frontends/qt4/LyXFileDialog.cpp +++ b/src/frontends/qt4/LyXFileDialog.cpp @@ -14,7 +14,6 @@ #include "qt_helpers.h" -#include "support/FileFilterList.h" #include "support/lstrings.h" #include @@ -22,53 +21,60 @@ #include using namespace std; +using namespace lyx::support; namespace lyx { -using support::split; - /// return the Qt form of the label -static docstring const getLabel(docstring const & ucs4str) +static QString getLabel(QString const & qstr) { - // FIXME UNICODE - string str = to_utf8(ucs4str); + // FIXME UNICODE (or "qt-ify") + string str = fromqstr(qstr); string label; string sc = split(str, label, '|'); if (sc.length() < 2) - return from_utf8(label); + return toqstr(label); size_t pos = label.find(sc[1]); if (pos != string::npos) label.insert(pos, 1, '&'); - return from_utf8(label); + return toqstr(label); } -LyXFileDialog::LyXFileDialog(docstring const & t, - docstring const & p, - support::FileFilterList const & filters, +LyXFileDialog::LyXFileDialog(QString const & title, + QString const & path, + QStringList const & filters, FileDialog::Button const & b1, FileDialog::Button const & b2) // FIXME replace that with guiApp->currentView() - : QFileDialog(qApp->focusWidget(), - toqstr(t), toqstr(p), toqstr(filters.as_string())) + : QFileDialog(qApp->focusWidget(), title, path) { - setWindowTitle(toqstr(t)); + setFilters(filters); +#if QT_VERSION < 0x040304 + // FIXME: workaround for a bug in qt which makes LyX crash + // with hidden paths (bug 4513). Fixed as of Qt 4.3.4 + QDir dir(path); + if (path.contains("/.")) + dir.setFilter(QDir::Hidden); + setDirectory(dir); +#endif + setWindowTitle(title); QList layout = findChildren(); - if (!b1.first.empty()) { + if (!b1.first.isEmpty()) { b1_dir_ = b1.second; QToolButton * tb = new QToolButton(this); connect(tb, SIGNAL(clicked()), this, SLOT(button1Clicked())); - tb->setText(toqstr(getLabel(b1.first))); + tb->setText(getLabel(b1.first)); layout.at(0)->addWidget(tb); } - if (!b2.first.empty()) { + if (!b2.first.isEmpty()) { b2_dir_ = b2.second; QToolButton * tb = new QToolButton(this); connect(tb, SIGNAL(clicked()), this, SLOT(button2Clicked())); - tb->setText(toqstr(getLabel(b2.first))); + tb->setText(getLabel(b2.first)); layout.at(0)->addWidget(tb); } } @@ -76,15 +82,15 @@ LyXFileDialog::LyXFileDialog(docstring const & t, void LyXFileDialog::button1Clicked() { - setDirectory(toqstr(b1_dir_)); + setDirectory(b1_dir_); } void LyXFileDialog::button2Clicked() { - setDirectory(toqstr(b2_dir_)); + setDirectory(b2_dir_); } } // namespace lyx -#include "LyXFileDialog_moc.cpp" +#include "moc_LyXFileDialog.cpp"