GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,522 Commits 294 Branches 267 Tags
Commit Graph

2912 Commits

Author SHA1 Message Date
Jaime van Kessel
11a3da3068 Removed color animation from stage buttons 
This caused laggy updates and it didn't add that much anyway

CURA-5772
 2018-11-06 11:06:20 +01:00
Jaime van Kessel
8117c087aa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-11-06 09:52:22 +01:00
Jaime van Kessel
317447aa54 Fix multi-buildplate panel location 
CURA-5772
 2018-11-06 09:52:01 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Jaime van Kessel
08917c37a1 Improve rendering of scaled avatar image 
CURA-5772
 2018-11-06 09:21:27 +01:00
Jaime van Kessel
9f246910bc Make avatar image border a bit wider 
This prevents a white edge from showing

CURA-5772
 2018-11-06 09:18:20 +01:00
Jaime van Kessel
99bac25ab2 Show default avatar if user has no avatar picture set 
CURA-5784
 2018-11-05 14:55:22 +01:00
Jaime van Kessel
2bb7b352ef Hide settings when pre-sliced g-code is loaded 
CURA-5772
 2018-11-05 13:25:47 +01:00
Diego Prado Gesto
b6e35df030
Merge pull request #4709 from fieldOfView/fix_add_printer_layout 
Add Printer dialog codestyle and readability
 2018-11-02 15:29:32 +01:00
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
Ghostkeeper
bd97aed1c7
Merge branch '3.6' 2018-11-01 14:43:47 +01:00
Ghostkeeper
4dc248a631
Rename Open Marketplace to just Marketplace 
Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace.

Contributes to issue 5870.
 2018-11-01 14:43:22 +01:00
fieldOfView
e61a6e7a5c Fix codestyle 2018-11-01 14:41:33 +01:00
Diego Prado Gesto
dcad95aab9 Rename Toolbox button to Marketplace. 
Contributes to CURA-5784.
 2018-11-01 12:44:14 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Diego Prado Gesto
9215bb11f0 Merge branch '3.6' 2018-11-01 09:11:20 +01:00
Diego Prado Gesto
e884605cc3 Fix typo. 2018-11-01 08:47:44 +01:00
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +01:00
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt 
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
 2018-10-31 13:09:15 +01:00
Remco Burema
e963fd2d85
Merge pull request #4445 from fieldOfView/fix_setting_float_precision 
Reduce the maximum precision of floats in SettingTextField inputs
 2018-10-31 12:26:34 +01:00
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Ghostkeeper
c736bfffb5
Add hotkeys for managing profiles and materials 
These are unused on all platforms. We can't use Ctrl+M (multiply selection), Ctrl+P (print) or Ctrl+Q (quit) sadly.

Fixes #4250.
 2018-10-30 10:54:14 +01:00
Diego Prado Gesto
b6ea0e6385 Make the height of the stage buttons themable. Now the height has to be 
28px as indicated by the UXers.

Contributes to CURA-5784.
 2018-10-30 10:38:53 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Diego Prado Gesto
aa75b64b5b Use the lining color to the default ouline color for the account widget. 
Contributes to CURA-5784.
 2018-10-30 09:48:56 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2 Change the way the string for the tooltip is formatted. 
Contributes to CURA-5772.
 2018-10-26 15:53:20 +02:00
Diego Prado Gesto
a277bd9f3b Don't use the hand cursor in the action buttons by default. 
Contributes to CURA-5784.
 2018-10-26 11:29:05 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +02:00
Ghostkeeper
47f820fe69
Don't disable entire view menu when viewing g-code 
Just disable the part about switching views.
Yes, you can still select the view from the actual view selection drop-down in the main window. Well, it's an improvement, not a complete fix. The complete fix is deferred.
 2018-10-25 10:47:21 +02:00
Diego Prado Gesto
e85b5febe1 Add pointing hand cursor shape when hovering the AccountWidget. 
Contributes to CURA-5784.
 2018-10-24 11:28:52 +02:00
Diego Prado Gesto
bf1c23243e Modify the styles to match the requirements. 
Contributes to CURA-5784.
 2018-10-24 09:55:51 +02:00
Diego Prado Gesto
dbb62f2490 Add default icons for the avatar. 
Contributes to CURA-5784.
 2018-10-22 11:31:19 +02:00
Diego Prado Gesto
69fc1e5bfb Reuse ActionButton component to create the toolbox shortcut. 
Contributes to CURA-5784.
 2018-10-22 10:30:06 +02:00
Diego Prado Gesto
17732b1169 Make the spacing between the orientation controls be dependent on the 
theme.

Contributes to CURA-5772.
 2018-10-19 17:04:40 +02:00
Diego Prado Gesto
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing 
more on the top than the header.

Contributes to CURA-5784.
 2018-10-19 16:40:21 +02:00
Diego Prado Gesto
6f12197cea Don't use an image to create a mask but a circle. 
Contributes to CURA-5772.
 2018-10-19 13:41:32 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind) 
Contributes to CURA-5772.
 2018-10-18 17:52:42 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file 
Contributes to CURA-5772.
 2018-10-18 17:48:03 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +02:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file 
Contributes to CURA-5772.
 2018-10-18 17:26:10 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ... 
Contributes to CURA-5772.
 2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00