Commit Graph

332 Commits

Author SHA1 Message Date
Roman Telezhynskyi
f593d4ca5b Dialog seam allowance tool should show visualization only when user is creating
new piece.

--HG--
branch : feature
2016-11-08 19:11:47 +02:00
Roman Telezhynskyi
721b9b638b Fixed VPiece class method name. CountNode -> CountNodes.
--HG--
branch : feature
2016-11-08 12:55:57 +02:00
Roman Telezhynskyi
2ed35461b6 Forbid delete objects if user is creating a piece.
--HG--
branch : feature
2016-11-05 15:31:20 +02:00
Roman Telezhynskyi
bff5462ef3 Changes in dialog: reverse and internal move update the visualization
automatically.

--HG--
branch : feature
2016-11-05 15:27:19 +02:00
Roman Telezhynskyi
bf306f6101 The visualization connected to tool dialog.
--HG--
branch : feature
2016-11-05 12:49:20 +02:00
Roman Telezhynskyi
f8ee078ef7 When user creates new piece button Apply should be disabled.
--HG--
branch : feature
2016-11-04 19:36:36 +02:00
Roman Telezhynskyi
f40bf977c8 Enable internal move in the list. Helps user quickly make reorder.
--HG--
branch : feature
2016-11-04 17:34:15 +02:00
Roman Telezhynskyi
eb84ae7526 Added list context menu with options Delete and Reverse (except for point).
--HG--
branch : feature
2016-11-04 17:04:18 +02:00
Roman Telezhynskyi
e261d02f89 Check keyboard modificator and add object reversed if pressed Shift.
--HG--
branch : feature
2016-11-04 16:25:57 +02:00
Roman Telezhynskyi
1dd86e66fb New dialog connected to tool button.
--HG--
branch : feature
2016-11-04 16:16:11 +02:00
BojanKverh
96cfc52202 At least one arrow has to be present on a grainline
--HG--
branch : feature
2016-10-25 23:00:42 +02:00
BojanKverh
21cd56463c User can now turn on/off grainline arrows
--HG--
branch : feature
2016-10-25 00:53:01 +02:00
Roman Telezhynskyi
0a7097f259 Fix MSVC warning.
--HG--
branch : develop
2016-10-24 12:57:27 +03:00
BojanKverh
e82f65fc6a Fixed the grainline tab icon in details dialog
--HG--
branch : feature
2016-10-23 20:59:38 +02:00
Bojan Kverh
01c068ddd0 Merged develop into feature
--HG--
branch : feature
2016-10-23 15:28:40 +02:00
Roman Telezhynskyi
fdc1eac734 Refactoring DialogTool::GetComboBoxCurrentData. Returned wrong default value.
--HG--
branch : develop
2016-10-17 14:53:46 +03:00
BojanKverh
e192ff54ec Finished interactive rotation of the grainline and fixed cursor in the Grainline tab of detail dialog
--HG--
branch : feature
2016-10-13 23:33:32 +02:00
BojanKverh
5562e46790 Fixed the Grainline tab in detail dialog and also length/rotation formulas checking
--HG--
branch : feature
2016-10-06 23:39:57 +02:00
BojanKverh
b755762aec Merged develop into feature
--HG--
branch : feature
2016-10-05 20:27:57 +02:00
Roman Telezhynskyi
f86bf9edd5 Lupdate.
--HG--
branch : develop
2016-10-05 16:21:33 +03:00
Roman Telezhynskyi
121ef1323d Fix building problem on Windows.
--HG--
branch : develop
2016-10-04 17:51:37 +03:00
Roman Telezhynskyi
4f516c60a6 For the tool Rotate was missed checking changing a point.
--HG--
branch : develop
2016-10-04 17:50:48 +03:00
Roman Telezhynskyi
abce5439a5 Resolved issue #573. New tool: 'Move Point'.
--HG--
branch : develop
2016-10-04 17:34:37 +03:00
BojanKverh
3bc3c4bec3 Fixed the grainline formulas editing
--HG--
branch : feature
2016-10-04 02:07:58 +02:00
BojanKverh
60462bc303 Fixed some code style and replaced some code with more appropriate one according to general recommendations
--HG--
branch : feature
2016-09-29 02:13:18 +02:00
BojanKverh
85b8cb2bd7 Fixes compilation error due to unrecognized qIsNaN
--HG--
branch : feature
2016-09-27 22:09:49 +02:00
BojanKverh
744acbcd3b Merged with develop
--HG--
branch : feature
2016-09-27 22:00:02 +02:00
Roman Telezhynskyi
3bb657ea1a New internal variable "Length to spline control point".
--HG--
branch : develop
2016-09-24 20:44:06 +03:00
BojanKverh
5f1d7a357a Merged develop into feature, removing the conflicts
--HG--
branch : feature
2016-09-20 19:29:49 +02:00
Roman Telezhynskyi
d556508265 Mark tooltip strings for translation. Tools Rotation, Flipping by line and
Flipping by axis.

