3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
17259 commits 302 branches 270 tags 773 MiB
Commit graph

48 commits

Author SHA1 Message Date
Jaime van Kessel
a6dbba7090 Minor UI tweaks 
CURA-6013
 2018-12-12 09:41:35 +01:00
Jaime van Kessel
4d57aa8ea4 Simplify the rating widget 
CURA-6013
 2018-12-12 09:28:15 +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
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
50099ab753 Make a few missed items themeable as well 
CURA-6013
 2018-12-07 16:02:21 +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
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
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b03.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb26.
 2018-10-03 16:27:13 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings 
CURA-5670
 2018-09-07 09:29:31 +02:00
Ian Paschal
d4aaec7355 CURA-5537 Style improvements 2018-07-04 12:51:01 +02:00
Ian Paschal
7d30cee205 Revert "Add dummy details for when there is no selection" 
This reverts commit 2e3528d9b2.
 2018-07-04 11:36:56 +02:00
Lipu Fei
2e3528d9b2 Add dummy details for when there is no selection 
CURA-5521
 2018-07-03 15:58:54 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00
Diego Prado Gesto
675b5b1997 Use the application language for the dates 2018-05-11 14:47:56 +02:00
fieldOfView
c2c5228eee Fix plugin details 
Previous fix for QML warnings broke the details display.
 2018-05-02 23:19:13 +02:00
fieldOfView
0aadaa3c9d Merge branch 'master' into fix_toolbox_appearance 
# Conflicts:
#	plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
 2018-05-02 20:37:33 +02:00
fieldOfView
ca8b7bb1da Fix QML warnings 2018-05-02 20:34:50 +02:00
fieldOfView
46e7a6665d Theme link colors 2018-05-02 19:20:52 +02:00
fieldOfView
1f542f176d Fix some more image rendering occurrences 2018-05-02 19:18:03 +02:00
Ian Paschal
0872d499f8 CURA-5035 Add compatibility chart 2018-05-02 18:43:12 +02:00
fieldOfView
a3436bb24b Fix title color on dark theme 2018-05-02 16:25:27 +02:00
Ghostkeeper
1d11fe0506
Code style: Spaces around binary operators 
Contributes to issue CURA-5035.
 2018-05-02 09:31:46 +02:00
Ian Paschal
236e2db47e CURA-5035 Fixed selection header 2018-04-24 16:59:23 +02:00
Ian Paschal
f2301eec31 CURA-5035 Simplify selection 2018-04-24 15:34:05 +02:00
Ian Paschal
dc0dcac199 CURA-5035 Small style tweaks 2018-04-20 17:06:16 +02:00
Ian Paschal
0944bba86b CURA-5035 Added typings 2018-04-20 16:21:57 +02:00
Ian Paschal
9b556e9c86 CURA-5035 Removed all base units 2018-04-20 14:08:44 +02:00
Ian Paschal
668a92952c CURA-5035 Review changes 2018-04-20 13:26:23 +02:00
Ian Paschal
921e8f7602 CURA-5035 Clean-up 2018-04-19 16:07:31 +02:00
Ian Paschal
f8672ecbc6 CURA-5035 Improved details pages 2018-04-18 16:35:55 +02:00
Ian Paschal
e13c45daee CURA-5035: Clean-up 2018-04-12 14:03:53 +02:00
Ian Paschal
87c194178d CURA-5035 Added fake material showcase model 2018-04-12 12:49:31 +02:00
Ian Paschal
594e9aa414 Cura-5035 Further style improvements 2018-04-11 17:05:16 +02:00
Ian Paschal
d4cc4659d8 CURA-5035 More styling & layout 2018-04-10 16:07:39 +02:00
Ian Paschal
7359554641 Implimented showcase 2018-04-10 11:05:34 +02:00
Ian Paschal
817b724994 Added author and material views 2018-04-09 15:55:56 +02:00
Ian Paschal
91001455ad Improved structure and enabled display by author 2018-04-06 17:26:25 +02:00
Renamed from plugins/Toolbox/resources/qml/ToolboxDetailsPage.qml (Browse further)