Commit Graph

3121 Commits

Author SHA1 Message Date
Roman Telezhynskyi
db1cdc3d53 Fixed typo.
--HG--
branch : develop
2016-10-31 09:30:10 +02:00
Roman Telezhynskyi
d8114a18f1 Cppcheck warning.
--HG--
branch : develop
2016-10-30 16:25:14 +02:00
Roman Telezhynskyi
3e8f8a8069 Resolved issue #582. Issue with standard path to shared data on Linux.
--HG--
branch : develop
2016-10-30 14:34:55 +02:00
Roman Telezhynskyi
4930414432 Fixed missed values for baseHeight in XSD files. ref #580.
--HG--
branch : develop
2016-10-27 12:43:57 +03:00
Roman Telezhynskyi
b644209406 Resolved issue #580. Extend the list of heights.
--HG--
branch : develop
2016-10-26 14:49:09 +03:00
Bojan Kverh
f5ab3d80c3 Merged develop into feature
--HG--
branch : feature
2016-10-25 23:01:41 +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
Roman Telezhynskyi
be10c88b7e Added new language Greek (Greece).
--HG--
branch : develop
2016-10-25 21:29:54 +03:00
Roman Telezhynskyi
81657eb429 Refactoring class TST_MeasurementRegExp. Speed up testing time.
--HG--
branch : develop
2016-10-25 21:06:58 +03:00
Roman Telezhynskyi
6ca4abd8fd Fix typo.
--HG--
branch : develop
2016-10-25 19:12:06 +03:00
Roman Telezhynskyi
06eb7c3b75 Improve translation test for supporting Greek language.
The '?' in Greek language is ';'.

