From 731ac567a40258745cf23f680702cc41214647d7 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig <jens.bache-wiig@nokia.com> Date: Tue, 2 Jun 2009 15:26:54 +0200 Subject: [PATCH] Fixes: Improved style sheet design Details: I'm now styling more controls and using a more consistent look for things. To make the tabbar feel more natural I added a web-like point cursor as well a sunken appearance. --- src/plugins/coreplugin/core.qrc | 4 + .../images/welcomemode/arrow-left.png | Bin 0 -> 323 bytes .../images/welcomemode/arrow-right.png | Bin 0 -> 304 bytes .../coreplugin/images/welcomemode/btn_26.png | Bin 621 -> 477 bytes .../images/welcomemode/btn_26_hover.png | Bin 682 -> 430 bytes .../images/welcomemode/btn_26_pressed.png | Bin 0 -> 494 bytes .../images/welcomemode/combobox_arrow.png | Bin 0 -> 333 bytes src/plugins/coreplugin/welcomemode.ui | 355 ++++++++++-------- 8 files changed, 192 insertions(+), 167 deletions(-) create mode 100644 src/plugins/coreplugin/images/welcomemode/arrow-left.png create mode 100644 src/plugins/coreplugin/images/welcomemode/arrow-right.png create mode 100644 src/plugins/coreplugin/images/welcomemode/btn_26_pressed.png create mode 100644 src/plugins/coreplugin/images/welcomemode/combobox_arrow.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index d7e63380272..202ee41db42 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -59,5 +59,9 @@ <file>images/welcomemode/rc_combined.png</file> <file>images/welcomemode/background_center_frame.png</file> <file>images/welcomemode/center_frame_header.png</file> + <file>images/welcomemode/btn_26_pressed.png</file> + <file>images/welcomemode/combobox_arrow.png</file> + <file>images/welcomemode/arrow-left.png</file> + <file>images/welcomemode/arrow-right.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/images/welcomemode/arrow-left.png b/src/plugins/coreplugin/images/welcomemode/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6a29679aec1169d2f61650ebb2dd08f947655172 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)T!3HEZPnf;}NHG=%xjQkeJ16rJ$YD$Jc6VX; z4}uH!E}sk(;VkfoECy;324O~qS#u<Sg6t)pzOL*y*_gOQSbqHQ`34k{EOCt}an8@p zP0cG|a4t$sEJ;mKD9<d(P;mG34G3@K69+1q=jq}YB5}F)ysy{c0EyOz&+GQ~YHBX! z-JZhhCoArrcbIoZqqk5@OZAH&7TIs?MukaUQ5TGB`JcD{-xB9NyZ6erMIx4mvc0~E zAJ$)^yeHwr&Br2oN?(4Qy1DLkNOI1C<DBnruT8za@?gz7M&^578|NIlnf3H@&9~m? zk1y6<{^8+iCBu`PUVHgw%sPkLyQHs&O<n#{A)rfS;r?Ggr`Iv8y(U%Q<R-`jbSZ<U LtDnm{r-UW|*+_cr literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/welcomemode/arrow-right.png b/src/plugins/coreplugin/images/welcomemode/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..207f7fcf2168ade1edf307102541eae3a6df1ca9 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)T!3HEZPnf;}NHG=%xjQkeJ16rJ$YD$Jc6VX; z4}uH!E}sk(;VkfoECy;324O~qS#u<Sg6t)pzOL*y*_gOQM4tM`Oacl?mbgZgIOpf) zrskC}I2WZRmZYXAlxLP?D7bt2281{Ai31gNd%8G=NL;QxZ_U>fAky-%U;BY+07KH9 z_N^O>OgCxt?%r4+eC?Z<nb~#mPQRj6_Qh#!_Ol$OS+*{ib$)KLN-W!_J8a(t-t6+r zxy_QWGvwJ$({+jxx30YrK6ccpS2<5&mfMe}+V#iezAxHPbx6ySe@D;Us~X1pj80$r qw)m~cEHzU<>-K&1{uO)wE@fvD6c$jv%vA|=7K5j&pUXO@geCxNN^3y? literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/welcomemode/btn_26.png b/src/plugins/coreplugin/images/welcomemode/btn_26.png index 17d9a83c6e8cfb0648f0164c03d135525428a66d..51de8bc89d36c0ad3e1a982d287b5faad6042926 100644 GIT binary patch delta 392 zcmV;30eAlG1l<FWUw;My3L^+%NucQf00CV|L_t(I%dL|!Zi6rshJQQ8Y>~0MMo1aR z+My@t+_6h@mCo(L)C+KeE}41_rb^)sZYCIv9Xd1+(ni6Ada-2jz5joY{{a&YNz*ip zqUe=UdaJd*9|Dw8u-3lhdH%*0i$xa4@p`pdA&R0wwcT!q?SFRrJfF`6t*UCBBngBN zXqx6C*fb4<5J-{)RaHGPtu>^S9XM0~0Hl=AT1(nBPl(@;df!n1FvfT(w$6+(000I6 zoOA5=djRO}ez8`K(jTLo^CR3s&bf=K&N<9xv#v-7TWh^+TWi4>`>Q<mOoHi@Y%>5T z%MxW-`Y*&``hWk^vu{Yw!oCIi@jOu;tA5h+Rmyc;gAn31G)ifgM#ecu5Co&+83X}X zyIwwnYb_gNP}lV_B)@@kE7`ss1izS4>b)q6$K`T~FboH6JLgao1(Z@b$+GMYz=ziQ m#`hN~r9L;C&BK(vz&AdBv9lW>oFV`K002ovPDHLkU;%=)rL>#? delta 537 zcmV+!0_OeQ1MLKmUw;G}3>gcKwHWOH00HeuL_t(I%jJ|Y%i2H~$NzVY$t}@ZP|;Xi z{00SA*9Hpj;3VC;NI_c2SLhdz44Fje;wm%&DR#-yg0mk$L2yY(qX))lave&od9i4> zLjUk^cijD+=kB??hv2r@ML)fqAeRHfFkS+93*ZF+?Xj2B>3{UfG|kT$*f5MjsZ{!y z&*vZ7?KbN5Itqot84AM?>-8G0>mm%pPm9Ik&3HTx0RWa|eRUj1+#|<vgk@RZ07y?p zqtS=s@%Xyi?cyFan@!B;^LnS#0S$uSov!Pkl->nXN}=mIw%hG{>ifQ0tyUp~xC<6S zK+`mMo|l)RD1Rc1F{Eh<A;h`8bVdjPAq13C5JJEhLli|s`n4cQ5}Zz_n~^0+Iv?>2 z$8mhuw&OTPE|<%~X`141^<Tq}@Agk3gj|pO@57$w{f46`0wDxRlHBz?RaO1@!x&@O zY&Iwsi%8S-rWK1ttk-KOiUQhbG+^5{IOk9l<(&0vrhh037-O()8=9tp_If?y`#xOP zMXgptrBZ<`%Na<PWmGB^)M_=DrisJhfPTMUkN|*l{&cxqejf}5Xti3XR;y4|73Fdn z0I=Kbuv{)No6WG_?=hWDpJz(%WHJ#!5MZ@hfpeb8ysD}Q!w{VF&Tu&Va<y*X&@%v; bYViY8oDx5^Kl5x>00000NkvXXu0mjfI1vM* diff --git a/src/plugins/coreplugin/images/welcomemode/btn_26_hover.png b/src/plugins/coreplugin/images/welcomemode/btn_26_hover.png index 2a5937803abafbdff713084a0ec44481fc49eb5b..3916904310fd7b1e813a7ec300828e8a773f96d9 100644 GIT binary patch delta 379 zcmV->0fhdl1+D`jiBL{Q4GJ0x0000DNk~Le0000F0000Q2nGNE0BFqyVv!*}e+B{z z0WAAEXfFT&0WL{IK~y-)#gj2kgg_LA|Cun*KoG~8P*6Z;;R&oQZQQF^YelmckP8@E zZ$YeNE-_X^0W&Zb>n3Z~2rL?>dy{<m|M&j)fEAAvMd3wJ^hhbalu}+#0i1IfV;<_d z-a2s{KP5@B$@3h(?@y{JrO-6Ze|;E+XS8kGO_pV|KmhQ4A6b^6ZQDC4r9=<}i+T-$ z08+|xx@KVi2Rny_wRSpNLXP2a9A~LnYe6YJ4F<3d{=I=|t)Y}!v?Qx-J4<5vo1Cq+ zi`BpMe3EkC_aKDK8XBb(TI(I`x-MMTg)wH9RbvboV_=NI>HGfM{r$;uQP*|QTJLNt zrH+8ZdJpaYJ_X+$&iS(t;x<iFc%C<Ddl&`?A;39*C1qJ&0eF#8Ud)Y%bN*IU)y<l_ Zzz0oFiqHq%WlI16002ovPDHLkV1lQoo_YWP delta 633 zcmV-<0*3vr1F8ifiBL{Q4GJ0x0000DNk~Le0000G0000Q2nGNE0KRD42azE@e*_y0 z87I7LbPfOj0xC&FK~y-)&6U4v8etg6Kb~@wSSp+j(Ym<>0*d881O*pM*JhB8-K5)% zrCWzmC<q<W(wNo%p-?E^qMKkKQ$!Lx6igtRlQZV-y)L<uYi(4r^b22(=YD+nKKI;v zZ-CW$^hdq8TLkVFnx;Jmsz4Taf4Yq3y6%fwt@hmq&@?Rqd`P8I)nc(oGMOY2iTECz zOePEl1DeeyCnqOgP1AgPaBwgS0_1YJPo+}nO{G#nmSu*+A-!IY!C>&)H#axL<8ku& zJVJ<PhG9Hzx7$C1nx?%<rBWaF_VzeFKE^N%EX%@mU7sz>Vmuymd3lMdf2#EReKna( z_9UQME|)n!KW93fB80ft)9I9piwnx-GU0IewFK-cio)618II$u<<rwsVzC&KB<+TP zh%C#@=W|@wWgX4ub7WZtcoG5-LSWnW+JHbHfDi(J(Cut-9A_hdcW=l$xhcStFM$_p zl_W{>C)gC=eH*?OY}?)_f5BfZYzp`fTX;}{hXN+o*VhqQmN89pEx^{+7K_CKU?u@a z<MEhuI=yl!d(LLFj7B4b5FH8lqU$<|M1p8Ex^gK;qfz4VIJ&N5S=M2&)oLB>?CiuG z$5BhA5{ja5b#;YhS-#kcqM)iOnM{Uevq`tx{kFfq|JfVkyLP)BPc#gps;Vl5LV<8N z>;ueZGls(<jYflhzkk^2bl%_hTUUYYWpCaz&6o9h{m0UM;U9|K9=#dccQ5_|wzt8( T4kM9100000NkvXXu0mjfj=&?n diff --git a/src/plugins/coreplugin/images/welcomemode/btn_26_pressed.png b/src/plugins/coreplugin/images/welcomemode/btn_26_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa53120dba11224a98d7401fa1e549f8e88a52d GIT binary patch literal 494 zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq000jF000^Y1^@s6Xw3#<00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXP! z2o^Bt{tmAI00C}EL_t(I%dJyAZo)7aeRhnKjT%)#nR10pSy-x`p-Y*20QSzU)Ug-n z33>#?8M=@uGi)&visGMipaG{q5@<ikgXQn}z4!ePbVL+IfpfL)8=1{!{%|;arIf}} z%KNU*gb>hLzocpU&cZPKFvd)cF^J>13yY#Ckmvbxk|Z~*D2nNLJjP@)*-0VfEU>C7 z0KjIm!D6v^q*6)*LC{DzcU<XG$`Re0Z((c{$;o2?V2o+}+!j?;K`C_rd!BbvvdiWk z&iMfh0M=R<V_FMU6V+sUa4n@PthLABzMkD^$i5nUHM3F*+wHbDh*J8Go`3hY&xFxS zncciUF<;!OBW7zY2q9<3(+$t_ptat4=A464+6!23AY%-J!2ql*%T{Tp{FY@2rPQw4 z>-G9*6;G{Zeg7fMnGoVL48sS`Ieg#mB|FP92qC^0fVb6Zb+=qDZ(Vt9Z4*MI^ZERV k^c}@0ibeo*?EnD20nFCrG?|wM(f|Me07*qoM6N<$g8CuT)c^nh literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/images/welcomemode/combobox_arrow.png b/src/plugins/coreplugin/images/welcomemode/combobox_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fa180a27e479d215137ba7c60cc01fb3c44f0fdd GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^oFFy_8<4DKZ~;+_#X;^)4C~IxyaaOClDyqr82*Fc zg1yTp14TFsJR*x37`TN&n2}-D90{Nxdx@v7EBj40CN2gs)%UMn1BK3dx;TbNT+W^7 z&2`8@z$L!CN#3QPtx@LSTD>nW>n1sK${kr7?XNiLyiuW|i}_rOE?!s1P~Y<<{0$#8 z8Lu7t^mt(#^9K_@p2shb^spBg%QZP&S;*AqkQFm?UBoY@H#!Ch>AzAc=D39)|7!Hd zbbraoO@&uXUd?bh7`D4FGqNaC>RYXU)`Vq=(bMMa=2K(|3N2c|=BK!U#m`}_mmE{m z_Z8pIglOj2mp@qO_0Tr>J>zqM!!jB<k6Vk+%wc}+5T>mn6?}Wz*`$M_FWUcCGvC=` VG)2kdNej?p44$rjF6*2UngE)ydi($Y literal 0 HcmV?d00001 diff --git a/src/plugins/coreplugin/welcomemode.ui b/src/plugins/coreplugin/welcomemode.ui index 9332292d061..d12e5524f2a 100644 --- a/src/plugins/coreplugin/welcomemode.ui +++ b/src/plugins/coreplugin/welcomemode.ui @@ -11,9 +11,44 @@ </rect> </property> <property name="styleSheet"> - <string>#Core--Internal--WelcomePage { + <string notr="true">#Core--Internal--WelcomePage { background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255)); -}</string> +} + +QToolButton, QPushButton, QComboBox { + border-image: url(:/core/images/welcomemode/btn_26.png) 4; + border-width: 4; + padding: 0px 6px; + font-size: 12px; + font-family: lucida sans, dejavu sans, sans serif; + color: black; +} + + QComboBox::down-arrow { + image: url(:/core/images/welcomemode/combobox_arrow.png); + } + +QComboBox:drop-down +{ + subcontrol-origin: padding; + subcontrol-position: top right; + border-left-style: none; + border-top-right-radius: 1px; + border-bottom-right-radius: 1px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { + border-image: url(:/core/images/welcomemode/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled { + color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ + border-image: url(:/core/images/welcomemode/btn_26_pressed.png) 4; +} +</string> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> <property name="spacing"> @@ -137,41 +172,58 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 <bold>false</bold> </font> </property> + <property name="cursor"> + <cursorShape>PointingHandCursor</cursorShape> + </property> <property name="autoFillBackground"> <bool>false</bool> </property> <property name="styleSheet"> <string notr="true">QToolButton { + border-image:none; background-color: qlineargradient(x1: 0, y1: 0, x2: 0.0, y2: 1.0, - stop: 0 #777777, - stop: 0.4 #606060, - stop: 0.401 #575757, - stop: 1 #333333); + stop: 0 #838383, + stop: 0.4 #707070, + stop: 0.401 #636363, + stop: 1 #4a4a4a); border: 0px solid black; border-top: 1px solid black; border-bottom: 1px solid black; color: white; + height:20px; } QToolButton:hover { + border-image:none; background-color: qlineargradient(x1: 0, y1: 0, x2: 0.0, y2: 1.0, - stop: 0 #808080, - stop: 0.4 #707070, - stop: 0.401 #606060, - stop: 1 #333333); + stop: 0 #909090, + stop: 0.4 #808080, + stop: 0.401 #707070, + stop: 1 #555555); } - QToolButton:checked { + border-image:none; background-color: qlineargradient(x1: 0, y1: 0, x2: 0.0, y2: 1.0, stop: 0 #ffffff, stop: 0.4 #eeeeee, - stop: 0.401 #dddddd, - stop: 1 #cccccc); + stop: 0.401 #e2e2e2, + stop: 1 #dddddd); color: black; border-top: 1px solid #606060; border-bottom: 1px solid #404040; } + +QToolButton:pressed { + border-image:none; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0.0, y2: 1.0, + stop: 0 #383838, + stop: 0.2 #404040, + stop: 0.201 #484848, + stop: 1 #505050); +} + + </string> </property> <property name="frameShape"> @@ -201,19 +253,17 @@ QToolButton:checked { <property name="minimumSize"> <size> <width>0</width> - <height>24</height> + <height>0</height> </size> </property> <property name="font"> <font> - <weight>75</weight> - <bold>true</bold> + <family>lucida sans ,dejavu sans ,sans serif</family> + <pointsize>-1</pointsize> </font> </property> <property name="styleSheet"> - <string notr="true">QToolButton { - border-right: 1px solid #555555; -}</string> + <string notr="true"/> </property> <property name="text"> <string>Getting Started</string> @@ -240,13 +290,13 @@ QToolButton:checked { <property name="minimumSize"> <size> <width>0</width> - <height>24</height> + <height>0</height> </size> </property> <property name="font"> <font> - <weight>75</weight> - <bold>true</bold> + <family>lucida sans ,dejavu sans ,sans serif</family> + <pointsize>-1</pointsize> </font> </property> <property name="text"> @@ -271,19 +321,17 @@ QToolButton:checked { <property name="minimumSize"> <size> <width>0</width> - <height>24</height> + <height>0</height> </size> </property> <property name="font"> <font> - <weight>75</weight> - <bold>true</bold> + <family>lucida sans ,dejavu sans ,sans serif</family> + <pointsize>-1</pointsize> </font> </property> <property name="styleSheet"> - <string notr="true">QToolButton { - border-left: 1px solid #555555; -}</string> + <string notr="true"/> </property> <property name="text"> <string>Community</string> @@ -319,7 +367,16 @@ QToolButton:checked { </property> <widget class="QWidget" name="gettingStartedPage"> <layout class="QGridLayout" name="gridLayout_9"> - <property name="margin"> + <property name="leftMargin"> + <number>18</number> + </property> + <property name="topMargin"> + <number>18</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> + <property name="bottomMargin"> <number>18</number> </property> <property name="spacing"> @@ -430,6 +487,9 @@ QToolButton:checked { <string/> </property> <layout class="QGridLayout" name="gridLayout_8"> + <property name="rightMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QLabel" name="demoTitleLabel"> <property name="alignment"> @@ -443,7 +503,7 @@ QToolButton:checked { <bool>false</bool> </property> <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -460,6 +520,12 @@ QToolButton:checked { <property name="enabled"> <bool>false</bool> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>Open</string> </property> @@ -486,6 +552,9 @@ QToolButton:checked { <string/> </property> <layout class="QGridLayout" name="gridLayout_11"> + <property name="rightMargin"> + <number>6</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="didYouKnowTitleLabel"> <property name="sizePolicy"> @@ -499,6 +568,31 @@ QToolButton:checked { </property> </widget> </item> + <item row="1" column="0" colspan="2"> + <widget class="QTextBrowser" name="didYouKnowTextBrowser"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> <item row="0" column="1"> <layout class="QGridLayout" name="gridLayout_10"> <property name="spacing"> @@ -522,21 +616,45 @@ QToolButton:checked { </item> <item row="1" column="0"> <widget class="QToolButton" name="prevTipBtn"> + <property name="styleSheet"> + <string notr="true">QToolButton{ + border-right:solid 0 px; + height:16px; + width:12px; +} +</string> + </property> <property name="text"> - <string><</string> + <string/> + </property> + <property name="icon"> + <iconset resource="core.qrc"> + <normaloff>:/core/images/welcomemode/arrow-left.png</normaloff>:/core/images/welcomemode/arrow-left.png</iconset> </property> <property name="arrowType"> - <enum>Qt::LeftArrow</enum> + <enum>Qt::NoArrow</enum> </property> </widget> </item> <item row="1" column="1"> <widget class="QToolButton" name="nextTipBtn"> + <property name="styleSheet"> + <string notr="true">QToolButton{ + border-left:solid 0 px; + height:16px; + width:12px; +} +</string> + </property> <property name="text"> - <string>></string> + <string/> + </property> + <property name="icon"> + <iconset resource="core.qrc"> + <normaloff>:/core/images/welcomemode/arrow-right.png</normaloff>:/core/images/welcomemode/arrow-right.png</iconset> </property> <property name="arrowType"> - <enum>Qt::RightArrow</enum> + <enum>Qt::NoArrow</enum> </property> </widget> </item> @@ -555,31 +673,6 @@ QToolButton:checked { </item> </layout> </item> - <item row="1" column="0" colspan="2"> - <widget class="QTextBrowser" name="didYouKnowTextBrowser"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="openExternalLinks"> - <bool>true</bool> - </property> - </widget> - </item> </layout> </widget> </item> @@ -611,6 +704,9 @@ QToolButton:checked { <string/> </property> <layout class="QGridLayout" name="gridLayout_3"> + <property name="spacing"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QLabel" name="recentSessionsTitleLabel"> <property name="sizePolicy"> @@ -677,63 +773,25 @@ QToolButton:checked { </column> </widget> </item> - <item row="2" column="0" colspan="2"> - <widget class="Core::Internal::WelcomeModeButton" name="manageSessionsButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="styleSheet"> - <string>* { - border-image: url(:/core/images/welcomemode/btn_26.png) 7; - border-width: 7; - padding: -2px 0; - font-size: 12px; - font-family: lucida sans, dejavu sans, sans serif; - color: black; -} - -*:hover { - border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7; - color: white; -} -</string> + <item row="3" column="0"> + <widget class="QPushButton" name="manageSessionsButton"> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> </property> <property name="text"> <string>Manage Sessions...</string> </property> </widget> </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>89</width> - <height>22</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="1"> + <item row="4" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>53</height> + <height>40</height> </size> </property> </spacer> @@ -741,12 +799,18 @@ QToolButton:checked { </layout> </widget> </item> - <item row="0" column="1"> + <item row="0" column="2"> <widget class="QFrame" name="recentProjectsFrame"> <property name="styleSheet"> <string/> </property> <layout class="QGridLayout" name="gridLayout_5"> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QLabel" name="projTitleLabel"> <property name="sizePolicy"> @@ -813,56 +877,21 @@ QToolButton:checked { </column> </widget> </item> - <item row="2" column="0" colspan="2"> - <widget class="Core::Internal::WelcomeModeButton" name="createNewProjectButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="styleSheet"> - <string>* { - border-image: url(:/core/images/welcomemode/btn_26.png) 7; - border-width: 7; - padding: -2px 0; - font-size: 12px; - font-family: lucida sans, dejavu sans, sans serif; - color: black; -} - -*:hover { - border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7; - color: white; -} -</string> + <item row="3" column="0"> + <widget class="QPushButton" name="createNewProjectButton"> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> </property> <property name="text"> <string>Create New Project...</string> </property> </widget> </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>157</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="1"> + <item row="4" column="0"> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> @@ -1053,10 +1082,10 @@ QToolButton:checked { <item> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="rightMargin"> - <number>15</number> + <number>17</number> </property> <property name="bottomMargin"> - <number>15</number> + <number>17</number> </property> <item> <spacer name="horizontalSpacer_5"> @@ -1095,24 +1124,19 @@ QToolButton:checked { </spacer> </item> <item> - <widget class="Core::Internal::WelcomeModeButton" name="feedbackButton"> + <widget class="QPushButton" name="feedbackButton"> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> <property name="styleSheet"> - <string>* { - border-image: url(:/core/images/welcomemode/btn_26.png) 7; - border-width: 7; - padding: -2px 2px; - font-size: 12px; - font-family: lucida sans, dejavu sans, sans serif; -} - -*:hover { - border-image: url(:/core/images/welcomemode/btn_26_hover.png) 7; - color: white; -} -</string> + <string notr="true">height:19px;</string> </property> <property name="text"> - <string><qt>Feedback&nbsp;&nbsp;<img src=":/core/images/welcomemode/feedback_arrow.png" /></string> + <string>Feedback</string> + </property> + <property name="icon"> + <iconset resource="core.qrc"> + <normaloff>:/core/images/welcomemode/feedback_arrow.png</normaloff>:/core/images/welcomemode/feedback_arrow.png</iconset> </property> </widget> </item> @@ -1165,17 +1189,14 @@ QToolButton:checked { </layout> </widget> <customwidgets> - <customwidget> - <class>Core::Internal::WelcomeModeButton</class> - <extends>QLabel</extends> - <header>welcomemode_p.h</header> - </customwidget> <customwidget> <class>Core::Internal::WelcomeModeTreeWidget</class> <extends>QTreeWidget</extends> <header>welcomemode_p.h</header> </customwidget> </customwidgets> - <resources/> + <resources> + <include location="core.qrc"/> + </resources> <connections/> </ui> -- GitLab