From c9bec7c3fd30c9b81a4286411e69c767b1ce26c7 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 8 Aug 2012 23:22:42 +0200 Subject: [PATCH] Add map configuration button to layers menu --- .../res/drawable-hdpi/list_activities_config.png | Bin 0 -> 2353 bytes .../drawable-large/list_activities_config.png | Bin 0 -> 2353 bytes .../res/drawable-mdpi/list_activities_config.png | Bin 0 -> 2271 bytes OsmAnd/res/values-ru/strings.xml | 14 +++++++------- OsmAnd/res/values/strings.xml | 1 + .../plus/activities/MapActivityLayers.java | 4 ++++ .../src/net/osmand/plus/views/MapInfoLayer.java | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/list_activities_config.png create mode 100644 OsmAnd/res/drawable-large/list_activities_config.png create mode 100644 OsmAnd/res/drawable-mdpi/list_activities_config.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_config.png b/OsmAnd/res/drawable-hdpi/list_activities_config.png new file mode 100644 index 0000000000000000000000000000000000000000..c750228a33849a0e6fd7ac24602be58e175a1256 GIT binary patch literal 2353 zcmV-13C{M3P)(z00004b3#c}2nYxW zd2@2A<>x!nU8hG7_nVHk#C7=~dOhG7_n zVHk#S2lYui#68QKlXTE-@z^2-S?`BvSlEV*ayJ!x!w1E z`<7cCTEA))+M`k2xq0*Ie;+;iZn<2(pejo5&mMW?VDE+v4+VU_9cL4XcPOQ4r(?O2 znoIiKn>Ow4XlYp~3Ic9lx2~;Xnw!d|8M$}!=3S9+*l3GH000ul$$B8rbv}_$clGuC zRZ|o-;PYW+YirZ1@4ff0s%4#bIFu`@xuh4%W#hiBTknp?V(@#tSlijz9&2vCyFL&w z{9Z4Dem^Lspp>F17;J2bM7E2fDCr&#Zi>Ya2n0x3QOwh)PydHfns+*$<<#7oJ~}aR zD4^@$I1V-;aBCVmTU*f>3ZW?+hE2%j;*w=_M5Aa32C=fO4HQ7mG_&h_dO8$EF`SO& zN*qsmvtj(Sv$gfNs-oNjKv>h!@z~U*OAC_gb-U4Q7;w2<3y#}_AfW4rHa3C+unB<* z_<7sb%B51e-tXVJxx0Hm$8k+g$2p&)TSkHBJDzy-(bKXd$@7nEih{0{E3doXY(9^H zMB?)2LvO$R!tqn5`mVdf8_dy}e#@FQzZL~SHiAJk83w#=Hz=hD)zvMT(brPkng+M3 zLKFl9{eJA~>w8#J)oo73I-jFA(uquFsC(6_2iJCXY938PP}dO&g`g?Q<(nm?6s3xV zGZ&`t(cn1#dwvq14yTdMm%wuzJc_uWEu|CyQ1AD{2nONzdQp+((UDAMVt9D?Z71WM z<7m!aB(7snUV=3Fnfh8 zcYdDdN2aRPbE{XcZhzyAH{K~xaSLYYM}uQX=ZkR33L*`ykYyE=0=8|#wh4G%gr<6tFWT^F1d_ln zndzJ$;JLkf_n$a%;`dI+I>(Wub3on3wQK*j^y7C{i<(qyQDy(H;^W%+!H(i;i{zMq zsjKTgV0PB3iUQT;f@N8k+vEymn5KzPeGpZv3ZQz`J}tPxi-1`!FR9Z#9>kiO;-57% z^k(zJ0>S5U%7FCTsueh>4ehEYwy4Rlv~$lC}xwrxX2O@f#YDBm9JF1 zUKd1{YuUamLTpQt(z;<3;_>);Ct{w@shK|W>G|`&EPFgRaU3TJ>2wb)OIh3~67piY zVt#37JkO)8B?PN9vtWq=0O)$ca=8*WXxul1W4jkhDH$0VkpYO2aJa=TmpzMbg1Xy< z^o)&4#RMVt70ZV14zx6fkeQssbS}4W_oC~cQI0dGr>9GAzWL@yCr_Sytx~BBI~6xj z1F!33N$P!Q`}UVtwYRI1xb(vFg&XnVCl@h3kzG4Dp=LJ(%> zi0*Tvy{!RTw{&4edjynHj3yGurqfH#w@p)>%4F(4PbOagU|oGg-wa1*`nNhe53Y;H z@6%Kj&4vMB&hX&YeSgVq!si%5fIqI7)1r zCzQe+3XLneUL6=1I10eN`l!Bs&h66y5K4#2g7B&yjdt)ZR|Y&^v2wZg=~Sv^x%R1K z5~*bJs(o^zSoO8G_H&|GK(*?x7K?t#>mA*;ZCm%@!-qR6mCEU_C75gA_?x2_UwY|B zmLOaN&sP9oERz}hf1ag_ic;i6apuycOEc5u@~EWipM&Qs2M!!~y%rJ<)WGfq079YA z4gg4})5k+~bw9bkxA%#F&v#vYaU4g5aQMjYo_zB0YPEV^Rn?oL(dhc2p`n9>kf|Fw z@ayF0@-k=s&+-<-xM#XhfbQ`C0DR%_7_TVBQYO<-nVE6VKTmILOp2;HlS?L7Sf(j` zahMxTB)Dp|Is^cvQt9Kt!9m9#a?R)X^0L_3MB-^lmJ1YsCmc>`hB2V%`bDo{3{wDe zMfP|KYJL5X6kX4*>FUxsj$69bsS!0X)90Hm6rLtt?`@%2>~_)P z83Ta5d-uMQ&1MVV-L&aXvNSuP6|eUa0PNYb=fLRb=+F;$?tG%&=L<@jHU$8IKwv{A zlX=~-K(4~^ml(@QrBe2qn{RH@G)>;OZ{Oh$KKS6tOeS+e^LV}!i^cq+%VoNQ!I4kS zoH=vk$dO+Zi^ZY$j~_pF>&A^6HBECJJ$m%xQ>RWHs?|Rm)x?eT3fzWa+&Mlz{t5sB z06fpv@7}$8|6GG-pMCb9{r&xaock=x@=dC$hH|;wI}VKZE33(w{)K9xP#DDQ5)J^M zlokmgEA#n$X>4pPeeBq=e^{24nya^Md&=pDSq#H448t%C!!QiPFbu;m48t%C^VR(i Xqu9BDA3vFc00000NkvXXu0mjfX3Cby literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-large/list_activities_config.png b/OsmAnd/res/drawable-large/list_activities_config.png new file mode 100644 index 0000000000000000000000000000000000000000..c750228a33849a0e6fd7ac24602be58e175a1256 GIT binary patch literal 2353 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 Xqu9BDA3vFc00000NkvXXu0mjfX3Cby literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/list_activities_config.png b/OsmAnd/res/drawable-mdpi/list_activities_config.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b7088e1519887b9867574f52e730f8a28cb44d GIT binary patch literal 2271 zcmV<52q5=~P)3gpq*N$V~#EFwQB$&qtgixS`4w}+|n1s}7 z6smqTK<_fb<(71(xz=_{4;4%N3}u!Xc?t!Wh)4(7AU0^j{?gmkA#$(;3Uq& zHg@9IeVnsD(qws1=xnEGQ$Et~58rdn&)=_q=bm%#F)+_O^UO2PJpU6gU+0(Yc;=ZK z;f97V0Q~CJSD#Idj=uGEe*XmQTqI=}reZ-b_zM8?lxw~T!vGKp1lp&LvCHxnkIVJk zTm6b2P)X{NxeQWDxS(4UwMIr|Pm@d10^EX$m+P-q}Vl)PWcw*hUCI2{e z>Z5!Hz=i`l%mG#t*#3Mw(vYJ zs164fg+lOnJR~nk`qisf|4AuLms=k&2lsUU(9jW&s)At{ScJf?C}^&)N43v~8owVF zA(LSfMKlG2sPcNTu%Q7IKuXt>E8E(dBuUcBt!;vmP1kDLkDKf3e=SSWQvkT7O-(P3 z+`T)^oYQVct){_dvrW5h5dx2@B3NAw3cw-+GT>${OUdVQ@k+OQ$GXQ0-efwBu1I9^^O4i1-#CBeN=MNNXHZh5S1n!o zOP=FI&Fe*trom~qgHj4#Ma8U&{x@M)6xd}MJjcQ7c4KEp$8(A-Z!DAN(iXCzM53p4 z@#1HfH8(2`MS)jU5%Bq-NYdnDMJYwDVB*^C5nSvZ#J_G0<9cr#@pKL>!@wc&)A~|M z0RWY5H#DyoZl@CkQS9$aB!+r>drv=f(}a*%MIcby($us9gz$t?%#7hw79Vu>VlX)d z-7rB20U-pV*#hnir7)J$p?St<$i2p=S+;M)Fm5hcvZV3Ei4z|YLJ|+vGyp_y-@dtF z{rc}n45LmMnuv6!fDbxvBd?oa85R}pO8C9i@Om`3RWEFUgm@~0Og0OjDr4q&LI~nO z7XggdUw{3bXf%4HRJ~;}&9Q8#+T;0Nwa@2Z7-m|PE_M$fp3cH1N(fZdLlk9D3Rso} z%OYS|9*XQlI%~nD5C|MQtI`a|;kEty4_>%%;kV^53>0aa0V>ukTlSZ&k3as(<85s_ zMV@!qL=iSooD{2@7S7*@f@L{W`D?$}lB|0M$MLW!B4o~*WtuZhmrIh`eICzuVrWwYuwxwkoFkUrTk|5h`Fimr^Pb!m#uIunsdSRFb0OP(nP1wQmfS%9K zYEvB!glcNSpH)@0C)4Ra6{C47MVSTwFbslKRdC2MIBtBxn3gr!ObCHREC{>^T`xQ^ z9kEQ<-EL(2`ewCxT(0rZv`72*?%g^(Jbbih-6(ROCX^=LJA3vOyQ+>+jGLVqqQHV< z80dQ8D}~c(18=k4GnYw-WeP%E)wE1F99~(9VW9X*k6piY>*slgV-dqJ0vC_B!8E0r zodP~5Mhp4_ld&v|hB_b2+}N~R1OT9_5z}Ui6shx`6uo*=N=aW|p9p{t`2BTOKJS>h z2&r}(;$s#H1s#M~UmB}hn^0HlLt=Osqp8&N)mv3RqYR^uj*jL|o;-Q+(xpr96$*vk zQcRb8TqFuY`}Qqc-dWt(C=2}TiR1EDtZobAk(FT(LU8@kCFq6e z_dlm7$vtnr`O_O+U4JZ9>txPS21}y2<>@D%Jk0aFED8cdL727Wn0g-T*0;fKm%(x4 zzp?7Fqp_h18`igAL1O@vQuIe6NXFx{##_2Bk0cV6pGTu_05I>b=&MmurN7bKe0W7T zyiJj1)M^@7=HBTfSw<)vhTZ9$)kY}AKyNPwdcSl6U%{;D2K@%uCYLTOK)3)(X5E6**}rk)#@1uUjx`kug{!4#2Fh@9^5)xb|G?z9 zJ7C!Y01PA&-KD%s^OBThcz*2e-MeF>`Fy{is-J^p3x^IJdcPcofifNT`+UBw01%JI z&-*GWe)M#E`^z4et2jXnLpi_y_-}UYddV=1Te2)K4+euPdwO~f6GBGHp|_;zJ;Bt+ z!a7ZRYBZC9>Tm!6Tz>xmD@oa0B2iTs8?#Rxr&d=-d08GyMWYK$T^GK%%=AYhjA0l( z0FcY&E_Zi#m;913m9n3P-iSo@2%?yw033dQOwqJ1NmcJSHLaHdm$@08G0Z6KvT-ws2G7K|&sV@^{sq|DvGnqZa>3q}|3O&X<90LHbfB*iY$z(F~ z?X_$FAPVCJm7LDI0I+xO-b4NU{XO5`vE$`Rm&+?C$_M~>Jf78wMB@E&>jUQCupaac$<|FyJhn)bxt;NVdJ1OQl;t=zqP_rZw{`}Xbo zTW4qI?Цель Высота Время в пути - Следующий поворот - Следующий поворот (маленький) - Второй следующий поворот + След. поворот + След. поворот (мал.) + Второй след. поворот Малая карта маршрута - Заблокировать/Разблокировать экран - Unlock screen - Disable Sleep mode - Enable Sleep mode + Блокировка экрана + Блокировать экран + Отключить спящий режим + Включить спящий режим Экран заблокирован Установить интервал просыпания \ No newline at end of file diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 1b89adc1dc..070ef07bec 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,7 @@ 1. All your modified/created strings are in the top of the file (to make easier find what's translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Map appearance… Show lanes Avoid unpaved roads Avoid ferries diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index 5cfcee3736..f231e3e8ed 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -241,6 +241,8 @@ public class MapActivityLayers { settings.SHOW_POI_OVER_MAP.set(isChecked); } else if(itemId == R.string.layer_poi_label){ settings.SHOW_POI_LABEL.set(isChecked); + } else if(itemId == R.string.layer_map_appearance){ + getMapInfoLayer().openViewConfigureDialog(); } else if(itemId == R.string.layer_favorites){ settings.SHOW_FAVORITES.set(isChecked); } else if(itemId == R.string.layer_gpx_layer){ @@ -265,6 +267,8 @@ public class MapActivityLayers { public void openLayerSelectionDialog(final OsmandMapTileView mapView){ final OsmandSettings settings = getApplication().getSettings(); final ContextMenuAdapter adapter = new ContextMenuAdapter(activity); + adapter.registerItem(R.string.layer_map_appearance, + R.drawable.list_activities_config); adapter.registerSelectedItem(R.string.layer_poi, settings.SHOW_POI_OVER_MAP.get() ? 1 : 0, R.drawable.list_activities_poi); adapter.registerSelectedItem(R.string.layer_poi_label, settings.SHOW_POI_LABEL.get() ? 1 : 0, diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index 4a74a67916..814e8eeed7 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -199,8 +199,8 @@ public class MapInfoLayer extends OsmandMapLayer { NextTurnInfoControl nextNextInfoControl = ric.createNextNextInfoControl(routingHelper, view.getApplication(), view.getSettings(), paintSmallText, paintSmallSubText, true); mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, all, none, 15); - MiniMapControl miniMap = ric.createMiniMapControl(routingHelper, view); - mapInfoControls.registerSideWidget(miniMap, R.drawable.widget_next_turn, R.string.map_widget_mini_route, "mini_route", true, none, none, 20); + //MiniMapControl miniMap = ric.createMiniMapControl(routingHelper, view); + //mapInfoControls.registerSideWidget(miniMap, R.drawable.widget_next_turn, R.string.map_widget_mini_route, "mini_route", true, none, none, 20); // right stack TextInfoControl dist = ric.createDistanceControl(map, paintText, paintSubText); mapInfoControls.registerSideWidget(dist, R.drawable.info_target, R.string.map_widget_distance, "distance", false, all, none, 5);