aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,053 Commits 5 Branches 34 Tags 280 MiB
1d059ca9a5
Commit Graph

911 Commits

Author SHA1 Message Date
Roman Telezhynskyi
4977604106 Correct disabling line to the label. 
--HG--
branch : develop
 2016-01-11 13:24:37 +02:00
Roman Telezhynskyi
ac5c8d8201 Do not remove a loop created by intersection point when it is the first or 
the last point of lines that intersect.

--HG--
branch : develop
 2016-01-10 21:41:46 +02:00
Roman Telezhynskyi
3d6f8e0caa Brush detail. 
--HG--
branch : develop
 2016-01-10 15:31:43 +02:00
Roman Telezhynskyi
c2976614ba Correct removing loop if a path contains them several. Seek and remove the last. 
In this way we will correct remove them all.

--HG--
branch : develop
 2016-01-09 23:53:17 +02:00
Roman Telezhynskyi
b9f8e19236 Test issue with method IsPointOnLineSegment. 
--HG--
branch : develop
 2016-01-09 11:42:06 +02:00
Roman Telezhynskyi
1c92165467 Have found case where the program returns wrong curve segment. 
--HG--
branch : develop
 2016-01-08 17:59:51 +02:00
Roman Telezhynskyi
45454a8955 Fix tool UnionDetails. Always left last poit of detail, save children ids, 
save in correct section.

--HG--
branch : develop
 2016-01-07 18:43:08 +02:00
Valentina Zhuravska
31aee635e4 Little optimization: change 'cansel' to 'cancel' 
--HG--
branch : feature
 2016-01-06 08:05:41 +02:00
Roman Telezhynskyi
65bf17fcf9 Fixed broken feature 'Default height and size'. 
--HG--
branch : develop
 2016-01-03 15:21:30 +02:00
Benjamin Nauck
6ffa9d0055 Move set attribute to vabstractapplication 
--HG--
branch : feature
 2016-01-02 17:06:19 +01:00
Benjamin Nauck
4bc766295e Add @2x versions of toolbar tab icons (excluding detail and layout) 
--HG--
branch : feature
 2016-01-02 02:45:29 +01:00
Valentina Zhuravska
9fd6f18426 Resolved issue #423. Deny moving several labels at one time. 
--HG--
branch : feature
 2015-12-28 10:00:10 +02:00
Roman Telezhynskyi
37e799ce71 Fixed issue with deleting detail (after union details) and blocked objects. 
--HG--
branch : feature
 2015-12-26 19:10:02 +02:00
Roman Telezhynskyi
1aa2263686 Improved question message. 
--HG--
branch : feature
 2015-12-26 18:01:32 +02:00
Roman Telezhynskyi
a11b3c3203 Check if setted detail is valid. 
--HG--
branch : feature
 2015-12-26 15:18:58 +02:00
Roman Telezhynskyi
00b8aae5a7 Fixed issue with deleting detail and blocked objects. Part about tool union 
still is not fixed.

--HG--
branch : feature
 2015-12-26 15:08:41 +02:00
Roman Telezhynskyi
d227ce68c2 Show dialog "Fix broken formula" only in GUI mode. 
--HG--
branch : develop
 2015-12-22 20:12:09 +02:00
Valentina Zhuravska
1dce05b239 Show openHand cursor only if we can move the detail 
--HG--
branch : feature
 2015-12-20 21:55:27 +02:00
Valentina Zhuravska
73c544c45d Resolved issue #271. Deny move workpieces when tool union is active. 
--HG--
branch : feature
 2015-12-20 21:53:59 +02:00
Valentina Zhuravska
fd658631b3 We don't need to move nodePoints 
--HG--
branch : feature
 2015-12-20 21:51:14 +02:00
Roman Telezhynskyi
95772bf0db Fixed "Build failed". 
--HG--
branch : develop
 2015-12-19 22:15:42 +02:00
Roman Telezhynskyi
40bf125fdf Resolved issue #422. Date of birth: German data format. 
--HG--
branch : develop
 2015-12-19 21:26:05 +02:00
Roman Telezhynskyi
a0b785ffd8 Resolved issue #402. After Crash .val is empty. 
--HG--
branch : develop
 2015-12-19 21:02:38 +02:00
Roman Telezhynskyi
90dac31a2e Discard vmargins.h. Build backport files if only need. 
--HG--
branch : develop
 2015-12-19 16:38:24 +02:00
