1062 Commits

Author SHA1 Message Date
Arjen Hiemstra
8c12426760 Merge branch '15.06'
* 15.06:
  Add a background to the tool additional controls
  Rescale the current layer number based on the maximum layer
  Add a text field style that can be used for generic text fields
  Implemented feature described by #30
  Handle finished signal for the ReadMeshJob started from command line args
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Fix for #29
2015-06-08 16:41:46 +02:00
Arjen Hiemstra
478babff9a Add a background to the tool additional controls
This makes the actual text more visible and also
makes the link between active tool and active tool
controls more apparent.

Fixes #21
2015-06-08 16:40:09 +02:00
Arjen Hiemstra
8db06b8305 Add a text field style that can be used for generic text fields
Based on the setting text field style.

Contributes to Asana issue 33752130551782
2015-06-05 19:10:15 +02:00
Arjen Hiemstra
98befd69ec Merge branch '15.06'
* 15.06:
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Add changes of 15.05.93 release
  Make button tooltip text use the dark color from the palette
  Render the build platform grid as a single sided plane
  Ignore selection when moving objects due to collision
  Use the right offset for object collision after Polygon collision was fixed
2015-06-05 10:41:53 +02:00
Arjen Hiemstra
24a8edd2ae Make button tooltip text use the dark color from the palette
This fixes a regression where tooltip text was white
2015-06-03 21:00:58 +02:00
Arjen Hiemstra
aed224df08 Merge branch '15.06'
* 15.06:
  Bump version to 15.05.93
  Add a changelog file
  add missing width and height to section icon
  add missing color to tool_button
  add setting for sidebar background color
  Make cura_app executable
  Move Sidebar so it is on top of everything else
  Do not slice if there is any setting with an error value
  Start adding some more proper error/warning values to settings
  Position the setting tooltip to the left of the settings instead of below
  Set version to 15.05.92
2015-06-03 15:15:43 +02:00
Tim Kuipers
5ee82c8de5 settings restructure 2015-06-03 12:42:03 +02:00
Adam Goldsmith
350e3312bd add missing width and height to section icon 2015-05-31 09:24:41 -04:00
Adam Goldsmith
cc8f974793 add missing color to tool_button 2015-05-31 09:18:36 -04:00
Adam Goldsmith
98a527b015 add setting for sidebar background color 2015-05-31 07:35:33 -04:00
Arjen Hiemstra
9d7e460b50 Add missing copyright headers
Fixes #5
2015-05-11 12:18:05 +02:00
Arjen Hiemstra
2e96ac1e91 Add 'resources/themes/cura/' from commit 'ff0b05acb2bcfcb4d021889ef94cfe603a44f870'
git-subtree-dir: resources/themes/cura
git-subtree-mainline: 63e8cf72a3032797f25b0cc2f14a0350d0a6a9d8
git-subtree-split: ff0b05acb2bcfcb4d021889ef94cfe603a44f870
2015-04-30 13:28:11 +02:00