Roman Telezhynskyi
6a3eff4c0b
Resolved issue #641 . Seam Allowance Tools tab texts truncated in MAC.
...
--HG--
branch : feature
2017-03-17 16:38:18 +02:00
Roman Telezhynskyi
abd10d8f56
Move Seam Allowance tool's dialog.
...
--HG--
branch : feature
2017-03-16 14:49:40 +02:00
Roman Telezhynskyi
74ee767a31
Fix bug with warning icon.
...
--HG--
branch : feature
2017-03-14 12:39:03 +02:00
Roman Telezhynskyi
65b3c6d3aa
Fix typo.
...
--HG--
branch : feature
2017-03-13 15:00:44 +02:00
Roman Telezhynskyi
ce1c96528e
If formula is empty set to default value.
...
--HG--
branch : feature
2017-03-13 15:00:32 +02:00
Roman Telezhynskyi
1ab541236d
Successful build.
...
--HG--
branch : feature
2017-03-13 14:27:29 +02:00
Roman Telezhynskyi
988da5fd19
Fix showing warning for labels.
...
--HG--
branch : feature
2017-03-11 16:39:04 +02:00
Roman Telezhynskyi
728b0e79d4
Set default values for grainline length and angle.
...
--HG--
branch : feature
2017-03-11 15:57:57 +02:00
Roman Telezhynskyi
c5f7eef8b4
Fix showing warning for grainline.
...
--HG--
branch : feature
2017-03-11 15:56:39 +02:00
Roman Telezhynskyi
38409f747f
Successful build.
...
--HG--
branch : feature
2017-03-11 15:25:21 +02:00
Roman Telezhynskyi
08d712ffb6
Show warning icon and pin points for tab Labels.
...
--HG--
branch : feature
2017-03-11 11:41:25 +02:00
Roman Telezhynskyi
367c78936a
Rename tab.
...
--HG--
branch : feature
2017-03-10 19:31:48 +02:00
Roman Telezhynskyi
4bec2bb815
Do not warn a user about wrong configuration if top and bottom pin points are
...
not selected.
--HG--
branch : feature
2017-03-10 16:27:56 +02:00
Roman Telezhynskyi
af3735ea23
Grainline now can be controlled by center pin point.
...
--HG--
branch : feature
2017-03-10 16:22:19 +02:00
Roman Telezhynskyi
fb402f84b7
Dialog get/set grainline center pin point.
...
--HG--
branch : feature
2017-03-09 13:10:46 +02:00
Roman Telezhynskyi
714a180b31
Improve memory allocation.
...
--HG--
branch : develop
2017-03-02 13:14:19 +02:00
Roman Telezhynskyi
98f26cd417
Show pins if user activated Pattern Piece Data tab or Grainline tab.
...
--HG--
branch : feature
2017-03-01 07:43:51 +02:00
Roman Telezhynskyi
38740f7ef8
Fix incorrect saving grainline angle and length.
...
--HG--
branch : feature
2017-02-27 14:28:22 +02:00
Roman Telezhynskyi
449543f203
Show warning icon if only both requirements are false.
...
--HG--
branch : feature
2017-02-24 19:42:06 +02:00
Roman Telezhynskyi
1e525ed788
User should at least has valid pins or not null lengths of grainline.
...
--HG--
branch : feature
2017-02-24 17:23:02 +02:00
Roman Telezhynskyi
86cc0fa0b0
Fix typo.
...
--HG--
branch : feature
2017-02-24 17:21:43 +02:00
Roman Telezhynskyi
3a2752ef37
Move all grainline objects inside a group box.
...
--HG--
branch : feature
2017-02-24 17:21:17 +02:00
Roman Telezhynskyi
d9bf2d5d6c
Get window text color from dialog palette. Set Ok color only for Active state.
...
--HG--
branch : feature
2017-02-24 17:17:56 +02:00
Roman Telezhynskyi
edf2b2e74a
Fix typo.
...
--HG--
branch : feature
2017-02-24 16:37:11 +02:00
Roman Telezhynskyi
3ebbc53a01
Delete pin visualization when close Seam allowance dialog.
...
--HG--
branch : feature
2017-02-24 12:14:28 +02:00
Roman Telezhynskyi
757a5ec550
Fix typo.
...
--HG--
branch : feature
2017-02-24 12:11:00 +02:00
Roman Telezhynskyi
8721a4a5d8
Dialog Seam allowance tool now allow select pin points.
...
--HG--
branch : feature
2017-02-23 16:33:15 +02:00
Roman Telezhynskyi
f36a4d6621
Copy-on-write for class VGrainlineData.
...
--HG--
branch : feature
2017-02-23 14:04:49 +02:00
Roman Telezhynskyi
1710e3cdb7
Refactoring. Prepare folder structure for new hierarchy.
...
--HG--
branch : feature
2017-02-23 11:37:19 +02:00
Roman Telezhynskyi
a287913500
Refactoring. Rename class VGrainlineGeometry to VGrainlineData.
...
--HG--
branch : feature
2017-02-23 11:33:17 +02:00
Roman Telezhynskyi
4e3ee3eefd
Refactoring. Rename class VPatternInfoGeometry to VPatternLabelData.
...
--HG--
branch : feature
2017-02-23 11:26:25 +02:00
Roman Telezhynskyi
37efefe1ec
Refactoring. Rename class VPatternPieceData to VPieceLabelData.
...
--HG--
branch : feature
2017-02-23 11:19:27 +02:00
Roman Telezhynskyi
e7651c7194
Merge with develop.
...
--HG--
branch : feature
2017-02-23 09:29:28 +02:00
Roman Telezhynskyi
67d69781f3
Remove the code after "return".
...
--HG--
branch : develop
2017-02-22 19:27:53 +02:00
Roman Telezhynskyi
3bf65edaa6
Merge with develop.
...
--HG--
branch : feature
2017-02-22 14:48:48 +02:00
Roman Telezhynskyi
4ed5fd9329
QScopedPointer doesn't support deleting from outside.
...
--HG--
branch : develop
2017-02-22 08:02:28 +02:00
Roman Telezhynskyi
38abf5c9a0
Removed redundant forward declaration.
...
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi
8f0f2399e2
Use QScopedPointer to prevent memory leaks.
...
--HG--
branch : develop
2017-02-18 10:43:06 +02:00
Roman Telezhynskyi
ff2d9c28fe
Init all pin comboboxes.
...
--HG--
branch : feature
2017-02-15 15:32:48 +02:00
Roman Telezhynskyi
a3d27bf9db
Refacoring. Use marcos for getting current combobox data.
...
--HG--
branch : feature
2017-02-15 15:23:04 +02:00
Roman Telezhynskyi
6597f68dad
Show all pins when tab Pins is active.
...
--HG--
branch : feature
2017-02-14 17:33:30 +02:00
Roman Telezhynskyi
79a1caa4d7
Translate path node names.
...
--HG--
branch : feature
2017-02-14 15:12:37 +02:00
Roman Telezhynskyi
fc86069f7c
Dialog Seam allowance tool. Show pins in a list.
...
--HG--
branch : feature
2017-02-14 15:11:54 +02:00
Roman Telezhynskyi
71ac49a221
Merge with develop.
...
--HG--
branch : feature
2017-02-13 15:29:37 +02:00
Roman Telezhynskyi
8814c07d14
Fixed bug. Grainline's formulas were not converted to internal look.
...
--HG--
branch : develop
2017-02-13 08:30:34 +02:00
Roman Telezhynskyi
16871a0466
Fix bug with Default button.
...
--HG--
branch : develop
2017-02-12 15:42:21 +02:00
Roman Telezhynskyi
6fd45d9e2c
Path should also supports elliptical arc.
...
--HG--
branch : develop
2017-02-10 16:47:15 +02:00
Roman Telezhynskyi
ddd2e3054f
Fixed issue #625 . Seam allowance tool does not take decimals with locale
...
de_DE.utf8.
--HG--
branch : develop
2017-02-10 15:02:03 +02:00
Roman Telezhynskyi
8a19d8a0b1
Fix bug with "internal variable" in localized form.
...
Some tools have internal variables, if click button Apply a dialog lost
information about such a variable.
--HG--
branch : develop
2017-02-06 13:38:47 +02:00
Roman Telezhynskyi
a58a479db5
Refactor VPiece class. Instead of method AppendInternalPath() use overloaded
...
getter.
--HG--
branch : feature
2017-01-31 16:26:28 +02:00
Roman Telezhynskyi
b9d635dab2
Dialog Pin tool.
...
--HG--
branch : feature
2017-01-31 14:28:48 +02:00
Roman Telezhynskyi
dcc36a253a
Refactoring and bug fix in dialog Piece path.
...
--HG--
branch : develop
2017-01-31 14:28:05 +02:00
Roman Telezhynskyi
637eaa4256
Refactoring and bug fix in dialog Piece path.
...
--HG--
branch : feature
2017-01-31 14:28:05 +02:00
Roman Telezhynskyi
dc3c9511ed
QPlainTextEdit widget crash a dialog if do not disable signal when closing a
...
dialog.
--HG--
branch : develop
2017-01-31 14:27:13 +02:00
Roman Telezhynskyi
21e034ef71
QPlainTextEdit widget crash a dialog if do not disable signal when closing a
...
dialog.
--HG--
branch : feature
2017-01-31 14:27:13 +02:00
Roman Telezhynskyi
c49f97d695
MSVC warning.
...
--HG--
branch : develop
2017-01-27 11:15:24 +02:00
Roman Telezhynskyi
ede59d003f
Update formula value if node was changed.
...
--HG--
branch : feature
2017-01-25 14:42:51 +02:00
Roman Telezhynskyi
19400f5b83
A seam allowance value can be 0.
...
--HG--
branch : feature
2017-01-25 14:20:25 +02:00
Roman Telezhynskyi
426e24dccf
Use predefined symbol degree variable.
...
--HG--
branch : feature
2017-01-22 15:08:59 +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
7490200806
Fix tool Union Details's dialog.
...
--HG--
branch : feature
2017-01-17 13:49:55 +02:00
Roman Telezhynskyi
4cc232fc74
Fix crash. Valentina crashes when change name of piece.
...
--HG--
branch : feature
2017-01-14 12:10:21 +02:00
Roman Telezhynskyi
e974f75b51
Make Internal path first in list.
...
--HG--
branch : feature
2017-01-13 19:09:22 +02:00
Roman Telezhynskyi
dabac6b17d
Better help messages.
...
--HG--
branch : feature
2017-01-13 16:06:39 +02:00
Roman Telezhynskyi
c065824306
Fix crash when create an internal path.
...
--HG--
branch : feature
2017-01-13 16:06:03 +02:00
Roman Telezhynskyi
29490b9e66
Removed dialog Detail.
...
--HG--
branch : feature
2017-01-12 19:17:13 +02:00
Roman Telezhynskyi
297b73a951
VToolSeamAllowance add grainline and labels. Only the dialog.
...
--HG--
branch : feature
2017-01-12 19:09:00 +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
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
7551cfda87
Remove the code after "return".
...
--HG--
branch : develop
2016-12-21 17:38:27 +02:00
Roman Telezhynskyi
5c40a91335
Remove empty statement.
...
--HG--
branch : develop
2016-12-21 17:36:38 +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
0882313f1e
Merge with develop.
...
--HG--
branch : feature
2016-12-20 17:42:51 +02:00
Roman Telezhynskyi
0ec53b6499
Operation tools should control an elliptical arc.
...
--HG--
branch : develop
2016-12-20 17:08:28 +02:00
Roman Telezhynskyi
2f46634eff
Elliptical arc is an independent scene object.
...
--HG--
branch : develop
2016-12-20 17:05:34 +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
6ea0a12da0
GCC warnings.
...
--HG--
branch : feature
2016-12-19 16:00:49 +02:00
Valentina Zhuravska
a5f504a710
Added DialogEllipticalArc.
...
--HG--
branch : feature
2016-12-17 03:10:05 +02:00
Roman Telezhynskyi
bf4f9a3c61
Check if option Reverse is available.
...
--HG--
branch : feature
2016-12-03 19:51:25 +02:00
Roman Telezhynskyi
1f96114c0b
Allow delete object when creating a path.
...
--HG--
branch : feature
2016-12-03 19:47:17 +02:00
Roman Telezhynskyi
c2da41bbf0
Undo selection of last object if was selected twice.
...
--HG--
branch : feature
2016-12-03 19:18:58 +02:00
Roman Telezhynskyi
0a11ec59fb
Show Delete option last in a context menu.
...
--HG--
branch : feature
2016-12-03 18:57:43 +02:00
Roman Telezhynskyi
0d1179a451
Allow delete object when creating a main path.
...
--HG--
branch : feature
2016-12-03 18:53:09 +02:00
Roman Telezhynskyi
641a807f24
Fix VToolPiecePath visualization.
...
--HG--
branch : feature
2016-12-03 18:44:24 +02:00
Roman Telezhynskyi
35f54c5cc7
Added Internal path.
...
--HG--
branch : feature
2016-12-03 18:01:39 +02:00
Roman Telezhynskyi
b3b957cf28
Minore fixes for dialogs.
...
--HG--
branch : feature
2016-11-29 19:41:52 +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
0c9a0347e9
Turn on context menu in dialog piece path.
...
--HG--
branch : feature
2016-11-29 17:45:43 +02:00
Roman Telezhynskyi
c7d61aec49
Update piece path name after change.
...
--HG--
branch : feature
2016-11-29 17:39:13 +02:00
Roman Telezhynskyi
0739b3f8a3
Update custom seam allowance settings if main path was changed.
...
--HG--
branch : feature
2016-11-29 17:06:22 +02:00
Roman Telezhynskyi
a2518509a4
Clear comboxes when piece path was deleted.
...
--HG--
branch : feature
2016-11-29 16:50:40 +02:00
Roman Telezhynskyi
8bb3377a60
Fix several bugs in dialogs.
...
--HG--
branch : feature
2016-11-29 16:29:09 +02:00
Roman Telezhynskyi
9275968bbc
Fix bug. Used wrong combobox.
...
--HG--
branch : feature
2016-11-29 15:30:33 +02:00
Roman Telezhynskyi
5156e0cf25
Read/write piece path include type.
...
--HG--
branch : feature
2016-11-28 14:52:31 +02:00
Roman Telezhynskyi
51df681fbc
Handle path seam allowance settings in separate tab.
...
--HG--
branch : feature
2016-11-28 13:58:17 +02:00
Roman Telezhynskyi
fea2ec52fe
New section "Custom seam allowance".
...
--HG--
branch : feature
2016-11-28 10:47:36 +02:00
Roman Telezhynskyi
9c3a49e43f
Renamed DialogPiecePath::DisableShowMode to DialogPiecePath::EnbleShowMode.
...
--HG--
branch : feature
2016-11-28 10:45:57 +02:00
Roman Telezhynskyi
ecdb53b7d0
Save VPiecePath name.
...
--HG--
branch : feature
2016-11-28 10:42:37 +02:00
Roman Telezhynskyi
7f1bab1ac6
Fix typo.
...
--HG--
branch : feature
2016-11-24 21:31:27 +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
1a73a1f870
Set clear button for field Name.
...
--HG--
branch : feature
2016-11-23 18:43:31 +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
34e5fd2ceb
Check size of pieces list in "Create mode".
...
--HG--
branch : feature
2016-11-23 18:36:37 +02:00
Roman Telezhynskyi
6793bb69f1
Some updates for dialog.
...
--HG--
branch : feature
2016-11-23 14:50:30 +02:00
Roman Telezhynskyi
bb39410296
Added visualization creating a path.
...
--HG--
branch : feature
2016-11-23 13:57:12 +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
f741e1387c
Added DialogPiecePath class. Not finished.
...
--HG--
branch : feature
2016-11-22 13:04:34 +02:00
Roman Telezhynskyi
cc3d97a015
Change order the angle "by first edge symmetry".
...
--HG--
branch : feature
2016-11-19 18:28:07 +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
3d835a1a2a
Merge with develop
...
--HG--
branch : feature
2016-11-14 20:35:22 +02:00
Roman Telezhynskyi
fd02a71c14
Fix building with Qt 5.1.
...
--HG--
branch : develop
2016-11-14 19:41:12 +02:00
Roman Telezhynskyi
585bfec12f
Fix bug Tool seam allowance. The tool returned to previous position after
...
selecting Apply or Ok buttons in the tool's dialog.
--HG--
branch : feature
2016-11-12 15:41:15 +02:00
Roman Telezhynskyi
878fdb6156
Disable Group Nodes if the main list doesn't contain points.
...
--HG--
branch : feature
2016-11-12 14:05:47 +02:00
Roman Telezhynskyi
6706f3b39d
Use QDoubleSpinBox setSuffix() method instead independent label.
...
--HG--
branch : feature
2016-11-12 12:45:53 +02:00
Roman Telezhynskyi
c5536ab38a
Control seam allowance before and after values in a dialog.
...
--HG--
branch : feature
2016-11-12 12:41:04 +02:00
Roman Telezhynskyi
49208a640d
Fix few bugs with apllying changes for seam allowance.
...
--HG--
branch : feature
2016-11-10 14:15:43 +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
0dbf26a109
Merge with develop
...
--HG--
branch : feature
2016-11-10 11:28:08 +02:00
Roman Telezhynskyi
2489f525f7
Added tab Seam allowance. Disabled if Apply button is not active.
...
--HG--
branch : feature
2016-11-10 11:27:59 +02:00
Roman Telezhynskyi
c4b9346021
Fixed issue #586 . Valentina crashes if clear input filter string.
...
--HG--
branch : develop
2016-11-10 11:15:52 +02:00
Roman Telezhynskyi
91d43c4b26
Added missed signal. Little refactoring. ref #581 .
...
--HG--
branch : develop
2016-11-10 08:53:44 +02:00
Raina
88130f1084
Resolves #581 . User can now filter input lists by keyword in function wizard.
...
--HG--
branch : feature
2016-11-09 18:25:52 -08:00
Roman Telezhynskyi
f593d4ca5b
Dialog seam allowance tool should show visualization only when user is creating
...
new piece.
--HG--
branch : feature
2016-11-08 19:11:47 +02:00
Roman Telezhynskyi
721b9b638b
Fixed VPiece class method name. CountNode -> CountNodes.
...
--HG--
branch : feature
2016-11-08 12:55:57 +02:00
Roman Telezhynskyi
2ed35461b6
Forbid delete objects if user is creating a piece.
...
--HG--
branch : feature
2016-11-05 15:31:20 +02:00
Roman Telezhynskyi
bff5462ef3
Changes in dialog: reverse and internal move update the visualization
...
automatically.
--HG--
branch : feature
2016-11-05 15:27:19 +02:00
Roman Telezhynskyi
bf306f6101
The visualization connected to tool dialog.
...
--HG--
branch : feature
2016-11-05 12:49:20 +02:00
Roman Telezhynskyi
f8ee078ef7
When user creates new piece button Apply should be disabled.
...
--HG--
branch : feature
2016-11-04 19:36:36 +02:00
Roman Telezhynskyi
f40bf977c8
Enable internal move in the list. Helps user quickly make reorder.
...
--HG--
branch : feature
2016-11-04 17:34:15 +02:00
Roman Telezhynskyi
eb84ae7526
Added list context menu with options Delete and Reverse (except for point).
...
--HG--
branch : feature
2016-11-04 17:04:18 +02:00
Roman Telezhynskyi
e261d02f89
Check keyboard modificator and add object reversed if pressed Shift.
...
--HG--
branch : feature
2016-11-04 16:25:57 +02:00
Roman Telezhynskyi
1dd86e66fb
New dialog connected to tool button.
...
--HG--
branch : feature
2016-11-04 16:16:11 +02:00
BojanKverh
96cfc52202
At least one arrow has to be present on a grainline
...
--HG--
branch : feature
2016-10-25 23:00:42 +02:00
BojanKverh
21cd56463c
User can now turn on/off grainline arrows
...
--HG--
branch : feature
2016-10-25 00:53:01 +02:00
Roman Telezhynskyi
0a7097f259
Fix MSVC warning.
...
--HG--
branch : develop
2016-10-24 12:57:27 +03:00
BojanKverh
e82f65fc6a
Fixed the grainline tab icon in details dialog
...
--HG--
branch : feature
2016-10-23 20:59:38 +02:00
Bojan Kverh
01c068ddd0
Merged develop into feature
...
--HG--
branch : feature
2016-10-23 15:28:40 +02:00
Roman Telezhynskyi
fdc1eac734
Refactoring DialogTool::GetComboBoxCurrentData. Returned wrong default value.
...
--HG--
branch : develop
2016-10-17 14:53:46 +03:00
BojanKverh
e192ff54ec
Finished interactive rotation of the grainline and fixed cursor in the Grainline tab of detail dialog
...
--HG--
branch : feature
2016-10-13 23:33:32 +02:00
BojanKverh
5562e46790
Fixed the Grainline tab in detail dialog and also length/rotation formulas checking
...
--HG--
branch : feature
2016-10-06 23:39:57 +02:00
BojanKverh
b755762aec
Merged develop into feature
...
--HG--
branch : feature
2016-10-05 20:27:57 +02:00