Roman Telezhynskyi
b2ec130d7e Fixed issue #167. Window modified indication disappears even we have unsaved 
change.

--HG--
branch : develop
 2015-12-18 13:57:03 +02:00
Roman Telezhynskyi
3beb8a8b7c Refactoring. Smooth scrolling. 
--HG--
branch : develop
 2015-12-17 21:13:07 +02:00
Roman Telezhynskyi
949f4be2c6 Merge. 
--HG--
branch : develop
 2015-12-17 13:13:11 +02:00
Roman Telezhynskyi
4bdb788c50 New tests of localizations. Lupdate. 
--HG--
branch : develop
 2015-12-17 12:52:10 +02:00
Valentina Zhuravska
550816a958 Resolved issue #270. Selection point by clicking on label in tools seam allowance and union. 
--HG--
branch : feature
 2015-12-17 12:03:44 +02:00
Roman Telezhynskyi
717772c339 Main workpiece's path also can contains loops. This cause wrong seam allowances. 
--HG--
branch : develop
 2015-12-15 13:16:37 +02:00
Roman Telezhynskyi
812c09ba83 Removed '...' from localization. 
--HG--
branch : develop
 2015-12-14 09:42:09 +02:00
Roman Telezhynskyi
90bdb6b561 XSD validation base height and size values. 
--HG--
branch : develop
 2015-12-12 17:35:57 +02:00
Roman Telezhynskyi
e8a93ddc2b New setting "Default height and size". 
--HG--
branch : develop
 2015-12-12 13:11:39 +02:00
Roman Telezhynskyi
3aa1ccaea4 Optimization. Call creation toolbar only if was not uploaded any measurements. 
--HG--
branch : develop
 2015-12-11 17:06:20 +02:00
Roman Telezhynskyi
f600a00db8 Merge 
--HG--
branch : develop
 2015-12-11 16:23:20 +02:00
