fix for #245 (trunk/4.0 version)

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

3 files changed, 15 insertions, 2 deletions

diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 046b8823c..b4bffd646 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1033,7 +1033,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 f52342c21..181a5d184 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -165,7 +165,6 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 
 	cacheFileList();
 	setupItemList();
-	connect(new QShortcut(Qt::Key_F+Qt::CTRL,this),SIGNAL(activated()),m_pIrcView,SLOT(toggleToolWidget()));
 }
 
 
@@ -174,6 +173,19 @@ KviLogViewMDIWindow::~KviLogViewMDIWindow()
 	g_pLogViewWindow = 0;
 }
 
+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.
+	if((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier) || (e->modifiers() & Qt::MetaModifier))
+	{
+		if(e->key() == Qt::Key_F)
+		{
+			m_pIrcView->toggleToolWidget();
+		}
+	}
+}
+
 void KviLogViewMDIWindow::applyFilter()
 {
 	setupItemList();
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index a3b2fd321..489893dad 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -126,6 +126,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;