new test.

SVN revision: 45545

diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index aa238787addb9c8af8abcf1e40db35aa47a0e073..afc162aa7fc46341f716f7591dd709ad85ddd7ae 100644 (file)
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -14,6 +14,30 @@ sky_04.jpg \
 wood_01.jpg \
 logo.png \
 logo_small.png \
-parking.png
+parking.png \
+icon_00.png \
+icon_01.png \
+icon_02.png \
+icon_03.png \
+icon_04.png \
+icon_05.png \
+icon_06.png \
+icon_07.png \
+icon_08.png \
+icon_09.png \
+icon_10.png \
+icon_11.png \
+icon_12.png \
+icon_13.png \
+icon_14.png \
+icon_15.png \
+icon_16.png \
+icon_17.png \
+icon_18.png \
+icon_19.png \
+icon_20.png \
+icon_21.png \
+icon_22.png \
+icon_23.png
 
 EXTRA_DIST = $(files_DATA)

diff --git a/data/images/icon_00.png b/data/images/icon_00.png
new file mode 100644 (file)
index 0000000..d026778
Binary files /dev/null and b/data/images/icon_00.png differ

diff --git a/data/images/icon_01.png b/data/images/icon_01.png
new file mode 100644 (file)
index 0000000..faf524c
Binary files /dev/null and b/data/images/icon_01.png differ

diff --git a/data/images/icon_02.png b/data/images/icon_02.png
new file mode 100644 (file)
index 0000000..592cb5a
Binary files /dev/null and b/data/images/icon_02.png differ

diff --git a/data/images/icon_03.png b/data/images/icon_03.png
new file mode 100644 (file)
index 0000000..3d3063b
Binary files /dev/null and b/data/images/icon_03.png differ

diff --git a/data/images/icon_04.png b/data/images/icon_04.png
new file mode 100644 (file)
index 0000000..454bd62
Binary files /dev/null and b/data/images/icon_04.png differ

diff --git a/data/images/icon_05.png b/data/images/icon_05.png
new file mode 100644 (file)
index 0000000..bb81792
Binary files /dev/null and b/data/images/icon_05.png differ

diff --git a/data/images/icon_06.png b/data/images/icon_06.png
new file mode 100644 (file)
index 0000000..7f72520
Binary files /dev/null and b/data/images/icon_06.png differ

diff --git a/data/images/icon_07.png b/data/images/icon_07.png
new file mode 100644 (file)
index 0000000..1c76beb
Binary files /dev/null and b/data/images/icon_07.png differ

diff --git a/data/images/icon_08.png b/data/images/icon_08.png
new file mode 100644 (file)
index 0000000..c8fc8d2
Binary files /dev/null and b/data/images/icon_08.png differ

diff --git a/data/images/icon_09.png b/data/images/icon_09.png
new file mode 100644 (file)
index 0000000..f321617
Binary files /dev/null and b/data/images/icon_09.png differ

diff --git a/data/images/icon_10.png b/data/images/icon_10.png
new file mode 100644 (file)
index 0000000..c72918b
Binary files /dev/null and b/data/images/icon_10.png differ

diff --git a/data/images/icon_11.png b/data/images/icon_11.png
new file mode 100644 (file)
index 0000000..cdb212e
Binary files /dev/null and b/data/images/icon_11.png differ

diff --git a/data/images/icon_12.png b/data/images/icon_12.png
new file mode 100644 (file)
index 0000000..1954b9b
Binary files /dev/null and b/data/images/icon_12.png differ

diff --git a/data/images/icon_13.png b/data/images/icon_13.png
new file mode 100644 (file)
index 0000000..27d964e
Binary files /dev/null and b/data/images/icon_13.png differ

diff --git a/data/images/icon_14.png b/data/images/icon_14.png
new file mode 100644 (file)
index 0000000..2434b05
Binary files /dev/null and b/data/images/icon_14.png differ

diff --git a/data/images/icon_15.png b/data/images/icon_15.png
new file mode 100644 (file)
index 0000000..8ab20ce
Binary files /dev/null and b/data/images/icon_15.png differ

diff --git a/data/images/icon_16.png b/data/images/icon_16.png
new file mode 100644 (file)
index 0000000..7f5ad1e
Binary files /dev/null and b/data/images/icon_16.png differ