Roman Telezhinskyi
eb69008e07 Merged in ValentinaZhuravska/valentina/feature (pull request #83) 
Fixed issue #415.

--HG--
branch : develop
 2015-12-11 16:22:52 +02:00
Valentina Zhuravska
10c0ad2c5c Define class VGraphicsSimpleTextItem instead of #include "../vwidgets/vgraphicssimpletextitem.h" 
--HG--
branch : feature
 2015-12-11 16:20:32 +02:00
Roman Telezhynskyi
93a52bd889 Allow user to set default size and height for a pattern. 
--HG--
branch : develop
 2015-12-11 16:19:11 +02:00
Valentina Zhuravska
5a22c6baf6 Use SCASSERT for point, namePoint and lineName 
--HG--
branch : feature
 2015-12-11 15:07:05 +02:00
Valentina Zhuravska
a1417fc127 We don't need to change pen inside RefreshLine method 
--HG--
branch : feature
 2015-12-11 13:35:48 +02:00
Valentina Zhuravska
0869c7fed4 We don't need to change the radius, so we can make it const 
--HG--
branch : feature
 2015-12-11 11:33:12 +02:00
Valentina Zhuravska
ece2c42e5f We need one method RefreshLine in VAbstractTool instead of two similar methods in VNodePoint and VToolSinglePoint 
--HG--
branch : feature
 2015-12-11 11:31:21 +02:00
Roman Telezhynskyi
da827ad952 QComboBox clear button in property browser. 
--HG--
branch : develop
 2015-12-09 13:13:34 +02:00
Roman Telezhynskyi
6f1dcb7592 Resolved build issue on OpenSuse. The method setClearButtonEnable is available 
only since Qt 5.2.

--HG--
branch : develop
 2015-12-09 12:40:43 +02:00
Roman Telezhynskyi
589bf173ae Improved calculation arc points. 
--HG--
branch : develop
 2015-12-07 23:33:11 +02:00
Valentina Zhuravska
d057d336f7 Fixed issue #415. Line appears between the point and mark in the detail mode 
--HG--
branch : feature
 2015-12-07 07:48:51 +02:00
Roman Telezhinskyi
b5dfbae5a1 Merged in ValentinaZhuravska/valentina/feature (pull request #82) 
Resolved Issue #272.

--HG--
branch : develop
 2015-12-06 18:45:46 +02:00
Valentina Zhuravska
178419742a Added hoverMoveEvent. The cursor should not be changed to arrow until we leave the detail area 
--HG--
branch : feature
 2015-12-06 18:20:37 +02:00
Roman Telezhynskyi
a820b20fc2 The program crashes if scene is not connected to view. 
--HG--
branch : develop
 2015-12-05 18:27:38 +02:00
Roman Telezhynskyi
e781b8252d Cut less scene rect size for showing axis. 
--HG--
branch : develop
 2015-12-04 22:21:07 +02:00
Roman Telezhynskyi
6de8a44314 Try to fix flowing of drawing. 
--HG--
branch : develop
 2015-12-04 21:49:00 +02:00
Roman Telezhynskyi
dc25101d78 Refactoring. Call parent's method. 
--HG--
branch : develop
 2015-12-04 21:47:44 +02:00
Roman Telezhynskyi
2b0e358cdd Saving position of the base point should be handled in ItemPositionChange 
section.

--HG--
branch : develop
 2015-12-04 21:46:52 +02:00
Roman Telezhynskyi
6d566c2715 Make fictive scene bigger in all cases. 
--HG--
branch : develop
 2015-12-04 10:04:43 +02:00
Roman Telezhynskyi
ae43c66bd9 Fixed issue #412. Error in Detail using 'Segment a Simple Curve' tool. 
--HG--
branch : develop
 2015-12-03 21:56:40 +02:00
Roman Telezhynskyi
b431f65ff2 Fixed issue #411. Curve Tool handles detach from curve. 
--HG--
branch : develop
 2015-12-03 19:50:42 +02:00
Roman Telezhynskyi
ced638a782 Support a proxy icon on Mac OS. 
--HG--
branch : develop
 2015-12-03 14:07:51 +02:00
Valentina Zhuravska
dfa46dc1cd Added mousePressEvent and changed QApplication::setOverrideCursor to SetOverrideCursor 
--HG--
branch : feature
 2015-12-02 23:07:23 +02:00
Valentina Zhuravska
75a4acaea7 Resolved Issue #272. Show that user can move workpiece. 
--HG--
branch : feature
 2015-12-02 21:33:42 +02:00
Roman Telezhynskyi
6cd674ec0f QGraphicsView Zooming in and out under mouse position using mouse wheel finally 
works like i want.

--HG--
branch : develop
 2015-12-02 20:39:25 +02:00
Roman Telezhynskyi
cf4e313862 Optimization dialogs for Mac OS. 
--HG--
branch : develop
 2015-12-01 20:12:40 +02:00
Roman Telezhynskyi
477a95798a Optimization line color combobox for Mac. 
--HG--
branch : develop
 2015-12-01 17:13:57 +02:00
Roman Telezhynskyi
d24390bd98 Set of fixes for better look on Mac OS X. 
--HG--
branch : develop
 2015-12-01 16:38:09 +02:00
Roman Telezhynskyi
85bb6141ab Clang warnings. 
--HG--
branch : develop
 2015-11-30 12:55:39 +02:00
Roman Telezhinskyi
3dc675e0ce Merged in ValentinaZhuravska/valentina/feature (pull request #81) 
Resolved issue #80.

--HG--
branch : develop
 2015-11-29 16:43:59 +02:00
Valentina Zhuravska
f91fbaaa01 We need do set decimals before we set value 
--HG--
branch : feature
 2015-11-29 16:42:39 +02:00
Valentina Zhuravska
cd15fd711e Resolved issue #80. Choice between inches and centimeters in options 
--HG--
branch : feature
 2015-11-28 22:48:43 +02:00
Roman Telezhynskyi
70cc2b6f95 QDebugStateSaver available only since Qt 5.1. 
--HG--
branch : develop
 2015-11-28 12:36:54 +02:00
Roman Telezhynskyi
b6506b2cae Wrong defining QLoggingCategory. 
--HG--
branch : develop
 2015-11-27 14:04:23 +02:00
Roman Telezhynskyi
f0691d7c9f Mark implicitly shared classes as a movable type. This can improve performance 
and memory efficiency when using Qt's container classes.

--HG--
branch : develop
 2015-11-25 20:56:17 +02:00
Roman Telezhynskyi
783e3d57c2 Support QGraphicsView autoscroll of a draged object. 
--HG--
branch : develop
 2015-11-25 19:26:37 +02:00
Roman Telezhynskyi
36704cd02e Invisible "VSimpleCurve" causes exponential growth scene size, and it causes 
the program crash. Because we don't need anymore this calss i just have removed
it.

--HG--
branch : develop
 2015-11-25 15:45:38 +02:00
Valentina Zhuravska
d575ad5ad3 Return false if we have less than 3 points 
--HG--
branch : feature
 2015-11-22 16:58:58 +02:00
Valentina Zhuravska
3e9793dbbb We don't need variable points in method Square 
--HG--
branch : feature
 2015-11-22 16:47:50 +02:00
Valentina Zhuravska
6c653163f9 Erased QString(" ") 
--HG--
branch : feature
 2015-11-22 16:36:55 +02:00
Valentina Zhuravska
d679187f15 Fixed SumTrapezoids method 
--HG--
branch : feature
 2015-11-22 15:58:31 +02:00
Valentina Zhuravska
40ef4732ca Changed SumTrapezoids method to static 
--HG--
branch : feature
 2015-11-22 03:01:56 +02:00
Valentina Zhuravska
e8deb4b29c The user must select points in a clockwise direction 
--HG--
branch : feature
 2015-11-22 01:52:18 +02:00
Roman Telezhynskyi
e38dc9d866 For avoiding error "dyld: Library not loaded" in Mac OS X we should create app 
bundle for Tape. I think if create bundle then make it full, not half made.
The bundle also will be very usefull for testing Tape in Mac and in case if
someone will want to use Tape like independent application. The main bundle
still will have Tape inside.

--HG--
branch : develop
 2015-11-18 14:42:25 +02:00
Roman Telezhynskyi
0473db2947 Load also qtbase_*.qm files. 
--HG--
branch : develop
 2015-11-17 16:27:51 +02:00
Roman Telezhynskyi
cdec047f58 Very often case in Mac OS is to have translations inside an app bundle. And 
searching these files require iterate through subdirectories.

--HG--
branch : develop
 2015-11-17 16:20:36 +02:00
Roman Telezhynskyi
ab526a54b4 New icon in the icon theme 'help-about'. 
--HG--
branch : develop
 2015-11-17 12:45:22 +02:00
Roman Telezhynskyi
7ef98c3c4b Fixed building on Linux. 
--HG--
branch : develop
 2015-11-17 12:17:53 +02:00
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
Roman Telezhynskyi
f444aebc2d Code style. 
--HG--
branch : feature
 2015-09-20 13:44:59 +03:00
Roman Telezhynskyi
e0cad4e732 Fix for support win64. 
--HG--
branch : develop
 2015-09-20 13:20:21 +03:00
Roman Telezhynskyi
305818bd8e Merge 
--HG--
branch : develop
 2015-09-20 13:12:15 +03:00
Roman Telezhynskyi
b5c6bf8260 Command option for setting a locale. 
--HG--
branch : develop
 2015-09-19 22:58:32 +03:00
Valentina Zhuravska
4423d6b937 Fixed build problem on Windows 
--HG--
branch : develop
 2015-09-18 23:38:11 +03:00
Roman Telezhynskyi
ad28a200f7 Removed unused variable. 
--HG--
branch : develop
 2015-09-16 11:03:33 +03:00
Roman Telezhynskyi
f2a111f0d2 Show popup message "Measurements was updated". Fixed path to measurements when 
sync.

--HG--
branch : develop
 2015-09-16 11:03:15 +03:00
Roman Telezhynskyi
e75951eb8e Validate unique increment name. 
--HG--
branch : develop
 2015-09-16 09:14:00 +03:00
Roman Telezhynskyi
2e2a6e8f5c Validate unique measurement name. 
--HG--
branch : develop
 2015-09-16 09:04:43 +03:00
Roman Telezhynskyi
f722964c11 Add increment's formula to the export list. 
--HG--
branch : develop
 2015-09-16 08:16:27 +03:00
Roman Telezhynskyi
8dc048a47b Fixed typo in measurement name. 
--HG--
branch : develop
 2015-09-15 15:34:20 +03:00
Roman Telezhynskyi
cf0d1981ca Moved lock-guarding abilities to separated template class. 
Changed application/mainwindow to use it. Most likelly mainwindow may be
upgraded more, since lock can hold and manage memory for complex object
like QFile, also it can have stored deallocator for the object
(lambdas), so this is effectively should simple code, when you have
allocation and freening resources declared on the same screen.

--HG--
branch : develop
 2015-09-14 14:53:49 +03:00
Roman Telezhynskyi
48d4ed5905 More pretty looking macros. 
--HG--
branch : develop
 2015-09-14 10:30:14 +03:00
Roman Telezhynskyi
7e2082fc0a Portable DebugBreak(). 
--HG--
branch : develop
 2015-09-13 15:00:33 +03:00
val177
9301347f3f Fixed metric bug in VObjPaintDevice 
--HG--
branch : develop
 2015-09-12 01:24:39 +03:00
Roman Telezhynskyi
5f62ce2bde Resolved issue #356. Measurement H12 has incorrect description in tape.exe. 
--HG--
branch : develop
 2015-09-11 13:14:20 +03:00
Roman Telezhynskyi
ef45bf2a94 Removed translation for the standard table. 
--HG--
branch : develop
 2015-09-09 14:24:54 +03:00
Roman Telezhynskyi
755cbc34d5 Correct file description. 
--HG--
branch : develop
 2015-09-08 10:37:23 +03:00
Roman Telezhynskyi
7d633d7270 Merge 
--HG--
branch : develop
 2015-09-08 10:22:42 +03:00
val177
80b0f38f0d Added dxf export 
--HG--
branch : feature
 2015-09-07 22:47:02 +03:00
val177
c9eb629e8c Added dxflib 
--HG--
branch : feature
 2015-09-07 17:39:04 +03:00
Roman Telezhynskyi
b9c91734b4 Conversion measuremnt namses in expressions. 
--HG--
branch : develop
 2015-09-07 16:51:13 +03:00
Roman Telezhynskyi
e90bbf3870 Conversion standard measurements. 
--HG--
branch : develop
 2015-09-07 15:29:31 +03:00
Roman Telezhynskyi
d2bb126d04 Conversion individual measurements. 
--HG--
branch : develop
 2015-09-07 14:51:21 +03:00
val177
d053d51cba Fixed issue #342 
--HG--
branch : develop
 2015-09-07 12:40:54 +03:00
val177
00e98b8913 Fixed issue #345 
--HG--
branch : develop
 2015-09-04 15:39:01 +03:00
Roman Telezhynskyi
882efbccf9 Fixed list groups A, E, H. 
--HG--
branch : develop
 2015-09-03 11:09:56 +03:00
Roman Telezhynskyi
7b732913dc Point in the end of each descriptions. 
--HG--
branch : develop
 2015-09-02 18:49:49 +03:00
Roman Telezhynskyi
90d794491e Updated full names. 
--HG--
branch : develop
 2015-09-02 18:27:48 +03:00
Roman Telezhynskyi
99873a4439 Updated group Q. 
--HG--
branch : develop
 2015-09-02 17:54:05 +03:00
Roman Telezhynskyi
2efb587983 Updated group P. 
--HG--
branch : develop
 2015-09-02 17:51:04 +03:00
Roman Telezhynskyi
afaa6cc370 Updated group O. 
--HG--
branch : develop
 2015-09-02 17:42:34 +03:00
Roman Telezhynskyi
e30ce7ea1a Updated group N. 
--HG--
branch : develop
 2015-09-02 17:35:21 +03:00
Roman Telezhynskyi
b92d1e0f18 Updated group M. 
--HG--
branch : develop
 2015-09-02 17:31:35 +03:00
Roman Telezhynskyi
3cbdb451f1 Updated group L. 
--HG--
branch : develop
 2015-09-02 17:29:02 +03:00
Roman Telezhynskyi
1dd6e6bf3c Updated group K. 
--HG--
branch : develop
 2015-09-02 17:25:17 +03:00
Roman Telezhynskyi
6340756ca9 Updated group J. 
--HG--
branch : develop
 2015-09-02 17:07:18 +03:00
Roman Telezhynskyi
bb447cd502 Updated group I. 
--HG--
branch : develop
 2015-09-02 16:58:40 +03:00
Roman Telezhynskyi
42a99c8282 Updated group H. 
--HG--
branch : develop
 2015-09-02 16:41:51 +03:00
Roman Telezhynskyi
e830773760 Updated group G. 
--HG--
branch : develop
 2015-09-02 16:28:33 +03:00
Roman Telezhynskyi
c50a931ccb Updated group F. 
--HG--
branch : develop
 2015-09-02 16:23:10 +03:00
Roman Telezhynskyi
37724fe83c Updated group E. 
--HG--
branch : develop
 2015-09-02 16:16:03 +03:00
Roman Telezhynskyi
f912bc80b2 Updated group D. 
--HG--
branch : develop
 2015-08-31 19:20:47 +03:00
Roman Telezhynskyi
37e25046f7 Updated group C. 
--HG--
branch : develop
 2015-08-31 19:06:10 +03:00
Roman Telezhynskyi
a39125245d Updated group B. 
--HG--
branch : develop
 2015-08-31 19:02:22 +03:00
Roman Telezhynskyi
34810726ee Updated group A. 
--HG--
branch : develop
 2015-08-31 18:56:23 +03:00
Alex
605fb6ad8f Fixed extra / found in include, changed Tool/Vis enums to use strict valid static_cast to make all kinds of tools happy 
--HG--
branch : develop
 2015-08-28 19:38:02 +03:00
Alex
7f1d2934a7 Merged changes 
--HG--
branch : develop
 2015-08-27 21:06:40 +03:00
Alex
8cd58af79b -- 
--HG--
branch : develop
 2015-08-27 19:20:02 +03:00
Alex
2ec0e31c2b still merge fixes... 
--HG--
branch : develop
 2015-08-27 19:03:43 +03:00
Alex
1641e16f50 Trying to fix conflicts 
--HG--
branch : develop
 2015-08-27 18:39:02 +03:00
Roman Telezhynskyi
e0f256514c Merge with feature. Conversion files is not finished yet. 
--HG--
branch : develop
 2015-08-27 15:25:39 +03:00
Roman Telezhynskyi
e3d13cd3b5 Wrong conversion for the tag unit. 
--HG--
branch : feature
 2015-08-27 14:00:20 +03:00
Roman Telezhynskyi
a69223299c Reserve a pattern file before conversion. 
--HG--
branch : feature
 2015-08-27 11:45:31 +03:00
Roman Telezhynskyi
62a22b122e Conversion a pattern file. 
--HG--
branch : feature
 2015-08-27 11:25:11 +03:00
Roman Telezhynskyi
a988c4b185 Removed DoubleSpinBoxDelegate and TextDelegate. 
--HG--
branch : feature
 2015-08-26 21:32:35 +03:00
Roman Telezhynskyi
a5e0ace3a5 Use V_FALLTHROUGH. 
--HG--
branch : feature
 2015-08-26 21:21:42 +03:00
Roman Telezhynskyi
98a5d8aadb Don't clean measurement before begin full parsing. 
--HG--
branch : feature
 2015-08-26 21:14:47 +03:00
Roman Telezhynskyi
0cacf1034a Open a pattern file. 
--HG--
branch : feature
 2015-08-26 17:20:23 +03:00
Alex
dc95ae30e9 Issue #334, try 2. 
Changed spaces, some minor stuffs like [[noreturn]].
Removed added by error clang settings.

--HG--
branch : develop
 2015-08-25 22:27:21 +03:00
Alex
799d5d1dc2 Issue #334 mostly with minor neccessary changes, all options implemented 
for command line, disabled gui popups when command line detected.

--HG--
branch : develop
 2015-08-25 20:53:03 +03:00
Roman Telezhynskyi
5a1208655c Working with new Increments. 
--HG--
branch : feature
 2015-08-25 13:35:50 +03:00
Roman Telezhynskyi
62a6fcce44 Sync measurements. 
--HG--
branch : feature
 2015-08-23 14:01:02 +03:00
Roman Telezhynskyi
6c2c36a11d Show current measurements in Tape. 
--HG--
branch : feature
 2015-08-18 17:53:33 +03:00
Roman Telezhynskyi
f3d24856be Check Measurement file unit. 
--HG--
branch : feature
 2015-08-18 10:24:51 +03:00
Roman Telezhynskyi
0c73e7f760 Convert measurements to a pattern file's unit. 
--HG--
branch : feature
 2015-08-17 15:36:55 +03:00
Roman Telezhynskyi
8146f53be3 Create a measurement independent pattern file. 
--HG--
branch : feature
 2015-08-16 18:56:06 +03:00