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

incomplete/wrong template; refs #167

Browse Source
master
Marc Wäckerlin 12 years ago
parent 1045c98c0a
commit 00bd85e559
9 changed files with 228 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/browser.hxx
  2. 8
      src/designer/webwidgetifc.hxx
  3. 49
      src/qbrowserlib/qbrowserlib_de.ts
  4. 49
      src/qbrowserlib/qbrowserlib_en.ts
  5. 49
      src/qbrowserlib/qbrowserlib_fr.ts
  6. 49
      src/qbrowserlib/qbrowserlib_it.ts
  7. 3
      src/qbrowserlib/qmake.pro.in
  8. 16
      src/qbrowserlib/swisswebview.hxx
  9. 12
      src/qbrowserlib/swisswebwidget.hxx

2
src/browser.hxx
Unescape View File

@ -248,7 +248,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
//! Create new empty tab.
qbrowserlib::SwissWebView* newTab() {
qbrowserlib::SwissWebView* browser
(new qbrowserlib::SwissWebView(&_networkManager, &_executor));
(new qbrowserlib::SwissWebView(0, &_networkManager, &_executor));
newTab(browser);
return browser;
}

8
src/designer/webwidgetifc.hxx
Unescape View File

@ -5,8 +5,8 @@
// 1 2 3 4 5 6 7 8
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
#ifndef __SWISSWEBWIDGETWIDGETIFC_HXX
#define __SWISSWEBWIDGETWIDGETIFC_HXX
#ifndef __SWISSWEBWIDGETIFC_HXX
#define __SWISSWEBWIDGETIFC_HXX
#include <qbrowserlib/log.hxx>
#include <qbrowserlib/swisswebwidget.hxx>
@ -16,8 +16,8 @@
//! @{
//! SwissWebWidget widget for Qt Designer
class SwissWebWidgetWidgetIfc: public QObject,
public QDesignerCustomWidgetInterface {
class SwissWebWidgetIfc: public QObject,
public QDesignerCustomWidgetInterface {
Q_OBJECT;
Q_INTERFACES(QDesignerCustomWidgetInterface);
public:

49
src/qbrowserlib/qbrowserlib_de.ts
Unescape View File

@ -580,6 +580,55 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SwissWebWidget</name>
<message>
<location filename="swisswebwidget.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="28"/>
<source>H</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="41"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="54"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="67"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="80"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="98"/>
<source>gg</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="129"/>
<source>status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="155"/>
<location filename="swisswebwidget.ui" line="181"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>qbrowserlib::SaveOrRun</name>
<message>

49
src/qbrowserlib/qbrowserlib_en.ts
Unescape View File

@ -580,6 +580,55 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SwissWebWidget</name>
<message>
<location filename="swisswebwidget.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="28"/>
<source>H</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="41"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="54"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="67"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="80"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="98"/>
<source>gg</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="129"/>
<source>status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="155"/>
<location filename="swisswebwidget.ui" line="181"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>qbrowserlib::SaveOrRun</name>
<message>

49
src/qbrowserlib/qbrowserlib_fr.ts
Unescape View File

@ -580,6 +580,55 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SwissWebWidget</name>
<message>
<location filename="swisswebwidget.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="28"/>
<source>H</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="41"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="54"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="67"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="80"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="98"/>
<source>gg</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="129"/>
<source>status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="155"/>
<location filename="swisswebwidget.ui" line="181"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>qbrowserlib::SaveOrRun</name>
<message>

49
src/qbrowserlib/qbrowserlib_it.ts
Unescape View File

@ -580,6 +580,55 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SwissWebWidget</name>
<message>
<location filename="swisswebwidget.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="28"/>
<source>H</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="41"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="54"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="67"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="80"/>
<source>R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="98"/>
<source>gg</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="129"/>
<source>status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="swisswebwidget.ui" line="155"/>
<location filename="swisswebwidget.ui" line="181"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>qbrowserlib::SaveOrRun</name>
<message>

3
src/qbrowserlib/qmake.pro.in
Unescape View File

@ -43,7 +43,8 @@ HEADERS = @srcdir@/log.hxx \
@srcdir@/executor.hxx \
@srcdir@/temporaryfile.hxx
FORMS = @srcdir@/saveorrun.ui @srcdir@/settings.ui @srcdir@/log.ui
FORMS = @srcdir@/saveorrun.ui @srcdir@/settings.ui @srcdir@/log.ui \
@srcdir@/swisswebwidget.ui
RESOURCES = languages.qrc

16
src/qbrowserlib/swisswebview.hxx
Unescape View File

@ -37,8 +37,15 @@ namespace qbrowserlib {
void newView(qbrowserlib::SwissWebView*);
public:
//! Default construction, creates new @ref SwissWebView
SwissWebView(QNetworkAccessManager* net,
Executor* executor, QWidget *parent=0): QWebView(parent) {
SwissWebView(QWidget *parent=0,
QNetworkAccessManager* net=0,
Executor* executor=0): QWebView(parent) {
if (!net) net = (_fallbackNetworkAccessManager =
std::auto_ptr<QNetworkAccessManager>
(new QNetworkAccessManager)).get();
if (!executor) executor = (_fallbackExecutor =
std::auto_ptr<Executor>
(new Executor)).get();
//! @bugfix, gcc does not yet support constructor calling
x(new SwissWebPage(net, executor, this));
}
@ -65,6 +72,11 @@ namespace qbrowserlib {
// is not assigned
newView(new SwissWebView(p));
}
private:
std::auto_ptr<QNetworkAccessManager> _fallbackNetworkAccessManager;
std::auto_ptr<Executor> _fallbackExecutor;
};
}

12
src/qbrowserlib/swisswebwidget.hxx
Unescape View File

@ -5,10 +5,17 @@
// 1 2 3 4 5 6 7 8
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
#ifndef __SWISSWEBWIDGET_HXX__
#define __SWISSWEBWIDGET_HXX__
#include <qbrowserlib/ui_swisswebwidget.h>
#include <QtGui/QMainWindow>
//! @addtogroup qbrowserlib
//! @{
namespace {
namespace qbrowserlib {
//! Window Widget for complete page witghin a webbrowser.
/*! Contains a toolbar, a status bar and @refs
@ -22,6 +29,9 @@ namespace {
}
protected:
};
}
//! @}
#endif

Write Preview
Loading…
Cancel
Save