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

2257 Commits

Author SHA1 Message Date
Roman Telezhynskyi
b6506b2cae Wrong defining QLoggingCategory. 
--HG--
branch : develop
 2015-11-27 14:04:23 +02:00
Roman Telezhynskyi
97d60004f6 Update debian files. 
--HG--
branch : develop
 2015-11-26 15:00:04 +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
af1c40e027 Merge 
--HG--
branch : develop
 2015-11-25 15:47:51 +02:00
Roman Telezhynskyi
1e5fd5e28d Merge 
--HG--
branch : develop
 2015-11-25 15:45:54 +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
58d2410f11 Do not close application when can't open recent file if we have GUI mode 
--HG--
branch : feature
 2015-11-25 13:46:36 +02:00
Valentina Zhuravska
3d5e8c211d Move 'drawMode = false' inside to 'if' statement 
--HG--
branch : feature
 2015-11-25 11:52:50 +02:00
Roman Telezhynskyi
2bd5a22218 Fixed memory leak. 
--HG--
branch : develop
 2015-11-25 11:30:02 +02:00
Valentina Zhuravska
2fbd01d89a Correct save of currentDrawIndex 
--HG--
branch : feature
 2015-11-25 04:29:12 +02:00
Roman Telezhynskyi
8f47af2c56 GCC warning. 
--HG--
branch : develop
 2015-11-22 19:45:20 +02:00
