Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
shibakaneki 13 years ago
commit 35b03dda12
  1. 2
      Sankore_3.1.pro
  2. 2
      src/board/UBBoardController.h
  3. 2
      src/board/UBBoardPaletteManager.h
  4. 6
      src/desktop/UBDesktopAnnotationController.cpp
  5. 2
      src/frameworks/UBPlatformUtils_linux.cpp

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

@ -41,7 +41,7 @@ class UBBoardPaletteManager;
class UBBoardController : public QObject
{
Q_OBJECT;
Q_OBJECT
public:
UBBoardController(UBMainWindow *mainWindow);

@ -36,7 +36,7 @@ class UBMainWindow;
class UBBoardPaletteManager : public QObject
{
Q_OBJECT;
Q_OBJECT
public:
UBBoardPaletteManager(QWidget* container, UBBoardController* controller);

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

@ -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),

Loading…
Cancel
Save