diff --git a/src/browser.hxx b/src/browser.hxx index 1d4238a..e05e994 100644 --- a/src/browser.hxx +++ b/src/browser.hxx @@ -8,6 +8,7 @@ #ifndef BROWSER_HXX #define BROWSER_HXX +#include #include #include #include @@ -47,11 +48,6 @@ #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - extern QString TMP; //! @addtogroup browser @@ -81,10 +77,11 @@ class Browser: public QMainWindow, protected Ui::Browser { _searchEngines(new QComboBox), _bookmarkfile(bookmarkfile), _executor(&_settings) { - LOG<setVisible(qbrowserlib::Log::DEBUG); actionStop->setVisible(false); actionReload->setVisible(false); show(); @@ -239,7 +236,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } ~Browser() { - LOG; + TRC; QWebSettings::clearIconDatabase(); } @@ -260,7 +257,7 @@ class Browser: public QMainWindow, protected Ui::Browser { protected: void closeEvent(QCloseEvent *event) { - LOG; + TRC; if (!_kiosk && ((!_startUrl && _settings.flag("SaveWindowState") && _settings()) || _bookmarkfile.writeable())) @@ -280,7 +277,7 @@ class Browser: public QMainWindow, protected Ui::Browser { private Q_SLOTS: void load() { - LOG; + TRC; if (qobject_cast(_url)) load(qobject_cast(_url)->currentText()); else @@ -298,7 +295,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void load(QUrl page, QWebView* view=0) { - LOG<showMessage(tr("Checking: %1").arg(page.toString())); if (!check(page)) { LOG<<"########## BLACK LISTED IGNORED ##########"; @@ -618,7 +615,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void zoom(int i) { - LOG<showMessage(tr("Zoom: %1%").arg(i)); qobject_cast(_tabs->currentWidget())->setZoomFactor(i/100.0); } @@ -628,12 +625,12 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionHome_activated() { - LOG; + TRC; load(_home); } void on_actionNew_triggered() { - LOG; + TRC; QStringList args(QCoreApplication::arguments()); QString prg(args.takeFirst()); statusBar()->showMessage(tr("opening new window"), 5000); @@ -688,17 +685,17 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionClose_triggered() { - LOG; + TRC; close(); } void on_actionBack_triggered() { - LOG; + TRC; qobject_cast(_tabs->currentWidget())->history()->back(); } void on_actionBack_hovered() { - LOG; + TRC; if (!qobject_cast(_tabs->currentWidget())->history() ->backItem().isValid()) return; @@ -712,12 +709,12 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionForward_triggered() { - LOG; + TRC; qobject_cast(_tabs->currentWidget())->history()->forward(); } void on_actionForward_hovered() { - LOG; + TRC; if (!qobject_cast(_tabs->currentWidget())->history() ->forwardItem().isValid()) return; @@ -731,12 +728,12 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionReload_triggered() { - LOG; + TRC; qobject_cast(_tabs->currentWidget())->reload(); } void on_actionStop_triggered() { - LOG; + TRC; for (int i(0); i<_tabs->count(); ++i) qobject_cast(_tabs->widget(i))->stop(); _downloadManager->abort(); @@ -845,6 +842,10 @@ class Browser: public QMainWindow, protected Ui::Browser { .arg(SHLIB_VERSION_NUMBER) .arg(QApplication::applicationName())); } + + void on_actionDebugLog_triggered() { + qbrowserlib::Log::show(this); + } void on_actionSettings_triggered() { _settings.show(); @@ -859,7 +860,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void saveWin() { - LOG<<"Save Window State"; + TRC; LOG<<"Save Window State"; saveBookmarks(); if (!_settings()) return; QStringList tabs; @@ -872,7 +873,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void saveBookmarks() { - LOG<<"Saving Bookmarks ..."; + TRC; LOG<<"Saving Bookmarks ..."; QStringList urls; if (qobject_cast(_url)) for (int i(0); i(_url)->count(); ++i) @@ -887,7 +888,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void loadWin() { - LOG; + TRC; loadBookmarks(); if (!_settings()) return; QStringList tabs(_settings()->value("Window/Tabs").toStringList()); @@ -905,7 +906,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void loadBookmarks() { - LOG<<"Loading Bookmarks ..."; + TRC; LOG<<"Loading Bookmarks ..."; QStringList urls; if (_bookmarkfile.readable()) { LOG<<"load from file"; @@ -934,7 +935,7 @@ class Browser: public QMainWindow, protected Ui::Browser { //@{ void urlChanged(const QUrl& url) { - LOG<currentWidget()) return; LOG<<"signal on current tab"; if (qobject_cast(_url)) { @@ -947,12 +948,12 @@ class Browser: public QMainWindow, protected Ui::Browser { } void linkClicked(const QUrl& url) { - LOG<(sender())); } void iconChanged() { - LOG; + TRC; QWebView* view(qobject_cast(sender())); int index = _tabs->indexOf(view); if (index<0) return; @@ -965,26 +966,26 @@ class Browser: public QMainWindow, protected Ui::Browser { } void titleChanged(const QString& text) { - LOG<setTabText(_tabs->indexOf(qobject_cast(sender())), trUtf8("%1").arg(text)); } void statusBarMessage(const QString& text) { - LOG<showMessage(tr("Info: %1").arg(text)); } void loadProgress(int i) { - LOG<(_tabs->currentWidget())->size()); qobject_cast(_tabs->currentWidget())->resize(0,0); qobject_cast(_tabs->currentWidget())->resize(sz); @@ -1001,215 +1002,215 @@ class Browser: public QMainWindow, protected Ui::Browser { //@{ void triggeredOpenLink(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredOpenLinkInNewWindow(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredOpenFrameInNewWindow(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredDownloadLinkToDisk(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredCopyLinkToClipboard(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredOpenImageInNewWindow(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredDownloadImageToDisk(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredCopyImageToClipboard(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredBack(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredForward(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredStop(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredReload(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredCut(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredCopy(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredPaste(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredUndo(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredRedo(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToNextChar(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToPreviousChar(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToNextWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToPreviousWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToNextLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToPreviousLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToStartOfLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToEndOfLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToStartOfBlock(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToEndOfBlock(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToStartOfDocument(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredMoveToEndOfDocument(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectNextChar(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectPreviousChar(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectNextWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectPreviousWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectNextLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectPreviousLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectStartOfLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectEndOfLine(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectStartOfBlock(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectEndOfBlock(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectStartOfDocument(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectEndOfDocument(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredDeleteStartOfWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredDeleteEndOfWord(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSetTextDirectionDefault(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSetTextDirectionLeftToRight(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSetTextDirectionRightToLeft(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredToggleBold(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredToggleItalic(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredToggleUnderline(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredInspectElement(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredInsertParagraphSeparator(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredInsertLineSeparator(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } void triggeredSelectAll(bool) { - LOG<(sender())->data().toString(); + TRC; LOG<(sender())->data().toString(); } //@} @@ -1218,97 +1219,97 @@ class Browser: public QMainWindow, protected Ui::Browser { //@{ void contentsChanged() { - LOG; + TRC; } void databaseQuotaExceeded(QWebFrame* frame, QString databaseName) { - LOG<showMessage(tr("%1", "statusbar for hovered link %1=url") .arg(link)); } // void loadFinished(bool ok) { -// LOG<<(ok?"succeess":"error"); +// TRC; LOG<<(ok?"succeess":"error"); // } // void loadProgress(int progress) { -// LOG<header(QNetworkRequest::ContentTypeHeader).toString(); + TRC; LOG<header(QNetworkRequest::ContentTypeHeader).toString(); LOG<<"Status:"<<_downloadManager->networkError(reply->error()); QList rh(reply->rawHeaderPairs()); for(QList::iterator it(rh.begin()); @@ -1320,6 +1321,7 @@ class Browser: public QMainWindow, protected Ui::Browser { //! check and handle content that is defined in settings void metaDataChanged(QNetworkReply* reply) { + TRC; QString filename (QString::fromUtf8(reply->rawHeader("Content-Disposition"))); if (filename.contains @@ -1343,7 +1345,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void handleContent(QNetworkReply* reply) { - LOG<<"Location:"<header(QNetworkRequest::LocationHeader) + TRC; LOG<<"Location:"<header(QNetworkRequest::LocationHeader) .toString(); LOG<<"Content-Type:"<header(QNetworkRequest::ContentTypeHeader) .toString(); @@ -1368,7 +1370,7 @@ class Browser: public QMainWindow, protected Ui::Browser { //@} void windowCloseRequested() { - LOG; + TRC; } //@} @@ -1392,7 +1394,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void finished() { - LOG; + TRC; QApplication::restoreOverrideCursor(); actionStop->setVisible(false); actionReload->setVisible(true); @@ -1402,7 +1404,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void finished(QNetworkReply *r) { - LOG; + TRC; if (r->error()!=QNetworkReply::NoError && r->error()!=QNetworkReply::OperationCanceledError) { statusBar()->showMessage(DownloadManager::networkError(r->error())); @@ -1419,7 +1421,7 @@ class Browser: public QMainWindow, protected Ui::Browser { } void errorReset() { - LOG; + TRC; _showErrorLog->hide(); } @@ -1454,7 +1456,7 @@ class Browser: public QMainWindow, protected Ui::Browser { void authenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator) { - LOG<url().toString()<realm(); + TRC; LOG<url().toString()<realm(); statusBar()->showMessage(tr("authentication required")); Authentication auth(authenticator, this); if (auth.exec()==QDialog::Rejected) reply->abort(); @@ -1462,11 +1464,11 @@ class Browser: public QMainWindow, protected Ui::Browser { void proxyAuthenticationRequired(const QNetworkProxy& proxy, QAuthenticator* authenticator) { - LOG; + TRC; } void sslErrors(QNetworkReply* reply, const QList& errors) { - LOG; + TRC; statusBar()->showMessage(tr("ssl error")); } diff --git a/src/browser.ui b/src/browser.ui index 935b476..5c26ad2 100644 --- a/src/browser.ui +++ b/src/browser.ui @@ -70,7 +70,7 @@ 0 0 1009 - 23 + 25 @@ -115,6 +115,7 @@ + @@ -479,6 +480,11 @@ Clear Search + + + Debug Log + + diff --git a/src/designer/buttonlineeditwidgetifc.hxx b/src/designer/buttonlineeditwidgetifc.hxx index 7dcb8bf..21792e6 100644 --- a/src/designer/buttonlineeditwidgetifc.hxx +++ b/src/designer/buttonlineeditwidgetifc.hxx @@ -8,13 +8,10 @@ #ifndef __BUTTONLINEEDITWIDGETIFC_HXX #define __BUTTONLINEEDITWIDGETIFC_HXX +#include #include #include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @defgroup designer //! @{ @@ -25,15 +22,15 @@ class ButtonLineEditWidgetIfc: public QObject, Q_INTERFACES(QDesignerCustomWidgetInterface); public: bool isContainer() const { - LOG; + TRC; return false; } QIcon icon() const { - LOG; + TRC; return QIcon(":/icons/buttonlineedit.png"); } QString domXml() const { - LOG; + TRC; return QString ("" @@ -48,27 +45,27 @@ class ButtonLineEditWidgetIfc: public QObject, .arg(name().toLower()); } QString group() const { - LOG; + TRC; return "Input Widgets"; } QString includeFile() const { - LOG; + TRC; return "qbrowserlib/buttonlineedit.hxx"; } QString name() const { - LOG; + TRC; return "ButtonLineEdit"; } QString toolTip() const { - LOG; + TRC; return ""; } QString whatsThis() const { - LOG; + TRC; return ""; } QWidget *createWidget(QWidget *parent) { - LOG; + TRC; return new ButtonLineEdit(parent); } }; diff --git a/src/designer/webviewwidgetifc.hxx b/src/designer/webviewwidgetifc.hxx index 17b850a..67add89 100644 --- a/src/designer/webviewwidgetifc.hxx +++ b/src/designer/webviewwidgetifc.hxx @@ -8,13 +8,10 @@ #ifndef __WEBVIEWWIDGETIFC_HXX #define __WEBVIEWWIDGETIFC_HXX +#include #include #include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @defgroup designer //! @{ @@ -26,15 +23,15 @@ class SwissWebViewWidgetIfc: public QObject, public: SwissWebViewWidgetIfc(): _initialized(false) {} bool isContainer() const { - LOG; + TRC; return true; } QIcon icon() const { - LOG; + TRC; return QIcon(":/icons/swisswebview.png"); } QString domXml() const { - LOG; + TRC; return QString ("" @@ -49,35 +46,35 @@ class SwissWebViewWidgetIfc: public QObject, .arg(name().toLower()); } QString group() const { - LOG; + TRC; return "Display Widgets [Examples]"; } QString includeFile() const { - LOG; + TRC; return "qbrowserlib/swisswebview.hxx"; } QString name() const { - LOG; + TRC; return "SwissWebView"; } QString toolTip() const { - LOG; + TRC; return ""; } QString whatsThis() const { - LOG; + TRC; return ""; } QWidget *createWidget(QWidget *parent) { - LOG; + TRC; return new qbrowserlib::SwissWebView(&_net, &_executor, parent); } bool isInitialized() { - LOG; + TRC; return _initialized; } void initialized() { - LOG; + TRC; _initialized = true; } private: diff --git a/src/downloadmanager.hxx b/src/downloadmanager.hxx index 58273d8..d8ef2d4 100644 --- a/src/downloadmanager.hxx +++ b/src/downloadmanager.hxx @@ -8,28 +8,25 @@ #ifndef __DOWNLOAD_MANAGER_HXX #define __DOWNLOAD_MANAGER_HXX +#include #include #include #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif class DownloadManager: public QObject { Q_OBJECT; public: DownloadManager& operator+=(QNetworkReply* reply) { - LOG; + TRC; add(reply); return *this; } static QString networkError(QNetworkReply::NetworkError err) { - LOG<url().toString(); + TRC; LOG<<_downloads.size()<url().toString(); LOG<(sender())].progress.first = bytesReceived; _downloads[qobject_cast(sender())].progress.second @@ -160,7 +157,7 @@ class DownloadManager: public QObject { calcProgress(); } void error(QNetworkReply::NetworkError code) { - LOG<<"Status:"<(sender())); _downloads[reply].error += tr("

