modify home item and add user item to inherit baritem group 80/42080/1
authorSoohye Shin <soohye.shin@samsung.com>
Tue, 23 Jun 2015 02:02:58 +0000 (11:02 +0900)
committerSoohye Shin <soohye.shin@samsung.com>
Tue, 23 Jun 2015 02:05:48 +0000 (11:05 +0900)
Change-Id: Ia8bd68384996bb603699713087264e8c7bffe713
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>
edje/home.edc
edje/view/baritem.edc [new file with mode: 0644]
edje/view/home.edc
edje/view/user.edc
images/btn_user_add_foc.png [new file with mode: 0644]
images/btn_user_add_nor.png [new file with mode: 0644]
images/btn_user_lock_foc.png [new file with mode: 0644]
images/btn_user_lock_nor.png [new file with mode: 0644]
include/defs.h
src/view/view_home.c

index c5304b9..0cf5ac2 100644 (file)
@@ -17,6 +17,7 @@
 #include "../include/defs.h"
 
 collections {
+       #include "view/baritem.edc"
        #include "view/home.edc"
        #include "view/recent.edc"
        #include "view/user.edc"
diff --git a/edje/view/baritem.edc b/edje/view/baritem.edc
new file mode 100644 (file)
index 0000000..f8dcf4d
--- /dev/null
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 "../../include/defs.h"
+group {
+       name, GRP_BAR_ITEM;
+       parts {
+               part {
+                       name, "bg";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 158 158;
+                       }
+               }
+               part {
+                       name, "clip";
+                       type, RECT;
+                       description {
+                               state, "default" 0.0;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 255 255 255 255;
+                       }
+                       description {
+                               state, "up" 0.0;
+                               inherit, "default" 0.0;
+                               rel1.relative, 0.0 -1.0;
+                               rel2.relative, 1.0 0.0;
+                               color, 255 255 255 255;
+                       }
+                       description {
+                               state, "down" 0.0;
+                               inherit, "default" 0.0;
+                               rel1.relative, 0.0 1.0;
+                               rel2.relative, 1.0 2.0;
+                               color, 255 255 255 255;
+                       }
+                       description {
+                               state, "right" 0.0;
+                               inherit, "default" 0.0;
+                               rel1.relative, 1.0 0.0;
+                               rel2.relative, 2.0 1.0;
+                               color, 255 255 255 255;
+                       }
+                       description {
+                               state, "left" 0.0;
+                               inherit, "default" 0.0;
+                               rel1.relative, -1.0 0.0;
+                               rel2.relative, 0.0 1.0;
+                               color, 255 255 255 255;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_BG;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               min, 158 158;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_ICON;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 70 70;
+                               rel1.relative, 0.5 0.5;
+                               rel2.relative, 0.5 0.5;
+                               fixed, 1 1;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_ICON_FOCUS;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, PART_BAR_ITEM_ICON;
+                               rel2.to, PART_BAR_ITEM_ICON;
+                       }
+               }
+       }
+       programs {
+               program {
+                       name, "sig,initial,focus";
+                       signal, SIG_INITIAL_FOCUS;
+                       source, SRC_PROG;
+                       action, STATE_SET "default" 0.0;
+                       target, "clip";
+                       after, "sig,focus";
+               }
+               program {
+                       name, "sig,focus";
+                       signal, SIG_FOCUS;
+                       source, SRC_PROG;
+                       action, STATE_SET "focus" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,unfocus";
+                       signal, SIG_UNFOCUS;
+                       source, SRC_PROG;
+                       action, STATE_SET "default" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,focus,to,up";
+                       signal, SIG_FOCUS_TO_UP;
+                       source, SRC_PROG;
+                       action, STATE_SET "up" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,focus,to,down";
+                       signal, SIG_FOCUS_TO_DOWN;
+                       source, SRC_PROG;
+                       action, STATE_SET "down" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,focus,to,right";
+                       signal, SIG_FOCUS_TO_RIGHT;
+                       source, SRC_PROG;
+                       action, STATE_SET "right" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,unfocus,to,right";
+                       signal, SIG_UNFOCUS_TO_RIGHT;
+                       source, SRC_PROG;
+                       action, STATE_SET "left" 0.0;
+                       target, "clip";
+                       after, "sig,focus";
+               }
+               program {
+                       name, "sig,focus,to,left";
+                       signal, SIG_FOCUS_TO_LEFT;
+                       source, SRC_PROG;
+                       action, STATE_SET "left" 0.0;
+                       transition, LINEAR 0.5;
+                       target, "clip";
+               }
+               program {
+                       name, "sig,unfocus,to,left";
+                       signal, SIG_UNFOCUS_TO_LEFT;
+                       source, SRC_PROG;
+                       action, STATE_SET "right" 0.0;
+                       target, "clip";
+                       after, "sig,focus";
+               }
+       }
+}
index 73ebe13..e6b1f06 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include "../../include/defs.h"
-group{
+group {
        name, GRP_HOME;
        parts {
                part {
@@ -303,69 +303,10 @@ group {
 
 group {
        name, GRP_HOME_ITEM;
-       data.item, TITLE_WIDTH "128";
+       inherit, GRP_BAR_ITEM;
+       data.item, TITLE_WIDTH "130";
        parts {
                part {
-                       name, "bg";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               min, 157 157;
-                       }
-               }
-               part {
-                       name, "clip";
-                       type, RECT;
-                       description {
-                               state, "default" 0.0;
-                               color, 0 0 0 0;
-                       }
-                       description {
-                               state, "focus" 0.0;
-                               inherit, "default" 0.0;
-                               color, 255 255 255 255;
-                       }
-                       description {
-                               state, "up" 0.0;
-                               inherit, "default" 0.0;
-                               rel1.relative, 0.0 -1.0;
-                               rel2.relative, 1.0 0.0;
-                               color, 255 255 255 255;
-                       }
-                       description {
-                               state, "down" 0.0;
-                               inherit, "default" 0.0;
-                               rel1.relative, 0.0 1.0;
-                               rel2.relative, 1.0 2.0;
-                               color, 255 255 255 255;
-                       }
-                       description {
-                               state, "right" 0.0;
-                               inherit, "default" 0.0;
-                               rel1.relative, 1.0 0.0;
-                               rel2.relative, 2.0 1.0;
-                               color, 255 255 255 255;
-                       }
-                       description {
-                               state, "left" 0.0;
-                               inherit, "default" 0.0;
-                               rel1.relative, -1.0 0.0;
-                               rel2.relative, 0.0 1.0;
-                               color, 255 255 255 255;
-                       }
-               }
-               part {
-                       name, PART_HOME_ITEM_BG;
-                       type, SWALLOW;
-                       scale, 1;
-                       clip_to, "clip";
-                       description {
-                               state, "default" 0.0;
-                               min, 157 157;
-                       }
-               }
-               part {
                        name, "pad.icon";
                        type, RECT;
                        scale, 1;
@@ -380,7 +321,7 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_ICON;
+                       name, PART_BAR_ITEM_ICON;
                        type, SWALLOW;
                        scale, 1;
                        description {
@@ -399,17 +340,6 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_ICON_FOCUS;
-                       type, SWALLOW;
-                       scale, 1;
-                       clip_to, "clip";
-                       description {
-                               state, "default" 0.0;
-                               rel1.to, PART_HOME_ITEM_ICON;
-                               rel2.to, PART_HOME_ITEM_ICON;
-                       }
-               }
-               part {
                        name, "pad.text";
                        type, RECT;
                        scale, 1;
@@ -424,7 +354,7 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_TITLE;
+                       name, PART_BAR_ITEM_TITLE;
                        type, SWALLOW;
                        scale, 1;
                        description {
@@ -443,29 +373,14 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_TITLE_FOCUS;
+                       name, PART_BAR_ITEM_TITLE_FOCUS;
                        type, SWALLOW;
                        scale, 1;
                        clip_to, "clip";
                        description {
                                state, "default" 0.0;
-                               rel1.to, PART_HOME_ITEM_TITLE;
-                               rel2.to, PART_HOME_ITEM_TITLE;
-                       }
-               }
-               part {
-                       name, "separtor";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               min, 1 114;
-                               rel1.relative, 1.0 0.5;
-                               rel2.relative, 1.0 0.5;
-                               align, 1.0 0.5;
-                               fixed, 1 1;
-                               color, 245 245 245 255;
-                               visible, 1;
+                               rel1.to, PART_BAR_ITEM_TITLE;
+                               rel2.to, PART_BAR_ITEM_TITLE;
                        }
                }
                part {
@@ -483,7 +398,7 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_BADGE;
+                       name, PART_BAR_ITEM_BADGE;
                        type, SWALLOW;
                        scale, 1;
                        description {
@@ -502,13 +417,13 @@ group {
                        }
                }
                part {
-                       name, PART_HOME_ITEM_BADGE_COUNT;
+                       name, PART_BAR_ITEM_BADGE_COUNT;
                        type, TEXT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               rel1.to, PART_HOME_ITEM_BADGE;
-                               rel2.to, PART_HOME_ITEM_BADGE;
+                               rel1.to, PART_BAR_ITEM_BADGE;
+                               rel2.to, PART_BAR_ITEM_BADGE;
                                fixed, 1 1;
                                text {
                                        size, 24;
@@ -518,78 +433,4 @@ group {
                        }
                }
        }
-       programs {
-               program {
-                       name, "sig,initial,focus";
-                       signal, SIG_INITIAL_FOCUS;
-                       source, SRC_PROG;
-                       action, STATE_SET "default" 0.0;
-                       target, "clip";
-                       after, "sig,focus";
-               }
-               program {
-                       name, "sig,focus";
-                       signal, SIG_FOCUS;
-                       source, SRC_PROG;
-                       action, STATE_SET "focus" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,unfocus";
-                       signal, SIG_UNFOCUS;
-                       source, SRC_PROG;
-                       action, STATE_SET "default" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,focus,to,up";
-                       signal, SIG_FOCUS_TO_UP;
-                       source, SRC_PROG;
-                       action, STATE_SET "up" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,focus,to,down";
-                       signal, SIG_FOCUS_TO_DOWN;
-                       source, SRC_PROG;
-                       action, STATE_SET "down" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,focus,to,right";
-                       signal, SIG_FOCUS_TO_RIGHT;
-                       source, SRC_PROG;
-                       action, STATE_SET "right" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,unfocus,to,right";
-                       signal, SIG_UNFOCUS_TO_RIGHT;
-                       source, SRC_PROG;
-                       action, STATE_SET "left" 0.0;
-                       target, "clip";
-                       after, "sig,focus";
-               }
-               program {
-                       name, "sig,focus,to,left";
-                       signal, SIG_FOCUS_TO_LEFT;
-                       source, SRC_PROG;
-                       action, STATE_SET "left" 0.0;
-                       transition, LINEAR 0.5;
-                       target, "clip";
-               }
-               program {
-                       name, "sig,unfocus,to,left";
-                       signal, SIG_UNFOCUS_TO_LEFT;
-                       source, SRC_PROG;
-                       action, STATE_SET "right" 0.0;
-                       target, "clip";
-                       after, "sig,focus";
-               }
-       }
 }
index ff790e1..419b781 100644 (file)
 group {
        name, GRP_USER;
        parts {
+               part {
+                       name, "pad.text";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1.relative, 0.5 1.0;
+                               rel2.relative, 0.5 1.0;
+                               min, 0 388;
+                               align, 0.5 1.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, "text";
+                       type, TEXT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, "pad.text";
+                               rel2 {
+                                       to, "pad.text";
+                                       relative, 0.0 0.0;
+                               }
+                               min, 200 34;
+                               fixed, 1 1;
+                               align, 0.5 1.0;
+                               text {
+                                       text, "Switch User";
+                                       font, "TizenSans";
+                                       size, 34;
+                               }
+                               color, 255 255 255 178;
+                               color2, 0 0 0 255;
+                       }
+               }
+               part {
+                       name, "pad.list";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "text";
+                                       relative, 0.5 1.0;
+                               }
+                               rel2 {
+                                       to, "text";
+                                       relative, 0.5 1.0;
+                               }
+                               min, 0 42;
+                               align, 0.5 0.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, PART_USER_BAR;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "pad.list";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2 {
+                                       to, "pad.list";
+                                       relative, 1.0 1.0;
+                               }
+                               min, 1264 158;
+                               align, 0.5 0.0;
+                               fixed, 1 1;
+                       }
+               }
+       }
+}
+
+group {
+       name, GRP_USER_ITEM;
+       inherit, GRP_BAR_ITEM;
+       data.item, TITLE_WIDTH "130";
+       parts {
+               part {
+                       name, "pad.icon";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 0 26;
+                               rel1.relative, 0.5 0.0;
+                               rel2.relative, 0.5 0.0;
+                               align, 0.5 0.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_ICON;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 70 70;
+                               rel1 {
+                                       to, "pad.icon";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2 {
+                                       to, "pad.icon";
+                                       relative, 1.0 1.0;
+                               }
+                               align, 0.5 0.0;
+                               fixed, 1 1;
+                       }
+               }
+               part {
+                       name, "pad.text";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 0 24;
+                               rel1.relative, 0.5 1.0;
+                               rel2.relative, 0.5 1.0;
+                               align, 0.5 1.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_TITLE;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "pad.text";
+                                       relative, 0.0 0.0;
+                               }
+                               rel2 {
+                                       to, "pad.text";
+                                       relative, 0.0 0.0;
+                               }
+                               align, 0.5 1.0;
+                               fixed, 1 1;
+                               min, 130 22;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_TITLE_FOCUS;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, PART_BAR_ITEM_TITLE;
+                               rel2.to, PART_BAR_ITEM_TITLE;
+                       }
+               }
+               part {
+                       name, "pad.lock";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 16 18;
+                               rel1.relative, 1.0 0.0;
+                               rel2.relative, 1.0 0.0;
+                               align, 1.0 0.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_LOCK;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 30 30;
+                               rel1 {
+                                       to, "pad.lock";
+                                       relative, 0.0 1.0;
+                               }
+                               rel2 {
+                                       to, "pad.lock";
+                                       relative, 0.0 1.0;
+                               }
+                               align, 1.0 0.0;
+                               fixed, 1 1;
+                       }
+               }
+               part {
+                       name, PART_BAR_ITEM_LOCK_FOCUS;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, PART_BAR_ITEM_LOCK;
+                               rel2.to, PART_BAR_ITEM_LOCK;
+                       }
+               }
        }
 }
