GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,095 Commits 290 Branches 260 Tags
Commit Graph

4565 Commits

Author SHA1 Message Date
Lipu Fei
63e75ec6b7 Merge branch 'master' 
CURA-4213
 2017-09-05 12:42:23 +02:00
Lipu Fei
4b08a5611a Make topbar transparent and update text style 
CURA-4213
 2017-09-05 11:37:05 +02:00
Lipu Fei
3f6f4a1291 Fix merge conflict for topbar monitor button 
CURA-4106
 2017-09-05 11:12:49 +02:00
Lipu Fei
3e3f15d33f Larger gap between the logo and topbar buttons 
CURA-4213
 2017-09-05 11:12:47 +02:00
Lipu Fei
afb8850155 Update topbar button style 
CURA-4213
 2017-09-05 11:12:22 +02:00
Lipu Fei
e44aedc4b9 Make logo smaller 
CURA-4213
 2017-09-05 10:56:55 +02:00
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +02:00
Lipu Fei
77adfe345d Fix merge conflicts from master 
CURA-4213
 2017-09-05 08:41:44 +02:00
Lipu Fei
4249274af0 Move license window size to light theme 
CURA-4279

The light theme is now the default and it's a base theme, so the window
size needs to be there.
 2017-09-04 17:25:58 +02:00
Jaime van Kessel
7d12ebe860 Merge pull request #2368 from smartavionics/mb-fix-layer-start-min-values 
Now layer start X/Y can be < 0 when machine centre is zero.
 2017-09-04 16:52:49 +02:00
Mark
e3f319a644 less margin when support extruder pops up 
CURA-4148
 2017-09-04 16:23:19 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Lipu Fei
1b66eaea22 Move extruder button sizes to cura-light theme 
CURA-4211
 2017-09-04 12:14:18 +02:00
Jaime van Kessel
88c74b30c2 Added missing QML properties 2017-09-04 11:48:54 +02:00
Lipu Fei
8e774dede4 Change extruder combobox style for simple mode 
CURA-4211
 2017-09-04 08:42:55 +02:00
Lipu Fei
0025369762 Remove old extruder material icons 
CURA-4211
 2017-09-04 08:30:59 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons 
CURA-4211

Resolve merge conflicts.
 2017-09-04 08:29:26 +02:00
Mark
d18d9223a5 refix the alignmet of the support and adhesion chackboxes 
CURA-4148
 2017-09-03 08:18:12 +02:00
Mark Burton
ab4da4ab36 Now layer start X/Y can be < 0 when machine centre is zero. 2017-09-02 08:40:01 +01:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae Adjusted color for the extruder counter number in left toolbox and added 
extra margin-right in sidebar_category
CURA-4148
 2017-09-01 17:45:50 +02:00
Jaime van Kessel
98795d8953 Added missing not supported profiles for PP 
CURA-3977
 2017-09-01 14:36:19 +02:00
Jaime van Kessel
2b54d75453 Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura 2017-09-01 13:22:13 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window 
CURA-4222
 2017-09-01 10:18:27 +02:00
Lipu Fei
aad628a46f Change to new design for extruder number settings 
CURA-4211
 2017-08-31 17:49:24 +02:00
Lipu Fei
c2645d0022 Change extruder tabs to buttons 
CURA-4211

Change extruder tabs to buttons according to the new design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e Change extruder tab to use new button style 
CURA-4211

- Use new button style ("Extruder" text with an extruder icon) for
  extruder tabs
- The "Extruder" text will disapear if the width is not enough
 2017-08-31 17:49:23 +02:00
Lipu Fei
7de9ccefaa Change extruder button on the toolbar side 
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b Add SVG image for extruder button 
CURA-4211
 2017-08-31 17:49:22 +02:00
Ghostkeeper
31af4b7dde
Remove unused icon 
Contributes to issue CURA-4213.
 2017-08-31 17:34:23 +02:00
Ghostkeeper
28d18d88e5
Make top bar buttons smaller 
Contributes to issue CURA-4213.
 2017-08-31 17:30:44 +02:00
Ghostkeeper
d13b693da0
Hide icons if top bar buttons have no icon 
Otherwise there's some empty space there and the RecolourImage will colour that space white.

Contributes to issue CURA-4213.
 2017-08-31 17:24:12 +02:00
Ghostkeeper
bec786b140
Move printer status icon outside of the monitor button 
It's positioned on the right side now above the side bar.

Contributes to issue CURA-4213.
 2017-08-31 17:13:56 +02:00
Ghostkeeper
c6d614156f
Move the Cura logo into the top bar 
Looks ugly there, I think, but the colours will be changed eventually so we'll see.

Contributes to issue CURA-4213.
 2017-08-31 16:09:16 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty 
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
 2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible 
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
 2017-08-31 15:47:29 +02:00
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder" 
CURA-4256
 2017-08-31 14:19:01 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature 
Show target hotend temperatures
 2017-08-31 13:46:55 +02:00
alekseisasin
37eb74e99e Fixed quality file names 
CURA-4128
 2017-08-31 13:16:08 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master 
FABtotum Personal Fabricator
 2017-08-31 12:56:24 +02:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height 
The materials team found this to work better.
 2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles 
This will make it easier to modify these profiles in the future.
 2017-08-31 11:48:41 +02:00
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text 
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
 2017-08-31 10:21:28 +02:00
Ghostkeeper
c4910503e4
Correct height of tips text 
The contentHeight property seems to indicate the height of only one line, contrary to the documentation...

Contributes to issue CURA-4148.
 2017-08-31 10:18:54 +02:00
Ghostkeeper
526a42f7a0
Put sidebar contents inside a scroll view 
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit.

Contributes to issue CURA-4148.
 2017-08-31 09:51:19 +02:00
Ghostkeeper
95ba4b9368
Link anchors differently 
Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes.

Contributes to issue CURA-4148.
 2017-08-31 09:35:27 +02:00
Mark Burton
0efa2ac168 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 20:14:35 +01:00