Generated v1.23 from branch Java

voegtlel · Nov 27, 2015 · ea6e984 · ea6e984
1 parent 96468a1
commit ea6e984
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 14 deletions.
diff --git a/JTabletPresenter.jar b/JTabletPresenter.jar
diff --git a/README.md b/README.md
@@ -102,8 +102,10 @@ Following variables are shown as
  * `pdf.thicknessFactor` (float, 0.2): The factor for line thickness for rendering to PDF
 
 ### General
- * `color.red`, `color.green`, `color.blue`, `color.black` (Color, FFBB0000, FF00BB00, FF0000BB, FF000000): Color values for the color-square selected colors.
+ * `color.nine`, (boolean, true): If true, the color-square shows nine colors, otherwise only four (red, gree, blue, black)
+ * `color.*`, (Color): Color values for the color-square selected colors to tune for presenters (possible colors: red, gree, blue, black, orange, violet, yellow, grey, white).
  * `fullscreen.autotoggleToolbar` (boolean, true): If true, the toolbar is hidden when changing into fullscreen and shown when switching to windowed mode
+ * `fullscreen.autotoggleAutoToolbar` (boolean, true): If true, the auto-toolbar is shown when changing into fullscreen and hidden when switching to windowed mode
  * `thickness.thin`, `thickness.medium`, `thickness.thick` (float, 1.0, 2.0, 3.0): Default base thicknesses possible to select.
 
 ### Save/Load
@@ -135,7 +137,6 @@ The (dynamic) toolbar is separate from the fixed toolbar. This toolbar automatic
  * `tools.new`: New Document
  * `tools.open`: Open file dialog
  * `tools.save`: Save file dialog
- * `tools.toggleToolbar`: Toggle the toolbar
  * `tools.primary.scribble`: Select scribble tool as primary tool
  * `tools.primary.eraser`: Select eraser tool as primary tool
  * `tools.primary.deleter`: Select deleter tool as primary tool
@@ -159,6 +160,8 @@ The (dynamic) toolbar is separate from the fixed toolbar. This toolbar automatic
  * `tools.screenshotDirect`: Take a screenshot of the screen under the cursor and set as page background
  * `tools.blankScreen`: Blanks the screen containing the main window
  * `tools.blankScreenAll`: Blanks all screens
+ * `tools.toggleToolbar`: Toggle the toolbar
+ * `tools.toggleAutoToolbar`: Toggle the auto-toolbar
  * `next`: Next page
  * `previous`: Previous page
  * `undo`: Undo

diff --git a/config.ini b/config.ini
@@ -46,9 +46,14 @@ toolbar.2 = tools.primary.line
 toolbar.3 = tools.primary.pdfCursor
 toolbar.4 = tools.primary.selectMove
 toolbar.5 = tools.screenshotAreaHide
-toolbar.6 = color
-toolbar.7 = fill
-toolbar.8 = toggleFullscreen
+toolbar.6 = fill
+toolbar.7 = next
+toolbar.8 = previous
+toolbar.9 = undo
+toolbar.10 = redo
+toolbar.11 = color
+toolbar.12 = fill
+toolbar.13 = toggleFullscreen
 
 # 0: JPod, 1: JMuPdf
 pdf.renderer = 1
@@ -83,12 +88,19 @@ editor.stroke.screenAdapt = true
 editor.stroke.baseThickness = 0.004
 
 fullscreen.autotoggleToolbar = true
+fullscreen.autotoggleAutoToolbar = true
 
 # Default colors
+color.nine = true
 color.red = FFBB0000
 color.green = FF00BB00
 color.blue = FF0000BB
 color.black = FF000000
+color.orange = FFEE7700
+color.violet = FF6600BB
+color.yellow = FFDDDD00
+color.grey = FF666666
+color.white = FFEEEEEE
 
 # Default Thicknesses
 thickness.thin = 1

