diff options
| author | 2009-10-24 23:18:42 +0000 | |
|---|---|---|
| committer | 2009-10-24 23:18:42 +0000 | |
| commit | bf17afb42b041162b10af73a28499e30a74bbd59 (patch) | |
| tree | 12ae4055f5517fb79fda305212cfbc614d586c0b | |
| parent | fix for #588 (classic window list) (diff) | |
| download | KVIrc-bf17afb42b041162b10af73a28499e30a74bbd59.tar.gz KVIrc-bf17afb42b041162b10af73a28499e30a74bbd59.tar.bz2 KVIrc-bf17afb42b041162b10af73a28499e30a74bbd59.zip | |
fix for #593 + free selection in help module
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3572 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/modules/help/helpwidget.cpp | 16 | ||||
| -rw-r--r-- | src/modules/help/helpwidget.h | 1 | ||||
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index df74a6b77..2ae0c6a2c 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -54,7 +54,6 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame *,bool bIsStandalone) m_pTextBrowser = new QTextBrowser(this); m_pTextBrowser->setObjectName("text_browser"); m_pTextBrowser->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); - m_pTextBrowser->setFocusPolicy(Qt::NoFocus); m_pTextBrowser->setStyleSheet("QTextBrowser { background-color:white; color:black; }"); m_pToolBar = new KviTalHBox(this); @@ -84,8 +83,6 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame *,bool bIsStandalone) m_pToolBar->setStretchFactor(pSpacer,1); connect(m_pTextBrowser,SIGNAL(backwardAvailable(bool)),m_pBtnBackward,SLOT(setEnabled(bool))); connect(m_pTextBrowser,SIGNAL(forwardAvailable(bool)),m_pBtnForward,SLOT(setEnabled(bool))); - - m_pTextBrowser->viewport()->installEventFilter(this); } KviHelpWidget::~KviHelpWidget() @@ -134,19 +131,6 @@ QSize KviHelpWidget::sizeHint() const return s; } -bool KviHelpWidget::eventFilter(QObject * o, QEvent *e) -{ - QClipboard *cb = QApplication::clipboard(); - - if(e->type() == QEvent::MouseButtonRelease) { - if(m_pTextBrowser->textCursor().hasSelection()) { - cb->setText(m_pTextBrowser->textCursor().selectedText()); - } - } - - return QWidget::eventFilter(o,e); -} - #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "helpwidget.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index b175801ef..ce8767a25 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -51,7 +51,6 @@ private: bool m_bIsStandalone; protected: virtual void resizeEvent(QResizeEvent *e); - bool eventFilter(QObject *, QEvent *); protected slots: void doClose(); void showIndex(); diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 8b641d5be..da01bf24d 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -39,6 +39,7 @@ #include <QMessageBox> #include <QRegExp> #include <QToolTip> +#include <QTimer> extern Index * g_pDocIndex; extern KviPointerList<KviHelpWindow> * g_pHelpWindowList; @@ -111,6 +112,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) li.append(80); m_pSplitter->setSizes(li); + QTimer::singleShot(0,m_pIndexSearch,SLOT(setFocus())); } KviHelpWindow::~KviHelpWindow() |