--HG--
branch : develop
2016-09-17 19:18:27 +03:00
Roman Telezhynskyi
255db32720 Improve tooltip for tools Rotation, Flipping by line and Flipping by axis.
The app will show updated tooltip message in case a user selected point that is
already a part of the list of operated objects.

--HG--
branch : develop
2016-09-17 19:16:15 +03:00
Roman Telezhynskyi
74bc4179ef New tool Flipping by axis.
--HG--
branch : feature
2016-09-17 12:10:03 +03:00
Roman Telezhynskyi
9bb88afaa5 New tool Flipping by line.
--HG--
branch : feature
2016-09-13 11:27:44 +03:00
BojanKverh
f341f51125 Grainline is visible on the detail now, rotation and length can be edited, but it cannot be moved yet
--HG--
branch : feature
2016-09-10 18:30:03 +02:00
BojanKverh
906dafebe8 Finished the grainline parameters editing in detail dialog
--HG--
branch : feature
2016-09-10 15:17:55 +02:00
BojanKverh
2dc19732a0 Prepated detail dialog for formula editing in case of grainline length and rotation
--HG--
branch : feature
2016-09-08 22:35:32 +02:00
BojanKverh
287f8fc41e Added VGrainlineGeometry class to hold grainline parameters and methods to save, load and edit it
--HG--
branch : feature
2016-09-06 23:50:46 +02:00
Roman Telezhynskyi
b6e9a7bab3 Fixed issue #561. UI compiler warning in dialogdetail.ui.
--HG--
branch : develop
2016-09-06 18:47:56 +03:00
Roman Telezhynskyi
0d35033275 Added global option "Forbid Flipping". ref #560.
--HG--
branch : develop
2016-09-06 17:05:54 +03:00
Roman Telezhynskyi
038863fbdf Resolved issue #560. Flipped pattern pieces in Layout.
--HG--
branch : develop
2016-09-06 13:24:52 +03:00
Roman Telezhynskyi
8cf52dc674 Length to control point can be 0.
--HG--
branch : develop
2016-08-26 19:33:54 +03:00
Roman Telezhynskyi
c2b7ead2ce Fixed wrong units in dialog DialogEditWrongFormula.
--HG--
branch : develop
2016-08-26 19:20:03 +03:00
Roman Telezhynskyi
c35f050b66 Improvements for the Dialog Detail. Added spliters, fields Letter and Name of
detail have placeholder text.

