#include <QToolButton>
#include <QHBoxLayout>
-using lyx::support::split;
-using std::string;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
string sc = split(str, label, '|');
if (sc.length() < 2)
return from_utf8(label);
- string::size_type pos = label.find(sc[1]);
- if (pos == string::npos)
- return from_utf8(label);
- label.insert(pos, 1, '&');
+ size_t pos = label.find(sc[1]);
+ if (pos != string::npos)
+ label.insert(pos, 1, '&');
return from_utf8(label);
}
support::FileFilterList const & filters,
FileDialog::Button const & b1,
FileDialog::Button const & b2)
- // FIXME replace that with theApp->gui()->currentView()
+ // FIXME replace that with guiApp->currentView()
: QFileDialog(qApp->focusWidget(),
toqstr(t), toqstr(p), toqstr(filters.as_string()))
{
+ QString const path = toqstr(p);
+ QDir dir(path);
+ // FIXME: workaround for a bug in qt which makes LyX crash
+ // with hidden paths (bug 4513). Recheck with recent Qt versions.
+ if (path.contains("/."))
+ dir.setFilter(QDir::Hidden);
+ setDirectory(dir);
setWindowTitle(toqstr(t));
QList<QHBoxLayout *> layout = findChildren<QHBoxLayout *>();
if (!b1.first.empty()) {
b1_dir_ = b1.second;
QToolButton * tb = new QToolButton(this);
- connect(tb, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+ connect(tb, SIGNAL(clicked()), this, SLOT(button1Clicked()));
tb->setText(toqstr(getLabel(b1.first)));
layout.at(0)->addWidget(tb);
}
if (!b2.first.empty()) {
b2_dir_ = b2.second;
QToolButton * tb = new QToolButton(this);
- connect(tb, SIGNAL(clicked()), this, SLOT(buttonClicked()));
+ connect(tb, SIGNAL(clicked()), this, SLOT(button2Clicked()));
tb->setText(toqstr(getLabel(b2.first)));
layout.at(0)->addWidget(tb);
}