[copy&paste module] apply nbeat-theme resolve conflict
authordeasung.kim <deasung.kim@samsung.com>
Tue, 16 Aug 2011 08:37:36 +0000 (17:37 +0900)
committerdeasung.kim <deasung.kim@samsung.com>
Tue, 16 Aug 2011 08:37:36 +0000 (17:37 +0900)
46 files changed:
themes/groups/ctxpopup.edc
themes/images/nbeat-black/copy&paste_arrow_down.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_arrow_left.png [moved from themes/images/nbeat-black/copypaste_btn_arrow_bottom.png with 84% similarity]
themes/images/nbeat-black/copy&paste_arrow_right.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_arrow_up.png [moved from themes/images/nbeat-black/copypaste_btn_arrow_left.png with 84% similarity]
themes/images/nbeat-black/copy&paste_bg.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_bg_center.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_icon_clipboard.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_press_center.png [moved from themes/images/nbeat/copypaste_btn_normal.png with 93% similarity]
themes/images/nbeat-black/copy&paste_press_left.png [new file with mode: 0644]
themes/images/nbeat-black/copy&paste_press_right.png [new file with mode: 0644]
themes/images/nbeat-black/copypaste_btn_bg.png [deleted file]
themes/images/nbeat-hd/copy&paste_arrow_down.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_arrow_left.png [moved from themes/images/nbeat-black/copypaste_btn_arrow_right.png with 84% similarity]
themes/images/nbeat-hd/copy&paste_arrow_right.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_arrow_up.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_bg.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_bg_center.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_icon_clipboard.png [new file with mode: 0644]
themes/images/nbeat-hd/copy&paste_press_center.png [moved from themes/images/nbeat-black/copypaste_btn_normal.png with 93% similarity]
themes/images/nbeat-hd/copy&paste_press_left.png [moved from themes/images/nbeat-black/copypaste_btn_press.png with 88% similarity]
themes/images/nbeat-hd/copy&paste_press_right.png [new file with mode: 0644]
themes/images/nbeat-hd/copypaste_btn_arrow_bottom.png [deleted file]
themes/images/nbeat-hd/copypaste_btn_arrow_left.png [deleted file]
themes/images/nbeat-hd/copypaste_btn_arrow_right.png [deleted file]
themes/images/nbeat-hd/copypaste_btn_arrow_top.png [deleted file]
themes/images/nbeat-hd/copypaste_btn_bg.png [deleted file]
themes/images/nbeat/copy&paste_arrow_down.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_arrow_left.png [moved from themes/images/nbeat-black/copypaste_btn_arrow_top.png with 84% similarity]
themes/images/nbeat/copy&paste_arrow_right.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_arrow_up.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_bg.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_bg_center.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_icon_clipboard.png [new file with mode: 0644]
themes/images/nbeat/copy&paste_press_center.png [moved from themes/images/nbeat-hd/copypaste_btn_normal.png with 93% similarity]
themes/images/nbeat/copy&paste_press_left.png [moved from themes/images/nbeat-hd/copypaste_btn_press.png with 88% similarity]
themes/images/nbeat/copy&paste_press_right.png [new file with mode: 0644]
themes/images/nbeat/copypaste_btn_arrow_bottom.png [deleted file]
themes/images/nbeat/copypaste_btn_arrow_left.png [deleted file]
themes/images/nbeat/copypaste_btn_arrow_right.png [deleted file]
themes/images/nbeat/copypaste_btn_arrow_top.png [deleted file]
themes/images/nbeat/copypaste_btn_bg.png [deleted file]
themes/images/nbeat/copypaste_btn_press.png [deleted file]
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-hd-inc.edc
themes/inc/nbeat-inc.edc

index cf2acfd..4d9bb71 100644 (file)
 #define CTXPOPUP_ENTRY_LIST_PADDING_TOP 6
 #define CTXPOPUP_ENTRY_LIST_PADDING_RIGHT 3
 #define CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM 6
-#define CTXPOPUP_ENTRY_FONT_COLOR 255 255 255 255
-#define CTXPOPUP_ENTRY_SEPARATOR_COLOR 0 0 0 0
-#define CTXPOPUP_ENTRY_ITEM_HEIGHT 44
-#define CTXPOPUP_ENTRY_ICON_SIZE 40
+
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 30
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 46
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 10
+#define CTXPOPUP_ENTRY_ICON_SIZE 36
 #define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 150
 #define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
 #define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