diff --git a/configClientDown.ini b/configClientDown.ini
@@ -38,9 +38,14 @@ toolbar.2 = tools.primary.line
 toolbar.3 = tools.primary.pdfCursor
 toolbar.4 = tools.primary.selectMove
 toolbar.5 = tools.screenshotAreaHide
-toolbar.6 = color
-toolbar.7 = fill
-toolbar.8 = toggleFullscreen
+toolbar.6 = fill
+toolbar.7 = next
+toolbar.8 = previous
+toolbar.9 = undo
+toolbar.10 = redo
+toolbar.11 = color
+toolbar.12 = fill
+toolbar.13 = toggleFullscreen
 
 pdf.defaultWidth = 1024
 pdf.defaultHeight = 768
@@ -63,12 +68,19 @@ editor.eraser.thickness = 30.0
 editor.image.lockRatio = true
 
 fullscreen.autotoggleToolbar = true
+fullscreen.autotoggleAutoToolbar = true
 
 # Default colors
+color.nine = true
 color.red = FFBB0000
 color.green = FF00BB00
 color.blue = FF0000BB
 color.black = FF000000
+color.orange = FFEE7700
+color.violet = FF6600BB
+color.yellow = FFDDDD00
+color.grey = FF666666
+color.white = FFEEEEEE
 
 
 # Client control

diff --git a/configClientUp.ini b/configClientUp.ini
@@ -38,9 +38,14 @@ toolbar.2 = tools.primary.line
 toolbar.3 = tools.primary.pdfCursor
 toolbar.4 = tools.primary.selectMove
 toolbar.5 = tools.screenshotAreaHide
-toolbar.6 = color
-toolbar.7 = fill
-toolbar.8 = toggleFullscreen
+toolbar.6 = fill
+toolbar.7 = next
+toolbar.8 = previous
+toolbar.9 = undo
+toolbar.10 = redo
+toolbar.11 = color
+toolbar.12 = fill
+toolbar.13 = toggleFullscreen
 
 pdf.defaultWidth = 1024
 pdf.defaultHeight = 768
@@ -63,12 +68,19 @@ editor.eraser.thickness = 30.0
 editor.image.lockRatio = true
 
 fullscreen.autotoggleToolbar = true
+fullscreen.autotoggleAutoToolbar = true
 
 # Default colors
+color.nine = true
 color.red = FFBB0000
 color.green = FF00BB00
 color.blue = FF0000BB
 color.black = FF000000
+color.orange = FFEE7700
+color.violet = FF6600BB
+color.yellow = FFDDDD00
+color.grey = FF666666
+color.white = FFEEEEEE
 
 # Client control
 client.up.enabled = true

diff --git a/configR0.ini b/configR0.ini
@@ -46,9 +46,14 @@ toolbar.2 = tools.primary.line
 toolbar.3 = tools.primary.pdfCursor
 toolbar.4 = tools.primary.selectMove
 toolbar.5 = tools.screenshotAreaHide
-toolbar.6 = color
-toolbar.7 = fill
-toolbar.8 = toggleFullscreen
+toolbar.6 = fill
+toolbar.7 = next
+toolbar.8 = previous
+toolbar.9 = undo
+toolbar.10 = redo
+toolbar.11 = color
+toolbar.12 = fill
+toolbar.13 = toggleFullscreen
 
 # 0: JPod, 1: JMuPdf
 pdf.renderer = 0
@@ -83,12 +88,19 @@ editor.stroke.screenAdapt = true
 editor.stroke.baseThickness = 0.004
 
 fullscreen.autotoggleToolbar = true
+fullscreen.autotoggleAutoToolbar = true
 
 # Default colors
+color.nine = true
 color.red = FFBB0000
 color.green = FF00BB00
 color.blue = FF0000BB
 color.black = FF000000
+color.orange = FFEE7700
+color.violet = FF6600BB
+color.yellow = FFDDDD00
+color.grey = FF666666
+color.white = FFEEEEEE
 
 # Default Thicknesses
 thickness.thin = 1