GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 14:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,432 Commits 295 Branches 268 Tags
Commit Graph

17432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
46c209a993 Add one pixel margin to the view selector. 2018-12-06 14:45:24 +01:00
Diego Prado Gesto
3ca749cdcb Add a bunch of renderTypes to labels in the DiscoverUM3Action. 2018-12-06 14:31:52 +01:00
Aleksei S
3c517d3fcc The top bar background overlaps settings bar 2018-12-06 14:25:18 +01:00
Diego Prado Gesto
05075c44ee Add renderType to some labels in the Configuration panel 
Contributes to CURA-5876.
 2018-12-06 14:19:34 +01:00
Lipu Fei
85f2a7e8f6 Move visible to Rows for extruder configs 
CURA-5941

So the whole row, such as "material", will be shown/hiden based on
whether the machine has materials.
 2018-12-06 14:06:18 +01:00
Marijn Deé
05ca0b372a Updated TODO, printjobs are not displayed in the monitor page because 
data returned from cura connect api contains None's instead of printer
uuid's
 2018-12-06 14:04:12 +01:00
Ghostkeeper
298c68c93b
Disable configuration menu if there are no configurations 
This then prevents you from dropping down into an empty menu.

Contributes to issue CURA-5876.
 2018-12-06 13:56:06 +01:00
Ghostkeeper
1e69960464
Make it possible to disable ExpandableComponent 
It won't show the drop-down icon then, won't do hovers and won't allow you to click on it. This will not remove the contents of the ExpandableComponent menu bar item though, so that has to be done in ConfigurationMenu.qml.

Contributes to issue CURA-5876.
 2018-12-06 13:52:57 +01:00
Diego Prado Gesto
76acb13f59 Change the play/pause button colors 2018-12-06 13:50:58 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget 
The menu in the output device selector has now a rounded corner.
 2018-12-06 13:42:29 +01:00
Ghostkeeper
f1fec2f280
Theme the scroll bar 
We need to make this a reusable component at some point, I think. This is the first time we're using the QtQuick2 version of ScrollView.

Contributes to issue CURA-5876.
 2018-12-06 12:07:03 +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
Diego Prado Gesto
1d877cbade Merge branch 'ui_rework_4_0' into small_ui_fixes 2018-12-06 11:47:29 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector 
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
 2018-12-06 11:45:14 +01:00
Diego Prado Gesto
aab61ce8da Modify the header pattern to be have an empty space in the left and bottom, so when repeating the pattern it doesn't overlap. 2018-12-06 11:35:33 +01:00
Diego Prado Gesto
f655e6c43e Add a pattern in the background of the header. 
Adjust some main colors to the ones in the designs.
 2018-12-06 11:30:59 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable 
Contributes to issue CURA-5876.
 2018-12-06 11:16:42 +01:00
Lipu Fei
109586f69c Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 11:09:26 +01:00
Lipu Fei
f7f3c96f81 Fix typo 
CURA-5941
 2018-12-06 10:53:43 +01:00
Marijn Deé
eb3777ed9f Cleaner login and update cluster flow, start update cluster timer 
at startup when the user is already logged in
 2018-12-06 10:40:06 +01:00
Diego Prado Gesto
b0c3a4e17a Align the additional components to the right of the job specs 
The model checker now shows centered
 2018-12-06 09:25:31 +01:00
Diego Prado Gesto
c757bf128e Adjust colors and alignments in the print info panel 2018-12-06 09:12:43 +01:00
ChrisTerBeke
57efca1376
Fix a possible division by zero error 2018-12-05 19:31:58 +01:00
ChrisTerBeke
94f31378a6 Add a TODO 2018-12-05 17:24:47 +01:00
ChrisTerBeke
ce07e31bbf Implement active printer for cloud device to get monitor page functionality working 2018-12-05 17:21:46 +01:00
ChrisTerBeke
66690dfef7 Add testing todo 2018-12-05 17:06:22 +01:00
ChrisTerBeke
5e15858cae more mocks for monitor page, fix showing current print job in monitor page, add todo 2018-12-05 17:05:21 +01:00
Daniel Schiavini
117cf10a2c STAR-322: Removing devices when logging off 2018-12-05 16:26:20 +01:00
Daniel Schiavini
657e763318 STAR-322: Using findChanges method to simplify code 2018-12-05 16:15:51 +01:00
Daniel Schiavini
7e76913736 STAR-322: Fixing printer matching by network key 2018-12-05 16:02:38 +01:00
ChrisTerBeke
cd67100097 Comment out some currently broken code 2018-12-05 15:40:45 +01:00
Diego Prado Gesto
218fa3aded Align the print info to the left 2018-12-05 14:22:04 +01:00
Ghostkeeper
5ba8820f18
Remove unnecessary setting height to 0 when invisible 
Turns out that it doesn't count for the childrenRect.height anyway when the item is invisible.

Contributes to issue CURA-5876.
 2018-12-05 14:10:51 +01:00
Daniel Schiavini
9f4b047ee1 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-05 14:08:46 +01:00
Daniel Schiavini
b693b9d98f STAR-322: Extracting models to be able for converting themselves 2018-12-05 14:08:40 +01:00
Diego Prado Gesto
a2587aca59 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-05 14:05:38 +01:00
ChrisTerBeke
7d7dd6bdde First idea for pairing local and remote clusters 2018-12-05 14:02:53 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Diego Prado Gesto
0e22f6b672 Fix an issue that caused a non-deterministic segfault 
Also add a topMargin only when there are tabs in the custom print setup.

Contributes to CURA-5941.
 2018-12-05 13:30:01 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Diego Prado Gesto
5b57e6bf30 Code style in JobSpecs 2018-12-05 13:24:34 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f Merge branch 'master' into ui_rework_4_0 2018-12-05 13:10:14 +01:00
Diego Prado Gesto
034b1660f7 Adjust sizes in the custom print setup mode 
Contributes to CURA-5941.
 2018-12-05 13:05:22 +01:00
Ian Paschal
e8a933331c Clean-up printer status label 
Contributes to CL-1153
 2018-12-05 12:14:18 +01:00
Daniel Schiavini
163226f940 STAR-322: Using composition rather than inheritance 2018-12-05 12:02:04 +01:00
Daniel Schiavini
d99e2d1533 STAR-322: Extracting file handler methods 2018-12-05 11:21:17 +01:00
Daniel Schiavini
3c5e74a72c Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-05 10:44:53 +01:00
Jaime van Kessel
325137db83
Merge pull request #4888 from Ultimaker/CURA-5982_fix_crash_no_material 
CURA-5982 Return empty material model for empty material
 2018-12-05 10:43:31 +01:00
Daniel Schiavini
01e443049f STAR-322: Creating a subclass for connect devices 2018-12-05 10:37:58 +01:00