From 3fb1e75c6b448caa8eb4edeab24347f4eaebf51b Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 28 Aug 2012 15:09:43 +0200 Subject: [PATCH] Did a better implementation of this fix --- src/desktop/UBDesktopAnnotationController.cpp | 4 ++-- src/desktop/UBDesktopPalette.cpp | 3 --- src/desktop/UBDesktopPalette.h | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index db32c695..9e5003c6 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -109,8 +109,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) connect(mDesktopPalette, SIGNAL(windowClick()), this, SLOT(onToolClicked())); connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(screenCapture())); connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(onToolClicked())); - connect(mDesktopPalette, SIGNAL(pointerClick()), this, SLOT(onToolClicked())); - connect(mDesktopPalette, SIGNAL(arrowClicked()), this, SLOT(onToolClicked())); + connect(UBApplication::mainWindow->actionPointer, SIGNAL(triggered()), this, SLOT(onToolClicked())); + connect(UBApplication::mainWindow->actionSelector, SIGNAL(triggered()), this, SLOT(onToolClicked())); connect(mDesktopPalette, SIGNAL(maximized()), this, SLOT(onDesktopPaletteMaximized())); connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), this, SLOT(onDesktopPaletteMinimize())); diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index 2ec3f3dc..2b3902b2 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -39,9 +39,6 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent) actions << UBApplication::mainWindow->actionSelector; actions << UBApplication::mainWindow->actionPointer; - connect(UBApplication::mainWindow->actionPointer, SIGNAL(triggered()), this, SIGNAL(pointerClick())); - connect(UBApplication::mainWindow->actionSelector, SIGNAL(triggered()), this, SIGNAL(arrowClicked())); - if (UBPlatformUtils::hasVirtualKeyboard()) actions << UBApplication::mainWindow->actionVirtualKeyboard; diff --git a/src/desktop/UBDesktopPalette.h b/src/desktop/UBDesktopPalette.h index 79553087..cd22d43e 100644 --- a/src/desktop/UBDesktopPalette.h +++ b/src/desktop/UBDesktopPalette.h @@ -33,8 +33,6 @@ class UBDesktopPalette : public UBActionPalette void customClick(); void windowClick(); void screenClick(); - void pointerClick(); - void arrowClicked(); #ifdef Q_WS_X11 void refreshMask();