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

711 Commits

Author SHA1 Message Date
Lipu Fei
c3175e5322 Theme welcome_pages_button 2019-03-21 16:01:50 +01:00
Lipu Fei
6742348a95 Theme radio_button size 2019-03-21 15:20:39 +01:00
Lipu Fei
95a0a5fb24 Theme window_disabled_background 2019-03-20 13:46:54 +01:00
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
3b63f92d55 WIP: Add base QMLs for WelcomeDialog 2019-02-27 12:45:28 +01:00
Ghostkeeper
fae4c9ee8d
Merge branch '4.0' 2019-02-26 15:35:17 +01:00
Ghostkeeper
d6c73175c7
Reduce minimum screen size 
With dual extrusion printers, this reduces the width so much that the material name is just ellipses in the top screen, but at least it's still usable. With single extrusion printers this is fine.
 2019-02-26 15:34:23 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Ian Paschal
c14aa3686c Add some new colors to theme 
Contributes to CL-1247
 2019-02-19 12:23:03 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +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
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Diego Prado Gesto
2d1d0c2d37 Remove unused image 2019-02-15 13:39:40 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Remco Burema
c6c0ed5f00 Fix sign-in size for cloud icon (and add for dark theme). 
Co-authored-by: Yi-An Lai <y.lai@ultimaker.com>
 2019-02-12 11:57:01 +01:00
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section' 
Contributes to issue CURA-5916.
 2019-02-08 09:32:56 +01:00
Diego Prado Gesto
b0cf5f25c6 Merge branch '4.0' 2019-02-07 17:36:44 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Jaime van Kessel
eb6f65d4ec Add print-guideline icon 
CURA-5916
 2019-02-07 15:19:46 +01:00
Jaime van Kessel
e869829f10 Updated the icon so it also works in the dark theme 2019-02-07 15:17:07 +01:00
Jaime van Kessel
c15089cd59 Some minor cleanup of the QML 
CURA-5916
 2019-02-07 14:13:00 +01:00
Jaime van Kessel
575f323ea1 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-06 13:07:09 +01:00
Ian Paschal
58d998af68 Add theme entry for message image 
Contributes to CL-1222
 2019-02-06 11:58:22 +01:00
Lipu Fei
4ea6e5d0df Merge remote-tracking branch 'origin/4.0' 2019-02-05 11:40:50 +01:00
Jaime van Kessel
d59889a4ab Fix logo in about popup 2019-02-05 11:13:47 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Remco Burema
203f699d0a Override message-box bg-color in dark theme. [CURA-6169] 2019-02-01 11:24:50 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Ian Paschal
858e2f6b42 Add some theme dependencies 
Contributes to CL-1154
 2019-01-31 10:49:33 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
784598d4a2 Remake: sign in page 
CURA-6132
 2019-01-30 15:37:25 +01:00
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Jaime van Kessel
13b2b33900 Remove unused theme option 2019-01-25 13:02:39 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Jaime van Kessel
228614a590 Remove unused values from theme.json 
CURA-6115
 2019-01-25 11:20:50 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
e204696b61 Add dark theme 
Contributes to CL-1165
 2019-01-23 12:10:06 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors" 
This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
 2019-01-21 14:05:24 +01:00