aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,622 Commits 3 Branches 35 Tags 270 MiB
c0d79afb85
Commit Graph

2196 Commits

Author SHA1 Message Date
Roman Telezhynskyi
b9d635dab2 Dialog Pin tool. 
--HG--
branch : feature
 2017-01-31 14:28:48 +02:00
Roman Telezhynskyi
d08282218b Optimized png files. 
--HG--
branch : develop
 2017-01-28 16:58:07 +02:00
Roman Telezhynskyi
b26eca13eb Optimized png files. 
--HG--
branch : feature
 2017-01-28 16:58:07 +02:00
Roman Telezhynskyi
d6c68a4df8 MSVC warning. 
--HG--
branch : develop
 2017-01-27 17:41:08 +02:00
Roman Telezhynskyi
d17dda3f9f Clang warning. 
--HG--
branch : develop
 2017-01-27 14:49:20 +02:00
Roman Telezhynskyi
01a04fdb09 Clang warning. 
--HG--
branch : develop
 2017-01-27 14:07:12 +02:00
Roman Telezhynskyi
af5bbf02f6 Fix tests. 
--HG--
branch : feature
 2017-01-25 15:45:17 +02:00
Roman Telezhynskyi
2c795281dd Merge with develop. 
--HG--
branch : feature
 2017-01-25 13:29:03 +02:00
Roman Telezhynskyi
8322c8d0ab Fix bug with point on curve. 
--HG--
branch : feature
 2017-01-25 13:21:23 +02:00
Roman Telezhynskyi
49167c0c3c Fix conversion to new seam allowance. 
--HG--
branch : feature
 2017-01-25 11:32:52 +02:00
Roman Telezhynskyi
e74a3f5cb2 Fixed typo. 
--HG--
branch : develop
 2017-01-24 16:20:39 +02:00
Roman Telezhynskyi
f982bea7ba Add OpenSSL library to bundle to prevent error "QSslSocket error when SSL is 
NOT used".

Try to prevent crashes on Windows because OpenSSL library is not installed or
installed very old version. Also will help suppress annoying messages.

--HG--
branch : develop
 2017-01-24 16:12:43 +02:00
Roman Telezhynskyi
1014cc86ca Resolved issue #612. Valentina crashes when network is disabled on Linux. 
--HG--
branch : develop
 2017-01-24 15:47:25 +02:00
Roman Telezhynskyi
10a13a499d Rename class VLayoutDetail. 
--HG--
branch : feature
 2017-01-22 11:02:02 +02:00
Roman Telezhynskyi
8fb6c9c508 Code that converts VPiece to VLayoutDetail moved to static function. 
--HG--
branch : feature
 2017-01-22 10:32:01 +02:00
Roman Telezhynskyi
26c76bbc71 Replace VDetail by VPiece. 
--HG--
branch : feature
 2017-01-21 19:12:57 +02:00
Roman Telezhynskyi
8b1e9e24d4 Tool path and piece now bring formulas, should cover this fact. 
--HG--
branch : feature
 2017-01-21 17:32:08 +02:00
Roman Telezhynskyi
ef9411cf5a Actually we check measurements in two palces. Forgot about this. 
--HG--
branch : feature
 2017-01-21 16:37:37 +02:00
Roman Telezhynskyi
669d295804 Class VToolDetail removed. 
--HG--
branch : feature
 2017-01-21 16:30:14 +02:00
Roman Telezhynskyi
e15d4d9c05 Fix possible memory leak. 
--HG--
branch : feature
 2017-01-21 15:50:17 +02:00
Roman Telezhynskyi
24d5aa0f53 The error message should display the translated measurement name. 
--HG--
branch : feature
 2017-01-21 15:49:43 +02:00
Roman Telezhynskyi
0ef10c01b0 A piece seam allowance can be controlled by formula. 
--HG--
branch : feature
 2017-01-21 15:24:40 +02:00
Roman Telezhynskyi
8eba46ade1 The tool redesign was finnised. Code is not tested. 
--HG--
branch : feature
 2017-01-16 17:37:15 +02:00
Roman Telezhynskyi
6faa0bc318 First successful build. The redesign is not finished. 
--HG--
branch : feature
 2017-01-16 12:08:13 +02:00
