fieldOfView
6474f3eb25
Ups the limit of the maximum cost of a spool of filament
...
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.
Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 09:12:48 +01:00
Jaime van Kessel
8023341090
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-23 15:15:08 +01:00
Lipu Fei
a0f841e8eb
Prevent MachineSettings dialog go beyond the top of screen
2017-03-23 13:46:01 +01:00
Lipu Fei
08f6ee319e
Use default font for open file dialog text
...
CURA-3495
2017-03-23 08:46:48 +01:00
Lipu Fei
ef0a502dcf
Add { } around statements in "if"
...
Make nitpicking people happy :P
2017-03-22 21:05:45 +01:00
Lipu Fei
fa7dc3a708
Use onActivated for profile override combobox
2017-03-22 16:01:50 +01:00
Jack Ha
bd10e50249
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-22 13:24:37 +01:00
Jack Ha
4eff58995d
Merge branch '2.5'
2017-03-22 13:24:32 +01:00
Lipu Fei
f9e377ec43
Enable/disable Keep/Discard buttons according to selection
2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5
CTRL-P only works when the button is enabled
...
CURA-3496
2017-03-22 12:01:41 +01:00
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +01:00
Lipu Fei
2d48809214
Also asks when opening a recent project file
...
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b
Add dialog for opening a project file
...
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 13:24:06 +01:00
Lipu Fei
8dbb1d47e1
Shrink the widht of profile override combobox
2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5
More spacing for override profile combobox
2017-03-21 11:05:37 +01:00
Lipu Fei
eaad358e42
Remove shortcut text in the SaveButton
2017-03-21 09:51:07 +01:00
Jaime van Kessel
8a1ad98ed5
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-21 09:39:27 +01:00
Jaime van Kessel
a8cec631b4
Lowered the required qtquick number for open dialog
2017-03-21 09:39:07 +01:00
Lipu Fei
139bb76806
Add CTRL+P shortcut for save/print button
...
CURA-3496
2017-03-21 09:28:03 +01:00
Lipu Fei
555cd58f5e
Save with code names for profile override preference
...
CURA-3561
2017-03-21 09:09:17 +01:00
Jack Ha
b6d9fdcd13
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-20 15:10:14 +01:00
Jack Ha
1faa195c35
Renamed 'Save As' to 'Save As...' CURA-3496
2017-03-20 15:10:01 +01:00
Lipu Fei
892225d398
Move some code to OpenFilesIncludingProjectsDialog.qml
...
CURA-3495
2017-03-20 14:59:23 +01:00
Jack Ha
ebf8782722
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-20 13:01:15 +01:00
Jack Ha
c1ca2ac09a
Merge branch '2.5'
2017-03-20 12:56:35 +01:00
Lipu Fei
f259038954
Adjust open project/models dialog size for high DPI
...
CURA-3495
2017-03-20 11:37:04 +01:00
Lipu Fei
8d6ea7bb97
Adjust Discard/Keep Profile Dialog size for high DPI
2017-03-20 11:30:05 +01:00
jack
42e7a0defa
Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
...
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Lipu Fei
8e77d212f7
Remove "Save All" and add "Save As" MenuItem
...
CURA-3496
2017-03-17 14:31:22 +01:00
Jaime van Kessel
d52515d57d
Added invert zoom preference option
2017-03-16 19:06:57 +01:00
Lipu Fei
e00c68344a
CURA-3495 open project/models in one dialog
2017-03-16 13:37:06 +01:00
Lipu Fei
ea16f967d7
Fix code styling
2017-03-16 13:37:06 +01:00
Jaime van Kessel
a7b5879263
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 13:18:41 +01:00
Jaime van Kessel
efce0696bd
Recently activated material can no longer be removed
...
CURA-3147
2017-03-16 13:11:51 +01:00
Jack Ha
f918a978b2
Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390
2017-03-15 14:29:59 +01:00
Jaime van Kessel
6cc0bd893f
Save as now defaults to 3mf
...
CURA-3496
2017-03-15 09:57:50 +01:00
Jaime van Kessel
48cba91b16
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-15 09:27:08 +01:00
Jaime van Kessel
138c3db26f
Preferred mimetype is now used when saving to local or removable drive
...
CURA-3496
2017-03-15 09:23:47 +01:00
Jack Ha
132b6aa9d7
Merge branch '2.5'
2017-03-15 09:10:49 +01:00
Lipu Fei
97b943736b
Use translation for text in keep/discard profile dialog
2017-03-14 11:59:51 +01:00
Jaime van Kessel
370f90db68
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-10 14:24:05 +01:00
Jaime van Kessel
1d7bf51152
Added confirmation message for starting new project
...
CURA-3494
2017-03-10 14:10:24 +01:00
Lipu Fei
c9d223acd4
CURA-3452 Save spool cost and weight upon change
2017-03-10 12:41:28 +01:00
Jaime van Kessel
66afc2a391
Added new project option
...
CURA-3494
2017-03-10 11:02:27 +01:00
Lipu Fei
e67aecb041
CURA-3221 Translate column name "Default"
2017-03-08 15:36:11 +01:00
jack
c154ce07f8
Merge pull request #1499 from LipuFei/feature_CURA-3397-override-profile-dialog
...
CURA-3397 Set override profile preference option upon visibility change
2017-03-08 10:32:14 +01:00
jack
4a68f25769
Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog
...
CURA-3221 improve override profile dialog
2017-03-08 09:52:32 +01:00
Lipu Fei
a20fb7a479
Fix some coding style
2017-03-07 20:18:31 +01:00
Lipu Fei
897791b0d2
CURA-3221 Use "system" font so texts fit in rows
2017-03-07 12:53:21 +01:00