web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show bookmarks also if settings are disabled; refs #138

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-05-03 14:23:52 +00:00
parent 6d34c2581a
commit 56e911c46f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser.hxx
View File

@@ -212,10 +212,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
if (!settings || _kiosk) { if (!settings || _kiosk) {
actionSettings->setVisible(false); actionSettings->setVisible(false);
actionEditBookmarks->setVisible(false);
actionSaveWindowState->setVisible(false); actionSaveWindowState->setVisible(false);
actionLoadWindowState->setVisible(false); actionLoadWindowState->setVisible(false);
delete _bookmarks; _bookmarks=0;
} }
if (_kiosk) { if (_kiosk) {
actionNew->setEnabled(false); actionNew->setEnabled(false);
@@ -223,6 +221,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
actionNewTab->setEnabled(false); actionNewTab->setEnabled(false);
actionNewTab->setVisible(false); actionNewTab->setVisible(false);
actionCloseTab->setVisible(false); actionCloseTab->setVisible(false);
actionEditBookmarks->setVisible(false);
delete _bookmarks; _bookmarks=0;
} }
if (!_kiosk && !_startUrl && _settings.flag("SaveWindowState") if (!_kiosk && !_startUrl && _settings.flag("SaveWindowState")
&& _settings()) && _settings())
@@ -1386,10 +1386,12 @@ class Browser: public QMainWindow, protected Ui::Browser {
(reply->header(QNetworkRequest::ContentTypeHeader).toString(), (reply->header(QNetworkRequest::ContentTypeHeader).toString(),
filename)); filename));
if (!type.isEmpty()) { if (!type.isEmpty()) {
LOG<<"Start Application";
filename.replace(QRegExp("^(.*)\\."+type.at(0)+"$"), filename.replace(QRegExp("^(.*)\\."+type.at(0)+"$"),
"\\1"); // remove extension "\\1"); // remove extension
run(reply, filename+"."+type.at(0), type.at(1)); run(reply, filename+"."+type.at(0), type.at(1));
} else { } else {
LOG<<"Show SaveOrRunDialog";
SaveOrRunDialog choice(_kiosk, this); SaveOrRunDialog choice(_kiosk, this);
choice.setup(filename, choice.setup(filename,
reply->header(QNetworkRequest::ContentTypeHeader) reply->header(QNetworkRequest::ContentTypeHeader)