diff --git a/data/images/icon_17.png b/data/images/icon_17.png
new file mode 100644 (file)
index 0000000..6afaf7a
Binary files /dev/null and b/data/images/icon_17.png differ

diff --git a/data/images/icon_18.png b/data/images/icon_18.png
new file mode 100644 (file)
index 0000000..74eb0d6
Binary files /dev/null and b/data/images/icon_18.png differ

diff --git a/data/images/icon_19.png b/data/images/icon_19.png
new file mode 100644 (file)
index 0000000..d8784e0
Binary files /dev/null and b/data/images/icon_19.png differ

diff --git a/data/images/icon_20.png b/data/images/icon_20.png
new file mode 100644 (file)
index 0000000..69a9dca
Binary files /dev/null and b/data/images/icon_20.png differ

diff --git a/data/images/icon_21.png b/data/images/icon_21.png
new file mode 100644 (file)
index 0000000..6561e5f
Binary files /dev/null and b/data/images/icon_21.png differ

diff --git a/data/images/icon_22.png b/data/images/icon_22.png
new file mode 100644 (file)
index 0000000..d6130e8
Binary files /dev/null and b/data/images/icon_22.png differ

diff --git a/data/images/icon_23.png b/data/images/icon_23.png
new file mode 100644 (file)
index 0000000..27f5457
Binary files /dev/null and b/data/images/icon_23.png differ

diff --git a/data/themes/default.edc b/data/themes/default.edc
index a7b8c29b432dac3068dde891cf8feba9b99853bd..4c9ed60b7dfb1a48488b91bc8a9b9d05f4395bb0 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -568,6 +568,49 @@ collections {
       }
    }
 
