Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tizen
diff options
context:
space:
mode:
authorSergey Pisarchik <pisarchik@mapswithme.com>2014-06-18 01:34:40 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:18:15 +0300
commitea00c6e665ec91940c3b6015f3f79ff6b309181f (patch)
treee2c0077c0e388f549eee106807c588b74adeab5b /tizen
parentab21befe8cc280e5a54ec6a047ad19af01fd4852 (diff)
[Tizen] Add pro version png.
Add menu event listener.
Diffstat (limited to 'tizen')
-rw-r--r--tizen/MapsWithMe/inc/MapsWithMeForm.hpp5
-rw-r--r--tizen/MapsWithMe/manifest.xml9
-rw-r--r--tizen/MapsWithMe/res/screen-density-high/Pro.pngbin0 -> 97108 bytes
-rw-r--r--tizen/MapsWithMe/shared/res/screen-density-xhigh/Pro.pngbin0 -> 9537 bytes
-rw-r--r--tizen/MapsWithMe/src/MapsWithMeForm.cpp11
5 files changed, 21 insertions, 4 deletions
diff --git a/tizen/MapsWithMe/inc/MapsWithMeForm.hpp b/tizen/MapsWithMe/inc/MapsWithMeForm.hpp
index 1cf6179c5c..09104ad267 100644
--- a/tizen/MapsWithMe/inc/MapsWithMeForm.hpp
+++ b/tizen/MapsWithMe/inc/MapsWithMeForm.hpp
@@ -23,6 +23,7 @@ class MapsWithMeForm
, public Tizen::Ui::Controls::IListViewItemProviderF
, public Tizen::Ui::Controls::IListViewItemEventListener
, public Tizen::Ui::Scenes::ISceneEventListener
+ , public Tizen::Ui::Controls::IFormMenuEventListener
{
public:
MapsWithMeForm();
@@ -61,7 +62,9 @@ public:
virtual void OnAccuracyChanged(Tizen::Locations::LocationAccuracy accuracy);
// IFormBackEventListener
- virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+ virtual void OnFormBackRequested(Tizen::Ui::Controls::Form & source);
+ // IFormMenuEventListener
+ virtual void OnFormMenuRequested(Tizen::Ui::Controls::Form & source);
//IListViewItemProvider
virtual Tizen::Ui::Controls::ListItemBase * CreateItem (int index, float itemWidth);
diff --git a/tizen/MapsWithMe/manifest.xml b/tizen/MapsWithMe/manifest.xml
index f356e6e6b3..1c9569b225 100644
--- a/tizen/MapsWithMe/manifest.xml
+++ b/tizen/MapsWithMe/manifest.xml
@@ -4,15 +4,18 @@
<Version>1.0.0</Version>
<Type>C++App</Type>
<Requirements>
+ <Feature Name="http://tizen.org/feature/platform.core.cpu.arch.armv7">true</Feature>
+ <Feature Name="http://tizen.org/feature/platform.core.fpu.arch.vfpv3">true</Feature>
<Feature Name="http://tizen.org/feature/platform.native.api.version">2.2</Feature>
+ <Feature Name="http://tizen.org/feature/screen.size.normal">true</Feature>
</Requirements>
<Apps>
<ApiVersion>2.2</ApiVersion>
<Privileges>
- <Privilege>http://tizen.org/privilege/web.service</Privilege>
<Privilege>http://tizen.org/privilege/location</Privilege>
- <Privilege>http://tizen.org/privilege/application.launch</Privilege>
+ <Privilege>http://tizen.org/privilege/web.service</Privilege>
<Privilege>http://tizen.org/privilege/http</Privilege>
+ <Privilege>http://tizen.org/privilege/application.launch</Privilege>
</Privileges>
<UiApp HwAcceleration="On" LaunchingHistoryVisible="True" Main="True" MenuIconVisible="True" Name="MapsWithMe">
<UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
@@ -21,7 +24,7 @@
<DisplayName Locale="eng-GB">MapsWithMe</DisplayName>
</DisplayNames>
<Icons>
- <Icon Section="MainMenu">ic_launcher.png</Icon>
+ <Icon Section="MainMenu">Pro.png</Icon>
</Icons>
<LaunchConditions/>
</UiApp>
diff --git a/tizen/MapsWithMe/res/screen-density-high/Pro.png b/tizen/MapsWithMe/res/screen-density-high/Pro.png
new file mode 100644
index 0000000000..8878ce3e9a
--- /dev/null
+++ b/tizen/MapsWithMe/res/screen-density-high/Pro.png
Binary files differ
diff --git a/tizen/MapsWithMe/shared/res/screen-density-xhigh/Pro.png b/tizen/MapsWithMe/shared/res/screen-density-xhigh/Pro.png
new file mode 100644
index 0000000000..6aa64ccb7a
--- /dev/null
+++ b/tizen/MapsWithMe/shared/res/screen-density-xhigh/Pro.png
Binary files differ
diff --git a/tizen/MapsWithMe/src/MapsWithMeForm.cpp b/tizen/MapsWithMe/src/MapsWithMeForm.cpp
index 270bc49bc5..6914ea910b 100644
--- a/tizen/MapsWithMe/src/MapsWithMeForm.cpp
+++ b/tizen/MapsWithMe/src/MapsWithMeForm.cpp
@@ -95,6 +95,7 @@ result MapsWithMeForm::OnInitializing(void)
m_locationEnabled = false;
SetFormBackEventListener(this);
+ SetFormMenuEventListener(this);
CreateBookMarkPanel();
CreateSplitPanel();
@@ -532,6 +533,16 @@ void MapsWithMeForm::OnFormBackRequested(Form& source)
}
}
+void MapsWithMeForm::OnFormMenuRequested(Tizen::Ui::Controls::Form & source)
+{
+ if (m_bookMArkSplitPanelEnabled)
+ return;
+ if (m_splitPanelEnabled)
+ HideSplitPanel();
+ else
+ ShowSplitPanel();
+}
+
void MapsWithMeForm::UpdateButtons()
{
bool bEnableScaleButtons = true;