From 4329fa6d1a9c2b5266a08408e38ae6da5e8745f4 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 2 Dec 2011 10:42:30 +0100 Subject: [PATCH] fixed double keyboard on document and web mode --- src/document/UBDocumentController.cpp | 2 ++ src/web/UBWebController.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index d56cb51c..a03078d0 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -448,7 +448,9 @@ void UBDocumentController::setupViews() { mKeyboardPalette = UBKeyboardPalette::create(0); mKeyboardPalette->setParent(controlView()); +#ifndef Q_WS_MACX connect(mMainWindow->actionVirtualKeyboard, SIGNAL(triggered(bool)), this, SLOT(showKeyboard(bool))); +#endif } } diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index 6ae2361b..648d84af 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -405,9 +405,9 @@ void UBWebController::setupPalettes() connect(mMainWindow->actionWebShowHideOnDisplay, SIGNAL(toggled(bool)), this, SLOT(toogleMirroring(bool))); connect(mMainWindow->actionWebTrap, SIGNAL(toggled(bool)), this, SLOT(toggleWebTrap(bool))); - +#ifndef Q_WS_MACX connect(mMainWindow->actionVirtualKeyboard, SIGNAL(toggled(bool)), this, SLOT(showKeyboard(bool))); - +#endif (*mToolsCurrentPalette)->hide(); (*mToolsCurrentPalette)->adjustSizeAndPosition();