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

678 Commits

Author SHA1 Message Date
Roman Telezhynskyi
e31a6eb841 Merge 
--HG--
branch : develop
 2015-11-16 22:04:56 +02:00
Valentina Zhuravska
fe23631251 Changed pixmap and icon to const, removed setTextFormat 
--HG--
branch : feature
 2015-11-16 17:54:45 +02:00
Valentina Zhuravska
e0237e901f Added help label to detail mode 
--HG--
branch : feature
 2015-11-16 17:34:16 +02:00
Roman Telezhynskyi
3347d0ad77 Clang warnings. 
--HG--
branch : develop
 2015-11-16 14:08:15 +02:00
Roman Telezhynskyi
96b2d644e1 Fixed broken compatible with higher Qt versions. 
--HG--
branch : develop
 2015-11-16 14:07:28 +02:00
Roman Telezhynskyi
5eed97c640 Enable #pragma message in Clang. 
--HG--
branch : develop
 2015-11-16 12:28:21 +02:00
Roman Telezhynskyi
7038c25c39 Turn on PCH on mac os x. 
--HG--
branch : develop
 2015-11-16 12:22:34 +02:00
Roman Telezhynskyi
d118ccb218 Fix for calculating more accurate unclosed seam allowance. 
--HG--
branch : develop
 2015-11-15 20:49:16 +02:00
Roman Telezhynskyi
7027198f2a Resolved issue #400. Layout 'fold line' is incorrect. 
--HG--
branch : develop
 2015-11-15 19:06:25 +02:00
Roman Telezhynskyi
af74da95af Corrected measurement N04 (rise_length_side_sitting) short description. 
--HG--
branch : develop
 2015-11-15 17:57:59 +02:00
Valentina Zhuravska
d253db879f ScrollUp and scrollDown is enabled if we have more than 1 objects in a detail 
--HG--
branch : feature
 2015-11-13 15:23:56 +02:00
Valentina Zhuravska
13ff0d7973 Removed unwanted strings 
--HG--
branch : feature
 2015-11-13 14:54:26 +02:00
Valentina Zhuravska
b9deb50c1b Fixed toolTips of scrollUp and scrollDown buttons 
--HG--
branch : feature
 2015-11-13 14:04:51 +02:00
Valentina Zhuravska
ef1fff7a22 Resolved Issue #329. Add button to 'Scroll Up/Scroll Down' in Detail mode 
--HG--
branch : feature
 2015-11-13 12:31:10 +02:00
Roman Telezhynskyi
c3e87b4ffc File index.theme. Fixed wrong name of the category. 
--HG--
branch : develop
 2015-11-12 14:18:56 +02:00
Thies Schröder
823090718b fix build on mac os 
--HG--
branch : develop
 2015-11-11 21:16:58 +01:00
