diff options
| author | cheun.hong <cheun.hong@samsung.com> | 2013-06-22 16:43:50 +0900 |
|---|---|---|
| committer | cheun.hong <cheun.hong@samsung.com> | 2013-06-22 17:02:27 +0900 |
| commit | 27306d181a6e2b297545ee2b7034cf744a973acb (patch) | |
| tree | 5af0321a05b027472cbd4ba00a49e976dca9834b | |
| parent | 648b0eccae6d74368aba7fec1c0ee94ca37d5003 (diff) | |
| download | UiControls-27306d181a6e2b297545ee2b7034cf744a973acb.tar.gz UiControls-27306d181a6e2b297545ee2b7034cf744a973acb.tar.bz2 UiControls-27306d181a6e2b297545ee2b7034cf744a973acb.zip | |
Apply Tizen2.2 GUI & Add SectionTableView
Change-Id: Ida7e9df2d194de95d46a613249e3ab4ab629d0ba
Signed-off-by: cheun.hong <cheun.hong@samsung.com>
55 files changed, 672 insertions, 120 deletions
diff --git a/project/inc/AppResourceId.h b/project/inc/AppResourceId.h index fe9670d..36f70ce 100644 --- a/project/inc/AppResourceId.h +++ b/project/inc/AppResourceId.h @@ -18,33 +18,82 @@ #ifndef _APP_RESOURCE_ID_H_ #define _APP_RESOURCE_ID_H_ +extern const wchar_t* IDC_BUTTON; extern const wchar_t* IDC_BUTTON2; +extern const wchar_t* IDC_BUTTON_BACKGROUND; extern const wchar_t* IDC_BUTTON_CLEAR; extern const wchar_t* IDC_BUTTON_CLEAR2; +extern const wchar_t* IDC_BUTTON_COLOR; +extern const wchar_t* IDC_BUTTON_DATEPICKER; +extern const wchar_t* IDC_BUTTON_DATETIMEPICKER; +extern const wchar_t* IDC_BUTTON_DISABLE; extern const wchar_t* IDC_BUTTON_DOWN; extern const wchar_t* IDC_BUTTON_EDITAREA_CLEAR; +extern const wchar_t* IDC_BUTTON_GRID; +extern const wchar_t* IDC_BUTTON_LIST; +extern const wchar_t* IDC_BUTTON_MESSAGEBOX; +extern const wchar_t* IDC_BUTTON_PANEL; +extern const wchar_t* IDC_BUTTON_PAUSE; +extern const wchar_t* IDC_BUTTON_PLAY; +extern const wchar_t* IDC_BUTTON_POPUP; +extern const wchar_t* IDC_BUTTON_PRESSED_BACKGROUND; +extern const wchar_t* IDC_BUTTON_PROGRESSPOPUP; +extern const wchar_t* IDC_BUTTON_SCROLLPANEL; +extern const wchar_t* IDC_BUTTON_STOP; +extern const wchar_t* IDC_BUTTON_TIMEPICKER; extern const wchar_t* IDC_BUTTON_UP; +extern const wchar_t* IDC_CHECKBUTTON_DISABLE; +extern const wchar_t* IDC_CHECKBUTTON_GROUP_BOTTOM; +extern const wchar_t* IDC_CHECKBUTTON_GROUP_MIDDLE; +extern const wchar_t* IDC_CHECKBUTTON_GROUP_TOP; +extern const wchar_t* IDC_CHECKBUTTON_MARK; +extern const wchar_t* IDC_CHECKBUTTON_MARK_WITH_DETAILED; +extern const wchar_t* IDC_CHECKBUTTON_ONOFF; +extern const wchar_t* IDC_CHECKBUTTON_RADIO; +extern const wchar_t* IDC_CHECKBUTTON_RADIO_WITH_DETAILED; +extern const wchar_t* IDC_COLORPICKER; extern const wchar_t* IDC_EDITAREA; +extern const wchar_t* IDC_EDITDATE; +extern const wchar_t* IDC_EDITDATE_DISABLE; +extern const wchar_t* IDC_EDITDATE_NO_TITLE; extern const wchar_t* IDC_EDITFIELD; extern const wchar_t* IDC_EDITFIELD_DISABLE; extern const wchar_t* IDC_EDITFIELD_INNERTITLE; extern const wchar_t* IDC_EDITFIELD_TOPTITLE; +extern const wchar_t* IDC_EDITTIME; +extern const wchar_t* IDC_EDITTIME_DISABLE; +extern const wchar_t* IDC_EDITTIME_NO_TITLE; extern const wchar_t* IDC_EXPANDABLEEDITAREA1; extern const wchar_t* IDC_EXPANDABLEEDITAREA2; +extern const wchar_t* IDC_GALLERY; extern const wchar_t* IDC_GROUPEDLISTVIEW; +extern const wchar_t* IDC_GROUPEDTABLEVIEW; extern const wchar_t* IDC_ICONLISTVIEW_HORIZONTAL; extern const wchar_t* IDC_ICONLISTVIEW_VERTICAL; extern const wchar_t* IDC_LABEL1; +extern const wchar_t* IDC_LABEL2; +extern const wchar_t* IDC_LABEL_COLOR; extern const wchar_t* IDC_LABEL_EDITAREA; extern const wchar_t* IDC_LABEL_EDITFIELD; extern const wchar_t* IDC_LISTVIEW; +extern const wchar_t* IDC_PANEL; extern const wchar_t* IDC_PANEL2; extern const wchar_t* IDC_PROGRESS; extern const wchar_t* IDC_PROGRESS_COLOR; extern const wchar_t* IDC_PROGRESS_DISABLE; extern const wchar_t* IDC_SCROLLPANEL; extern const wchar_t* IDC_SEARCHBAR; +extern const wchar_t* IDC_SECTIONTABLEVIEW; +extern const wchar_t* IDC_SECTIONTABLEVIEW1; +extern const wchar_t* IDC_SLIDER; +extern const wchar_t* IDC_SLIDER_COLOR; +extern const wchar_t* IDC_SLIDER_DISABLE; +extern const wchar_t* IDC_SLIDER_ICON; +extern const wchar_t* IDC_SLIDER_NO_BACKGROUND; +extern const wchar_t* IDC_SLIDER_TITLE; extern const wchar_t* IDC_SPLITPANEL; +extern const wchar_t* IDC_TABBAR; +extern const wchar_t* IDC_TEXTBOX; extern const wchar_t* IDF_FORM_ANIMATION; extern const wchar_t* IDF_FORM_BUTTON; extern const wchar_t* IDF_FORM_CHECKBUTTON; @@ -69,5 +118,6 @@ extern const wchar_t* IDF_FORM_SLIDER; extern const wchar_t* IDF_FORM_SPLITPANEL; extern const wchar_t* IDF_FORM_TABBAR; extern const wchar_t* IDF_FORM_TABLEVIEW; +extern const wchar_t* IDF_FORM_TEXTBOX; #endif // _APP_RESOURCE_ID_H_ diff --git a/project/inc/FormFactory.h b/project/inc/FormFactory.h index a702829..c689488 100644 --- a/project/inc/FormFactory.h +++ b/project/inc/FormFactory.h @@ -47,6 +47,7 @@ extern const wchar_t* FORM_PANEL; extern const wchar_t* FORM_PROGRESS; extern const wchar_t* FORM_RADIOGROUP; extern const wchar_t* FORM_SEARCHBAR; +extern const wchar_t* FORM_SECTIONTABLEVIEW; extern const wchar_t* FORM_SLIDER; extern const wchar_t* FORM_SPLIT_PANEL; extern const wchar_t* FORM_TABBAR; diff --git a/project/inc/SceneRegister.h b/project/inc/SceneRegister.h index e11698b..8a19348 100644 --- a/project/inc/SceneRegister.h +++ b/project/inc/SceneRegister.h @@ -45,6 +45,7 @@ extern const wchar_t* SCENE_PANEL_FORM; extern const wchar_t* SCENE_PROGRESS_FORM; extern const wchar_t* SCENE_RADIOGROUP_FORM; extern const wchar_t* SCENE_SEARCHBAR_FORM; +extern const wchar_t* SCENE_SECTION_TABLEVIEW_FORM; extern const wchar_t* SCENE_SLIDER_FORM; extern const wchar_t* SCENE_SPLIT_PANEL_FORM; extern const wchar_t* SCENE_TABBAR_FORM; diff --git a/project/inc/SectionTableViewForm.h b/project/inc/SectionTableViewForm.h new file mode 100644 index 0000000..d2a6bff --- /dev/null +++ b/project/inc/SectionTableViewForm.h @@ -0,0 +1,82 @@ +// +// Tizen native SDK +// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.1 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://floralicense.org/license/ +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an AS IS BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef _SECTIONTABLEVIEW_FORM_H_ +#define _SECTIONTABLEVIEW_FORM_H_ + +#include <FApp.h> +#include "BaseForm.h" + +class SectionTableViewForm + : public BaseForm + , public Tizen::Ui::Controls::ISectionTableViewItemEventListener + , public Tizen::Ui::Controls::ISectionTableViewItemProviderF +{ +public: + SectionTableViewForm(void); + virtual ~SectionTableViewForm(void); + + virtual bool Initialize(void); + void GetBitmap(void); + virtual result OnInitializing(void); + virtual result OnTerminating(void); + + //ISectionTableViewItemProviderF + virtual int GetSectionCount(void); + virtual int GetItemCount(int sectionIndex); + virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int sectionIndex, int itemIndex, float itemWidth); + virtual bool DeleteItem(int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); + virtual void UpdateItem(int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); + virtual Tizen::Base::String GetSectionHeader(int sectionIndex); + virtual bool HasSectionHeader(int sectionIndex); + virtual Tizen::Base::String GetSectionFooter(int sectionIndex); + virtual bool HasSectionFooter(int sectionIndex); + virtual float GetDefaultItemHeight(void); + + //ISectionTableViewItemEventListener + + virtual void OnSectionTableViewItemStateChanged(Tizen::Ui::Controls::SectionTableView& tableView, int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status); + virtual void OnSectionTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::SectionTableView& tableView, int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated); + +private: + static const int SECTION_COUNT = 3; + static const int ID_GROUP_INDEX_MAIN = 0; + static const int ID_GROUP_INDEX_VOLUME = 1; + static const int ID_GROUP_INDEX_VIBRATION = 2; + static const int ID_GROUP_INDEX_INFORMATION = 3; + static const int ID_GROUP_INDEX_MAIN_ITEM_SOUNDS = 0; + static const int ID_GROUP_INDEX_MAIN_ITEM_VIBRATION = 1; + + Tizen::Ui::Controls::SectionTableView* __pSectionTableView; + Tizen::Ui::Controls::EditField* __pEditField; + Tizen::Ui::Controls::Slider* __pSlider; + + Tizen::Graphics::Bitmap* __pWifiBitmap; + Tizen::Graphics::Bitmap* __pBluetoothBitmap; + Tizen::Graphics::Bitmap* __pNetworkBitmap; + Tizen::Graphics::Bitmap* __pNFCBitmap; + Tizen::Graphics::Bitmap* __pSBeamBitmap; + Tizen::Graphics::Bitmap* __pWiFiDirectBitmap; + Tizen::Graphics::Bitmap* __pScreenMirroringBitmap; + Tizen::Graphics::Bitmap* __pNearbydevicesBitmap; + Tizen::Graphics::Bitmap* __pKiesBitmap; + Tizen::Graphics::Bitmap* __pFlightmodeBitmap; + Tizen::Graphics::Bitmap* __pBlockingmodeBitmap; + Tizen::Graphics::Bitmap* __pPowerSavingmodeBitmap; + Tizen::Graphics::Bitmap* __pDrivingmodeBitmap; +}; // SectionTableViewForm + +#endif // _SECTIONTABLEVIEW_FORM_H_ diff --git a/project/res/screen-density-xhigh/settings_74_allshare.png b/project/res/screen-density-xhigh/settings_74_allshare.png Binary files differnew file mode 100644 index 0000000..1ce0733 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_allshare.png diff --git a/project/res/screen-density-xhigh/settings_74_block.png b/project/res/screen-density-xhigh/settings_74_block.png Binary files differnew file mode 100644 index 0000000..39cda12 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_block.png diff --git a/project/res/screen-density-xhigh/settings_74_bluetooth.png b/project/res/screen-density-xhigh/settings_74_bluetooth.png Binary files differnew file mode 100644 index 0000000..452d53b --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_bluetooth.png diff --git a/project/res/screen-density-xhigh/settings_74_driving_mode.png b/project/res/screen-density-xhigh/settings_74_driving_mode.png Binary files differnew file mode 100644 index 0000000..6870dce --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_driving_mode.png diff --git a/project/res/screen-density-xhigh/settings_74_flight.png b/project/res/screen-density-xhigh/settings_74_flight.png Binary files differnew file mode 100644 index 0000000..37e4a18 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_flight.png diff --git a/project/res/screen-density-xhigh/settings_74_kies_via_wifi.png b/project/res/screen-density-xhigh/settings_74_kies_via_wifi.png Binary files differnew file mode 100644 index 0000000..f0d92c3 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_kies_via_wifi.png diff --git a/project/res/screen-density-xhigh/settings_74_near_device.png b/project/res/screen-density-xhigh/settings_74_near_device.png Binary files differnew file mode 100644 index 0000000..bda5931 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_near_device.png diff --git a/project/res/screen-density-xhigh/settings_74_network.png b/project/res/screen-density-xhigh/settings_74_network.png Binary files differnew file mode 100644 index 0000000..71d3dc5 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_network.png diff --git a/project/res/screen-density-xhigh/settings_74_nfc.png b/project/res/screen-density-xhigh/settings_74_nfc.png Binary files differnew file mode 100644 index 0000000..09aa6e2 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_nfc.png diff --git a/project/res/screen-density-xhigh/settings_74_power_saving_mode.png b/project/res/screen-density-xhigh/settings_74_power_saving_mode.png Binary files differnew file mode 100644 index 0000000..908c354 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_power_saving_mode.png diff --git a/project/res/screen-density-xhigh/settings_74_sbeam.png b/project/res/screen-density-xhigh/settings_74_sbeam.png Binary files differnew file mode 100644 index 0000000..a3327db --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_sbeam.png diff --git a/project/res/screen-density-xhigh/settings_74_wifi.png b/project/res/screen-density-xhigh/settings_74_wifi.png Binary files differnew file mode 100644 index 0000000..6b75906 --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_wifi.png diff --git a/project/res/screen-density-xhigh/settings_74_wifi_direct.png b/project/res/screen-density-xhigh/settings_74_wifi_direct.png Binary files differnew file mode 100644 index 0000000..4462c8d --- /dev/null +++ b/project/res/screen-density-xhigh/settings_74_wifi_direct.png diff --git a/project/res/screen-size-normal/IDF_FORM_ANIMATION.xml b/project/res/screen-size-normal/IDF_FORM_ANIMATION.xml index aae0698..8b751de 100644 --- a/project/res/screen-size-normal/IDF_FORM_ANIMATION.xml +++ b/project/res/screen-size-normal/IDF_FORM_ANIMATION.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_ANIMATION"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_BUTTON.xml b/project/res/screen-size-normal/IDF_FORM_BUTTON.xml index 66ba1b9..a7bf663 100644 --- a/project/res/screen-size-normal/IDF_FORM_BUTTON.xml +++ b/project/res/screen-size-normal/IDF_FORM_BUTTON.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_BUTTON"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_CHECKBUTTON.xml b/project/res/screen-size-normal/IDF_FORM_CHECKBUTTON.xml index 599125e..1fd4355 100644 --- a/project/res/screen-size-normal/IDF_FORM_CHECKBUTTON.xml +++ b/project/res/screen-size-normal/IDF_FORM_CHECKBUTTON.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_CHECKBUTTON"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_COLORPICKER.xml b/project/res/screen-size-normal/IDF_FORM_COLORPICKER.xml index bfca2d5..023ab39 100644 --- a/project/res/screen-size-normal/IDF_FORM_COLORPICKER.xml +++ b/project/res/screen-size-normal/IDF_FORM_COLORPICKER.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_COLORPICKER"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_CUSTOMBUTTON.xml b/project/res/screen-size-normal/IDF_FORM_CUSTOMBUTTON.xml index 1545669..3a4a175 100644 --- a/project/res/screen-size-normal/IDF_FORM_CUSTOMBUTTON.xml +++ b/project/res/screen-size-normal/IDF_FORM_CUSTOMBUTTON.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_CUSTOMBUTTON"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_DATETIME.xml b/project/res/screen-size-normal/IDF_FORM_DATETIME.xml index 8c9a550..a388394 100644 --- a/project/res/screen-size-normal/IDF_FORM_DATETIME.xml +++ b/project/res/screen-size-normal/IDF_FORM_DATETIME.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_DATETIME"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_EDIT.xml b/project/res/screen-size-normal/IDF_FORM_EDIT.xml index 68112f0..cd2be3f 100644 --- a/project/res/screen-size-normal/IDF_FORM_EDIT.xml +++ b/project/res/screen-size-normal/IDF_FORM_EDIT.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_EDIT"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_ENRICHEDTEXT.xml b/project/res/screen-size-normal/IDF_FORM_ENRICHEDTEXT.xml index 528b010..89f97dc 100644 --- a/project/res/screen-size-normal/IDF_FORM_ENRICHEDTEXT.xml +++ b/project/res/screen-size-normal/IDF_FORM_ENRICHEDTEXT.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_ENRICHEDTEXT"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_EXPANDABLEEDITAREA.xml b/project/res/screen-size-normal/IDF_FORM_EXPANDABLEEDITAREA.xml index 8d4999d..1130b4e 100644 --- a/project/res/screen-size-normal/IDF_FORM_EXPANDABLEEDITAREA.xml +++ b/project/res/screen-size-normal/IDF_FORM_EXPANDABLEEDITAREA.xml @@ -8,8 +8,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_EXPANDABLEEDITAREA"> <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Header> <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="ExpandableEditArea" titleTextColor=""/> diff --git a/project/res/screen-size-normal/IDF_FORM_GALLERY.xml b/project/res/screen-size-normal/IDF_FORM_GALLERY.xml index ce728d9..cef5542 100644 --- a/project/res/screen-size-normal/IDF_FORM_GALLERY.xml +++ b/project/res/screen-size-normal/IDF_FORM_GALLERY.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_GALLERY"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_GROUPEDLISTVIEW.xml b/project/res/screen-size-normal/IDF_FORM_GROUPEDLISTVIEW.xml index 3d88613..2a71628 100644 --- a/project/res/screen-size-normal/IDF_FORM_GROUPEDLISTVIEW.xml +++ b/project/res/screen-size-normal/IDF_FORM_GROUPEDLISTVIEW.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_GROUPEDLISTVIEW"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_ICONLISTVIEW.xml b/project/res/screen-size-normal/IDF_FORM_ICONLISTVIEW.xml index 06a4b87..56f9f79 100644 --- a/project/res/screen-size-normal/IDF_FORM_ICONLISTVIEW.xml +++ b/project/res/screen-size-normal/IDF_FORM_ICONLISTVIEW.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_ICONLISTVIEW"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_LISTVIEW.xml b/project/res/screen-size-normal/IDF_FORM_LISTVIEW.xml index 031b11c..df2fcea 100644 --- a/project/res/screen-size-normal/IDF_FORM_LISTVIEW.xml +++ b/project/res/screen-size-normal/IDF_FORM_LISTVIEW.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_LISTVIEW"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_MENU.xml b/project/res/screen-size-normal/IDF_FORM_MENU.xml index 5f7c35b..e489c19 100644 --- a/project/res/screen-size-normal/IDF_FORM_MENU.xml +++ b/project/res/screen-size-normal/IDF_FORM_MENU.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_MENU"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_MSGBOXPOPUP.xml b/project/res/screen-size-normal/IDF_FORM_MSGBOXPOPUP.xml index 742fcb5..42c6650 100644 --- a/project/res/screen-size-normal/IDF_FORM_MSGBOXPOPUP.xml +++ b/project/res/screen-size-normal/IDF_FORM_MSGBOXPOPUP.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_MSGBOXPOPUP"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_NAVIGATION.xml b/project/res/screen-size-normal/IDF_FORM_NAVIGATION.xml index 15d950e..ff49fb8 100644 --- a/project/res/screen-size-normal/IDF_FORM_NAVIGATION.xml +++ b/project/res/screen-size-normal/IDF_FORM_NAVIGATION.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_NAVIGATION"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_OVERLAYKEYPAD.xml b/project/res/screen-size-normal/IDF_FORM_OVERLAYKEYPAD.xml index 4680212..e2207da 100644 --- a/project/res/screen-size-normal/IDF_FORM_OVERLAYKEYPAD.xml +++ b/project/res/screen-size-normal/IDF_FORM_OVERLAYKEYPAD.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_OVERLAYKEYPAD"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_PANEL.xml b/project/res/screen-size-normal/IDF_FORM_PANEL.xml index 94a13b3..229a6eb 100644 --- a/project/res/screen-size-normal/IDF_FORM_PANEL.xml +++ b/project/res/screen-size-normal/IDF_FORM_PANEL.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_PANEL"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_PROGRESS.xml b/project/res/screen-size-normal/IDF_FORM_PROGRESS.xml index 186d591..a0a86ff 100644 --- a/project/res/screen-size-normal/IDF_FORM_PROGRESS.xml +++ b/project/res/screen-size-normal/IDF_FORM_PROGRESS.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_PROGRESS"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_SEGMENTED_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_SEARCHBAR.xml b/project/res/screen-size-normal/IDF_FORM_SEARCHBAR.xml index 3dc1966..10542a9 100644 --- a/project/res/screen-size-normal/IDF_FORM_SEARCHBAR.xml +++ b/project/res/screen-size-normal/IDF_FORM_SEARCHBAR.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_SEARCHBAR"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_SECTIONTABLEVIEW.xml b/project/res/screen-size-normal/IDF_FORM_SECTIONTABLEVIEW.xml new file mode 100644 index 0000000..64fac22 --- /dev/null +++ b/project/res/screen-size-normal/IDF_FORM_SECTIONTABLEVIEW.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + This XML file was automatically generated by UiBuilder - do not modify by hand. +--> +<!DOCTYPE Scene SYSTEM "UIForm.dtd"> + +<Scene Bversion="2.0.0.201304161803" Dversion="20120315"> + <LogicalCoordinate>720</LogicalCoordinate> + <Form id="IDF_FORM_SECTIONTABLEVIEW"> + <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + </Form> + <Footer> + <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> + <itemSet/> + </Footer> + <Header> + <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="SectionTableView" titleTextColor=""/> + <itemSet/> + </Header> + <SectionTableView id="IDC_SECTIONTABLEVIEW" parent="IDF_FORM_SECTIONTABLEVIEW"> + <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" groupedLookEnabled="false" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_NONE" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sectionColor="" useSearchIcon="false"/> + <layout bottomRelation="IDF_FORM_SECTIONTABLEVIEW" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDF_FORM_SECTIONTABLEVIEW" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="15.0" marginRight="15.0" marginTop="0.0" mode="Portrait" rightRelation="IDF_FORM_SECTIONTABLEVIEW" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDF_FORM_SECTIONTABLEVIEW" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="690.0" x="15.0" y="0.0"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="730.0" x="515.0" y="90.0"/> + </SectionTableView> +</Scene> diff --git a/project/res/screen-size-normal/IDF_FORM_SLIDER.xml b/project/res/screen-size-normal/IDF_FORM_SLIDER.xml index cc7e03b..c16dd07 100644 --- a/project/res/screen-size-normal/IDF_FORM_SLIDER.xml +++ b/project/res/screen-size-normal/IDF_FORM_SLIDER.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_SLIDER"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_SPLITPANEL.xml b/project/res/screen-size-normal/IDF_FORM_SPLITPANEL.xml index 8a0d341..bea5f95 100644 --- a/project/res/screen-size-normal/IDF_FORM_SPLITPANEL.xml +++ b/project/res/screen-size-normal/IDF_FORM_SPLITPANEL.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_SPLITPANEL"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_TABBAR.xml b/project/res/screen-size-normal/IDF_FORM_TABBAR.xml index 5bdcd71..7f81e7b 100644 --- a/project/res/screen-size-normal/IDF_FORM_TABBAR.xml +++ b/project/res/screen-size-normal/IDF_FORM_TABBAR.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_TABBAR"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_TABLEVIEW.xml b/project/res/screen-size-normal/IDF_FORM_TABLEVIEW.xml index c88fc1f..95c64e7 100644 --- a/project/res/screen-size-normal/IDF_FORM_TABLEVIEW.xml +++ b/project/res/screen-size-normal/IDF_FORM_TABLEVIEW.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_TABLEVIEW"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/res/screen-size-normal/IDF_FORM_TEXTBOX.xml b/project/res/screen-size-normal/IDF_FORM_TEXTBOX.xml index 1ce66b8..386c08b 100644 --- a/project/res/screen-size-normal/IDF_FORM_TEXTBOX.xml +++ b/project/res/screen-size-normal/IDF_FORM_TEXTBOX.xml @@ -7,8 +7,8 @@ <LogicalCoordinate>720</LogicalCoordinate> <Form id="IDF_FORM_TEXTBOX"> <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/> - <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> - <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/> + <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> + <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER" type="LAYOUT_RELATIVE"/> </Form> <Footer> <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/> diff --git a/project/src/AppResourceId.cpp b/project/src/AppResourceId.cpp index 2b060e8..820628b 100644 --- a/project/src/AppResourceId.cpp +++ b/project/src/AppResourceId.cpp @@ -17,33 +17,82 @@ #include "AppResourceId.h" +const wchar_t* IDC_BUTTON = L"IDC_BUTTON"; const wchar_t* IDC_BUTTON2 = L"IDC_BUTTON2"; +const wchar_t* IDC_BUTTON_BACKGROUND = L"IDC_BUTTON_BACKGROUND"; const wchar_t* IDC_BUTTON_CLEAR = L"IDC_BUTTON_CLEAR"; const wchar_t* IDC_BUTTON_CLEAR2 = L"IDC_BUTTON_CLEAR2"; +const wchar_t* IDC_BUTTON_COLOR = L"IDC_BUTTON_COLOR"; +const wchar_t* IDC_BUTTON_DATEPICKER = L"IDC_BUTTON_DATEPICKER"; +const wchar_t* IDC_BUTTON_DATETIMEPICKER = L"IDC_BUTTON_DATETIMEPICKER"; +const wchar_t* IDC_BUTTON_DISABLE = L"IDC_BUTTON_DISABLE"; const wchar_t* IDC_BUTTON_DOWN = L"IDC_BUTTON_DOWN"; const wchar_t* IDC_BUTTON_EDITAREA_CLEAR = L"IDC_BUTTON_EDITAREA_CLEAR"; +const wchar_t* IDC_BUTTON_GRID = L"IDC_BUTTON_GRID"; +const wchar_t* IDC_BUTTON_LIST = L"IDC_BUTTON_LIST"; +const wchar_t* IDC_BUTTON_MESSAGEBOX = L"IDC_BUTTON_MESSAGEBOX"; +const wchar_t* IDC_BUTTON_PANEL = L"IDC_BUTTON_PANEL"; +const wchar_t* IDC_BUTTON_PAUSE = L"IDC_BUTTON_PAUSE"; +const wchar_t* IDC_BUTTON_PLAY = L"IDC_BUTTON_PLAY"; +const wchar_t* IDC_BUTTON_POPUP = L"IDC_BUTTON_POPUP"; +const wchar_t* IDC_BUTTON_PRESSED_BACKGROUND = L"IDC_BUTTON_PRESSED_BACKGROUND"; +const wchar_t* IDC_BUTTON_PROGRESSPOPUP = L"IDC_BUTTON_PROGRESSPOPUP"; +const wchar_t* IDC_BUTTON_SCROLLPANEL = L"IDC_BUTTON_SCROLLPANEL"; +const wchar_t* IDC_BUTTON_STOP = L"IDC_BUTTON_STOP"; +const wchar_t* IDC_BUTTON_TIMEPICKER = L"IDC_BUTTON_TIMEPICKER"; const wchar_t* IDC_BUTTON_UP = L"IDC_BUTTON_UP"; +const wchar_t* IDC_CHECKBUTTON_DISABLE = L"IDC_CHECKBUTTON_DISABLE"; +const wchar_t* IDC_CHECKBUTTON_GROUP_BOTTOM = L"IDC_CHECKBUTTON_GROUP_BOTTOM"; +const wchar_t* IDC_CHECKBUTTON_GROUP_MIDDLE = L"IDC_CHECKBUTTON_GROUP_MIDDLE"; +const wchar_t* IDC_CHECKBUTTON_GROUP_TOP = L"IDC_CHECKBUTTON_GROUP_TOP"; +const wchar_t* IDC_CHECKBUTTON_MARK = L"IDC_CHECKBUTTON_MARK"; +const wchar_t* IDC_CHECKBUTTON_MARK_WITH_DETAILED = L"IDC_CHECKBUTTON_MARK_WITH_DETAILED"; +const wchar_t* IDC_CHECKBUTTON_ONOFF = L"IDC_CHECKBUTTON_ONOFF"; +const wchar_t* IDC_CHECKBUTTON_RADIO = L"IDC_CHECKBUTTON_RADIO"; +const wchar_t* IDC_CHECKBUTTON_RADIO_WITH_DETAILED = L"IDC_CHECKBUTTON_RADIO_WITH_DETAILED"; +const wchar_t* IDC_COLORPICKER = L"IDC_COLORPICKER"; const wchar_t* IDC_EDITAREA = L"IDC_EDITAREA"; +const wchar_t* IDC_EDITDATE = L"IDC_EDITDATE"; +const wchar_t* IDC_EDITDATE_DISABLE = L"IDC_EDITDATE_DISABLE"; +const wchar_t* IDC_EDITDATE_NO_TITLE = L"IDC_EDITDATE_NO_TITLE"; const wchar_t* IDC_EDITFIELD = L"IDC_EDITFIELD"; const wchar_t* IDC_EDITFIELD_DISABLE = L"IDC_EDITFIELD_DISABLE"; const wchar_t* IDC_EDITFIELD_INNERTITLE = L"IDC_EDITFIELD_INNERTITLE"; const wchar_t* IDC_EDITFIELD_TOPTITLE = L"IDC_EDITFIELD_TOPTITLE"; +const wchar_t* IDC_EDITTIME = L"IDC_EDITTIME"; +const wchar_t* IDC_EDITTIME_DISABLE = L"IDC_EDITTIME_DISABLE"; +const wchar_t* IDC_EDITTIME_NO_TITLE = L"IDC_EDITTIME_NO_TITLE"; const wchar_t* IDC_EXPANDABLEEDITAREA1 = L"IDC_EXPANDABLEEDITAREA1"; const wchar_t* IDC_EXPANDABLEEDITAREA2 = L"IDC_EXPANDABLEEDITAREA2"; +const wchar_t* IDC_GALLERY = L"IDC_GALLERY"; const wchar_t* IDC_GROUPEDLISTVIEW = L"IDC_GROUPEDLISTVIEW"; +const wchar_t* IDC_GROUPEDTABLEVIEW = L"IDC_GROUPEDTABLEVIEW"; const wchar_t* IDC_ICONLISTVIEW_HORIZONTAL = L"IDC_ICONLISTVIEW_HORIZONTAL"; const wchar_t* IDC_ICONLISTVIEW_VERTICAL = L"IDC_ICONLISTVIEW_VERTICAL"; const wchar_t* IDC_LABEL1 = L"IDC_LABEL1"; +const wchar_t* IDC_LABEL2 = L"IDC_LABEL2"; +const wchar_t* IDC_LABEL_COLOR = L"IDC_LABEL_COLOR"; const wchar_t* IDC_LABEL_EDITAREA = L"IDC_LABEL_EDITAREA"; const wchar_t* IDC_LABEL_EDITFIELD = L"IDC_LABEL_EDITFIELD"; const wchar_t* IDC_LISTVIEW = L"IDC_LISTVIEW"; +const wchar_t* IDC_PANEL = L"IDC_PANEL"; const wchar_t* IDC_PANEL2 = L"IDC_PANEL2"; const wchar_t* IDC_PROGRESS = L"IDC_PROGRESS"; const wchar_t* IDC_PROGRESS_COLOR = L"IDC_PROGRESS_COLOR"; const wchar_t* IDC_PROGRESS_DISABLE = L"IDC_PROGRESS_DISABLE"; const wchar_t* IDC_SCROLLPANEL = L"IDC_SCROLLPANEL"; const wchar_t* IDC_SEARCHBAR = L"IDC_SEARCHBAR"; +const wchar_t* IDC_SECTIONTABLEVIEW = L"IDC_SECTIONTABLEVIEW"; +const wchar_t* IDC_SECTIONTABLEVIEW1 = L"IDC_SECTIONTABLEVIEW1"; +const wchar_t* IDC_SLIDER = L"IDC_SLIDER"; +const wchar_t* IDC_SLIDER_COLOR = L"IDC_SLIDER_COLOR"; +const wchar_t* IDC_SLIDER_DISABLE = L"IDC_SLIDER_DISABLE"; +const wchar_t* IDC_SLIDER_ICON = L"IDC_SLIDER_ICON"; +const wchar_t* IDC_SLIDER_NO_BACKGROUND = L"IDC_SLIDER_NO_BACKGROUND"; +const wchar_t* IDC_SLIDER_TITLE = L"IDC_SLIDER_TITLE"; const wchar_t* IDC_SPLITPANEL = L"IDC_SPLITPANEL"; +const wchar_t* IDC_TABBAR = L"IDC_TABBAR"; +const wchar_t* IDC_TEXTBOX = L"IDC_TEXTBOX"; const wchar_t* IDF_FORM_ANIMATION = L"IDF_FORM_ANIMATION"; const wchar_t* IDF_FORM_BUTTON = L"IDF_FORM_BUTTON"; const wchar_t* IDF_FORM_CHECKBUTTON = L"IDF_FORM_CHECKBUTTON"; @@ -68,3 +117,4 @@ const wchar_t* IDF_FORM_SLIDER = L"IDF_FORM_SLIDER"; const wchar_t* IDF_FORM_SPLITPANEL = L"IDF_FORM_SPLITPANEL"; const wchar_t* IDF_FORM_TABBAR = L"IDF_FORM_TABBAR"; const wchar_t* IDF_FORM_TABLEVIEW = L"IDF_FORM_TABLEVIEW"; +const wchar_t* IDF_FORM_TEXTBOX = L"IDF_FORM_TEXTBOX"; diff --git a/project/src/BaseForm.cpp b/project/src/BaseForm.cpp index be09ca8..f390581 100644 --- a/project/src/BaseForm.cpp +++ b/project/src/BaseForm.cpp @@ -30,26 +30,9 @@ BaseForm::~BaseForm(void) { } -bool -BaseForm::SetFooter(void) -{ - Footer* pFooter = GetFooter(); - pFooter->SetStyle(FOOTER_STYLE_SEGMENTED_TEXT); - pFooter->SetBackButton(); - return true; -} - void BaseForm::OnActionPerformed(const Control& source, int actionId) { - switch (actionId) - { - case ID_EXIT: - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - pSceneManager->GoBackward(BackwardSceneTransition()); - break; - } } result diff --git a/project/src/ExpandableEditAreaForm.cpp b/project/src/ExpandableEditAreaForm.cpp index f5928d5..2641737 100644 --- a/project/src/ExpandableEditAreaForm.cpp +++ b/project/src/ExpandableEditAreaForm.cpp @@ -55,17 +55,6 @@ ExpandableEditAreaForm::OnInitializing(void) AddOrientationEventListener(*this); SetFormBackEventListener(this); - Header* pHeader = GetHeader(); - - ButtonItem buttonRightItem; - buttonRightItem.Construct(BUTTON_ITEM_STYLE_TEXT, ID_BUTTON_BACK); - buttonRightItem.SetText(L"Back"); - - pHeader->SetStyle(HEADER_STYLE_TITLE); - pHeader->SetTitleText(L"ExpandableEditArea"); - pHeader->SetButton(BUTTON_POSITION_RIGHT, buttonRightItem); - pHeader->AddActionEventListener(*this); - __pPanel = static_cast<Panel *>(GetControl(IDC_PANEL2, true)); __pLabel = static_cast<Label *>(GetControl(IDC_LABEL1,true)); diff --git a/project/src/FormFactory.cpp b/project/src/FormFactory.cpp index 9bdefb6..437cdef 100644 --- a/project/src/FormFactory.cpp +++ b/project/src/FormFactory.cpp @@ -35,6 +35,7 @@ #include "GroupedListViewForm.h" #include "IconListViewForm.h" #include "SearchBarForm.h" +#include "SectionTableViewForm.h" #include "EnrichedTextForm.h" #include "ExpandableEditAreaForm.h" #include "GalleryForm.h" @@ -72,6 +73,7 @@ const wchar_t* FORM_OVERLAYKEYPAD = L"Form_OverlayKeypad"; const wchar_t* FORM_PANEL = L"Form_Panel"; const wchar_t* FORM_PROGRESS = L"Form_Progress"; const wchar_t* FORM_SEARCHBAR = L"Form_SearchBar"; +const wchar_t* FORM_SECTIONTABLEVIEW = L"Form_SectionTableView"; const wchar_t* FORM_SLIDER = L"Form_Slider"; const wchar_t* FORM_SPLIT_PANEL = L"Form_SplitPanel"; const wchar_t* FORM_TABLEVIEW = L"Form_TableView"; @@ -224,6 +226,12 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce pSearchBarForm->Initialize(); pNewForm = pSearchBarForm; } + else if (formId == FORM_SECTIONTABLEVIEW) + { + SectionTableViewForm* pSectionTableViewForm = new (std::nothrow) SectionTableViewForm(); + pSectionTableViewForm->Initialize(); + pNewForm = pSectionTableViewForm; + } else if (formId == FORM_SLIDER) { SliderForm* pSliderForm = new (std::nothrow) SliderForm(); diff --git a/project/src/GalleryForm.cpp b/project/src/GalleryForm.cpp index 6ba6dd7..32665ea 100644 --- a/project/src/GalleryForm.cpp +++ b/project/src/GalleryForm.cpp @@ -63,7 +63,7 @@ GalleryForm::OnInitializing(void) BaseForm::OnInitializing(); result r = E_SUCCESS; - r = SetActionBarsTranslucent(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER| FORM_ACTION_BAR_FOOTER, true); + r = SetActionBarsTranslucent(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER, true); SetOrientation(ORIENTATION_AUTOMATIC); AddOrientationEventListener(*this); @@ -250,13 +250,13 @@ GalleryForm::OnGalleryItemClicked(Gallery& view, int index) { if (__visible) { - SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER| FORM_ACTION_BAR_FOOTER, false); + SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER, false); __visible = false; } else { - SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER| FORM_ACTION_BAR_FOOTER, true); + SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER, true); __visible = true; } @@ -269,7 +269,7 @@ GalleryForm::OnGallerySlideShowStarted(Gallery& gallery) PowerManager::KeepScreenOnState(true, false); if (__visible) { - SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER| FORM_ACTION_BAR_FOOTER, false); + SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER, false); __visible = false; } @@ -285,7 +285,7 @@ GalleryForm::OnGallerySlideShowStopped(Gallery& gallery) PowerManager::KeepScreenOnState(false, true); if (!__visible) { - SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER| FORM_ACTION_BAR_FOOTER, true); + SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR| FORM_ACTION_BAR_HEADER, true); __visible = true; } diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp index f7a064b..c439be4 100644 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.cpp @@ -25,7 +25,7 @@ using namespace Tizen::Base; using namespace Tizen::Graphics; using namespace Tizen::Ui::Scenes; -static const int ITEM_COUNT = 26; +static const int ITEM_COUNT = 27; MainForm::MainForm(void) : __pList(null) @@ -39,7 +39,7 @@ MainForm::~MainForm(void) bool MainForm::Initialize(void) { - Construct(FORM_STYLE_NORMAL| FORM_STYLE_HEADER| FORM_STYLE_INDICATOR| FORM_STYLE_FOOTER); + Construct(FORM_STYLE_NORMAL| FORM_STYLE_HEADER| FORM_STYLE_PORTRAIT_INDICATOR); return true; } @@ -47,14 +47,11 @@ result MainForm::OnInitializing(void) { Header* pHeader = GetHeader(); - pHeader->SetTitleText(L"UI CONTROLS"); + pHeader->SetTitleText(L"UI Controls"); if (!CreateMainList()) { return false; } - - Footer* pFooter = GetFooter(); - pFooter->SetBackButton(); SetFormBackEventListener(this); return E_SUCCESS; @@ -142,21 +139,24 @@ MainForm::OnListViewItemStateChanged(ListView& view, int index, int elementId, L pSceneManager->GoForward(ForwardSceneTransition(SCENE_SEARCHBAR_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 20: - pSceneManager->GoForward(ForwardSceneTransition(SCENE_SLIDER_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + pSceneManager->GoForward(ForwardSceneTransition(SCENE_SECTION_TABLEVIEW_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 21: - pSceneManager->GoForward(ForwardSceneTransition(SCENE_SPLIT_PANEL_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + pSceneManager->GoForward(ForwardSceneTransition(SCENE_SLIDER_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 22: - pSceneManager->GoForward(ForwardSceneTransition(SCENE_TABBAR_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + pSceneManager->GoForward(ForwardSceneTransition(SCENE_SPLIT_PANEL_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 23: - pSceneManager->GoForward(ForwardSceneTransition(SCENE_TABLEVIEWER_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + pSceneManager->GoForward(ForwardSceneTransition(SCENE_TABBAR_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 24: - pSceneManager->GoForward(ForwardSceneTransition(SCENE_TEXTBOX_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + pSceneManager->GoForward(ForwardSceneTransition(SCENE_TABLEVIEWER_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; case 25: + pSceneManager->GoForward(ForwardSceneTransition(SCENE_TEXTBOX_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); + break; + case 26: pSceneManager->GoForward(ForwardSceneTransition(SCENE_QUICK_PANEL_FRAME_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT)); break; } @@ -264,21 +264,24 @@ MainForm::CreateItem(int index, float itemWidth) pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"SearchBar", true); break; case 20: - pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"Slider", true); + pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"SectionTableView", true); break; case 21: + pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"Slider", true); + break; + case 22: pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"SplitPanel", true); break; - case 22: + case 23: pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"TabBar", true); break; - case 23: + case 24: pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"TableView", true); break; - case 24: + case 25: pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"TextBox", true); break; - case 25: + case 26: pItem->AddElement(mainListItemRect, ID_FORMAT_STRING, L"QuickPanelFrame", true); break; default: diff --git a/project/src/OverlayKeypadForm.cpp b/project/src/OverlayKeypadForm.cpp index fd8ebb8..cf10c5a 100644 --- a/project/src/OverlayKeypadForm.cpp +++ b/project/src/OverlayKeypadForm.cpp @@ -192,34 +192,24 @@ OverlayKeypadForm::OnKeypadWillOpen(Control& source) void OverlayKeypadForm::OnKeypadOpened(Control& source) { + Footer* pFooter = GetFooter(); + pFooter->SetItemEnabled(0,true); + pFooter->SetItemEnabled(1,true); + Invalidate(true); } void OverlayKeypadForm::OnKeypadClosed(Control& source) { + Footer* pFooter = GetFooter(); + pFooter->SetItemEnabled(0,false); + pFooter->SetItemEnabled(1,false); + Invalidate(true); } void OverlayKeypadForm::OnTextValueChanged(const Control& source) { - Footer* pFooter = GetFooter(); - int cmpEditField, cmpEditArea = -1; - - StringComparer strCompare; - strCompare.Compare(*__pEditFieldPreText,__pEditField->GetText(), cmpEditField); - strCompare.Compare(*__pEditAreaPreText,__pEditArea->GetText(), cmpEditArea); - - if (cmpEditField == 0 && cmpEditArea == 0) - { - pFooter->SetItemEnabled(0,false); - pFooter->SetItemEnabled(1,false); - } - else - { - pFooter->SetItemEnabled(0,true); - pFooter->SetItemEnabled(1,true); - } - Invalidate(true); } void diff --git a/project/src/QuickPanelFrameForm.cpp b/project/src/QuickPanelFrameForm.cpp index 2388032..3c16827 100644 --- a/project/src/QuickPanelFrameForm.cpp +++ b/project/src/QuickPanelFrameForm.cpp @@ -49,7 +49,7 @@ QuickPanelFrameForm::OnTerminating(void) bool QuickPanelFrameForm::Initialize(void) { - Form::Construct(FORM_STYLE_NORMAL| FORM_STYLE_INDICATOR| FORM_STYLE_HEADER| FORM_STYLE_FOOTER); + Form::Construct(FORM_STYLE_NORMAL| FORM_STYLE_PORTRAIT_INDICATOR| FORM_STYLE_HEADER| FORM_STYLE_FOOTER); return true; } diff --git a/project/src/SceneRegister.cpp b/project/src/SceneRegister.cpp index 4577a30..bcb2a5e 100644 --- a/project/src/SceneRegister.cpp +++ b/project/src/SceneRegister.cpp @@ -47,6 +47,7 @@ const wchar_t* SCENE_PANEL_FORM = L"Scene_PanelForm"; const wchar_t* SCENE_PROGRESS_FORM = L"Scene_ProgressForm"; const wchar_t* SCENE_RADIOGROUP_FORM = L"Scene_RadioForm"; const wchar_t* SCENE_SEARCHBAR_FORM = L"Scene_SearchBarForm"; +const wchar_t* SCENE_SECTION_TABLEVIEW_FORM = L"Scene_SectionTableViewForm"; const wchar_t* SCENE_SLIDER_FORM = L"Scene_SliderForm"; const wchar_t* SCENE_SPLIT_PANEL_FORM = L"Scene_SplitPanelForm"; const wchar_t* SCENE_TABBAR_FORM = L"Scene_TabBarForm"; @@ -93,6 +94,7 @@ SceneRegister::RegisterAllScenes(void) pSceneManager->RegisterScene(SCENE_PANEL_FORM, FORM_PANEL, PANEL_BLANK); pSceneManager->RegisterScene(SCENE_PROGRESS_FORM, FORM_PROGRESS, PANEL_BLANK); pSceneManager->RegisterScene(SCENE_SEARCHBAR_FORM, FORM_SEARCHBAR, PANEL_BLANK); + pSceneManager->RegisterScene(SCENE_SECTION_TABLEVIEW_FORM, FORM_SECTIONTABLEVIEW, PANEL_BLANK); pSceneManager->RegisterScene(SCENE_SLIDER_FORM, FORM_SLIDER, PANEL_BLANK); pSceneManager->RegisterScene(SCENE_SPLIT_PANEL_FORM, FORM_SPLIT_PANEL, PANEL_BLANK); pSceneManager->RegisterScene(SCENE_TABBAR_FORM, FORM_TABBAR, PANEL_BLANK); diff --git a/project/src/SectionTableViewForm.cpp b/project/src/SectionTableViewForm.cpp new file mode 100644 index 0000000..07b3dee --- /dev/null +++ b/project/src/SectionTableViewForm.cpp @@ -0,0 +1,367 @@ +// +// Tizen native SDK +// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.1 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://floralicense.org/license/ +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an AS IS BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "SectionTableViewForm.h" + +using namespace Tizen::App; +using namespace Tizen::Ui; +using namespace Tizen::Ui::Controls; +using namespace Tizen::Graphics; +using namespace Tizen::Base; + +const wchar_t WIFI_IMAGE[] = L"settings_74_wifi.png"; +const wchar_t BLUETOOTH_IMAGE[] = L"settings_74_bluetooth.png"; +const wchar_t NETWORK_IMAGE[] = L"settings_74_network.png"; +const wchar_t NFC_IMAGE[] = L"settings_74_nfc.png"; +const wchar_t SBEAM_IMAGE[] = L"settings_74_sbeam.png"; +const wchar_t WIFIDIRECT_IMAGE[] = L"settings_74_wifi_direct.png"; +const wchar_t SCREENMIRRORING_IMAGE[] = L"settings_74_allshare.png"; +const wchar_t NEARBYDEVICES_IMAGE[] = L"settings_74_near_device.png"; +const wchar_t KIES_IMAGE[] = L"settings_74_kies_via_wifi.png"; +const wchar_t FLIGHT_IMAGE[] = L"settings_74_flight.png"; +const wchar_t BLOCK_IMAGE[] = L"settings_74_block.png"; +const wchar_t POWER_IMAGE[] = L"settings_74_power_saving_mode.png"; +const wchar_t DRIVEING_IMAGE[] = L"settings_74_driving_mode.png"; + +SectionTableViewForm::SectionTableViewForm(void) + : __pSectionTableView(null) + , __pEditField(null) + , __pSlider(null) + , __pWifiBitmap(null) + , __pBluetoothBitmap(null) + , __pNetworkBitmap(null) + , __pNFCBitmap(null) + , __pSBeamBitmap(null) + , __pWiFiDirectBitmap(null) + , __pScreenMirroringBitmap(null) + , __pNearbydevicesBitmap(null) + , __pKiesBitmap(null) + , __pFlightmodeBitmap(null) + , __pBlockingmodeBitmap(null) + , __pPowerSavingmodeBitmap(null) + , __pDrivingmodeBitmap(null) +{ +} + +SectionTableViewForm::~SectionTableViewForm(void) +{ +} + +bool +SectionTableViewForm::Initialize(void) +{ + Construct(L"IDF_FORM_SECTIONTABLEVIEW"); + return true; +} + +result +SectionTableViewForm::OnInitializing(void) +{ + BaseForm::OnInitializing(); + result r = E_SUCCESS; + + GetBitmap(); + + __pSectionTableView = static_cast <SectionTableView*> (GetControl("IDC_SECTIONTABLEVIEW", true)); + __pSectionTableView->SetItemProviderF(this); + __pSectionTableView->AddSectionTableViewItemEventListener(*this); + AddControl(__pSectionTableView); + + __pEditField = new (std::nothrow) EditField(); + __pEditField->Construct(FloatRectangle(0, 0, __pSectionTableView->GetWidthF(), GetDefaultItemHeight()), EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_FULLSCREEN, true); + __pEditField->SetTitleText(L"EditField"); + + __pSlider = new (std::nothrow) Slider(); + __pSlider->Construct(FloatRectangle(0, 0, __pSectionTableView->GetWidthF(), GetDefaultItemHeight())); + + return r; +} + +result +SectionTableViewForm::OnTerminating(void) +{ + result r = E_SUCCESS; + + delete __pWifiBitmap; + delete __pBluetoothBitmap; + delete __pNetworkBitmap; + delete __pNFCBitmap; + delete __pSBeamBitmap; + delete __pWiFiDirectBitmap; + delete __pScreenMirroringBitmap; + delete __pNearbydevicesBitmap; + delete __pKiesBitmap; + delete __pFlightmodeBitmap; + delete __pBlockingmodeBitmap; + delete __pPowerSavingmodeBitmap; + delete __pDrivingmodeBitmap; + + return r; +} + +int +SectionTableViewForm::GetSectionCount(void) +{ + return SECTION_COUNT; +} + +void +SectionTableViewForm::GetBitmap(void) +{ + AppResource* pAppResource = Application::GetInstance()->GetAppResource(); + __pWifiBitmap = pAppResource->GetBitmapN(WIFI_IMAGE); + __pBluetoothBitmap = pAppResource->GetBitmapN(BLUETOOTH_IMAGE); + __pNetworkBitmap = pAppResource->GetBitmapN(NETWORK_IMAGE); + __pNFCBitmap = pAppResource->GetBitmapN(NFC_IMAGE); + __pSBeamBitmap = pAppResource->GetBitmapN(SBEAM_IMAGE); + __pWiFiDirectBitmap = pAppResource->GetBitmapN(WIFIDIRECT_IMAGE); + __pScreenMirroringBitmap = pAppResource->GetBitmapN(SCREENMIRRORING_IMAGE); + __pNearbydevicesBitmap = pAppResource->GetBitmapN(NEARBYDEVICES_IMAGE); + __pKiesBitmap = pAppResource->GetBitmapN(KIES_IMAGE); + __pFlightmodeBitmap = pAppResource->GetBitmapN(FLIGHT_IMAGE); + __pBlockingmodeBitmap = pAppResource->GetBitmapN(BLOCK_IMAGE); + __pPowerSavingmodeBitmap = pAppResource->GetBitmapN(POWER_IMAGE); + __pDrivingmodeBitmap = pAppResource->GetBitmapN(DRIVEING_IMAGE); +} + +int +SectionTableViewForm::GetItemCount(int sectionIndex) +{ + int itemCount = 0; + + switch (sectionIndex) + { + case 0: + itemCount = 4; + break; + case 1: + itemCount = 5; + break; + case 2: + itemCount = 3; + break; + default : + break; + } + + return itemCount; +} + +TableViewItem* +SectionTableViewForm::CreateItem(int sectionIndex, int itemIndex, float itemWidth) +{ + TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + TableViewItem* pItem = new TableViewItem(); + String text = L""; + Label* pLabel = new Label(); + Label* pBitmap = new (std::nothrow) Label(); + pBitmap->Construct(FloatRectangle(20.0f, 19.0f, 74.0f, 74.0f), L""); + pLabel->Construct(FloatRectangle(0.0f, 0.0f, itemWidth, GetDefaultItemHeight()), text); + + if (sectionIndex % SECTION_COUNT == 0) + { + switch (itemIndex % 4) + { + case 0: + style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER; + text.Format(34, L"Wi-Fi", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pWifiBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 1: + style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER; + text.Format(34, L"Bluetooth", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pBluetoothBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 2: + style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING; + text.Format(34, L"NFC", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pNFCBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 3: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"Data Network", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pNetworkBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + default: + break; + } + } + else if (sectionIndex % SECTION_COUNT == 1) + { + switch (itemIndex % 5) + { + case 0: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"S Beam", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pSBeamBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 1: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"Wi-Fi Direct", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pWiFiDirectBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 2: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"Screen Mirroring", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pScreenMirroringBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 3: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"Nearby devices", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pNearbydevicesBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 4: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + text.Format(34, L"Kies via Wi-Fi", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pKiesBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + default: + break; + } + } + else if (sectionIndex % SECTION_COUNT == 2) + { + switch (itemIndex % 3) + { + case 0: + style = TABLE_VIEW_ANNEX_STYLE_DETAILED; + text.Format(34, L"Flight mode", itemIndex); + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pBitmap->SetBackgroundBitmap(*__pFlightmodeBitmap); + pItem->AddControl(pBitmap); + pLabel->SetBounds(FloatRectangle(pBitmap->GetBoundsF().width + 40.0f, 0.0f, itemWidth - pBitmap->GetBoundsF().width, GetDefaultItemHeight())); + break; + case 1: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pItem->AddControl(__pEditField); + break; + case 2: + style = TABLE_VIEW_ANNEX_STYLE_NORMAL; + pItem->Construct(FloatDimension(itemWidth, GetDefaultItemHeight()), style); + pItem->AddControl(__pSlider); + break; + default: + break; + } + } + + pLabel->SetText(text); + pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); + + if (sectionIndex % SECTION_COUNT != 2 || (itemIndex != 1 && itemIndex !=2)) + pItem->AddControl(pLabel); + + return pItem; +} + +void +SectionTableViewForm::UpdateItem(int sectionIndex, int itemIndex, TableViewItem* pItem) +{ + +} + +float +SectionTableViewForm::GetDefaultItemHeight(void) +{ + return 112.0f; +} + +bool +SectionTableViewForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pItem) +{ + delete pItem; + + return true; +} + +Tizen::Base::String +SectionTableViewForm::GetSectionHeader(int sectionIndex) +{ + String headerText; + + switch (sectionIndex) + { + case 0: + headerText = L"Connectivity"; + break; + case 1: + headerText = L"Share and transfer"; + break; + case 2: + headerText = L"Mode"; + break; + default : + break; + } + + return headerText; +} + +bool +SectionTableViewForm::HasSectionHeader(int sectionIndex) +{ + return true; +} + +Tizen::Base::String +SectionTableViewForm::GetSectionFooter(int sectionIndex) +{ + return L""; +} + +bool +SectionTableViewForm::HasSectionFooter(int sectionIndex) +{ + return false; +} + +void +SectionTableViewForm::OnSectionTableViewItemStateChanged(Tizen::Ui::Controls::SectionTableView& tableView, int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status) +{ +} + +void +SectionTableViewForm::OnSectionTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::SectionTableView& tableView, int sectionIndex, int itemIndex, Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated) +{ +} diff --git a/project/src/TextBoxForm.cpp b/project/src/TextBoxForm.cpp index 83443ac..d07424f 100644 --- a/project/src/TextBoxForm.cpp +++ b/project/src/TextBoxForm.cpp @@ -33,8 +33,7 @@ TextBoxForm::~TextBoxForm(void) bool TextBoxForm::Initialize(void) { - Construct(FORM_STYLE_NORMAL| FORM_STYLE_INDICATOR| FORM_STYLE_HEADER| FORM_STYLE_FOOTER); - SetFooter(); + Construct(FORM_STYLE_NORMAL| FORM_STYLE_PORTRAIT_INDICATOR| FORM_STYLE_HEADER); return true; } diff --git a/screenshot.png b/screenshot.png Binary files differindex 40a85d7..ec610a5 100644 --- a/screenshot.png +++ b/screenshot.png |