Roman Telezhinskyi
4c3eae4c80 Merged in ValentinaZhuravska/valentina/feature (pull request #78) 
Tests for SumTrapezoids method in VAbstractDetail class

--HG--
branch : develop
 2015-11-22 18:59:07 +02:00
Valentina Zhuravska
88503bb806 Added comments to tests for SumTrapezoids 
--HG--
branch : feature
 2015-11-22 18:56:49 +02:00
Roman Telezhynskyi
b7caafb0c4 Fixed test failure. 
--HG--
branch : develop
 2015-11-22 17:49:36 +02:00
Valentina Zhuravska
56d655f2ff Tests for SumTrapezoids method in VAbstractDetail class 
--HG--
branch : feature
 2015-11-22 17:08:22 +02:00
Roman Telezhynskyi
e8570f9812 Merge 
--HG--
branch : develop
 2015-11-22 17:02:08 +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
Roman Telezhynskyi
0a67af35b3 Don't know why i did this, but this code did not allow change valies of known 
measurement in standard table.

--HG--
branch : develop
 2015-11-22 16:31:31 +02:00
Roman Telezhynskyi
64df6d8095 Standard table must provide 'height'. 
--HG--
branch : develop
 2015-11-22 16:30:06 +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
0e70d335ce Changes for new debian package. 
--HG--
branch : develop
 2015-11-21 19:34:23 +02:00
Roman Telezhynskyi
ccca5c84f3 Improved Tape's description options. 
--HG--
branch : develop
 2015-11-21 15:51:29 +02:00
Roman Telezhynskyi
9e4ead188a Improved description Valentina's options. 
--HG--
branch : develop
 2015-11-21 15:36:22 +02:00
Roman Telezhynskyi
33bf03994e Handling "Open With" from Finder in Mac OS X. 
--HG--
branch : develop
 2015-11-19 17:17:25 +02:00
Roman Telezhynskyi
5604f8eea3 Correct path to Tape. 
--HG--
branch : develop
 2015-11-18 17:36:37 +02:00
Roman Telezhynskyi
42bd8b86f7 We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why 
we must do this manually.

--HG--
branch : develop
 2015-11-18 16:46:36 +02:00
Roman Telezhynskyi
ba19d4e88e Try hide very annoying, Qt related, warnings in Mac OS X. 
--HG--
branch : develop
 2015-11-18 14:54:53 +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
9ce9f45cd3 Fixate size of the Tape 'Config dialog' only after first show. 
--HG--
branch : develop
 2015-11-18 11:03:19 +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
ce80ae4523 Tape show correct placeholder [*] in menu Window. 
--HG--
branch : develop
 2015-11-17 14:49:28 +02:00
Roman Telezhynskyi
dc1b593b4b For correct working menu on Mac OS X use menu roles. 
--HG--
branch : develop
 2015-11-17 14:42:03 +02:00
Roman Telezhynskyi
974a074ffd Fixate size of the 'Config dialog' only after first show. 
--HG--
branch : develop
 2015-11-17 12:54:18 +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
8c8b7d1570 Fixed generation the list of QM files. 
--HG--
branch : develop
 2015-11-17 12:18:46 +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
Roman Telezhynskyi
3a81bebf93 Copy Qt's translations inside app bundle. 
--HG--
branch : develop
 2015-11-16 22:04:34 +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
8eef5db927 Improved app bundle. 
--HG--
branch : develop
 2015-11-16 13:39:46 +02:00
Roman Telezhynskyi
f6582f8627 No bundle for tape on mac. 
--HG--
branch : develop
 2015-11-16 12:39:07 +02:00
Roman Telezhynskyi
e0c98476ca For making app bundle tape must exist before valentina.app will be created. 
--HG--
branch : develop
 2015-11-16 12:36:41 +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
dc0344bbea Run Tape through Valentina. Need for file association on Mac OS X. 
--HG--
branch : develop
 2015-11-16 11:28:58 +02:00
Roman Telezhynskyi
14e3c06833 Improved test TST_QmuParserErrorMsg::TestEErrorCodes(). 
--HG--
branch : develop
 2015-11-15 21:09:52 +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
Roman Telezhynskyi
089e667f48 Scale diagrams according to screen resolution. 
--HG--
branch : develop
 2015-11-15 17:48:48 +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
Roman Telezhynskyi
428175944e New test cases. 
--HG--
branch : develop
 2015-11-12 13:06:14 +02:00
Roman Telezhynskyi
b28cc36188 Tape.exe. New option "Check all/Uncheck all". 
--HG--
branch : develop
 2015-11-12 12:47:00 +02:00
Roman Telezhynskyi
4beed02320 Updated VIT template with all measurements. 
--HG--
branch : develop
 2015-11-12 10:48:01 +02:00
Roman Telezhynskyi
e79d21e06d Updated test VIT and VST test files. 
--HG--
branch : develop
 2015-11-12 10:42:28 +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
0838cf2817 Updated GOST table, removed empty measurements. 
--HG--
branch : develop
 2015-11-11 16:50:07 +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
Roman Telezhynskyi
161f1bd61c Fiexed diagram for measurements (A18) height_neck_back_to_knee and 
(A20) height_waist_side_to_hip.

--HG--
branch : feature
 2015-11-11 10:49:12 +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
779117a34f Fixed files without license header. 
--HG--
branch : develop
 2015-11-09 20:11:06 +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
9c38e65b45 Fixed size of the "Legal" paper format. 
--HG--
branch : develop
 2015-11-09 17:56:54 +02:00
Roman Telezhynskyi
39f7994f1b Command line options for dealing with margins. 
--HG--
branch : feature
 2015-11-09 17:52:38 +02:00
Roman Telezhynskyi
01a23b5e08 Keep order of options. 
--HG--
branch : feature
 2015-11-09 17:23:15 +02:00
Roman Telezhynskyi
e7e177898c Each time when set paper size first try to find predefined template size. This 
will help user undertand what paper size is setted now.

--HG--
branch : feature
 2015-11-09 14:29:37 +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
9a865ab72d Merge with develop 
--HG--
branch : feature
 2015-11-09 13:36:36 +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
Valentina Zhuravska
bfc6a525ed Fixed print on Windows 
--HG--
branch : develop
 2015-11-06 17:42:52 +02:00
Roman Telezhinskyi
7eb7cddea9 Merged in ValentinaZhuravska/valentina/feature (pull request #71) 
Resolved issue #397

--HG--
branch : develop
 2015-11-06 16:08:41 +02:00
Valentina Zhuravska
0c23f86886 UpdateWindowTitle at the end of MeasurementsChanged method 
--HG--
branch : feature
 2015-11-06 16:06:32 +02:00
Valentina Zhuravska
fa032fced2 Fixed GetMeasurementFileName 
--HG--
branch : feature
 2015-11-06 15:52:58 +02:00
Valentina Zhuravska
76f4753773 UpdateWindowTitle in one string 
--HG--
branch : feature
 2015-11-06 05:31:37 +02:00
Roman Telezhynskyi
f632ef6480 New paper size template - "custom". Appers if change height or width. The 
program also test each size and show appropriate template from the list.

--HG--
branch : develop
 2015-11-05 20:04:09 +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
840a4a9d92 Fixed crash after language change. 
--HG--
branch : develop
 2015-11-05 14:06:45 +02:00
Roman Telezhynskyi
f4aabbcf06 Disable changing window size only after first. 
--HG--
branch : develop
 2015-11-05 13:54:15 +02:00
Roman Telezhynskyi
8b6d8aee70 Before setting a layout settings need to set units. 
--HG--
branch : develop
 2015-11-05 13:25:44 +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
Valentina Zhuravska
aba82baa98 Fixed issue #397. Added UpdateWindowTitle 
--HG--
branch : feature
 2015-11-04 07:06:44 +02:00
Roman Telezhynskyi
8d6c007217 Tooltipe for tool TrueDarts. 
--HG--
branch : develop
 2015-11-03 22:36:44 +02:00
Roman Telezhynskyi
a5345946bb Show more data about failed test. 
--HG--
branch : develop
 2015-11-03 22:28:53 +02:00
Roman Telezhynskyi
18a3a289ff New test. Each translated measurement name should be unique. 
--HG--
branch : develop
 2015-11-03 18:19:52 +02:00
Roman Telezhynskyi
00a4187eda Set start position for base point according to items bounding rect. 
--HG--
branch : develop
 2015-11-03 17:54:44 +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
Valentina Zhuravska
5b9914f409 Merge 
--HG--
branch : feature
 2015-11-02 16:30:28 +04: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
Valentina Zhuravska
1d9af2dcc0 Resolved issue #397. Display the currently open measurement file name in the top menu of Valentina 
--HG--
branch : feature
 2015-10-31 05:44:21 +02:00
Roman Telezhynskyi
80ff422a39 Separate file for localization files. 
--HG--
branch : develop
 2015-10-30 13:05:44 +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
c989a2b00e Try fix issue "Problem to export the pattern". 
--HG--
branch : develop
 2015-10-29 10:14:34 +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
3558d634c0 Improved documentation. 
--HG--
branch : develop
 2015-10-26 16:24:17 +02:00
Roman Telezhynskyi
3282652be7 Updated standard table and template file. 
--HG--
branch : develop
 2015-10-26 16:23:46 +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
7102071b19 Test VLockGuard. 
--HG--
branch : develop
 2015-10-26 10:31:36 +02:00
Roman Telezhynskyi
1e99d00a54 Hide lock file. 
--HG--
branch : develop
 2015-10-26 09:57:20 +02:00
Roman Telezhynskyi
c6e18b8565 No need anymore run qmake twice. 
--HG--
branch : develop
 2015-10-25 18:09:24 +02:00
Roman Telezhynskyi
c3aba113a2 Use the -rpath linker option to set the .so search path. 
--HG--
branch : develop
 2015-10-24 23:06:16 +03: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
1af1283ed4 Resolved issue #396. Layout printing is incorrect size. 
--HG--
branch : develop
 2015-10-23 08:27:47 +03:00
Roman Telezhynskyi
bcbb7e66d2 Skip part about NSIS if was not installed. 
--HG--
branch : develop
 2015-10-22 17:50:42 +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
a7f656a412 Alwayse deploy QM files to test directory. 
--HG--
branch : develop
 2015-10-21 12:35:52 +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
2be2c00521 Force qmake to update QM files. 
--HG--
branch : develop
 2015-10-20 08:58:17 +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
66a7581bbb Erased unwanted row in pathTable 
--HG--
branch : feature
 2015-10-18 16:25:39 +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
37f11e732d Check that $TOK$ and $POS$ there are in translated strings. 
--HG--
branch : develop
 2015-10-16 14:55:23 +03:00
Roman Telezhynskyi
93d63ef8ca Two new tests. Check if empty standard/individual measurement file is valid. 
--HG--
branch : develop
 2015-10-16 11:13:23 +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
ba9407bcb5 Curl.exe is part of crash report tools. 
--HG--
branch : develop
 2015-10-14 16:21:23 +03:00
Roman Telezhynskyi
3c949e5cc5 First template with all measurements. 
--HG--
branch : develop
 2015-10-14 16:03:36 +03:00
Roman Telezhynskyi
7cd6f7eb44 Updated standard table. 
--HG--
branch : develop
 2015-10-14 15:34:33 +03:00
Roman Telezhynskyi
8388529ad6 Forgot to set aliases. 
--HG--
branch : develop
 2015-10-14 14:39:44 +03:00
Roman Telezhynskyi
8c7c7a9550 CONFIG+=noCrashReports. 
--HG--
branch : develop
 2015-10-14 14:12:38 +03:00
Roman Telezhynskyi
fa7cb935cb Tape's logo on macx. 
--HG--
branch : develop
 2015-10-14 13:56:53 +03:00
Roman Telezhynskyi
6bdd2c808e Missed icons. 
--HG--
branch : develop
 2015-10-14 13:49:20 +03:00
Roman Telezhynskyi
f0d87ef440 Prerape Windows installer. 
--HG--
branch : develop
 2015-10-14 13:06:50 +03:00
Roman Telezhynskyi
9a4b9ad106 Remove lock from template. 
--HG--
branch : develop
 2015-10-13 16:45:03 +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
b14f1db74d lupdate. Several tooltipes. 
--HG--
branch : develop
 2015-10-12 18:16:12 +03:00
Roman Telezhynskyi
1989c0289e Resolved issue #384. Change tooltip for Tape.exe, 'Add Known', f(x) button. 
--HG--
branch : develop
 2015-10-12 18:10:31 +03:00
Roman Telezhynskyi
90a3400efc Resolved issue #374. Change tooltip for Tape.exe, 'Add Known', 'Delete' [-] 
button.

--HG--
branch : develop
 2015-10-12 18:08:25 +03:00
Roman Telezhynskyi
d1b6c90a01 Resolved issue #375. Improve cursor placement after deleting a measurement in 
Tape.exe.

--HG--
branch : develop
 2015-10-12 18:05:53 +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
8b6dbc0463 Fixed Issue #372 (bug when running Valentina from commandline). 
--HG--
branch : develop
 2015-10-12 10:38:48 +03:00
Valentina Zhuravska
fc39c52b79 Fixed Issue #372 (bug when running Valentina from commandline) 
--HG--
branch : develop
 2015-10-12 06:28:17 +03:00
Roman Telezhynskyi
7ef6cfa660 Typo. Lupdate. 
--HG--
branch : develop
 2015-10-11 22:14:19 +03:00
Roman Telezhynskyi
aa0042cc60 Typo. Lupdate. 
--HG--
branch : develop
 2015-10-11 22:07:51 +03:00
Roman Telezhynskyi
14f1b84bc3 Typo. 
--HG--
branch : develop
 2015-10-11 21:42:13 +03:00
Roman Telezhynskyi
47b2d03304 "make install" on Windows supports only MinGW. 
--HG--
branch : develop
 2015-10-11 20:30:16 +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
9e69b03a1b Merge 
--HG--
branch : develop
 2015-10-11 12:06:31 +03:00
Roman Telezhynskyi
a4b2bb905f Fixed crash on Windows. 
--HG--
branch : develop
 2015-10-11 12:06:14 +03:00
Valentina Zhuravska
2fe176c40d Fixed pdftops error in Windows 
--HG--
branch : develop
 2015-10-11 00:25:46 +03:00
Valentina Zhuravska
b46e384ca7 Fixed warnings in Windows 
--HG--
branch : develop
 2015-10-10 04:49:10 +03:00
Roman Telezhynskyi
b3a7063a9b GCC warnings. 
--HG--
branch : develop
 2015-10-09 20:26:53 +03:00
Roman Telezhynskyi
c1976401a0 Use CONFIG += silent in release mode. 
--HG--
branch : develop
 2015-10-09 20:22:49 +03:00
Roman Telezhynskyi
c92699abf3 Fixed build problem on Win. 
--HG--
branch : develop
 2015-10-09 19:52:56 +03:00
Valentina Zhuravska
9873df47ae Merged dismine/valentina into develop 
--HG--
branch : develop
 2015-10-09 14:19:00 +03:00
Valentina Zhuravska
a233923587 Fixed build problem on Win 
--HG--
branch : develop
 2015-10-09 14:17:24 +03:00
Roman Telezhynskyi
aeb0140688 Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-09 13:16:37 +03:00
Roman Telezhynskyi
e6e8a7ff6d Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-09 12:50:37 +03:00
Roman Telezhynskyi
894444297b Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 21:33:43 +03:00
Roman Telezhynskyi
026804bc37 Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 21:11:50 +03:00
Roman Telezhynskyi
64e07c405a Fix for build on drone.io. 
--HG--
branch : develop
 2015-10-08 20:45:26 +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
daa9f9fbea Show tooltip "author name" and "book name". 
--HG--
branch : develop
 2015-10-08 18:21:12 +03:00
Roman Telezhynskyi
85d088179b Fixed bug with resizing QListWidget (black space). 
--HG--
branch : develop
 2015-10-08 18:20:01 +03:00
Roman Telezhynskyi
0e5cb30801 Context menu "Collapse All" and "Expand All". 
--HG--
branch : develop
 2015-10-08 16:20:07 +03:00
Roman Telezhynskyi
7649ac5f6f Expend by default all groups. 
--HG--
branch : develop
 2015-10-08 14:10:56 +03:00
Roman Telezhynskyi
6533579b52 Measurement database keyboard navigation. 
--HG--
branch : develop
 2015-10-08 13:59:24 +03:00
Roman Telezhynskyi
758fbc714f Force user to save new file after openning a template file. 
--HG--
branch : develop
 2015-10-08 12:57:00 +03:00
Roman Telezhynskyi
d7e9f8cb8b Refactoring. 
--HG--
branch : develop
 2015-10-08 09:49:20 +03:00
Roman Telezhynskyi
7ed0f2760b Don't ignore broken xml data. 
--HG--
branch : develop
 2015-10-08 09:43:29 +03:00
Roman Telezhynskyi
2a742497ea Fixed unit test. 
--HG--
branch : develop
 2015-10-08 09:31:22 +03:00
Roman Telezhynskyi
a43e852977 Show error message if got unknown object type. 
--HG--
branch : develop
 2015-10-08 09:30:26 +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
003849649f New test case. Wrong object type. 
--HG--
branch : develop
 2015-10-07 21:50:40 +03:00
Roman Telezhynskyi
bda38a978f * The default option (blank field or 'None') should appear at the top of the 
list.
* The list should be sorted alphabetically so users can find their system
easily.
* 'None' would be in the middle of an alphabetically sorted list.

--HG--
branch : develop
 2015-10-07 21:09:50 +03:00
Roman Telezhynskyi
951f6f2f4e First check if key was setted. 
--HG--
branch : develop
 2015-10-07 20:59:52 +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
4d21fa8a5b Code style. 
--HG--
branch : develop
 2015-10-07 19:36:41 +03:00
Roman Telezhynskyi
719598b97b Refactoring validating size and height value. 
--HG--
branch : develop
 2015-10-07 19:34:46 +03:00
Roman Telezhynskyi
defbdb8e9c New keys "gsize" and "gheight". 
--HG--
branch : develop
 2015-10-07 18:28:51 +03:00
Roman Telezhynskyi
afce2cb0ba Correct update measurements. 
--HG--
branch : develop
 2015-10-07 16:58:00 +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
61178e64de Remember cursor position and return focus to the formula field. 
--HG--
branch : develop
 2015-10-05 16:52:18 +03:00
Roman Telezhynskyi
67240af260 Changes in command line options. New key "basename" and "destination". 
--HG--
branch : develop
 2015-10-05 16:08:26 +03:00
Roman Telezhynskyi
7eff8e8b9c Immediately exit in console mode. 
--HG--
branch : develop
 2015-10-05 12:56:43 +03:00
Roman Telezhynskyi
bd2e1063e3 Return empty string if relative path to measurements is empty. 
--HG--
branch : develop
 2015-10-05 11:58:54 +03:00
Roman Telezhynskyi
852bd63fe1 Class for testing run valentina.exe. 
--HG--
branch : develop
 2015-10-04 15:20:12 +03:00
Roman Telezhynskyi
f310c6a479 Test mode for Valentina.exe. 
--HG--
branch : develop
 2015-10-03 20:27:27 +03:00
Roman Telezhynskyi
693dd7a06e Fixed Tape client/server work. Disable client/server work in test mode. 
--HG--
branch : develop
 2015-10-03 17:16:28 +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
ac32dbc143 Use correct an exit code. 
--HG--
branch : develop
 2015-10-03 14:10:58 +03:00
Roman Telezhynskyi
ed156d3d57 Testing Tape.exe. More test cases. 
--HG--
branch : develop
 2015-10-03 14:09:06 +03:00
Valentina Zhuravska
29cd62e5ef Fixed windows build (erased unwanted bracket) 
--HG--
branch : develop
 2015-10-03 07:50:38 +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
b5000e5fae Make variable const. 
--HG--
branch : develop
 2015-10-03 01:44:44 +03:00
Roman Telezhynskyi
f607e37168 Fixed crash. 
--HG--
branch : develop
 2015-10-03 01:38:50 +03:00
Roman Telezhynskyi
1d73547d28 Block signals for QLineEdit in readonly mode because it still emits 
QLineEdit::editingFinished signal.

--HG--
branch : develop
 2015-10-03 01:00:18 +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
2d4086206c Try to check all files. 
--HG--
branch : develop
 2015-10-01 21:41:16 +03:00
Roman Telezhynskyi
30cfa143fe No points to show warnings if we excpect error in test. 
--HG--
branch : develop
 2015-10-01 21:02:14 +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
9069337a7a Convertor error in console mode. 
--HG--
branch : develop
 2015-10-01 18:21:13 +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
00e38fc119 Fixed Windows build. 
--HG--
branch : develop
 2015-09-30 13:58:59 +03:00
Roman Telezhynskyi
f6b6a0bc36 Second try to close issue #373. 
--HG--
branch : develop
 2015-09-29 21:56:46 +03:00
Roman Telezhynskyi
2113f6e7d4 Fixed issue #383. Crash on running Valentina after build. 
--HG--
branch : develop
 2015-09-29 20:12:23 +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
0601b46f87 Resolved issue #381. Add a 'measurement desc' column in Tape, Create/Edit, 
'Add Known' dialog.

--HG--
branch : develop
 2015-09-29 18:46:00 +03:00
Roman Telezhynskyi
e6fec09905 Fixed issue #379. Crash in Tape, Create/Edit when '(' in Formula field then 
click f(x).

--HG--
branch : develop
 2015-09-29 18:09:41 +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
77dd8f0c77 by default for console version use system locale. 
--HG--
branch : develop
 2015-09-28 18:34:29 +03:00
Roman Telezhynskyi
e236757d57 Test openning measurement files. 
--HG--
branch : develop
 2015-09-28 13:42:26 +03:00
Roman Telezhynskyi
25561858f0 Check known names after conversion. 
--HG--
branch : develop
 2015-09-25 13:45:58 +03:00
Roman Telezhynskyi
96f1f63fa4 Fixed issue #373. Incorrect groupnames in Tape.exe, 'Add Known'. 
--HG--
branch : develop
 2015-09-25 11:16:25 +03:00
Roman Telezhynskyi
6bbb0c531f Remove the file individual.vit. 
--HG--
branch : develop
 2015-09-23 17:38:46 +03:00
Roman Telezhynskyi
640202da5f Pass correct path to measurements in a pattern file. 
--HG--
branch : develop
 2015-09-23 13:11:19 +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