324 Commits

Author SHA1 Message Date
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox
CURA-6006
2018-12-12 10:47:18 +01:00
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants
CURA-6005
2018-12-11 12:13:46 +01:00
Lipu Fei
69744282e6 Fix rounding issue in toolbox QML widget size
CURA-6006
2018-12-10 14:38:40 +01:00
Lipu Fei
861deaa9f7 Add renderType native for toolbox QML Labels
CURA-6006
2018-12-10 14:38:33 +01:00
Lipu Fei
b745755a7d Remove TODO in ToolboxProgressButton
CURA-6006

This file has been refactored.
2018-12-10 13:22:38 +01:00
Lipu Fei
1487af167b Disable async loading for ToolboxDetailTile
CURA-6006
2018-12-10 13:20:38 +01:00
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Jaime van Kessel
eaf413997d Changed the installed button to be a secondary button
CURA-6006
2018-12-07 09:44:09 +01:00
Jaime van Kessel
9eb09132d6 Fix minor layout issue installed page
CURA-6006
2018-12-07 09:38:02 +01:00
Jaime van Kessel
b33ce7a50f Fix alignment of download grid tile
CURA-6006
2018-12-07 09:35:08 +01:00
Jaime van Kessel
eddf4e7f3d Simplify QML 2018-12-06 19:38:12 +01:00
Jaime van Kessel
d4a255c9e5 Also add the login required label at the installed plugin list
CURA-6006
2018-12-06 17:35:58 +01:00
Jaime van Kessel
2c9c9d8c96 Handle non-happy path for downloading
CURA-6006
2018-12-06 17:23:02 +01:00
Jaime van Kessel
717fb260c1 Change toolbox tabs to controls2
CURA-6006
2018-12-06 16:58:40 +01:00
Jaime van Kessel
4b8e3c32cb Also show the login required if an update is needed
CURA-6006
2018-12-06 16:37:47 +01:00
Jaime van Kessel
4e2ab163ed Add login fequired link to packages that have the login-required tag
CURA-6006
2018-12-06 16:24:12 +01:00
Jaime van Kessel
62c5398933 Change buttons to use either secondary or primary
CURA-6006
2018-12-06 14:58:46 +01:00
Jaime van Kessel
a77ad32999 Move all the seperate tiles into loaders instead of the entire page
Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
2018-12-06 14:35:07 +01:00
Jaime van Kessel
54def4edee Revert "Moved qml pages of toolbox to a loader"
This reverts commit 838949dac74831e38e9f07fe7d628af7807320db.
2018-12-06 14:12:35 +01:00
Jaime van Kessel
2602d5bf02 Add changed checks to prevent unneeded signals from being fired
CURA-6006
2018-12-06 10:46:19 +01:00
Jaime van Kessel
6a466c99b2 Make the progressButton use signals instead of functions
Although the naming is still a bit off, it's much cleaner to use signals instead of functions. It's
also more in line with how default QML components handle these kind of situations

CURA-6006
2018-12-06 09:54:32 +01:00
Jaime van Kessel
838949dac7 Moved qml pages of toolbox to a loader
This dramatically improves the loading of the toolbox dialog

CURA-6006
2018-12-06 09:45:27 +01:00
Jaime van Kessel
00e95e68eb Removed unneeded Marketplace tag in logging
The logger does that all by itself already. CURA-6006
2018-12-05 14:26:47 +01:00
Jaime van Kessel
d6630b6881 Removed some more cases where data was duplicated and re-used for different purposes
CURA-6006
2018-12-05 14:09:55 +01:00
Jaime van Kessel
a52f866f81 Move most models out of dictionary
CURA-6006
2018-12-05 14:03:32 +01:00
Jaime van Kessel
07d210483c Greatly decrease the bloat / complexity of the toolbox
There was a lot of stuff going on that didn't need to happen, so I cut those parts out in order
to improve the overview.
2018-12-05 13:42:13 +01:00
Jaime van Kessel
b1440737e6 Remove a whole bunch of unused code
CURA-6006
2018-12-05 13:21:17 +01:00
Jaime van Kessel
abcc621cc6 Added missing typing 2018-12-05 11:29:44 +01:00
Jaime van Kessel
d9135ac72f Fix more codestyle issues
CURA-6006
2018-12-05 11:06:14 +01:00
Jaime van Kessel
978a01e4c8 Fix typing & codestyle
CURA-6006
2018-12-05 10:51:05 +01:00
Jaime van Kessel
700ae4bebb Removed super spammy logging
CURA-6006
2018-12-05 10:48:06 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
It is now the default in Uranium.

Contributes to issue CURA-5876.
2018-12-04 15:04:51 +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
d88a465737 Increase possible visible description lines in the Marketplace 2018-11-29 14:45:42 +01:00
Mark
b98df0f22f Show one website link where to get the material 2018-11-27 15:46:23 +01:00
Mark
f8f498b90c Increase the lines that are shown to 12 2018-11-27 15:45:58 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
Mark
c7fd147f59 Show website for support 2018-11-27 14:55:06 +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
Jaime van Kessel
a654499752 Re-enable hover for marketplace button
CURA-5959
2018-11-26 13:47:22 +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
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Ghostkeeper
e9216936d7
Compare SDK version as Version instances
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
2018-11-15 15:13:36 +01:00
Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
2018-11-13 16:23:36 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00