Network Error

" @@ -172,11 +169,11 @@ class DownloadManager: public QObject { .arg(code); } void slotDestroyed(QObject* obj) { - LOG<<_downloads.size(); + TRC; LOG<<_downloads.size(); _downloads.erase((QNetworkReply*)obj); } void slotFinished() { - LOG<<_downloads.size(); + TRC; LOG<<_downloads.size(); QNetworkReply* reply(qobject_cast(sender())); if (_downloads[reply].error.size()) error(_downloads[reply].error); @@ -184,7 +181,7 @@ class DownloadManager: public QObject { if (_downloads.size()==0) finished(); } void slotMetaDataChanged() { - LOG; + TRC; QNetworkReply* reply(qobject_cast(sender())); if (!reply) return; LOG<<"Location:"<header(QNetworkRequest::LocationHeader) @@ -199,7 +196,7 @@ class DownloadManager: public QObject { metaDataChanged(reply); } void sslErrors(const QList & errors) { - LOG; + TRC; QNetworkReply* reply(qobject_cast(sender())); for (QList::const_iterator err(errors.begin()); err!=errors.end(); ++err) { @@ -261,7 +258,7 @@ class DownloadManager: public QObject { } void uploadProgress(qint64 bytesSent, qint64 bytesTotal) { - //LOG<(sender())].progress.first = bytesSent; _downloads[qobject_cast(sender())].progress.second diff --git a/src/errorlog.hxx b/src/errorlog.hxx index fee9587..99cc94c 100644 --- a/src/errorlog.hxx +++ b/src/errorlog.hxx @@ -8,6 +8,7 @@ #ifndef ERRORLOG_HXX #define ERRORLOG_HXX +#include #include #include @@ -18,13 +19,16 @@ class ErrorLog: public QDialog, protected Ui::ErrorLog { void reset(); public: ErrorLog(QWidget* p): QDialog(p) { + TRC; setupUi(this); } void append(QString text) { + TRC; LOG<append(text); } protected Q_SLOTS: void on__buttons_clicked(QAbstractButton* button) { + TRC; switch (_buttons->buttonRole(button)) { case QDialogButtonBox::ResetRole: { _errors->clear(); diff --git a/src/logincertificate.hxx b/src/logincertificate.hxx index 96de65e..ef726d3 100644 --- a/src/logincertificate.hxx +++ b/src/logincertificate.hxx @@ -8,15 +8,18 @@ #ifndef LOGINCERTIFICATE_HXX #define LOGINCERTIFICATE_HXX +#include #include class LoginCertificate: public QDialog, protected Ui::LoginCertificate { public: LoginCertificate(QWidget* p): QDialog(p) { + TRC; setupUi(this); setup(); } LoginCertificate& setup() { + TRC; QSslCertificate c(QSslConfiguration::defaultConfiguration() .localCertificate()); _cert->certificate(c); @@ -24,6 +27,7 @@ class LoginCertificate: public QDialog, protected Ui::LoginCertificate { } protected: virtual void showEvent(QShowEvent *event) { + TRC; setup(); QDialog::showEvent(event); } diff --git a/src/main.cxx b/src/main.cxx index 75d50f8..1b48931 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -8,6 +8,9 @@ // 1 2 3 4 5 6 7 8 // 45678901234567890123456789012345678901234567890123456789012345678901234567890 +#include +#include + #include #include #include @@ -20,7 +23,6 @@ #include #include -#include #include #include @@ -46,197 +48,6 @@ QString TMP; -const QByteArray SWISSSIGN_EV_GOLD_CA_2009_G2 - ("-----BEGIN CERTIFICATE-----\n" - "MIIGvzCCBaegAwIBAgIQAPI39KUS4aGJo+mkR4+YuTANBgkqhkiG9w0BAQUFADBN\n" - "MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMScwJQYDVQQDEx5T\n" - "d2lzc1NpZ24gRVYgR29sZCBDQSAyMDA5IC0gRzIwHhcNMTAwNDI5MDgyMzA2WhcN\n" - "MTIwNDI5MDgyMzA2WjCCASQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w\n" - "CwYDVQQHEwRCZXJuMSAwHgYDVQQKExdEaWUgU2Nod2VpemVyaXNjaGUgUG9zdDEa\n" - "MBgGA1UEAxMRaWRwLnN3aXNzc2lnbi5uZXQxJzAlBgkqhkiG9w0BCQEWGG9wZXJh\n" - "dGlvbnNAc3dpc3NzaWduLmNvbTEbMBkGA1UECRMSVmlrdG9yaWFzdHJhc3NlIDIx\n" - "MQ0wCwYDVQQREwQzMDMwMRUwEwYLKwYBBAGCNzwCAQITBEJlcm4xEzARBgsrBgEE\n" - "AYI3PAIBAxMCQ0gxGzAZBgNVBA8TElYxLjAsIENsYXVzZSA1LihiKTEbMBkGA1UE\n" - "BRMSQ0gtMDM1LjguMDE3LjIxNy03MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" - "CgKCAQEA6vtopNyjugIQb+OwsjcAN60Uo1ClcnFa+0Eme5MOCQg8khGwux42aRTL\n" - "kUfcTrOye4J8ThE5/9Qm32hagA+mPQRWAkQqZKDJCPU7LMEQKzClZs4LYA04Vv32\n" - "WFbeSVh3tK6j92tQ8mbtUep1S/dye9j72P1WQxdd2uJrwzQgA3ftEoVJ6lOMEcBS\n" - "cR4lfCdFbQMSwfRI3g2BKPfuYZ+Vp90rF/0Si2kNd1CrBYdLhoZFvPFBapdcK9g/\n" - "QzBXfoLQb7MZkR3o8HtUOzcmEl7fhvO/8PEh5hJgn/hnLlFW0TIrqd/ag+n4U17V\n" - "isDHS13eaSPE7qq1xhfeTda2QBk9/wIDAQABo4ICwDCCArwwHAYDVR0RBBUwE4IR\n" - "aWRwLnN3aXNzc2lnbi5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG\n" - "AQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUs/yd7N1TLOjtmtcB+S16SzcX5W8w\n" - "HwYDVR0jBBgwFoAUiHRGbcd8tfpycRnevydeDWjg9ycwgf8GA1UdHwSB9zCB9DBH\n" - "oEWgQ4ZBaHR0cDovL2NybC5zd2lzc3NpZ24ubmV0Lzg4NzQ0NjZEQzc3Q0I1RkE3\n" - "MjcxMTlERUJGMjc1RTBENjhFMEY3MjcwgaiggaWggaKGgZ9sZGFwOi8vZGlyZWN0\n" - "b3J5LnN3aXNzc2lnbi5uZXQvQ049ODg3NDQ2NkRDNzdDQjVGQTcyNzExOURFQkYy\n" - "NzVFMEQ2OEUwRjcyNyUyQ089U3dpc3NTaWduJTJDQz1DSD9jZXJ0aWZpY2F0ZVJl\n" - "dm9jYXRpb25MaXN0P2Jhc2U/b2JqZWN0Q2xhc3M9Y1JMRGlzdHJpYnV0aW9uUG9p\n" - "bnQwYgYDVR0gBFswWTBXBglghXQBWQECAQEwSjBIBggrBgEFBQcCARY8aHR0cDov\n" - "L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS9Td2lzc1NpZ24tR29sZC1DUC1DUFMt\n" - "UjQucGRmMIHGBggrBgEFBQcBAQSBuTCBtjBkBggrBgEFBQcwAoZYaHR0cDovL3N3\n" - "aXNzc2lnbi5uZXQvY2dpLWJpbi9hdXRob3JpdHkvZG93bmxvYWQvODg3NDQ2NkRD\n" - "NzdDQjVGQTcyNzExOURFQkYyNzVFMEQ2OEUwRjcyNzBOBggrBgEFBQcwAYZCaHR0\n" - "cDovL29jc3Auc3dpc3NzaWduLm5ldC84ODc0NDY2REM3N0NCNUZBNzI3MTE5REVC\n" - "RjI3NUUwRDY4RTBGNzI3MA0GCSqGSIb3DQEBBQUAA4IBAQCNpT2u/s/IKqXrWmHX\n" - "TTVbW2Kh8xul9jLole+hWXtx8Ln4E8oW+bV25HGUjt8QrC1wXGABRCijgIjQ8PtR\n" - "CQrcwJCmC9ShcckP7KXiaETaT67TUB8qIQ/pf3akNeWKcdFGcD6CDYM7umuu1Q1X\n" - "326mufNviiqlU0uoK1LJQHhme3HMHarYdzkuIeShvIYHUYP3JnorXaizcCqjBhdF\n" - "rj4QcCZx8hKE6gmNL+dJkBM/5CSqByy15tMs2qa0iMdwkPUiNxlL0VuZkwzooVQx\n" - "1eKQwsSx3807MkQMKs+4v1LexkY+5/xU9dvtyRysjuSEWS8yCx3+E3fOOVAIX5jD\n" - "0uSX\n" - "-----END CERTIFICATE-----"); -const QByteArray SWISSSIGN_SERVER_GOLD_CA_2008_G2 - ("-----BEGIN CERTIFICATE-----\n" - "MIIGXjCCBEagAwIBAgIIXsz6acAzJ+8wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UE\n" - "BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEfMB0GA1UEAxMWU3dpc3NTaWdu\n" - "IEdvbGQgQ0EgLSBHMjAeFw0wODA3MDcxNzA2MDNaFw0yMzA3MDcxNzA2MDNaMFEx\n" - "CzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3\n" - "aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDA4IC0gRzIwggEiMA0GCSqGSIb3DQEB\n" - "AQUAA4IBDwAwggEKAoIBAQDNMradteMVxVvR6t+pOooZejP8r1lY85el0PB7C118\n" - "iKYv1Apfq3mZ0wt7ZdpCyd2DzKE338Ki04Qn9IidLCkKDLOSNtlQlw4Yvg12W2bU\n" - "/WVaVAeUN0Tn3VeCkdWbSRIbvTGU63X9dp5lbgEm8XyjpLAK3SKABn7dWivfWuBo\n" - "oUCy64hJ+fSWljJmqG772Qmc9p3GxfN7/L227JH4SMaOwVcJd0rkvMTi1bWa1XFp\n" - "Q3lIlxW91JBEKqBKsru1h7wOq81VwIa3a2pdFgWY8F45G7M2Om9bLL5TiJ3Emkbl\n" - "gKIFRX+GztmnQdKdY8c8rpknh/jWr6YiqYm+jV6+crGhAgMBAAGjggJEMIICQDAO\n" - "BgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUl3be\n" - "CjTlEJpAxOvYnVpTeyHMRz4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn\n" - "8O4wgf8GA1UdHwSB9zCB9DBHoEWgQ4ZBaHR0cDovL2NybC5zd2lzc3NpZ24ubmV0\n" - "LzVCMjU3Qjk2QTQ2NTUxN0VCODM5RjNDMDc4NjY1RUU4M0FFN0YwRUUwgaiggaWg\n" - "gaKGgZ9sZGFwOi8vZGlyZWN0b3J5LnN3aXNzc2lnbi5uZXQvQ049NUIyNTdCOTZB\n" - "NDY1NTE3RUI4MzlGM0MwNzg2NjVFRTgzQUU3RjBFRSUyQ089U3dpc3NTaWduJTJD\n" - "Qz1DSD9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2U/b2JqZWN0Q2xhc3M9\n" - "Y1JMRGlzdHJpYnV0aW9uUG9pbnQwYgYDVR0gBFswWTBXBglghXQBWQECAQMwSjBI\n" - "BggrBgEFBQcCARY8aHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS9Td2lz\n" - "c1NpZ24tR29sZC1DUC1DUFMtUjMucGRmMHQGCCsGAQUFBwEBBGgwZjBkBggrBgEF\n" - "BQcwAoZYaHR0cDovL3N3aXNzc2lnbi5uZXQvY2dpLWJpbi9hdXRob3JpdHkvZG93\n" - "bmxvYWQvNUIyNTdCOTZBNDY1NTE3RUI4MzlGM0MwNzg2NjVFRTgzQUU3RjBFRTAN\n" - "BgkqhkiG9w0BAQUFAAOCAgEAPuJBwXDS9McQwt5Gp0xHGpeiTCr4qmBwIKM33x8J\n" - "U3xjHQ/ynptuwkI5sqQsUcfuHe6uipqA3lIJoBM8u6M65jg/tZTsLoExFE+DtOf5\n" - "pHDvUXMFwhsjv9AbkhL6X1LBZAZEMkOpnuRdR2FD0wy1Kh4Hbel9LwmmaYJdfH5a\n" - "tkKVlHsN0b6stJ6zEX0dIgi/7M4FYaAZgoxBS1OijPxFCSl0sFT6UYf0GYXcr6M+\n" - "URLc1NBofDHo/lIrTygFNfk7PIvOrBoREiOqNtE5RnuGyJa+tt2y2P3QyGBE6Ppi\n" - "e/VCCMJagmH8yel0WhuyDUJE35bpNEL34w+pJKr7ApQ1sT0yh607jGEbl53Y+vFC\n" - "Uuwo39MMqzx26notCbj0izccf+nDuW05jFQWmRc6OCI2L9Yw34r+1PQTmQe1TKx6\n" - "FqnW3WP66ZwbXfGXwwfqmjcK+42695kQYSLsDfNaxxkCBTkt+MauYgXWiOfzAnYz\n" - "R2nMQ/LHTDsTpTMkJ+eA/bHcrUJVkBHNWDiolD5C03oSFY0fPRlSnfXHRpgcOkq8\n" - "yI/OYArKo4tvQpAYPnG7ELI/j2grgRx6xutuVMYVmzhr/JnqFto5Eg32hKjA5H5+\n" - "c4Ssw1ZaGGMMb9aMFlnJi4SYoXB8MfL+SU/u1K54dM1mV/oFK6e2dtGgaYDdV86v\n" - "0qo=\n" - "-----END CERTIFICATE-----"); -const QByteArray SWISSSIGN_GOLD_CA_G2 - ("-----BEGIN CERTIFICATE-----\n" - "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\n" - "-----END CERTIFICATE-----\n"); -const QByteArray SWISSSIGN_PLATINUM_CA_G2 - ("-----BEGIN CERTIFICATE-----\n" - "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\n" - "-----END CERTIFICATE-----\n"); -const QByteArray SWISSSIGN_SILVER_CA_G2 - ("-----BEGIN CERTIFICATE-----\n" - "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\n" - "-----END CERTIFICATE-----\n"); - -void notrace(QtMsgType, const char*) { - return; -} - extern QWEBKIT_EXPORT void qt_drt_overwritePluginDirectories(); QMap& env() { @@ -286,7 +97,7 @@ QString helptext() { " PROXY_HOST proxy host name (actual: %4)\n" " SWISS_USERAGENT fake user agent (actual: %6)\n" " QT_PLUGIN_PATH path to plugins dir (actual: %7)\n" - " QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)\n") + " QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)") .arg(QFileInfo(QCoreApplication::arguments().at(0)).fileName()) .arg(env()["PROXY_TYPE"]).arg(env()["PROXY_PORT"]).arg(env()["PROXY_HOST"]) .arg(env()["LANGUAGE"]).arg(env()["SWISS_USERAGENT"]) @@ -294,29 +105,10 @@ QString helptext() { } int main(int argv, char** argc) try { -// qInstallMsgHandler(notrace); -// std::cout.rdbuf((new std::stringstream)->rdbuf()); -// std::cerr.rdbuf((new std::stringstream)->rdbuf()); -// std::clog.rdbuf((new std::stringstream)->rdbuf()); //............................................................................ QSslConfiguration sslConfig(QSslConfiguration::defaultConfiguration()); sslConfig.setProtocol(QSsl::AnyProtocol); sslConfig.setPeerVerifyMode(QSslSocket::AutoVerifyPeer); - QList certs(sslConfig.caCertificates()); - for (QList::iterator cert(certs.begin()); - cert!=certs.end(); ++cert) { - qDebug()<<"CERTIFICATE: " - <issuerInfo(QSslCertificate::Organization) - <issuerInfo(QSslCertificate::CommonName) - <subjectInfo(QSslCertificate::Organization) - <subjectInfo(QSslCertificate::CommonName); - } - // certs.push_back(QSslCertificate(SWISSSIGN_EV_GOLD_CA_2009_G2)); - // certs.push_back(QSslCertificate(SWISSSIGN_GOLD_CA_G2)); - // //certs.push_back(QSslCertificate(SWISSSIGN_SERVER_GOLD_CA_2008_G2)); - // certs.push_back(QSslCertificate(SWISSSIGN_SILVER_CA_G2)); - // certs.push_back(QSslCertificate(SWISSSIGN_PLATINUM_CA_G2)); - // sslConfig.setCaCertificates(certs); //............................................................................ QTextCodec* utf8(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(utf8); @@ -333,28 +125,6 @@ int main(int argv, char** argc) try { QTranslator appTranslator; appTranslator.load(":/language/swissbrowser_"+ QLocale().name()); app.installTranslator(&appTranslator); - //............................................................................ - if (env()["PROXY_TYPE"]=="http") - QNetworkProxy::setApplicationProxy - (QNetworkProxy - (QNetworkProxy::HttpProxy, - env()["PROXY_HOST"], env()["PROXY_PORT"].toInt())); - if (env()["PROXY_TYPE"]=="socks") - QNetworkProxy::setApplicationProxy - (QNetworkProxy - (QNetworkProxy::Socks5Proxy, - env()["PROXY_HOST"], env()["PROXY_PORT"].toInt())); - else - QNetworkProxyFactory::setUseSystemConfiguration(true); - qDebug()<<"***************************************************************"; - qDebug()<<"Start - Proxy:" - <<(QNetworkProxy::applicationProxy().type()==QNetworkProxy::NoProxy - ? "No Proxy" - : (QNetworkProxy::applicationProxy().type() - ==QNetworkProxy::Socks5Proxy ? "socks" : "http")) - <<"Hostname"< certs(sslConfig.caCertificates()); + for (QList::iterator cert(certs.begin()); + cert!=certs.end(); ++cert) { + LOG<<"CERTIFICATE: " + <issuerInfo(QSslCertificate::Organization) + <issuerInfo(QSslCertificate::CommonName) + <subjectInfo(QSslCertificate::Organization) + <subjectInfo(QSslCertificate::CommonName); + } QSslConfiguration::setDefaultConfiguration(sslConfig); //............................................................................ - std::cerr<<"LIBRARY PATHES:\n"< #include #include #include #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif class PinEntry: public QDialog, public Ui::PinEntry { Q_OBJECT; @@ -49,7 +46,7 @@ class PinEntry: public QDialog, public Ui::PinEntry { return _pin->text(); } int myexec() { - LOG; + TRC; _pin->clear(); show(); LOG<<"SSSSSSSSSTTTTTTTAAAAAAAAAAAAARRRRRRRRRRTTTTTTTTTT"; @@ -60,18 +57,18 @@ class PinEntry: public QDialog, public Ui::PinEntry { } public Q_SLOTS: virtual void accept() { - LOG; + TRC; QDialog::accept(); } virtual void done(int r) { - LOG< #include #include #include #include #include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @addtogroup qbrowserlib //! @{ @@ -26,17 +23,17 @@ class ButtonLineEdit: public QLineEdit { Q_OBJECT; public: ButtonLineEdit(QWidget* p=0): QLineEdit(p) { - LOG; + TRC; } QToolButton* add(QAction* a) { - LOG; + TRC; QToolButton* b(new QToolButton(this)); b->setDefaultAction(a); add(b); return b; } ButtonLineEdit& add(QToolButton* b) { - LOG; + TRC; b->setParent(this); b->setStyleSheet("QToolButton { border: none; padding: 0; }"); b->setCursor(Qt::ArrowCursor); @@ -45,7 +42,7 @@ class ButtonLineEdit: public QLineEdit { return *this; } ButtonLineEdit& changeStyleSheet(QString s) { - LOG; + TRC; _style = s; resizeEvent(0); return *this; diff --git a/src/qbrowserlib/executor.hxx b/src/qbrowserlib/executor.hxx index e6cb83d..c6d0ac5 100644 --- a/src/qbrowserlib/executor.hxx +++ b/src/qbrowserlib/executor.hxx @@ -8,6 +8,7 @@ #ifndef QBROWSERLIB_EXECUTOR_HXX #define QBROWSERLIB_EXECUTOR_HXX +#include #include #include @@ -31,6 +32,7 @@ namespace qbrowserlib { Executor(Settings* settings=0): _settings(settings) {} ~Executor() { + TRC; for (DownloadProcesses::iterator it(_downloadProcesses.begin()); it!=_downloadProcesses.end(); ++it) { LOG<<"cleanup:"<second->fileName(); @@ -52,7 +54,7 @@ namespace qbrowserlib { public Q_SLOTS: void run(QNetworkReply* reply, QString filename, QString command) { - LOG<(sender())) == _downloadProcesses.end()) return; if (_downloadProcesses[qobject_cast(sender())]) diff --git a/src/qbrowserlib/log.cxx b/src/qbrowserlib/log.cxx new file mode 100644 index 0000000..b16e490 --- /dev/null +++ b/src/qbrowserlib/log.cxx @@ -0,0 +1,100 @@ +/*! @file + + @id $Id$ +*/ +// 1 2 3 4 5 6 7 8 +// 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +#include + +namespace qbrowserlib { + + bool Log::DEBUG(false); + LogDialog* Log::_dialog(0); + unsigned int Log::_level(0); + + Log::Log(const void* addr, const std::string& name, + const std::string& file, unsigned long line): + _debug(DEBUG), _addr(addr), _name(name), _file(file), _line(line) { + if (!_debug) return; + ++_level; + std::stringstream ss; + init(ss); + indent(ss)<<"\\ "<<_name; + std::clog<_logs->resizeColumnsToContents(); + _dialog->_logs->resizeRowsToContents(); + _dialog->show(); + } + + std::stringstream& Log::init(std::stringstream& ss) { + if (_addr) + ss< LogDialog& LogDialog::append + (const Log& log, std::string arg) { + return append(log, QString::fromStdString(arg)); + } + template<> LogDialog& LogDialog::append + (const Log& log, const char* arg) { + return append(log, QString(arg)); + } + template<> LogDialog& LogDialog::append + (const Log& log, unsigned long arg) { + return append(log, (qulonglong)arg); + } + + std::ostream& operator<<(std::ostream& ss, QString arg) { + ss<<'"'< + +#include + +#include +#include +#include +#include + +// supported Qt logging types +#include +#include +#include +#include + +namespace qbrowserlib { + +#ifndef LOG +#define LOG \ + QBROWSERLIB_LOCAL_TRACER +#endif + +#ifndef TRC +#define TRC \ + qbrowserlib::Log QBROWSERLIB_LOCAL_TRACER \ + (this, __PRETTY_FUNCTION__, __FILE__, __LINE__) +#endif + +#ifndef TRC_FN +#define TRC_FN \ + qbrowserlib::Log QBROWSERLIB_LOCAL_TRACER \ + (0, __PRETTY_FUNCTION__, __FILE__, __LINE__) +#endif + + class LogDialog; + + class Log { + + public: + + static bool DEBUG; + + public: + + Log(const void* addr, const std::string& name, + const std::string& file, unsigned long line); + + template Log& operator<<(TYPE arg); + + ~Log() throw(); + + static void show(QWidget* p); + + private: + + std::stringstream& init(std::stringstream& ss); + + std::stringstream& indent(std::stringstream& ss); + + std::stringstream& close(std::stringstream& ss); + + private: + + friend class LogDialog; + + static LogDialog* _dialog; + static unsigned int _level; + bool _debug; + const void* _addr; + const std::string _name; + const std::string _file; + unsigned long _line; + }; + + class LogDialog: public QDialog, public Ui::LogDialog { + + Q_OBJECT; + + public: + + LogDialog(QWidget* p): QDialog(p) { + setupUi(this); + } + + template LogDialog& append(const Log& log, TYPE* arg) { + std::ostringstream ss; + ss<<"("< LogDialog& append(const Log& log, TYPE arg) { + int pos(_logs->rowCount()); + _logs->insertRow(pos); + _logs->setItem + (pos, FILE, + new QTableWidgetItem(QString::fromStdString(log._file))); + _logs->setItem + (pos, LINE, new QTableWidgetItem(QString::number(log._line))); + if (log._addr) _logs->setItem + (pos, INSTANCE, + new QTableWidgetItem + (QString::number((qulonglong)log._addr))); + _logs->setItem + (pos, FUNCTION, + new QTableWidgetItem(QString::fromStdString(log._name))); + _logs->setItem + (pos, MESSAGE, + new QTableWidgetItem(QVariant(arg).toString())); + return *this; + } + + protected Q_SLOTS: + + void on__fileLine_toggled(bool checked) { + if (checked) { + _logs->showColumn(FILE); + _logs->showColumn(LINE); + } else { + _logs->hideColumn(FILE); + _logs->hideColumn(LINE); + } + } + + void on__instance_toggled(bool checked) { + if (checked) { + _logs->showColumn(INSTANCE); + } else { + _logs->hideColumn(INSTANCE); + } + } + + void on__function_toggled(bool checked) { + if (checked) { + _logs->showColumn(FUNCTION); + } else { + _logs->hideColumn(FUNCTION); + } + } + + void on__buttons_clicked(QAbstractButton* button) { + if (_buttons->buttonRole(button)==QDialogButtonBox::ResetRole) + for (int i(_logs->rowCount()); i>1; --i) + _logs->removeRow(i-1); + } + + void on__find_clicked(bool) { + setCursor(QCursor(Qt::BusyCursor)); + QList items + (_logs->findItems(_search->text(), + Qt::MatchWrap|Qt::MatchContains + |Qt::MatchFixedString)); + _logs->clearSelection(); + foreach (QTableWidgetItem* item, items) { + item->setSelected(true); + } + if (!items.isEmpty()) _logs->scrollToItem(items[0]); + unsetCursor(); + } + + private: + + friend class Log; + enum {FILE, LINE, INSTANCE, FUNCTION, MESSAGE} Columns; + + }; + + // note: template class method must be defined in the header + template Log& Log::operator<<(TYPE arg) { + if (!_debug) return *this; + std::stringstream ss; + init(ss); + indent(ss)<<" → "<append(*this, arg); + return *this; + } + + template<> LogDialog& LogDialog::append + (const Log& log, const char* arg); + template<> LogDialog& LogDialog::append + (const Log& log, std::string arg); + template<> LogDialog& LogDialog::append + (const Log& log, unsigned long arg); + + std::ostream& operator<<(std::ostream& ss, QString arg); + std::ostream& operator<<(std::ostream& ss, QStringList arg); + std::ostream& operator<<(std::ostream& ss, QUrl arg); + std::ostream& operator<<(std::ostream& ss, QByteArray arg); +} + +#endif diff --git a/src/qbrowserlib/log.ui b/src/qbrowserlib/log.ui new file mode 100644 index 0000000..06bfe0c --- /dev/null +++ b/src/qbrowserlib/log.ui @@ -0,0 +1,203 @@ + + + LogDialog + + + + 0 + 0 + 957 + 736 + + + + Debug Log + + + + + + + + Show Columns + + + + + + File/Line + + + true + + + + + + + Instance + + + true + + + + + + + Function + + + true + + + + + + + + + + Find Text + + + + + + + + + Find + + + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + false + + + false + + + true + + + QAbstractItemView::NoSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + true + + + true + + + + File + + + AlignLeft|AlignTop + + + + + Line + + + AlignLeft|AlignTop + + + + + Instance + + + AlignLeft|AlignTop + + + + + Function + + + AlignLeft|AlignTop + + + + + Message + + + AlignJustify|AlignTop + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close|QDialogButtonBox::Reset + + + true + + + + + + + + + _buttons + accepted() + LogDialog + accept() + + + 227 + 640 + + + 157 + 274 + + + + + _buttons + rejected() + LogDialog + reject() + + + 295 + 646 + + + 286 + 274 + + + + + diff --git a/src/qbrowserlib/pluginfactory.hxx b/src/qbrowserlib/pluginfactory.hxx index 0631ea1..8e0a5f3 100644 --- a/src/qbrowserlib/pluginfactory.hxx +++ b/src/qbrowserlib/pluginfactory.hxx @@ -8,14 +8,10 @@ #ifndef __PLUGINFACTORY_HXX__ #define __PLUGINFACTORY_HXX__ +#include #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @addtogroup qbrowserlib //! @{ @@ -31,7 +27,7 @@ namespace qbrowserlib { PluginFactory(QNetworkAccessManager* net, Executor* executor, QObject* p=0): QWebPluginFactory(p), _net(net), _executor(executor) { - LOG; + TRC; // Plugin plugin; // plugin.name = "Show PDF-Document"; // plugin.description = "Plugin for PDF documents"; @@ -45,7 +41,7 @@ namespace qbrowserlib { virtual QObject* create(const QString& mimeType, const QUrl& url, const QStringList& argumentNames, const QStringList& argumentValues ) const { - LOG<<"mimeType:"< plugins() const { - LOG; + TRC; return _plugins; } virtual void refreshPlugins() { - LOG; + TRC; } private: QList _plugins; diff --git a/src/qbrowserlib/qbrowserlib_de.ts b/src/qbrowserlib/qbrowserlib_de.ts index 313ffe3..2ae29cc 100644 --- a/src/qbrowserlib/qbrowserlib_de.ts +++ b/src/qbrowserlib/qbrowserlib_de.ts @@ -2,6 +2,61 @@ UTF-8 + + LogDialog + + + Debug Log + + + + + Show Columns + + + + + File/Line + + + + + + Instance + + + + + + Function + + + + + Find Text + + + + + Find + + + + + File + + + + + Line + + + + + Message + + + SaveOrRun @@ -523,12 +578,12 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + File Exists - + File already exists: %1 @@ -537,12 +592,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -551,23 +606,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -576,7 +631,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts index 8f31239..54e142f 100644 --- a/src/qbrowserlib/qbrowserlib_en.ts +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -2,6 +2,61 @@ UTF-8 + + LogDialog + + + Debug Log + + + + + Show Columns + + + + + File/Line + + + + + + Instance + + + + + + Function + + + + + Find Text + + + + + Find + + + + + File + + + + + Line + + + + + Message + + + SaveOrRun @@ -523,12 +578,12 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + File Exists - + File already exists: %1 @@ -537,12 +592,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -551,23 +606,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -576,7 +631,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts index 7889f37..60a3c32 100644 --- a/src/qbrowserlib/qbrowserlib_fr.ts +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -2,6 +2,61 @@ UTF-8 + + LogDialog + + + Debug Log + + + + + Show Columns + + + + + File/Line + + + + + + Instance + + + + + + Function + + + + + Find Text + + + + + Find + + + + + File + + + + + Line + + + + + Message + + + SaveOrRun @@ -523,12 +578,12 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + File Exists - + File already exists: %1 @@ -537,12 +592,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -551,23 +606,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -576,7 +631,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts index 11bcf7a..f8608c1 100644 --- a/src/qbrowserlib/qbrowserlib_it.ts +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -2,6 +2,61 @@ UTF-8 + + LogDialog + + + Debug Log + + + + + Show Columns + + + + + File/Line + + + + + + Instance + + + + + + Function + + + + + Find Text + + + + + Find + + + + + File + + + + + Line + + + + + Message + + + SaveOrRun @@ -523,12 +578,12 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + File Exists - + File already exists: %1 @@ -537,12 +592,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -551,23 +606,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -576,7 +631,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qmake.pro.in b/src/qbrowserlib/qmake.pro.in index babd10d..4027714 100644 --- a/src/qbrowserlib/qmake.pro.in +++ b/src/qbrowserlib/qmake.pro.in @@ -32,9 +32,10 @@ TRANSLATIONS = @srcdir@/qbrowserlib_en.ts \ @srcdir@/qbrowserlib_fr.ts \ @srcdir@/qbrowserlib_it.ts -SOURCES = @srcdir@/certs.cxx +SOURCES = @srcdir@/log.cxx @srcdir@/certs.cxx -HEADERS = @srcdir@/swisswebview.hxx @srcdir@/swisswebpage.hxx \ +HEADERS = @srcdir@/log.hxx \ + @srcdir@/swisswebview.hxx @srcdir@/swisswebpage.hxx \ @srcdir@/pluginfactory.hxx @srcdir@/saveorrun.hxx \ @srcdir@/settings.hxx \ @srcdir@/buttonlineedit.hxx \ @@ -42,7 +43,7 @@ HEADERS = @srcdir@/swisswebview.hxx @srcdir@/swisswebpage.hxx \ @srcdir@/executor.hxx \ @srcdir@/temporaryfile.hxx -FORMS = @srcdir@/saveorrun.ui @srcdir@/settings.ui +FORMS = @srcdir@/saveorrun.ui @srcdir@/settings.ui @srcdir@/log.ui RESOURCES = languages.qrc diff --git a/src/qbrowserlib/saveorrun.hxx b/src/qbrowserlib/saveorrun.hxx index f053f4f..42f45fe 100644 --- a/src/qbrowserlib/saveorrun.hxx +++ b/src/qbrowserlib/saveorrun.hxx @@ -8,6 +8,7 @@ #ifndef __SAVEORRUN_HXX__ #define __SAVEORRUN_HXX__ +#include #include #include @@ -21,10 +22,6 @@ #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif //! @addtogroup qbrowserlib //! @{ @@ -44,7 +41,7 @@ namespace qbrowserlib { SaveOrRun(QNetworkReply* reply, Executor* executor, QString type, QString src, QWidget* p=0): QWidget(p), _reply(reply), _executor(executor) { - LOG; + TRC; setupUi(this); QString obj(remoteFilename()); _rememberPath->setVisible(false); @@ -59,6 +56,7 @@ namespace qbrowserlib { //! Run configured application if mime type is preconfigured. bool handlePreconfigured() { + TRC; QString filename(remoteFilename()); QStringList type (_executor->settings()->mimetype @@ -78,6 +76,7 @@ namespace qbrowserlib { } QString remoteFilename() { + TRC; QString filename (QString::fromUtf8(_reply->rawHeader("Content-Disposition"))); if (filename.contains @@ -98,19 +97,19 @@ namespace qbrowserlib { } QString filename() { - LOG; + TRC; return _filename->text(); } QString program() { - LOG; + TRC; return _program->text(); } public Q_SLOTS: void save() { - LOG; + TRC; QFile file(filename()); file.open(QIODevice::WriteOnly); file.write(_reply->readAll()); @@ -119,7 +118,7 @@ namespace qbrowserlib { } void run() { - LOG<run(_reply, filename(), program()+" %1"); accept(); } @@ -127,7 +126,7 @@ namespace qbrowserlib { protected Q_SLOTS: void on__saveFileAs_clicked(bool=true) { - LOG; + TRC; if (QFileInfo(filename()).exists() && QMessageBox::question(this, tr("File Exists"), tr("File already exists:\n\n" @@ -139,7 +138,7 @@ namespace qbrowserlib { } void on__openFileIn_clicked(bool=true) { - LOG; + TRC; if (!QFile::exists(program()) || !QFileInfo(program()).isExecutable()) { QMessageBox::warning(this, tr("No Program"), @@ -153,7 +152,7 @@ namespace qbrowserlib { } void on__browseSaveAs_clicked(bool) { - LOG; + TRC; QString saveFile (QFileDialog::getSaveFileName(this, tr("Save File As ..."), _filename->text(), QString(), 0, @@ -166,7 +165,7 @@ namespace qbrowserlib { } void on__browseOpenWith_clicked(bool) { - LOG; + TRC; QString openFile (QFileDialog::getOpenFileName(this, tr("Open File With ..."), _program->text())); @@ -176,7 +175,7 @@ namespace qbrowserlib { } QString savePath() { - LOG; + TRC; QString path(QDir::homePath()); QStringList defpaths; defpaths<<"downloads"<<"Downloads"<<"Documents" @@ -209,7 +208,7 @@ namespace qbrowserlib { bool kiosk=false, QWidget* p=0): SaveOrRun(reply, executor, mime, url.toString(), p) { - LOG; + TRC; setAutoFillBackground(true); _type->setText(mime); _source->setText(url.host()); @@ -233,7 +232,7 @@ namespace qbrowserlib { QString type, QString src, bool kiosk=false, QWidget* p=0): QDialog(p), _sor(new SaveOrRun(reply, executor, type, src)) { - LOG; + TRC; setWindowTitle(tr("Unknown File Type")); QVBoxLayout* l(new QVBoxLayout(this)); l->addWidget(_sor); diff --git a/src/qbrowserlib/settings.hxx b/src/qbrowserlib/settings.hxx index 5d2f71b..3be8f4d 100644 --- a/src/qbrowserlib/settings.hxx +++ b/src/qbrowserlib/settings.hxx @@ -8,6 +8,7 @@ #ifndef QBROWSERLIB_SETTINGS_HXX #define QBROWSERLIB_SETTINGS_HXX +#include #include #include @@ -17,10 +18,6 @@ #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif namespace qbrowserlib { @@ -117,7 +114,7 @@ namespace qbrowserlib { } void setAttribute(QWebSettings::WebAttribute attr, bool state) { - //LOG; + //TRC; QWebSettings::globalSettings()->setAttribute(attr, state); _attributes[attr]->setChecked(state); } @@ -147,7 +144,7 @@ namespace qbrowserlib { } QString& replaceSearchEngine(QString& url) { - LOG; + TRC; int len(url.indexOf(QRegExp("[ :]"))); if (len<=0) return url; QString scheme(url.left(len)); @@ -165,7 +162,7 @@ namespace qbrowserlib { } bool save() { - LOG; + TRC; if (!_settings || !_settings->isWritable()) return false; // Attributes for (Attributes::iterator it(_attributes.begin()); @@ -191,7 +188,7 @@ namespace qbrowserlib { } bool load(bool overwriteMimeTypes=true) { - LOG; + TRC; if (!_settings) return false; // Attributes for (Attributes::iterator it(_attributes.begin()); @@ -242,7 +239,7 @@ namespace qbrowserlib { private Q_SLOTS: void on__buttons_accepted() { - LOG; + TRC; // Attributes for (Attributes::iterator it(_attributes.begin()); it!=_attributes.end(); ++it) @@ -274,7 +271,7 @@ namespace qbrowserlib { } void on__buttons_rejected() { - LOG; + TRC; // Attributes for (Attributes::iterator it(_attributes.begin()); it!=_attributes.end(); ++it) diff --git a/src/qbrowserlib/swisswebpage.hxx b/src/qbrowserlib/swisswebpage.hxx index e44287b..1dc275b 100644 --- a/src/qbrowserlib/swisswebpage.hxx +++ b/src/qbrowserlib/swisswebpage.hxx @@ -8,17 +8,13 @@ #ifndef __SWISSWEBPAGE_HXX__ #define __SWISSWEBPAGE_HXX__ +#include #include #include #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @addtogroup qbrowserlib //! @{ @@ -72,7 +68,7 @@ namespace qbrowserlib { QObject* createPlugin(const QString& classid, const QUrl& url, const QStringList& paramNames, const QStringList& paramValues) { - LOG<<"classid:"< #include #include #include @@ -18,10 +19,6 @@ #include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - class CryptokiEngine: public QObject, public openssl::Engine { Q_OBJECT; @@ -34,11 +31,11 @@ class CryptokiEngine: public QObject, public openssl::Engine { CryptokiEngine(std::string lib): _cryptoki(lib) { - LOG; + TRC; } operator bool() { - LOG<<"Status of CryptokiEngine: " + TRC; LOG<<"Status of CryptokiEngine: " <<(_privateKey.get() ?"privateKey defined, ":"privateKey undefined"); return _privateKey.get(); @@ -49,7 +46,7 @@ class CryptokiEngine: public QObject, public openssl::Engine { } void cert(cryptoki::Object& privateKey, const std::string& certVal) { - LOG; + TRC; _privateKey = std::auto_ptr (new cryptoki::Object(privateKey)); try { // new @@ -101,6 +98,7 @@ class CryptokiEngine: public QObject, public openssl::Engine { protected: void set(BIGNUM*& num, cryptoki::Object& key, int type, std::string name) { + TRC; try { std::string value(key.attribute(type).value); num = BN_bin2bn((const unsigned char*)value.data(), @@ -111,17 +109,17 @@ class CryptokiEngine: public QObject, public openssl::Engine { } virtual const char* id() { - LOG; + TRC; return "CryptokiEngine_ID"; } virtual const char* name() { - LOG; + TRC; return "CryptokiEngine_NAME"; } virtual std::string rsaSign(const std::string& in, unsigned int type) { - LOG<<"log; type="<=2) return ((((unsigned int)(unsigned char)res[res.size()-2])*256) @@ -311,12 +311,12 @@ class SmartCardAuth: public QObject { class Lock { public: Lock() { - LOG<1) loops().back()->exec(); // wait } ~Lock() { - LOG< #include #include #include -#include -#ifndef LOG -#define LOG qDebug()<<__PRETTY_FUNCTION__ -#endif - //! @addtogroup pkcs11 //! @{ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { @@ -24,11 +20,11 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { SslClientAuthNetworkAccessManager(QObject* parent = 0): QNetworkAccessManager(parent) { - LOG; + TRC; } virtual ~SslClientAuthNetworkAccessManager() { - LOG; + TRC; } void scAuth(SmartCardAuth* auth) { @@ -44,7 +40,7 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest& req, QIODevice* outgoingData = 0 ) { - LOG<login(false); diff --git a/src/swissbrowser_de.ts b/src/swissbrowser_de.ts index 3a449e8..b33cbc0 100644 --- a/src/swissbrowser_de.ts +++ b/src/swissbrowser_de.ts @@ -399,6 +399,10 @@ openssl-%7 handling content ... + + Debug Log + + Certificate @@ -743,8 +747,7 @@ Environment: PROXY_HOST proxy host name (actual: %4) SWISS_USERAGENT fake user agent (actual: %6) QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) - + QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) diff --git a/src/swissbrowser_en.ts b/src/swissbrowser_en.ts index 6fe59ae..87b17db 100644 --- a/src/swissbrowser_en.ts +++ b/src/swissbrowser_en.ts @@ -399,6 +399,10 @@ openssl-%7 handling content ... + + Debug Log + + Certificate @@ -743,8 +747,7 @@ Environment: PROXY_HOST proxy host name (actual: %4) SWISS_USERAGENT fake user agent (actual: %6) QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) - + QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) diff --git a/src/swissbrowser_fr.ts b/src/swissbrowser_fr.ts index 3a449e8..b33cbc0 100644 --- a/src/swissbrowser_fr.ts +++ b/src/swissbrowser_fr.ts @@ -399,6 +399,10 @@ openssl-%7 handling content ... + + Debug Log + + Certificate @@ -743,8 +747,7 @@ Environment: PROXY_HOST proxy host name (actual: %4) SWISS_USERAGENT fake user agent (actual: %6) QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) - + QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) diff --git a/src/swissbrowser_it.ts b/src/swissbrowser_it.ts index d677dff..9509f16 100644 --- a/src/swissbrowser_it.ts +++ b/src/swissbrowser_it.ts @@ -399,6 +399,10 @@ openssl-%7 handling content ... + + Debug Log + + Certificate @@ -743,8 +747,7 @@ Environment: PROXY_HOST proxy host name (actual: %4) SWISS_USERAGENT fake user agent (actual: %6) QT_PLUGIN_PATH path to plugins dir (actual: %7) - QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8) - + QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)