Added a 5th pen color (yellow by default)

preferencesAboutTextFull
Craig Watson 9 years ago
parent 3dc320d13a
commit 63b1742010
  1. 9
      resources/forms/mainWindow.ui
  2. 1
      src/board/UBBoardController.cpp
  3. 4
      src/core/UBSettings.cpp
  4. 2
      src/desktop/UBDesktopPropertyPalette.cpp

@ -445,6 +445,15 @@
<string>Color</string>
</property>
</action>
<action name="actionColor4">
<property name="icon">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
</property>
<property name="text">
<string>Color</string>
</property>
</action>
<action name="actionWebBack">
<property name="icon">
<iconset resource="../OpenBoard.qrc">

@ -291,6 +291,7 @@ void UBBoardController::setupToolbar()
colorActions.append(mMainWindow->actionColor1);
colorActions.append(mMainWindow->actionColor2);
colorActions.append(mMainWindow->actionColor3);
colorActions.append(mMainWindow->actionColor4);
UBToolbarButtonGroup *colorChoice =
new UBToolbarButtonGroup(mMainWindow->boardToolBar, colorActions);

@ -45,7 +45,7 @@ QPointer<UBSettings> UBSettings::sSingleton = 0;
int UBSettings::pointerDiameter = 40;
int UBSettings::crossSize = 32;
int UBSettings::colorPaletteSize = 4;
int UBSettings::colorPaletteSize = 5;
int UBSettings::objectFrameWidth = 20;
int UBSettings::boardMargin = 10;
@ -265,7 +265,7 @@ void UBSettings::init()
pageDpi = new UBSetting(this, "Board", "pageDpi", 0);
QStringList penLightBackgroundColors;
penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#C87400" << "#800040" << "#008080" << "#5F2D0A";
penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFFF00" << "#C87400" << "#800040" << "#008080" << "#5F2D0A";
boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0);
QStringList penDarkBackgroundColors;

@ -55,6 +55,7 @@ UBDesktopPenPalette::UBDesktopPenPalette(QWidget *parent, UBRightPalette* rightP
colorActions.append(UBApplication::mainWindow->actionColor1);
colorActions.append(UBApplication::mainWindow->actionColor2);
colorActions.append(UBApplication::mainWindow->actionColor3);
colorActions.append(UBApplication::mainWindow->actionColor4);
UBToolbarButtonGroup *colorChoice =
new UBToolbarButtonGroup(UBApplication::mainWindow->boardToolBar, colorActions);
@ -151,6 +152,7 @@ UBDesktopMarkerPalette::UBDesktopMarkerPalette(QWidget *parent, UBRightPalette*
colorActions.append(UBApplication::mainWindow->actionColor1);
colorActions.append(UBApplication::mainWindow->actionColor2);
colorActions.append(UBApplication::mainWindow->actionColor3);
colorActions.append(UBApplication::mainWindow->actionColor4);
UBToolbarButtonGroup *colorChoice = new UBToolbarButtonGroup(UBApplication::mainWindow->boardToolBar, colorActions);
colorChoice->displayText(false);

Loading…
Cancel
Save