Roman Telezhynskyi
5442eb40b9 Move methods to class VAbstractPattern to be able to use them for tool Unite 
Details.

--HG--
branch : feature
 2017-01-16 11:59:02 +02:00
Roman Telezhynskyi
c48dc6b4a2 Update scene size after full parse. 
--HG--
branch : feature
 2017-01-14 11:52:39 +02:00
Roman Telezhynskyi
e7adac78ba Parse grainline and labels data tool Seam allowance. 
--HG--
branch : feature
 2017-01-12 16:08:27 +02:00
Roman Telezhynskyi
1b8ecdcb27 Refactoring names. 
--HG--
branch : feature
 2017-01-12 15:58:45 +02:00
Roman Telezhynskyi
5a95ce9c8a Merge with develop. 
--HG--
branch : feature
 2017-01-11 14:05:06 +02:00
Roman Telezhynskyi
ff03f67663 Fix infinite loop in method VAbstractDetail::CheckLoops(). 
--HG--
branch : develop
 2017-01-11 13:54:06 +02:00
Roman Telezhynskyi
e952260a9f Fixed issue #609. Bug in CheckLoops method. Better handling internal and 
external loops.

--HG--
branch : develop
 2017-01-09 18:25:13 +02:00
Roman Telezhynskyi
a842e2c2d1 Fixed issue #604. Seams allowances gets "weird" and turns inward when changing 
measurment file.

--HG--
branch : develop
 2017-01-05 17:16:36 +02:00
Roman Telezhynskyi
f4a2d64497 Completely remove unsupported XML editor. 
--HG--
branch : develop
 2017-01-03 20:16:04 +02:00
Roman Telezhynskyi
b4c4a22a4c Merge with develop. 
--HG--
branch : feature
 2017-01-03 11:48:22 +02:00
Roman Telezhynskyi
86f4b21879 Instead of method QLocale::system() better to use the default constructor. 
Usefull in case we will deside change default locale.

--HG--
branch : develop
 2017-01-03 10:46:28 +02:00
Roman Telezhynskyi
0419f60e0b Merge with develop. 
--HG--
branch : feature
 2016-12-23 12:58:17 +02:00
Roman Telezhynskyi
4d277f392e Fix switching to Layout page when enable Layout mode. 
--HG--
branch : develop
 2016-12-23 11:11:00 +02:00
Roman Telezhynskyi
c9e9fb57d5 Fixed issue #603. Wrong layout caused by wrong seam allowance. 
--HG--
branch : develop
 2016-12-23 10:25:45 +02:00
Roman Telezhynskyi
e777c788b4 Cppcheck warning. 
--HG--
branch : develop
 2016-12-23 10:51:05 +02:00
Roman Telezhynskyi
a6a8ef29b0 Refactoring. Merge similar switch cases together. 
--HG--
branch : develop
 2016-12-21 21:35:07 +02:00
Roman Telezhynskyi
731eb9ec89 Refactoring. 
There is no automatic disconnection when the 'receiver' is destroyed because
it's a functor with no QObject. However, since 5.2 there is an overload which
adds a "context object". When that object is destroyed, the connection is
broken (the context is also used for the thread affinity: the lambda will be
called in the thread of the event loop of the object used as context).

--HG--
branch : develop
 2016-12-21 20:45:14 +02:00
Roman Telezhynskyi
e4c90a0809 Fix warning "Explicitly capture the required scope variables". 
--HG--
branch : develop
 2016-12-21 20:08:02 +02:00
Roman Telezhynskyi
d247823d22 Refactoring. Merge similar switch cases together. 
--HG--
branch : develop
 2016-12-21 19:07:57 +02:00
Roman Telezhynskyi
7b76dbe99d Remove redundant check. 
--HG--
branch : develop
 2016-12-21 18:00:56 +02:00
Roman Telezhynskyi
d10026bd9d Remove empty statement. 
--HG--
branch : develop
 2016-12-21 17:58:18 +02:00
Roman Telezhynskyi
f3b900902b Fix memory leak. 
--HG--
branch : develop
 2016-12-21 17:47:07 +02:00
Roman Telezhynskyi
7551cfda87 Remove the code after "return". 
--HG--
branch : develop
 2016-12-21 17:38:27 +02:00
