diff options
51 files changed, 1 insertions, 183 deletions
diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_001.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_001.png Binary files differindex ecd4f241..cf3d69c4 100644 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_001.png +++ b/themes/images/tizen-black-hd/00_mainmenu_page_bar_001.png diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_002.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_002.png Binary files differindex fc2ae059..adf788eb 100644 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_002.png +++ b/themes/images/tizen-black-hd/00_mainmenu_page_bar_002.png diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_1.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_1.png Binary files differdeleted file mode 100644 index fddb025b..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_1.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_10.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_10.png Binary files differdeleted file mode 100644 index 5faf4116..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_10.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_2.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_2.png Binary files differdeleted file mode 100644 index c522c5fa..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_2.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_3.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_3.png Binary files differdeleted file mode 100644 index 4a0f89b7..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_3.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_4.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_4.png Binary files differdeleted file mode 100644 index f8a8de9e..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_4.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_5.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_5.png Binary files differdeleted file mode 100644 index 887b31a0..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_5.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_6.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_6.png Binary files differdeleted file mode 100644 index ae940452..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_6.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_7.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_7.png Binary files differdeleted file mode 100644 index b6fee011..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_7.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_8.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_8.png Binary files differdeleted file mode 100644 index d1c1158f..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_8.png +++ /dev/null diff --git a/themes/images/tizen-black-hd/00_mainmenu_page_bar_9.png b/themes/images/tizen-black-hd/00_mainmenu_page_bar_9.png Binary files differdeleted file mode 100644 index c1629d69..00000000 --- a/themes/images/tizen-black-hd/00_mainmenu_page_bar_9.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_1.png b/themes/images/tizen-black/00_mainmenu_page_bar_1.png Binary files differdeleted file mode 100644 index fddb025b..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_1.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_10.png b/themes/images/tizen-black/00_mainmenu_page_bar_10.png Binary files differdeleted file mode 100644 index 5faf4116..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_10.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_2.png b/themes/images/tizen-black/00_mainmenu_page_bar_2.png Binary files differdeleted file mode 100644 index c522c5fa..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_2.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_3.png b/themes/images/tizen-black/00_mainmenu_page_bar_3.png Binary files differdeleted file mode 100644 index 4a0f89b7..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_3.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_4.png b/themes/images/tizen-black/00_mainmenu_page_bar_4.png Binary files differdeleted file mode 100644 index f8a8de9e..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_4.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_5.png b/themes/images/tizen-black/00_mainmenu_page_bar_5.png Binary files differdeleted file mode 100644 index 887b31a0..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_5.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_6.png b/themes/images/tizen-black/00_mainmenu_page_bar_6.png Binary files differdeleted file mode 100644 index ae940452..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_6.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_7.png b/themes/images/tizen-black/00_mainmenu_page_bar_7.png Binary files differdeleted file mode 100644 index b6fee011..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_7.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_8.png b/themes/images/tizen-black/00_mainmenu_page_bar_8.png Binary files differdeleted file mode 100644 index d1c1158f..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_8.png +++ /dev/null diff --git a/themes/images/tizen-black/00_mainmenu_page_bar_9.png b/themes/images/tizen-black/00_mainmenu_page_bar_9.png Binary files differdeleted file mode 100644 index c1629d69..00000000 --- a/themes/images/tizen-black/00_mainmenu_page_bar_9.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_001.png b/themes/images/tizen-hd/00_mainmenu_page_bar_001.png Binary files differindex ecd4f241..cf3d69c4 100644 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_001.png +++ b/themes/images/tizen-hd/00_mainmenu_page_bar_001.png diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_002.png b/themes/images/tizen-hd/00_mainmenu_page_bar_002.png Binary files differindex fc2ae059..adf788eb 100644 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_002.png +++ b/themes/images/tizen-hd/00_mainmenu_page_bar_002.png diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_1.png b/themes/images/tizen-hd/00_mainmenu_page_bar_1.png Binary files differdeleted file mode 100644 index fddb025b..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_1.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_10.png b/themes/images/tizen-hd/00_mainmenu_page_bar_10.png Binary files differdeleted file mode 100644 index 5faf4116..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_10.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_2.png b/themes/images/tizen-hd/00_mainmenu_page_bar_2.png Binary files differdeleted file mode 100644 index c522c5fa..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_2.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_3.png b/themes/images/tizen-hd/00_mainmenu_page_bar_3.png Binary files differdeleted file mode 100644 index 4a0f89b7..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_3.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_4.png b/themes/images/tizen-hd/00_mainmenu_page_bar_4.png Binary files differdeleted file mode 100644 index f8a8de9e..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_4.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_5.png b/themes/images/tizen-hd/00_mainmenu_page_bar_5.png Binary files differdeleted file mode 100644 index 887b31a0..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_5.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_6.png b/themes/images/tizen-hd/00_mainmenu_page_bar_6.png Binary files differdeleted file mode 100644 index ae940452..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_6.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_7.png b/themes/images/tizen-hd/00_mainmenu_page_bar_7.png Binary files differdeleted file mode 100644 index b6fee011..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_7.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_8.png b/themes/images/tizen-hd/00_mainmenu_page_bar_8.png Binary files differdeleted file mode 100644 index d1c1158f..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_8.png +++ /dev/null diff --git a/themes/images/tizen-hd/00_mainmenu_page_bar_9.png b/themes/images/tizen-hd/00_mainmenu_page_bar_9.png Binary files differdeleted file mode 100644 index c1629d69..00000000 --- a/themes/images/tizen-hd/00_mainmenu_page_bar_9.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_1.png b/themes/images/tizen/00_mainmenu_page_bar_1.png Binary files differdeleted file mode 100644 index fddb025b..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_1.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_10.png b/themes/images/tizen/00_mainmenu_page_bar_10.png Binary files differdeleted file mode 100644 index 5faf4116..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_10.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_2.png b/themes/images/tizen/00_mainmenu_page_bar_2.png Binary files differdeleted file mode 100644 index c522c5fa..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_2.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_3.png b/themes/images/tizen/00_mainmenu_page_bar_3.png Binary files differdeleted file mode 100644 index 4a0f89b7..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_3.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_4.png b/themes/images/tizen/00_mainmenu_page_bar_4.png Binary files differdeleted file mode 100644 index f8a8de9e..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_4.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_5.png b/themes/images/tizen/00_mainmenu_page_bar_5.png Binary files differdeleted file mode 100644 index 887b31a0..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_5.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_6.png b/themes/images/tizen/00_mainmenu_page_bar_6.png Binary files differdeleted file mode 100644 index ae940452..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_6.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_7.png b/themes/images/tizen/00_mainmenu_page_bar_7.png Binary files differdeleted file mode 100644 index b6fee011..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_7.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_8.png b/themes/images/tizen/00_mainmenu_page_bar_8.png Binary files differdeleted file mode 100644 index d1c1158f..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_8.png +++ /dev/null diff --git a/themes/images/tizen/00_mainmenu_page_bar_9.png b/themes/images/tizen/00_mainmenu_page_bar_9.png Binary files differdeleted file mode 100644 index c1629d69..00000000 --- a/themes/images/tizen/00_mainmenu_page_bar_9.png +++ /dev/null diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index 4b555a91..12f81469 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -1146,6 +1146,3 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 48 26 #define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 26 48 #define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 10 - -#define PAGECONTROL_IND_MIN_BG_INC 52 52 -#define PAGECONTROL_IND_MIN_INC 24 24 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index b46ed7a0..5d093a0c 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -1131,6 +1131,3 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 30 16 #define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 16 30 #define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 4 - -#define PAGECONTROL_IND_MIN_BG_INC 32 32 -#define PAGECONTROL_IND_MIN_INC 16 16 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 4883ae83..e3e4faf9 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1150,6 +1150,3 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 48 26 #define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 26 48 #define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 10 - -#define PAGECONTROL_IND_MIN_BG_INC 52 52 -#define PAGECONTROL_IND_MIN_INC 24 24 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index a0585ca2..1ffc01ef 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -1144,7 +1144,3 @@ #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 30 16 #define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 16 30 #define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 4 - -#define PAGECONTROL_IND_MIN_BG_INC 32 32 -#define PAGECONTROL_IND_MIN_INC 16 16 - diff --git a/themes/tizen.edc b/themes/tizen.edc index 17b9c1e2..75065296 100644 --- a/themes/tizen.edc +++ b/themes/tizen.edc @@ -76,7 +76,6 @@ collections { #include "widgets/multibuttonentry.edc" //#include "widgets/multisense_ui.edc" #include "widgets/naviframe.edc" -#include "widgets/pagecontrol.edc" #include "widgets/panes.edc" #include "widgets/photocam.edc" #include "widgets/popup.edc" diff --git a/themes/widgets/index.edc b/themes/widgets/index.edc index 09d0fbee..049bd55c 100644 --- a/themes/widgets/index.edc +++ b/themes/widgets/index.edc @@ -636,8 +636,7 @@ font: "SLP:style=Bold"; size: INDEX_PAGECONTROL_FONT_SIZE_INC; min: 0 1; - //FIXME:values should be 0.5 0.5 when fonts are aligned correctly. - align: 0.53 0.56; + align: 0.5 0.5; } rel1 { to: "indicator2"; } rel2 { to: "indicator2"; } diff --git a/themes/widgets/pagecontrol.edc b/themes/widgets/pagecontrol.edc deleted file mode 100644 index 33ebc311..00000000 --- a/themes/widgets/pagecontrol.edc +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved - * - * PROPRIETARY/CONFIDENTIAL - * - * This software is the confidential and proprietary information of SAMSUNG - * ELECTRONICS ("Confidential Information"). You agree and acknowledge that this - * software is owned by Samsung and you shall not disclose such Confidential - * Information and shall use it only in accordance with the terms of the license - * agreement you entered into with SAMSUNG ELECTRONICS. SAMSUNG make no - * representations or warranties about the suitability of the software, either - * express or implied, including but not limited to the implied warranties of - * merchantability, fitness for a particular purpose, or non-infringement. - * SAMSUNG shall not be liable for any damages suffered by licensee arising out - * of or releated to this software. - * - */ - -group { - name: "elm/pagecontrol/base/default"; - - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "elm.swallow.page"; - type: SWALLOW; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - min: 332 32; - } - } - } -} - -#define PAGE_ITEM(number) \ -group { \ - name: "elm/page/item/default_"number; \ - images { \ - image: "00_mainmenu_page_bar_001.png" COMP; \ - image: "00_mainmenu_page_bar_002.png" COMP; \ - image: "00_mainmenu_page_bar_1.png" COMP; \ - image: "00_mainmenu_page_bar_2.png" COMP; \ - image: "00_mainmenu_page_bar_3.png" COMP; \ - image: "00_mainmenu_page_bar_4.png" COMP; \ - image: "00_mainmenu_page_bar_5.png" COMP; \ - image: "00_mainmenu_page_bar_6.png" COMP; \ - image: "00_mainmenu_page_bar_7.png" COMP; \ - image: "00_mainmenu_page_bar_8.png" COMP; \ - image: "00_mainmenu_page_bar_9.png" COMP; \ - image: "00_mainmenu_page_bar_10.png" COMP; \ - } \ - parts { \ - part { \ - name: "bg"; \ - type: RECT; \ - mouse_events: 1; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - min: PAGECONTROL_IND_MIN_BG_INC; \ - max: PAGECONTROL_IND_MIN_BG_INC; \ - align: 0.5 0.5; \ - color: 0 0 0 0; \ - } \ - } \ - part { \ - name: "indicator_1"; \ - mouse_events: 0; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - min: PAGECONTROL_IND_MIN_BG_INC; \ - max: PAGECONTROL_IND_MIN_BG_INC; \ - fixed: 1 1; \ - align: 0.5 0.5; \ - visible: 1; \ - rel1 { to: "bg"; } \ - rel2 { to: "bg"; } \ - image { \ - normal: "00_mainmenu_page_bar_001.png"; \ - } \ - } \ - description { \ - state: "selected" 0.0; \ - inherit: "default" 0.0; \ - min: PAGECONTROL_IND_MIN_INC; \ - max: PAGECONTROL_IND_MIN_INC; \ - visible: 0; \ - } \ - } \ - part { \ - name: "indicator_2"; \ - mouse_events: 0; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - min: PAGECONTROL_IND_MIN_INC; \ - max: PAGECONTROL_IND_MIN_INC; \ - fixed: 1 1; \ - align: 0.5 0.5; \ - visible: 0; \ - rel1 { to: "bg"; } \ - rel2 { to: "bg"; } \ - image { \ - normal: "00_mainmenu_page_bar_"number".png"; \ - } \ - } \ - description { \ - state: "selected" 0.0; \ - inherit: "default" 0.0; \ - min: PAGECONTROL_IND_MIN_BG_INC; \ - max: PAGECONTROL_IND_MIN_BG_INC; \ - visible: 1; \ - } \ - } \ - } \ - programs { \ - program { \ - name: "indicator_on"; \ - signal: "elm,state,indicator,on"; \ - source: "elm"; \ - action: STATE_SET "selected" 0.0; \ - target: "indicator_1"; \ - target: "indicator_2"; \ - transition: LINEAR 0.2; \ - } \ - program { \ - name: "indicator_off"; \ - signal: "elm,state,indicator,off"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - target: "indicator_1"; \ - target: "indicator_2"; \ - transition: LINEAR 0.2; \ - } \ - program { \ - name: "indicator_clicked"; \ - signal: "mouse,clicked,1"; \ - source: "bg"; \ - action: SIGNAL_EMIT "clicked" "indicator_clicked"; \ - } \ - } \ -} \ - -PAGE_ITEM(1) -PAGE_ITEM(2) -PAGE_ITEM(3) -PAGE_ITEM(4) -PAGE_ITEM(5) -PAGE_ITEM(6) -PAGE_ITEM(7) -PAGE_ITEM(8) -PAGE_ITEM(9) -PAGE_ITEM(10) - - |