diff --git a/images/btn_user_add_foc.png b/images/btn_user_add_foc.png
new file mode 100644 (file)
index 0000000..b80cefe
Binary files /dev/null and b/images/btn_user_add_foc.png differ
diff --git a/images/btn_user_add_nor.png b/images/btn_user_add_nor.png
new file mode 100644 (file)
index 0000000..29b9ee5
Binary files /dev/null and b/images/btn_user_add_nor.png differ
diff --git a/images/btn_user_lock_foc.png b/images/btn_user_lock_foc.png
new file mode 100644 (file)
index 0000000..de5b869
Binary files /dev/null and b/images/btn_user_lock_foc.png differ
diff --git a/images/btn_user_lock_nor.png b/images/btn_user_lock_nor.png
new file mode 100644 (file)
index 0000000..71001f5
Binary files /dev/null and b/images/btn_user_lock_nor.png differ
index 8d87f09..4cbf787 100644 (file)
 #define GRP_RECENT_ICON "group.recent.icon"
 #define GRP_RECENT_PREVIEW "group.recent.preview"
 #define GRP_USER "group.user"
+#define GRP_USER_ITEM "group.user.item"
 #define GRP_USER_EDIT "group.user.edit"
 #define GRP_USER_EDIT_CONTENTS "group.user.edit.contents"
