Merge branch 'preprod'

OpenBoard-org · Mar 22, 2018 · d75d84b · d75d84b
2 parents b228a5c + 21b98e5
commit d75d84b
Show file tree

Hide file tree

Showing 188 changed files with 12,946 additions and 6,875 deletions.
diff --git a/OpenBoard.pro b/OpenBoard.pro
@@ -9,8 +9,8 @@ CONFIG += debug_and_release \
 
 
 VERSION_MAJ = 1
-VERSION_MIN = 3
-VERSION_PATCH = 6
+VERSION_MIN = 4
+VERSION_PATCH = 0
 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error
 VERSION_BUILD = 0
 
@@ -454,3 +454,7 @@ INSTALLS = UB_ETC \
    UB_LIBRARY \
    UB_THIRDPARTY_INTERACTIVE
 
+DISTFILES += \
+    resources/images/moveDown.svg \
+    resources/images/moveDownDisabled.svg
+
diff --git a/release_scripts/linux/package.sh b/release_scripts/linux/package.sh
@@ -348,7 +348,7 @@ for ((i=0;i<${#tab[@]};i++)); do
         echo -n ",    " >> "$CONTROL_FILE"
     fi
 
-    echo -n "${tab[$i]} (>= "`dpkg -p ${tab[$i]} | grep "Version: " | awk '{      print $2 }' | sed -e 's/\([:. 0-9?]*\).*/\1/g' | sed -e 's/\.$//'`") " >> "$CONTROL_FILE"
+    echo -n "${tab[$i]} (>= "`apt-cache show ${tab[$i]} | grep "Version: " | head -1 | awk '{      print $2 }' | sed -e 's/\([:. 0-9?]*\).*/\1/g' | sed -e 's/\.$//'`") " >> "$CONTROL_FILE"
 done
 echo -n ",  onboard" >> "$CONTROL_FILE"
 

diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc
@@ -159,6 +159,10 @@
         <file>images/backgroundPalette/background3On.svg</file>
         <file>images/backgroundPalette/background4.svg</file>
         <file>images/backgroundPalette/background4On.svg</file>
+        <file>images/backgroundPalette/background5.svg</file>
+        <file>images/backgroundPalette/background5On.svg</file>
+        <file>images/backgroundPalette/background6.svg</file>
+        <file>images/backgroundPalette/background6On.svg</file>
         <file>images/toolPalette/podcast.svg</file>
         <file>images/toolPalette/podcastOn.svg</file>
         <file>images/toolPalette/rulerTool.png</file>
@@ -335,6 +339,8 @@
         <file>images/left_arrow.png</file>
         <file>images/right_arrow.png</file>
         <file>images/moveUp.svg</file>
+        <file>images/moveDown.svg</file>
+        <file>images/moveDownDisabled.svg</file>
         <file>images/closeDisabled.svg</file>
         <file>images/menuDisabled.svg</file>
         <file>images/moveUpDisabled.svg</file>
@@ -352,5 +358,7 @@
         <file>images/notAligned.svg</file>
         <file>images/groupItems.svg</file>
         <file>images/ungroupItems.svg</file>
+        <file>images/setAsBackground.svg</file>
+        <file>images/backgroundPalette/resetDefaultGridSize.svg</file>
     </qresource>
 </RCC>
diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config
@@ -1,6 +1,8 @@
 [App]
 AngleTolerance=4
-EnableAutomaticSoftwareUpdates=false
+HideCheckForSoftwareUpdate=false
+EnableAutomaticSoftwareUpdates=true
+EnableSoftwareUpdates=true
 EnableStartupHints=true
 FavoriteToolURIs=openboardtool://openboard/mask, openboardtool://ruler, openboardtool://compass, openboardtool://protractor, openboardtool://triangle, openboardtool://magnifier, openboardtool://cache
 IsInSoftwareUpdateProcess=false
@@ -9,8 +11,9 @@ LastSessionPageIndex=0
 LookForOpenSankoreInstall=true
 OnlineUserName=
 PageCacheSize=20
-PreferredLanguage=
+PreferredLanguage=fr_CH
 ProductWebAddress=http://www.openboard.ch
+SoftwareUpdateURL=http://www.openboard.ch/update.json
 StartMode=
 SwapControlAndDisplayScreens=false
 ToolBarDisplayText=true
@@ -22,11 +25,16 @@ UseSystemOnScreenKeyboard=true
 
 [Board]
 AutoSaveIntervalInMinutes=3
-CrossedBackground=0
+CrossColorDarkBackground=#C8C0C0C0
+CrossColorLightBackground=#A5E1FF
 DarkBackground=0
 DefaultPageSize=@Size(1280 960)
 EraserCircleWidthIndex=1
 FeatureSliderPosition=40
+GridDarkBackgroundColors=#FFFFFF, #FF3400, #66C0FF, #81FF5C, #FFFF00, #B68360, #FF497E, #8D69FF, #C8C0C0C0
+GridLightBackgroundColors=#000000, #FF0000, #004080, #008000, #FFDD00, #C87400, #800040, #008080, #5F2D0A, #A5E1FF
+InterpolateMarkerStrokes=true
+InterpolatePenStrokes=true
 KeyboardPaletteKeyBtnSize=16x16
 LeftLibPaletteBoardModeIsCollapsed=true
 LeftLibPaletteBoardModeWidth=270
@@ -59,7 +67,13 @@ RightLibPaletteDesktopModeIsCollapsed=true
 RightLibPaletteDesktopModeWidth=270
 ShowEraserPreviewCircle=true
 ShowMarkerPreviewCircle=true
+ShowPenPreviewCircle=true
+PenPreviewFromSize=5
 ShowToolsPalette=false
+SimplifyMarkerStrokes=true
+SimplifyPenStrokes=true
+SimplifyPenStrokesThresholdAngle=3
+SimplifyPenStrokesThresholdWidthDifference=2
 StartupKeyboardLocale=0
 UseHighResTabletEvent=true
 ZoomFactor=1.4099999999999999
@@ -89,6 +103,7 @@ InteractivitiesDirectory=./library/interactivities
 LibIconSize=80
 ShapeDirectory=./library/shape
 ShapeThumbnailWidth=50
+ShowDetailsForLocalItems=false
 SoundThumbnailWidth=50
 VideoThumbnailWidth=80
 VideosDirectory=./library/videos
@@ -123,7 +138,7 @@ AddBookmarkURL="http://www.myuniboard.com/bookmarks/save/?url="
 BookmarksPage=http://www.myuniboard.com
 HistoryLimit=15
 Homepage=http://www.openboard.ch
-ShowAddBookmarkButton=false
+ShowAddBookmarkButton=true
 ShowPageImediatelyOnMirroredScreen=false
 UseExternalBrowser=false