--HG--
branch : develop
2016-10-25 19:11:26 +03:00
Roman Telezhynskyi
214c4a50b6 Fixed path to translations and standard measurements on Mac OS X.
--HG--
branch : develop
2016-10-25 17:54:51 +03: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
Roman Telezhynskyi
1aa896eff1 Merged in BojanKverh/valentina-issue331/feature (pull request #147)
Grainline implementation. ref #331.

--HG--
branch : develop
2016-10-23 20:05:50 +00:00
BojanKverh
568ecc01a6 Fixed exception catching when reading grainline formulas
--HG--
branch : feature
2016-10-23 22:04:14 +02:00
BojanKverh
22d2f2275e Fixed exception catching when reading grainline formulas
--HG--
branch : feature
2016-10-23 21:57:55 +02:00
BojanKverh
ddb040901b Fixed default values for grainline formulas
--HG--
branch : feature
2016-10-23 21:51:22 +02:00
BojanKverh
1f67e327c4 Fixed exception catching when reading grainline formulas
--HG--
branch : feature
2016-10-23 21:45:11 +02:00
BojanKverh
5862264a1d Fixed saving grainline formulas when grainline is set to not visible
--HG--
branch : feature
2016-10-23 21:24:16 +02:00
BojanKverh
e82f65fc6a Fixed the grainline tab icon in details dialog
--HG--
branch : feature
2016-10-23 20:59:38 +02:00
Roman Telezhynskyi
7d935add5b Fix building. Error about private members.
--HG--
branch : develop
2016-10-23 19:45:45 +03:00
Roman Telezhynskyi
c203986111 Fix support Qt 5.0.
--HG--
branch : develop
2016-10-23 19:38:34 +03:00
BojanKverh
0ca37fdecb Merged grainline data into v0.3.7 schema
--HG--
branch : feature
2016-10-23 17:59:03 +02:00
Bojan Kverh
01c068ddd0 Merged develop into feature
--HG--
branch : feature
2016-10-23 15:28:40 +02:00
Ronan Le Tiec
5c778aba1a Update the TST_VPoster after changes in VPoster
--HG--
branch : feature
2016-10-23 12:19:50 +02:00
Ronan Le Tiec
ae9da263ab issue #570 tiled pdf case when margin smaller than min
--HG--
branch : feature
2016-10-23 11:11:00 +02:00
Ronan Le Tiec
8da35622d1 Merged develop into feature
--HG--
branch : feature
2016-10-22 10:42:27 +02:00
Roman Telezhynskyi
5c821e331d Refactoring function MapDiagrams(). ref #576.
--HG--
branch : develop
2016-10-17 16:55:58 +03:00
Roman Telezhynskyi
fdc1eac734 Refactoring DialogTool::GetComboBoxCurrentData. Returned wrong default value.
--HG--
branch : develop
2016-10-17 14:53:46 +03:00
Ronan Le Tiec
588da2c9a8 corrections to support pattern schema v0.3.7
--HG--
branch : feature
2016-10-16 20:38:29 +02:00
Ronan Le Tiec
f91b3dc955 10 new colors added for the lines #577
--HG--
branch : feature
2016-10-16 19:23:40 +02:00
Bojan Kverh
128924eb28 Merged develop into feature
--HG--
branch : feature
2016-10-16 15:03:16 +02:00
BojanKverh
8ab094c40d Grainline should now be visible in Layout mode
--HG--
branch : feature
2016-10-16 15:00:53 +02:00
Roman Telezhynskyi
4a326d3b6b Allow MAC OS X to find library inside a bundle.
(grafted from 483fd5c402708b828382a691e0f21305b2b2b9df)

--HG--
branch : develop
2016-10-16 12:48:06 +03:00
Roman Telezhynskyi
67d20696a7 Fixed Mac OS X deployment target.
(grafted from 8bd98d7d0a42ca97d7608b084b5f2ddbf228117e)

--HG--
branch : develop
2016-10-16 12:47:47 +03:00
BojanKverh
46eb6dfaa3 Added grainline to layout
--HG--
branch : feature
2016-10-16 11:38:08 +02:00
Bojan Kverh
e1a4eeb4e4 Merged develop into feature
--HG--
branch : feature
2016-10-15 11:50:17 +02:00
Roman Telezhynskyi
29664e118a Added new option "Invert selection" to context menu tool Detail.
--HG--
branch : develop
2016-10-14 23:25:10 +03:00
Roman Telezhynskyi
972c70e608 Selected detail is also selected in the list.
--HG--
branch : develop
2016-10-14 21:33:12 +03:00
Roman Telezhynskyi
d38e81cecb Added new option "In layout" to context menu tool Detail.
--HG--
branch : develop
2016-10-14 20:41:37 +03:00
Roman Telezhynskyi
710558812a Improved performans commands Select all/Select none in the list of details in
layout.

--HG--
branch : develop
2016-10-14 17:11:15 +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
Bojan Kverh
39afb81321 Merged develop into feature
--HG--
branch : feature
2016-10-13 19:53:49 +02:00
Roman Telezhynskyi
87209bc850 Fixed broken visuzlization for tool Move.
--HG--
branch : develop
2016-10-12 16:36:58 +03:00
Roman Telezhynskyi
0817264a84 New feature. Valentina will highlight a detail selected in the Group list.
--HG--
branch : develop
2016-10-12 14:43:08 +03:00
BojanKverh
fce2849208 Worked on grainline rotation
--HG--
branch : feature
2016-10-12 02:45:01 +02:00
Roman Telezhynskyi
585618e3fc Cppcheck warnings.
--HG--
branch : develop
2016-10-11 17:10:28 +03:00
BojanKverh
dc36337663 Implemented interactive resizing for grainline item
--HG--
branch : feature
2016-10-11 00:27:14 +02:00
Bojan Kverh
bc345231ea Merged develop into feature
--HG--
branch : feature
2016-10-10 22:43:00 +02:00
Roman Telezhynskyi
b393d284c8 Case where margins bigger than min values. ref #570.
--HG--
branch : develop
2016-10-08 17:53:53 +03:00
Roman Telezhynskyi
fce190db74 Set default page size for tiled print. ref #570.
--HG--
branch : develop
2016-10-08 13:18:21 +03:00
Roman Telezhynskyi
b6c7f6e76e Resolved issue #575. Prefence: forbid flipping do not work.
--HG--
branch : develop
2016-10-08 13:14:14 +03: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
Bojan Kverh
520995a90c Merged develop into feature
--HG--
branch : feature
2016-10-06 20:39:55 +02:00
Roman Telezhynskyi
8d455952f8 The warning is accessible only if build with Qt 5.3. ref #570.
--HG--
branch : develop
2016-10-06 19:42:13 +03:00
Roman Telezhynskyi
27767e46e2 Warn about invalid margins. ref #570.
--HG--
branch : develop
2016-10-06 19:28:58 +03:00
Roman Telezhynskyi
9da0b5cab5 Refactoring methods GetMinPrinterFields and GetPrinterFields.
--HG--
branch : develop
2016-10-06 19:13:06 +03:00
Roman Telezhynskyi
593bae3969 Fixed build on Windows.
--HG--
branch : develop
2016-10-06 19:12:25 +03: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
ac5331979d Refactoring file libs.pri.
--HG--
branch : develop
2016-10-04 17:52:35 +03:00
Roman Telezhynskyi
4a50f2e3c9 Fixed wrong include.
--HG--
branch : develop
2016-10-04 17:52:03 +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
Roman Telezhynskyi
0127f745c6 Improve efficiency using QStringLiteral macros.
--HG--
branch : develop
2016-10-04 16:44:11 +03:00
Roman Telezhynskyi
9103c8ef15 Remove thousand seaparator according to xml specification for type xs:decimal.
--HG--
branch : develop
2016-10-04 16:43:06 +03:00
Roman Telezhynskyi
c53b4fb433 Fixed issue #572. Issue with thousand separator during a formula translations
to user.
(grafted from d1621c1cd816e8b7323639ce41c8592ef4131e31)

--HG--
branch : develop
2016-10-04 16:38:54 +03:00
Roman Telezhynskyi
1eb93fd4f7 Fixed wrong selecting rule for the tool Line.
--HG--
branch : develop
2016-10-04 13:52:04 +03:00
BojanKverh
b28538fefb Fixed the grainline formulas editing
--HG--
branch : feature
2016-10-04 02:13:35 +02:00
BojanKverh
3bc3c4bec3 Fixed the grainline formulas editing
--HG--
branch : feature
2016-10-04 02:07:58 +02:00
Bojan Kverh
f99693ae55 Merged develop into feature
--HG--
branch : feature
2016-10-01 10:28:50 +02:00
Roman Telezhynskyi
723d68b245 Resolved issue #570. Error: Tiled PDF : field values not taken into account if
one of them is smaller than 0,3.

--HG--
branch : develop
2016-09-30 19:33:10 +03: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
083b2035af Hopefully this commit solves the #551 issue
--HG--
branch : feature
2016-09-29 01:39:50 +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
bf1e4aeb0c Fixed issue #539. Infinite alert loop "Gradation doesn't support inches" when
loading standard table.
(grafted from 9e1dee53ca8fb5d116359f9aff4b62220a10bb39)

--HG--
branch : develop
2016-09-27 14:18:08 +03:00
Roman Telezhynskyi
4bd615cda4 Fixed typo.
--HG--
branch : develop
2016-09-27 13:00:56 +03:00
Roman Telezhynskyi
aefdd21ac7 Try avoid translators errors. Translate only parts of filters that really
should be translated.

--HG--
branch : develop
2016-09-27 12:37:41 +03:00
Roman Telezhynskyi
de1c7cd9f3 Resolved issue #569. Tape app. Options that open new file open new instance
even if a user doesn't want this.
(grafted from a74c6d9fac8dd6920d7d0914e68770b893920380)

--HG--
branch : develop
2016-09-27 12:27:52 +03:00
Roman Telezhynskyi
014ce1e45e Translation for new internal variable.
--HG--
branch : develop
2016-09-26 22:33:28 +03:00
Roman Telezhynskyi
fd8ab6123c Fixed issue #565. Bug : Some informations not saved in "Seam allowance tool" in
Draw Mode.

--HG--
branch : develop
2016-09-24 22:30:33 +03:00
Roman Telezhynskyi
3bb657ea1a New internal variable "Length to spline control point".
--HG--
branch : develop
2016-09-24 20:44:06 +03:00
Roman Telezhynskyi
eee2144483 Fix crash. Each tool should delete visualization even if scene also can delete
it.

--HG--
branch : develop
2016-09-24 16:09:09 +03:00
Roman Telezhynskyi
2b26b986bc Fix recalculation scene after creating new PP.
--HG--
branch : develop
2016-09-24 15:05:17 +03:00
Roman Telezhynskyi
1ed9983ee7 Fix wrong disabling VSimplePoint and VSimpleCurve after changing a pattern
piece.

--HG--
branch : develop
2016-09-24 14:41:05 +03:00
Roman Telezhynskyi
378ec5f4b7 Add two news files to the collection.
--HG--
branch : develop
2016-09-23 19:17:25 +03:00
Roman Telezhynskyi
d8874c844f Suppress all messages that contain string "Error receiving trust for a CA
certificate". ref #568.

--HG--
branch : develop
2016-09-20 21:33:33 +03:00
Roman Telezhynskyi
5fe41e8a99 Suppress message inside noisyFailureMsgHandler. ref #568.
--HG--
branch : develop
2016-09-20 21:12:19 +03:00
BojanKverh
f89b5a8a10 Fixed schema.qrc
--HG--
branch : feature
2016-09-20 19:42:27 +02:00
BojanKverh
5f1d7a357a Merged develop into feature, removing the conflicts
--HG--
branch : feature
2016-09-20 19:29:49 +02:00
Roman Telezhynskyi
efef5d371b Suppress also fatal errors from qt.network.ssl. ref #568.
--HG--
branch : develop
2016-09-20 17:28:39 +03:00
Roman Telezhynskyi
f370629af0 Fixed support Qt 5.0.
--HG--
branch : develop
2016-09-20 14:27:21 +03:00
Roman Telezhynskyi
b28ac8e97b Fixed issue #568. Certificate checking on Mac OS X.
--HG--
branch : develop
2016-09-20 14:10:42 +03: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
33298c3361 GCC warnings.
--HG--
branch : develop
2016-09-17 12:42:05 +03:00
Roman Telezhynskyi
74bc4179ef New tool Flipping by axis.
--HG--
branch : feature
2016-09-17 12:10:03 +03:00
Roman Telezhynskyi
91c614a2b8 Fix broken build.
--HG--
branch : feature
2016-09-16 11:03:51 +03:00
Bojan Kverh
eff3e0c733 Merged develop into feature
--HG--
branch : feature
2016-09-15 09:10:00 +02:00
Roman Telezhynskyi
34338cc275 Merge with develop.
--HG--
branch : feature
2016-09-14 19:26:26 +03:00
Roman Telezhynskyi
fed0705cc5 MSVC warning.
--HG--
branch : develop
2016-09-14 16:52:18 +03:00
Roman Telezhynskyi
1d909ee4ac Added new file to collection.
--HG--
branch : develop
2016-09-14 16:23:48 +03:00
Roman Telezhynskyi
2024f4d19b Added new file with bug example.
--HG--
branch : develop
2016-09-14 16:13:00 +03:00
Roman Telezhynskyi
bca10e71fb Fixed issue #548. Bug Detail tool. Case when seam allowance is wrong.
--HG--
branch : develop
2016-09-14 16:12:08 +03:00
BojanKverh
de799569ef Fixed moving and scaling grainline and ensured that it stays in bounds
--HG--
branch : feature
2016-09-14 01:15:01 +02:00
Roman Telezhynskyi
bfde34c882 Rename RotationMoveLabel class.
--HG--
branch : feature
2016-09-13 11:47:33 +03:00
Roman Telezhynskyi
9bb88afaa5 New tool Flipping by line.
--HG--
branch : feature
2016-09-13 11:27:44 +03:00
BojanKverh
8e0dc15e25 Moving the grainline works now, but still has a few issues
--HG--
branch : feature
2016-09-11 12:18:09 +02:00
Bojan Kverh
364de552e5 Merged develop into feature
--HG--
branch : feature
2016-09-11 10:15:45 +02:00
Roman Telezhynskyi
fe56607d7d Flipping VSpline, VSplinePath, VEllipticalArc, VCubicBezierPath and
VCubicBezier.

--HG--
branch : feature
2016-09-10 21:40:30 +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
Roman Telezhynskyi
800181e867 Flipping VArc.
--HG--
branch : feature
2016-09-10 18:18:11 +03:00
Roman Telezhynskyi
4c47c33c5e Flipping VPointF.
--HG--
branch : feature
2016-09-10 16:40:38 +03:00
BojanKverh
906dafebe8 Finished the grainline parameters editing in detail dialog
--HG--
branch : feature
2016-09-10 15:17:55 +02:00
Roman Telezhynskyi
868fc3db1d Fix definition VFSplinePoint and VSplinePoint. Improving efficiency.
--HG--
branch : develop
2016-09-10 14:19:32 +03:00
Roman Telezhynskyi
cbc7eb7571 Test rotating VSplinePath.
--HG--
branch : develop
2016-09-10 14:17:08 +03:00
Bojan Kverh
853c6852a8 Merged develop into feature
--HG--
branch : feature
2016-09-09 21:55:18 +02:00
Roman Telezhynskyi
ae13021205 Fixing rotating VSplinePath. ref #128.
--HG--
branch : develop
2016-09-09 15:18:59 +03:00
Roman Telezhynskyi
a9e9c0d5ad Clear a list of recent files from non-existent files.
--HG--
branch : develop
2016-09-09 14:01:57 +03: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
37e16b4626 Removed the vpatterndb.pro changes
--HG--
branch : feature
2016-09-06 23:52:16 +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
c622d173dd Several useful constans.
--HG--
branch : develop
2016-09-06 17:48:28 +03:00
Roman Telezhynskyi
cbd2e4a912 Fix issue #547. Compiler warning.
--HG--
branch : develop
2016-09-06 17:26:53 +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
ef576d7646 Enable rotation only for workpieces that forbid flipping. ref #560.
--HG--
branch : develop
2016-09-06 16:00:25 +03:00
Roman Telezhynskyi
038863fbdf Resolved issue #560. Flipped pattern pieces in Layout.
--HG--
branch : develop
2016-09-06 13:24:52 +03:00
Valentina Zhuravska
4283cc8ef2 Used QUndoStack::beginMacro and QUndoStack::endMacro.
--HG--
branch : feature
2016-09-06 12:37:20 +03:00
Valentina Zhuravska
a067b19d8f Added "All/None" menu in detail list area for easier handling of many parts.
--HG--
branch : feature
2016-08-31 16:18:34 +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
34beaed2b2 Tape app. Show tooltip in table.
--HG--
branch : develop
2016-08-26 18:57:39 +03:00
Roman Telezhynskyi
6baa623be3 Disable buttons Find Next and Find Previous if the search field is empty.
--HG--
branch : develop
2016-08-26 16:16:06 +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
ddc34803a0 Fix issue with Config dialog Apply button.
In some cases the Apply or OK buttons will not save settings because of section
that was active in the moment of applying. For example made change in one
section, change to another and click Apply. The change will not be applied.

--HG--
branch : develop
2016-08-26 13:36:51 +03:00
Roman Telezhynskyi
f22eccf91e Update search after using the qlineedit clear button.
--HG--
branch : develop
2016-08-26 13:27:14 +03:00
Roman Telezhynskyi
758f1caa1b Refresh search after retranslating the table.
--HG--
branch : develop
2016-08-26 13:23:50 +03:00
Roman Telezhynskyi
32df298cc3 The field Created was useless. Moved data about date of creation to a checkbox.
--HG--
branch : develop
2016-08-26 12:48:55 +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
f0cac1c191 Improve string to "Material, cut 1 on fold". This will look better.
--HG--
branch : develop
2016-08-26 12:28:30 +03:00
Roman Telezhynskyi
707712befd TMainWindow. Comboboxes on the tab Information looked ugly.
--HG--
branch : develop
2016-08-25 20:26:59 +03:00
Roman Telezhynskyi
88d2919a9b TMainWindow will show decimal point according to locale.
--HG--
branch : develop
2016-08-25 20:00:03 +03:00
Roman Telezhynskyi
99a2f0f807 Fixed issue #553. Tape.exe crash. Issue with the Search field.
(grafted from c4cc1aca74cb29d3fb57cd0718ec282b3dd0dc7b)

--HG--
branch : develop
2016-08-25 19:32:59 +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
be6c676145 We don't need these files anymore.
--HG--
branch : develop
2016-08-23 15:54:44 +03:00
Roman Telezhynskyi
209d2c46b6 Save as tiled pdf should produce only A4 page size output.
--HG--
branch : develop
2016-08-23 15:43:52 +03:00