-#define CTXPOPUP_ENTRY_ARROW_SIZE 14
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 15
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30
 ///////////////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/base/extended/entry";
                alias: "elm/ctxpopup/base/extended/entry/pass_event";
                images {
-                       image: "ctxpopup_bg.png" COMP;
-                       image: "ctxpopup_shadow.png" COMP;
-                       image: "copypaste_btn_bg.png" COMP;
+                       image: "copy&paste_bg_center.png" COMP;
                }
                parts {
                        part {
-                               name:"frame_shadow_left_top_padding";
-                               type:RECT;
+                               name: "ctxpopup_frame";
+                               type: RECT;
                                scale: 1;
-                               mouse_events: 0;
                                description {
-                                       min: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING;
-                                       max: CTXPOPUP_SHADOW_PADDING CTXPOPUP_SHADOW_PADDING;
-                                       align: 0 0;
-                                       fixed: 1 1;
                                        visible: 0;
+                                       rel1 {
+                                               to: "frame_left_padding";
+                                               relative: 0 0;
+                                       }
+                                       rel2 {
+                                               to: "frame_right_padding";
+                                               relative: 1 1;
+                                       }
                                }
                        }
                        part {
-                               name:"frame_shadow_right_bottom_padding";
+                               name:"frame_left_padding";
                                type:RECT;
                                scale: 1;
                                mouse_events: 0;
                                description {
-                                       min: CTXPOPUP_ENTRY_LIST_PADDING_RIGHT CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM;
-                                       max: CTXPOPUP_ENTRY_LIST_PADDING_RIGHT CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM;
-                                       rel1{relative: 1 1;}
+                                       visible: 0;
+                                       min: 7 1;
+                                       max: 7 1;
+                                       rel2 {
+                                               relative: 0 0;
+                                               to: "elm.swallow.content";
+                                       }
                                        align: 0 0;
                                        fixed: 1 1;
-                                       visible: 0;
                                }
                        }
                        part {
-                               name: "frame_shadow";
-                               type: IMAGE;
+                               name:"frame_right_padding";
+                               type:RECT;
                                scale: 1;
                                mouse_events: 0;
                                description {
-                                       state: "default" 0.0;
-                                       rel1 {to:"frame_shadow_left_top_padding"; relative: 1 1;}
-                                       rel2 {to:"frame_shadow_right_bottom_padding";}
-                                       image {
-                                               normal: "ctxpopup_shadow.png";
-                                               border: 10 10 10 10;
-                                               border_scale: 1;
+                                       visible: 0;
+                                       min: 7 1;
+                                       max: 7 1;
+                                       rel1 {
+                                               relative: 1 1;
+                                               to: "elm.swallow.content";
                                        }
-                                       color: 255 255 255 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 255 255 255 255;
+                                       align: 1 1;
+                                       fixed: 1 1;
                                }
                        }
+
                        part {
-                               name: "ctxpopup_frame";
+                               name: "ctxpopup_frame_rect";
                                type: IMAGE;
                                scale: 1;
                                description {
                                        visible: 1;
-                                       rel2 {offset: -1 11;}
                                        image {
-                                               normal: "copypaste_btn_bg.png";
-                                               border: 0 0 0 0;
+                                               normal: "copy&paste_bg_center.png";
+                                               border: 5 9 0 7;
                                                border_scale: 1;
                                        }
-                               }
-                       }
-                       part {
-                               name: "ctxpopup_frame_rect";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       visible: 0;
-                                       color: 0 0 0 255;
-                               }
-                       }
-                       part {
-                               name:"list_shadow_right_bottom_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       min: CTXPOPUP_ENTRY_LIST_SHADOW_PADDING CTXPOPUP_ENTRY_LIST_SHADOW_PADDING;
-                                       max: CTXPOPUP_ENTRY_LIST_SHADOW_PADDING CTXPOPUP_ENTRY_LIST_SHADOW_PADDING;
-                                       align: 0 0;
-                                       fixed: 1 1;
-                                       visible: 0;
-                                       rel1 {to:"elm.swallow.content";  relative: 1 1;}
-                               }
-                       }
-                       part {
-                               name: "ctxpopup_list";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to: "elm.swallow.content";}
-                                       rel2 {to: "list_shadow_right_bottom_padding";}
-                                       color: 255 255 255 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 255 255 255 255;
-                               }
-                       }
-                       part {
-                               name:"content_left_top_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_ENTRY_LIST_PADDING_LEFT CTXPOPUP_ENTRY_LIST_PADDING_TOP;
-                                       max: CTXPOPUP_ENTRY_LIST_PADDING_LEFT CTXPOPUP_ENTRY_LIST_PADDING_TOP;
-                                       align: 0 0;
-                                       fixed: 1 1;
-                                       visible: 0;
+                                       rel2 { offset: 9 7; }
                                }
                        }
                        part {
                                scale: 1;
                                mouse_events: 0;
                                description {
-                                       min: CTXPOPUP_ENTRY_LIST_PADDING_RIGHT CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM;
-                                       max: CTXPOPUP_ENTRY_LIST_PADDING_RIGHT CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM;
-                                       rel1 { relative: 1 1;}
-                                       rel2 { relative: 1 1;}
+                                       visible: 0;
+                                       min: 4 7;       // shadow 4 7
+                                       max: 4 7;
+                                       rel1 {to: "ctxpopup_frame_rect"; relative: 1 1;}
+                                       rel2 {to: "ctxpopup_frame_rect"; relative: 1 1;}
                                        align: 1 1;
                                        fixed: 1 1;
-                                       visible: 0;
                                }
                        }
                        part {
                                type: SWALLOW;
                                description {
                                        state: "default" 0.0;
-                                       rel1 {to:"content_left_top_padding"; relative: 1 1;}
-                                       rel2 {to:"content_right_bottom_padding"; relative: 0 0;}
+                                       rel1 {to: "ctxpopup_frame_rect"; relative: 0 0; }
+//                                     rel1 {to: "content_left_padding"; relative: 1 0;}
+                                       rel2 {to: "content_right_bottom_padding"; relative: 0 0; }
                                }
                        }
                }
                name: "elm/ctxpopup/arrow/extended/entry";
                alias: "elm/ctxpopup/arrow/extended/entry/pass_event";
                images {
-                       image: "copypaste_btn_arrow_left.png" COMP;
-                       image: "copypaste_btn_arrow_right.png" COMP;
-                       image: "copypaste_btn_arrow_top.png" COMP;
-                       image: "copypaste_btn_arrow_bottom.png" COMP;
+                       image: "copy&paste_arrow_up.png" COMP;
+                       image: "copy&paste_arrow_left.png" COMP;
+                       image: "copy&paste_arrow_right.png" COMP;
+                       image: "copy&paste_arrow_down.png" COMP;
                }
                parts {
                        part {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
-                                       max: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
+                                       min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
+                                       max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        fixed: 1 1;
                                        visible: 0;
                                        align: 0.5 0.5;
                                }
                                description {
                                        state: "left" 0.0;
-                                       min: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
-                                       max: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
+                                       min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
+                                       max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        fixed: 1 1;
                                        align: 0.0 0.5;
                                        image {
-                                               normal: "copypaste_btn_arrow_left.png";
+                                               normal: "copy&paste_arrow_left.png";
                                        }
                                }
                                description {
                                        state: "right" 0.0;
-                                       min: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
-                                       max: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
+                                       min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
+                                       max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        fixed: 1 1;
                                        align: 1.0 0.5;
                                        image {
-                                               normal: "copypaste_btn_arrow_right.png";
+                                               normal: "copy&paste_arrow_right.png";
                                        }
                                }
                                description {
                                        state: "top" 0.0;
-                                       min: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
-                                       max: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
+                                       min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
+                                       max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        fixed: 1 1;
                                        align: 0.5 0.0;
                                        image {
-                                               normal: "copypaste_btn_arrow_top.png";
+                                               normal: "copy&paste_arrow_up.png";
                                        }
                                }
                                description {
                                        state: "bottom" 0.0;
-                                       min: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
-                                       max: CTXPOPUP_ENTRY_ARROW_SIZE CTXPOPUP_ENTRY_ARROW_SIZE;
+                                       min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
+                                       max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        fixed: 1 1;
-                                       align: 0.5 1.0;
+                                       align: 0.5 0;
+                                       rel1.offset: 0 0;
+                                       rel2.offset: 0 0;
                                        image {
-                                               normal: "copypaste_btn_arrow_bottom.png";
+                                               normal: "copy&paste_arrow_down.png";
                                        }
                                }
                        }
                }
        }
 ///////////////////////////////////////////////////////////////////////////////////////
