Did a better implementation of this fix

preferencesAboutTextFull
shibakaneki 12 years ago
parent 3ef2b22340
commit 3fb1e75c6b
  1. 4
      src/desktop/UBDesktopAnnotationController.cpp
  2. 3
      src/desktop/UBDesktopPalette.cpp
  3. 2
      src/desktop/UBDesktopPalette.h

@ -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()));

@ -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;

@ -33,8 +33,6 @@ class UBDesktopPalette : public UBActionPalette
void customClick();
void windowClick();
void screenClick();
void pointerClick();
void arrowClicked();
#ifdef Q_WS_X11
void refreshMask();

Loading…
Cancel
Save