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

not removed, but diabled and smaller; closes #47

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-05-23 11:22:02 +00:00
parent 6e36fa3967
commit 1713781422
5 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
swisssurfer/src/browser.hxx
View File

@@ -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<QWebView*>(_tabs->currentWidget())->setZoomFactor(i/10.0);
LOG<<i;
statusBar()->showMessage(tr("Zoom: %1%").arg(i));
qobject_cast<QWebView*>(_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);
}
//@}

40
swisssurfer/src/swisssurfer_de.ts
View File

@@ -226,88 +226,88 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="424"/>
<location filename="browser.hxx" line="431"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="440"/>
<location filename="browser.hxx" line="446"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="455"/>
<location filename="browser.hxx" line="461"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="442"/>
<location filename="browser.hxx" line="448"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="506"/>
<location filename="browser.hxx" line="512"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="527"/>
<location filename="browser.hxx" line="533"/>
<source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="665"/>
<location filename="browser.hxx" line="671"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="931"/>
<location filename="browser.hxx" line="937"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="431"/>
<location filename="browser.hxx" line="438"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="432"/>
<location filename="browser.hxx" line="439"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="433"/>
<location filename="browser.hxx" line="440"/>
<source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="546"/>
<location filename="browser.hxx" line="552"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="610"/>
<location filename="browser.hxx" line="616"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="611"/>
<location filename="browser.hxx" line="617"/>
<source>SwissSurfer %1 (%2)
%3
@@ -321,22 +321,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="660"/>
<location filename="browser.hxx" line="666"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1041"/>
<location filename="browser.hxx" line="1047"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1097"/>
<location filename="browser.hxx" line="1107"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1109"/>
<location filename="browser.hxx" line="1119"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

40
swisssurfer/src/swisssurfer_en.ts
View File

@@ -226,88 +226,88 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="424"/>
<location filename="browser.hxx" line="431"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="440"/>
<location filename="browser.hxx" line="446"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="455"/>
<location filename="browser.hxx" line="461"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="442"/>
<location filename="browser.hxx" line="448"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="506"/>
<location filename="browser.hxx" line="512"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="527"/>
<location filename="browser.hxx" line="533"/>
<source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="665"/>
<location filename="browser.hxx" line="671"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="931"/>
<location filename="browser.hxx" line="937"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="431"/>
<location filename="browser.hxx" line="438"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="432"/>
<location filename="browser.hxx" line="439"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="433"/>
<location filename="browser.hxx" line="440"/>
<source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="546"/>
<location filename="browser.hxx" line="552"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="610"/>
<location filename="browser.hxx" line="616"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="611"/>
<location filename="browser.hxx" line="617"/>
<source>SwissSurfer %1 (%2)
%3
@@ -321,22 +321,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="660"/>
<location filename="browser.hxx" line="666"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1041"/>
<location filename="browser.hxx" line="1047"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1097"/>
<location filename="browser.hxx" line="1107"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1109"/>
<location filename="browser.hxx" line="1119"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

40
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -226,88 +226,88 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="424"/>
<location filename="browser.hxx" line="431"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="440"/>
<location filename="browser.hxx" line="446"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="455"/>
<location filename="browser.hxx" line="461"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="442"/>
<location filename="browser.hxx" line="448"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="506"/>
<location filename="browser.hxx" line="512"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="527"/>
<location filename="browser.hxx" line="533"/>
<source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="665"/>
<location filename="browser.hxx" line="671"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="931"/>
<location filename="browser.hxx" line="937"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="431"/>
<location filename="browser.hxx" line="438"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="432"/>
<location filename="browser.hxx" line="439"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="433"/>
<location filename="browser.hxx" line="440"/>
<source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="546"/>
<location filename="browser.hxx" line="552"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="610"/>
<location filename="browser.hxx" line="616"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="611"/>
<location filename="browser.hxx" line="617"/>
<source>SwissSurfer %1 (%2)
%3
@@ -321,22 +321,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="660"/>
<location filename="browser.hxx" line="666"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1041"/>
<location filename="browser.hxx" line="1047"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1097"/>
<location filename="browser.hxx" line="1107"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1109"/>
<location filename="browser.hxx" line="1119"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

40
swisssurfer/src/swisssurfer_it.ts
View File

@@ -226,88 +226,88 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="424"/>
<location filename="browser.hxx" line="431"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="440"/>
<location filename="browser.hxx" line="446"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="455"/>
<location filename="browser.hxx" line="461"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="442"/>
<location filename="browser.hxx" line="448"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="506"/>
<location filename="browser.hxx" line="512"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="527"/>
<location filename="browser.hxx" line="533"/>
<source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="665"/>
<location filename="browser.hxx" line="671"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="678"/>
<location filename="browser.hxx" line="684"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="931"/>
<location filename="browser.hxx" line="937"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="431"/>
<location filename="browser.hxx" line="438"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="432"/>
<location filename="browser.hxx" line="439"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="433"/>
<location filename="browser.hxx" line="440"/>
<source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="546"/>
<location filename="browser.hxx" line="552"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="610"/>
<location filename="browser.hxx" line="616"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="611"/>
<location filename="browser.hxx" line="617"/>
<source>SwissSurfer %1 (%2)
%3
@@ -321,22 +321,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="660"/>
<location filename="browser.hxx" line="666"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1041"/>
<location filename="browser.hxx" line="1047"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1097"/>
<location filename="browser.hxx" line="1107"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1109"/>
<location filename="browser.hxx" line="1119"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>