diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index 06b6fca..9eaa426 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -80,7 +80,7 @@ class Browser: public QMainWindow, protected Ui::Browser { _zoom->setValue(100); _zoom->setSingleStep(1); _zoom->setPageStep(10); - _zoom->setTickPosition(QSlider::TicksBothSides); + _zoom->setTickPosition(QSlider::TicksAbove); assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int)))); _url = new QComboBox(_toolbar); _url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, diff --git a/swisssurfer/src/settings.hxx b/swisssurfer/src/settings.hxx index e64e99e..f9d9724 100644 --- a/swisssurfer/src/settings.hxx +++ b/swisssurfer/src/settings.hxx @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -113,6 +114,11 @@ class Settings: public QDialog, protected Ui::Settings { return _checkboxes[name].second; } + const QString& text(const QString& name) { + assert(_lineedits.find(name)!=_lineedits.end()); + return _lineedits[name].second; + } + const MimeTypes& mimetypes() const { return _mimetypes; } @@ -155,6 +161,11 @@ class Settings: public QDialog, protected Ui::Settings { it!=_checkboxes.end(); ++it) _settings->setValue (QString("Flags/%1").arg(it->first), it->second.second); + // LineEdits + for (LineEdits::iterator it(_lineedits.begin()); + it!=_lineedits.end(); ++it) + _settings->setValue + (QString("Texts/%1").arg(it->first), it->second.second); // MimeTypes _settings->setValue("QWebSettings/MimeTypes", _mimetypes); // Search Engines @@ -186,6 +197,17 @@ class Settings: public QDialog, protected Ui::Settings { it->second.second = val.toBool(); } } + // LineEdits + for (LineEdits::iterator it(_lineedits.begin()); + it!=_lineedits.end(); ++it) { + QVariant val + (_settings->value + (QString("Texts/%1").arg(it->first), it->second.second)); + if (val.isValid() && val.canConvert(QVariant::String)) { + it->second.first->setText(val.toString()); + it->second.second = val.toString(); + } + } // MimeTypes if (overwriteMimeTypes) { QVariant val(_settings->value("QWebSettings/MimeTypes")); @@ -212,6 +234,10 @@ class Settings: public QDialog, protected Ui::Settings { for (CheckBoxes::iterator it(_checkboxes.begin()); it!=_checkboxes.end(); ++it) it->second.second = it->second.first->isChecked(); + // LineEdits + for (LineEdits::iterator it(_lineedits.begin()); + it!=_lineedits.end(); ++it) + it->second.second = it->second.first->text(); // MimeTypes _mimetypes.clear(); for (int row(_mimeTypeTable->rowCount()); row--;) @@ -239,6 +265,10 @@ class Settings: public QDialog, protected Ui::Settings { for (CheckBoxes::iterator it(_checkboxes.begin()); it!=_checkboxes.end(); ++it) it->second.first->setChecked(it->second.second); + // LineEdits + for (LineEdits::iterator it(_lineedits.begin()); + it!=_lineedits.end(); ++it) + it->second.first->setText(it->second.second); // MimeTypes _mimeTypeTable->setRowCount(_mimetypes.size()); _mimeTypeTable->verticalHeader()->show(); @@ -315,6 +345,8 @@ class Settings: public QDialog, protected Ui::Settings { Attributes _attributes; typedef std::map > CheckBoxes; CheckBoxes _checkboxes; + typedef std::map > LineEdits; + LineEdits _lineedits; QSettings* _settings; bool _autoWrite; MimeTypes _mimetypes; diff --git a/swisssurfer/src/settings.ui b/swisssurfer/src/settings.ui index 8f71624..ac098c4 100644 --- a/swisssurfer/src/settings.ui +++ b/swisssurfer/src/settings.ui @@ -6,7 +6,7 @@ 0 0 - 615 + 611 383 diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index cc7c02a..a89353a 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -213,6 +213,11 @@ &Proxy ... + + + Auto Zoom + + diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 8344c8f..a0f5dc4 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -243,6 +243,11 @@ &Proxy ... + + + Auto Zoom + + Checking: %1 diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index cc7c02a..a89353a 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -213,6 +213,11 @@ &Proxy ... + + + Auto Zoom + + diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index cc7c02a..a89353a 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -213,6 +213,11 @@ &Proxy ... + + + Auto Zoom + +