Subversion Repositories svn1

Rev

Rev 383 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 383 Rev 384
Line 2... Line 2...
2
#define QMREPORTWINDOW_H
2
#define QMREPORTWINDOW_H
3
 
3
 
4
#include <QTabWidget>
4
#include <QTabWidget>
5
#include <QLineEdit>
5
#include <QLineEdit>
6
#include <QPushButton>
6
#include <QPushButton>
-
 
7
#include <QWebEnginePage>
7
#include <QWebView>
8
#include <QWebEngineView>
8
#include <QUrl>
9
#include <QUrl>
9
#include <QAction>
10
#include <QAction>
10
#include <QDoubleSpinBox>
11
#include <QDoubleSpinBox>
11
#include <QContextMenuEvent>
12
#include <QContextMenuEvent>
12
 
13
 
Line 52... Line 53...
52
    void printPreview(QPrinter * printer);
53
    void printPreview(QPrinter * printer);
53
    void openLocation(void);
54
    void openLocation(void);
54
    void openExternal(void);
55
    void openExternal(void);
55
};
56
};
56
 
57
 
57
class QmWebView : public QWebView
58
class QmWebView : public QWebEngineView
58
{
59
{
59
    Q_OBJECT
60
    Q_OBJECT
60
 
61
 
61
public:
62
public:
62
    QmWebView(QWidget * parent = 0 ) : QWebView(parent)
63
    QmWebView(QWidget * parent = 0 ) : QWebEngineView(parent)
63
    {
64
    {
64
        tab = 0;
65
        tab = 0;
65
        connect(this,SIGNAL(urlChanged(QUrl)), this,SLOT(lurlChanged(QUrl)));
66
        connect(this,SIGNAL(urlChanged(QUrl)), this,SLOT(lurlChanged(QUrl)));
66
    }
67
    }
67
    void setUrl(const QString &url)
68
    void setUrl(const QString &url)
68
    {
69
    {
69
        homeUrl = url;
70
        homeUrl = url;
70
        //qDebug("QmWebView::setUrl:%s", qPrintable(url));
71
        //qDebug("QmWebView::setUrl:%s", qPrintable(url));
71
        QWebView::setUrl(QUrl(url,QUrl::TolerantMode));
72
        load(QUrl(url,QUrl::TolerantMode));
72
    }
73
    }
73
 
74
 
74
    void setTab (const int utab) { tab = utab; }
75
    void setTab (const int utab) { tab = utab; }
75
    void home(void) { QWebView::setUrl(QUrl(homeUrl,QUrl::TolerantMode)); }
76
    void home(void) {load(QUrl(homeUrl,QUrl::TolerantMode)); }
76
    QString homeUrl;
77
    QString homeUrl;
77
    int tab;
78
    int tab;
78
    //void contextMenuEvent ( QContextMenuEvent * event )
79
    //void contextMenuEvent ( QContextMenuEvent * event )
79
    //{
80
    //{
80
    //    qDebug("QmWebView::contextMenuEvent");
81
    //    qDebug("QmWebView::contextMenuEvent");
81
    //    QWebView::contextMenuEvent(event);
82
    //    QWebView::contextMenuEvent(event);
82
    //}
83
    //}
83
    QWebView * createWindow ( QWebPage::WebWindowType type )
84
    QWebEngineView * createWindow ( QWebEnginePage::WebWindowType type )
84
    {
85
    {
85
        //qDebug("QmWebView::createWindow:%d", type);
86
        //qDebug("QmWebView::createWindow:%d", type);
86
        QWebView *nwv = QmReportWindow::newTab();
87
        QWebEngineView *nwv = QmReportWindow::newTab();
87
        //qDebug("QmWebView::createWindow:%p", nwv);
88
        //qDebug("QmWebView::createWindow:%p", nwv);
88
        return(nwv);
89
        return(nwv);
89
    }
90
    }
90
 
91
 
91
    private slots:
92
    private slots: