GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 10:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,927 Commits 294 Branches 267 Tags
Commit Graph

3661 Commits

Author SHA1 Message Date
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
Diego Prado Gesto
03b4121d22 Fix broken shortcut for slice or stop slicing. 2019-01-10 13:59:22 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
578027182e Prevent setting items from overlapping with column headers 2019-01-08 10:49:55 +01:00
Lipu Fei
a8128919af Make resize bar slim 
CURA-6054
 2019-01-07 10:41:07 +01:00
Ghostkeeper
cfdce25a62
Add grip lines to bottom of resizable panel 
Looks all right now.

Contributes to issue CURA-6054.
 2019-01-03 17:06:17 +01:00
fieldOfView
f1d01e733d Add variant to the configuration menu headerItem 2019-01-03 16:34:05 +01:00
Ghostkeeper
798c1f198c
Hide action panel when displaying a stage with a background 
This is not the worst hack ever, but it's quite a hack.

Contributes to issue CURA-6054.
 2019-01-03 16:04:27 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text 
CURA-6003
 2019-01-03 15:34:41 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
a14c846e29 Rename CheckBox.qml to CheckBoxWithTooltip.qml 
CURA-6005
 2019-01-03 11:53:19 +01:00
Lipu Fei
136317c3c7 Fix code styles 
CURA-6005
 2019-01-03 11:26:14 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +01:00
Ghostkeeper
707c3a26a8
Make job specs not bold 
As per the design.

Contributes to issue CURA-6025.
 2019-01-03 11:06:43 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
979fd507de Give the section delegates a fixed height 
This fixes the issue where the first printer would be drawn over the section label

CURA-6011
 2019-01-03 10:39:43 +01:00
Jaime van Kessel
7fc4e6ddde Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-03 10:23:22 +01:00
Jaime van Kessel
0b1773e087 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-03 09:43:13 +01:00
Jaime van Kessel
3505eb321f Also add space for the savebutton additional components with the output widget 
CURA-6043
 2019-01-03 09:42:22 +01:00
Lipu Fei
08dc035f6e Merge remote-tracking branch 'origin/4.0' 2019-01-03 08:30:27 +01:00
Ghostkeeper
a5385b229a
Make text in printer type label bigger 
Just shown it to our UX designer and she thinks it's better this way.

Contributes to issue CURA-6025.
 2019-01-02 16:37:19 +01:00
Ghostkeeper
82c9e99ab3
Merge branch '4.0' 2019-01-02 14:11:30 +01:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel 
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.

Contributes to issue CURA-6069.
 2019-01-02 14:05:17 +01:00
Jaime van Kessel
ae7f843bbc Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-02 13:54:19 +01:00
Jaime van Kessel
71632fd098 Add the postProcessing button back next to the slice button 
CURA-6043
 2019-01-02 13:53:35 +01:00
Ghostkeeper
9e0a423f28
Disable visibility of glass buildplate configuration in sync menu 
Because the build plate swapping is not implemented yet.
 2019-01-02 13:30:29 +01:00
Jaime van Kessel
df23097a99 Changed the label for when no remote configurations are loaded yet 2019-01-02 11:36:07 +01:00
Jaime van Kessel
9be1f8aa7b Removed marketplace menu item from top menu 
It was a bit double since we had the marketplace button in the top bar
 2019-01-02 11:33:49 +01:00
Lipu Fei
11dfb9acdc Remove PluginsPage.qml 
CURA-6066
 2019-01-02 11:18:17 +01:00
Ghostkeeper
6092402a87
Fix 'Slicing...' message when not autoslicing 
Also changes the 'auto slicing' text to just 'slicing', because that's more what the user expects.
Discussed with UX.

Contributes to issue CURA-6025.
 2018-12-31 15:44:09 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles 
Contributes to issue CURA-6025.
 2018-12-31 15:14:23 +01:00
Ghostkeeper
66aeb2d1dd
Give print time estimate a large font 
Contributes to issue CURA-6025.
 2018-12-31 14:28:51 +01:00
Ghostkeeper
cf6cce5df0
Make 'Profile' text larger 
As per the design.

Contributes to issue CURA-6025.
 2018-12-31 14:00:39 +01:00
Ghostkeeper
4be9fbb75e
Give tick marks a font 
Otherwise it uses your system's font, which is not consistent.

Contributes to issue CURA-6025.
 2018-12-31 13:57:49 +01:00
Ghostkeeper
44f21b37ac
Make labels on left side of recommended mode larger 
Contributes to issue CURA-6025.
 2018-12-31 13:49:03 +01:00
Ghostkeeper
60a5438db6
Make expandable component header fonts larger 
As per the design.

Contributes to issue CURA-6025.
 2018-12-31 13:43:31 +01:00
Ghostkeeper
8d8133d521
Make synced material name larger than the rest 
In accordance with the designs.

Contributes to issue CURA-6025.
 2018-12-31 13:34:57 +01:00
Ghostkeeper
c74d6fc1e7
Make printerTypeLabel smaller 
More in line with the theme.

Contributes to issue CURA-6025.
 2018-12-31 13:32:49 +01:00
Ghostkeeper
d020a49b75
Assign a font to Marketplace button 
Otherwise the font face may be different, and the theme has no effect on the font.

Contributes to issue CURA-6025.
 2018-12-31 13:26:55 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu 
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
 2018-12-31 13:22:53 +01:00
Jaime van Kessel
8dbebaa23c Ensure that the machine selector list scales properly 
The old implementation directly listend to the height (instead of childrenRect).
This caused issues, since other things apart from adding / removing machines could
influence the height.

CURA-6060
 2018-12-31 13:14:08 +01:00
Jaime van Kessel
fd9b29fee2 Rename printersModel to GlobalStacksModel 
This is a better description for the model anyway.

CURA-6011
 2018-12-31 11:09:39 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material 
CURA-6033
 2018-12-31 11:01:30 +01:00
Jaime van Kessel
c08339e191 Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:33:01 +01:00
Jaime van Kessel
f9e76aa6c9 Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:09:33 +01:00
Jaime van Kessel
52d97dfbd2 Change back the behavior of the output device selector to the old way 
Although the new way was discussed with our UXers, we got a number of reports that it was confusing.
I also accidentally started a print while using it
 2018-12-31 09:32:16 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Ghostkeeper
abe684c1bd
Use Item instead of rectangle without defined colour 
Item should be faster to render.

Contributes to issue CURA-6056.
 2018-12-27 13:36:17 +01:00
Ghostkeeper
f2a32e62fc
Rename 'Protected profiles' to 'Default profiles' 
We agreed that it looks better, especially when listed right above 'Custom profiles'.
 2018-12-27 11:06:09 +01:00