GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,927 Commits 294 Branches 267 Tags
Commit Graph

3661 Commits

Author SHA1 Message Date
Lipu Fei
b28e98f288
Merge pull request #5521 from Ultimaker/CURA-6151-Notify-updates-from-marketplace 
Notify updates from marketplace
 2019-04-01 13:19:37 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
15f9844b85 Make reusable NotificationIcon 
CURA-6151
 2019-04-01 11:51:31 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children 
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
 2019-04-01 10:41:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from 
For the maximumSize of a button.

Contributes to CURA-6412.
 2019-03-28 09:29:31 +01:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace. 
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
 2019-03-27 13:21:56 +01:00
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4 2019-03-26 15:00:31 +01:00
Satish
85a7d814d8 Added id to machine selector for integration tests 2019-03-25 14:34:00 +01:00
Thomas Karl Pietrowski
8b0e1e9f5d
PrintSetupSelector: "G code" -> "G-code" 
Noticed that "g-code" is written at some places with and without a hyphen.
Since it think it should be written with, I'm correcting it at this point.
 2019-03-22 19:42:01 +01:00
Diego Prado Gesto
a793a06b60 Add a maximumWidth to the ActionButton 
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.

Contributes to CURA-6412.
 2019-03-22 17:10:42 +01:00
Ghostkeeper
294b61937a
Re-enable Polish 2019-03-21 21:14:11 +01:00
Diego Prado Gesto
fceffce56e Show the slider in the middle when there is only one quality profile available. 
Contributes to CURA-6121.
 2019-03-21 14:18:07 +01:00
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