+#define GRP_BAR_ITEM "group.bar.item"
 
 #define PART_HOME_MENU_BAR "part.home.menu.bar"
 #define PART_HOME_UP_ARROW "part.home.up.arrow"
 #define PART_HOME_DOWN_ARROW "part.home.down.arrow"
-#define PART_HOME_ITEM_ICON "part.home.item.icon"
-#define PART_HOME_ITEM_ICON_FOCUS "part.home.item.icon.focus"
-#define PART_HOME_ITEM_BG "part.home.item.bg"
-#define PART_HOME_ITEM_TITLE "part.home.item.title"
-#define PART_HOME_ITEM_TITLE_FOCUS "part.home.item.focus"
-#define PART_HOME_ITEM_BADGE "part.home.item.badge"
-#define PART_HOME_ITEM_BADGE_COUNT "part.home.item.badge.count"
 #define PART_RECENT_DELETE_ICON "part.recent.delete.icon"
 #define PART_RECENT_CONTENTS "part.recent.contents"
 #define PART_RECENT_NO_CONTENTS "part.recent.no.contents"
 #define PART_USER_EDIT_CONTENTS_ACCOUNT "part.user.edit.contents.account"
 #define PART_USER_EDIT_CONTENTS_LOCK "part.user.edit.contents.lock"
 #define PART_USER_EDIT_CONTETNS_DELETE "part.user.edit.contents.delete"
