GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-10 11:41:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 295 Branches 268 Tags
Commit Graph

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code 
CURA-6006
 2018-12-05 13:21:17 +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
Jaime van Kessel
abcc621cc6 Added missing typing 2018-12-05 11:29:44 +01:00
Daniel Schiavini
d99e2d1533 STAR-322: Extracting file handler methods 2018-12-05 11:21:17 +01:00
Jaime van Kessel
d9135ac72f Fix more codestyle issues 
CURA-6006
 2018-12-05 11:06:14 +01:00
Jaime van Kessel
978a01e4c8 Fix typing & codestyle 
CURA-6006
 2018-12-05 10:51:05 +01:00
Jaime van Kessel
700ae4bebb Removed super spammy logging 
CURA-6006
 2018-12-05 10:48:06 +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
Ghostkeeper
5d95d11437
Use setCurrentIndex to switch tabs at activeExtruderChanged 
This fixes a mysterious segfault. We still don't know why the segfault occurred though. All we know is that QML logs something about a binding loop on currentIndex, and Qt logs something about removing range [-1 through 0] from VisualItemModel. When the tab bar is then made visible, Cura crashes. It is a nondeterministic crash. After this change, we are not seeing it any more (but with any nondeterministic bug, it's hard to verify that it was actually fixed).

Contributes to issue CURA-5876.
 2018-12-05 09:52:43 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component 
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
 2018-12-05 09:39:04 +01:00
Jaime van Kessel
a62da4e523 Use setCurrentIndex instead of direct assignment 
This should prevent the binding from breaking and hopefully the segfault

CURA-5876
 2018-12-05 09:13:48 +01:00
ChrisTerBeke
b57f6c5c6a
Do no stop when no clusters are found, we still might need to remove some 2018-12-04 22:58:50 +01:00
ChrisTerBeke
d0513e40e1
Remove crappy implementation 2018-12-04 22:21:36 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
 2018-12-04 21:30:24 +01:00
Daniel Schiavini
8ea4edf67e STAR-322: Fixing job uploads 2018-12-04 17:37:58 +01:00
Lipu Fei
4ff5e43a28 Handle Empty and Unknown material cases 
CURA-5982
 2018-12-04 17:24:51 +01:00
Lipu Fei
fb3c1fc11d Merge remote-tracking branch 'origin/master' into CURA-5982_fix_crash_no_material 2018-12-04 17:15:26 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Ghostkeeper
780e5e1691
Fix binding loop in PrintCoreConfiguration 
Contributes to issue CURA-5876.
 2018-12-04 17:09:55 +01:00
Ghostkeeper
1544ab6cf0
Explicitly enable hover on ConfigurationItem 
Apparently the default for this depends on some system setting. In Nallath's computer that system setting makes it false by default for some reason.

Contributes to issue CURA-5876.
 2018-12-04 17:07:59 +01:00
ChrisTerBeke
02efc9e1a9 Fix cloud status icon size 2018-12-04 16:54:36 +01:00
Daniel Schiavini
27dc17f993 STAR-322: Extracting translations 2018-12-04 16:49:26 +01:00
ChrisTerBeke
075fa813d6 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:48:09 +01:00
Ghostkeeper
de78c44461
Fix configuration drop-down for dark theme 
This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then.

Contributes to issue CURA-5876.
 2018-12-04 16:43:13 +01:00
ChrisTerBeke
9df49a1232 Add the actual icon contents 2018-12-04 16:39:46 +01:00
Marijn Deé
997811720c Merge remote-tracking branch 'origin/STAR-322_cloud-connection' into STAR-322_cloud-connection 2018-12-04 16:36:01 +01:00
Marijn Deé
3a733bb0a3 Check before removing a printer 2018-12-04 16:35:48 +01:00
ChrisTerBeke
907ade6266 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:35:18 +01:00
ChrisTerBeke
0887817f7d use special icon for cloud connected 2018-12-04 16:35:09 +01:00
Marijn Deé
b32d6812db We don't need a Signal with QTimer 2018-12-04 16:20:27 +01:00
Daniel Schiavini
54744b46a7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:15:19 +01:00
Daniel Schiavini
9046b39b43 STAR-322: Creating a Cloud API client to handle the interaction 2018-12-04 16:14:08 +01:00
Jaime van Kessel
fd6a8d7642 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-04 15:47:27 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic 
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
 2018-12-04 15:46:13 +01:00
Simon Edwards
39c282fabe
Merge pull request #4925 from Ultimaker/CL-1153_printer_states_in_monitor 
CL-1153 printer states in monitor
 2018-12-04 15:30:12 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Marijn Deé
a9273ec2b5 Use QTimer instead of threading.Timer 2018-12-04 15:20:24 +01:00
Ghostkeeper
9c75f3fe0f
Merge branch 'CURA-5876-Configuration_dropdown' of ssh://github.com/Ultimaker/Cura into CURA-5876-Configuration_dropdown 2018-12-04 15:19:48 +01:00
Ian Paschal
014a138fda Remove semi-colon 
Contributes to CL-1153
 2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671 Simplify preview icon logic 
Contributes to CL-1153
 2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8 Always return a string for preview icon 
Contributes to CL-1153
 2018-12-04 15:10:31 +01:00
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +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
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1 
CURA-5943
 2018-12-04 15:03:45 +01:00