--HG--
branch : develop
2016-08-26 13:46:23 +03:00
Roman Telezhynskyi
23d9898154 Use QLocale::c() instead of QLocale(QLocale::C).
--HG--
branch : develop
2016-08-26 12:38:23 +03:00
Roman Telezhynskyi
89ce8afe77 Localize numeric keyboard's dot key according to locale and user preferences.
--HG--
branch : develop
2016-08-23 21:24:14 +03:00
Roman Telezhynskyi
73bcc89107 Fixed wrong compatibility with Qt 5.0.
--HG--
branch : develop
2016-08-22 12:16:12 +03:00
Roman Telezhynskyi
bf82dc3bb3 Make 1 minimal value of the field "Cut number".
--HG--
branch : develop
2016-08-22 11:47:21 +03:00
Bojan Kverh
08bfd9cd82 Merged develop into feature
--HG--
branch : feature
2016-08-21 11:51:49 +02:00
BojanKverh
b4ced822e0 Fixed material attribute writing to XML and removed commented out lines
--HG--
branch : feature
2016-08-21 11:48:51 +02:00
Roman Telezhynskyi
0563df117d <QLoggingCategory> available since Qt 5.2. Use vmisc/logging.h instead.
--HG--
branch : develop
2016-08-21 11:54:32 +03:00
BojanKverh
ff6d3c7155 Fixed user defined materials
--HG--
branch : feature
2016-08-21 10:27:39 +02:00
Bojan Kverh
19c69c691a Merged develop into feature
--HG--
branch : feature
2016-08-21 00:01:35 +02:00
Valentina Zhuravska
00649770e3 Little fixes.
--HG--
branch : feature
2016-08-17 23:13:54 +03:00
BojanKverh
1cfa97497c Fixed translations after language change
--HG--
branch : feature
2016-08-17 21:38:39 +02:00
Bojan Kverh
10f2d83edd Merged develop into feature
--HG--
branch : feature
2016-08-17 18:00:56 +02:00
Valentina Zhuravska
09a9ec2855 Resolved Issue #424. Improve Formula Wizard dialog.
--HG--
branch : feature
2016-08-16 23:13:34 +03:00
Roman Telezhynskyi
e333c9bc08 QtDebug and QDebug lead to the same header. Leave only QtDebug.
--HG--
branch : develop
2016-08-16 20:35:21 +03:00
Roman Telezhynskyi
d66280033b Fixed issue #546. Compile error under Windows in current develop revision.
--HG--
branch : develop
2016-08-16 19:57:32 +03:00
Bojan Kverh
37b683f125 Merged develop into feature
--HG--
branch : feature
2016-08-15 11:06:42 +02:00
Roman Telezhynskyi
da4bf27c75 New test localization (checking punctuation).
--HG--
branch : develop
2016-08-12 15:21:55 +03:00
BojanKverh
86f24bf0e5 User defined materials are now remembered and can also be deleted in preferences dialog
--HG--
branch : feature
2016-08-12 01:22:23 +02:00
BojanKverh
b0532e6fb9 Removed userDef attributes from DOM tree, where they are not necessary. Fixed some translations. Refactored finding the selected material in detail dialog
--HG--
branch : feature
2016-08-11 22:44:53 +02:00
Roman Telezhynskyi
0aabacfee4 String inside label also should be translated.
--HG--
branch : develop
2016-08-09 19:42:00 +03:00
Roman Telezhynskyi
7585db6a58 Fix build on Qt\5.3\msvc2013_64_opengl.
--HG--
branch : develop
2016-08-09 16:55:46 +03:00
Roman Telezhynskyi
31fa9785b9 Fixed several mistakes in original strings.
--HG--
branch : develop
2016-08-09 13:50:37 +03:00
Roman Telezhynskyi
80f00b361d Use "Include What You Use" tool for optimizing #includes.
--HG--
branch : develop
2016-08-08 14:44:49 +03:00
Roman Telezhynskyi
67b18fbbde Fix problems with layouts in dialog tool Detail. Returned detail name by
default. Setted clear button for field Letter.

--HG--
branch : develop
2016-08-07 23:41:49 +03:00
Roman Telezhynskyi
2af9c0e65a Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:48:23 +03:00
Roman Telezhynskyi
75e9e9b2ee Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:41:02 +03:00
Bojan Kverh
c5f38207fd Merged develop into feature
--HG--
branch : feature
2016-07-29 21:47:49 +02:00
Roman Telezhynskyi
7b7ef6c0e2 Fixed build.
--HG--
branch : develop
2016-07-26 16:51:38 +03:00
Valentina Zhuravska
1ae8509d63 Merge with develop.
--HG--
branch : feature
2016-07-26 15:32:55 +03:00
Valentina Zhuravska
f9c9cedfac We don't need DialogTool::ShowVisToolTip slot anymore.
--HG--
branch : feature
2016-07-26 13:45:17 +03:00
Bojan Kverh
4138d30fb6 Merged develop into feature
--HG--
branch : feature
2016-07-21 08:30:51 +02:00
Roman Telezhynskyi
1bffa92127 Using QLatin1String instead of QLatin1Literal.
QLatin1Literal is just a typedef of QLatin1String lefter for compatibility with
Qt 4.x.