Roman Telezhynskyi
4cf9c59056 Remove redundant check. 
--HG--
branch : develop
 2016-12-21 17:19:12 +02:00
Roman Telezhynskyi
5153e997d1 Fix warning "using-directive shall not be used.". 
--HG--
branch : develop
 2016-12-21 14:02:55 +02:00
Roman Telezhynskyi
2d61b87256 Remove empty statement. 
--HG--
branch : develop
 2016-12-20 21:19:21 +02:00
Roman Telezhynskyi
ffab000e0f Remove empty statement. 
--HG--
branch : develop
 2016-12-20 20:57:20 +02:00
Roman Telezhynskyi
b6d0aa1a1f Tool seam allowance add support for elliptical arc. 
--HG--
branch : feature
 2016-12-20 17:50:39 +02:00
Roman Telezhynskyi
0882313f1e Merge with develop. 
--HG--
branch : feature
 2016-12-20 17:42:51 +02:00
Roman Telezhynskyi
1fb0ab4d75 Added VNodeEllipticalArc. 
--HG--
branch : develop
 2016-12-20 16:51:58 +02:00
Roman Telezhynskyi
81eb33fe63 Merge with develop. 
--HG--
branch : feature
 2016-12-20 14:39:05 +02:00
Roman Telezhynskyi
f0b35ddc11 Added support elliptical arc in other tools. 
--HG--
branch : develop
 2016-12-20 13:04:56 +02:00
Roman Telezhynskyi
243e9c2894 Clang warning. 
--HG--
branch : develop
 2016-12-19 16:47:43 +02:00
Roman Telezhynskyi
469d6ffe02 Small fixes for UI. 
--HG--
branch : feature
 2016-12-19 14:31:49 +02:00
Roman Telezhynskyi
2d55423e8e Check pointer instead of QSharedPointer object. 
--HG--
branch : feature
 2016-12-19 14:25:00 +02:00
Roman Telezhynskyi
2b9a50bf3a Better history record for an elliptical arc. 
--HG--
branch : feature
 2016-12-19 14:22:25 +02:00
Roman Telezhynskyi
6f4d1b5ed9 Complete working with the property browser. 
--HG--
branch : feature
 2016-12-19 14:18:32 +02:00
Valentina Zhuravska
947f4eb97c Added ShowOptionsToolEllipticalArc method. 
--HG--
branch : feature
 2016-12-17 03:57:01 +02:00
Valentina Zhuravska
a8a3487996 Added new schema v0.3.9. 
--HG--
branch : feature
 2016-12-17 03:53:47 +02:00
Valentina Zhuravska
aa24976f9a Added elliptical arc tool to MainWindow. 
--HG--
branch : feature
 2016-12-17 03:17:29 +02:00
Roman Telezhynskyi
bd49df3d50 Merge with develop. 
--HG--
branch : feature
 2016-12-10 19:54:13 +02:00
Roman Telezhynskyi
0b407792d7 Fixed issue #594. Broken export on Mac. 
--HG--
branch : develop
 2016-12-10 18:47:33 +02:00
Roman Telezhynskyi
39a8165bd5 Update details list after each full parse. 
--HG--
branch : feature
 2016-12-04 18:29:12 +02:00
Roman Telezhynskyi
f2e0974158 Update details list after each full parse. 
--HG--
branch : develop
 2016-12-04 18:29:12 +02:00
Roman Telezhynskyi
9cdf222467 New test case. Zigzag in main path. 
--HG--
branch : develop
 2016-12-07 18:55:01 +02:00
Roman Telezhynskyi
251a717c6f Broken seam allowance. Fix wrong curve. 
--HG--
branch : feature
 2016-12-04 18:14:43 +02:00
Roman Telezhynskyi
35f54c5cc7 Added Internal path. 
--HG--
branch : feature
 2016-12-03 18:01:39 +02:00
Roman Telezhynskyi
64c2026e6a Merge with develop. 
--HG--
branch : feature
 2016-12-03 12:43:19 +02:00
Roman Telezhynskyi
fa67634f38 Call waitForStarted() before each waitForFinished(). 
--HG--
branch : develop
 2016-12-03 10:40:23 +02:00
