GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 287 Branches 260 Tags
Commit Graph

42 Commits

Author SHA1 Message Date
Jaime van Kessel
80719d4724
Mark disabled extruders when saving project 2019-11-25 11:13:07 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups 
Contributes to #6670
 2019-11-19 13:00:39 +01:00
Jaime van Kessel
377a21071b
Remove color from discard dialog text, since it uses system style 
Originally a lot of text would not be readable when in dark theme
because the text would be light, but the background would always be
white.
 2019-11-18 11:33:36 +01:00
Jaime van Kessel
f1b9ac1c21
Fix aspect ratio of logo in about window 
CURA-6934
 2019-11-04 16:15:40 +01:00
Lipu Fei
227b76d6f0 Remove deprecated currentExtruderPositions 
CURA-6858
 2019-10-22 14:11:31 +02:00
Lipu Fei
570dfdab4b Fix project saving summary 
CURA-6865
 2019-10-08 15:15:13 +02:00
Jaime van Kessel
e6d19d9244
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-08 10:37:40 +02:00
Jaime van Kessel
cfd577f235
Remove buildplate info from workspace save dialog 2019-10-08 10:37:19 +02:00
Lipu Fei
32747d2abe Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-07 21:20:54 +02:00
Nino van Hooff
11d0462c7a Fix recent files python function calls 2019-10-07 10:44:30 +02:00
Nino van Hooff
2df0d96923 Consider user preference when opening project files from cli. 
The logic using just a "skip_project_file_check" boolean was too obscure
imho, so used a string value with more explicit values
to improve readability

CURA-6824
 2019-10-01 11:54:53 +02:00
Lipu Fei
79f938a39c Add intent for project saving summary 
CURA-6800
 2019-09-23 11:44:11 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Lipu Fei
7d096e5734 Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine 2019-04-08 09:09:07 +02:00
Jaime van Kessel
ed503cb6ec Removed platform check that always had the same result 
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
 2019-04-05 17:07:12 +02:00
Lipu Fei
b269dc95b0 Remove old AddMachineDialog 
CURA-6435
 2019-04-05 09:10:58 +02:00
Jaime van Kessel
2dd4a30586 Prevent machines without an extruder from showing "undefined" in the workspace dialog 
This fixes #5572
 2019-04-04 20:07:27 +02:00
Ghostkeeper
2ccc30b824
Only show add machine dialogue if your stack got corrupt, not whole onboarding 
We don't need to accept the EULA again or whatever. Just add the printer that got lost.

Contributes to issue CURA-6057.
 2019-04-03 15:52:07 +02:00
Jaime van Kessel
5c354eb6a3 Switch the order of name & id in addMachine call 
This makes it possible for the name to not be set, in which case it will
default to the name provided by the definition

CURA-6179
 2019-02-26 10:45:18 +01:00
Jaime van Kessel
b2df5c3445 Remove the numSettingsVisible property from the workspace dialog 
This slows down the booting of Cura and it's probably not something people care about.
 2019-02-21 15:08:41 +01:00
Diego Prado Gesto
ef73453874 Fix height in the about dialog to show the logo correctly 2019-02-15 14:36:58 +01:00
Jaime van Kessel
c1b53f0a90 Change header color in about window 
This makes it work for both light & dark theme
 2019-02-14 10:42:25 +01:00
Jaime van Kessel
d59889a4ab Fix logo in about popup 2019-02-05 11:13:47 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Jaime van Kessel
6c70543d11 Only set the containerID when the dialog is visible 
This prevents unneeded updates

CURA-6016
 2018-12-11 12:46:11 +01:00
Diego Prado Gesto
47626f6033 Fix the color and proportions of the cura logo in the about panel 2018-12-06 11:57:55 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Jaime van Kessel
384c359db1 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-30 15:34:47 +01:00
Jaime van Kessel
a825daea95 Cleanup the Theme.json 
There were a lot of sizes that weren't used
 2018-11-26 17:10:48 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"" 
This reverts commit 791929d6897942e971a112a26839c0fa6f94f847.
 2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu" 
This reverts commit 4caf770a62f07b71a646b7f09a08623485b89582, reversing
changes made to 0cdcd61ff2dfe2677e636cc2f1ee993cbd9d641d.
 2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu 
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
 2018-11-20 20:48:52 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
Diego Prado Gesto
8bdd27183f Move TopBar to the Skeleton folder. 
Clean up the Cura.qml even more by moving some components to the
ApplicationMenu, where they are called.

Contributes to CURA-5784.
 2018-10-08 10:59:46 +02:00