fixed #245

git-svn-id: https://svn.kvirc.de/svn/branches/kvirc/3.4@2583 17fca916-40b9-46aa-a4ea-0a15b648b75c

diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 492067737213cd7cbe7cd6b6b27691c3dcbc889f..ebe00f554cf0ad11d2a3adb1cb35d978915a0240 100644 (file)
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1128,7 +1128,7 @@ void KviWindow::childInserted(QWidget * o)
        o->installEventFilter(this); // we filter its events
        connect(o,SIGNAL(destroyed()),this,SLOT(childDestroyed()));
 
-       if(o->inherits("KviInput"))
+       if(o->inherits("KviInput") || (m_iType==KVI_WINDOW_TYPE_LOGVIEW && o->inherits("KviIrcView")))
                m_pFocusHandler = o;
        else
        {

diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 6fe9fca5e925345b40a36af659686f662671f7dd..63edfedbddd3e4790155c9d0b5683d78f59de49f 100644 (file)
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -166,16 +166,27 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
        
        g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
        KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
-        
-        cacheFileList();
-        setupItemList();
-        KviAccel *a = new KviAccel( this );
-        a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),
-                        m_pIrcView,
-                        SLOT(toggleToolWidget()) );
-}
 
+       cacheFileList();
+       setupItemList();
+}
 
+void KviLogViewMDIWindow::keyPressEvent(QKeyEvent *e)
+{
+//Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX.
+//This way typical X11 and Apple shortcuts can be used simultanously within the input line.
+#ifndef Q_OS_MACX
+       if(e->state() & Qt::ControlButton)
+#else
+       if((e->state() & Qt::ControlButton) || (e->state() & Qt::MetaButton))
+#endif
+       {
+               if(e->key() == Qt::Key_F)
+               {
+                       m_pIrcView->toggleToolWidget();
+               }
+       }
+}
 
 KviLogViewMDIWindow::~KviLogViewMDIWindow()
 {

diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 95fb855aa2b25f627acbb7af4f1d1f1d0d124f55..21f77383da3d46360941d8e0708990b9564f0efc 100644 (file)
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -111,6 +111,7 @@ protected:
 
        virtual QPixmap * myIconPtr();
        virtual void resizeEvent(QResizeEvent *e);
+       virtual void keyPressEvent(QKeyEvent *e);
        virtual void fillCaptionBuffers();
        virtual void die();
        virtual QSize sizeHint() const;