Roman Telezhynskyi
939644692d Convert all mx and my values to local seam allowance. 
--HG--
branch : feature
 2016-12-01 20:47:15 +02:00
Roman Telezhynskyi
e2579c231c Fix pointer to current scene. Show piece path visualization if the tool dialog 
was opened.

--HG--
branch : feature
 2016-11-29 19:39:40 +02:00
Roman Telezhynskyi
5156e0cf25 Read/write piece path include type. 
--HG--
branch : feature
 2016-11-28 14:52:31 +02:00
Roman Telezhynskyi
f56ea24810 Custom Path will work in two modes. The first extend automatic seam allowance, 
the second show custom deam allowance. In this case a path must have options
for controling seam allowance.

--HG--
branch : feature
 2016-11-28 11:58:44 +02:00
Roman Telezhynskyi
ecdb53b7d0 Save VPiecePath name. 
--HG--
branch : feature
 2016-11-28 10:42:37 +02:00
Roman Telezhynskyi
82d9fcba3f Connect MainWindow with VToolPiecePath. 
--HG--
branch : feature
 2016-11-25 16:36:56 +02:00
Roman Telezhynskyi
6424a92559 Read/write custom seam allowance record. 
--HG--
branch : feature
 2016-11-25 14:19:44 +02:00
Roman Telezhynskyi
39b27e4b24 New class VToolPiecePath. 
--HG--
branch : feature
 2016-11-24 21:35:54 +02:00
Roman Telezhynskyi
0e78efc714 Move tag strings from VToolSeamAllowance class to VAbstractPattern class. The 
same strings use also VToolPiecePath class.

--HG--
branch : feature
 2016-11-24 21:35:07 +02:00
Roman Telezhynskyi
422fb60dcc Each path should know its type. 
--HG--
branch : feature
 2016-11-24 21:26:51 +02:00
Roman Telezhynskyi
8a5c4a1a37 Check if a path is valid. Should contains at least one object. 
--HG--
branch : feature
 2016-11-23 18:50:52 +02:00
Roman Telezhynskyi
524e98d372 Get active pattern piece list of pieces. 
--HG--
branch : feature
 2016-11-23 18:41:01 +02:00
Roman Telezhynskyi
965e588a9d New piece attribute "united". 
--HG--
branch : feature
 2016-11-23 18:40:27 +02:00
Roman Telezhynskyi
5d5e677e2c Added class VPiecePath. 
--HG--
branch : feature
 2016-11-23 12:54:46 +02:00
Roman Telezhynskyi
6b89f43e87 Tool button connected to tool dialog. 
--HG--
branch : feature
 2016-11-22 14:33:08 +02:00
Roman Telezhynskyi
c21aedc541 A seam allowance node angle. Read, write and set in the dialog. Not handled in 
seam allowance itself.

--HG--
branch : feature
 2016-11-19 13:44:12 +02:00
Roman Telezhynskyi
726d8614dc Unit tests for testing seam allowance. 
--HG--
branch : feature
 2016-11-18 12:58:47 +02:00
Roman Telezhynskyi
3d835a1a2a Merge with develop 
--HG--
branch : feature
 2016-11-14 20:35:22 +02:00
Roman Telezhynskyi
e881547999 Alwayse show locale "en_US" in the language list. 
--HG--
branch : develop
 2016-11-14 19:35:26 +02:00
Roman Telezhynskyi
d0b0f55d19 Read and write local seam allowance width (before and after). 
--HG--
branch : feature
 2016-11-12 13:18:16 +02:00
Roman Telezhynskyi
a5fc19d7ec Returned storing and reading base seam allowance values: width and 
enable/disable.

--HG--
branch : feature
 2016-11-10 12:53:02 +02:00
Roman Telezhynskyi
df20415e9e Returned "Forbid flipping" feature. 
--HG--
branch : feature
 2016-11-10 11:56:40 +02:00
Roman Telezhynskyi
836df6e309 Zoom fit best for details scene again working. 
--HG--
branch : feature
 2016-11-09 16:29:28 +02:00
Roman Telezhynskyi
a6a492c8d3 Better to give a piece default name. 
--HG--
branch : feature
 2016-11-09 16:27:17 +02:00