--HG--
branch : develop
2016-07-20 11:39:15 +03:00
BojanKverh
9943fa7c8b Merging
--HG--
branch : feature
2016-07-18 20:56:05 +02:00
Roman Telezhynskyi
47f12c80f8 Refactoring. Use lambda for small slots. Move slots declaration in appropriate
place.

--HG--
branch : develop
2016-07-18 18:09:15 +03:00
Bojan Kverh
f7ebda3c6e Merged develop into feature
--HG--
branch : feature
2016-07-13 23:11:49 +02:00
Roman Telezhynskyi
e4d6df06b7 Refactoring. Instead of using proxy slots emit signals directly from lambda
expressions.

--HG--
branch : develop
2016-07-13 14:41:44 +03:00
Bojan Kverh
e93f2c117b Merged develop into feature
--HG--
branch : feature
2016-07-12 22:09:47 +02:00
Roman Telezhynskyi
f56f2a0209 Fixed issue #526. Dialog Detail is not on top after selection second object on
Mac.
(grafted from acde5cf1164d8227d71e7ff41ce03b45cbe7c9dd)

--HG--
branch : develop
2016-07-09 13:57:37 +03:00
BojanKverh
6e1dce0cd7 Fixed moving labels and added warning icon to detail dialog when detail name is empty
--HG--
branch : feature
2016-07-08 00:46:33 +02:00
Bojan Kverh
5aa75f2aff Merged develop into feature
--HG--
branch : feature
2016-07-07 20:47:16 +02:00
Roman Telezhynskyi
bd7f328a8a Refactoring deleting visualization object.
Instead of searcing inside current graphics scene use QPointer class.

--HG--
branch : develop
2016-07-07 14:56:55 +03:00
BojanKverh
3a40927764 Fixed layout in detail dialog and painting of text item in rotate mode
--HG--
branch : feature
2016-07-06 22:15:32 +02:00
BojanKverh
192c4d33a7 Added possibility to hide both labels for each detail individually
--HG--
branch : feature
2016-07-06 21:56:52 +02:00
BojanKverh
aa1d1f8ce1 Label cannot be moved outside of parent bounding box. Moving cursor is on when moving label. Name of detail moved to Pattern Piece Data tab. Hopefully all warnings removed
--HG--
branch : feature
2016-07-06 20:49:36 +02:00
BojanKverh
cdd3e03e53 Merged develop into feature
--HG--
branch : feature
2016-07-06 17:58:17 +02:00
Roman Telezhynskyi
0e24fae91c Fixed issue #521. Error: Can't create Seam Allowance after using Union Tool.
--HG--
branch : develop
2016-07-06 13:34:05 +03:00
BojanKverh
180e1ddc90 Merged
--HG--
branch : feature
2016-07-03 10:24:25 +02:00
Roman Telezhynskyi
14afb2ce9b Resolved issue #521. Error: Can't create Seam Allowance after using Union Tool.
--HG--
branch : develop
2016-07-02 14:43:01 +03:00
Roman Telezhynskyi
49258cac8c Added additional checks to method DialogTool::SetAssociatedTool.
--HG--
branch : develop
2016-07-02 12:12:12 +03:00
Bojan Kverh
9a64ddf6a3 Merged develop into feature
--HG--
branch : feature
2016-06-30 20:50:07 +02:00
Roman Telezhynskyi
c89243a288 Resolved issue #520. Improve Union tool. An option to select about original
pieces.

