diff options
| author |  Fabio Bas | 2011-03-13 21:51:54 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-03-13 21:51:54 +0000 |
| commit | b974840472db2f4466282b8169c0336bced036ea (patch) | |
| tree | 1c2a94af6ecc75e12b3b41105dfa6e2677ea8106 /src | |
| parent | fixes compilation (diff) | |
| download | KVIrc-b974840472db2f4466282b8169c0336bced036ea.tar.gz KVIrc-b974840472db2f4466282b8169c0336bced036ea.tar.bz2 KVIrc-b974840472db2f4466282b8169c0336bced036ea.zip | |
webkit-enabled helpwidget: workaround to support qt 4.5, indentation fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5586 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/help/HelpWidget.cpp | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp index 8a90f66a8..2888904f6 100644 --- a/src/modules/help/HelpWidget.cpp +++ b/src/modules/help/HelpWidget.cpp @@ -43,13 +43,19 @@ extern HelpIndex * g_pDocIndex; extern KviPointerList<HelpWindow> * g_pHelpWindowList; extern KviPointerList<HelpWidget> * g_pHelpWidgetList; + #ifdef COMPILE_WEBKIT_SUPPORT #include <QtWebKit/QWebView> +#if QT_VERSION >= 0x040600 + #define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences +#else + #define HIGHLIGHT_FLAGS 0 +#endif + HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone) : QWidget(par) { - m_pLayout = new QVBoxLayout(this); m_pLayout->setMargin(3); m_pLayout->setSpacing(2); @@ -129,19 +135,19 @@ HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone) void HelpWidget::slotLoadFinished(bool ) { - - m_pTextBrowser->findText(m_pFindText->text(),QWebPage::HighlightAllOccurrences); + m_pTextBrowser->findText(m_pFindText->text(),HIGHLIGHT_FLAGS); } + void HelpWidget::slotTextChanged(const QString szFind) { - m_pTextBrowser->findText("",QWebPage::HighlightAllOccurrences); - m_pTextBrowser->findText(szFind,QWebPage::HighlightAllOccurrences); + m_pTextBrowser->findText("",HIGHLIGHT_FLAGS); + m_pTextBrowser->findText(szFind,HIGHLIGHT_FLAGS); } void HelpWidget::slotResetFind() { - m_pFindText->setText(""); - m_pTextBrowser->findText("",QWebPage::HighlightAllOccurrences); + m_pFindText->setText(""); + m_pTextBrowser->findText("",HIGHLIGHT_FLAGS); } void HelpWidget::slotFindPrev() @@ -155,20 +161,22 @@ void HelpWidget::slotFindNext() } void HelpWidget::slotZoomIn() { - kvs_real_t dZoom=m_pTextBrowser->zoomFactor(); - if(dZoom>=2) return; - dZoom+= 0.05; - m_pTextBrowser->setZoomFactor(dZoom); + kvs_real_t dZoom=m_pTextBrowser->zoomFactor(); + if(dZoom>=2) return; + dZoom+= 0.05; + m_pTextBrowser->setZoomFactor(dZoom); } void HelpWidget::slotZoomOut() { - kvs_real_t dZoom=m_pTextBrowser->zoomFactor(); - if(dZoom<=0.5) return; - dZoom-= 0.05; - m_pTextBrowser->setZoomFactor(dZoom); + kvs_real_t dZoom=m_pTextBrowser->zoomFactor(); + if(dZoom<=0.5) return; + dZoom-= 0.05; + m_pTextBrowser->setZoomFactor(dZoom); } + #else + HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone) : QWidget(par) { @@ -210,7 +218,9 @@ HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone) connect(m_pTextBrowser,SIGNAL(backwardAvailable(bool)),m_pBtnBackward,SLOT(setEnabled(bool))); connect(m_pTextBrowser,SIGNAL(forwardAvailable(bool)),m_pBtnForward,SLOT(setEnabled(bool))); } + #endif + HelpWidget::~HelpWidget() { if(m_bIsStandalone)g_pHelpWidgetList->removeRef(this); |