Roman Telezhynskyi
39d2ea41ac Returned undocommand "Toggle piece in layout". 
--HG--
branch : feature
 2016-11-09 15:53:22 +02:00
Roman Telezhynskyi
8601b2ae2a Returned undocommand "Move piece". 
--HG--
branch : feature
 2016-11-09 13:06:05 +02:00
Roman Telezhynskyi
6c0e4348e7 The app again parse tag "detail". 
--HG--
branch : feature
 2016-11-08 17:54:26 +02:00
Roman Telezhynskyi
2eea6482de From no one we should check count of VPiece. 
--HG--
branch : feature
 2016-11-08 17:53:38 +02:00
Roman Telezhynskyi
bf847bac7b Dialog Detail need pointer to scene Details. 
--HG--
branch : feature
 2016-11-08 14:04:23 +02:00
Roman Telezhynskyi
c5e8a6a529 Refactor templates SetToolButton and SetToolButtonWithApply. 
These templates do almost the same. Uniting them looks like a good idea.

--HG--
branch : feature
 2016-11-08 13:39:27 +02:00
Roman Telezhynskyi
731456f714 Merge with develop 
--HG--
branch : feature
 2016-11-08 12:57:19 +02:00
Roman Telezhynskyi
4a41840ae7 New class VToolSeamAllowance. 
--HG--
branch : feature
 2016-11-08 12:57:01 +02:00
Roman Telezhynskyi
2f1524d0db Move url to user manual outside of translated string. 
--HG--
branch : develop
 2016-11-07 13:10:53 +02:00
Roman Telezhynskyi
bf306f6101 The visualization connected to tool dialog. 
--HG--
branch : feature
 2016-11-05 12:49:20 +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
f58f840488 Merge with develop 
--HG--
branch : feature
 2016-11-04 16:28:38 +02:00
Roman Telezhynskyi
1dd86e66fb New dialog connected to tool button. 
--HG--
branch : feature
 2016-11-04 16:16:11 +02:00
Roman Telezhynskyi
e6c85fa47a Calling constructor of Preference dialog take some time. Because of this user 
have time to call the dialog twice.

--HG--
branch : develop
 2016-11-04 13:29:59 +02:00
Roman Telezhynskyi
595a7dcaff Enable attribute Qt::AA_EnableHighDpiScaling for support HighDpi displays. 
--HG--
branch : develop
 2016-11-04 12:47:10 +02:00
Roman Telezhynskyi
c978caa7ba Fixed url to page UserManual:Crash reports. 
--HG--
branch : develop
 2016-11-04 11:41:16 +02:00
Roman Telezhynskyi
0599583923 Fix issue in context menu details list. QUndoStack endMacro() did not match 
beginMacro().

--HG--
branch : develop
 2016-11-03 15:39:48 +02:00
Roman Telezhynskyi
d134e8b367 Clang warnings. 
--HG--
branch : develop
 2016-11-01 10:42:32 +02: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
6ca4abd8fd Fix typo. 
--HG--
branch : develop
 2016-10-25 19:12:06 +03:00
BojanKverh
21cd56463c User can now turn on/off grainline arrows 
--HG--
branch : feature
 2016-10-25 00:53:01 +02: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
Bojan Kverh
01c068ddd0 Merged develop into feature 
--HG--
branch : feature
 2016-10-23 15:28:40 +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
Roman Telezhynskyi
5c821e331d Refactoring function MapDiagrams(). ref #576. 
--HG--
branch : develop
 2016-10-17 16:55:58 +03:00
Bojan Kverh
128924eb28 Merged develop into feature 
--HG--
branch : feature
 2016-10-16 15:03:16 +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
Roman Telezhynskyi
ac85c37de7 Allow MAC OS X to find library inside a bundle. 2016-10-16 12:08:30 +03:00
Roman Telezhynskyi
ed53077203 Fixed Mac OS X deployment target. 2016-10-16 12:03:19 +03:00
Roman Telezhynskyi
c08e007bc8 Merge with release. Release 0.4.5. 2016-10-15 14:56:19 +03: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
Bojan Kverh
39afb81321 Merged develop into feature 
--HG--
branch : feature
 2016-10-13 19:53:49 +02: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
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
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