Tim Kuipers
7a67ab4e66
Merge branch '2.5'
2017-03-28 12:55:18 +02:00
Jaime van Kessel
6367755875
Disabled center_on_select for windows, as pyqt has a bug with it
2017-03-28 10:21:52 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen"
...
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
2017-03-27 16:00:08 +02:00
Lipu Fei
6644a4d386
Revert "Prevent MachineSettings dialog go beyond the top of screen"
...
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
2017-03-27 11:09:40 +02:00
fieldOfView
33f20710d9
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 11:23:40 +01:00
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
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +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
555cd58f5e
Save with code names for profile override preference
...
CURA-3561
2017-03-21 09:09:17 +01:00
Jaime van Kessel
d52515d57d
Added invert zoom preference option
2017-03-16 19:06:57 +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
Lipu Fei
c9d223acd4
CURA-3452 Save spool cost and weight upon change
2017-03-10 12:41:28 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
Jaime van Kessel
419396cc16
Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura
2017-03-03 14:43:42 +01:00
Lipu Fei
67b57129ed
CURA-3397 Add options for profile override dialog
2017-03-03 13:23:32 +01:00
Jaime van Kessel
8e4f650746
Added a tiny bit of spacing between machine action buttons
2017-03-03 09:47:58 +01:00
Jack Ha
f9a5dc885c
Solved merge conflicts #1479 CURA-3321
2017-03-01 14:47:54 +01:00
Jack Ha
057dc2fd7d
Solved merge conflicts. CURA-3214
2017-02-21 11:01:20 +01:00
fieldOfView
61e0cd4ff5
Move legacy options to layerview options
2017-02-20 11:09:34 +01:00
fieldOfView
97d20b4242
Make General preference pane scrollable
...
On some OSes/configurations/screens, the options on the General pane don't fit until the window is resized. Adding a scrollview helps in these cases.
2017-02-17 13:39:46 +01:00
Jack Ha
ca84fdd767
Merge branch 'master' into feature_auto_slice
2017-02-15 12:42:09 +01:00
Jack Ha
e5cdc318f7
Added preference. CURA-3214
2017-02-13 14:29:34 +01:00
Jack Ha
1d77864915
Added force layer view compatibility mode. CURA-3273
2017-02-07 09:36:21 +01:00
Victor Larchenko
bc300d1116
T524: Added theme picker
2017-02-02 13:27:58 +06:00
Jack Ha
2f9618f2ad
Merge branch 'master' into layer_view3_cleanup
2017-01-30 11:25:55 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language
...
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
2017-01-26 17:06:06 +01:00
Jack Ha
3a2438937d
Removed crappy legend
2017-01-25 12:46:07 +01:00
Jack Ha
e21a6ed62a
Cleanup
2017-01-24 16:52:47 +01:00
Ghostkeeper
a8efde9450
Merge pull request #1243 from fieldOfView/feature_material_cost
...
Implement material cost
2017-01-24 15:54:57 +01:00
Jack Ha
abe7a8e9a3
Merge branch 'master' into layer_view3_cleanup
2017-01-17 15:16:50 +01:00
fieldOfView
c48f02a7eb
Fix horizontal scrolling/flicking of materialview
...
(probably windows-only)
2017-01-09 14:19:22 +01:00
fieldOfView
4ba8b4e7c8
Update spool length and cost per meter when editing values in materials dialog
2017-01-09 14:08:50 +01:00
Ruslan Popov
0c4b2c404b
Add Russian language into select control on General Page.
2017-01-06 23:51:28 +03:00
fieldOfView
ebbe37a6cd
Remove "Edit" button from materials page
...
The "Edit" button is an unnecessary barrier. Read-only materials are still uneditable.
2017-01-03 11:23:31 +01:00
fieldOfView
6479f2f938
Remove redundant "(Approx.)"
...
It is made redundant by the ~, and Approx. is an ugly abbreviation anyway
2017-01-03 11:11:57 +01:00
fieldOfView
27cf300ba6
Remove lingering debug statement
2017-01-03 11:05:32 +01:00
fieldOfView
ac34fe89ee
Make currency preference settable
2017-01-03 11:05:32 +01:00
fieldOfView
4429825d15
Show the calculated values are an approximation
2017-01-03 11:05:31 +01:00
fieldOfView
a06f66305f
Calculate spool length and cost per meter
2017-01-03 11:05:31 +01:00
fieldOfView
7516fb6056
Store cost & weight as preference values independent of material definition
...
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
2017-01-03 11:05:31 +01:00
Jack Ha
93137fcc91
Added compatibility mode - old layer view is now also available
2017-01-02 12:56:18 +01:00
Ghostkeeper
0ca157518e
Update current item when importing new material
...
Since we select the newly imported material, we need to update the current item so that the window on the right also gets updated.
Contributes to issue CURA-3138.
2016-12-16 11:12:33 +01:00
jack
8fdc0a40ce
Merge pull request #1235 from Ultimaker/project_save_dialog
...
Project save dialog
2016-12-12 10:41:49 +01:00
