From 85d4ebd93cfbb22b2e12b89ffd29a3c6d76f82be Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 28 Sep 2004 20:38:23 +0000 Subject: [PATCH] Tue Sep 28 16:35:20 2004 Jonathan Blandford * panel-applet/NMWirelessApplet.c: Fix deadlock. Add a separator before 'select custom ESSID'. * panel-applet/menu-info.c: Start rewrite for better headers. Not fully complete, but syncing in prep for merge. * panel-applet/icons/*png: New images git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@178 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 +++ panel-applet/NMWirelessApplet.c | 9 ++- panel-applet/icons/Makefile.am | 12 ++++ panel-applet/icons/nm-connecting00.png | Bin 0 -> 929 bytes panel-applet/icons/nm-connecting01.png | Bin 0 -> 972 bytes panel-applet/icons/nm-connecting02.png | Bin 0 -> 1019 bytes panel-applet/icons/nm-connecting03.png | Bin 0 -> 971 bytes panel-applet/icons/nm-detect00.png | Bin 0 -> 611 bytes panel-applet/icons/nm-detect01.png | Bin 0 -> 650 bytes panel-applet/icons/nm-detect02.png | Bin 0 -> 598 bytes panel-applet/icons/nm-detect03.png | Bin 0 -> 711 bytes panel-applet/icons/nm-detect04.png | Bin 0 -> 629 bytes panel-applet/icons/nm-detect05.png | Bin 0 -> 774 bytes panel-applet/icons/nm-detect06.png | Bin 0 -> 586 bytes panel-applet/icons/nm-detect07.png | Bin 0 -> 696 bytes panel-applet/menu-info.c | 90 +++---------------------- panel-applet/menu-info.h | 10 ++- 17 files changed, 42 insertions(+), 89 deletions(-) create mode 100644 panel-applet/icons/nm-connecting00.png create mode 100644 panel-applet/icons/nm-connecting01.png create mode 100644 panel-applet/icons/nm-connecting02.png create mode 100644 panel-applet/icons/nm-connecting03.png create mode 100644 panel-applet/icons/nm-detect00.png create mode 100644 panel-applet/icons/nm-detect01.png create mode 100644 panel-applet/icons/nm-detect02.png create mode 100644 panel-applet/icons/nm-detect03.png create mode 100644 panel-applet/icons/nm-detect04.png create mode 100644 panel-applet/icons/nm-detect05.png create mode 100644 panel-applet/icons/nm-detect06.png create mode 100644 panel-applet/icons/nm-detect07.png diff --git a/ChangeLog b/ChangeLog index 113de1577..89760a3b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Sep 28 16:35:20 2004 Jonathan Blandford + + * panel-applet/NMWirelessApplet.c: Fix deadlock. Add a separator + before 'select custom ESSID'. + + * panel-applet/menu-info.c: Start rewrite for better headers. Not + fully complete, but syncing in prep for merge. + + * panel-applet/icons/*png: New images + 2004-09-28 Dan Williams * src/NetworkManager.c diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c index 38bd8f81d..7c01ffba6 100644 --- a/panel-applet/NMWirelessApplet.c +++ b/panel-applet/NMWirelessApplet.c @@ -640,8 +640,7 @@ static void nmwa_menu_device_add_networks (GtkWidget *menu, NetworkDevice *dev, net = (WirelessNetwork *) list->data; - menu_item = nm_menu_wireless_new (applet->image_size_group, - applet->encryption_size_group); + menu_item = nm_menu_wireless_new (applet->encryption_size_group); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); if (applet->active_device == dev && net->active) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); @@ -708,10 +707,10 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet) g_return_if_fail (applet != NULL); g_mutex_lock (applet->data_mutex); - if (! applet->devices) { nmwa_menu_add_text_item (menu, _("No network devices have been found")); + g_mutex_unlock (applet->data_mutex); return; } @@ -757,8 +756,11 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet) } if (n_wireless_interfaces > 0) + { /* Add the 'Select a custom esssid entry */ + nmwa_menu_add_separator_item (menu); nmwa_menu_add_custom_essid_item (menu, applet); + } g_mutex_unlock (applet->data_mutex); } @@ -919,6 +921,7 @@ static void change_background_cb(PanelApplet *a, PanelAppletBackgroundType type, { GtkRcStyle *rc_style = gtk_rc_style_new (); + return; switch (type) { case PANEL_PIXMAP_BACKGROUND: diff --git a/panel-applet/icons/Makefile.am b/panel-applet/icons/Makefile.am index 3c1d9a091..1469e3b8b 100644 --- a/panel-applet/icons/Makefile.am +++ b/panel-applet/icons/Makefile.am @@ -4,6 +4,18 @@ largeicondir=${datadir}/icons/hicolor/48x48/apps largeicon_DATA=\ nm-device-wired.png \ nm-device-wireless.png \ + nm-connecting00.png \ + nm-connecting01.png \ + nm-connecting02.png \ + nm-connecting03.png \ + nm-detect00.png \ + nm-detect01.png \ + nm-detect02.png \ + nm-detect03.png \ + nm-detect04.png \ + nm-detect05.png \ + nm-detect06.png \ + nm-detect07.png \ $(NULL) EXTRA_DIST=\ diff --git a/panel-applet/icons/nm-connecting00.png b/panel-applet/icons/nm-connecting00.png new file mode 100644 index 0000000000000000000000000000000000000000..38d33664843d5099c326ba91ee1de9c03c4cacb3 GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l9V*f` zU(&kImrcEAZa}=X?~-MXEemu6RJs+!bmgaNa0Ib_6c+FhbP5g6xzP~8_$Zm(Lq};V zlcozxmzJ663BOxjncW#2nu5oYua`|$ld}>&ZQR~Fan+H+*C~g0?+!P9e$n>%9{nvV zw%hMqz&PiZ!dl=d~DV0nv%;R$u@3 zrl(xp?v1akM2Oc+%hOulr+L|*KYxCH#+Urd>VA7HrN7j^6jN*!So?EpbN2qaN~6SW zwl-E~UMfNdOJy&;#R0ms&@$;W)Wjt2GT-tOL(yZ%n3`+eRAl}A{9v9_`PGU<3(_2J)<#&-c0GKwNu z%Qvs?4$yE>5mKBOlJ@7p4d>ghU-(*WVf(W*bImKM?nZ^;cWK|$wc~G;$hK#dcK1ea zzp*Osp%q`)!(|e-&gyZNKMyB=w`qP`_4BJf&+ALi(9C!ozT4ZH$QE|1ZaKr@cLpuvIGHb?o2sB?~fTGolzW#CN>^@OXV( zRNRcX`;#x~oEFk~J==YL?ej&?e@@<~@8x3kdfz9;;O4{!yUxj#{^^Ze`|PLb`RQvq z)-dGl-NCNQS6|cL9}7R$o@BnxQgpygHfXJW|2}<&19z6||2SZOz;^-18s^zw ztrusCX)Y}hwET5{r{{vFjm4$+W!5rh9cYcMT`+}f2LFuvU%!6u)mZw-^0e0U*(|p< zUQfH#ke9F`&gTE$bbUQj7LBD}LbOVEnP0UoT;F)j$GRp#;@HH-M(5zi{(aKc%xg1l zZL3YKUSK-;-VWE56^k8$Pp0g->YBlEBC>wEG;7qkQ&Xc^-(&=uNX7E9H78H?O4ShS zepo42w$#aL^1=!Fb7G^Ss>AUl=x%iL#SAES#WphgZERbhlU|{fc^>bP0l+XkKS~{nM literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-connecting01.png b/panel-applet/icons/nm-connecting01.png new file mode 100644 index 0000000000000000000000000000000000000000..15e6fe6c840d032f8a26ea0f00fded9547545568 GIT binary patch literal 972 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lwk;iOKtq$@n*)Vtbi#BN*6UmTpO2VZkTj3!l8FX{rvs; z4jaF0xRqmaAuIP`;NHHq*TiP^vUM#LRZrnj^_zG8q%CvDi{DvGt)}aX1gyRqu>ShS zxYdgB8VPs5inqJp-}nBv%=@2wGRG6s<}nuR3DT23n-;vcHhp2t%G`T~?&qFxBq(ih zJ9cl)o!viM`58XdDQivj;z`KL%*=drJ$gF>!%K6!$$QN<@o*S)F&tvJR>kzD@eV`7 zW%(HUCw6&zA00GjIKUos=FbC%hP$(>@~1`Je%qp=aZfDZ=JDb)D;huC{xWs`%L5GS z->!aZ_UMequO1HL4h}`fEk7?>>lga3no(o!zSCd*=arw4o3DN|I%C7}AoTokK_=1E znd@9jO4SN?or~;nsRI+j-Texsn%O z#VWs2*%GqUh&^GJobZcP%f=UDW++Wh^hu60h{ zGGUBdpUxe#<`j@}>XenQD6PrRooc869S&05BJ{__JXzE7=8*J6(H+8giVc%UbEcN&Mh*Q6hxUVGoXzk9FS z&Sth6hG2%YS-oz@w!OXa=l(tl`nN*3^ z`Q>Gs?bFQe`drFNQ(vZ%>){;Yl_}&IqT*|Kbcu)V(t8!Lg0EW_neY94NU2La)KS2( z#YxL6dUa@1z%S=XVcnU!y17di&b_(8{-oOGlmAl7_PlU&x|^{1;?7w!-`75$^WOTo zE%X1+s#8r~?pn8F-R|U*25vFqK%tgXSm(zEAXD&2c;%NiFYIeU9MyMIMH ztIlW5lx{P;bLWoDjmx(eOSLUDkrKSR?d`V!jV~>kvkqr71%z(Rzr1W(^WO7cR?S+r zaFy0RE&HgsZZ=|Uh(J z%)8zx#*&|Y%4}XKva_ZyN3A(?W@pjYdrN0GG9MQ`5HDo+|8e?m@&6AwCdLbWJo5A6 z#*MbIv9T=8j+76gz*=BElpU=FFL2AL4vVBJNpC4U(^eO4~w%F^X z{fx37BYaM$ZEn1;zV67fWsB_BK2g%#c%N+#hYiyihU>0R%oV;KUhZ6+dPim5>u3-KoVD z{&JEf+N>Y8FDOup^qNJp{DbLV8J67+;$>`|SDzoQ%x~&i0#w-}^;^y*X%>kx$ z(FNUpc4i+_OV2)X$^M;unK^g1^8E6$vij}c*9Hd_#=Nh4{5$Qqrd(N<-}Ktovw8d5 zHvL=o?vg>OaZg`gV${aVYirxT)qK5ouC?nQ`|o>pd*8n6EtYS+n{9jE{`T9IYp;Iz z{r5?6<)q7==jK?NXWv}NKWp2&-&5;f)+Kk+>p~y&9d|Br6}SDdXxXx7eb-;V-IBX|@49t-#|u4ffBWm;t$Xjz zg>RR{@#Xh> zy1R9iG!ycE9FA@6a*w%QnwgPtW8v$Gb+P?lm}P!FxwIl*cXLtsAbc=6WJ7 z1&fzlbDf&7bju=^Da%Awq>TLfX!;|_n-dT z@;(2f_d#BKYthS}=I3+RK8LYcF>qYdGW>dby4%&gU&I+ixLW6ju~vMXD{q#)bhqf^ z&@?~B4UyVfv40nBHkLIizS%2iK7W14si)nG7cXYN#UxYp{#fURa!acV9pL*dw_)(S`hc zvU0EHO+P3dm2AzqA@f3|QjEfbQ|0sDd=B4zl8NEo|1UzB&)ONz2p$w~xj8}ej>i!V z>17kL16vsy9_QO0O{j30!D4VwDkxL0-8t>ym6Ln-h&5C$4|fS=w2-P`Vc2r*&sFy7 zXVFv4EIh%?L&wt*gBGj3??ls>!se`u8{(Y%u{W&VWKHq({Q*>e1v};ZAQ>RV6eWCBdEhdJB+500i-7|Ezb1+Og`D97v zEZcd{b2CFTav5#TC#Tu5CS>mn@$%GM9KJ42TeQ1%^Xi$4e%sBQmMUocK5i5H^AGiF b>KW%&Y!}Xvn{k7Ifq}u()z4*}Q$iB}3O2hl literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect00.png b/panel-applet/icons/nm-detect00.png new file mode 100644 index 0000000000000000000000000000000000000000..d81e551b2375f206b4635e2306bea1fa209011b1 GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lg5fV3dP0c)=oOiePHS&LEV|#IZef<9a@^kn7y7TYo zPB{i&o!?F6?awSJ@U>v5VdFHhFgL!f6UwL=5p)%-DsshzDGUFHp}YvOl^)@`M`hO zy6yQ(*ckToPg&`%rOBfDznNog`L0(Nenc3&|Lv#P_x0yNh5t`(r0f(rdh+#KhWRr; zT$H$6>Z+lU_T1%1$Lk&4i>tjhKPo6*d~;^nqge)feRy?3)8!bxOr5#c<@L&-gZB+L z?XE~#Ez7(6(HW!5bEj^-w&L11ABmYYQ4S0X{(Zan>ByB<#|FNtbuu4fPNo`dQaE$i zntjuHhl=IByfOWKTs$3zxeXqH>O%E{K2@!XOb?X*~2_1k;~h8^)U=XEF5`eqBe zZ`5nox_STY%EPnQ&b!Y$)$ecUpUjGtoA&s(e2+?K?yTGJ!Rza@k0B@go5D|uu6}nf Rmw|zS!PC{xWt~$(699KB9R~ma literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect01.png b/panel-applet/icons/nm-detect01.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbe900ef63b187c3c9e715cf6f033abd8f166d9 GIT binary patch literal 650 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lVSSM=&rjiF>*@hG?9BJJmWPBvGLC z{LKIR*WZ1^JKJS(l5ha`#-NP?Ot&({a@I@~EJB`;3ceRFlFpXt?~7Ch-}H^Q`6g=GJ&tUeY0>^h@Q$f~Uy zZ5W?z|EVfe9umqh$D-hk&Hg=gKXj(EOwD?0(pfxDRQ!h|=D~1X>*}rEwW=G`jFgP8omisv?E9B#_r#QDPnw}! z-u6{vgLI1?!wwsRKR?n|Gf1ZMI{|RFiYdhy|rtWs!q7i zbl%46^0NCz4jt$H5OMVtIiLKUzYZtVlbzkCMX^no z(U{e_h`(tlx|)pM7Y*H0~2 z4w&yQE3r~M{@3Bp!Nz?z%eua8d0Db?qUqURZiij=O`pop7&2MAxjpUE4%a`% zJa=bxI4(&{n7li@|FwOk#o_Jo1;5|^EC0*n7Iq_+Su=hI0|Nttr>mdKI;Vst0RP1s A6#xJL literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect02.png b/panel-applet/icons/nm-detect02.png new file mode 100644 index 0000000000000000000000000000000000000000..8649e25ce6291ccf0d05e220c679ca8ed76b9e99 GIT binary patch literal 598 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lF&Q7 zc_oTV>5wz)vsGXBZgVwu`EhC6i`qFaR=;*!zHaNv)Jxx1Yk28pDF1Y1Vqr)yJgfZ3 zI{IVq(icJu(@rnVJ^syC^j^vCy{yS8AB5+wyQVI9ar+FZb*tYAKIn^?HeYqu_AR@v z#V}30P`bucH!a)zT5_#^!ZM|X8i$taU7Zs?Tz<9v!IA0jAL=NU6(z5<7Je*wUg9HL zlmf$kk;IJ1KW3gK+hmXK=6IMio!`FSq;G<@}g;ZQ0g~`+uf42-Ld#NxZG) z$at#yUCBy|e={Vf_s*DkK7RJpF!f43CO(EKzxWMIW!iZaH_Z-eoE@|;sKokdK(zF& z${!D|Ozm{~_UY_yeYNY&=Y%CBB_(gx)H4J$?><&_(BTjR0|SGntDnm{r-UW|ycGn8 literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect03.png b/panel-applet/icons/nm-detect03.png new file mode 100644 index 0000000000000000000000000000000000000000..3c378b30bc937e69248e3cef2c6f12ab2a8ba52f GIT binary patch literal 711 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l8;d zR>5D9A{%ttb&^vY^=>E*Z-ng-5i?lM%^&EEZD-=6AS0pFWem&dd7+|d@a5}atOs>rb?HCy9t$G7QbN{(k1 zcNAQ*e7CvJ=-3UhT#mKMjU5~e%b%y6`^y;^&DOvwMfR7f=Uu0y!{YM-s@Y?F24W(U0xnD~9tbzTOB89OGVx;$uEFO-o>OE)V{F9bF$k1`S+KfQVBTfcXT!b0|SGn LtDnm{r-UW|&Ur1R literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect04.png b/panel-applet/icons/nm-detect04.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b1aa00565fa2ec0ee321b4d0087785a6084ea0 GIT binary patch literal 629 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lK*P1d6FiIz492Hb6cc4n$L}@_ZJwI;M~LCp5rvbJ7#jY#?OiBm fTlMGqAC?J)w{bP0l+XkKp6w1$ literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect05.png b/panel-applet/icons/nm-detect05.png new file mode 100644 index 0000000000000000000000000000000000000000..25124502168d9c0cda13e9c5c51128942f0c315e GIT binary patch literal 774 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l`NIh2M7rU3BGRHs0g`q9)?xcw6-MQMUp_uYJZF;s5TEqoll;3g zOYd{%pTF~4$^QFg+l7VPC+}Sre_ysgypemW`$XX*egPda+c*jyeCaPQV`|80`*G_0 z1;a;sO}*K6~gHm#o7k{oGZxY<;w()6A3Mt7HQ z-3hCf3dc&%%)aaZ0Oli8f#uE0Y<#^voqMOouWQw7 z)n?w`yFYk2!`Y2%X z?(I5-&tV_qyjAYovOnH>P?aH``BO+|(cXzqXPv#U+^u%!l{Yyim(DLb@z%@O_JMPT zf6)Dl6?5x$De@m{Tg|Pq-|+F{GpoI8Ul=AIWnbMfS^v=qS)WZCl9x^t3(D8dnli2F zn!U*;*#qkt`Z_w8CRh}m4N^3p&wBT5ZN-8%&Pj`PpC;@vv*3R)rNd`J&%c#(ln%;G zDmB$%(qOK*S|r|ko$a~jy6yuW&-XqHJ>v7VQv5b literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect06.png b/panel-applet/icons/nm-detect06.png new file mode 100644 index 0000000000000000000000000000000000000000..3cecca6343c6521edb4d3a9db257f32fb1b25a83 GIT binary patch literal 586 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lHn>)8xI3e`}bAP10F@MSzLH!dY&M(D%zTqs!xGta#P` zUS9rp8<)MH=VJ2{`wTo)xRR1{4yZ_Enc%e^wH6C3;q^vG+!+HMtN2C!&wiSgEm;5?V5We=>Nug zn;Zs#t3khCp9+e*A-wNBOSE~|>~&>w9Nu#sZYgb$cIahf5V&~f0^{V%QN3sOz4y~q z|2fZ``{T)9&o;c=`Kx5wWxh1NV(;gS3{jJXKl{yG?yeI!N$k2T`|hm^^?h?e+TNf3NqyunrG-7@hq1eHH@)1B0ilpUXO@geCwtQ2O=& literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect07.png b/panel-applet/icons/nm-detect07.png new file mode 100644 index 0000000000000000000000000000000000000000..cf976ca4131dac6e245149c20f2915129f0d6f0e GIT binary patch literal 696 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l^|^AhX71561|#@*~W5WxgA? zCe7$)N!w?6FTl*Jo^9ca8F#l9+ipr+P+wu=|l>jYj*zO*Hz*ygQF z{fmt3U8z0aZ2X@dx)9kYa%y$xQwbg=bE`|IrS&|P8b4=@VGS^z#TBL9-|^_U( z(k^cQHCL&L<6eeq@VUa^h+>unN1Bux)?CUeEm`vYy3k%bgWs?IeLgquAeY1LNQ0+y zbh--GMLpJAymGE2J7bB(G~089)xDO-bOf0cnA}~o&Go*7n%RCjuj=l)q`#wsA-Ct& z`)JwC^Hx^O)5~;?T>3$5K|_O>!!s9y;?I{>_DBC)RBGNSG_lskYJ$9lwP3H=3 #include "menu-info.h" #include "gtkcellview.h" #include "gtkcellrendererprogress.h" #include "NMWirelessAppletDbus.h" #include -G_DEFINE_TYPE (NMMenuNetwork, nm_menu_network, GTK_TYPE_CHECK_MENU_ITEM); +G_DEFINE_TYPE (NMMenuNetwork, nm_menu_network, GTK_TYPE_MENU_ITEM); -static void nm_menu_network_update_image (NMMenuNetwork *menu_network); static void nm_menu_network_init (NMMenuNetwork *menu_network) { - GtkWidget *hbox; + GtkWidget *eb; - gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_network), TRUE); - hbox = gtk_hbox_new (FALSE, 2); - menu_network->image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (hbox), menu_network->image, FALSE, FALSE, 0); + eb = gtk_event_box_new (); menu_network->label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (menu_network->label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), menu_network->label, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (menu_network), hbox); - gtk_widget_show_all (hbox); + gtk_container_add (GTK_CONTAINER (eb), menu_network->label); + gtk_container_add (GTK_CONTAINER (menu_network), eb); + gtk_widget_show_all (eb); } @@ -57,32 +53,16 @@ nm_menu_network_style_set (GtkWidget *widget, GtkStyle *previous_style) { GTK_WIDGET_CLASS (nm_menu_network_parent_class)->style_set (widget, previous_style); - - nm_menu_network_update_image (NM_MENU_NETWORK (widget)); -} - -static void -nm_menu_network_draw_indicator (GtkCheckMenuItem *check_menu_item, - GdkRectangle *area) -{ - /* Don't draw the indicator if we're a wireless device */ - if (NM_MENU_NETWORK (check_menu_item)->type == DEVICE_TYPE_WIRELESS_ETHERNET) - return; - - GTK_CHECK_MENU_ITEM_CLASS (nm_menu_network_parent_class)->draw_indicator (check_menu_item, area); } static void nm_menu_network_class_init (NMMenuNetworkClass *menu_network) { GtkWidgetClass *widget_class; - GtkCheckMenuItemClass *check_menu_item_class; widget_class = GTK_WIDGET_CLASS (menu_network); - check_menu_item_class = GTK_CHECK_MENU_ITEM_CLASS (menu_network); widget_class->style_set = nm_menu_network_style_set; - check_menu_item_class->draw_indicator = nm_menu_network_draw_indicator; } GtkWidget * @@ -96,42 +76,6 @@ nm_menu_network_new (GtkSizeGroup *image_size_group) return retval; } -/* updates the image based on the icon type. It is called when themes - * change too as the icon size is theme dependent */ -static void -nm_menu_network_update_image (NMMenuNetwork *menu_network) -{ - GtkIconTheme *icon_theme; - GdkPixbuf *icon; - const gchar *icon_name = NULL; - gint size; - - if (menu_network->type == DEVICE_TYPE_WIRED_ETHERNET) - { - icon_name = "nm-device-wired"; - } - else if (menu_network->type == DEVICE_TYPE_WIRELESS_ETHERNET) - { - icon_name = "nm-device-wireless"; - } - else - { - gtk_image_set_from_pixbuf (GTK_IMAGE (menu_network->image), NULL); - return; - } - - gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - GTK_ICON_SIZE_MENU, - &size, NULL); - - icon_theme = gtk_icon_theme_get_default (); - icon = gtk_icon_theme_load_icon (icon_theme, - icon_name, - size, 0, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (menu_network->image), icon); - if (icon) - g_object_unref (icon); -} void nm_menu_network_update (NMMenuNetwork *menu_network, @@ -166,12 +110,6 @@ nm_menu_network_update (NMMenuNetwork *menu_network, } gtk_label_set_text (GTK_LABEL (menu_network->label), text); g_free (text); - nm_menu_network_update_image (menu_network); - - if (menu_network->type == DEVICE_TYPE_WIRELESS_ETHERNET) - gtk_widget_set_sensitive (GTK_WIDGET (menu_network), FALSE); - else - gtk_widget_set_sensitive (GTK_WIDGET (menu_network), TRUE); } /* NMMenuWireless items*/ @@ -183,15 +121,12 @@ nm_menu_wireless_init (NMMenuWireless *menu_info) GtkWidget *hbox; gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_info), TRUE); - hbox = gtk_hbox_new (FALSE, 2); - menu_info->spacer = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (menu_info->spacer), GTK_SHADOW_NONE); + hbox = gtk_hbox_new (FALSE, 6); menu_info->label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (menu_info->label), 0.0, 0.5); menu_info->security_image = gtk_image_new (); gtk_container_add (GTK_CONTAINER (menu_info), hbox); - gtk_box_pack_start (GTK_BOX (hbox), menu_info->spacer, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), menu_info->label, TRUE, TRUE, 0); menu_info->cell_view = gtk_cell_view_new (); menu_info->progress_bar = g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS, @@ -201,10 +136,8 @@ nm_menu_wireless_init (NMMenuWireless *menu_info) GTK_CELL_RENDERER (menu_info->progress_bar), TRUE); gtk_box_pack_start (GTK_BOX (hbox), menu_info->cell_view, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), menu_info->security_image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), menu_info->security_image, FALSE, FALSE, 0); - /* We don't show all the widgets, but we do show a few */ - gtk_widget_show (menu_info->spacer); gtk_widget_show (menu_info->label); gtk_widget_show (menu_info->cell_view); gtk_widget_show (hbox); @@ -216,13 +149,10 @@ nm_menu_wireless_class_init (NMMenuWirelessClass *menu_info_class) } GtkWidget * -nm_menu_wireless_new (GtkSizeGroup *image_size_group, - GtkSizeGroup *encryption_size_group) +nm_menu_wireless_new (GtkSizeGroup *encryption_size_group) { GtkWidget *retval = g_object_new (nm_menu_wireless_get_type (), NULL); - gtk_size_group_add_widget (image_size_group, - NM_MENU_WIRELESS (retval)->spacer); gtk_size_group_add_widget (encryption_size_group, NM_MENU_WIRELESS (retval)->security_image); diff --git a/panel-applet/menu-info.h b/panel-applet/menu-info.h index 828f51333..3978f25e0 100644 --- a/panel-applet/menu-info.h +++ b/panel-applet/menu-info.h @@ -36,12 +36,12 @@ typedef struct { - GtkCheckMenuItemClass parent_class; + GtkMenuItemClass parent_class; } NMMenuNetworkClass; typedef struct { - GtkCheckMenuItem parent; + GtkMenuItem parent; GtkWidget *image; GtkWidget *label; int type; @@ -56,9 +56,8 @@ typedef struct typedef struct { GtkCheckMenuItem parent; - GtkWidget *spacer; - GtkWidget *cell_view; GtkWidget *label; + GtkWidget *cell_view; GtkWidget *security_image; GObject *progress_bar; } NMMenuWireless; @@ -73,8 +72,7 @@ void nm_menu_network_update (NMMenuNetwork *menu_network, gboolean multiple_devices); GType nm_menu_wireless_get_type (void); -GtkWidget *nm_menu_wireless_new (GtkSizeGroup *image_size_group, - GtkSizeGroup *encryption_size_group); +GtkWidget *nm_menu_wireless_new (GtkSizeGroup *encryption_size_group); void nm_menu_wireless_update (NMMenuWireless *menu_info, WirelessNetwork *network, gboolean has_encrypted);