+#define CTXPOPUP_ENTRY_ITEM_BG_PART \
+                       part {\
+                               name: "bg";\
+                               mouse_events: 0;\
+                               type: IMAGE;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 0;\
+                                       rel1 {to:"left_bg_padding"; relative: 1 0;}\
+                                       rel2 {to:"right_bg_padding"; relative: 0 1;}\
+                                       image {\
+                                               normal: "copy&paste_press_center.png";\
+                                               border: 0 0 0 0;\
+                                       }\
+                               }\
+                               description {\
+                                       state: "clicked" 0.0;\
+                                       inherit: "default" 0.0;\
+                                       visible: 1;\
+                                       image {\
+                                               normal: "copy&paste_press_center.png";\
+                                               border: 0 0 0 0;\
+                                       }\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART \
+                       part {\
+                               name: "left_bg_padding";\
+                               type: IMAGE;\
+                               scale: 1;\
+                               mouse_events: 0;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 0;\
+                                       min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       align: 0 0.5;\
+                                       fixed: 1 0;\
+                                       rel1 { to: "event_blocker"; relative: 0 0; }\
+                                       rel2 { to: "event_blocker"; relative: 0 1; }\
+                                       image {\
+                                               normal: "copy&paste_press_left.png";\
+                                               border: 6 0 0 0;\
+                                       }\
+                               }\
+                               description {\
+                                       state: "clicked" 0.0;\
+                                       inherit: "default" 0.0;\
+                                       visible: 1;\
+                                       image {\
+                                               normal: "copy&paste_press_left.png";\
+                                               border: 6 0 0 0;\
+                                       }\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART \
+                       part {\
+                               name: "right_bg_padding";\
+                               type: IMAGE;\
+                               scale: 1;\
+                               mouse_events: 0;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 0;\
+                                       min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       fixed: 1 0;\
+                                       align: 1.0 0.5;\
+                                       rel1 { to: "event_blocker"; relative: 1 0; }\
+                                       rel2 { to: "event_blocker"; relative: 1 1; }\
+                                       image {\
+                                               normal: "copy&paste_press_right.png";\
+                                               border: 0 6 0 0;\
+                                       }\
+                               }\
+                               description {\
+                                       state: "clicked" 0.0;\
+                                       inherit: "default" 0.0;\
+                                       visible: 1;\
+                                       image {\
+                                               normal: "copy&paste_press_right.png";\
+                                               border: 0 6 0 0;\
+                                       }\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART \
+                       part {\
+                               name: "left_padding";\
+                               type: RECT;\
+                               scale: 1;\
+                               mouse_events: 0;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 0;\
+                                       min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       align: 0 0.5;\
+                                       fixed: 1 0;\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART \
+                       part {\
+                               name: "right_padding";\
+                               type: RECT;\
+                               scale: 1;\
+                               mouse_events: 0;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 0;\
+                                       min: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH CTXPOPUP_ENTRY_ITEM_HEIGHT;\
+                                       fixed: 1 0;\
+                                       align: 1.0 0.5;\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART \
+                       part {\
+                               name: "left_separator";\
+                               mouse_events: 0;\
+                               type: RECT;\
+                               scale: 1;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 1;\
+                                       color: CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR;\
+                                       min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\
+                                       fixed: 1 1;\
+                                       rel1.to: "left_padding";\
+                                       rel2 {\
+                                               to: "left_padding";\
+                                               relative: 0 1;\
+                                       }\
+                               }\
+                       }
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART \
+                       part {\
+                               name: "right_separator";\
+                               mouse_events: 0;\
+                               type: RECT;\
+                               scale: 1;\
+                               description {\
+                                       state: "default" 0.0;\
+                                       visible: 1;\
+                                       color: CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR;\
+                                       min: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\
+                                       max: CTXPOPUP_ENTRY_SEPARATOR_WIDTH CTXPOPUP_ENTRY_SEPARATOR_HEIGHT;\
+                                       fixed: 1 1;\
+                                       rel1 {\
+                                               to: "right_padding";\
+                                               relative: 1 0;\
+                                               offset: -1 0;\
+                                       }\
+                                       rel2 {\
+                                               to: "right_padding";\
+                                               offset: -1 0;\
+                                       }\
+                               }\
+                       }
+///////////////////////////////////////////////////////////////////////////////////////
+
        group {
                name: "elm/ctxpopup/text_style_item/extended/entry";
                alias: "elm/ctxpopup/text_style_item/extended/entry/pass_event";
                images {
-                       image: "copypaste_btn_normal.png" COMP;
-                       image: "copypaste_btn_press.png" COMP;
+                       image: "copy&paste_press_center.png" COMP;
+                       image: "copy&paste_press_left.png" COMP;
+                       image: "copy&paste_press_right.png" COMP;
                }
                parts {
                        part {
                                        color: 0 0 0 0;
                                }
                        }
-                       part {
-                               name: "left_bg_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       align: 0 0.5;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "right_bg_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       min: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
-                       }
-                       }
-                       part {
-                               name: "bg";
-                               mouse_events: 0;
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to:"left_bg_padding"; relative: 1 0;}
-                                       rel2 {to:"right_bg_padding"; relative: 0 1;}
-                                       image {
-                                               normal: "copypaste_btn_normal.png";
-                                               border: 3 3 3 3;
-                                               border_scale: 1;
-                                       }
-                               }
-                               description {
-                                       state: "clicked" 0.0;
-                                       inherit: "default" 0.0;
-                                       image {
-                                               normal: "copypaste_btn_press.png";
-                                               border: 3 3 3 3;
-                                               border_scale: 1;
-                                       }
-                               }
-                       }
-                       part {
-                               name: "left_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 16 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 16 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       align: 0 0.5;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "bottom_separator";
-                               mouse_events: 0;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       color: CTXPOPUP_ENTRY_SEPARATOR_COLOR;
-                                       align: 0.5 1;
-                                       min: 0 1;
-                                       max: 999999 1;
-                               }
-                       }
-                       part {
-                               name: "right_separator";
-                               mouse_events: 0;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: CTXPOPUP_ENTRY_SEPARATOR_COLOR;
-                                       align: 1 0.5;
-                                       min: 1 0;
-                                       max: 1 999999;
-                               }
-                       }
+                       CTXPOPUP_ENTRY_ITEM_BG_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART
+                       CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_PART
                        part {
                                name: "elm.text";
                                type:  TEXT;
                                        align: 0.5 0.5;
                                        rel1 {relative: 1.0 0.0; to: "left_padding";}
                                        rel2 {relative: 0.0 1.0; to: "right_padding";}
-                                       color: CTXPOPUP_ENTRY_FONT_COLOR;
+                                       color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 20;
+                                               size: 18;
                                                align: 0.5 0.5;
                                                min: 1 1;
                                        }
                                description {
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
-                                       color: CTXPOPUP_CLICKED_FONT_COLOR;
-                               }
-                       }
-                       part {
-                               name: "right_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       min: 16 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 16 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
+                                       color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR;
                                }
                        }
                        part {
                                script {
                                        set_state(PART:"elm.text", "clicked", 0.0);
                                        set_state(PART:"bg", "clicked", 0.0);
+                                       set_state(PART:"left_bg_padding", "clicked", 0.0);
+                                       set_state(PART:"right_bg_padding", "clicked", 0.0);
                                }
                        }
