From 6f7dff6fb2c487ea9a6fe2fc4bc33de446efcff3 Mon Sep 17 00:00:00 2001 From: wellu Date: Tue, 14 Oct 2008 05:10:35 +0000 Subject: [PATCH] Yet another mod. git-svn-id: file:///svnroot/speedometer/trunk@48 df364472-da61-43ef-8a67-511c89aa921b --- README | 15 +++------------ callbacks.c | 22 ++++++++-------------- callbacks.h | 3 --- data/dot.png | Bin 9197 -> 0 bytes ui.c | 2 +- 5 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 data/dot.png diff --git a/README b/README index 9fbcbec..913066d 100644 --- a/README +++ b/README @@ -2,25 +2,16 @@ This application and all its files are released under GPL license. See COPYING for the whole license text. There is one catch though.. If you really like this -program I would like to get a postcard from you. Include -word Speedometer in the card so I know that the card is -related to this software (like I'm getting tons of -anynomous postcards all around the world ;) +program I would like to get a postcard from you. This is *not* to say you have to but it would be very nice. See http://en.wikipedia.org/wiki/Cardware if you don't know what this means. - Anyway, here goes the address: -Wellu Mäkinen -PO Box +Wellu Mäkinen, +Poste restante, 33580 Tampere - FINLAND - - - - diff --git a/callbacks.c b/callbacks.c index 9159c60..ea30825 100644 --- a/callbacks.c +++ b/callbacks.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . -****/ + ****/ #include #include @@ -29,7 +29,7 @@ void location_changed(LocationGPSDevice* device, gpointer data) { if(device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) { if(!isnan(device->fix->speed)) { interpret_and_set_speed(device->fix->speed); - } + } } } @@ -75,22 +75,16 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo return FALSE; } -gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) { - g_assert(data); - +gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) { gdouble x = event->x; - g_print("Top event box pressed at: %f\n", x); - AppData* appdata = (AppData*) data; - - if(x > 750) { - g_print("Exiting..\n"); + if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) { + g_assert(data); + AppData* appdata = (AppData*) data; g_signal_emit_by_name(appdata->window, "delete_event"); } - return TRUE; -} -gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) { - gdouble x = event->x; + + g_print("Middle event box pressed at: %f\n", x); g_print("Changing conversion unit\n"); change_unit(); diff --git a/callbacks.h b/callbacks.h index 465482b..44911d0 100644 --- a/callbacks.h +++ b/callbacks.h @@ -32,9 +32,6 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo // middle event box gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data); -// top event box -gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data); - // bottom event box gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data); diff --git a/data/dot.png b/data/dot.png deleted file mode 100644 index 9f6ec4b523d060e6fe1302def3edf3705de65d35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9197 zcmeHtWmg={^ENJvdkF5n!QHYfvbY8(i$jp$?z%t-?vUUTY#~5c2(q{Zf&>X32=1OB z`S1Pv4A0Bw%*^STKGWS(-PKoJRW%8^+Nwl==KwS`G$M!^SRYkRqoJYW(ps;CrZEBK5-mZd^QR~A<1vip4|AlAG91t%4e~p_kGBJ zR*JZBiD=2Ru6)m)ah5sWPN~euM88m7en4L&t^BT^rI_@M59_r;BotF6o8NMEH}JUY z)jyLS-cWW1}|%1VX^}h0^df@ zRv58A<2%q!v^|)TOc?b}GOqX6!G7UGRX#LEe#GoSdm_BEKO63Cj7rHq$V`MN`*09& zceqv|8F9S{C;X9Z$Q|fC)C;a8C<2Xxc3iww8TFr5kNJ+fjD}Fk-{{=1 z@Uqw4(aqkF)};=H)ikUB*V>-HcrMf&XBk~4qAsEiGmz0Ce(ptJ@PA2 zAo{U*i(CtROLUdWcw%a4ZaypTVAS@;7<1GNR%E8YGbwK2XBcdlWem^0A)T<4Up$y1 zh)(F+mythgIjAxc_k<}(p~grn%q8h<95YV53ftnXlEV_0ZC}a^Eq;A`>fW*2%_xtr zB=aK(=F&bTYp9d8N#FPWUSu&xiWDKyI~-kC5PBvTvL?8SwZjHW6!Vy@g~3N8m&Y0> zS8Ovs!R8{%XeJ`6i&{eGk%f_gn3s$@{1Z~SP2YXLH+{cIrKn3g_ZrR7r_gHw z$(xi!QlO*D5VsMzV#=H++5jL5Dh%ASl91SP){Z)?xyX=IlaJhtBm~sN0Vd2Amo`}r zKxHr%-yEi&tgHDVhIpjF3mUjVOwa6FBpi2;obrDww%bSbJrP4#umD*YkBy5PF&L0{ z7Q~o~=|Jd1N(Qm8b87ci)3hrlM8rXjBD&+dBi+a*vLlH|=z68$&d|>h$FiR1AI#Kv zS*fPw@zk2lxA<4YQj22eEm(`4LL-z3G>Ef__&He3&>TWZ^$NzwO%a+8!Xeiinrd%z zZ~(Yvdy@&UHUo6pc5aZF1e~@$JvQuJMt1Qc16xgMgWUz6b!wFz!(KqOF#Is}#mibk z+Ap-2-W>b^Ce85e&EiP=zE(Al!%~@r>+j-Oe2%l_pa=UUHiRzBTtd`Zz;7sSKsi3O z&WUz}-Y$>-mxEqHjN-RQrU(U+Lc;lP!Mz*FC~Xrpk~mpyPL+;v6(3Nn|A03VSB_l7 zK*x=w!W`EIZ(Ad=j2jLIv%FbZKbcfJXLS)sFxVvHIUlCsH62Ea|Ey$uZQpI?FU(0c zgBOyN>S=-<4t!8(n5hHotFw2mtV&|;!0@VRsP&emd~C?kB~xL$%y9CL1sgL07`R}t zw+&?n7FioXTzyosAEYPCDvqCo24Rx767O4GcraG#aYJ4X;bp8d5o7c9SK4@fmJ-W^ zudM|8OW6vZ_1MDmOf5>oKQ57pG9|d22IP_AGKjJ=lV}K03$suk44Ld<+_o}qD75wr zJ2n$_+dnst9h&fJeZ496^gOKO>xb9R1w7n%&ZkY(D)s(Am1xN>D&+zAXL+!Z2pN9t z`f(&L0-8AY+}XxjeX0EvBu~fb>PTwQ9!P*|K{}R5GQUgeF@l9IkOZd=u@9BTmZ|?Y ztWX#j@vl%rZ1VG6sc^$@ffKQZ*-fJr@hfC29r>>^28x+wA*2VgKM->le*qgxWO577 z>i47jyPE;V+|YLZX}*fU|H*7S04R!fWo!=fsOcbf@XqA})qTdIZ!w~$#BO0(~c=c)3`22@gzF7?HU13lsa2A!3_;Wc3vW0r0)z8Zsm|&MJj2 zVCO{l6uTF7c+bLO@o4!kE#cU9$Aa_OLH0KNN1F2p4_&ci!NpO z)HD8D_tDMX;GDTSOyUp0C1mY;S8pf-sE+FJYNsAnV24~t zYL8r^_91Zk0;&{}!MySOGtqsnRO+O8RmeZhlMp)@pX^f)I@q+K$D(icSnN0IB_oOF z;51{^T$93Fje5D8@zweU|LLukqKM_41XIlVLo!_Hbe~(}Zmw$M@gI5jL)L2e+HZI` z-N!?w?HzQM;8nH()kE=tmpVa`yPI{fpNS`F+f$LsB<5^;MAm1*&+6koy|s)m((u{G zk2MlZ8Gm(x(M*3q{xi0Yhzy{)Ygw(ID`5nga@Ax-s}H_Ab~jKQ*Es9>NApm0EB85q zxvsE#i^1bGXQQ79@K3&CO6otMEw>__(xgW);P2kPoUhplwdd$8d(*}161$xs_b2KI zvzj$uvPo%5NKj{t`qY|R)NM4Zm^KgQtpfbWPRgEKq=1w=zQ5}-n^8(ta@9*qT5?@Y8?O;7PmmJKWBu%tm7I$4AxzN>gnX51$(|VVy>lE9X z)5IZcohH`d_u0_6Mc(tH?h{8?=c=Y{_{MAG)YDN#@^QrrqU@uA^S_V2jN-3%nEbc@ zF%dvM(K!^pGYZ3!CjP0^1g2ed6Lh)2^r|vLS<4DiON71Wu0x-V!*~L$e6I3PDav}t zmJ~X0>am$XlwB9M3HJYK8dPaXxk%1nfDR*2+H@mZCs!wZCw~B^p6c%b{5zV{w;>pSSAV+1SqgHKs+YCv%G1V^_;xFxMja%y5zD^XpI|^SMrqug zYLgP-mX0wL=-Qk6tKMMxT87s86Wd|VH>)B#ZxCUBUm%YSa*Iyywc4KsuY=b&Q*0S5 zcWN(+UkOiU<5P1_DJyn;w;Oc*M5Rxr6}23xC3rZ))F9vjHod4lDGxBrPie99a!|aX z3E_XSzp!@sMW_F|%y?H*>2jj-*w^-e?&mJA zA{b&tyJ@2koCySFNwo%s%2##2N+bhk0!Fxm(i&|(`pqU|)|J5(HoRM>t{VJ7Uu3${ zUIz=TTwVO_@?~rqiE6?RPISHGMLHne#A3~usHWLXF=sPgJJ4~OyDKGj4xaGo)TPQz zEqo@UYrPG=U#?WxSy(d*@9HNRy7rNG9{ydf_QTMe^Bv}F_S(ks^>bNe<*Stp06_xB z*dTcxuhIhR6685H)*?zDZUTh~-iB;l4To(dUoZ5lqs&x>?oXqU)9DTqJu)r!8no{; ze4>PpB+Ye+Nu{Y5?7Ate!n=2GjxSfd2s_IUp}r<%bByKr;1N>>L_=to)qWT%cpL; z9?r!Uaas8&=JGr2LhN4T2Dy><@BOqzWTI2h5%4x4dxTv`uVZos4x$!3B;pg5Ab1h} zM;=jZt|LIN@IGTE7lM*9EqBdb>sF9D|PR^n?C# z6VZ8l6m3F;dXt)=yX7~GL6_*a3+&zxLyvT) zx7`b{wCXA>OZ%)+xZsBBh3rCLb@rY<;k_h=4Yloc0nO6s;dkF>8e{B*H%lSDQZib~r*GWlxwUxjN zmYoV)^1;;I|DykPDZiJ|(`x~rZ`kcppl6j-cnENkC)K@zC|?~R@3$g6UW-%SMP+Y>_G*ZAfE6WWBCO>g{u#nMsk7lZ z0E)@ReuMfBp;%(NL0583JmHW=E9kHMrFTiee%M(>@IfQV`9YJ%cA}-O28e4;-wYtr z+gg$L*p{feihvl1t2=}=w-(a|r!3YDvnSn)sGM%D#c@dYxrq^E0w4p1Bam(T78T4h z%QJ!vox?&y4WAmqJ`f-2SSv@9Vsln;;xoHSYS#sU>4&Fx*J-L7eP#w=1*1xgM91z9 zk3{fGNw*hf9J|PGQ3dD%I>H=~~ZmIjlbEwxSZXq z_T5^+IaCfzZyXpyNZb4mZi&5XMXp=?HgDlzEBR=RoH(FK>0Jk9^iI&meSV&ShN#i_1!2axaqv3Y;!@sIZhpfGD_2NTV2`nW ziF1Ocpo( zcQ0MBS-EAup@93mRGa-p7j6|UH|5(sj+`S$h;}hB6}5Xd>A%bX@RlZcbpVS!|DhXP zvpBhbW}MwAejAqQy;~_U|8{Mm1=RS-$X%7dF2jVomW$fL_`ep;(^-(LaR)K393B1? z=XO6@#3|gOAVlF|lT!KW+uy_JESL?*dI40c)20a4D2HHEO@kq}QQ5LNDvXny%e5JU z6D_oOBJ>To|5CIZ3%eLY4$Za5x`dPCXC^G_w}&NWmh%mD$+QZo$dvi6?3V2lLOhQ1 z%^T%593{=}#r~c6SBVVWpOOHoQ|_}kI{lmHXO@8wH~(_4V2TIY|EI(LAp)0Bhp zx&K4LD<|`GfHbxdn1b#2FM_S!w=BTo7c0lq?A-{8xmwaO=hy5(zQ1dw_8(TVMXG5U z{`_Q=eYs&av#R<_kt#jW$%~$XrizW#D@(WZ+FAa6yRX(e9 zcdcGo4T1B6EbhX@#6G1VnO5xana1(Yg!`R?XW8MD@Cx+jTdtmv zX-)%AsknyD(s=FC4xff}r^@`*Gn6O4Ex0u}^xG2~1P4Rnfb~kXrlq+R=G&DsGoQLH zX}Tp5dgAv>Syyy8+%3}C(If9ddgf#LM>TnNfkenFa`e?28x+4w%-ylV>|q?ZahoUq$wnRVSM>FANE1AvvX_%(Y%1P zK9r@LN=dFNaFoa6#5EJAcb`t*4Qx@9S`>jY;eM8;PS5^c1LN$qHjP;!Nd zP1CaI$c0J{9ggn=YmZf!n?|}}((_~mwfT1rk_UD!Adb>09rt&`DGRSZ{$`}3z_YTDD(2|h zAE=FaPaz~VqTZyUimcYCV$COIQKHEp@J`@J=eKwh8`rCgW#qjtdsq7hQNuxF6{_)g zef!5%lh?%ax0xQ86R(=UhsdW?c??vSX%Ce^%34vRb@=d>;&af<_nlu&M$#q77{?{< zmE??bKycE{Ivgyn_H3;;eaTn+%pb2g*M(>T1P-MM>2NKDx1N!WP_!1wqLuQx_5^agz}mmf4w;Bz9nTEBPaXKnwig$ zIL}QWq|X;0lG*OF+q)N(mgr>Tsiz5~)IX=E>s3Wp)?jCSP5_w%`Cfh<5b)~LQ3AgR zrY&?DP)<3Uo)Ad{u1Yqgnv^u)ecCFvOq4MO&EtN?-|;I-;w^;?DGMP|hm_e8k~FDE zh-3-#=kZ2oET?2#fU8}%+6~F`!RrS9G4H@kh0&U-_StrBfK#ExNZ-%2ZyXv`HSQ=# zmg4DJoCh^xJJyz|B?{v?Y)~Xo)~D61Nc+p3eyZq@^H^BTpj{6RBf6;DpLw)a$vT)! z6=Pk1CD>RPa*oCxv;U~~M2YmvQ_sSOfiqjJZmM^FQ1k*KfT9+Bj))*$&*>k={pM@> zJ-5$3w#gKZrf-8f7JuGA{N9sN*lUkP5XXp06#Jsqhi6ckHnYC`XxJFzxyfFYi|V`2 zKJ%8t%Wr_IyYjenbSRIo@!z+m6yDd$C&agYfuX!;(8g_%Mqdq z1J!{%Fn#nl$!L&X?bvrB{0564qL41iYOIy@l0LwHixnbwp-h1&itd?YZ?=aY|9=S6LIx zrhg#k@~~B`%v-0A>m+~TPP@DGsbe^gJFb29$Fo4qk1_}Vgn!QvWj=mX1b^-RQVoaL zAPq4NSkB3i^>l$vR>Ofh&dxf66~W3%;P+k21Qn>^&7^M)!BaUJ5&$7R>u6mY{Sr?0 zgp^-lWnOV?zmo!k1(0V;Q+-M#mVdcZ7(?T9SW2Dcah(ny49JeZXwZE2i4oC_XT%{6 zvH}_;IJqX ze@({q1O54CO7B9?)5`F5@>|&~bUd`_B>3%ysd5HL}&h#VPohV@~d0g);WYX zhRA5&N?YYtrdJuHlfX_}f}*R3GlPyKfJ0EA_sgcOcW)q-xF#9v& zcs64TO+mCWYQjWlvR{M%0u_X31F3JZDZP52?@h@UQ84rXd#H!{dnrKLz4tbXDv5zl=>RA9e3E42-* zCfB4^RvWN-_Tyo)dVl`$qOsRe{&J!$@a$#4a3?glD(oNDDbG*-%H-QEzZ<=oJg04P zmfthNw4fgy+7PPgx%%l(CS@oNGI-6}BwIi%F6a7u5jH<68grGgGTrn3%RDtSI5gmJ zdGmF+ApLb0pZUgSSvXeXJNZQv8d3kOYJe1E%6CvpuKw~o zaT}0i-6h4LT(qn7rEs2E6f>_?kc2--(#d+T-+BWU-;eVu!X8Ryg60sZjnuvmKbu@) zI#cj}%>8=BaaJ3S=^kjr9dLj7wlDngt;aviPSw^C{C^H7Cjwr!7JIAW@J(x?0CGtJ z+09K&97nmrTew5?cmFo%VvZ$(3;7W+Ojl!s0u5C#V}So&s_icGi()ZA=&Az)zog07 z2D67+j1QiqT@*Y!0uu}QO*SJnjFMVvbA4d-v4Xi6-N?(9p&hzG|5DOXpwQQ2vKJdF z7k`WqZ!vPMBBRd*bI^B54 zo^MYOuMcpwy&j-j^(OmXfav7HNHiDmBmFWH)9yNptLKI|`!`h7Ud9@b?5<_gm9eD- z=0$}Q+MN|Al&3DMac2#@a?>ByLSg5Iw=;OIi0Oo|}pcM{Xe=%eBE3lZv`oBDh$ zFX3S>y@3?uc)LUvXRORoNnZ?li;4Qhcv64FL?!M8>If6E6vT#*#(e)~Jp@ZF#2bx| z>3GB)lJ}_z2I*#dVN9tf`>W!Gy^1+&aZ1Tk4-?r7X~uCw#hTqN}Qw@uwY7Mdg2Sf{E-L zOT=h?-ui`@DCJ+mp_>u-kl4Y!$-Go(?lltI)xa0n+6^oAD-49 zgkNAv`dypkuRzT!Now%kTr$e-*8@FAY7%=Z!!mZX)TH@yQ%!Q&*l9XYbT3d8nht$7 ztVBe1jmP>k@euTCK2Ckn{pAZPUEDD$Zeyg2xb`YyoL4@*<%S(Ln~l~r+7UYX@xNpYlKQK z^Oei+CLurJId}cEKEP+?b*qLmqRH`bD6$r})qid;Kow45>NiLoN^v#SkS zk8_d4>_?~6LU*SBFHb7s$M{gRG073`Wx_v=XCY%KHGq>UmrilyDv4ylt#d1Hw_Hp< z7-R118>{Tqd>`aFx*sYhCE`q+m^-v4z}yPrEgiQ|gSq(2y7u32+~vW`S|)gN>Q4KA z>W;q}{(wqzyR_W2dXauMDQ~7s63q++%^bRmW~P7e)^!IVs!{C4vIYdQDK`=vSLB*o z{=-_1Nb<`)3k3ce-QMm<6D>?R4kJSkEY7;pa2kbBF>nXz`YG`>mSX?bHtFPLq89o{ zm_S06>ag3eQn&i45d7tNo9?3cB1W^UX!ca|M)y)Ty}y2hvqbmDk}L4YAgh#AJ*!mV zlD)1K$;mnV_i_m@CWNGR z>a45KweEbS>Ci-mDkX6bo0mHr^7;c{H+JkFZjL%5XXQD96!qf`8bnze+yH_`{T~n- BH1hxe diff --git a/ui.c b/ui.c index 6328e7f..35e01e5 100644 --- a/ui.c +++ b/ui.c @@ -270,7 +270,7 @@ static void show_dialog() { "If you think, however, that this software is worth it, you " "can always drop me a postcard.\n\n" "Wellu Mäkinen\n" - "PO BOX\n" + "Poste restante\n" "33580 Tampere\n" "FINLAND"); gtk_dialog_run(GTK_DIALOG(dialog)); -- 1.7.9.5