3647 Commits

Author SHA1 Message Date
Ghostkeeper
cb44223eca
Consistent capitalisation 2019-03-18 15:16:49 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence
A lot of translators got this wrong.

Contributes to issue CURA-6257.
2019-03-14 14:30:57 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Ghostkeeper
cfa02c39ec
Don't allow translating 'Ultimaker Cloud'
It is a marketing name and shouldn't be translated then.

Contributes to issue CURA-6257.
2019-03-13 14:29:07 +01:00
Ghostkeeper
04f11e4abf
Make translation a bit easier to get grammatically correct
We should not append translations to each other. That doesn't work in different languages.

Contributes to issue CURA-6257.
2019-03-13 14:13:49 +01:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode
It makes more sense.
2019-03-08 15:27:17 +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
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
Jaime van Kessel
575f323ea1 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-06 13:07:09 +01:00
Jaime van Kessel
c7c57c167c Fix call to non-existing function 2019-02-06 12:37:30 +01:00
Jaime van Kessel
f2fbb4e989 Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174] 2019-02-05 13:24:28 +01:00
Lipu Fei
4ea6e5d0df Merge remote-tracking branch 'origin/4.0' 2019-02-05 11:40:50 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage
Let each stage create its own action panel
2019-02-05 11:16:00 +01:00