From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Tue, 19 Mar 2013 07:04:55 +0000 (+0900)
Subject: sync with master
X-Git-Tag: 2.1b_release~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6018b90fa3aa6eba3b7ea1a05305f6c4865f3a40;p=samples%2Fnative%2FPushClient.git

sync with master
---

diff --git a/project/inc/MainForm.h b/project/inc/MainForm.h
index 79b0554..ec84b6b 100755
--- a/project/inc/MainForm.h
+++ b/project/inc/MainForm.h
@@ -28,6 +28,7 @@ class MainForm
 	, public Tizen::Ui::IActionEventListener
 	, public Tizen::Messaging::IPushManagerListener
 	, public Tizen::Messaging::IPushEventListener
+	, public Tizen::Ui::Controls::IFormBackEventListener
 {
 public:
 	MainForm(void);
@@ -37,6 +38,7 @@ public:
 	virtual result OnInitializing(void);
 	virtual result OnTerminating(void);
 	virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+	virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 	void OnPushServiceRegistered(RequestId reqId, const Tizen::Base::String& registrationId, result r, const Tizen::Base::String& errorCode, const Tizen::Base::String& errorMsg);
 	void OnPushServiceUnregistered(RequestId reqId, result r, const Tizen::Base::String& errorCode, const Tizen::Base::String& errorMsg);
 	void OnPushMessageReceived(const Tizen::Messaging::PushMessage& message);
diff --git a/project/inc/SettingForm.h b/project/inc/SettingForm.h
index b677fdb..5a2c983 100755
--- a/project/inc/SettingForm.h
+++ b/project/inc/SettingForm.h
@@ -26,6 +26,7 @@
 class SettingForm
 	: public Tizen::Ui::Controls::Form
 	, public Tizen::Ui::IActionEventListener
+	, public Tizen::Ui::Controls::IFormBackEventListener
 {
 public:
 	SettingForm(void);
@@ -35,6 +36,7 @@ public:
 	virtual result OnInitializing(void);
 	virtual result OnTerminating(void);
 	virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+	virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 	bool GetSetting(void);
 	void UpdateSetting(bool value);
 
diff --git a/project/manifest.xml b/project/manifest.xml
index 55fb300..40c6bdc 100755
--- a/project/manifest.xml
+++ b/project/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
 	<Id>208dv19d5n</Id>
-	<Version>1.0.0</Version>
+	<Version>2.0.0</Version>
 	<Type>C++App</Type>
 	<Author/>
 	<Descriptions/>
diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp
index c2dfac5..d7e2683 100755
--- a/project/src/MainForm.cpp
+++ b/project/src/MainForm.cpp
@@ -72,14 +72,15 @@ MainForm::OnInitializing(void)
 	{
 		pHeader->SetStyle(HEADER_STYLE_TITLE);
 		pHeader->SetName(L"MainForm");
-		pHeader->SetTitleText(L"PushClient - Main");
+		pHeader->SetTitleText(L"PUSH CLIENT - MAIN");
 	}
 
 	Footer* pFooter = GetFooter();
 	if (pFooter != null)
 	{
-		pFooter->SetStyle(FOOTER_STYLE_TAB);
-
+		pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
+		pFooter->SetBackButton();
+		SetFormBackEventListener(this);
 		FooterItem footerItem1;
 		footerItem1.Construct(ID_FOOTER_SETTING);
 		footerItem1.SetText(L"Setting");
@@ -168,6 +169,10 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 	case ID_BUTTON_CHECK:
 		{
 			AppLog("####### Check unread messages. #######");
+			if (!IsInitialized())
+			{
+				break;
+			}
 
 			IList* pUnreadMessges = null;
 			IEnumerator* pEnum = null;
@@ -212,6 +217,14 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 }
 
 void
+MainForm::OnFormBackRequested(Form& source)
+{
+	UiApp* pApp = UiApp::GetInstance();
+	AppAssert(pApp);
+	pApp->Terminate();
+}
+
+void
 MainForm::OnPushServiceRegistered(RequestId reqId, const Tizen::Base::String& registrationId, result r, const Tizen::Base::String& errorCode, const Tizen::Base::String& errorMsg)
 {
 	AppLog("####### OnPushServiceRegistered! #######");
diff --git a/project/src/SettingForm.cpp b/project/src/SettingForm.cpp
index 2b3d55d..df6ab45 100755
--- a/project/src/SettingForm.cpp
+++ b/project/src/SettingForm.cpp
@@ -63,14 +63,15 @@ SettingForm::OnInitializing(void)
 	{
 		pHeader->SetStyle(HEADER_STYLE_TITLE);
 		pHeader->SetName(L"SettingForm");
-		pHeader->SetTitleText(L"PushClient - Setting");
+		pHeader->SetTitleText(L"PUSH CLIENT - SETTING");
 	}
 
 	Footer* pFooter = GetFooter();
 	if (pFooter != null)
 	{
-		pFooter->SetStyle(FOOTER_STYLE_TAB);
-
+		pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
+		pFooter->SetBackButton();
+		SetFormBackEventListener(this);
 		FooterItem footerItem1;
 		footerItem1.Construct(ID_FOOTER_MAIN);
 		footerItem1.SetText(L"Main");
@@ -141,6 +142,14 @@ SettingForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 	}
 }
 
+void
+SettingForm::OnFormBackRequested(Form& source)
+{
+	UiApp* pApp = UiApp::GetInstance();
+	AppAssert(pApp);
+	pApp->Terminate();
+}
+
 bool
 SettingForm::GetSetting(void)
 {
diff --git a/screenshot.png b/screenshot.png
old mode 100644
new mode 100755
index 7a43a82..bb57bcd
Binary files a/screenshot.png and b/screenshot.png differ