From 8aff83d2a20895e5a373c85c7b77b5adc0a949a7 Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sat, 11 Apr 2020 10:43:47 +0200 Subject: [PATCH] icons and structure main window --- src/app/puzzle/puzzlemainwindow.h | 1 + src/app/puzzle/puzzlemainwindow.ui | 109 +++++++++++++++++- src/app/puzzle/share/resources/puzzleicon.qrc | 4 + .../puzzleicon/64x64/iconCurrentPiece.png | Bin 0 -> 1355 bytes .../resources/puzzleicon/64x64/iconLayers.png | Bin 0 -> 827 bytes .../resources/puzzleicon/64x64/iconLayout.png | Bin 0 -> 736 bytes .../resources/puzzleicon/64x64/iconTiles.png | Bin 0 -> 899 bytes 7 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png create mode 100644 src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png diff --git a/src/app/puzzle/puzzlemainwindow.h b/src/app/puzzle/puzzlemainwindow.h index ac1ba0cb6..6cf5977ee 100644 --- a/src/app/puzzle/puzzlemainwindow.h +++ b/src/app/puzzle/puzzlemainwindow.h @@ -51,6 +51,7 @@ private: void InitMenuBar(); +private slots: void New(); void Open(); void Save(); diff --git a/src/app/puzzle/puzzlemainwindow.ui b/src/app/puzzle/puzzlemainwindow.ui index 0dee51b58..55b7f1b95 100644 --- a/src/app/puzzle/puzzlemainwindow.ui +++ b/src/app/puzzle/puzzlemainwindow.ui @@ -13,7 +13,86 @@ PuzzleMainWindow - + + + true + + + Qt::LeftToRight + + + + QLayout::SetDefaultConstraint + + + + + + + + + 0 + 0 + + + + + 320 + 0 + + + + QTabWidget::Rounded + + + 0 + + + + 32 + 32 + + + + + + :/puzzleicon/64x64/iconCurrentPiece.png:/puzzleicon/64x64/iconCurrentPiece.png + + + + + + + + + :/puzzleicon/64x64/iconLayout.png:/puzzleicon/64x64/iconLayout.png + + + + + + + + + :/puzzleicon/64x64/iconTiles.png:/puzzleicon/64x64/iconTiles.png + + + + + + + + + :/puzzleicon/64x64/iconLayers.png:/puzzleicon/64x64/iconLayers.png + + + + + + + + + @@ -69,6 +148,27 @@ + + + + 160 + 160 + + + + QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable + + + Qt::AllDockWidgetAreas + + + Piece Carrousel + + + 1 + + + Open @@ -108,7 +208,8 @@ true - + + .. E&xit @@ -137,6 +238,8 @@ - + + + diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc index 871f678c4..563bb83a4 100644 --- a/src/app/puzzle/share/resources/puzzleicon.qrc +++ b/src/app/puzzle/share/resources/puzzleicon.qrc @@ -1,5 +1,9 @@ puzzleicon/64x64/logo.png + puzzleicon/64x64/iconLayout.png + puzzleicon/64x64/iconCurrentPiece.png + puzzleicon/64x64/iconLayers.png + puzzleicon/64x64/iconTiles.png diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png new file mode 100644 index 0000000000000000000000000000000000000000..0e12bb4433f7a051208c296444e31067a8e9b4b0 GIT binary patch literal 1355 zcmV-R1+@B!P)EX>4Tx04R}tkv&MmP!xqv(@Kk09PFUtkfAzR5EXIMDionYs1;guFnQ@8G-*g$ zTpR`0f`dPcRR6lU)^quLz(AA*w-{S;m|sCE>Zg?&0J6U5saW-}`g*syT}RK9P8q8D^DugLrzg zYH;2sj7IPWeK{ zWtH<5XRTagtv>k+!#RCrnd?-;NMI35kRU=q4JDLOMT~Zx6bmUjk9+us9KS>^g4!CxZD8-o($QP9m!86k8{ps& z7%foty2raiopby5PHTQY{daPB$6l&&00006VoOIv0Q3M$08806x7z>!010qNS#tmY z4c7nw4c7reD4Tcy000McNliru~>zvq3wJBS_g$Oha39sw@kGm_{g z@C--;qO^Vhm(Fw1H-M)=s;p?y)YK$eTU)iyOMv4%72O3yfiLAnd%a#UIyx%m=H|rV z;h{*U)1tY#S^NGKpwx5G*MUeW&!1cet!tWfiQ5V6rn4?W#B?-xs5LTF|biy zwA<|#fj~gSVlk1+<;4GLZEa2T_4SGJbN*pHsC4wyO0R*S)9GYzaFAdy$k5ObKA*4Z z6R)nWGCx1h%E}6xo15(H?2yf7IX*rnm&<8~g-Vndrd~k!e7=hAcBL8^7|;j^RdUg_ z?66C~r))Nhs;auVt|&@XwbXjV%mTz>G5xlWHd|G3uC)PifW^f{_V@RtB;YIXu}~ba!`4IR?i8Mn*=k+wIbg z!K=VMMNycTn2_>?$aBCR2n1+vZ`b>Uh~Wf`19x367tv@Gy<`>w?gK9YB9RDfZEd<4 zU^D@K;02%p&atsECMPG+Q$`XnTYBz)2q@ujn3&*c6MTvjEsQ&%mo;tY9psq`&$zkph#(ekr6PP0X8cF76BFkRuhz& z04oAk6V%xNo9sQnR*SuOJ@RK$NL&2d|M~P3?RNVw;%uj N002ovPDHLkV1m+PUVZ=o literal 0 HcmV?d00001 diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png new file mode 100644 index 0000000000000000000000000000000000000000..2f36eba4db6f39e1cc77ec0d51f188d0cd737184 GIT binary patch literal 827 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_9rad9I`qK)SEW}W75LY#WAGf*4taQS*;Ed ztq+Y2AH*>+nkOW`j0@V?7JX|*&T(6fNynU|J8z_LPkz<3HhG=#ol1U=s24o^_aB^J zJ~2f!?99~Wy&9kP+$(>zD{NY7oZ7|GxvN%v;+~K?vujbuI;KVOOhCIq;K1YuAJ@EI zb^Gl%{mBv2QtN*_wNmx;6W%l_=k~U59&L#mz85p!+^4^`q4w0KkXg&(yeej?eXXs3 zCAC~T;kMapZQsjtRx!MTnFcZPdxLkc}*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_9rad96XlulwCZ5LU%n~978H@y}hl-cgR7Y z_2G6_*6WUn83GpPnw1tN?Bv^*DUiXp`NUkSn47**N4EU;zScW4|F~VIMX$>26T5kJ zcZR5ihHADb^cxy4olaxwnoB{jeU-8{8WVr7=;mK1zpCGL{x@$lwc)I$ztaD0e0s!j-ALRf5 literal 0 HcmV?d00001 diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png new file mode 100644 index 0000000000000000000000000000000000000000..ee3099a77c9a1e3bc9df5cb1dd0a91469f1fe858 GIT binary patch literal 899 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_9rad9I|ZHbG%Z3G1=hh;uunK>+S80S%(~C zj(=Q#QNcoE*Hpfy3+*p1H2n&&^3djGt7ST9URbcwIXrw}z=i~KR~hL^e7P&P+-ja< zzU5zCK}*3&)$cneJmhC@zsx$R{?a=>U!!)#dCw=FOeqlj|M*AOY!y!@nd2+pzi09k zVCmd^pt^WU-1_uCOg4TtOacuIED8*a91aXfOm*>O-w#DrtzJjpM!%7^?@HLcRqETS ziyPQKEatfOddmIj>`Q}AEj{VDGlx~+=RVs5wR_KfO?i~|)PD8Z)l(-wls_bJEcq`p zrnw+1%97V`%+;N4ASL^KWg*Y(v)6wnJV+^e-rZ_@;Ajos;f1$TGq%s=iOx2A%Q$a! zXvWsMG7+u`=jGEM{jJ;edvm0Q7=M}lxwM28=~9gIvP@r;+*$X>?t$_XRi3ZHBG~-G z^kd%rGS~9P=;^bU$EK%$E@8OyX7{lOq0KjI|B8QNoBG7Cl