Roman Telezhinskyi
ae1195df21 Merged in ValentinaZhuravska/valentina/feature (pull request #73) 
Fixed problems in DialogDetail

--HG--
branch : develop
 2015-11-11 21:50:54 +02:00
Valentina Zhuravska
c6577675e7 Changed some methods to be const 
--HG--
branch : feature
 2015-11-11 21:46:36 +02:00
Roman Telezhynskyi
67c2de94f7 Fixed infinite loop. 
--HG--
branch : develop
 2015-11-11 20:53:23 +02:00
Roman Telezhynskyi
22bc725230 Replace measurement "size" on equvivalent "bust_arc_f". 
--HG--
branch : develop
 2015-11-11 20:52:38 +02:00
Roman Telezhynskyi
4e21bf05e0 Don't show section "Size and Height". 
--HG--
branch : develop
 2015-11-11 20:52:25 +02:00
Valentina Zhuravska
e323afc4e6 Fixed DetailIsValid() method 
--HG--
branch : feature
 2015-11-11 19:38:21 +02:00
Roman Telezhynskyi
833c507148 New measurement (N08) rise_length_side. 
--HG--
branch : feature
 2015-11-11 16:26:48 +02:00
Roman Telezhynskyi
fa822dda24 (N04) 'rise_length_side' renamed to 'rise_length_side_sitting'. 
--HG--
branch : feature
 2015-11-11 14:37:32 +02:00
Roman Telezhynskyi
e286ae8476 New measurements: (H41) neck_back_to_across_back, (H42) across_back_to_waist_b, 
​(L22) arm_neck_side_to_outer_elbow, (G46) hip_circ_with_abdomen.

--HG--
branch : feature
 2015-11-11 14:23:39 +02:00
Roman Telezhynskyi
0bfd673ab8 Fixed conversion measurements. 
--HG--
branch : feature
 2015-11-11 12:15:42 +02:00
Valentina Zhuravska
d27a64b819 Delete the last point from detail when the first point equals the last point 
--HG--
branch : feature
 2015-11-10 11:58:33 +02:00
Valentina Zhuravska
4c41e04d49 Can not add one point to detail twice 
--HG--
branch : feature
 2015-11-10 10:07:40 +02:00
Roman Telezhynskyi
9545db280d Test that all command line option names are unique. 
--HG--
branch : develop
 2015-11-09 20:02:38 +02:00
Roman Telezhynskyi
9327da7a2c Calculate correct paper size. Print preview doesn't support non native 
printers.

--HG--
branch : feature
 2015-11-09 13:58:45 +02:00
Roman Telezhynskyi
4411cccd9c First draft of the issue #313. Layout pieces too close to right edge. 
--HG--
branch : feature
 2015-11-09 13:33:36 +02:00
Roman Telezhynskyi
912d1f91f6 Disable changing window size only after first show. 
--HG--
branch : develop
 2015-11-05 15:01:33 +02:00
Roman Telezhynskyi
7f065cac89 GCC warnings. 
--HG--
branch : develop
 2015-11-05 14:32:47 +02:00
Roman Telezhynskyi
2e49d1437a For avoiding losing precision use double everywhere. 
--HG--
branch : develop
 2015-11-05 13:07:51 +02:00
Roman Telezhynskyi
6b54c5bb7d Set default printing color mode. 
Known issue: program doesn't print in grayscale color mode.

--HG--
branch : develop
 2015-11-04 17:22:49 +02:00
Roman Telezhynskyi
a342948437 Improved loging. Base point's DeleteTool should ignore value "_referens". 
--HG--
branch : develop
 2015-11-03 17:11:35 +02:00
Roman Telezhynskyi
31ee872a1d Refactoring exceptions. 
--HG--
branch : develop
 2015-11-02 19:02:41 +02:00
Roman Telezhynskyi
345b0e5c7f Fixed crash after undo creating a pattern piece. 
--HG--
branch : develop
 2015-11-02 18:25:29 +02:00
Roman Telezhynskyi
9aa8713203 Refactoring. 
--HG--
branch : develop
 2015-10-31 14:56:28 +02:00
Roman Telezhynskyi
f52d609b9c Refactoring. Test functions RelativeMPath and AbsoluteMPath. 
--HG--
branch : develop
 2015-10-31 14:41:52 +02:00
Roman Telezhynskyi
82190e2917 Refactoring. StrippedName() doesn't belong to MainWindows. 
--HG--
branch : develop
 2015-10-31 10:46:45 +02:00
Roman Telezhynskyi
9ffeeec298 Three new languages: English (Canada), English (India), Romanian (Romania). 
--HG--
branch : develop
 2015-10-30 12:44:10 +02:00
Roman Telezhynskyi
cb8bc39e8c Resolved issue #380. 
--HG--
branch : develop
 2015-10-29 18:20:59 +02:00
Roman Telezhynskyi
a4bc4a75c0 Integrate QmuParserTests in main testing set. 
--HG--
branch : develop
 2015-10-28 19:57:34 +02:00
Roman Telezhynskyi
ba89a2856d Better don't touch stack. 
--HG--
branch : develop
 2015-10-28 18:37:36 +02:00
Roman Telezhynskyi
84f1c4e10f Recognize Intel compiler and return version string. 
--HG--
branch : develop
 2015-10-28 17:00:59 +02:00
Roman Telezhynskyi
4a0e2dee00 Optimized access to QVector. 
--HG--
branch : develop
 2015-10-28 16:26:58 +02:00
Roman Telezhynskyi
95ef34bf72 Removed wrong key. 
--HG--
branch : develop
 2015-10-28 16:24:28 +02:00
Roman Telezhynskyi
88324a11f2 Static Code Analysis. 
--HG--
branch : develop
 2015-10-28 16:22:36 +02:00
Roman Telezhynskyi
ff31ac889c After last redesign measurements order comments became useless. 
--HG--
branch : develop
 2015-10-27 08:32:34 +02:00
Roman Telezhynskyi
2b8fb91d17 Fixed missing measurement head_girth -> head_circ in conversion. 
--HG--
branch : develop
 2015-10-27 08:11:41 +02:00
Roman Telezhynskyi
d104b8bd7e Additionaly each standard table provide measurements size and height. 
--HG--
branch : develop
 2015-10-26 17:39:23 +02:00
Roman Telezhynskyi
28f5188a92 Remove minus "-" from the list of measurements. 
--HG--
branch : develop
 2015-10-26 16:46:07 +02:00
Roman Telezhynskyi
caa1a46b01 New option Measurements->Unload measurements. 
--HG--
branch : develop
 2015-10-26 13:21:49 +02:00
Roman Telezhynskyi
f1796eaf90 GCC warnings. Don't use PCH if use ccache. 
--HG--
branch : develop
 2015-10-26 12:04:20 +02:00
Roman Telezhynskyi
d1f18dc9a0 Use quint32 instead unsigned int. 
--HG--
branch : develop
 2015-10-26 10:36:07 +02:00
Roman Telezhynskyi
1e99d00a54 Hide lock file. 
--HG--
branch : develop
 2015-10-26 09:57:20 +02:00
Roman Telezhynskyi
b516ceb8e1 "CONFIG += silent" doesn't work correct with msvc. Do not create target 
"make distclean" with msvc.

--HG--
branch : develop
 2015-10-24 14:13:59 +03:00
Roman Telezhynskyi
d6653ca9af Successful build with MSVC 2012. 
--HG--
branch : develop
 2015-10-23 20:47:33 +03:00
Roman Telezhynskyi
44edb90967 Changed version to 0.4.0b. Fixed file assosiation on Windows Vista and higher. 
--HG--
branch : develop
 2015-10-22 17:35:54 +03:00
Valentina Zhuravska
dd9fecb89f Added Q_CC_MSVC 
--HG--
branch : feature
 2015-10-22 15:16:15 +03:00
Valentina Zhuravska
36f0e1dc44 Fixed MSVC build 
--HG--
branch : feature
 2015-10-22 12:28:17 +03:00
Valentina Zhuravska
38541c78c9 Fixed MSVC build (C2143, missing ';' before 'type') 
--HG--
branch : feature
 2015-10-21 17:13:16 +03:00
Valentina Zhuravska
b877c49f61 Fixed MSVC build (access the not operator) 
--HG--
branch : feature
 2015-10-21 16:17:05 +03:00
Roman Telezhynskyi
69f65cf4e7 ICC warnings. 
--HG--
branch : develop
 2015-10-21 10:25:27 +03:00
Roman Telezhynskyi
467ffbd132 ICC warnings. 
--HG--
branch : develop
 2015-10-20 17:32:01 +03:00
Roman Telezhynskyi
a21e037de8 GCC/Clang warnings. 
--HG--
branch : develop
 2015-10-19 23:08:20 +03:00
Roman Telezhynskyi
047f53e2ec Clang Static Analyzer warnings. 
--HG--
branch : develop
 2015-10-19 22:33:20 +03:00
Roman Telezhynskyi
4d90589f01 Clang warnings. 
--HG--
branch : develop
 2015-10-19 16:21:06 +03:00
Roman Telezhynskyi
03b6ce08cc Coverity scan. 
--HG--
branch : develop
 2015-10-19 09:10:39 +03:00
Roman Telezhynskyi
65d2213ef9 Coverity scan missing includes. 
--HG--
branch : develop
 2015-10-18 22:30:51 +03:00
Valentina Zhuravska
9be90e75db Fixed synchronization (correct path to Valentina settings) 
--HG--
branch : feature
 2015-10-18 16:17:56 +03:00
Valentina Zhuravska
251cd94407 Fixed synchronization (correct path to Valentina settings) 
--HG--
branch : feature
 2015-10-18 16:13:51 +03:00
Valentina Zhuravska
fd12524011 Fixed synchronization 
--HG--
branch : feature
 2015-10-18 15:38:05 +03:00
Valentina Zhuravska
d146d381e8 Save valentina.exe Path Preferences to a file accessible by tape.exe without commonSettings 
--HG--
branch : feature
 2015-10-18 14:51:14 +03:00
Valentina Zhuravska
e16943cfa2 Resolved issue #388. Add field for measurement template directory in Valentina.exe, 'File', 'Preferences', 'Paths' 
--HG--
branch : feature
 2015-10-18 13:01:38 +03:00
Valentina Zhuravska
de12c77aa4 Resolved issue #354. Save valentina.exe Path Preferences to a file accessible by tape.exe 
--HG--
branch : feature
 2015-10-18 12:56:47 +03:00
Roman Telezhynskyi
0862ce75cc Fixed Windows build. 
--HG--
branch : develop
 2015-10-18 10:50:33 +03:00
Roman Telezhynskyi
6ee987947c Tests that helps to check that all current pattern making systems match pattern 
inside XSD scheme.

--HG--
branch : develop
 2015-10-17 11:32:54 +03:00
Roman Telezhynskyi
a6dedb814a We can't use tr() macros, but macros translate() need context in the first 
parameter.

--HG--
branch : develop
 2015-10-16 23:00:05 +03:00
Roman Telezhynskyi
ff768c1c0f Show pattern making system in tab Information of a measurement file. 
--HG--
branch : develop
 2015-10-16 20:26:05 +03:00
Roman Telezhynskyi
3358f9dbc7 Resolved issue #382. Add 'Create from existing file' option in Tape, 
Create/Edit.

--HG--
branch : develop
 2015-10-15 15:37:10 +03:00
Roman Telezhynskyi
1e05300ae1 Add method for check that formula contain inside only single value. 
--HG--
branch : develop
 2015-10-15 13:41:42 +03:00
Roman Telezhynskyi
5cd9a88761 Making class Calculator independent from class VContainer. 
--HG--
branch : develop
 2015-10-15 13:07:43 +03:00
Roman Telezhynskyi
4fbae45406 Return list of all variables. 
--HG--
branch : develop
 2015-10-15 12:49:15 +03:00
Roman Telezhynskyi
bdb3bf9050 Fixed height formula field. 
--HG--
branch : develop
 2015-10-15 12:39:09 +03:00
Roman Telezhynskyi
8066d880c9 Lupdate. Fixed lupdate warnings. 
--HG--
branch : develop
 2015-10-15 12:32:50 +03:00
Roman Telezhynskyi
6006bca7ba Birth date can't be empty. 
--HG--
branch : develop
 2015-10-15 08:04:23 +03:00
Roman Telezhynskyi
8388529ad6 Forgot to set aliases. 
--HG--
branch : develop
 2015-10-14 14:39:44 +03:00
Roman Telezhynskyi
6bdd2c808e Missed icons. 
--HG--
branch : develop
 2015-10-14 13:49:20 +03:00
Roman Telezhynskyi
6ec1826fbd Popup calendar. 
--HG--
branch : develop
 2015-10-13 16:38:07 +03:00
Roman Telezhynskyi
c9ff24dd79 Resolved issue #378. Change 'sex' field name to 'gender'. 
--HG--
branch : develop
 2015-10-13 11:13:43 +03:00
Roman Telezhynskyi
1ba9855d22 Resolved issue #377. Add blank option for 'sex' field in Tape.exe. 
--HG--
branch : develop
 2015-10-12 20:06:12 +03:00
Roman Telezhynskyi
68eb410082 Updated portuguese alphabet. 
--HG--
branch : develop
 2015-10-12 18:28:38 +03:00
Roman Telezhynskyi
3b4c4e8261 Resolved issue #376. Add buttons in Tape.exe to move measurement to top or 
bottom of list.

--HG--
branch : develop
 2015-10-12 17:57:11 +03:00
Roman Telezhynskyi
c2e563a65c variable scope. 
--HG--
branch : develop
 2015-10-12 16:26:42 +03:00
Roman Telezhynskyi
86982d3d0a Localize parser error messages. 
--HG--
branch : develop
 2015-10-12 15:25:44 +03:00
Roman Telezhynskyi
be398bae93 cppcheck. 
--HG--
branch : develop
 2015-10-12 14:52:48 +03:00
Roman Telezhynskyi
97fdd161b7 Optimization copying files. 
--HG--
branch : develop
 2015-10-11 20:27:47 +03:00
Roman Telezhynskyi
2c042b82ae stable.cpp only need by MSVC. 
--HG--
branch : develop
 2015-10-11 13:15:08 +03:00
Roman Telezhynskyi
a4b2bb905f Fixed crash on Windows. 
--HG--
branch : develop
 2015-10-11 12:06:14 +03:00
Valentina Zhuravska
b46e384ca7 Fixed warnings in Windows 
--HG--
branch : develop
 2015-10-10 04:49:10 +03:00
Roman Telezhynskyi
c1976401a0 Use CONFIG += silent in release mode. 
--HG--
branch : develop
 2015-10-09 20:22:49 +03:00
Roman Telezhynskyi
e6e8a7ff6d Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-09 12:50:37 +03:00
Roman Telezhynskyi
026804bc37 Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 21:11:50 +03:00
Roman Telezhynskyi
7676959bdb Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 20:07:48 +03:00
Roman Telezhynskyi
4121dc7689 Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 19:57:50 +03:00
Roman Telezhynskyi
c630b2e0fc Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 19:27:39 +03:00
Roman Telezhynskyi
259f1e1de0 Define macros tr() for reducing code complexity. 
--HG--
branch : develop
 2015-10-08 08:24:15 +03:00
Roman Telezhynskyi
7daec88f6e Fixed system p25 description. 
--HG--
branch : develop
 2015-10-07 22:22:44 +03:00
Roman Telezhynskyi
94f86f136e New pattern making system 'None' with code p998. 
--HG--
branch : develop
 2015-10-07 20:57:18 +03:00
Roman Telezhynskyi
8df6014412 Fixed typos. 
--HG--
branch : develop
 2015-10-07 19:45:01 +03:00
Roman Telezhynskyi
defbdb8e9c New keys "gsize" and "gheight". 
--HG--
branch : develop
 2015-10-07 18:28:51 +03:00
Roman Telezhynskyi
8aea332cda Remember cursor position and return focus to the formula field. 
--HG--
branch : develop
 2015-10-05 17:12:36 +03:00
Roman Telezhynskyi
55421d196b Correct maximum size formula field. 
--HG--
branch : develop
 2015-10-05 17:07:53 +03:00
Roman Telezhynskyi
7a95b52cd0 Enable debug information Valentina and Tape from one place. 
--HG--
branch : develop
 2015-10-03 17:03:25 +03:00
Roman Telezhynskyi
5d118c61ea Code style. 
--HG--
branch : develop
 2015-10-03 17:01:27 +03:00
Roman Telezhynskyi
ed156d3d57 Testing Tape.exe. More test cases. 
--HG--
branch : develop
 2015-10-03 14:09:06 +03:00
Roman Telezhynskyi
bdfae8230d Check if we seek in a measurement file an empty name. 
--HG--
branch : develop
 2015-10-03 01:49:15 +03:00
Roman Telezhynskyi
f607e37168 Fixed crash. 
--HG--
branch : develop
 2015-10-03 01:38:50 +03:00
Roman Telezhynskyi
c65f554a8d Fixed GCC warnings. 
--HG--
branch : develop
 2015-10-02 08:37:31 +03:00
Roman Telezhynskyi
ad7928248c Merge 
--HG--
branch : develop
 2015-10-02 08:01:48 +03:00
Valentina Zhuravska
0b16f5acf0 Fixed "comparing floating point with == is unsafe" 
--HG--
branch : feature
 2015-10-02 05:46:10 +03:00
Valentina Zhuravska
55ab727d78 Correct structure members initialization 
--HG--
branch : feature
 2015-10-02 04:07:07 +03:00
Roman Telezhynskyi
655a297f73 Test "Converting old individual format to new version". 
--HG--
branch : develop
 2015-10-01 20:19:19 +03:00
Roman Telezhynskyi
019642e70a Avoid duplicated QStringLiterals. 
--HG--
branch : develop
 2015-10-01 19:43:41 +03:00
Valentina Zhuravska
c298be342d Q_DISABLE_COPY instead copy constructor 
--HG--
branch : feature
 2015-10-01 18:48:25 +03:00
Roman Telezhynskyi
06a54ba40c Use qUtf8Printable. 
--HG--
branch : develop
 2015-10-01 18:34:03 +03:00
Roman Telezhynskyi
0b57b8821a Show error message box only through message handler. 
--HG--
branch : develop
 2015-10-01 17:59:01 +03:00
Valentina Zhuravska
15834562af Fixed warnings in Linux 
--HG--
branch : feature
 2015-10-01 05:05:21 +03:00
Valentina Zhuravska
92a7f21621 Fixed warnings in Linux 
1. fixed old-style cast
2. correct order of variables

--HG--
branch : feature
 2015-09-30 21:10:13 +03:00
Valentina Zhuravska
1eaf5055a7 Fixed warnings in Linux (correct order of variables) 
--HG--
branch : feature
 2015-09-30 21:06:31 +03:00
Valentina Zhuravska
418a7ab57f Fixed warnings in Linux (default statement in switch case) 
--HG--
branch : feature
 2015-09-30 21:00:58 +03:00
Valentina Zhuravska
c3fef2abd7 Fixed warnings in Linux (old-style cast) 
--HG--
branch : feature
 2015-09-30 20:57:50 +03:00
Valentina Zhuravska
80d35507ca Fixed warnings in Linux 
1. correct structure members initialization
2. struct has pointer data members but has no copy constructor

--HG--
branch : feature
 2015-09-30 20:49:02 +03:00
Valentina Zhuravska
139027926e Fixed warnings in Linux (correct structure members initialization) 
--HG--
branch : feature
 2015-09-30 19:59:12 +03:00
Valentina Zhuravska
637baaeabb Fixed warnings in Linux (_MSC_VER) 
--HG--
branch : feature
 2015-09-30 18:10:42 +03:00
Roman Telezhynskyi
da05f74468 Do not create attributes "full name" and "description" for a known measurement. 
--HG--
branch : develop
 2015-09-29 18:52:30 +03:00
Roman Telezhynskyi
2e344b27b0 Fix for searching the folder 'templates'. 
--HG--
branch : develop
 2015-09-29 17:13:29 +03:00
Roman Telezhynskyi
bf2db165da Fixed translation. 
--HG--
branch : develop
 2015-09-29 17:04:24 +03:00
Roman Telezhynskyi
31af1687a6 Improve handling error messages in console mode. 
--HG--
branch : develop
 2015-09-28 21:54:41 +03:00
Roman Telezhynskyi
d90d24ca61 Check if all defined known measurements in a file are valid. 
--HG--
branch : develop
 2015-09-22 17:41:05 +03:00
Roman Telezhynskyi
ed373cf6c1 Define "tr" makes code more compact. 
--HG--
branch : feature
 2015-09-22 16:11:20 +03:00
Roman Telezhynskyi
4f296d46d7 Updated diagrams. 
--HG--
branch : feature
 2015-09-22 12:11:52 +03:00
Roman Telezhynskyi
055f80ccd5 Updated the measurement numbers. 
--HG--
branch : feature
 2015-09-21 17:50:50 +03:00
Roman Telezhynskyi
2299054ae6 Updated the long descriptions. 
--HG--
branch : feature
 2015-09-20 21:08:10 +03:00
Roman Telezhynskyi
4e3197d3d6 Updated the descriptions. 
--HG--
branch : feature
 2015-09-20 17:54:55 +03:00
Roman Telezhynskyi
141a3a8a05 shoulder_width_f -> shoulder_tip_to_shoulder_tip_f 
--HG--
branch : feature
 2015-09-20 14:11:06 +03:00
Roman Telezhynskyi
7d72d2d579 shoulder_width_b -> shoulder_tip_to_shoulder_tip_b 
--HG--
branch : feature
 2015-09-20 13:58:26 +03:00
Roman Telezhynskyi
5a66e753e9 neck_side_to_waist_bladepoint_b -> neck_side_to_waist_scapula_b 
--HG--
branch : feature
 2015-09-20 13:53:27 +03:00