GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 10:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,356 Commits 290 Branches 260 Tags
Commit Graph

362 Commits

Author SHA1 Message Date
Jaime van Kessel
4d57aa8ea4 Simplify the rating widget 
CURA-6013
 2018-12-12 09:28:15 +01:00
Jaime van Kessel
fcaa23ed0a Added smallRating widget to featured plugins 
CURA-6013
 2018-12-11 15:16:21 +01:00
Jaime van Kessel
7a5701b001 Made smallrating widget re-usable 
Also added it to the details page

CURA-6013
 2018-12-11 14:12:34 +01:00
Jaime van Kessel
4baf0d1bdb Always show average rating 
CURA-6013
 2018-12-11 13:49:20 +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
Jaime van Kessel
9d1701aacb Removed hardcoded color 
CURA-6013
 2018-12-10 13:29:58 +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
82322d8575 Show that a downloaded plugin has a user rating or not 
CURA-6013
 2018-12-10 11:12:25 +01:00
Jaime van Kessel
99f0e96131 Ensure that the local model is updated correctly on local vote 
CURA-6013
 2018-12-10 11:01:55 +01:00
Jaime van Kessel
098adc45ff Move the rating logic outside of the rating widget 
That way it's easier to re-use the component if that's ever required.

CURA-6013
 2018-12-10 10:40:54 +01:00
Jaime van Kessel
04f3601c27 Ensure that local votes are displayed right away 
So even before an update is received, ensure that the data is updated

CURA-6013
 2018-12-10 09:54:26 +01:00
Jaime van Kessel
e92bd01fb2 Removed the rating from the download grid 
It felt a bit weird to already have it in the grid layout

CURA-6013
 2018-12-07 17:28:42 +01:00
Jaime van Kessel
50099ab753 Make a few missed items themeable as well 
CURA-6013
 2018-12-07 16:02:21 +01:00
Jaime van Kessel
4742db6fec Cleanup gridTile 
CURA-6013
 2018-12-07 15:57:52 +01:00
Jaime van Kessel
fed9e2b623 Move the click area of the download tile to just the icon 
CURA-6013
 2018-12-07 15:42:46 +01:00
Jaime van Kessel
8b25e6946a Prevent attempting to rate when not logged in 
CURA-6013
 2018-12-07 15:33:44 +01:00
Jaime van Kessel
f4220da550 Adds rough first version of rating stars 
It's not fully polished just yet

CURA-6013
 2018-12-07 15:31:33 +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
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
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
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
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
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +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