+#define PART_BAR_ITEM_BG "part.bar.item.bg"
+#define PART_BAR_ITEM_ICON "part.bar.item.icon"
+#define PART_BAR_ITEM_ICON_FOCUS "part.bar.item.icon.focus"
+#define PART_BAR_ITEM_TITLE "part.bar.item.title"
+#define PART_BAR_ITEM_TITLE_FOCUS "part.bar.item.title.focus"
+#define PART_BAR_ITEM_BADGE "part.bar.item.badge"
+#define PART_BAR_ITEM_BADGE_COUNT "part.bar.item.badge.count"
+#define PART_BAR_ITEM_LOCK "part.bar.item.lock"
+#define PART_BAR_ITEM_LOCK_FOCUS "part.bar.item.lock.focus"
+#define PART_USER_BAR "part.user.bar"
 
 #define SIG_SHOW_NAVIGATION "sig.show.navigation"
 #define SIG_HIDE_NAVIGATION "sig.hide.navigation"
index f1900b2..ef88297 100644 (file)
@@ -117,25 +117,25 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
                return NULL;
        }
 
-       ic = utils_add_icon(eo, di->icon, PART_HOME_ITEM_ICON);
+       ic = utils_add_icon(eo, di->icon, PART_BAR_ITEM_ICON);
        if (!ic)
                goto err;
 
-       focus_ic = utils_add_icon(eo, di->focus_icon, PART_HOME_ITEM_ICON_FOCUS);
+       focus_ic = utils_add_icon(eo, di->focus_icon, PART_BAR_ITEM_ICON_FOCUS);
        if (!focus_ic)
                goto err;
 
-       lbl = utils_add_label(eo, di->title, STYLE_LABEL_TITLE, PART_HOME_ITEM_TITLE);
+       lbl = utils_add_label(eo, di->title, STYLE_LABEL_TITLE, PART_BAR_ITEM_TITLE);
        if (!lbl)
                goto err;
 
        focus_lbl = utils_add_label(eo, di->title, STYLE_LABEL_TITLE_FOCUS,
-                       PART_HOME_ITEM_TITLE_FOCUS);
+                       PART_BAR_ITEM_TITLE_FOCUS);
        if (!focus_lbl)
                goto err;
 
        bg = utils_add_bg(eo, COLOR_DEFAULT_R, COLOR_DEFAULT_G, COLOR_DEFAULT_B,
-                       COLOR_DEFAULT_A, PART_HOME_ITEM_BG);
+                       COLOR_DEFAULT_A, PART_BAR_ITEM_BG);
        if (!bg)
                goto err;