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

1704 Commits

Author SHA1 Message Date
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
fieldOfView
5e50a8fe0b Show value from definition if it is not defined in the material profile 
This way you get sane defaults if no value is provided in the material xml file, instead of 0s
 2017-04-13 00:53:47 +02:00
fieldOfView
c97f8679c2 Fix NaN values on material print settings tab 2017-04-13 00:25:38 +02:00
fieldOfView
e92aaca7b6 Filter materials by the (approximate) material diameter of the printer 
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
 2017-04-12 23:03:58 +02:00
Lipu Fei
5945212e4b Remove pixel ratio for childrenRect in OpenFilesIncludingProjectsDialog 
CURA-3642
 2017-04-12 08:55:17 +02:00
Lipu Fei
f4e1212005 Use screen pixel ratio for OpenFilesIncludingProjectsDialog 
CURA-3642
 2017-04-12 08:43:48 +02:00
Jaime van Kessel
bc78bf94ab Fixed buttons not visible on my screen 
CURA-3642
 2017-04-10 14:06:10 +02:00
Tim Kuipers
4c6f9486be feat: cutting mesh (CURA-966) 2017-04-08 12:49:00 +02:00
Arjen Hiemstra
e1537d4dea Fix quality selection menu to highlight the active entry 
Since we changed the "empty_quality_changes" to a proper empty
container.
 2017-04-06 17:51:38 +02:00
Lipu Fei
1965b02fdf Fix size problem for open project dialog 
CURA-3642
 2017-04-06 14:28:45 +02:00
Jack Ha
07ed1bedc3 Fix boo boo with open multi files including project files. 2017-04-05 16:07:02 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs 
Fix issues with Workspace and Profile Changes dialogs
 2017-04-04 14:35:12 +02:00
jack
0ad344f91d Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox 
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
 2017-04-04 10:57:42 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:04:45 +02:00