GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,610 Commits 295 Branches 268 Tags
Commit Graph

1619 Commits

Author SHA1 Message Date
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control 
While simplifying theme additions
 2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues 
Make scrollview look more in line with the scrollview on the profiles page
 2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons 
Add Extruder selection buttons to the Toolbar
 2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker 
Theme picker
 2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material. 
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
 2017-04-27 11:19:46 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button 
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
 2017-04-26 16:17:54 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label 
CURA-3609
 2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling 
Make the general settings page options draggable only vertically
 2017-04-26 11:19:47 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar 
Contributes to CURA-3577
 2017-04-25 16:11:31 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu 
Add Extruders to Context Menu and Refactor
 2017-04-24 14:55:57 +02:00
Arjen Hiemstra
bca27ad11f Document findItemIndex function in ContextMenu 2017-04-24 13:13:00 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection 
This matches more closely with the naming of the other selection
actions.
 2017-04-24 13:12:00 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction 
... to match other scrollviews. Fixes #1723
 2017-04-22 23:07:13 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
dd73c53ece Introduce center and multiply actions that work on the entire selection 
Instead of working on a single object.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
06cc0e9a63 Move the ContextMenu to its own file 
Contributes to CURA-3609
 2017-04-20 17:39:43 +02:00
fieldOfView
62f2fe062b Enable settings when machine_extruder_count is set to 1 but multiple extruders are defined 2017-04-19 16:20:01 +02:00
Lipu Fei
7db0f0ebb7 Make toggle button labels clickable 2017-04-19 12:46:25 +02:00
Jack Ha
232f975092 Removed unused code, added ';' to end of lines. CURA-3574 2017-04-19 10:28:16 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme 
CURA-3574
 2017-04-19 08:56:11 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching 
CURA-3574
 2017-04-18 16:40:59 +02:00
Mark
2d14052f4e Change Label to Text to fix ugly fonts 
CURA-3389
 2017-04-18 13:35:39 +02:00
Mark
8c9eccd1f4 Change Label to Text because of ugle font rendering 
CURA-3389
 2017-04-18 12:11:02 +02:00
Lipu Fei
865ab7135a Merge pull request #1686 from fieldOfView/fix_material_nan 
Fix NaN values on material print settings tab
 2017-04-18 09:52:38 +02:00
Ghostkeeper
39fbe542b9
Fix font rendering issues in job spec details 
Labels render with system settings. Text renders with our settings.

Contributes to issue CURA-3389.
 2017-04-14 16:08:12 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct 
CURA-3389
 2017-04-14 13:16:48 +02:00
Mark
81ab6dd754 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 11:41:29 +02:00
Mark
8ede111001 Texts in the mainwindow should be Text instead of Label 
CURA-3389
 2017-04-14 11:41:12 +02:00
Jaime van Kessel
397b08ce6d Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura 2017-04-14 11:22:35 +02:00
Mark
c0f35a620a Use the correct i18n catalog name for translations in the right-click menu 
CURA-3660
 2017-04-13 13:52:11 +02:00
Tim Kuipers
ef9b705cc4 Merge remote-tracking branch 'origin/feature_support_mesh' 2017-04-13 11:13:25 +02:00
Ghostkeeper
f35124400b
Merge branch '2.5' 2017-04-13 09:50:27 +02:00
Ghostkeeper
cf25eeea5f
Remove Japanese and Korean translations 
They are not complete (by far).

Contributes to issue CURA-3487.
 2017-04-13 09:39:10 +02:00