Lipu Fei
861deaa9f7
Add renderType native for toolbox QML Labels
...
CURA-6006
2018-12-10 14:38:33 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
...
Conflicts:
cura/Settings/MachineManager.py -> rowCount vs. count
resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Jaime van Kessel
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Mark
b98df0f22f
Show one website link where to get the material
2018-11-27 15:46:23 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default
...
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.
Contributes to issue CURA-5876.
2018-11-26 17:33:37 +01:00
Diego Prado Gesto
fab0d5a4b7
Rename the color of the sidebar to main_background, since it was deleted
...
but not updated in the usages.
Contributes to CURA-5785.
2018-11-20 13:25:15 +01:00
Remco Burema
8e05c2adcb
Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922]
2018-11-09 15:27:02 +01:00
Remco Burema
c8d9ad37ff
Add Printing Guidelines links to materials in Marketplace. [CURA-5922]
2018-11-09 13:49:14 +01:00
Remco Burema
21d4cd8f9f
Add Safety Data Sheet links to materials in Marketplace. [CURA-5922]
2018-11-09 13:44:42 +01:00
Jaime van Kessel
d3302938b2
Fix technical data sheet not showing if there is no support_configs
2018-11-08 16:38:38 +01:00
Lipu Fei
d6046c725a
Fix Toolbox QML null object warnings
...
CURA-5670
2018-09-07 09:29:31 +02:00
Lipu Fei
c4afbe7a67
Convert links to a dict
...
CURA-5676
Easier to process.
2018-08-31 13:45:04 +02:00
Aleksei S
9258c9a7fc
Added links to toolbox
...
CURA-5676
2018-08-31 11:03:30 +02:00
Ian Paschal
c47de04983
Fix bracket style
...
Contributes to CURA-5598
2018-08-03 11:41:08 +02:00
Ian Paschal
bcedef3bbe
Continue scrolling over compatibility charts
...
Contributes to CURA-5598
2018-08-03 11:38:42 +02:00
Lipu Fei
b0f1a6d859
Use Label delegate to avoid overlapping texts
...
CURA-5544
2018-07-05 14:36:41 +02:00
fieldOfView
ac1dfcf15d
Make headers non-transparent
2018-05-28 22:52:49 +02:00
Ian Paschal
858108920a
Merge pull request #3765 from fieldOfView/fix_toolbox_appearance
...
Fix toolbox appearance
2018-05-04 14:25:01 +02:00
Diego Prado Gesto
b00d51a6eb
CURA-4644 Set the property in the component where is being used.
2018-05-04 14:03:26 +02:00
fieldOfView
4e305079ec
Simplify
2018-05-04 11:42:45 +02:00
fieldOfView
685b80fc3a
Fix more QML warnings
2018-05-02 21:56:23 +02:00
Ian Paschal
0872d499f8
CURA-5035 Add compatibility chart
2018-05-02 18:43:12 +02:00
