Elementary: conformant preview and diagram

SVN revision: 61574

legacy/elementary/doc/Makefile.am

@@ -43,6 +43,7 @@ widget_preview_fileselector_button2 \
 widget_preview_fileselector_button3 \
 widget_preview_colorselector \
 widget_preview_layout \
+widget_preview_conformant \
 widget_preview_index \
 widget_preview_clock \
 widget_preview_label \
@@ -86,6 +87,7 @@ WGT_PREVIEW = \
 	bubble:preview-02.png:widget_preview_bubble3:160:50 \
 	colorselector:preview-00.png:widget_preview_colorselector:160:200 \
 	layout:preview-00.png:widget_preview_layout:200:160 \
+	conformant:preview-00.png:widget_preview_conformant:200:400 \
 	index:preview-00.png:widget_preview_index:300:500 \
 	frame:preview-00.png:widget_preview_frame:100:50 \
 	label:preview-00.png:widget_preview_label:70:30 \

legacy/elementary/doc/index.doxy

@@ -66,6 +66,11 @@
  * @image html img/widget/clock/preview-00.png
  * @image latex img/widget/clock/preview-00.eps
  * @li @ref Conformant
+ *
+ * @image html img/widget/conformant/preview-00.png
+ * @image latex img/widget/conformant/preview-00.eps
+ * @image html img/conformant.png
+ * @image latex img/conformant.eps
  * @li @ref Colorselector
  *
  * @image html img/widget/colorselector/preview-00.png

legacy/elementary/doc/shot.sh

@@ -8,6 +8,9 @@ shift
 export ELM_THEME=default
 export ELM_SCALE=1.0
 export ELM_ENGINE=shot:delay=0.5:file=$DIR/$FILE
+export ILLUME_KBD=0,0,240,123
+export ILLUME_IND=0,0,240,32
+export ILLUME_STK=0,288,240,32
 
 mkdir -p $DIR || true
 

legacy/elementary/doc/widget_preview_conformant.c

@@ -0,0 +1,42 @@
+#include "widget_preview_tmpl_head.c"
+
+evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+Evas_Object *conform = elm_conformant_add(win);
+elm_win_resize_object_add(win, conform);
+evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+evas_object_show(conform);
+
+Evas_Object *bx = elm_box_add(win);
+evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+evas_object_show(bx);
+
+Evas_Object *btn = elm_button_add(win);
+elm_object_text_set(btn, "Conformant");
+evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0);
+evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0);
+evas_object_show(btn);
+elm_box_pack_end(bx, btn);
+
+Evas_Object *en = elm_entry_add(win);
+elm_entry_scrollable_set(en, EINA_TRUE);
+elm_entry_entry_set(en,
+                    "This is a multi-line entry<br>"
+                    "This can contain more than 1 line of text and be "
+                    "scrolled around to allow for entering of lots of "
+                    "content. It is also to test to see that autoscroll "
+                    "moves to the right part of a larger multi-line "
+                    "text entry that is inside of a scroller than can be "
+                    "scrolled around, thus changing the expected position "
+                    "as well as cursor changes updating auto-scroll when "
+                    "it is enabled.");
+
+evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
+evas_object_show(en);
+elm_box_pack_end(bx, en);
+
+elm_conformant_content_set(conform, bx);
+
+#include "widget_preview_tmpl_foot.c"

legacy/elementary/src/lib/Elementary.h.in

@@ -9997,6 +9997,12 @@ extern "C" {
     * @defgroup Conformant Conformant
     * @ingroup Elementary
     *
+    * @image html img/widget/conformant/preview-00.png
+    * @image latex img/widget/conformant/preview-00.eps width=\textwidth
+    *
+    * @image html img/conformant.png
+    * @image latex img/conformant.eps width=\textwidth
+    *
     * The aim is to provide a widget that can be used in elementary apps to
     * account for space taken up by the indicator, virtual keypad & softkey
     * windows when running the illume2 module of E17.