diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx
index 087cbfb..70295d1 100644
--- a/swisssurfer/src/browser.hxx
+++ b/swisssurfer/src/browser.hxx
@@ -58,7 +58,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
QSettings* settings=0,
Settings::MimeTypes mimeTypes = Settings::MimeTypes(),
bool kiosk = false, bool login = true):
- _url(0), _clearUrl(0), _addBookmark(0), _find(0),
+ _url(0), _find(0),
_kiosk(kiosk),
_settings(mimeTypes, this, settings, !kiosk),
_errorLog(this), _logincertificate(this),
@@ -85,7 +85,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int))));
_url = new QComboBox(_toolbar);
_url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
- QSizePolicy::Fixed));
+ QSizePolicy::Preferred));
_url->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
_url->setEditable(!_kiosk);
_url->addItems(urls);
@@ -119,14 +119,12 @@ class Browser: public QMainWindow, protected Ui::Browser {
SLOT(load())));
assert(connect(_url->lineEdit(), SIGNAL(textChanged(QString)),
SLOT(goodUrl())));
- _toolbar->addWidget(_clearUrl = new QPushButton("X", _toolbar));
- assert(connect(_clearUrl, SIGNAL(clicked(bool)),
+ _toolbar->addAction(actionClearLocation);
+ assert(connect(actionClearLocation, SIGNAL(triggered()),
_url, SLOT(clearEditText())));
- assert(connect(_clearUrl, SIGNAL(clicked(bool)),
+ assert(connect(actionClearLocation, SIGNAL(triggered()),
_url, SLOT(setFocus())));
- _toolbar->addWidget(_addBookmark = new QPushButton("+", _toolbar));
- assert(connect(_addBookmark, SIGNAL(clicked(bool)),
- SLOT(addBookmark())));
+ _toolbar->addAction(actionAddBookmark);
}
if (!_kiosk && _settings.flag("SaveWindowState") && _settings())
loadWin(urls.size());
@@ -464,7 +462,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
view->load(page);
}
- void addBookmark() {
+ void on_actionAddBookmark_triggered() {
_url->addItem(_url->currentText());
}
@@ -1277,8 +1275,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
private:
QComboBox* _url;
- QPushButton* _clearUrl;
- QPushButton* _addBookmark;
QLineEdit* _find;
QSlider* _zoom;
QProgressBar* _progress;
diff --git a/swisssurfer/src/browser.ui b/swisssurfer/src/browser.ui
index b08261f..878682f 100644
--- a/swisssurfer/src/browser.ui
+++ b/swisssurfer/src/browser.ui
@@ -321,6 +321,33 @@
&Proxy ...
+
+
+
+ :/icons/clearlocation:/icons/clearlocation
+
+
+ Clear Location
+
+
+ clear location bar
+
+
+
+
+
+ :/icons/addbookmark:/icons/addbookmark
+
+
+ Add Bookmark
+
+
+ add bookmark to location bar
+
+
+ Ctrl+D
+
+
diff --git a/swisssurfer/src/resources.qrc b/swisssurfer/src/resources.qrc
index 53df884..2d19ee2 100644
--- a/swisssurfer/src/resources.qrc
+++ b/swisssurfer/src/resources.qrc
@@ -8,5 +8,7 @@
resources/icons/reload.png
resources/icons/stop.png
resources/icons/error.svg
+ resources/icons/clearlocation.svg
+ resources/icons/addbookmark.svg
diff --git a/swisssurfer/src/resources/icons/addbookmark.svg b/swisssurfer/src/resources/icons/addbookmark.svg
new file mode 100644
index 0000000..274e5c8
--- /dev/null
+++ b/swisssurfer/src/resources/icons/addbookmark.svg
@@ -0,0 +1,435 @@
+
+
diff --git a/swisssurfer/src/resources/icons/clearlocation.svg b/swisssurfer/src/resources/icons/clearlocation.svg
new file mode 100644
index 0000000..707e075
--- /dev/null
+++ b/swisssurfer/src/resources/icons/clearlocation.svg
@@ -0,0 +1,166 @@
+
+
diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts
index 1b2d74d..b710af0 100644
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -213,6 +213,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts
index 8f10314..dadb481 100644
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -243,6 +243,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts
index 1b2d74d..b710af0 100644
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -213,6 +213,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts
index 1b2d74d..b710af0 100644
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -213,6 +213,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+