--HG--
branch : develop
2016-06-30 19:48:46 +03:00
BojanKverh
e68fa3a0f3 Fixed few bugs: label position is preserved after editing detail, buttons for add/update/remove MCP are handled correcty. Added style to VTextGraphicsItem lines
--HG--
branch : feature
2016-06-26 14:21:06 +02:00
Bojan Kverh
3480f33922 Merged develop into feature
--HG--
branch : feature
2016-06-24 17:57:52 +02:00
Roman Telezhynskyi
7eaadf1761 Resolved issue #480. New tool: Midpoint between two points.
--HG--
branch : develop
2016-06-23 20:20:21 +03:00
BojanKverh
b14a3c9551 Fixed the SaveDetailOption::undo method and few code style issues
--HG--
branch : feature
2016-06-21 19:53:15 +02:00
BojanKverh
c05c51e078 Finished the detail dialog
--HG--
branch : feature
2016-06-21 00:49:22 +02:00
BojanKverh
9386ae2ff1 Corrected code to satisfy code style specifications
--HG--
branch : feature
2016-06-19 13:46:19 +02:00
BojanKverh
8140647242 Updated detail dialog with pattern piece data editing
--HG--
branch : feature
2016-06-18 22:14:35 +02:00
BojanKverh
1899abc39e Added pattern piece data dialog, which can be accessed with right mouse click in Detail mode
--HG--
branch : feature
2016-06-18 16:00:01 +02:00
Roman Telezhynskyi
eaa1744262 Clang warnings.
--HG--
branch : develop
2016-05-25 16:28:35 +03:00
Roman Telezhynskyi
9c0f5f2fa4 Refactoring. Use QScopedPointer for class Calculator.
--HG--
branch : develop
2016-05-24 15:25:58 +03:00
Roman Telezhynskyi
83243e5af3 Handle case when NaN and Inf value treats like valid.
--HG--
branch : develop
2016-05-24 15:06:35 +03:00
Roman Telezhynskyi
66cc34ed64 Fixed issue "Rotation tool - Cannot edit formula after creation".
--HG--
branch : develop
2016-05-24 13:29:13 +03:00
Roman Telezhynskyi
b820d5a6ea Fixed issue #491. Valentina doesn't update fractional separator.
(grafted from c658843945e37cd7f1d3e4e0ca4967d7a01b1c4d)

--HG--
branch : develop
2016-05-23 18:23:39 +03:00
Roman Telezhynskyi
0266b27b36 Save information about curve color inside geometric objects. Help to copy this
data to copy objects after rotation.

