From e72c54318a542ab67f148fcd0c1a76157454ec3a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 14 Jul 2015 19:28:50 +0300 Subject: [PATCH] New actions. --HG-- branch : feature --- src/app/tape/share/resources/tapeicon.qrc | 4 + .../resources/tapeicon/24x24/orange_plus.png | Bin 0 -> 355 bytes .../tapeicon/24x24/padlock_locked.png | Bin 0 -> 375 bytes .../tapeicon/24x24/padlock_opened.png | Bin 0 -> 385 bytes .../resources/tapeicon/24x24/red_plus.png | Bin 0 -> 383 bytes src/app/tape/tmainwindow.cpp | 4 + src/app/tape/tmainwindow.ui | 212 ++++++++++++++++-- src/app/valentina/dialogs/dialogincrements.ui | 6 +- .../win.icon.theme/16x16/actions/go-down.png | Bin 756 -> 828 bytes .../win.icon.theme/16x16/actions/go-up.png | Bin 0 -> 816 bytes .../win.icon.theme/24x24/actions/go-up.png | Bin 0 -> 1459 bytes .../win.icon.theme/32x32/actions/go-up.png | Bin 0 -> 2277 bytes src/libs/vmisc/share/resources/theme.qrc | 3 + 13 files changed, 205 insertions(+), 24 deletions(-) create mode 100644 src/app/tape/share/resources/tapeicon/24x24/orange_plus.png create mode 100644 src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png create mode 100644 src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png create mode 100644 src/app/tape/share/resources/tapeicon/24x24/red_plus.png mode change 100644 => 100755 src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png create mode 100755 src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png create mode 100755 src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png create mode 100755 src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png diff --git a/src/app/tape/share/resources/tapeicon.qrc b/src/app/tape/share/resources/tapeicon.qrc index 24fdeb957..0c85d664d 100644 --- a/src/app/tape/share/resources/tapeicon.qrc +++ b/src/app/tape/share/resources/tapeicon.qrc @@ -5,5 +5,9 @@ tapeicon/16x16/measurement.png tapeicon/24x24/equal.png tapeicon/24x24/fx.png + tapeicon/24x24/orange_plus.png + tapeicon/24x24/red_plus.png + tapeicon/24x24/padlock_locked.png + tapeicon/24x24/padlock_opened.png diff --git a/src/app/tape/share/resources/tapeicon/24x24/orange_plus.png b/src/app/tape/share/resources/tapeicon/24x24/orange_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..b5361b547b9cc8116a6062f304016302c27968a0 GIT binary patch literal 355 zcmV-p0i6DcP)^O<8Qz{iB0v;)$VimV?Z9!T~|Iz@%!$g1K&dX z{~#hFE!|RUy6g&ws_h@q9~hVc@mSUW^gRr<@E^*4iM<;rEP4O{002ovPDHLkV1itA Bn9~3N literal 0 HcmV?d00001 diff --git a/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png b/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png new file mode 100644 index 0000000000000000000000000000000000000000..7a25deb3a06a6649cc50366a63530b2db3a3a2a4 GIT binary patch literal 375 zcmV--0f_#IP))nj^P0li30zr?)U5{2=+yrP_unkCX&HiCH5=&cR+sWFJP z@e+e2IK!j#SY}U1S9+nc-ZgrZJ2=No46vyD#VYcZp=h>lVOf4+Neu9xk zzbpC=_*;N%t9Zcigml}(!Bi%gU`f2~j{DMnFz(~Zpq*y{4e4L0Re8N%?HX%Cz$aAY VZdr>Fv@`$!002ovPDHLkV1fwpu3G>A literal 0 HcmV?d00001 diff --git a/src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png b/src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png new file mode 100644 index 0000000000000000000000000000000000000000..588e13cdce395e009e85cf926603a26964e6bb25 GIT binary patch literal 385 zcmV-{0e=38P)(=-~VIG45fP@t~;S8DVf fZznFXmpgjG;~=cmXewNwS066dA#d=dgB&E1&L=LLvp~D1kn^3>twv;eX-t z6B3;0yWK&N6DS~nB1l{v-_Q4-t@_{*fCPd42+Kqgsr>pk?*)xCi}kptc;OP1Korm< z*^>l1fv6!8NP<005Id*^e3)SFVBXP5Br49J!bPLjlHhFaN9eoV0VIqtnp|$&-o}@g zzyfXGHRN8)@AlHBmv313wxyf3z)$-1wL16$Cnf-0U

labelMType->setText(tr("Standard measurements")); + // Tab Measurements delete ui->labelValue; delete ui->horizontalLayoutValue; @@ -189,6 +191,8 @@ void TMainWindow::InitNew(MeasurementsType type) } else { + ui->labelMType->setText(tr("Individual measurements")); + // Tab Measurements delete ui->labelBaseValue; delete ui->doubleSpinBoxBaseValue; diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index 5e4b3423a..0346fc15b 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -6,12 +6,12 @@ 0 0 - 599 - 569 + 536 + 694 - TMainWindow + @@ -28,6 +28,9 @@ + + Remove measurement + 0 @@ -121,28 +124,28 @@ Details - + Name: - + false - + Value: - + @@ -261,56 +264,56 @@ - + Base value: - + false - + In sizes: - + false - + In heights: - + false - + Description: - + false @@ -323,6 +326,59 @@ + + + + + + false + + + Move measurement up + + + ... + + + + + + + + + + false + + + Move measurement down + + + ... + + + + + + + + + + + + + + false + + + ... + + + + + + + + @@ -345,7 +401,7 @@ - + Measurement type @@ -372,6 +428,9 @@ + + false + Show in folder @@ -415,7 +474,11 @@ - + + + false + + @@ -425,7 +488,11 @@ - + + + false + + @@ -436,6 +503,9 @@ + + false + yyyy-MM-dd @@ -449,7 +519,11 @@ - + + + false + + @@ -459,7 +533,11 @@ - + + + false + + @@ -470,6 +548,9 @@ + + false + 0 @@ -489,7 +570,7 @@ 0 0 - 599 + 536 25 @@ -503,6 +584,8 @@ + + @@ -528,30 +611,68 @@ + + true + + + Qt::ToolButtonTextUnderIcon + TopToolBarArea false + + + + + + + + + + + Open ... + + false + + + + + + Save + + false + + + + + + Save As ... + + + + + Quit @@ -562,15 +683,64 @@ + + + + + About Tape + + + + + New + + + false + + + + :/tapeicon/24x24/red_plus.png:/tapeicon/24x24/red_plus.png + + + Add known + + + + + false + + + + :/tapeicon/24x24/orange_plus.png:/tapeicon/24x24/orange_plus.png + + + Add custom + + + + + true + + + false + + + + :/tapeicon/24x24/padlock_opened.png:/tapeicon/24x24/padlock_opened.png + + + Read only + + diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index 4afd8c90a..45c72deec 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -39,7 +39,7 @@ QTabWidget::North - 0 + 1 @@ -118,8 +118,8 @@ 0 0 - 939 - 411 + 559 + 82 diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png old mode 100644 new mode 100755 index a74287892e3a8b6135f8c7239530e962021fdb49..9b310604906c0f968a3278b3c1501099b922c755 GIT binary patch delta 780 zcmV+n1M~d!1-u53Bnkm@Qb$4nuFf3kks%y^3ljhU3ljkVnw%H_000McNliru*#`;@ z5ew+6viJZ10=!8?K~y-)eUnRUOmP&(fA_jG?v&{mjj2bGMhx|;M@5L0NQ5Zj(FKdH z2+<}aRvtSGVO0c?MkSv0NC*{#h=hA*GhFnQkg;i^LC0T)fo%7!KuKxFSZI;MDlHO}je^r>dcB#>O;UTsK#tC=#kF zGa=}usqsh8#&yTTP@@6Ja2J5OYddd$jSF}}kxq?Br$$Go#=O~igo}N2L^V3QbiPG? zv7ppnbgJgS)m+p2D6kESut>Mp8CXL zUPm>mwiZ$}(M#?AnYaQ35_S7$vaHz0=RSkO*ZWu#&SR)smxh-JO`m_ZCM_2$Ut!hh zC@IZh`3x1$7>RsUW@WLDSlVWP_4zKC=%KmK;7h`6`AhKT#+RFg)5bzTp<9+HtB;d1 zT!hHoyZ4vF(mQbystiGoaQq7C=keRa1do7XR}fGT zS?85o|L|Z=2jzcMSU+q}sOo|Cvtu47#GGDTl2J{7xB#|*0e-d;601|Wo-ew^k7{;HoX_O0{ zw{qFkjBFJ;luaVCq(uFYXi@7TWknW=reGzhQIk=Lre%qjtP~Sc!%!(NjQr5eyrh## zBl}?Fm2}>xoBrQEjIEaVz30=*InQ~{?|sh!{*g~min&fNC<}^Cf5?gxKPRIg1FB!_!3o53xPe>ejB3wEa>5$awhNcu;XB6#yXKliK5}CPH*0 zhkZq4l02@Cjw+itf7OF_uD)%M4qtqF&vYpd04j=92n{?CyHl08d2D=|;O5C-EijW2 z2t!&O`!O-hbl;Um@)6tQq)L0P)QMQ*#Ckjn83pVvh9>Ps3N@ zhRFEL;{ae~GKK9GC+K;AZfYFIs1w3~KLoDMHt_clf*Cl>f9ed(*>(lG`vvY61fx^< zU`2pIZ$MdcI6Pd%=73P2wYV8AgQML_@OX^$9Kl7n$hUk)+u*dsF`_LmbsXYe5fKr$ zxIi3d9AsvB7adG$q});sS5nhMkMg8e76kM&`F2ZA6|}PeY#hOMrGxSKU<|lb{t5NX z{qS68OMX%pfA+TH`@7TUH47=(72pHFCFOkthbZP(X&w3;HhD)3ed{Gmjxl9&9u3cM zOfv}b60K$dey*&!djOg7fo=fsx}nlYkZ~;*!6!2CRg+)5P?8fRnw(XYC_S z2;A<@WHNWCI|th8Dytm30r_%rdq^BoMAwJSZi*^FGVN3-!BVYSR2qmL4(r sPF=0Svbu2n@$#GAH}LFDFa9t622fxUC?>4nz5oCK07*qoM6N<$g4_m5p8x;= diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png new file mode 100755 index 0000000000000000000000000000000000000000..eab659e798c8abc381b674e8fe0ccc072647c26d GIT binary patch literal 816 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 literal 0 HcmV?d00001 diff --git a/src/libs/vmisc/share/resources/theme.qrc b/src/libs/vmisc/share/resources/theme.qrc index f89a5ca50..12f35f3b4 100644 --- a/src/libs/vmisc/share/resources/theme.qrc +++ b/src/libs/vmisc/share/resources/theme.qrc @@ -68,5 +68,8 @@ icons/win.icon.theme/24x24/actions/document-print-preview.png icons/win.icon.theme/32x32/actions/document-print-preview.png icons/win.icon.theme/32x32/emblems/emblem-system.png + icons/win.icon.theme/16x16/actions/go-up.png + icons/win.icon.theme/24x24/actions/go-up.png + icons/win.icon.theme/32x32/actions/go-up.png