-               }
-               program {
-                       name: "item_unclick2";
-                       signal: "mouse,up,1";
-                       source: "over2";
-                       script {
-                               set_state(PART:"elm.text", "default", 0.0);
-                               set_state(PART:"bg", "default", 0.0);
+                       program {
+                               name: "item_unclick2";
+                               signal: "mouse,up,1";
+                               source: "over2";
+                               script {
+                                       set_state(PART:"elm.text", "default", 0.0);
+                                       set_state(PART:"bg", "default", 0.0);
+                                       set_state(PART:"left_bg_padding", "default", 0.0);
+                                       set_state(PART:"right_bg_padding", "default", 0.0);
+                               }
                        }
                }
        }
        group {
                name: "elm/ctxpopup/icon_style_item/extended/entry";
                images {
-                       image: "copypaste_btn_normal.png" COMP;
-                       image: "copypaste_btn_press.png" COMP;
+                       image: "copy&paste_press_center.png" COMP;
+                       image: "copy&paste_press_left.png" COMP;
+                       image: "copy&paste_press_right.png" COMP;
                }
                parts {
                        part {
                                        color: 0 0 0 0;
                                }
                        }
-                       part {
-                               name: "left_bg_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       align: 0 0.5;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "right_bg_padding";
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       min: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       max: 3 CTXPOPUP_ENTRY_ITEM_HEIGHT;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
-                       }
-                       }
-                       part {
-                               name: "bg";
-                               mouse_events: 0;
-                               type: IMAGE;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to:"left_bg_padding"; relative: 1 0;}
-                                       rel2 {to:"right_bg_padding"; relative: 0 1;}
-                                       image {
-                                               normal: "copypaste_btn_normal.png";
-                                               border: 3 3 3 3;
-                                               border_scale: 1;
-                                       }
-                               }
-                               description {
-                                       state: "clicked" 0.0;
-                                       inherit: "default" 0.0;
-                                       image {
-                                               normal: "copypaste_btn_press.png";
-                                               border: 3 3 3 3;
-                                               border_scale: 1;
-                                       }
-                               }
-                       }
-                       part {
-                               name: "left_top_padding";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       min: 6 2;
-                                       max: 6 2;
-                                       visible: 0;
-                                       align: 0 0;
-                                       fixed: 1 1;
-                                       color: 255 0 0 255;
-                               }
-                       }
-                       part {
-                               name: "right_bottom_padding";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       min: 6 2;
-                                       max: 6 2;
-                                       visible: 0;
-                                       align: 1 1;
-                                       fixed: 1 1;
-                                       color: 0 0 255 255;
-                               }
-                       }
-                       part {
-                               name: "right_separator";
-                               mouse_events: 0;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: CTXPOPUP_ENTRY_SEPARATOR_COLOR;
-                                       align: 1 0.5;
-                                       min: 1 0;
-                                       max: 1 999999;
-                               }
-                       }
+                       CTXPOPUP_ENTRY_ITEM_BG_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_BG_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_RIGHT_BG_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_RIGHT_PADDING_PART
+                       CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_PART
                        part {
                                name: "elm.swallow.icon";
                                type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: CTXPOPUP_ENTRY_ICON_SIZE CTXPOPUP_ENTRY_ICON_SIZE;
-                                       max: CTXPOPUP_ENTRY_ICON_SIZE CTXPOPUP_ENTRY_ICON_SIZE;
+                                       min: 36 36;
+                                       max: 36 36;
+                                       fixed: 0 1;
                                        align: 0.5 0.5;
-                                       aspect: 1.0 1.0;
-                                       rel1 { to: "left_top_padding"; relative: 1 1; }
-                                       rel2 { to: "right_bottom_padding"; relative: 0 0; }
+//                                     aspect: 1.0 1.0;
+                                       rel1 {relative: 1.0 0.0; to: "left_padding";}
+                                       rel2 {relative: 0.0 1.0; to: "right_padding";}
                                }
                        }
                        part {
                                target: "disclip";
                        }
                        program {
-                               name: "enable";
-                               signal: "elm,state,enabled";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "disclip";
-                       }
-                       program {
                                name: "item_click2";
                                signal: "mouse,down,1";
                                source: "over2";
                                script {
                                        set_state(PART:"bg", "clicked", 0.0);
+                                       set_state(PART:"left_bg_padding", "clicked", 0.0);
+                                       set_state(PART:"right_bg_padding", "clicked", 0.0);
                                }
                        }
                        program {
                                source: "over2";
                                script {
                                        set_state(PART:"bg", "default", 0.0);
+                                       set_state(PART:"left_bg_padding", "default", 0.0);
+                                       set_state(PART:"right_bg_padding", "default", 0.0);
                                }
                        }
                }