--HG--
branch : feature
2016-05-19 13:11:50 +03:00
Roman Telezhynskyi
19df01be2e Correct selection and hovering. Line can't be selected.
--HG--
branch : feature
2016-05-18 19:07:43 +03:00
Roman Telezhynskyi
ba76ba2746 Origin point shouldn't be in a rotation list.
--HG--
branch : feature
2016-05-18 16:57:17 +03:00
Roman Telezhynskyi
702245f9fb Check suffix in a dialog.
--HG--
branch : feature
2016-05-18 16:38:04 +03:00
Roman Telezhynskyi
180903b807 Automatically generate suffix.
--HG--
branch : feature
2016-05-18 15:35:07 +03:00
Roman Telezhynskyi
b377042125 Merge with develop.
--HG--
branch : feature
2016-05-17 13:25:33 +03:00
Valentina Zhuravska
6e7b77b9de Added toolTip.
--HG--
branch : feature
2016-05-17 13:18:38 +03:00
Valentina Zhuravska
5933da7403 Resolved issue #472. Add 'Full Name' column to Formula dialog.
--HG--
branch : feature
2016-05-17 12:25:01 +03:00
Roman Telezhynskyi
6187f16c6a Refactoring. Use conversion operator for conversion VPointF to QPointF.
--HG--
branch : feature
2016-05-14 22:28:09 +03:00
Roman Telezhynskyi
d2efd50030 Delete visualization before closing the tool dialog.
--HG--
branch : feature
2016-05-13 20:59:15 +03:00
Roman Telezhynskyi
2f7138e69c Forgot to add apply button.
--HG--
branch : feature
2016-05-13 20:46:57 +03:00
Roman Telezhynskyi
80b415f258 Merge with develop.
--HG--
branch : feature
2016-05-12 22:52:31 +03:00
Roman Telezhynskyi
910c40a5b3 Commit successful build.
--HG--
branch : feature
2016-05-12 22:11:21 +03:00
Roman Telezhynskyi
6f56b46d26 Fixed Clang warnings.
--HG--
branch : develop
2016-05-03 19:50:37 +03:00
Roman Telezhynskyi
a0842b0f48 Merge with develop.
--HG--
branch : feature
2016-04-07 17:59:07 +03:00
Roman Telezhinskyi
0b9562a3bd Merged in ValentinaZhuravska/valentina/feature (pull request #107)
We can add image to file.val

--HG--
branch : develop
2016-04-07 12:03:40 +03:00
Roman Telezhynskyi
ada64305c0 Dialog Group.
--HG--
branch : feature
2016-04-05 20:14:12 +03:00
Roman Telezhynskyi
d1480132a0 Don't separate data about spline and arc length and angles.
--HG--
branch : develop
2016-04-01 22:34:57 +03:00
Roman Telezhynskyi
bb29984b4a Cut tools do not create subcurves anymore.
--HG--
branch : develop
2016-04-01 17:32:36 +03:00
Roman Telezhynskyi
0325e0a441 Changed code tree structure for visualization classes.
--HG--
branch : develop
2016-03-24 16:49:15 +02:00
Roman Telezhynskyi
be7277eeba Refactoring. Use more safe function VFuzzyComparePossibleNulls.
--HG--
branch : develop
2016-03-23 16:09:30 +02:00
Roman Telezhynskyi
2e0bf11261 The tool Cut Spline now supports Cubic Bezier Path curve.
--HG--
branch : develop
2016-03-22 17:14:53 +02:00
Roman Telezhynskyi
baddba9e43 Resolved issue #366. Update 'Point from Distance and Angle' tool to read
distance and angle between points.

--HG--
branch : develop
2016-03-19 17:45:57 +02:00
Roman Telezhynskyi
02cb84c4a1 Show list of points from the begin of the list.
--HG--
branch : feature
2016-03-19 16:29:26 +02:00
Roman Telezhynskyi
505cec891d Several bug fixes.
--HG--
branch : feature
2016-03-19 16:20:09 +02:00
Roman Telezhynskyi
19265e1f93 Succesful build.
--HG--
branch : feature
2016-03-18 23:11:14 +02:00
Roman Telezhynskyi
2c4312046c New classes VAbstractCubicBezierPath and VCubicBezierPath.
--HG--
branch : feature
2016-03-16 20:07:50 +02:00
Roman Telezhynskyi
2548697a9e The tool Cut Spline now supports Cubic Bezier curve.
--HG--
branch : feature
2016-03-10 18:09:38 +02:00
Roman Telezhynskyi
53250a4dc4 Simple curve which uses point as control handle.
--HG--
branch : feature
2016-03-10 15:55:04 +02:00
Valentina Zhuravska
ab78ee2550 Fixed build on Win7
--HG--
branch : feature
2016-03-09 20:59:08 +02:00
Roman Telezhynskyi
fe220f6305 Removed tag "zorder".
--HG--
branch : develop
2016-03-05 23:11:02 +02:00
Roman Telezhynskyi
2e6be9119c Fixed crash.
--HG--
branch : feature
2016-03-05 18:30:45 +02:00
Roman Telezhynskyi
504a334717 The method FormulaFromUser throw an exception. In many places we don't catch the
exception and i think this is wrong. New method TryFormulaFromUser was
introduced for fixing situation.

--HG--
branch : feature
2016-03-05 17:27:07 +02:00
Roman Telezhynskyi
e120fc1d0a Calculate a formula immediately.
--HG--
branch : feature
2016-03-05 15:22:24 +02:00
Roman Telezhynskyi
e948a0ba27 Refactoring ValFormulaChanged. Continue fix bugs in the dialog spline path.
--HG--
branch : feature
2016-03-05 14:30:18 +02:00
Roman Telezhynskyi
40436a5c57 Successfull build, bugs was not fixed.
--HG--
branch : feature
2016-03-04 18:08:29 +02:00
Roman Telezhynskyi
8d628404df Curve factor was removed.
--HG--
branch : feature
2016-02-27 16:49:10 +02:00
Roman Telezhynskyi
4eca4f97c6 Fixed issue "Warning: Z-order assignment: '' is not a valid widget."
--HG--
branch : feature
2016-02-25 21:40:39 +02:00
Roman Telezhynskyi
9b02bde691 Release a dialog size for deploying a formula field.
--HG--
branch : feature
2016-02-25 21:39:21 +02:00
Roman Telezhynskyi
990c03c697 Updated dialog for the tool Spline.
--HG--
branch : feature
2016-02-25 21:23:16 +02:00
Roman Telezhynskyi
04ae26d1bd Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze.
--HG--
branch : develop
2016-02-16 18:08:51 +02:00
Roman Telezhynskyi
c36f1eb8ef Working with Spline Path.
--HG--
branch : feature
2016-02-16 14:00:56 +02:00
Roman Telezhynskyi
be3fc296f4 Untested changes for the tool Spline.
--HG--
branch : feature
2016-02-15 16:30:48 +02:00