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

load now sets url field to page url; refs #141

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-05-04 12:26:13 +00:00
parent 085e6a73bf
commit 2adc5c544d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser.hxx
View File

@@ -300,6 +300,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
void load(QString page) { void load(QString page) {
_settings.replaceSearchEngine(page); _settings.replaceSearchEngine(page);
if (QUrl(page).scheme()=="") page = "http://"+page; if (QUrl(page).scheme()=="") page = "http://"+page;
if (qobject_cast<QComboBox*>(_url))
qobject_cast<QComboBox*>(_url)->lineEdit()->setText(page);
else
qobject_cast<QLineEdit*>(_url)->setText(page);
load(QUrl(page)); load(QUrl(page));
} }
@@ -922,8 +926,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
urls = _settings()->value("Window/Urls").toStringList(); urls = _settings()->value("Window/Urls").toStringList();
} }
if (qobject_cast<QComboBox*>(_url)) { if (qobject_cast<QComboBox*>(_url)) {
QString ci(qobject_cast<QComboBox*>(_url)->currentText());
qobject_cast<QComboBox*>(_url)->clear(); qobject_cast<QComboBox*>(_url)->clear();
qobject_cast<QComboBox*>(_url)->addItems(urls); qobject_cast<QComboBox*>(_url)->addItems(urls);
qobject_cast<QComboBox*>(_url)->lineEdit()->setText(ci);
} }
if (_bookmarks) { if (_bookmarks) {
_bookmarks->clear(); _bookmarks->clear();