From 152ed0f77cb3ca9af31216a07b385dbdddff4612 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 9 Jun 2012 15:19:57 -0300 Subject: [PATCH] Start: Small fixes to the start page --- src/Mod/Start/Gui/CMakeLists.txt | 2 ++ src/Mod/Start/StartPage/CMakeLists.txt | 2 ++ src/Mod/Start/StartPage/Makefile.am | 4 +++- src/Mod/Start/StartPage/StartPage.py | 19 ++++++++++++------- src/Mod/Start/StartPage/blank.png | Bin 0 -> 302 bytes src/Mod/Start/StartPage/complete.jpg | Bin 0 -> 12532 bytes 6 files changed, 19 insertions(+), 8 deletions(-) create mode 100755 src/Mod/Start/StartPage/blank.png create mode 100644 src/Mod/Start/StartPage/complete.jpg diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 54bdc5c5e..339c9ad50 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -54,6 +54,8 @@ SET(StartPage_Resources StartPage/PartDesignExample.png StartPage/ArchExample.png StartPage/web.png + StartPage/blank.png + StartPage/complete.jpg ) add_library(StartGui SHARED ${StartGui_SRCS}) diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt index 19c59fcf3..7a798c98e 100644 --- a/src/Mod/Start/StartPage/CMakeLists.txt +++ b/src/Mod/Start/StartPage/CMakeLists.txt @@ -24,6 +24,8 @@ SET(StartPage_DATA PartDesignExample.png ArchExample.png web.png + blank.png + complete.jpg ) INSTALL(FILES ${StartPage_SRCS} diff --git a/src/Mod/Start/StartPage/Makefile.am b/src/Mod/Start/StartPage/Makefile.am index de35b6d45..57ffd74ee 100644 --- a/src/Mod/Start/StartPage/Makefile.am +++ b/src/Mod/Start/StartPage/Makefile.am @@ -28,7 +28,9 @@ data_DATA = \ Complete.png \ PartDesignExample.png \ ArchExample.png \ - web.png + web.png \ + blank.png \ + complete.jpg EXTRA_DIST = \ $(data_DATA) $(python_DATA) diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index c3983a86f..978cae6b7 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -309,10 +309,10 @@ def getWebExamples(): def getExamples(): return """ """ def getLinks(): @@ -366,7 +366,7 @@ def getWorkbenches():
  •   \

    This is the """ + text31 + """, \ - """ + text32 + """

    ')" + """ + text32 + """

    ')" onMouseout="show('')" href="DefaultWorkbench.py">""" + text31 + """
  • @@ -399,7 +399,7 @@ def getInfo(filename): html += text35 + " " + getLocalTime(s.st_mtime) + "
    " html += "" + text36 + " " + filename + "

    " # get additional info from fcstd files - if os.path.splitext(filename)[1] in [".fcstd",".FcStd"]: + if os.path.splitext(filename)[1].upper() in [".FCSTD"]: zfile=zipfile.ZipFile(filename) files=zfile.namelist() # check for meta-file if it's really a FreeCAD document @@ -429,7 +429,12 @@ def getRecentFiles(): if i < ct: mr = rf.GetString("MRU%d" % (i)) fn = os.path.basename(mr) - html += '
  • ' diff --git a/src/Mod/Start/StartPage/blank.png b/src/Mod/Start/StartPage/blank.png new file mode 100755 index 0000000000000000000000000000000000000000..4b794044844fceb5d8172c69f0cdf2b0c6fac6e0 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFqeTaW9`+ZGeAMf64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T6d%8G= zSoFT_Gvqqtz`*id`yKnJ7n~Tz3KkOO(JhZgR&oJb#qKos@3rkw&+Wk zvNhn~IhE37_iqZSESxgS^Z3lgZ09${ylqP0pCqyS-7*cXFxB(Lep8~DUzEMt^RMXi zCc%cp_s_R!%T|HersIRCQ;IfjOq8tE$Kmc>_4?rOS zlG|=pW*%0S4BmDgwhZ!$D)#`?EJ3)ekDWCDC@OLSH~;{k0sIg&fCMbDfv4S53;+WD z7Y9!n@Z`V2$1i?ESp0?<1D~L{kbt-VKUjNlpabZTpR`!u9R%%X*&ZyT{VG!sT+o4< z{9QYc^r8dQIB*-l!obAB#K6MB#KOkL!oj1053+0|TTE z0NVi!V$3Uyd^fSKs+(amxsvb)#k|E~zE#phs?op2B4F+ojEhG`PC-e<%Er!djZ;ua zSVUAz{PrDLIe7&|B~2}D9bLWq`WBW});6|w_U;~@Ufw>wej%ZcpFDjQ79Jb-GCm>k z)$62p=^2?>**UrIOUueDDyyn%YCnDc(%jP8*4{BNI5a#m`gII3`)zK1VR7mE^2+wk z?%w{v;nDHQ1uh8q*nS^Bf&Bw6Vh|S^1_n9?_605onm2f&6Jua9@?l-Msg7;tdXTI|69oZ0Q(CU0w6$#fDaFy7=QwM zt56(~7wnDqugu&T|748zrc`02frtkFy7|5uo=i8|6So1hFZh|u@Vp)OX3wh~`Eg$k zN;}a$DyMEH6UE58$?8;b#@W5~7-KfdhY)^2FE$&DL8=I;A6|{zFA04}_lAYhTJ$t^ znQPa5dVVgtfN&N=FXgorLG{N|rJ1N>3DJVpycT3PE4NLo$`PMctNG2IiMdDOohJTHJIf3Y^bnNClcATI2l7Z$1 zg&b?CX0taVVWZ!PL*n{rYLB3|476*I{k5l($=q36q+(KGa|H%;!~>n81GBQsURL6deh|@XumwBtD8^1PUIfRa*E1<>qX+Hgp%R#0^<`NI~23N7#59C(h35 z8}r_!T;pkBKVz)*>YKK$MYx76@?7%s%5=f9Tfw#4_(&6LX$)1W%Qf=Vw@!NguG@<> zNwhu!>$2(AI{c9-&2VR3L$OJ%UN2YcV?;WZi%NF&V);^>k`cwRMU^JyL(1&Z;IhdV zayPH=LNgh*ypr#~G@M9KkChy5qdU{R>DX*hh4xkMVe%aFyeK^ntXHY4)(hF1u%bex z=fuH3E&#zLGIYkjMc`&bcCNnxT*;KVQ+S zlS_kLCR=$sf-fezDo^ftl!gcwTD89VdYT?39s~FDA1MgU^4GIY5FjW_E4SRq9(Xce zQT@`~-KHtYhf-kD0$Iy@q+_>bXze{Fn02R#>mVo|Bc!c0t#I=C`rM_Gv%0T!X2pt9 zDrh)Y>}=Hb3+wJzd7>i{C2LD|(o@7Azo_vPj@uN&STt2!jc}S1E5IQPec|h#5UeQE zCFeaQ*0zDOtZiMLfGdxn@1(|OjJZtkK%lxx_2#NOh-I5u{n zovnJ69f8-j)8h;d)wQ~^)b21Lmi$#pJ`V4-j5%oJ-6Z$-oC~59v(K^vg4MK9zz4(& znuF~83B7hIp;~9FcIvVy6-^WnnglyOP&@rTa1_PFd#j}Vp1k2g2*)S@vXv%X-H= zlIh+c-z;BrYf!fe*}HdqxRu;>VVIfba;j>p+GnZuZp}|1#wlPaj^ zH$Zfl4--r-Z95!B%y1#Rteo+a6tivqsLmqGqey{l6%;+-!LX~pmX=( zDo!hTA5M(L`A9W84vI{OBs3LTlr^F4>FotXT!?5cMCC!~*WMl59f#W;2kGDsff<1U z*rM6WC5!CApH!OOf4P;5^zDMbhM=BiGrOjYLVwjjkyX_bg^f9FO9FI8_Ur)ug<8)&U6wR_g+^7q!tV&>rq1`zk35Z&kJDYpwD<`Ugc5B_ zCUBM{nbZfuv^@y=w;LQ|%&3?3jaB$-WP@+s zjsmRJHd0RyQNT$0TKhTZ z>VYWWWC-HdmliuO0X!U830P?{N1h-(yG?9kjEoJ8a0?leCT`rO;@u{odvDK}W)?yy zf3I!%6KtDQ@i;`hzWIFr?ECrj;plGub5SY;Q>5VF75CaZlqjH8hE!VZ)a0<~-5Md$ zBxpI9IMf@YUWKxs7oE-wT$!wbO=Berpvxb^rcHXHf0FcI)@^{Jfsp41Yx?V;x2KJp zMN9G*m5nJj^C+MK1w5qUhaoPgXu5O+e+d1h!ddD;<7SB5FW!j0ABv^_kYBd*lZ6tx z4t5)5%|%6DcL7vQ{R+j0WDtd>nH0e9OLKZJ?EMj3D-!W-J!pF$#cl z)KS)0pa41@6tLe7i&rt^i28nuSg200iJg((cfAw-a@(=Alcq|4#7I4zivX^FLv%hO z^_4|1pJLE>zo9jBJn3Pp z)T5&+6wny_NSulbeyW{#c4mMArkmvd&;Z|U3;ox1Om?@y@dm@Bw=V^Q$aC1~5eNF) zcQu<8_hG%wjpt`10a=~M!0RYrb0+Q5lklYvgH|X2N`?Xsx6}{vz)02lg9_4j(SQE$ z{{JGnhkaYtefp2^YjMV7Ep?$WP$|+;XwM^YrC=0*lyru!zJYNrk!x0P;@-Xbwbm5{ zL~G7{C`-cP>2Fb$8})2I3rizHjs3s21}KMc|IZrW$J*xq`!&GI>;Uh60l$BWgjTW7 zyi>4ejbRJ&DFY4M@8m=$!kBdATUDs)f$A5`U4oUj#x20I^I@UX(ijq ztWa0w%z=ZRJoB*oBf zgkYtc{#90UI&!N<11j!)##GxgFz$E|6dTxAjaGZi)IYn`728bB^9t&xL*pe04@@2| zU{@Wms1WhfQY6tOMgjQ|PTch|qbv3`^R-vo>XMm!EOZ_`CVY-fX=s=`AthfxzZGGB zY=#VpKmEMU)jB#**LfXZ={CW^K~7;PKlFjTpCg=ZV1t((?x4=H;kGvO07jISxlZ9P zG%-8+skZZxy5m>knCFir{RS82OA8~3dC@_zcP8uzXYky5RIlkS>gyk;bq>WB_M7h#4O0neqJN6q{nq)PWdj;11E3AooYk| z_EUG;qH_d%o4kSf^EHk+Z}+HxRR_(6s=;($9-~i8iC%Mf0DDmpHhO`yuNP^0VI7?< z5@(xBp{wfNySNu``{s5@nzuy4np8&nZ(xv7MmW#=T@t77X`t60cG_DP;-%xNiRlwn zV450N6_a|ZuFDwDQmUMARW9O9hxo(QHJM)NA@`2aVpg)X*NdGq>kn0X0=q1jA(FFA zbE$nuPu?>o@ujmJaAIzpJL4+t7h0t?Kh!9%6v#*TVim$lvzhbM;$o7t;ef zI&fabiK;;XlIyU|BNTuK{kulSK{>_-%LfHgoo&Rb(%S88sZz}a4Mhl>YP}g|#)(Hn zRilX1a&vIdEv0TfTTR{V7)64!>Q*|EnARQX3%>bGZzD;^k6`ypMm-)66;OTSGH+I> ziSDps&SBVF;p~oF&pb<1v=fUjNM;GWgiicIU^<*uuH05CNfMm0|0aaw?n zVtA{U#;VSz0=rSucLPbM#|Sy+v}(#j6{-?Gy69j$%zklmZ&led6Y;SvM!v#p2{=u1 zb~D0AOV!jDqPy!{N`er05m2+Ly;N2*!tHc6teodeCp;k|X(2|Dzi#GOxPFDYTY0Ur z|MKCz{5H5faY~f?3vrJn8t-g-FF()4*G}2Z?u79#RbM^9jwFo{XP7thSzo^Iu4o_W z2#+YKQbvAZ;(GRWupkUeVG)s|_2OgI&~8$~*D-_T>w?~;4p}@w`{c4uTJQv=ME4MjfMUFpjPT}lh50vh`_IUciEZgL!RJ)wDRn)af~I5Rf2bn;yYw zrM9&b_(lM)nu>SxX;32@7dCrO)9UiP9E2hyAouO z^!Pn&O?p)`K6TU5enrG9;T}uU<1fNnW%>3yANuY`0lm4oyc=o7WeJNXw(INfC}R~b zk;<#8m>%_h@(Sdvs#GqMW;UR|dmlC;R9&OkyU%t^ZY(c?!c zw8A9UIQhPWYwgC3VpS@M8^z?h&D|T^J7=w+exBzexN!4Y$}|qi9Jcf^#YwnRX7iIq z3)<%7?MVZ&W6Q8trpQqG0`qAf@u|a)TRzT|8Y4)*t{TGqR+O_nGy5#;t2kZ3sYO z_~~8$;cEZh%Sf8^ZzImxn87-pAnO|R^Dm%K+# zbSX-TGcl;19y=6PE?d59czvR&-w^Y1i$LWKk;|@eyPksjWX>mhSL;e0RI}hgY%iaC zW-N>FDUA><^a5_(xQ=H9%YAdp$_@dUgt83bCnEJP1l3!5+`O(<^T>;~vcuz3(tM_>(R zuJc}ZW^QD-$>Pu28Bg%K9eaF#u~hQ@?9*+`;fVHJ6T6l%BegL-w3&Fxd)VOi5Vj%ehO6a7fC&U@EL+;<^Lao*0g zTFlUOI%qU$A$0rt;8J*HJ!0*|pr$@ud1@gLZdv)<;ox};K^V(=5HCX|@R44%v4D)s zE5T(RfpMF}{yD`mmHQ)XQ&^^M`GC&2hDc1Wn|wn5v->a7FhZ8$e67$FiBqwb9A2H3 z1z(AG)WX%sWzimSkEXc-ElzVWi(XQ%{jxC!o29-)Jnuu3GcgT9X8F=>%0|sdB`rRV zSZh;=n8eMQt7o-3@OMtkCDl%{X=D*~R=Xv|AuX2z+#|H9&o6Ox%Ta$8n&6k~Xg2r2 zTTqpABgz(Su}_UUmWK603Mtsyl#KURt~z zVOKQi(&(fTDVCo;$b1R}OHd5G=Oldph=w@otB|0&EX{Qi^?VM2cy#ND!-ISW7-5sk ztf(Lb3tZGJQr#NUJ63GMy@_Q%FEXKP!xMGZf@Dd^QoB{T7^6jdZTF zrWX(FlZV~eG+GwIg+s}wHwNh0Zu*A6cRcD!87O*n0A@gf`~{DzdBiny+S4T&4qb`&SY?JRX4C7`wUDxuOwMj zEb)>XrWO?dHq#EpW0R6Z1QDGR=6TUq$H6=^E=;Lo8!aU7uDmKV-o~-WISMOcxkb$@ zf>k}+0?Z7D!l#iw$|vez{#UB;Y%6iE(87wEOKt50?VwZ~cBHrtrmaI8Guh8r4#4#A zCzFAil$Va_r_zu7@6$s6RDxONUxe<|9Aoka0RYJD@~4vb4`EH@AMR`0f+o8yY9Q1i zB}p|bv0%ef^WVZ7@}p9bSNvhev%Je-!u)sFznIVev(~43pAl`#Ps4uc^H00}?<@XO zItrL&2lHp}E6A6rTXDb4yy&G~8vT!UbED(wJLCJ-?V>VV@kU~)VQ~AvD=Hwo+UYZc z=VHENx)uG{9`?GWLuZbiyAkV`N{K}oz)O}rq$R+0T#A!=JcWM;zb*U8TEX8?otl>V0E(rUg7D3Oz(E6&M`iY|#W5Ca9fnPL97In$}5d*spgGmyR8wU?FOt#b8tHB3D2#z1#qmeAzG=fI9Ii!!s z`CjAPy(wAI^5j=~KxACCUx0(Hc7Qxmk_WaL2V<6@!78m8vXuUOtbIK``#q0K@+r}R zwwG>SU*bmk_b5B(j&Y7L9q<8HE)pA9QFHcm2&;EtI=ytvlel(K3b-hNj(>x+QoS^P zE!~RdqYn6tN=g%dmC8yZU%Es7f%V^IP=OD*LrkpHaK4zQlqO@5z~KAs5%J53ggu9H zV3uAs@!VByo^wI7zj2-z%)c6H9^=&*Q&y{oOZ0~We6rY?B*5RW>R{>)!R9_KA!|f- z1R*W<_;0E%a0kTuZM#2cUB0(gWFOJ!O@AA!f(rzq2f`Rk*7;q0*kt~pLs6FHv%dvp|5Yg#+blDiqHgA=;3jvnPY(A0qQy)zVWN|o)J zSAUgT(?q|S*%ZSYfWxQ0fr)1>EX2vmEdFPAjP}^NbW=Hb^%tBj(x<1(V4nU!5K_$f z0em~4BZuy{H^$^|{%#N=-0wz=^;lY2eszPa@FCX$8zm9xP4&CuI!dN92N~nWDPsQ5 z+6$CUZO3(l`zy;AiA|iS?OPDS{h$w(JLOT^j)OjQ&|jJFl~D5cBI8~ijK7-UPIhJycAAfEUT>$ ze=FXs;<8(V_@%F;B2Q7kJnn_7J+{?_+iRZUEuDKbW*=$$M_%fg{X8L8T1`R7V*AB& zLw5q{nL8B@^oA$}Pe~;#yt}((&zaNPhZna7?lehdoXQ8uI&B(X~Dq`x#X(yiuD@H~DT*FWdUZ^z4f^~Xj3 zaw7Q~zrB%T5ufw`9GPIirTNc2_@6rKzaz4J_zBO|^WGH)e=GA<3vzHm9fhtqh{x7a z$t%vHfMc}#uu(>R($v3|+w{EOg>wM!LSzBbi~P?Esiku_mj&I&>Z8zkB7e}lZ;tO_ z`g?YngdsiIIy{pWA^Xst>@odZTQ1TAfAwO&i-DNk1>R^l(#6|YQD5M!BvKM4Qu+~a zz#)j8$=2~#nOf@o?_rqnRqAILBja+Ud-*qZjkSY|5qM#|V!uB&t87}9Yg)btfuMy9 zO!v}F_kKpaA5=dzxd;hgr8q#rzd8Y>27QA(Z$kmAuaMT2o_Rxqf`>IRF*2M%$+KD| zAKAy3do#@(67Q*bQij{kqcPy#j)AM~FlA|c2vPW6j%#5=)g|~0=h*{2?Oj)#Rc_c} zU!kPlRJ#=h*&!OotRa`I05ic3DwuPwMw^;RBX3QiFHuxaz^Ymx#U0|NQ0#1h5ClQP_H3KXm3LKQC7-)S?$ zv0~+UzVKlAnG$#a5E)wXKU~q}O`zkx1NR1-%>v#aU)?^2?dP0|oZoo51H!zA^}Qwp z=`Rb;KjE1LhPMzZGxsf6zI=r|&9piHMV(7n!YT9QvO{#qG^vlVoFA4@lTZ35UGb?r8!xsJb?c6;^*M+W9WVk+94wDv_Ssia(^65=fmZZC)rqT(BZl53p-+h+pz41`q3Ac zoDJB2?05*`zpi*bl74Y{FOhm00`7CJYJl;m8VW^L04ApzFwdNe%loKbst!5-5+OtW zVJLOdUi#wl7EGW1;Nba9_0Qz0|E22qf$l3%I&6o@PU~lB&6Q7HxXEB7)2RZh21$R-m>lR= zTIKzzT`_Zlm+lFGmTs6qjL(>wOk zt)A!Kp=<@>9OwdT-ms~vv!v*sPc!5se;}>}B`JrFv{{1S}sc6=*(B65G zm*az*1XK&2)ta*PWZSpNSWLumvzS(&Y9N5tm@g*)+-9Q+bJ9m%beu4z8K=Pfg%3qqELq%ACaQlcbK9_xLVA{>%@DX+##-4Z!cKd%CplD%LA2pm7-N_qb2#Dkx!6)%tDW0ND% zXYU5S`fFLqapYn>-XHudPKQ1&$LSZlq229LlVP?<9mqfqR_-Sv&l-<(=n~V%?UMBi zo4E}m;@T-T)a(b+@J$e2Qy1&t#EV^y^7RIAoHz0!NwxYBkFLY)#{Iw*WT43z#~&%$ z`hHLq5oWK{kVpIu3SUTzeYOHhnc!A;c_3g31WRr|2N5bO15ad ze*ua9i%Lfj{;%M^Ps-)Vw7J?AJHb?ISuEDpgnk?&L)G{rL~7{iY~#^;=&UIC ziQ7_S>iO36nKsEi2$f>@#+%)U)j} zaC)ak0paP$tC4C*pE1z;z$Im~x-9TN3jANTK#oCkm19@8MYe#j@>K}S5@oOS=bd-q zfXR{aCSP=k-PgHj=DvCF{lynPmEU>#Ewa}4c0`eZOS>RV%tNP~mRC_z&06k{BZ5%C hTb+dXd?WjVZdccZ^gNO;4na{w4^R4K8B