pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Tizen] Review fixes.

Browse source
This commit is contained in:
Sergey Pisarchik 2014-07-29 23:02:05 +03:00 • committed by Alex Zolotarev
parent 8760507be5
commit 8d9a81cdb1
8 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tizen/MapsWithMe/inc/BookMarkUtils.hpp
View file

@ -83,5 +83,5 @@ private:
shared_ptr<UserMarkCopy> m_pCurBookMarkCopy;
};
BookMarkManager & GetBMMnger();
BookMarkManager & GetBMManager();
}

6
tizen/MapsWithMe/src/BMCategoriesForm.cpp
View file

@ -73,7 +73,7 @@ ListItemBase * BMCategoriesForm::CreateItem (int index, float itemWidth)
{
CustomItem * pItem = new CustomItem();
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
pItem->Construct(FloatDimension(itemWidth, lstItmHght), LIST_ANNEX_STYLE_NORMAL);
int addWdth = 0;
@ -108,7 +108,7 @@ ListItemBase * BMCategoriesForm::CreateItem (int index, float itemWidth)
void BMCategoriesForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView & listView, int index, int elementId, Tizen::Ui::Controls::ListItemStatus status)
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
if (elementId == ID_EYE)
{
bool bVisible = mngr.IsCategoryVisible(index);
@ -163,5 +163,5 @@ bool BMCategoriesForm::DeleteItem (int index, Tizen::Ui::Controls::ListItemBase
int BMCategoriesForm::GetItemCount(void)
{
return GetBMMnger().GetCategoriesCount();
return GetBMManager().GetCategoriesCount();
}

18
tizen/MapsWithMe/src/BookMarkSplitPanel.cpp
View file

@ -137,8 +137,8 @@ void BookMarkSplitPanel::OnActionPerformed(Tizen::Ui::Control const & source, in
{
case ID_SHARE_BUTTON:
{
String textValSMS = GetBMMnger().GetSMSTextMark(GetBMMnger().GetCurMark());
String textValEmail = GetBMMnger().GetEmailTextMark(GetBMMnger().GetCurMark());
String textValSMS = GetBMManager().GetSMSTextMark(GetBMManager().GetCurMark());
String textValEmail = GetBMManager().GetEmailTextMark(GetBMManager().GetCurMark());
ArrayList * pList = new ArrayList;
pList->Construct();
pList->Add(new String(textValSMS));
@ -178,7 +178,7 @@ Tizen::Ui::Controls::ListItemBase * BookMarkSplitPanel::CreateHeaderItem (float
}
Tizen::Ui::Controls::ListItemBase * BookMarkSplitPanel::CreateSettingsItem (float itemWidth)
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
CustomItem * pItem = new CustomItem();
pItem->Construct(FloatDimension(itemWidth, settingsItemHeight), LIST_ANNEX_STYLE_NORMAL);
@ -250,7 +250,7 @@ void BookMarkSplitPanel::UpdateState()
m_pButton->SetPosition(btwWdth, listSz + btwWdth);
m_pDummyMessageEdit->SetFocus();
m_pMessageEdit->SetShowState(IsBookMark());
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
if (!mngr.GetBookMarkMessage().IsEmpty())
m_pMessageEdit->SetText(mngr.GetBookMarkMessage());
else
@ -274,7 +274,7 @@ void BookMarkSplitPanel::OnListViewItemStateChanged(Tizen::Ui::Controls::ListVie
{
if (index == HEADER_ITEM && elementId == STAR_BUTTON)
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
if (IsBookMark())
{
mngr.RemoveCurBookMark();
@ -333,12 +333,12 @@ Tizen::Base::String BookMarkSplitPanel::GetLocationText() const
Tizen::Base::String BookMarkSplitPanel::GetGroupText() const
{
return GetBMMnger().GetCurrentCategoryName();
return GetBMManager().GetCurrentCategoryName();
}
Tizen::Base::String BookMarkSplitPanel::GetMessageText() const
{
return GetBMMnger().GetBookMarkMessage();
return GetBMManager().GetBookMarkMessage();
}
bool BookMarkSplitPanel::IsBookMark() const
@ -348,7 +348,7 @@ bool BookMarkSplitPanel::IsBookMark() const
UserMark const * BookMarkSplitPanel::GetCurMark() const
{
return GetBMMnger().GetCurMark();
return GetBMManager().GetCurMark();
}
void BookMarkSplitPanel::OnTextValueChangeCanceled (Tizen::Ui::Control const & source)
@ -358,7 +358,7 @@ void BookMarkSplitPanel::OnTextValueChangeCanceled (Tizen::Ui::Control const & s
void BookMarkSplitPanel::OnTextValueChanged (Tizen::Ui::Control const & source)
{
GetBMMnger().SetBookMarkMessage(m_pMessageEdit->GetText());
GetBMManager().SetBookMarkMessage(m_pMessageEdit->GetText());
UpdateState();
}

2
tizen/MapsWithMe/src/BookMarkUtils.cpp
View file

@ -190,7 +190,7 @@ const wchar_t * GetColorPPBM(EColor color)
return IDB_COLOR_PP_RED;
}
BookMarkManager & GetBMMnger()
BookMarkManager & GetBMManager()
{
return BookMarkManager::GetInstance();
}

10
tizen/MapsWithMe/src/CategoryForm.cpp
View file

@ -53,7 +53,7 @@ result CategoryForm::OnInitializing(void)
void CategoryForm::OnActionPerformed(Tizen::Ui::Control const & source, int actionId)
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
switch(actionId)
{
case ID_EDIT:
@ -86,7 +86,7 @@ void CategoryForm::OnFormBackRequested(Tizen::Ui::Controls::Form & source)
ListItemBase * CategoryForm::CreateItem (int index, float itemWidth)
{
Bookmark const * pBMark = GetBMMnger().GetBookMark(m_curCategory, index);
Bookmark const * pBMark = GetBMManager().GetBookMark(m_curCategory, index);
String itemText = pBMark->GetName().c_str();
CustomItem * pItem = new CustomItem();
@ -125,7 +125,7 @@ ListItemBase * CategoryForm::CreateItem (int index, float itemWidth)
void CategoryForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView & listView, int index, int elementId, Tizen::Ui::Controls::ListItemStatus status)
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
if (elementId == ID_DELETE)
{
if (m_itemToDelete == index)
@ -151,7 +151,7 @@ void CategoryForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView & li
void CategoryForm::UpdateState()
{
BookMarkManager & mngr = GetBMMnger();
BookMarkManager & mngr = GetBMManager();
ListView * pList = static_cast<ListView *>(GetControl(IDC_LISTVIEW, true));
pList->SetSize(pList->GetWidth(), GetItemCount() * lstItmHght);
pList->UpdateList();
@ -177,7 +177,7 @@ void CategoryForm::UpdateState()
void CategoryForm::OnTextValueChanged (Tizen::Ui::Control const & source)
{
EditField * pEditName = static_cast<EditField *>(GetControl(IDC_EDITFIELD_NAME, true));
GetBMMnger().SetCategoryName(m_curCategory, pEditName->GetText());
GetBMManager().SetCategoryName(m_curCategory, pEditName->GetText());
UpdateState();
}

4
tizen/MapsWithMe/src/MapsWithMeForm.cpp
View file

@ -571,8 +571,8 @@ void MapsWithMeForm::OnListViewItemStateChanged(ListView & listView, int index,
double lat, lon;
if (GetFramework()->GetCurrentPosition(lat, lon))
{
String textValSMS = bookmark::GetBMMnger().GetSMSTextMyPosition(lat, lon);
String textValEmail = bookmark::GetBMMnger().GetEmailTextMyPosition(lat, lon);
String textValSMS = bookmark::GetBMManager().GetSMSTextMyPosition(lat, lon);
String textValEmail = bookmark::GetBMManager().GetEmailTextMyPosition(lat, lon);
ArrayList * pList = new ArrayList;
pList->Construct();
pList->Add(new String(textValSMS));

12
tizen/MapsWithMe/src/SelectBMCategoryForm.cpp
View file

@ -52,13 +52,13 @@ void SelectBMCategoryForm::OnFormBackRequested(Tizen::Ui::Controls::Form & sourc
ListItemBase * SelectBMCategoryForm::CreateItem(int index, float itemWidth)
{
String itemText = GetBMMnger().GetCategoryName(index);
String itemText = GetBMManager().GetCategoryName(index);
CustomItem * pItem = new CustomItem();
pItem->Construct(FloatDimension(itemWidth, lstItmHght), LIST_ANNEX_STYLE_NORMAL);
FloatRectangle imgRect(btwWdth, topHght, imgWdth, imgHght);
pItem->AddElement(FloatRectangle(btwWdth, topHght, itemWidth - 2 * btwWdth - imgWdth, imgHght), 1, itemText, mainFontSz, black, black, black);
if(index == GetBMMnger().GetCurrentCategory())
if(index == GetBMManager().GetCurrentCategory())
pItem->AddElement(FloatRectangle(itemWidth - btwWdth - imgWdth, topHght, imgWdth, imgHght), 0, *GetBitmap(IDB_V));
return pItem;
@ -66,7 +66,7 @@ ListItemBase * SelectBMCategoryForm::CreateItem(int index, float itemWidth)
void SelectBMCategoryForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView & listView, int index, int elementId, Tizen::Ui::Controls::ListItemStatus status)
{
GetBMMnger().SetNewCurBookMarkCategory(index);
GetBMManager().SetNewCurBookMarkCategory(index);
SceneManager * pSceneManager = SceneManager::GetInstance();
pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT));
}
@ -79,7 +79,7 @@ bool SelectBMCategoryForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBa
int SelectBMCategoryForm::GetItemCount(void)
{
return GetBMMnger().GetCategoriesCount();
return GetBMManager().GetCategoriesCount();
}
void SelectBMCategoryForm::OnTextValueChangeCanceled(Tizen::Ui::Control const & source)
@ -92,9 +92,9 @@ void SelectBMCategoryForm::OnTextValueChangeCanceled(Tizen::Ui::Control const &
void SelectBMCategoryForm::OnTextValueChanged(Tizen::Ui::Control const & source)
{
EditField * pEditField = static_cast<EditField *>(GetControl(IDC_EDITFIELD, true));
int iNewCat = GetBMMnger().AddCategory(pEditField->GetText());
int iNewCat = GetBMManager().AddCategory(pEditField->GetText());
if (iNewCat >= 0)
GetBMMnger().SetNewCurBookMarkCategory(iNewCat);
GetBMManager().SetNewCurBookMarkCategory(iNewCat);
pEditField->SetText("");
ListView * pList = static_cast<ListView *>(GetControl(IDC_LISTVIEW, true));
pList->UpdateList();

6
tizen/MapsWithMe/src/SharePositionForm.cpp
View file

@ -146,10 +146,8 @@ void SharePositionForm::OnSceneActivatedN(Tizen::Ui::Scenes::SceneId const & pre
{
if (pArgs->GetCount() == 3)
{
String * pMessageSMS = dynamic_cast<String *>(pArgs->GetAt(0));
m_messageSMS = *pMessageSMS;
String * pMessageEmail = dynamic_cast<String *>(pArgs->GetAt(1));
m_messageEmail = *pMessageEmail;
m_messageSMS = *dynamic_cast<String *>(pArgs->GetAt(0));
m_messageEmail = *dynamic_cast<String *>(pArgs->GetAt(1));
Boolean * pSharePosition = dynamic_cast<Boolean *>(pArgs->GetAt(2));
m_sharePosition = pSharePosition->value;
}