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

3755 Commits

Author SHA1 Message Date
Remco Burema
3c0583bef0 [AddPrinterByIp] Finish GUI as a facade first for review. [CURA-6057] 2019-03-06 14:05:42 +01:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00
Remco Burema
c1cde2ebc0 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-05 14:15:17 +01:00
Lipu Fei
56060b1e64 WIP: Add add printer page, network part 2019-03-05 12:06:51 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538 WIP: dos2unix new files 2019-02-28 08:07:44 +01:00
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +01:00
Lipu Fei
92730a09a2 WIP: Add data collections page 2019-02-28 07:48:05 +01:00
Lipu Fei
72866683e6 WIP: Add Whats new page 2019-02-27 16:00:45 +01:00
Lipu Fei
14fdf68871 WIP: Add User Agreement page and fixes 2019-02-27 15:28:39 +01:00
Lipu Fei
ac012e8f09 WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
Lipu Fei
3b63f92d55 WIP: Add base QMLs for WelcomeDialog 2019-02-27 12:45:28 +01: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
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix 
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
 2019-02-22 13:37:10 +01:00
Jaime van Kessel
dd59b9167b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-22 11:37:58 +01:00
Jaime van Kessel
69d3813f98 No longer disable viewMenu when user loaded presliced g-code 2019-02-22 11:19:16 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible 
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
 2019-02-21 20:20:01 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
8409d7d645 Remove another unneeded catalog 2019-02-21 18:42:06 +01:00
Jaime van Kessel
48ed9b6e20 Remove usage of plugin model 2019-02-21 17:16:59 +01:00
Jaime van Kessel
d9c4edf093 Prevent a few expensive conversions from happening in the QML 2019-02-21 16:36:14 +01:00
Jaime van Kessel
1b36a8e12c Fix some more bindings for SettingItem 2019-02-21 16:17:25 +01:00
Jaime van Kessel
27370dd45d Improve the bindings for the material menu 
This way the evaluation is significantly faster.
 2019-02-21 15:26:25 +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
Jaime van Kessel
c2d783bf7a Removed unused plugins model 2019-02-21 15:05:40 +01:00
Jaime van Kessel
b07086dee4 Remove catalog creation from setting item 
This pretty much doubles the speed by which setting items are created.
 2019-02-21 14:49:25 +01:00
Remco Burema
b4e4b7125d Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] 2019-02-20 13:27:05 +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
Satish
4a0bb43e39 CURA-6201 - Added an id to stage buttons for the integration tests 2019-02-15 12:08:42 +01:00
Ghostkeeper
73524deb8d
Add settingKey property for Squish to find things easier 2019-02-15 11:52:16 +01:00
Jaime van Kessel
6ff1f49c34 Ensure the layout gets the right width & height for the output devices popup 
CURA-6222
 2019-02-14 17:21:54 +01:00
Remco Burema
a392f50a67 Small fix for glue-warning height in Ext.-config. 2019-02-14 11:21:01 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +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
Remco Burema
7698ea0df2
Merge pull request #5260 from Ultimaker/CURA-6144_support_extruder_combobox_style 
CURA-6144 Fix combox style for support extruder in recommended
 2019-02-13 16:55:21 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Lipu Fei
c237222d3c Minor change to QML 
CURA-6144
 2019-02-13 11:28:28 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Jaime van Kessel
43b81c70db Ensure that color for support extruder selector gets updated in all cases 
CURA-6144
 2019-02-08 10:32:54 +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
c15089cd59 Some minor cleanup of the QML 
CURA-5916
 2019-02-07 14:13:00 +01:00