From 3b96605ef9a47476dcee1b9d3238cbf36ba2e122 Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sat, 11 Apr 2020 13:28:01 +0200 Subject: [PATCH] layout property and icons --- src/app/puzzle/puzzlemainwindow.ui | 168 +++++++++++++++--- src/app/puzzle/share/resources/puzzleicon.qrc | 2 + .../puzzleicon/64x64/iconLandscape.png | Bin 0 -> 1042 bytes .../puzzleicon/64x64/iconPortrait.png | Bin 0 -> 980 bytes .../puzzleicon/svg/icon_current_piece.svg | 72 ++++++++ .../puzzleicon/svg/icon_landscape.svg | 75 ++++++++ .../resources/puzzleicon/svg/icon_layers.svg | 82 +++++++++ .../resources/puzzleicon/svg/icon_layout.svg | 75 ++++++++ .../puzzleicon/svg/icon_portrait.svg | 75 ++++++++ .../resources/puzzleicon/svg/icon_tiles.svg | 91 ++++++++++ 10 files changed, 612 insertions(+), 28 deletions(-) create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconLandscape.png create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconPortrait.png create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_current_piece.svg create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg create mode 100644 src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg diff --git a/src/app/puzzle/puzzlemainwindow.ui b/src/app/puzzle/puzzlemainwindow.ui index e26640467..9f991ae41 100644 --- a/src/app/puzzle/puzzlemainwindow.ui +++ b/src/app/puzzle/puzzlemainwindow.ui @@ -102,8 +102,8 @@ 0 0 - 316 - 779 + 115 + 41 @@ -208,6 +208,106 @@ Format + + + + + + + Unit + + + + + + + + + + Templates + + + + + + + + + + Width + + + + + + + + + + + + + Length + + + + + + + Orientation + + + + + + + + + Portrait + + + + + + + :/puzzleicon/64x64/iconPortrait.png:/puzzleicon/64x64/iconPortrait.png + + + + 32 + 32 + + + + true + + + + + + + Landscape + + + + + + + :/puzzleicon/64x64/iconLandscape.png:/puzzleicon/64x64/iconLandscape.png + + + + 32 + 32 + + + + + + + + + @@ -216,6 +316,26 @@ Margins + + + + Right: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Top: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -231,7 +351,7 @@ - + Left: @@ -240,16 +360,6 @@ - - - - Right: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -260,16 +370,6 @@ - - - - Top: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -278,7 +378,7 @@ - + Bottom: @@ -366,8 +466,8 @@ 0 0 - 316 - 779 + 98 + 41 @@ -446,8 +546,8 @@ 0 0 - 316 - 779 + 98 + 41 @@ -632,6 +732,18 @@ + + graphicsView + tabWidgetProperties + scrollAreaLayout + doubleSpinBoxLayoutMarginTop + doubleSpinBoxLayoutMarginLeft + doubleSpinBoxLayoutMarginRight + doubleSpinBoxLayoutMarginBottom + scrollAreaCurrentPiece + scrollAreaLayers + scrollAreaTiles + diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc index 563bb83a4..0eb2506df 100644 --- a/src/app/puzzle/share/resources/puzzleicon.qrc +++ b/src/app/puzzle/share/resources/puzzleicon.qrc @@ -5,5 +5,7 @@ puzzleicon/64x64/iconCurrentPiece.png puzzleicon/64x64/iconLayers.png puzzleicon/64x64/iconTiles.png + puzzleicon/64x64/iconLandscape.png + puzzleicon/64x64/iconPortrait.png diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLandscape.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLandscape.png new file mode 100644 index 0000000000000000000000000000000000000000..666d96fa7fcaf8f1b96eff2c442839d362b8e6b6 GIT binary patch literal 1042 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~I{Bb`J1#c2+1T%1_J8No8Qr zm{>c}*5h!1NUQ&4ukJ9JHwzw3SZEa~AX<1uOJt$b3el)igUXlkCYc^lF*2;zo0{#r zL)pdCV`XDl9Y3%iIeF3ZqN~>)ea$T$9}hmQo%8+N!+pOQ76zux5|v;#*_*XYsL*h7 ztZ4Ikjs@(Bs~l%W9-E`0`f%sIcMl)`j_paWy#KrS>nh7`M!Sg>(sZO$sV zr{1?=(Hf!o!u>O^D121DE;{|bg}97ZMcNUc<g~_hHN0)S0hC4tpdBdQVVra^zK=66o4fHdlmO)2hGvN4v~^7roXP zRf8g(1x&n~9<%>%zQ1|vr^&*3K^A-^dvAO@&LMDzbyn%^e|Fp6KI42)&$jN%w*8kF z((F9fZ{PYt@WOW9n3(ORsr))&`5c*w4D_`kkFy&lUb+ zSdtlbQu@II0SVoJZ@Z4~cAi`O`@3Iuo&DePqKe~js|tb9!j|Oi?!xee!JEPRrrGw} zKoQOYkH}(R3|H=O_9rad+ydrvS9N(YFfj3Zx;TbZ+elplWLkCa0~3Qd(eI1=v7AHlS7>*_dGR!>xTuJHD`|tjOb}oDlE-3~Q z9l5vNTl&p;12jZfCLB%rc>X6l$NW4oh56^X6;40>l#^>ABPYo6qi8Zid3ib0iL9+v zCAB6}osTWtTh^PiPdNQ_9*cnBOuyxmeAN0m?#oI4?48T}uW!?}r^jccZ9Z9Hqc+ux zv4-szf3{hjKou9mf{PgjGkrXkUuJmUa4_?(IX^?d`s*KU_^+3;R&dv_&pE-sa3#ys z=KN-(nLG!)AFvCQ``l+01 z|Lw_sU$%RqR?YtV%c}*5h!1NUQ&4ukJ9JHwzw3SZEa~AX<1uOJt$b3el)igUXlkCYc^lF*2;zo0{#r zL)pdCV`XDl9Y3%iIeF3ZqN~>)ea$T$9}hmQo%8+N!+pOQ76zux5|v;#*_*XYsL*h7 ztZ4Ikjs@(Bs~l%W9-E`0`f%sIcMl)`j_paWy#KrS>nh7`M!Sg>(sZO$sV zr{1?=(Hf!o!u>O^D121DE;{|bg}97ZMcNUc<g~_hHN0)S0hC4tpdBdQVVra^zK=66o4fHdlmO)2hGvN4v~^7roXP zRf8g(1x&n~9<%>%zQ1|vr^&*3K^A-^dvAO@&LMDzbyn%^e|Fp6KI42)&$jN%w*8kF z((F9fZ{PYt@WOW9n3(ORsr))&`5c*w4D_`kkFy&lUb+ zSdtlbQu@II0SVoJZ@Z4~cAi`O`@3Iuo&DePqKe~js|tb9!j|Oi?!xee!JEPRrrGw} zKoQOYkH}(R3|H=O_9rad+yc_;i=M3n#^gm$7srr_TW@b0W(y}u zuz$FJmsKc3@riKCiRBt;x+$+h)U{g#Tv(cS99t-KQe|6{#=>I?x)y0#jQd^oJ1Q<_ z*;VqUfNxuJVD{?H?|&Xj{?{+JpZDU@n3h@~AD<_kxYAs~Q|Lm5$(5|F+AaOtf8Nn%3|JW=BQGBvAAkPhF%Hi}hEF!z zH*QQco2{CioqgfxY$ryC%{NWv`h{wVR1>#tU(hOpI7U%c>G z8PXJ95vRd$N&62P!w^X6n5Iq%CR2cvB?MHsf+&Sht359fIQVMhSN zg_k8gZptV74^`V}i7=Gxj{W`nx1PR-{D%!dxz}IcynP$H_c{xI-8Id%Ob3o0ZM}T? za{Q~D+}ubVv9`mBZRe*;v}^Mk%s+1`)jL~e;zQwm4_}{ROo?0;w%YS@$kwR8Z~rB2 zEU2rCJG6Hy%Zlr-&z(D$cSoMD{ny`r^&eedoD*VT6d)hDo>}+wXZ0Wd=czddOn>r; X`^rbUe&3w{jBf@{S3j3^P6 + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg new file mode 100644 index 000000000..444a54033 --- /dev/null +++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_landscape.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg new file mode 100644 index 000000000..ab1385c2d --- /dev/null +++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layers.svg @@ -0,0 +1,82 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg new file mode 100644 index 000000000..993a50de8 --- /dev/null +++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_layout.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg new file mode 100644 index 000000000..cf7971065 --- /dev/null +++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_portrait.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg b/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg new file mode 100644 index 000000000..5ee9a5d0d --- /dev/null +++ b/src/app/puzzle/share/resources/puzzleicon/svg/icon_tiles.svg @@ -0,0 +1,91 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + +