232 Commits

Author SHA1 Message Date
Ghostkeeper
5e63c0df48
Add major grid cells
This draws a grid of 1x1cm.

Contributes to issue CURA-4150.
2017-08-17 09:56:11 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs
CURA-4146
2017-08-15 17:42:34 +02:00
Jaime van Kessel
7e07482dec Added topbar to Cura
CURA-3964
2017-07-03 15:44:42 +02:00
Jaime van Kessel
c36ab386fa Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura 2017-06-26 14:39:12 +02:00
Tim Kuipers
49e53c2cda Revert "dark layer view"
This reverts commit 67a4ec2a9e56ba6df31fa06efe49a69aa1b2d20f.
2017-06-23 17:25:53 +02:00
Jaime van Kessel
217eecccb9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-23 09:57:34 +02:00
Jaime van Kessel
3049fb4da2 Made setting warning colors for dark theme a bit darker. 2017-06-23 09:57:07 +02:00
Tim Kuipers
67a4ec2a9e dark layer view 2017-06-22 18:56:55 +02:00
fieldOfView
b324e90ba5 Show hover state on active focus 2017-06-22 18:33:30 +02:00
fieldOfView
73e951d402 Darken buildplate 2017-06-19 15:48:04 +02:00
fieldOfView
07dc19c299 Add a dark theme
Based on the work by @rudowinger
2017-06-19 13:24:01 +02:00
Ghostkeeper
9acaef8ecc
Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes 2017-06-19 11:05:20 +02:00
Lipu Fei
3a3d9afc24 Use "button" style for material info button
CURA-3810
2017-05-29 18:06:42 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
2017-05-29 14:52:05 +02:00
fieldOfView
817de9d39e Get a list of available themes instead of the hardcoded list 2017-05-24 17:42:11 +02:00
Mark
bcebf4d24c A gradual infill icon untill we have a better one 2017-05-09 14:53:26 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
2017-05-02 13:39:12 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control
While simplifying theme additions
2017-04-30 22:52:54 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons
Add Extruder selection buttons to the Toolbar
2017-04-28 15:02:47 +02:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly
The Label style property should not be confused with e TextField style property
2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio
Contributes to CURA-3577
2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button
Contributes to CURA-3577
2017-04-25 16:09:51 +02:00
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme
CURA-3574
2017-04-19 08:56:11 +02:00
Lipu Fei
6bf0965632 Adjust toggle button size
CURA-3574
2017-04-18 16:52:17 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching
CURA-3574
2017-04-18 16:40:59 +02:00
Jaime van Kessel
9ce8f6cf66 Added new icons
CURA-3577
2017-04-18 15:10:32 +02:00
Jack Ha
aa79ca1d30 Layer view menu items now have Cura colors, not the system colors. 2017-03-20 15:49:27 +01:00
jack
3b1a15e1c4 Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2
Use a single draggable range slider in Layerview
2017-03-07 11:43:17 +01:00
Jack Ha
c10dc2f07c Set old permissions back. CURA-3321 2017-03-07 10:36:30 +01:00
fieldOfView
a0df6bf542 Jerry-rig single slider to replace dual slider design 2017-03-06 14:33:48 +01:00
Jack Ha
1c40c94c44 Fix compatibility options. CURA-3321 2017-03-06 11:55:39 +01:00
Jack Ha
e89b1afa2c Initial layer view color mode -> legend. CURA-3321 2017-03-02 16:55:54 +01:00
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jack Ha
212a2bc4f3 Removed unused theme element. CURA-3321 2017-02-28 14:47:25 +01:00
Jack Ha
f22299c80d Added option for show_travels in compatibility mode top layers. CURA-3321 2017-02-28 14:43:46 +01:00
Jack Ha
27f013fd81 Cleanup layout, finalizing 2017-02-28 11:52:51 +01:00
Jack Ha
8b7aee1664 Adjusted menu, added View Mode: Layers. CURA-3321 2017-02-27 14:16:56 +01:00
Jack Ha
fa1b332733 Moved layer view menu to left, next to sliders. CURA-3321 2017-02-27 14:06:17 +01:00
Jack Ha
36476a14bb Solved merge conflicts 2017-02-23 14:40:49 +01:00
Ghostkeeper
ee3e0ba6ab
Add material indication to extruder boxes
Only if a material is known of course. But the case where it is unknown is not tested.

Contributes to issue CURA-3161.
2017-02-03 14:52:09 +01:00
Ghostkeeper
9546c85967
Add boxes containing information on extruders
These are meant to eventually replace the bullet-list of information we currently have.

Contributes to issue CURA-3161.
2017-02-03 13:50:17 +01:00
Jack Ha
645d188698 Merge branch 'layer_view3_cleanup' into layer_view3_layout 2017-01-30 11:26:13 +01:00
Jack Ha
b1d95f3464 Layout Layer View menu, removed item, changed size. CURA-3321 2017-01-30 11:24:51 +01:00
fieldOfView
e2a9fc0d79 Rename header tab status overlays to make them reusable
The "settings" tab could use a status overlay to show setting errors and slicing paused states.
2017-01-26 14:32:47 +01:00
fieldOfView
5939ff9b81 Make header tab button color stylable
The monitor tab icon is split up in a base monitor tab icon and a status overlay, each with their own color.
2017-01-26 14:17:07 +01:00