diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index 775c8f1..aa8180d 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -64,15 +64,22 @@ class Browser: public QMainWindow, protected Ui::Browser { QNetworkProxyFactory::setUseSystemConfiguration(true); setupUi(this); statusBar()->addPermanentWidget(_progress = new QProgressBar()); + _progress -> setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); statusBar()->addPermanentWidget(_zoom = new QSlider(Qt::Horizontal)); - _zoom->setMinimum(1); - _zoom->setMaximum(100); - _zoom->setValue(10); + _zoom->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + _zoom->setMinimum(10); + _zoom->setMaximum(190); + _zoom->setValue(100); + _zoom->setSingleStep(1); + _zoom->setPageStep(10); + _zoom->setTickPosition(QSlider::TicksBothSides); + //_zoom->setTickInterval(10); assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int)))); _toolbar->addWidget(_url = new QComboBox(_toolbar)); on_actionNewTab_triggered(); _url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); + _url->setEditable(!_kiosk); _url->setVisible(!_kiosk); _url->addItems(urls); assert(connect(_url, SIGNAL(currentIndexChanged(const QString&)), @@ -436,7 +443,6 @@ class Browser: public QMainWindow, protected Ui::Browser { .arg(page.toString())); return; } - statusBar()->showMessage(tr("Reading: %1").arg(page.toString())); if (!page.isValid()) { statusBar()->showMessage(tr("Illegal URL: %1").arg(page.errorString())); @@ -451,9 +457,9 @@ class Browser: public QMainWindow, protected Ui::Browser { } void zoom(int i) { - LOG<<100.0*i/10.0; - statusBar()->showMessage(tr("Zoom: %1%").arg(100.0*i/10.0)); - qobject_cast(_tabs->currentWidget())->setZoomFactor(i/10.0); + LOG<showMessage(tr("Zoom: %1%").arg(i)); + qobject_cast(_tabs->currentWidget())->setZoomFactor(i/100.0); } void loadFromHistory() { @@ -1078,12 +1084,16 @@ class Browser: public QMainWindow, protected Ui::Browser { actionStop->setEnabled(true); _progress->setRange(0, 0); _progress->setValue(0); + _progress->setEnabled(true); _progress->show(); } void finished() { LOG; actionStop->setEnabled(false); + _progress->setRange(0, 1); + _progress->setValue(1); + _progress->setEnabled(false); } //@} diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 49a1ccc..34293af 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -226,88 +226,88 @@ - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 49a1ccc..34293af 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -226,88 +226,88 @@ - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 49a1ccc..34293af 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -226,88 +226,88 @@ - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 49a1ccc..34293af 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -226,88 +226,88 @@ - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -321,22 +321,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error