+   group { name: "elm/label/base/marker";
+      styles
+       {
+          style { name: "textblock_style2";
+             base: "font=Sans:style=Bold font_size=14 align=center color=#fff wrap=word";
+
+             tag:  "br" "\n";
+             tag:  "hilight" "+ color=#ffff";
+             tag:  "b" "+ color=#ffff";
+             tag:  "tab" "\t";
+          }
+       }
+      parts {
+        part { name: "elm.text";
+           type: TEXTBLOCK;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              text {
+                 style: "textblock_style2";
+                 min: 1 1;
+              }
+           }
+        }
+      }
+   }
+
+   group { name: "elm/label/base_wrap/marker";
+      parts {
+        part { name: "elm.text";
+           type: TEXTBLOCK;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              text {
+                 style: "textblock_style2";
+                 min: 0 1;
+              }
+           }
+        }
+      }
+   }
+
 ///////////////////////////////////////////////////////////////////////////////
 
    group { name: "elm/button/base/default";

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 3425f7afb267eaf92ba630f9f1949c5d823c2464..33406aa8bc520664b3a057a007e94e0201ecd776 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -72,7 +72,8 @@ test_flip.c \
 test_label.c \
 test_conform.c \
 test_multi.c \
-test_floating.c
+test_floating.c \
+test_launcher.c
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
 elementary_test_LDFLAGS =

diff --git a/src/bin/test.c b/src/bin/test.c
index d28cfa7e731557735e9e46bd64a0e567fb59ee0c..a655b0e5317a934ae02091a67ac21948b017ad0b 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -61,6 +61,7 @@ void test_label(void *data, Evas_Object *obj, void *event_info);
 void test_conformant(void *data, Evas_Object *obj, void *event_info);
 void test_multi(void *data, Evas_Object *obj, void *event_info);
 void test_floating(void *data, Evas_Object *obj, void *event_info);
+void test_launcher(void *data, Evas_Object *obj, void *event_info);
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
@@ -204,6 +205,7 @@ my_win_main(void)
    elm_list_item_append(li, "Conformant", NULL, NULL, test_conformant, NULL);
    elm_list_item_append(li, "Multi Touch", NULL, NULL, test_multi, NULL);
    elm_list_item_append(li, "Floating Objects", NULL, NULL, test_floating, NULL);
+   elm_list_item_append(li, "Launcher", NULL, NULL, test_launcher, NULL);
 
    elm_list_go(li);
 

diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c
new file mode 100644 (file)
index 0000000..c23de0a
--- /dev/null
+++ b/src/bin/test_launcher.c
@@ -0,0 +1,103 @@
+#include <Elementary.h>
+#ifndef ELM_LIB_QUICKLAUNCH
+void
+test_launcher(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *sc, *tb, *pad;
+   int i, j, k, n, m;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "launcher", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Launcher");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", PACKAGE_DATA_DIR);
+   elm_bg_file_set(bg, buf, NULL);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   tb = elm_table_add(win);
+   evas_object_size_hint_weight_set(bg, 0.0, 0.0);
+   evas_object_size_hint_align_set(bg, 0.5, 0.5);
+   n = 0; m = 0;
+   for (k = 0 ; k < 5; k++)
+     {
+        pad = evas_object_rectangle_add(evas_object_evas_get(win));
+        evas_object_size_hint_min_set(pad, 470, 4);
+        evas_object_size_hint_weight_set(pad, 0.0, 0.0);
+        evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_table_pack(tb, pad, (k * 7) + 1, 0, 5, 1);
+        
+        pad = evas_object_rectangle_add(evas_object_evas_get(win));
+        evas_object_size_hint_min_set(pad, 470, 4);
+        evas_object_size_hint_weight_set(pad, 0.0, 0.0);
+        evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_table_pack(tb, pad, (k * 7) + 1, 14, 5, 1);
+        
+        pad = evas_object_rectangle_add(evas_object_evas_get(win));
+        evas_object_size_hint_min_set(pad, 4, 4);
+        evas_object_size_hint_weight_set(pad, 0.0, 0.0);
+        evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_table_pack(tb, pad, k * 7, 1, 1, 12);
+        
+        pad = evas_object_rectangle_add(evas_object_evas_get(win));
+        evas_object_size_hint_min_set(pad, 4, 4);
+        evas_object_size_hint_weight_set(pad, 0.0, 0.0);
+        evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_table_pack(tb, pad, (k * 7) + 6, 1, 1, 12);
+        
+        for (j = 0; j < 6; j++)
+          {
+             for (i = 0; i < 5; i++)
+               {
+                  Evas_Object *ic, *lb;
+                  const char *names[] =
+                    {
+                         "Hello",    "World",    "Things",  "Should", 
+                         "Work",     "Great",    "These",    "Days", 
+                         "Lots",     "Of",       "Labels",   "Make",
+                         "Everyone", "Happy",    "And",      "Calm"
+                    };
+                  
+                  ic = elm_icon_add(win);
+                  snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", PACKAGE_DATA_DIR, n);
+                  elm_icon_file_set(ic, buf, NULL);
+                  elm_icon_scale_set(ic, 0, 0);
+                  evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                  evas_object_size_hint_align_set(ic, 0.5, 0.5);
+                  elm_table_pack(tb, ic, (k * 7) + 1 + i, 1 + (j * 2), 1, 1);
+                  evas_object_show(ic);
+                  
+                  lb = elm_label_add(win);
+                  elm_object_style_set(lb, "marker");
+                  elm_label_label_set(lb, names[m]);
+                  evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                  evas_object_size_hint_align_set(lb, 0.5, 0.5);
+                  elm_table_pack(tb, lb, (k * 7) + 1 + i, 1 + (j * 2) + 1, 1, 1);
+                  evas_object_show(lb);
+                  
+                  n++; if (n > 23) n = 0;
+                  m++; if (m > 15) m = 0;
+               }
+          }
+     }
+   
+   sc = elm_scroller_add(win);
+   elm_scroller_bounce_set(sc, 1, 0);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, sc);
+   
+   elm_scroller_content_set(sc, tb);
+   evas_object_show(tb);
+   
+   elm_scroller_page_relative_set(sc, 1.0, 1.0);
+   // elm_scroller_page_size_set(sc, 200, 200);
+   evas_object_show(sc);
+
+   evas_object_resize(win, 480, 800);
+   evas_object_show(win);
+}
+#endif

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 309f68c72c69c8050066d9e4a0386760f0e9d6b4..a07c17ec9a0244d6b7c559480d3a4493f86effa8 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -431,6 +431,10 @@ extern "C" {
    EAPI void         elm_label_label_set(Evas_Object *obj, const char *label);
    EAPI const char  *elm_label_label_get(Evas_Object *obj);
    EAPI void         elm_label_line_wrap_set(Evas_Object *obj, Eina_Bool wrap);
+   /* available styles:
+    * default
+    * marker
+    */
    /* smart callbacks called:
     */