From 9bcfc7c5790a903d40effd3354d1730cb4452785 Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 7 Sep 2010 11:20:33 +0100 Subject: [PATCH 1/8] initial commit for new branch "new menu" added spreadsheet to display current and proposed menu structures --- gui/.~lock.FG-menu-structure.ods# | 1 + gui/FG-menu-structure.ods | Bin 0 -> 12997 bytes 2 files changed, 1 insertion(+) create mode 100644 gui/.~lock.FG-menu-structure.ods# create mode 100644 gui/FG-menu-structure.ods diff --git a/gui/.~lock.FG-menu-structure.ods# b/gui/.~lock.FG-menu-structure.ods# new file mode 100644 index 000000000..091fe1768 --- /dev/null +++ b/gui/.~lock.FG-menu-structure.ods# @@ -0,0 +1 @@ +,willie,gagarin.kosmos.ath.cx,07.09.2010 11:20,file:///home/willie/.openoffice.org/3; \ No newline at end of file diff --git a/gui/FG-menu-structure.ods b/gui/FG-menu-structure.ods new file mode 100644 index 0000000000000000000000000000000000000000..1204a4e793c75582de437053cc2977fe90f0c30c GIT binary patch literal 12997 zcma)j1yohp`!*>p-Cfe1(kb2D-EoOaH%KepDJh-O(jeW^CEZ=pA2{Ra%s2B}|ChDT zI(MJ9cHDh7&wj4F6gUJL2naL?h@T<_Z=m(-FnSOWkmvGL1!7}iV*+%uGcmBUv$ilY z09pWS8Jum6=>Z0g7LN1)I}=-DfRU4pi7k-c(ayodz}V5;!~`h+H=j>#{t}$0J7IvW zsfC%7!w+wc%nXh|1E7dB0Gj+v=4Z$JaP;Tp-x^^Duye9|>IbJk z8}V;;c>fa3&H-TNVB+{&^Z(8A-|~D8_N&wWuU0?+!1{k%5&lb-7B&WECXNh37C;*V zJIDVqPH<1gMgUvjpJQ==Z{@gFd*a~(`6Yel6Cvg9PVlbdri0qDj@5EQLhQK~)GJ~b zCKyH#bB+58ohURJDt9DS!9Bc<000ENGv;jx*M@E{VfCV~ChOTw7~Q7rmofx_Bu0c#$lSk0eP$>x^DEhm;uBy_LBRy>{a3@@~Qe z$hApqv_goenmZxNXCKbbA?i7`qA66ItAcb=!jA@&WPQV{z5L8fD6G_xEbVWS64UR< zz|95)cMaa6>#VF&eb`@F98)ed-)^j)En(ZMsZXj;udZg{a7$s?->_4l^@r%c(ndj& zk#0;^?a^rq5?QIbvzQ@~qJ4Q3N=b)Pa(wg&2ZjU`BB22JvfgYLeK2dM?uQgz}^ZI)bwr1=0Xy4 zNN+dptl_EO;3_{4?1yBbC-fB5T1=}e zgbf(V66V+Om3@0u4hiY(PX89!&TuO_W;Qd?aL?I;(-HNV}DGO}_x z1k@Z-n!NvL8>cHP?VxT%If*BAuq-abRZlUNT3Tmp)yJv6Z--NpBY5e$M82kRuomcK z8PIkG5T=T2Ltt7#aG%JuLND=#Ed5!#!I-cIn0)nNI<#hsSlq# zi)|Fi$#(+gW}oq9$`dQEwFYeozZnxPAc%OI4nzoNFtaCI=>pYE2rC33O@6o_P6`QG zh2U+W7`$VR?BYQ#e~jMA2osJU=M>{HCZ7HE6__+vMS5O?GMOigoSLU3`i*q59LK4$ zZ{d3im)OH9dpw#lgfEULJPnGmtx`0{t`rmrmFccn>z{~T&W;(H+K+~|t%l0SiL-8Y zdI%l|ILft&gJ!*IZcFkTDJVZvXr07`|IE13+BVF-)F^W@WtILiV#sxmjiSy-c- zw3LIBY0YL74?sb|%d!-as$}uereGpA-*vCHu_uU&*JgBSPKRY_IAvl-qDS5~-Pv*Q zf*W6W6GsZZc}icuUpqEA%fqr)JD@NNkb=wgo;=vQ*vpW*;YGFZhL$2B)5%W zyFHrNwk=lYu_MU+gtW(ypk(c9QJ9!kJcMzQ_g1WS%In+Y23n=L>M|F16YAy{aY`^!7(K$YP+2Axy=3 zC1=^47Hg?J{s;>Eh+CNBX`KLbkpcCfXi@HmPfKMQP8AruQ_{V5;ds&KD3HNEG7K7X z{Q~x$p+qj~#JwhAat;g1;XQT(ZX{I|)YU>Jf2O*qesfD2N;dtl5?J5zJN5o!ilR{g z88I@&g83=jy>knNz|i>o&gc))bl)qx;5F?Rz#Gzbj(d8S6loml%p&0E7sIR_zKVnmtr@Mi7s%D%gGh z1vbDJfbYR|KpSywkAx~VM2eLNOEM<1Hi|hk)=iGk+mL$C>7vFoEh(kf!YaBK=FtcF zM(KP>*fP|-O+^Xfv7Mmso3tJh+ndw6BzB3T`$ed$`^5YLFLKK--NH)id@;AK<7ky5 zWFa^cIOrK|MjP))Ruw?X1MQN<_sZmbku>S^ou|9MDhj^1H7%ww!rC##@Cpas#nh~| zuEbalnrBg-t9@re<}rO(w)~jTBT5!JuA+PocLQmyFA0I;_SQhq?Er$_2!&|S6Bw}N zhY+s^d#WX!1cfehP|q)2DO6+BOs4u=X$3A^`hI%#rRj)&2b~|QdaG>16_P@rcM#Zsrao4*ud8G*57yn?&4^qfL;N7`osnFbupg$-R|RU3Mb;F5PpP}xdbw3LlmXN9_N3$j@Am`j`aI*ib6-5EpQ-fP%J6falvw=LPo z+D4uJCDKE(;6BoU-TSEr(&L%q&GlWZA%Pa!)f?)1m0f;(l~D`ln#13W37Vq~-E$*L zYCe4dqJ+be3tW@AUL25uO(gG!XKn8dftXM%Ur-FK=MjCK!DJfALM3{*v1o%K@ebz1e&07o?^~nxbQrUn*bA5x0 zz+Kys1q!7;d}WoJ4GG};!1v&J(H%k?%1gd`+Jfr7ewu0yiW=eeSmc=LNFO00;P?C# zZO9+A6qj0!G>>!)O@>UGeC`jRyzDeQ1X&6+>bWU1RO35?8=xdEaUI8n3fw}`#1f9_ zFRpeW`p8dWix^=+p9=0%!G9`*PldS7>Z#mXA~eL?T#rV1 znD;Jr1}$tKIIrslU@C6CD8iWF%HtXm)+$3@SvbYE6KRo-(6EoNSBylSaCCIMwwn=Wrciw0PX&vz))ZLX^+Tr%8JicE6fW436kMO*7I zP#@IRPBf1mNG;3N)wopNE*aggE{odBs~}D3ncYShpPT}EloLc7>e%1h}%evYF$d{73#s~FIVc_Y2IfN>)jDPZ`~U=(Oxpaf`G`l{oK0$+kXU43LuU^ zH)|8e=S}~j#-r^#JJN%XoB^f47-$aF>jRvo$^e`0DNq{);NpWBndGKqD44{oy`CAM zief$*&7>~|@1kea2_{Np-K8gT89$O@>t>UFs~SH(EYuKRV>1)SG~9+PK#aaf_%7|!VVcF_^8nICRh zD!9}4&dtEpil)l4P0BEMTl#@4mUa-}pKCURfh$Qh5lUv?w3~#b@`1-p7 zTQxyS9~t&ruyiT-9*ma=b4-n`+h42BZWt;d*{Djt<`HPF9pGATMo}foBkhJQHj?X$ zC47^VQlyL(xezS%@`JUsofHfTblUwa@Lof|zzipxOsAJDy;Hd21XG&&n}dXew1SXP z8T)h@BWowil{J|j6uWwR)z=A(F9>NLf$}MvnH@WUGt9gm!(ngVJ6Ia<;ZpEmG`TNa zz-D*|DJh;b1{`NtMX+-#NH_FBbEu$5FiZ5)QIqG!e1)HT$pLA8Od=V_m?vStg(P0q zWABaDPiD6~igJ)EPpz7UrXk9Vl@o{`BC28zQ{sKi#K|TSHJ8gN10H_j&9i<#HS+c4 zeV1JMjqT86=gy*A4}$rCtPY1#YfDu$c9f^%f$i2!%wbo%#VIwstU&b*l^LXAU_SN? zIjxbV-@0=aXy*IK`WO`V{?1WFh40%=+b)%;c>N(3y`M_V8NYptT82HG1(I%7mKNAN zJQN!^uNoN#MAg$$;Kk#OW3ksk4+9oQOcj;$Y?A5D5=a(@W|4Krf|vPv&nKK>`EqI9=qPt{r<3hC2fUFo z8c0zW^gbL?G4+tn(vS31yCFt$D5rm9vg$WJ(+q0V;*6C{FuA|%W?iAZe4wqTMxkE0 z_j7-Tl15G%#VaM9DoIWE2FYo4PV`_|u+uG#uYq}SSWGL*=tO#w^_KYQ?MjHP)5mT7VRbI@A)JZ2_vXtBv+P@kiYT?`(R&6tj12|d9(J} za4ljvd8CYM52WFVO;a4&fE#`L%Ffp)5%Eye zKj~1|tD!gXSD%=77g0E5<6!R2Sj`Hq?Pzm+<%0tc93ETNo=4Og zxT%{{+#OAQ5-U$G^~g91lC-X+t}(q?X~A%}Z5?;nRMU%TQ-+Ixtb?02ne}O__ZO6| zYWQO#ifz33N3oYO_wD1@CYZb?_XnBDR)a`40+nWn__8cR^GH{BHgX}ulIg@AL9(jB zreP76Dx;-rM8@;3uA2b5(3GJciHhsGa!00wRPnB;}I{3lY=eS47G;hk;ETfo|?F_q%CZnT#5evK<^1sv@|gSGO#c++AzH)6LPY!Hl};c#>n<(m|q_M zi1618e+FVL9Dx=_L_g928W>ue&=~=oY=OKaEF^zaK0&V5KkJw{p1wLiQ~`$15r5V* zk}&Y`{5fN|o}d5v^jEAO)&Gt6J_DZ0=1w+-wgwi~jtsz`xAb{t)s-ti8&P z6FPejpe~Eor!5`_yd#4tvn*%(5U8X!j3KBHARujxTsSVF%TKEb^am2+2VzKUGZ2tX zwMHDvO~LDV$SeX{C2KDP#1x&OGO=XlK$vrne8toK)NJZ(jy+d5H&i$B5?l?ey)to{ zN)v%zaMfP$F}U}J??u>XldqRh5iFDXVVL{k0x9_RUic&*V|!-hcbH%%YE?9!Ic-t; zyftgd+4(RDKp?2cKyGBw!gX^hl1XP}B(TV>7nvG9#gx|zfMchBzwO&%lV*)$k;2bo zPjHN$$bJONr#?A^M0-p)9sk{qQ#Pq`%U-j-xTu`}(`%J#kr}Psm;Bs7;jCH=F0>RT zBjuEo6x59%B$1HT^uXFO6SH#6U>Q&eyfT9e@%FK{LXH zb|Yr_U1?mjgMop`3@JjCxG znO0j`^T-+KE#^SH?YHVd#ghYwS4nXd1O@xZhvu@l62qV^8fs(9|Gq+?F=;L*Ow$I43?7)fN;U%_wMsmu}o59F?CZ52fCmbR3AVSli80#FdtnwS7lq zJa>(MpAo;kpfnv(T5ZeJAOFC1v^W{t0prKX3>U1EUe<2wP`g|k`kjc9Fia>*TBgSt zgUi&iR6O`ns}fR0MImlM@TKsqp=f}oxU{Kr?M?9K&pd{2jya)pSOvudFOpnIX}X%X zmT@inF&K*WeGF99kIjNWUyOlwcZLZ0Md6H0+C7fVaYM54xbpPZFR8Ua1m$!}7flg$9H1hx8R$0KBQu_5xcb7rlUIE?zm z=M!K6Iml*3>jJ6UDVdE|aaOo(m{LF0WiyHHTRQH2^C^>&Wx#N0M@NUyzBehLWZX)z zZw8CFzT&#s0|haqFet0pY)^^c?5N#voLxY+|He*d5rVr>jD5OmR6ot=$Vt_(ME#XW zc4a1V59g+OabFQ7<=x3g@5F#ffLGrr*81e+_2EKQapH7O?1ou*yOsQuQfMp?^d8j! zWYdM?g>?dZB<;Sqbc#*O76+xGLT)Is&QXo~QM+J!Es&j?J3NDN;&IcN6swHNLgNJo zC9x(*(#-taTw_CM$wZrPXs;O!XKQp}O+a9qXif59tk=#*F|kM)<^ z&(%|x?Pi6ev$aJu&IBa)&uhsdly_KY|K7Z^_|**dRk)( z(9_Tq!@l*qkv}|i_YiE@)zw`!h}zlN8L5pYg+zAma@Cje3KMsW3m`*m&}_Y1Th%SS z%Mrv#bMUXWfP~Ra++VXgSO0z@6o{2>;OhF_VWG|EC0xYqwbGQ+eL z&w~!chY_JnRg;ndK1apz^$oFT77O!kPOuMzk%A--p^vPvKv4p53fuApJ-c&p7qj}W zuk%I-2im;-THgd!9eML$s=fTCaQbna%MgRryu>U6#OJl;ZE_jEj+Ke2Vbye}>0=>U z*}kJUmpDK1g-0x_UYd^EELH!)*EofRJE=2MJ5yDRsoc&M8X*(`NnJ7=&Ra?-DFHW+ zk+_zFgM*p_S6b6Yq6o&E{&PUg?{O5E>M# zE!~6rPyYUPhI;evH}~D!s}v&62E@GPpYr6RDo2b>6z;AT3t$`!cPCv6`6HAGqUPUV zdfPR;mSonvnOWAmzF8%zoOEHhI|A(vfM%*oz(*MB>l2KwzU6sa6O1XSOX>Pp&!a0n z2Jn=G*-XR3j|V>7kce*3K0u3?zV)+r5$`x}$*xp*eTl4UtvT|VZG_ZhPpJM14FMxg zo8A^JkWc$jq+;`mdDL1WIf`zgJWe+LEy7In5lQvQ7;tp=PX>p&?-p^BbkO)A1LBHBcdjk{f7fk{lUr z;cJZQ>fCZcQA~@*Hv#N=pc_z&*&U*Q<$S~~Z$Z!ulv>kQ%+R=Gmf5Y|_f_u0a3457 z^N=RJcN?3KWi9HHbh;`xyWjCL5uctX(vle}#S$A4=HRfXT^YfHn6^OQpa2ga(2uK7 zC|NY3RfPT&wXVY8aIiI!?MP(Kz-bJ+T!n=^(Y_{IjY9U0)#^TB@3E-XC4*;<+1>1G zI()BG&#=nDoKQojXho#K(OKR~=5ckCaW8Z31dvfb`Kw`FXwv*E9EVBMEk~JmDmZJ< z(w^;${hw9edHUrwLQpuNn57!=b?3yplDLEh&5sc>6twPr+CYyWE}WEO^ch*eW~=y+q6F8lnln_A7CE~# zRGuw)M1>Ie9ru3AH@oa^zUTPtZhecNRW1a>_CUU2g#_no6f=frS)2;jz6(D7HJA`C z1Dvrs$2+ceNuk+xrU2d{KFL$ZuV2GO;PgIte)B#0PPjaOrya7$E+qHGaIgY-8Xa3B z%+)c}F327uV`Hvile&a^1o__GTrZ90kt|)biSUsWcx53fle#>|JTXutXm`baSzt1w zO`7M^(mPTppA}ETdPS`_Iy!h#@@ricI`&U`b>u_`qqX)gf+%I|lW_$NZ^H=6c zD0$^6yF<9EfI843 z^RoMulwt-`zy*(Vb`8PCSA!-@`!5yV9Q_Jg?9~%99GcKZ0Kv{4mKnQAkuC)CY73v# z;zLZAoSKi_2ybx=H{*kEUprAJK)rJlkJ#61#=KLE=^^%EA$)-m@t{h6)>{#I!5s`@ zB3W9B!BrmF83ydsz6OH#rPAisVh<7@85@hJ>8mOz68S3@akMq+_-08aqtWF*x}Gu= zDZd@z+!}JAzfM({{%`^&F5tFyv~N5H$%-dRNoIaM`MwYRGee97+ioAFGV!gDT)dbw zBQXRyik5|newosQo;$Q1cckwW*g^U%o(8##-%U+HbFVZEjnc<<>rFwD^KKh_wqS_- z(PhAm_Ly`t$<@83e0?1X9(MKjhSI${)OMIEZX#|k-e!aEWe(Lcds$P=#3YHK1>kw)IJnM7|_rSm)}_vy*SJrN**;Yo~uaF7{3?f(TW2U`OB_ zA)tF0H=DDyXBkEGtxvQQeO@GM4rlIi>9 zNu%%hV{5qRfqjboHt|} zzBEYtvv_a2s5vajluNnAkKqtA`W~d=2whKV7QAzmIw5-O%c(P z#K^7luG~5f$y8jy!gAGLb!WF)1SGVS+i&~TIQjC#>3p>+OTID6NbR24`F_laFi4bSQ=*QC%( zgemFky2Gb3DYHGns;|74biRB~w80$Jmqgy2)^zIdsk6DGg1>QP1)5Pk<)twm_BuiC zWCVXvyS7_GNGzePwESgQjRzJ_NG0u%Od*-e*X`Br8NSb~Di(d8rI_UP)sYjwc*R$I z%B3`3$-o_|5K#|Xqsna6nxNQ;(2DqC_Cnjv&tjDLVF3otY1SgzE&isBlgs>^p2lBN zvLa#)Fqmh}uT5GsWew`07P+SSf#<7{SyNOx_bgM7Olr}?@wsA6*a)AZ}Uz&CuJl!>=f_maM&%`^~4LmXqq^V7c5=aPy zc(q?5a$DRvnx}oe1~i^GoiiHQSy@Zm*q<)#w>i_ z-tE&g&+u__SS0M+zI=>!|uRsZt$~~>^%8;b-ZYH zjf|xsEo5|k#QW2-!sct#+{tm%jTR zH0m1XxR9G~jMSD!z%R99xA&s-bx6=A{$;tA+m$oz&@_y-H1DSGz&AwRkr{a=@U+;- zrTDH_PO0E+jyO!<3=OS~R*H^Y>En#JI5@-C@Lsq1*eoEK2ehpG%9)OH6drYk7Df{i z#(Ehs^VKq5T&G{;yZCXm$_mq7@TU#AX9g)$@5k1bEr64d*}3ODFt&BRhK3+Pj}2?M zF%GAaGu~TZe2nv%N90$_$uTrRA&)mr8&j>3J}m8;!>YH!Jl~Bt8hHpRD^5%`Q;tAY zQNYB+G@LrJI%-vDO<*7<(9LY_ZCX3t+7eJ0w4J`_+1+iQxA+ptQxxzW0#0CGQ5J_X zjuI|fLGd9b0aYyJVpN>m&YuIfGoylD>Ds*7)BoXW9`F7!{BaT2DACfiuFF!oV!Z1p?KK+H%1NG1ay&+@`E^~ zwsrF%VjN03>xe*AWo72uJW3Hy3^Y3NxX{3w)FD~YYry1`WDBFr{4QX>!tMUyT2tUu z=_Bl2FMG|!ns`k{p6DDL?0{LZhQ?m)^n#MaNB9?Dy%6A5ECs551i9K8_nU5OY`wB= z9LFC9i5^9H*+%>iKWQyaG_REV4sRwGWdeuiL|69sV0Pm?jv;h4(P*nVsC07{rAopm z;Rmc3^7530JbWi3Uubb#;P~aAryv%%G`Qlg=B(@7Qq z$vg*`Z#5d|7T-K%1TOH=LwN=IKZuk;JA%ELG&?71Ms-B<;N*rD)lu4}I^e)4VpiAN z1%UW`qi*!Y@{;~e+rtxR;)10e8=H%>y>=Zw^moHGp2qKgK|2N$5-po2XMoKxWB zDMm&J9Kpa%6jWxHnrh%iVT(xLyt=WFurrGokP@7L=Myy+sGn3Ld27A?E*L-SRHOMlmgMTy%H#7P@LH1U%VXjoa$`b)HX zpX_a3i6enAs4#YkF}F_prd)IL?)PzNvO}sbTR6ZQz_3$MqUVXN9=(r0HS^M;Fro<% z03b!ur+Lafh@>~`b(1@uc=7ZyvyzxfE7z}}RqFLY8P??YpUp|N*T#%Uf*tU2H2 z8he;p86hNXgo&5BZ=Wℑ1UB4MK-1i4JkT7%ktJmS^g3*SJfH;%9o>Eb7bwvGuPZ(V!Z(qHv)%#?d}0ZB~T6v4lok7ZBrUQo!2y=`iHuo?v1 z*s%^KRi3aN_`*(@EXIj*9>7yk7@Dv>*q=5FuD*A2_Dw5&mo6Ptzi20G!Hm!DPK)60 zTY5+q5-AeB>%@_amO2vu?xV-v%wzVWapE^f|0R71mK0P$?b2`1_X57}(#lV{=H(Bf zeY!Wmy5rmlj<=@gA3FvRR;r^u+sc*UQng9hf&@k1;e8!2=*yr(<^q>W6zk@-g=Xn@ zT2)#yd;GSPx_2dGzl^xACr|rQD3G*cA!=uTRD|xv-fLxK%sVY}{t)?5!q9_wG}D(b z&g1=pWzNa2kOApYk;x}{h4pXIp}u%REV{u!)2C5 z1-(#j6D~t&ZKL`&6JmRGSo6=@Zr_L#6NWito^D!yyu}(uwxA02BRwEmZx2v3XOz*2 zq7GujAe!WCq6z=N@)C=sz4>hHBO#e-2h=oFuBV>+y9|Wk;bdz&UV%t5JvPK|RK;t8 zmsb;Sv+mH+heJE8r*{XA3Je~H4s`S}~c{l7i^yenBzbD3jpTGUn%kK;0 w^PcRNe4zaM4(*?ozkiLN7tUY8M)x1fsJs;9i)S^&r@zCell}JRU#fuoKVb} Date: Tue, 7 Sep 2010 12:12:32 +0100 Subject: [PATCH 2/8] first trivial changes to menubar.xml for testing --- gui/.~lock.FG-menu-structure.ods# | 2 +- gui/FG-menu-structure.ods | Bin 12997 -> 13021 bytes gui/menubar.xml | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/.~lock.FG-menu-structure.ods# b/gui/.~lock.FG-menu-structure.ods# index 091fe1768..b5dc7b927 100644 --- a/gui/.~lock.FG-menu-structure.ods# +++ b/gui/.~lock.FG-menu-structure.ods# @@ -1 +1 @@ -,willie,gagarin.kosmos.ath.cx,07.09.2010 11:20,file:///home/willie/.openoffice.org/3; \ No newline at end of file +,willie,gagarin.kosmos.ath.cx,07.09.2010 12:12,file:///home/willie/.openoffice.org/3; \ No newline at end of file diff --git a/gui/FG-menu-structure.ods b/gui/FG-menu-structure.ods index 1204a4e793c75582de437053cc2977fe90f0c30c..f619dd3b25b17dbef6064e54b1bc0081af8d9f88 100644 GIT binary patch delta 5783 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 delta 5782 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 Bw`u?Y diff --git a/gui/menubar.xml b/gui/menubar.xml index 68fffb6dc..f108b6a69 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -460,7 +460,7 @@ - + multiplayer @@ -486,7 +486,10 @@ - + + + + From 821fae4a030056a992387c8bbdd1f6554c5718fb Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 7 Sep 2010 19:59:00 +0100 Subject: [PATCH 3/8] further changes to the menu structure split AI carrier options to its own menu moved "advanced" menu items to Debug removed several redundant items rationalised the placement of some items started adding keyboard shortcuts TODO: reinstate AI Scenario menu item (position to be conmfirmed) get feedback add more : keyboard shortcuts --- gui/dialogs/AIcarrier.xml | 221 ++++++ gui/dialogs/ai.xml | 74 ++ gui/menubar.xml | 318 +++++---- gui/menubar.xml~ | 752 ++++++++++++++++++++ keyboard.xml | 2 +- keyboard.xml~ | 1415 +++++++++++++++++++++++++++++++++++++ 6 files changed, 2653 insertions(+), 129 deletions(-) create mode 100644 gui/dialogs/AIcarrier.xml create mode 100644 gui/dialogs/ai.xml create mode 100644 gui/menubar.xml~ create mode 100644 keyboard.xml~ diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml new file mode 100644 index 000000000..fda87ccb0 --- /dev/null +++ b/gui/dialogs/AIcarrier.xml @@ -0,0 +1,221 @@ + + + + AIcarrier + false + vbox + + + + + + left + + + 0.9 + 0.9 + 0.9 + 1 + + + + + hbox + + 10 + + + + vbox + + + left + + /ai/models/carrier/controls/turn-to-launch-hdg + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/turn-to-recovery-hdg + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/turn-to-base-course + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/elevators + + dialog-apply + + + nasal + + + + + + left + + /sim/current-view/lso-commentary + + dialog-apply + + + + + left + + /sim/current-view/deck-park + + dialog-apply + + + + + left + + /ai/models/carrier/controls/lighting/deck-lights + + dialog-apply + + + nasal + + + + + + left + + + + + left + 75 + 25 + /ai/models/carrier/controls/lighting/flood-lights-red-norm + + nasal + + + + + + + + true + + + + + hbox + 6 + + true + + + + + + + + + + + + true + + + \ No newline at end of file diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml new file mode 100644 index 000000000..bba1c22eb --- /dev/null +++ b/gui/dialogs/ai.xml @@ -0,0 +1,74 @@ + + + + + + ai + false + vbox + + + + + + + + + + + + + + hbox + + 10 + + + + vbox + + + + + left + + /sim/ai-traffic/enabled + + + + hbox + + + left + + + + + left + /sim/ai-traffic/level + 1 + 2 + 3 + + + + + + + true + + + \ No newline at end of file diff --git a/gui/menubar.xml b/gui/menubar.xml index f108b6a69..ec36d8598 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -4,7 +4,7 @@ - + nasal @@ -12,33 +12,42 @@ - + nasal + + + + dialog-show + scenario + + + - + reset - + nasal + - + old-print-dialog @@ -65,23 +87,7 @@ - - - nasal - - - - - - - - dialog-show - logging - - - - - + dialog-show exit @@ -109,7 +115,7 @@ - + dialog-show view @@ -140,30 +146,28 @@ + + + + nasal + + + + - + + + dialog-show replay - - - - - dialog-show - static-lod - - - - - - - dialog-show - osg-display-settings - - - + @@ -193,7 +197,7 @@ - + H property-assign /sim/presets/trim @@ -234,7 +238,7 @@ autopilot - + dialog-show autopilot @@ -265,7 +269,7 @@ - + - - - - dialog-show - map - - + @@ -312,14 +310,6 @@ - - - - dialog-show - timeofday - - - @@ -328,14 +318,6 @@ - - - - nasal - - - - @@ -351,11 +333,45 @@ local_weather_tiles + + + + + + dialog-show + timeofday + + + + + + + nasal + + + + + + + + + dialog-show + map + + + + + + dialog-show + stopwatch-dialog + + + fuel-and-payload @@ -366,7 +382,7 @@ - + dialog-show radios @@ -389,14 +405,12 @@ - - - - dialog-show - stopwatch-dialog - - + + + + + @@ -424,24 +438,25 @@ - + + + + dialog-show + ai + + + - + ATC-freq-search - - - - dialog-show - atc-ai - - + - + tanker false @@ -450,13 +465,14 @@ - - - - dialog-show - scenario - - + + + + dialog-show + AIcarrier + + + @@ -464,7 +480,7 @@ multiplayer - + dialog-show chat-full @@ -487,11 +503,8 @@ - - - - + nasal + + @@ -539,13 +554,13 @@ - - - - reinit - io - - + + + + reinit + io + + @@ -603,20 +618,60 @@ 1 - + + + + + + + + + + nasal + + + + + + + + dialog-show + logging + + + + + + + + + dialog-show + static-lod + + + + + + + dialog-show + osg-display + + + dialog-show + about + + -settings + + + + + - - - dialog-show - about - - - - + old-help-dialog @@ -632,7 +687,11 @@ - + + + + + nasal @@ -648,24 +707,19 @@ - + nasal - - - - nasal - - - + + + + + + @@ -685,6 +739,14 @@ + + + + + dialog-show + about + + diff --git a/gui/menubar.xml~ b/gui/menubar.xml~ new file mode 100644 index 000000000..4c7c3a016 --- /dev/null +++ b/gui/menubar.xml~ @@ -0,0 +1,752 @@ + + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + dialog-show + scenario + + + + + + + reset + + + + + + + + nasal + + + + + + + + old-print-dialog + + + + + + + dialog-show + sound-dialog + + + + + + + dialog-show + exit + + + + + + + + + + + dialog-show + display + + + + + + + dialog-show + rendering + + + + + + + dialog-show + view + + + + + + + dialog-show + cockpit-view + + + + + + + dialog-show + pilot_offset + + + + + + + dialog-show + hud + + + + + + + nasal + + + + + + + + + + dialog-show + replay + + + + + + + + + + + dialog-show + location-on-ground + + + + + + + dialog-show + location-in-air + + + + + + + dialog-show + airports + + + + + H + + property-assign + /sim/presets/trim + false + + + property-randomize + /orientation/pitch-deg + 0 + 360 + + + property-randomize + /orientation/roll-deg + 0 + 360 + + + property-randomize + /orientation/heading-deg + 0 + 360 + + + + + + + dialog-show + location-of-tower + + + + + + + + autopilot + + + + + dialog-show + autopilot + + + + + + + dialog-show + route-manager + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + + + dialog-show + weather_scenario + + + + + + + dialog-show + weather + + + + + + + dialog-show + clouds + + + + + + + dialog-show + rainsnow + + + + + + + dialog-show + local_weather + + + + + + + dialog-show + local_weather_tiles + + + + + + + + dialog-show + timeofday + + + + + + + nasal + + + + + + + + + + + + + dialog-show + map + + + + + + + dialog-show + stopwatch-dialog + + + + + + fuel-and-payload + + nasal + + + + + + + + dialog-show + radios + + + + + + + dialog-show + gps + + + + + + + dialog-show + instruments + + + + + + + + + + + + + dialog-show + random-failures + + + + + + + dialog-show + system-failures + + + + + + + dialog-show + instrument-failures + + + + + + + + + + dialog-show + ai + + + + + + + ATC-freq-search + + + + + + + + tanker + false + + dialog-show + tanker + + + + + + + dialog-show + AIcarrier + + + + + + + + multiplayer + + + + + dialog-show + chat-full + + + + + + + dialog-show + chat-menu + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + reinit + gui + + + + + + + reinit + input + + + + + + + panel-load + + + + + + + reinit + xml-autopilot + + + + + + + reinit + io + + + + + + + dialog-show + nasal-console + + + + + + + nasal + + + + + + + + dialog-show + devel-extensions + + + + + + + nasal + + + + + + + + dump-scenegraph + + + + + + + property-assign + /sim/rendering/print-statistics + true + + + + + + + property-adjust + /sim/rendering/on-screen-statistics + 1 + + + + + + + + + + + + nasal + + + + + + + + dialog-show + logging + + + + + + + + + dialog-show + static-lod + + + + + + + dialog-show + osg-display + + + dialog-show + about + + -settings + + + + + + + + + + + + + old-help-dialog + + + + + + joystick-info + + dialog-show + joystick-info + + + + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + tutorial-start + + dialog-show + tutorial + + + + + + tutorial-stop + false + + nasal + + + + + + + + dialog-show + about + + + + + diff --git a/keyboard.xml b/keyboard.xml index e4010ac4d..d61f3d731 100644 --- a/keyboard.xml +++ b/keyboard.xml @@ -272,7 +272,7 @@ top down before the key bindings are parsed. SPACE - PTT - Push To Talk (via VoIP) + PTT - Push To Talk (via FGCom) nasal diff --git a/keyboard.xml~ b/keyboard.xml~ new file mode 100644 index 000000000..d61f3d731 --- /dev/null +++ b/keyboard.xml~ @@ -0,0 +1,1415 @@ + + + + + + + + + + Ctrl-A + Toggle autopilot altitude lock + + nasal + + + + + + Ctrl-B + Toggle speedbrake + + property-toggle + /controls/flight/speedbrake + + + + + Ctrl-C + Toggle clickable panel hotspots + + property-toggle + /sim/panel-hotspots + + + + + Ctrl-G + Toggle autopilot glide slope lock + + nasal + + + + + + Ctrl-H + Toggle autopilot heading lock + + nasal + + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Ctrl-N + Toggle autopilot nav1 lock + + nasal + + + + + + Ctrl-P + Toggle pitch hold + + nasal + + + + + + Ctrl-R + Activate the instant replay system + + replay + + + + + Ctrl-S + Toggle auto-throttle lock + + nasal + + + + + + Ctrl-T + Toggle autopilot terrain lock + + nasal + + + + + + Ctrl-U + [Cheat] Add 1000ft of emergency altitude + + property-adjust + /position/altitude-ft + 1000.0 + + + property-assign + /sim/startup/onground + false + + + + + Ctrl-V + Select initial view (view 0) + + property-assign + /sim/current-view/view-number + 0 + + + + + Ctrl-W + Toggle autopilot wing leveler + + nasal + + + + + + Ctrl-X + Reset zoom to default + + property-assign + /sim/current-view/field-of-view + /sim/view/config/default-field-of-view-deg + + + + + ESC + Prompt and quit FlightGear + + dialog-show + exit + + + Reset FlightGear + + reset + + + + + + SPACE + PTT - Push To Talk (via FGCom) + + nasal + + + + + nasal + + + + + + nasal + + + + + nasal + + + + + + + + ! + Select first engine + + nasal + + + + + + # + Select third engine + + nasal + + + + + + $ + Select fourth engine + + nasal + + + + + + ' + Display a dialog relevant to the tuned in ATC service (if any) + + ATC-dialog + + + + + + + Let ATC/instructor repeat last message + + nasal + + + + + + , + Left brake + + nasal + + + + + nasal + + + + + + + - + false + Chat Menu + + dialog-show + chat-menu + + + + + . + Right brake + + nasal + + + + + nasal + + + + + + + / + Open property browser + + + + /sim/input/property-key-handler + + + nasal + + + + + /sim/input/property-key-handler + + nasal + + + + + + 0 + Move rudder left + true + + property-adjust + /controls/flight/rudder + -0.05 + + + + + 1 + Decrease elevator trim + true + + property-adjust + /controls/flight/elevator-trim + -0.001 + + + Look back left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-left-direction-deg + + + + + + 2 + Increase elevator or autopilot altitude + true + + nasal + + + + Look back + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-direction-deg + + + + + + 3 + Decrease throttle or autopilot autothrottle + true + + nasal + + + + Look back right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-right-direction-deg + + + + + + 4 + Move aileron left (or adjust AP heading.) + true + + nasal + + + + Look left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/left-direction-deg + + + + + + 5 + Center aileron, elevator, and rudder + + nasal + + + + + + 6 + Move aileron right (or adjust AP heading.) + true + + nasal + + + + Look right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/right-direction-deg + + + + + + 7 + Increase elevator trim + true + + property-adjust + /controls/flight/elevator-trim + 0.001 + + + Look front left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-left-direction-deg + + + + + + 8 + Decrease elevator or autopilot altitude + true + + nasal + + + + Look forward + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-direction-deg + + + + + + 9 + Increase throttle or autopilot autothrottle + true + + nasal + + + + Look front right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-right-direction-deg + + + + + + : + Start multikey command + + nasal + + + + + + ? + Show help dialog + + nasal + + + + + + @ + Select second engine + + nasal + + + + + + A + Decrease speed-up + + property-adjust + /sim/speed-up + 1 + -1 + + + + + B + Toggle parking brake on or off + + nasal + + + + + nasal + + + + + + + G + Gear down + + nasal + + + + + nasal + + + + + + + H + Cycle HUD Brightness + + nasal + + + + + + I + Switch to and toggle alternative HUD types + + nasal + + + + + + M + Mixture leaner + true + + nasal + + + + + + N + Propeller Coarser + true + + nasal + + + + + + P + Toggle panel + + property-toggle + /sim/panel/visibility + + + + + S + Swap panels + + + + /sim/allow-toggle-cockpit + + + property-swap + /sim/panel/path + /sim/panel_2/path + + + + + /sim/allow-toggle-cockpit + + + panel-load + + + + + T + Decrease warp delta + + property-adjust + /sim/time/warp-delta + -30 + + + + + V + Scroll in reverse through views + + nasal + + + + + + W + Decrease warp + + property-adjust + /sim/time/warp + -60 + + + + + X + Increase field of view + true + + nasal + + + + + + Z + Decrease Visibility + true + + decrease-visibility + + + + + [ + Decrease flaps + + nasal + + + + + nasal + + + + + + + ] + Increase flaps + + nasal + + + + + nasal + + + + + + + _ + false + Compose Chat + + nasal + + + + + + a + Increase speed-up + + property-adjust + /sim/speed-up + 1 + 1 + + + + + b + Apply all brakes + + nasal + + + + + nasal + + + + + + + c + Toggle 3D/2D cockpit + + nasal + + + + + + g + Gear Up + + nasal + + + + + nasal + + + + + + + h + HUD Master Switch + + nasal + + + + + + i + Normal HUD + + nasal + + + + + + j + Decrease spoilers + + nasal + + + + + + k + Increase spoilers + + nasal + + + + + + l + Toggle tail-wheel lock + + property-toggle + /controls/gear/tailwheel-lock + + + + + m + Mixture richer + true + + nasal + + + + + + n + Propeller Finer + true + + nasal + + + + + + p + Toggle the pause state of the sim + + property-toggle + /sim/freeze/master + + + property-toggle + /sim/freeze/clock + + + + /sim/freeze/replay-state + + property-assign + /sim/freeze/replay-state + 0 + + + + + s + Fire Starter on Selected Engine(s) + + nasal + + + + + nasal + + + + + + + + + + + t + Increase warp delta + + property-adjust + /sim/time/warp-delta + 30 + + + nasal + + + + + nasal + + + + + + + v + Scroll through views + + nasal + + + + + + w + Increase warp + + property-adjust + /sim/time/warp + 60 + + + + + x + Decrease field of view + true + + nasal + + + + + + z + Increase Visibility + true + + increase-visibility + + + + + { + Decrease Magneto on Selected Engine + + nasal + + + + + nasal + + + + + + + } + Increase Magneto on Selected Engine + + nasal + + + + + nasal + + + + + + + ~ + Select all engines + + nasal + + + + + + F1 + + Load flight + + load + + + + + + + Save flight + + save + false + + + + + + F3 + Capture screen + + nasal + + + + Load panel + + panel-load + + + + + + F5 + true + + Scroll panel down + + property-adjust + /sim/panel/y-offset + -5 + + + + + + F6 + Toggle Autopilot Heading Mode + true + + nasal + + + + Scroll panel up + + property-adjust + /sim/panel/y-offset + 5 + + + + + + F7 + true + + Scroll panel left + + property-adjust + /sim/panel/x-offset + -5 + + + + + + F8 + + true + + Scroll panel right + + property-adjust + /sim/panel/x-offset + 5 + + + + + + F10 + Toggle menubar + + property-toggle + /sim/menubar/visibility + + + Switch to next GUI style + + nasal + + + + + + + F11 + Pop up autopilot dialog + + dialog-show + autopilot + + + + + F12 + Pop up radio settings dialog + + dialog-show + radios + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Keypad 5 + Center aileron, elevator, and rudder + + nasal + + + + + + Left + Move aileron left (or adjust AP heading.) + true + + nasal + + + + Look left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/left-direction-deg + + + + + + Up + Increase elevator or autopilot altitude + true + + nasal + + + + Look forward + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-direction-deg + + + + + + Right + Move aileron right (or adjust AP heading.) + true + + nasal + + 0.05 + + + Look right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/right-direction-deg + + + + + + Down + Decrease elevator or autopilot altitude + true + + nasal + + + + Look backwards + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-direction-deg + + + + + + PageUp + Increase throttle or autopilot autothrottle + true + + nasal + + + + Look front right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-right-direction-deg + + + + + + PageDown + Decrease throttle or autopilot autothrottle + true + + nasal + + + + Look back right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-right-direction-deg + + + + + + Home + Increase elevator trim + true + + property-adjust + /controls/flight/elevator-trim + 0.001 + + + Look front left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-left-direction-deg + + + + + + End + Decrease elevator trim + true + + property-adjust + /controls/flight/elevator-trim + -0.001 + + + Look back left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-left-direction-deg + + + + + + Insert + Move rudder left + true + + property-adjust + /controls/flight/rudder + -0.05 + + + + + + From 7a8e8af600820ad352505368809e84b1c64537eb Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 7 Sep 2010 20:07:53 +0100 Subject: [PATCH 4/8] minor typo clean up --- gui/menubar.xml | 4 +--- gui/menubar.xml~ | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gui/menubar.xml b/gui/menubar.xml index ec36d8598..b2918aee7 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -159,9 +159,7 @@ - - - + dialog-show replay diff --git a/gui/menubar.xml~ b/gui/menubar.xml~ index 4c7c3a016..ec36d8598 100644 --- a/gui/menubar.xml~ +++ b/gui/menubar.xml~ @@ -115,7 +115,7 @@ - + dialog-show view From d70fc6660e677ec9a541914080389cc32d0c4083 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 8 Sep 2010 00:12:24 +0100 Subject: [PATCH 5/8] reinstated "Scenario" other small tidy-ups --- gui/menubar.xml | 64 ++-- gui/menubar.xml~ | 752 ----------------------------------------------- 2 files changed, 35 insertions(+), 781 deletions(-) delete mode 100644 gui/menubar.xml~ diff --git a/gui/menubar.xml b/gui/menubar.xml index b2918aee7..deb8e6cce 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -18,7 +18,7 @@ - + @@ -35,13 +35,22 @@ +--> @@ -114,7 +123,16 @@ - + dialog-show @@ -266,19 +284,6 @@ - - - - @@ -443,7 +448,7 @@ ai - + @@ -471,6 +476,16 @@ + + + + dialog-show + scenario + + + + + @@ -652,13 +667,7 @@ dialog-show - osg-display - - - dialog-show - about - - -settings + osg-display-settings @@ -715,9 +724,6 @@ - - - diff --git a/gui/menubar.xml~ b/gui/menubar.xml~ deleted file mode 100644 index ec36d8598..000000000 --- a/gui/menubar.xml~ +++ /dev/null @@ -1,752 +0,0 @@ - - - - - - - - - nasal - - - - - - - - nasal - - - - - - - - dialog-show - scenario - - - - - - - reset - - - - - - - - nasal - - - - - - - - old-print-dialog - - - - - - - dialog-show - sound-dialog - - - - - - - dialog-show - exit - - - - - - - - - - - dialog-show - display - - - - - - - dialog-show - rendering - - - - - - - dialog-show - view - - - - - - - dialog-show - cockpit-view - - - - - - - dialog-show - pilot_offset - - - - - - - dialog-show - hud - - - - - - - nasal - - - - - - - - - - dialog-show - replay - - - - - - - - - - - dialog-show - location-on-ground - - - - - - - dialog-show - location-in-air - - - - - - - dialog-show - airports - - - - - H - - property-assign - /sim/presets/trim - false - - - property-randomize - /orientation/pitch-deg - 0 - 360 - - - property-randomize - /orientation/roll-deg - 0 - 360 - - - property-randomize - /orientation/heading-deg - 0 - 360 - - - - - - - dialog-show - location-of-tower - - - - - - - - autopilot - - - - - dialog-show - autopilot - - - - - - - dialog-show - route-manager - - - - - - - nasal - - - - - - - - nasal - - - - - - - - - - - - - - - - dialog-show - weather_scenario - - - - - - - dialog-show - weather - - - - - - - dialog-show - clouds - - - - - - - dialog-show - rainsnow - - - - - - - dialog-show - local_weather - - - - - - - dialog-show - local_weather_tiles - - - - - - - - dialog-show - timeofday - - - - - - - nasal - - - - - - - - - - - - - dialog-show - map - - - - - - - dialog-show - stopwatch-dialog - - - - - - fuel-and-payload - - nasal - - - - - - - - dialog-show - radios - - - - - - - dialog-show - gps - - - - - - - dialog-show - instruments - - - - - - - - - - - - - dialog-show - random-failures - - - - - - - dialog-show - system-failures - - - - - - - dialog-show - instrument-failures - - - - - - - - - - dialog-show - ai - - - - - - - ATC-freq-search - - - - - - - - tanker - false - - dialog-show - tanker - - - - - - - dialog-show - AIcarrier - - - - - - - - multiplayer - - - - - dialog-show - chat-full - - - - - - - dialog-show - chat-menu - - - - - - - nasal - - - - - - - - nasal - - - - - - - - - - - - - - reinit - gui - - - - - - - reinit - input - - - - - - - panel-load - - - - - - - reinit - xml-autopilot - - - - - - - reinit - io - - - - - - - dialog-show - nasal-console - - - - - - - nasal - - - - - - - - dialog-show - devel-extensions - - - - - - - nasal - - - - - - - - dump-scenegraph - - - - - - - property-assign - /sim/rendering/print-statistics - true - - - - - - - property-adjust - /sim/rendering/on-screen-statistics - 1 - - - - - - - - - - - - nasal - - - - - - - - dialog-show - logging - - - - - - - - - dialog-show - static-lod - - - - - - - dialog-show - osg-display - - - dialog-show - about - - -settings - - - - - - - - - - - - - old-help-dialog - - - - - - joystick-info - - dialog-show - joystick-info - - - - - - - - - - - nasal - - - - - - - - nasal - - - - - - - - nasal - - - - - - - - - - - - - - tutorial-start - - dialog-show - tutorial - - - - - - tutorial-stop - false - - nasal - - - - - - - - dialog-show - about - - - - - From fe7cfe3b3a268f66ade9c81db27290a1351116ec Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 8 Sep 2010 00:15:38 +0100 Subject: [PATCH 6/8] removed "housekeeping" files --- gui/.~lock.FG-menu-structure.ods# | 1 - 1 file changed, 1 deletion(-) delete mode 100644 gui/.~lock.FG-menu-structure.ods# diff --git a/gui/.~lock.FG-menu-structure.ods# b/gui/.~lock.FG-menu-structure.ods# deleted file mode 100644 index b5dc7b927..000000000 --- a/gui/.~lock.FG-menu-structure.ods# +++ /dev/null @@ -1 +0,0 @@ -,willie,gagarin.kosmos.ath.cx,07.09.2010 12:12,file:///home/willie/.openoffice.org/3; \ No newline at end of file From fe231637fb02015d960c225e941db9bdfa13c385 Mon Sep 17 00:00:00 2001 From: willie Date: Wed, 8 Sep 2010 00:17:42 +0100 Subject: [PATCH 7/8] minor tidy-up --- keyboard.xml~ | 1415 ------------------------------------------------- 1 file changed, 1415 deletions(-) delete mode 100644 keyboard.xml~ diff --git a/keyboard.xml~ b/keyboard.xml~ deleted file mode 100644 index d61f3d731..000000000 --- a/keyboard.xml~ +++ /dev/null @@ -1,1415 +0,0 @@ - - - - - - - - - - Ctrl-A - Toggle autopilot altitude lock - - nasal - - - - - - Ctrl-B - Toggle speedbrake - - property-toggle - /controls/flight/speedbrake - - - - - Ctrl-C - Toggle clickable panel hotspots - - property-toggle - /sim/panel-hotspots - - - - - Ctrl-G - Toggle autopilot glide slope lock - - nasal - - - - - - Ctrl-H - Toggle autopilot heading lock - - nasal - - - - - - Enter - Move rudder right - true - - property-adjust - /controls/flight/rudder - 0.05 - - - - - Enter - Move rudder right - true - - property-adjust - /controls/flight/rudder - 0.05 - - - - - Ctrl-N - Toggle autopilot nav1 lock - - nasal - - - - - - Ctrl-P - Toggle pitch hold - - nasal - - - - - - Ctrl-R - Activate the instant replay system - - replay - - - - - Ctrl-S - Toggle auto-throttle lock - - nasal - - - - - - Ctrl-T - Toggle autopilot terrain lock - - nasal - - - - - - Ctrl-U - [Cheat] Add 1000ft of emergency altitude - - property-adjust - /position/altitude-ft - 1000.0 - - - property-assign - /sim/startup/onground - false - - - - - Ctrl-V - Select initial view (view 0) - - property-assign - /sim/current-view/view-number - 0 - - - - - Ctrl-W - Toggle autopilot wing leveler - - nasal - - - - - - Ctrl-X - Reset zoom to default - - property-assign - /sim/current-view/field-of-view - /sim/view/config/default-field-of-view-deg - - - - - ESC - Prompt and quit FlightGear - - dialog-show - exit - - - Reset FlightGear - - reset - - - - - - SPACE - PTT - Push To Talk (via FGCom) - - nasal - - - - - nasal - - - - - - nasal - - - - - nasal - - - - - - - - ! - Select first engine - - nasal - - - - - - # - Select third engine - - nasal - - - - - - $ - Select fourth engine - - nasal - - - - - - ' - Display a dialog relevant to the tuned in ATC service (if any) - - ATC-dialog - - - - - + - Let ATC/instructor repeat last message - - nasal - - - - - - , - Left brake - - nasal - - - - - nasal - - - - - - - - - false - Chat Menu - - dialog-show - chat-menu - - - - - . - Right brake - - nasal - - - - - nasal - - - - - - - / - Open property browser - - - - /sim/input/property-key-handler - - - nasal - - - - - /sim/input/property-key-handler - - nasal - - - - - - 0 - Move rudder left - true - - property-adjust - /controls/flight/rudder - -0.05 - - - - - 1 - Decrease elevator trim - true - - property-adjust - /controls/flight/elevator-trim - -0.001 - - - Look back left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-left-direction-deg - - - - - - 2 - Increase elevator or autopilot altitude - true - - nasal - - - - Look back - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-direction-deg - - - - - - 3 - Decrease throttle or autopilot autothrottle - true - - nasal - - - - Look back right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-right-direction-deg - - - - - - 4 - Move aileron left (or adjust AP heading.) - true - - nasal - - - - Look left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/left-direction-deg - - - - - - 5 - Center aileron, elevator, and rudder - - nasal - - - - - - 6 - Move aileron right (or adjust AP heading.) - true - - nasal - - - - Look right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/right-direction-deg - - - - - - 7 - Increase elevator trim - true - - property-adjust - /controls/flight/elevator-trim - 0.001 - - - Look front left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-left-direction-deg - - - - - - 8 - Decrease elevator or autopilot altitude - true - - nasal - - - - Look forward - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-direction-deg - - - - - - 9 - Increase throttle or autopilot autothrottle - true - - nasal - - - - Look front right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-right-direction-deg - - - - - - : - Start multikey command - - nasal - - - - - - ? - Show help dialog - - nasal - - - - - - @ - Select second engine - - nasal - - - - - - A - Decrease speed-up - - property-adjust - /sim/speed-up - 1 - -1 - - - - - B - Toggle parking brake on or off - - nasal - - - - - nasal - - - - - - - G - Gear down - - nasal - - - - - nasal - - - - - - - H - Cycle HUD Brightness - - nasal - - - - - - I - Switch to and toggle alternative HUD types - - nasal - - - - - - M - Mixture leaner - true - - nasal - - - - - - N - Propeller Coarser - true - - nasal - - - - - - P - Toggle panel - - property-toggle - /sim/panel/visibility - - - - - S - Swap panels - - - - /sim/allow-toggle-cockpit - - - property-swap - /sim/panel/path - /sim/panel_2/path - - - - - /sim/allow-toggle-cockpit - - - panel-load - - - - - T - Decrease warp delta - - property-adjust - /sim/time/warp-delta - -30 - - - - - V - Scroll in reverse through views - - nasal - - - - - - W - Decrease warp - - property-adjust - /sim/time/warp - -60 - - - - - X - Increase field of view - true - - nasal - - - - - - Z - Decrease Visibility - true - - decrease-visibility - - - - - [ - Decrease flaps - - nasal - - - - - nasal - - - - - - - ] - Increase flaps - - nasal - - - - - nasal - - - - - - - _ - false - Compose Chat - - nasal - - - - - - a - Increase speed-up - - property-adjust - /sim/speed-up - 1 - 1 - - - - - b - Apply all brakes - - nasal - - - - - nasal - - - - - - - c - Toggle 3D/2D cockpit - - nasal - - - - - - g - Gear Up - - nasal - - - - - nasal - - - - - - - h - HUD Master Switch - - nasal - - - - - - i - Normal HUD - - nasal - - - - - - j - Decrease spoilers - - nasal - - - - - - k - Increase spoilers - - nasal - - - - - - l - Toggle tail-wheel lock - - property-toggle - /controls/gear/tailwheel-lock - - - - - m - Mixture richer - true - - nasal - - - - - - n - Propeller Finer - true - - nasal - - - - - - p - Toggle the pause state of the sim - - property-toggle - /sim/freeze/master - - - property-toggle - /sim/freeze/clock - - - - /sim/freeze/replay-state - - property-assign - /sim/freeze/replay-state - 0 - - - - - s - Fire Starter on Selected Engine(s) - - nasal - - - - - nasal - - - - - - - - - - - t - Increase warp delta - - property-adjust - /sim/time/warp-delta - 30 - - - nasal - - - - - nasal - - - - - - - v - Scroll through views - - nasal - - - - - - w - Increase warp - - property-adjust - /sim/time/warp - 60 - - - - - x - Decrease field of view - true - - nasal - - - - - - z - Increase Visibility - true - - increase-visibility - - - - - { - Decrease Magneto on Selected Engine - - nasal - - - - - nasal - - - - - - - } - Increase Magneto on Selected Engine - - nasal - - - - - nasal - - - - - - - ~ - Select all engines - - nasal - - - - - - F1 - - Load flight - - load - - - - - - - Save flight - - save - false - - - - - - F3 - Capture screen - - nasal - - - - Load panel - - panel-load - - - - - - F5 - true - - Scroll panel down - - property-adjust - /sim/panel/y-offset - -5 - - - - - - F6 - Toggle Autopilot Heading Mode - true - - nasal - - - - Scroll panel up - - property-adjust - /sim/panel/y-offset - 5 - - - - - - F7 - true - - Scroll panel left - - property-adjust - /sim/panel/x-offset - -5 - - - - - - F8 - - true - - Scroll panel right - - property-adjust - /sim/panel/x-offset - 5 - - - - - - F10 - Toggle menubar - - property-toggle - /sim/menubar/visibility - - - Switch to next GUI style - - nasal - - - - - - - F11 - Pop up autopilot dialog - - dialog-show - autopilot - - - - - F12 - Pop up radio settings dialog - - dialog-show - radios - - - - - Enter - Move rudder right - true - - property-adjust - /controls/flight/rudder - 0.05 - - - - - Keypad 5 - Center aileron, elevator, and rudder - - nasal - - - - - - Left - Move aileron left (or adjust AP heading.) - true - - nasal - - - - Look left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/left-direction-deg - - - - - - Up - Increase elevator or autopilot altitude - true - - nasal - - - - Look forward - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-direction-deg - - - - - - Right - Move aileron right (or adjust AP heading.) - true - - nasal - - 0.05 - - - Look right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/right-direction-deg - - - - - - Down - Decrease elevator or autopilot altitude - true - - nasal - - - - Look backwards - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-direction-deg - - - - - - PageUp - Increase throttle or autopilot autothrottle - true - - nasal - - - - Look front right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-right-direction-deg - - - - - - PageDown - Decrease throttle or autopilot autothrottle - true - - nasal - - - - Look back right - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-right-direction-deg - - - - - - Home - Increase elevator trim - true - - property-adjust - /controls/flight/elevator-trim - 0.001 - - - Look front left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/front-left-direction-deg - - - - - - End - Decrease elevator trim - true - - property-adjust - /controls/flight/elevator-trim - -0.001 - - - Look back left - - property-assign - /sim/current-view/goal-heading-offset-deg - /sim/view/config/back-left-direction-deg - - - - - - Insert - Move rudder left - true - - property-adjust - /controls/flight/rudder - -0.05 - - - - - - From 408bc4973a767fb8a5ac01bc5e40283a10305d7b Mon Sep 17 00:00:00 2001 From: willie Date: Thu, 9 Sep 2010 23:34:23 +0100 Subject: [PATCH 8/8] some changes made after feedback on IRC TODO: sort out right-align for keyboard shortcuts --- gui/dialogs/view.xml | 2 +- gui/menubar.xml | 34 +++++++++++++++------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml index d1c1a2ad7..b105ee1db 100644 --- a/gui/dialogs/view.xml +++ b/gui/dialogs/view.xml @@ -6,7 +6,7 @@ vbox - + diff --git a/gui/menubar.xml b/gui/menubar.xml index deb8e6cce..22cc833ae 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -1,7 +1,7 @@ - + @@ -28,7 +28,7 @@ --> - + reset @@ -52,7 +52,7 @@ --> - + nasal ---> + old-print-dialog - +--> @@ -96,7 +96,7 @@ - + dialog-show exit @@ -133,7 +133,7 @@ --> - + dialog-show view @@ -148,6 +148,14 @@ + + + + dialog-show + static-lod + + + @@ -632,11 +640,6 @@ - - - - - @@ -655,13 +658,6 @@ - - - - dialog-show - static-lod - -