From 3ec0de72cd66e6d05e470c9306cb25aed1a9bbdf Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 12 Aug 2011 10:56:52 +0300 Subject: [PATCH 1/3] ilia iss keyboard --- src/frameworks/UBPlatformUtils_linux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index ae356df7..0e6ca9f3 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -333,4 +333,4 @@ void UBPlatformUtils::destroyKeyboardLayouts() delete keyboardLayouts[i]; delete [] keyboardLayouts; keyboardLayouts = NULL; -} \ No newline at end of file +} From e9bd3a6e0f676f591ae358338c05d1fdc237e24e Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Tue, 16 Aug 2011 18:49:19 +0300 Subject: [PATCH 2/3] ilia commit --- src/board/UBBoardController.h | 2 +- src/board/UBBoardPaletteManager.h | 2 +- src/frameworks/UBPlatformUtils_linux.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h index 5e1e0260..9309bdda 100644 --- a/src/board/UBBoardController.h +++ b/src/board/UBBoardController.h @@ -42,7 +42,7 @@ class UBBoardPaletteManager; class UBBoardController : public QObject { - Q_OBJECT; + Q_OBJECT public: UBBoardController(UBMainWindow *mainWindow); diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h index 72644808..d609604c 100644 --- a/src/board/UBBoardPaletteManager.h +++ b/src/board/UBBoardPaletteManager.h @@ -36,7 +36,7 @@ class UBMainWindow; class UBBoardPaletteManager : public QObject { - Q_OBJECT; + Q_OBJECT public: UBBoardPaletteManager(QWidget* container, UBBoardController* controller); diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index a1d77910..a3fb372c 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -210,7 +210,6 @@ const KEYBT RUSSIAN_LOCALE [] = /* ю Ю */ KEYBT(0x44e, XK_Cyrillic_yu, 0x42e, XK_Cyrillic_YU), /* . , */ KEYBT(0x2e, 0x2c)}; - const KEYBT FRENCH_LOCALE[] = { /* ? ? */ KEYBT(0xb2, XK_twosuperior, 0xb2, XK_twosuperior), /* & 1 */ KEYBT(0x26, 0x31), @@ -263,7 +262,6 @@ const KEYBT FRENCH_LOCALE[] = { /* : / */ KEYBT(0x3a, 0x2f), /* ! ? */ KEYBT(0x21, 0xa7)}; - const KEYBT GERMAN_LOCALE[] = { /* ^ ? */ KEYBT(0x5f, 0xb0), /* 1 ! */ KEYBT(0x31, 0x21), From efc09b98a29011ece907a64c455ca670d2a5acce Mon Sep 17 00:00:00 2001 From: Ivan Ilin Date: Tue, 6 Sep 2011 12:53:12 +0300 Subject: [PATCH 3/3] Fixed .pro file and simple bug in linux desktop mode --- Sankore_3.1.pro | 2 +- src/desktop/UBDesktopAnnotationController.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 722a9f79..91996b09 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -110,7 +110,7 @@ win32 { QMAKE_CXXFLAGS_RELEASE += /Od \ /Zi QMAKE_LFLAGS_RELEASE += /DEBUG - UB_LIBRARY.path = DESTDIR + UB_LIBRARY.path = $$DESTDIR UB_I18N.path = $$DESTDIR/i18n UB_ETC.path = $$DESTDIR UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index ca70f989..3af00596 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -855,7 +855,11 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent) void UBDesktopAnnotationController::refreshMask() { if(mIsFullyTransparent - || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Selector) + || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Selector + || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Eraser + || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Pointer + || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Pen + || UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Marker) { updateMask(true); }