diff --git a/themes/images/nbeat-black/copy&paste_arrow_down.png b/themes/images/nbeat-black/copy&paste_arrow_down.png
new file mode 100644 (file)
index 0000000..d420439
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_arrow_down.png differ
similarity index 84%
rename from themes/images/nbeat-black/copypaste_btn_arrow_bottom.png
rename to themes/images/nbeat-black/copy&paste_arrow_left.png
index be40b50..a3dac32 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_arrow_bottom.png and b/themes/images/nbeat-black/copy&paste_arrow_left.png differ
diff --git a/themes/images/nbeat-black/copy&paste_arrow_right.png b/themes/images/nbeat-black/copy&paste_arrow_right.png
new file mode 100644 (file)
index 0000000..83fb91a
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_arrow_right.png differ
similarity index 84%
rename from themes/images/nbeat-black/copypaste_btn_arrow_left.png
rename to themes/images/nbeat-black/copy&paste_arrow_up.png
index 6c7f1d6..0cb65ea 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_arrow_left.png and b/themes/images/nbeat-black/copy&paste_arrow_up.png differ
diff --git a/themes/images/nbeat-black/copy&paste_bg.png b/themes/images/nbeat-black/copy&paste_bg.png
new file mode 100644 (file)
index 0000000..4ac68a5
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_bg.png differ
diff --git a/themes/images/nbeat-black/copy&paste_bg_center.png b/themes/images/nbeat-black/copy&paste_bg_center.png
new file mode 100644 (file)
index 0000000..986b6a7
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_bg_center.png differ
diff --git a/themes/images/nbeat-black/copy&paste_icon_clipboard.png b/themes/images/nbeat-black/copy&paste_icon_clipboard.png
new file mode 100644 (file)
index 0000000..79ac80a
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_icon_clipboard.png differ
similarity index 93%
rename from themes/images/nbeat/copypaste_btn_normal.png
rename to themes/images/nbeat-black/copy&paste_press_center.png
index d732f9b..944ed1c 100644 (file)
Binary files a/themes/images/nbeat/copypaste_btn_normal.png and b/themes/images/nbeat-black/copy&paste_press_center.png differ
diff --git a/themes/images/nbeat-black/copy&paste_press_left.png b/themes/images/nbeat-black/copy&paste_press_left.png
new file mode 100644 (file)
index 0000000..5c87715
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_press_left.png differ
diff --git a/themes/images/nbeat-black/copy&paste_press_right.png b/themes/images/nbeat-black/copy&paste_press_right.png
new file mode 100644 (file)
index 0000000..b002ce4
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_press_right.png differ
diff --git a/themes/images/nbeat-black/copypaste_btn_bg.png b/themes/images/nbeat-black/copypaste_btn_bg.png
deleted file mode 100644 (file)
index 9a5b561..0000000
Binary files a/themes/images/nbeat-black/copypaste_btn_bg.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/copy&paste_arrow_down.png b/themes/images/nbeat-hd/copy&paste_arrow_down.png
new file mode 100644 (file)
index 0000000..7f9e782
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_arrow_down.png differ
similarity index 84%
rename from themes/images/nbeat-black/copypaste_btn_arrow_right.png
rename to themes/images/nbeat-hd/copy&paste_arrow_left.png
index 8ff34d7..f3130bf 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_arrow_right.png and b/themes/images/nbeat-hd/copy&paste_arrow_left.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_arrow_right.png b/themes/images/nbeat-hd/copy&paste_arrow_right.png
new file mode 100644 (file)
index 0000000..e8699c7
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_arrow_right.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_arrow_up.png b/themes/images/nbeat-hd/copy&paste_arrow_up.png
new file mode 100644 (file)
index 0000000..96925b9
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_arrow_up.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_bg.png b/themes/images/nbeat-hd/copy&paste_bg.png
new file mode 100644 (file)
index 0000000..ca38f59
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_bg.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_bg_center.png b/themes/images/nbeat-hd/copy&paste_bg_center.png
new file mode 100644 (file)
index 0000000..819f037
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_bg_center.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_icon_clipboard.png b/themes/images/nbeat-hd/copy&paste_icon_clipboard.png
new file mode 100644 (file)
index 0000000..79ac80a
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_icon_clipboard.png differ
similarity index 93%
rename from themes/images/nbeat-black/copypaste_btn_normal.png
rename to themes/images/nbeat-hd/copy&paste_press_center.png
index d732f9b..f15f9c8 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_normal.png and b/themes/images/nbeat-hd/copy&paste_press_center.png differ
similarity index 88%
rename from themes/images/nbeat-black/copypaste_btn_press.png
rename to themes/images/nbeat-hd/copy&paste_press_left.png
index 7cbf604..e38873f 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_press.png and b/themes/images/nbeat-hd/copy&paste_press_left.png differ
diff --git a/themes/images/nbeat-hd/copy&paste_press_right.png b/themes/images/nbeat-hd/copy&paste_press_right.png
new file mode 100644 (file)
index 0000000..0cc877d
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_press_right.png differ
diff --git a/themes/images/nbeat-hd/copypaste_btn_arrow_bottom.png b/themes/images/nbeat-hd/copypaste_btn_arrow_bottom.png
deleted file mode 100644 (file)
index be40b50..0000000
Binary files a/themes/images/nbeat-hd/copypaste_btn_arrow_bottom.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/copypaste_btn_arrow_left.png b/themes/images/nbeat-hd/copypaste_btn_arrow_left.png
deleted file mode 100644 (file)
index 6c7f1d6..0000000
Binary files a/themes/images/nbeat-hd/copypaste_btn_arrow_left.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/copypaste_btn_arrow_right.png b/themes/images/nbeat-hd/copypaste_btn_arrow_right.png
deleted file mode 100644 (file)
index 8ff34d7..0000000
Binary files a/themes/images/nbeat-hd/copypaste_btn_arrow_right.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/copypaste_btn_arrow_top.png b/themes/images/nbeat-hd/copypaste_btn_arrow_top.png
deleted file mode 100644 (file)
index f2e4aa0..0000000
Binary files a/themes/images/nbeat-hd/copypaste_btn_arrow_top.png and /dev/null differ
diff --git a/themes/images/nbeat-hd/copypaste_btn_bg.png b/themes/images/nbeat-hd/copypaste_btn_bg.png
deleted file mode 100644 (file)
index 9a5b561..0000000
Binary files a/themes/images/nbeat-hd/copypaste_btn_bg.png and /dev/null differ
diff --git a/themes/images/nbeat/copy&paste_arrow_down.png b/themes/images/nbeat/copy&paste_arrow_down.png
new file mode 100644 (file)
index 0000000..7f9e782
Binary files /dev/null and b/themes/images/nbeat/copy&paste_arrow_down.png differ
similarity index 84%
rename from themes/images/nbeat-black/copypaste_btn_arrow_top.png
rename to themes/images/nbeat/copy&paste_arrow_left.png
index f2e4aa0..f3130bf 100644 (file)
Binary files a/themes/images/nbeat-black/copypaste_btn_arrow_top.png and b/themes/images/nbeat/copy&paste_arrow_left.png differ
diff --git a/themes/images/nbeat/copy&paste_arrow_right.png b/themes/images/nbeat/copy&paste_arrow_right.png
new file mode 100644 (file)
index 0000000..e8699c7
Binary files /dev/null and b/themes/images/nbeat/copy&paste_arrow_right.png differ
diff --git a/themes/images/nbeat/copy&paste_arrow_up.png b/themes/images/nbeat/copy&paste_arrow_up.png
new file mode 100644 (file)
index 0000000..96925b9
Binary files /dev/null and b/themes/images/nbeat/copy&paste_arrow_up.png differ
diff --git a/themes/images/nbeat/copy&paste_bg.png b/themes/images/nbeat/copy&paste_bg.png
new file mode 100644 (file)
index 0000000..ca38f59
Binary files /dev/null and b/themes/images/nbeat/copy&paste_bg.png differ
diff --git a/themes/images/nbeat/copy&paste_bg_center.png b/themes/images/nbeat/copy&paste_bg_center.png
new file mode 100644 (file)
index 0000000..819f037
Binary files /dev/null and b/themes/images/nbeat/copy&paste_bg_center.png differ
diff --git a/themes/images/nbeat/copy&paste_icon_clipboard.png b/themes/images/nbeat/copy&paste_icon_clipboard.png
new file mode 100644 (file)
index 0000000..79ac80a
Binary files /dev/null and b/themes/images/nbeat/copy&paste_icon_clipboard.png differ
similarity index 93%
rename from themes/images/nbeat-hd/copypaste_btn_normal.png
rename to themes/images/nbeat/copy&paste_press_center.png
index d732f9b..f15f9c8 100644 (file)
Binary files a/themes/images/nbeat-hd/copypaste_btn_normal.png and b/themes/images/nbeat/copy&paste_press_center.png differ
similarity index 88%
rename from themes/images/nbeat-hd/copypaste_btn_press.png
rename to themes/images/nbeat/copy&paste_press_left.png
index 7cbf604..e38873f 100644 (file)
Binary files a/themes/images/nbeat-hd/copypaste_btn_press.png and b/themes/images/nbeat/copy&paste_press_left.png differ
diff --git a/themes/images/nbeat/copy&paste_press_right.png b/themes/images/nbeat/copy&paste_press_right.png
new file mode 100644 (file)
index 0000000..0cc877d
Binary files /dev/null and b/themes/images/nbeat/copy&paste_press_right.png differ
diff --git a/themes/images/nbeat/copypaste_btn_arrow_bottom.png b/themes/images/nbeat/copypaste_btn_arrow_bottom.png
deleted file mode 100644 (file)
index be40b50..0000000
Binary files a/themes/images/nbeat/copypaste_btn_arrow_bottom.png and /dev/null differ
diff --git a/themes/images/nbeat/copypaste_btn_arrow_left.png b/themes/images/nbeat/copypaste_btn_arrow_left.png
deleted file mode 100644 (file)
index 6c7f1d6..0000000
Binary files a/themes/images/nbeat/copypaste_btn_arrow_left.png and /dev/null differ
diff --git a/themes/images/nbeat/copypaste_btn_arrow_right.png b/themes/images/nbeat/copypaste_btn_arrow_right.png
deleted file mode 100644 (file)
index 8ff34d7..0000000
Binary files a/themes/images/nbeat/copypaste_btn_arrow_right.png and /dev/null differ
diff --git a/themes/images/nbeat/copypaste_btn_arrow_top.png b/themes/images/nbeat/copypaste_btn_arrow_top.png
deleted file mode 100644 (file)
index f2e4aa0..0000000
Binary files a/themes/images/nbeat/copypaste_btn_arrow_top.png and /dev/null differ
diff --git a/themes/images/nbeat/copypaste_btn_bg.png b/themes/images/nbeat/copypaste_btn_bg.png
deleted file mode 100644 (file)
index 9a5b561..0000000
Binary files a/themes/images/nbeat/copypaste_btn_bg.png and /dev/null differ
diff --git a/themes/images/nbeat/copypaste_btn_press.png b/themes/images/nbeat/copypaste_btn_press.png
deleted file mode 100644 (file)
index 7cbf604..0000000
Binary files a/themes/images/nbeat/copypaste_btn_press.png and /dev/null differ
index 0cd26f7..3640e8f 100644 (file)
 #define CALENDAR_HEADER_MIN_WIDTH_INC 24
 #define CALENDAR_HEADER_MIN_HEIGHT_INC 50
 
-
+#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
+#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 74 74 74 255
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 164 164 164 255
index 2953078..040b52b 100644 (file)
 #define CALENDAR_HEADER_MIN_WIDTH_INC 36
 #define CALENDAR_HEADER_MIN_HEIGHT_INC 80
 
+#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
+#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 61 61 61 255
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 148 148 148 255
index 71e914e..45d6ccb 100644 (file)
 #define CALENDAR_BASE_MIN_HEIGHT_INC 220
 #define CALENDAR_HEADER_MIN_WIDTH_INC 24
 #define CALENDAR_HEADER_MIN_HEIGHT_INC 50
+
+#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
+#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 61 61 61 255
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 148 148 148 255