114 Commits

Author SHA1 Message Date
Ghostkeeper
8c9d051479
Re-enable Korean translations
They are complete now, as far as we agreed on (only the setting descriptions). They may now be re-enabled.

Contributes to issue CURA-3950.
2017-06-23 16:42:47 +02:00
Lipu Fei
dbf0cf347c Default to 0 if we cannot find the theme
CURA-3873
2017-06-23 13:59:05 +02:00
Ghostkeeper
1d23d659f0
Merge branch '2.6' 2017-06-21 12:29:23 +02:00
Ghostkeeper
e7d5618148
Re-enable Japanese translation
Note that this only includes the setting descriptions.

Contributes to issue CURA-3950.
2017-06-21 11:30:16 +02:00
Ghostkeeper
24b19fa0a5
Convert tab to spaces
We indent with spaces, not tab. This one was mixed.
2017-06-21 11:29:35 +02:00
Ghostkeeper
9acaef8ecc
Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes 2017-06-19 11:05:20 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection
With Qt 5.8 it works again on Windows.
2017-06-15 16:16:56 +02:00
Ghostkeeper
4c8d65a2f4
Re-enable Brazillian Portuguese translation
It's complete again. Thanks Patola.

Contributes to issue CURA-3885.
2017-06-15 09:42:30 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
2017-06-14 09:37:55 +02:00
fieldOfView
817de9d39e Get a list of available themes instead of the hardcoded list 2017-05-24 17:42:11 +02:00
Ghostkeeper
4b28e9bf43
Re-enable Japanese from language selection menu
Contributes to issue CURA-3817.
2017-05-16 09:38:39 +02:00
Mark
04611b06af Fix two spelling errors
TRI-1450
2017-05-10 20:14:03 +02:00
Mark
0e1748b705 Small layout fix so the comboboxes are aligned 2017-05-02 12:55:37 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +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
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
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06: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
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
Jack Ha
02bb575ced Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-29 10:56:36 +02:00
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
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
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
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Lipu Fei
67b57129ed CURA-3397 Add options for profile override dialog 2017-03-03 13:23:32 +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
Ruslan Popov
0c4b2c404b Add Russian language into select control on General Page. 2017-01-06 23:51:28 +03:00