add zibase management into calaos

.gitignore

@@ -73,3 +73,6 @@ po/insert-header.sin
 po/quot.sed
 po/remove-potcdate.sin
 po/stamp-po
+src/bin/tools/calaos_config
+src/bin/tools/wago_test
+src/bin/tools/calaos_thumb

INSTALL

@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -309,10 +309,9 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -368,3 +367,4 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
+

configure.ac

@@ -40,6 +40,7 @@ AC_CANONICAL_HOST
 ### Checks for programs
 AC_PROG_CXX
 AC_PROG_CC
+AM_PROG_CC_C_O
 AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
 
 # pkg-config
@@ -49,15 +50,45 @@ PKG_PROG_PKG_CONFIG
 
 efl_ver="1.7.0"
 
-requirements_calaos_common="eina >= ${efl_ver} eet >= ${efl_ver} ecore >= ${efl_ver} ecore-file >= ${efl_ver} ecore-con >= ${efl_ver} sigc++-2.0 >= 2.2.0 log4cpp >= 1.0 jansson >= 2.0.0 vmime >= 0.9.0 lua5.1 >= 5.1.0"
+requirements_calaos_common="eina >= ${efl_ver} eet >= ${efl_ver} ecore >= ${efl_ver} ecore-file >= ${efl_ver} ecore-con >= ${efl_ver} sigc++-2.0 >= 2.2.0 log4cpp >= 1.0 jansson >= 2.4 vmime >= 0.9.0"
 PKG_CHECK_MODULES([CALAOS_COMMON], [${requirements_calaos_common}])
 AC_SUBST([requirements_calaos_common])
 
+# Check for LUA
+# Lua pkg-config hack for different naming conventions
+have_lua="yes"
+requirement_lua=""
+lua_libs=""
+PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.0], requirement_lua="lua5.1",
+   [PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1.0], requirement_lua="lua-5.1",
+      [PKG_CHECK_MODULES([LUA], [lua51 >= 5.1.0], requirement_lua="lua51",
+         [PKG_CHECK_MODULES([LUA], [lua >= 5.1.0], requirement_lua="lua",
+            [have_lua="no"])])])])
+
+if test "x${have_lua}" = "xno" ; then
+   AC_MSG_CHECKING([whether lua_newstate() is in liblua])
+   AC_CHECK_LIB([lua], [lua_newstate],
+      [
+       have_lua="yes"
+       lua_libs="-llua"
+      ],
+      [have_lua="no"])
+   AC_MSG_RESULT([${have_lua}])
+fi
+AC_SUBST(lua_libs)
+
+if test "x${have_lua}" = "xno" ; then
+   AC_MSG_ERROR([Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly])
+fi
+
 requirements_calaos_server="eina >= ${efl_ver} eet >= ${efl_ver} ecore >= ${efl_ver} ecore-file >= ${efl_ver} ecore-con >= ${efl_ver} libcurl"
 PKG_CHECK_MODULES([CALAOS_SERVER], [${requirements_calaos_server}])
 AC_SUBST([requirements_calaos_server])
 
-requirements_calaos_home="eina >= ${efl_ver} eet >= ${efl_ver} ecore >= ${efl_ver} ecore-file >= ${efl_ver} ecore-con >= ${efl_ver} elementary >= ${efl_ver} ecore-x >= ${efl_ver} openssl >= 1.0.0 libcurl x11 xext"
+CALAOS_COMMON_LIBS="${CALAOS_COMMON_LIBS} ${LUA_LIBS} ${lua_libs}"
+CALAOS_COMMON_CFLAGS="${CALAOS_COMMON_CFLAGS} ${LUA_CFLAGS}"
+
+requirements_calaos_home="eina >= ${efl_ver} eet >= ${efl_ver} ecore >= ${efl_ver} ecore-file >= ${efl_ver} ecore-con >= ${efl_ver} elementary >= ${efl_ver} openssl >= 1.0.0 libcurl"
 PKG_CHECK_MODULES([CALAOS_HOME], [${requirements_calaos_home}], [have_calaos_home_dep="yes"], [have_calaos_home_dep="no"])
 AM_CONDITIONAL([HAVE_CALAOS_HOME_BIN], [test "x${have_calaos_home_dep}" = "xyes"])
 
@@ -119,13 +150,23 @@ then
      AC_DEFINE([HAVE_EWEBKIT], [1], [ewebkit])
 fi
 
+have_ecore_x="no"
+PKG_CHECK_MODULES([ECORE_X], [ecore-x x11 xext], [have_ecore_x="yes"], [have_ecore_x="no"])
+AM_CONDITIONAL([HAVE_ECORE_X], [test "x${have_ecore_x}" = "xyes"])
+if test "x${have_ecore_x}" == "xyes"
+then 
+     AC_DEFINE([HAVE_ECORE_X], [1], [ecore_x])
+fi
+
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/lib/Makefile
 src/bin/Makefile
 src/bin/calaos_server/Makefile
 src/bin/calaos_home/Makefile
+src/bin/tools/Makefile
 src/widgets/Makefile
 src/widgets/clock/Makefile
 src/widgets/note/Makefile
@@ -167,4 +208,5 @@ echo " Build theme.......... : $build_theme"
 echo
 echo " One Wire support......: ${have_owcapi}"
 echo " EWebkit support.......: ${have_ewebkit}"
+echo " Ecore_X support.......: ${have_ecore_x}"
 echo

data/themes/default/Makefile.am

@@ -875,7 +875,8 @@ structure/slider.edc				\
 structure/macro_round_button.edc		\
 structure/amplifier_control.edc			\
 structure/images.edc \
-elm/elm_genlist_widget.edc
+elm/elm_genlist_widget.edc \
+structure/screen_suspend.edc
 
 FONT = \
 fonts/calaos_logo.ttf				\

data/themes/default/calaos_theme.edc

@@ -160,4 +160,6 @@ collections
         #include "elm/elm_gengrid_item_config.edc"
 
         #include "structure/paging_view.edc"
+
+        #include "structure/screen_suspend.edc"
 }

data/themes/default/structure/activity_loading.edc

@@ -82,7 +82,7 @@ part
         {
                 state, "default" 0.0;
                 visible: 1;
-                text { text: "Chargement..."; font: "CalaosContentBold"; size: 20; min: 0 0; align: 0.5 0.65; }
+                text { text: "Loading..."; font: "CalaosContentBold"; size: 20; min: 0 0; align: 0.5 0.65; }
                 color: 95 95 95 255;
         }
 }

data/themes/default/structure/main_menu.edc

@@ -588,11 +588,11 @@ group
                         }
                 }
 
-                MENU_BUTTON("home", "Ma maison", 0.5, 1.0, -284, -94,
+                MENU_BUTTON("home", "My Home", 0.5, 1.0, -284, -94,
                                                  0.5, 1.0, -143, -1)
                 MENU_BUTTON("media", "Medias", 0.5, 1.0, -142, -94,
                                                0.5, 1.0, -1, -1)
-                MENU_BUTTON("scenarios", "Scénarios", 0.5, 1.0, 0, -94,
+                MENU_BUTTON("scenarios", "Scenarios", 0.5, 1.0, 0, -94,
                                                       0.5, 1.0, 141, -1)
                 MENU_BUTTON("configuration", "Configuration", 0.5, 1.0, 142, -94,
                                                               0.5, 1.0, 283, -1)

data/themes/default/structure/page_audio_list.edc

@@ -1193,7 +1193,7 @@ group
                 ELEMENT_ACTION_BUTTON_NORMAL("stop_button", "player_buttons", "player_buttons", "player_buttons", "button_action_stop.png", "button_action_glow.png", "player", "player,stop", 0.0, 0.5, 74, -14, 0.0, 0.5, 107, 13)
                 ELEMENT_ACTION_BUTTON_NORMAL("next_button", "player_buttons", "player_buttons", "player_buttons", "button_action_next.png", "button_action_glow.png", "player", "player,next", 0.0, 0.5, 111, -14, 0.0, 0.5, 144, 13)
 
-                HORIZ_SLIDER("player.time.slider", "time_slider_whole", "message.text", "Avancement :", "player.time", "00:00", 50, 180, 215, "slider.png", "slider_on.png", "slider_border.png", "player", "player,time,change", "local", "slider,timer,inactive", "local", "slider,timer,active")
+                HORIZ_SLIDER("player.time.slider", "time_slider_whole", "message.text", "Avancement2 :", "player.time", "00:00", 50, 180, 215, "slider.png", "slider_on.png", "slider_border.png", "player", "player,time,change", "local", "slider,timer,inactive", "local", "slider,timer,active")
 
                 #include "activity_loading.edc"
         }

data/themes/default/structure/page_media.edc

@@ -522,12 +522,12 @@ group { \
         } \
 }
 
-MEDIA_MENU_ITEM("calaos/icons/menu/media/music", "calaos/icons/media/music", "Votre Musique", "Accédez à toute votre discothèque", "click,music", "menu")
-MEDIA_MENU_ITEM("calaos/icons/menu/media/camera", "calaos/icons/media/camera", "Vidéosurveillance", "Pilotez toutes vos caméras", "click,camera", "menu")
-MEDIA_MENU_ITEM("calaos/icons/menu/media/photos", "calaos/icons/media/flickr", "Flickr", "Visualisez des photos", "click,photos", "menu")
+MEDIA_MENU_ITEM("calaos/icons/menu/media/music", "calaos/icons/media/music", "Your Music", "Access you media library", "click,music", "menu")
+MEDIA_MENU_ITEM("calaos/icons/menu/media/camera", "calaos/icons/media/camera", "CCTV", "Drive all you cctv cameras", "click,camera", "menu")
+MEDIA_MENU_ITEM("calaos/icons/menu/media/photos", "calaos/icons/media/flickr", "Flickr", "Look at pictures", "click,photos", "menu")
 
-MEDIA_MENU_ITEM("calaos/icons/menu/media/web", "calaos/icons/media/web", "Internet", "Accédez et surfez sur le web", "click,web", "menu")
-MEDIA_MENU_ITEM("calaos/icons/menu/media/eskiss", "calaos/icons/media/eskiss", "Eskiss", "Jouez avec la physique !", "click,eskiss", "menu")
+MEDIA_MENU_ITEM("calaos/icons/menu/media/web", "calaos/icons/media/web", "Internet", "Go and surf the web", "click,web", "menu")
+MEDIA_MENU_ITEM("calaos/icons/menu/media/eskiss", "calaos/icons/media/eskiss", "Eskiss", "Play with physics !", "click,eskiss", "menu")
 
 group
 {

data/themes/default/structure/player.edc

@@ -1207,7 +1207,7 @@ part {
     rel1.to: "player_artist_label";
     rel2.to: "player_artist_label";
     color: 231 231 231 140;
-    text { text: "Artiste :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
+    text { text: "Artist :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
   }
   description {
     state: "active" 0.0;
@@ -1282,7 +1282,7 @@ part {
     rel1.to: "player_title_label";
     rel2.to: "player_title_label";
     color: 231 231 231 140;
-    text { text: "Piste :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
+    text { text: "Track :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
   }
   description {
     state: "active" 0.0;
@@ -1320,7 +1320,7 @@ part {
     rel1.to: "player_year_label";
     rel2.to: "player_year_label";
     color: 231 231 231 140;
-    text { text: "Année :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
+    text { text: "Year :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
   }
   description {
     state: "active" 0.0;
@@ -1364,7 +1364,7 @@ part {
     rel1.to: "player_duration_label";
     rel2.to: "player_duration_label";
     color: 231 231 231 140;
-    text { text: "Durée :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
+    text { text: "Duration :"; font: "CalaosContent"; size: 12; min: 0 0; align: 1.0 0.5;}
   }
   description {
     state: "active" 0.0;
@@ -1409,7 +1409,7 @@ ELEMENT_ACTION_BUTTON_NORMAL("volume_more", "player_button_volume_more", "player
 ELEMENT_ACTION_BUTTON_NORMAL("volume_less", "player_button_volume_less", "player_button_volume_less", "player_button_volume_less", "button_action_less_vertical.png", "button_action_vertical_glow.png", "player", "player,volume,moins", 0.5, 0.5, -14, -17, 0.5, 0.5, 13, 16)
 ELEMENT_ACTION_BUTTON_NORMAL("amplifier", "player_button_amp", "player_button_amp", "player_button_amp", "button_info.png", "button_info_glow.png", "player", "player,amplifier", 0.0, 0.0, 0, 0, 1.0, 1.0, -1, -1)
 
-HORIZ_SLIDER("player.time.slider", "time_slider_whole", "message.text", "Avancement :", "player.time", "00:00", 50, 180, 215, "slider.png", "slider_on.png", "slider_border.png", "player", "player,time,change", "local", "slider,timer,inactive", "local", "slider,timer,active")
+HORIZ_SLIDER("player.time.slider", "time_slider_whole", "message.text", "Position :", "player.time", "00:00", 50, 180, 215, "slider.png", "slider_on.png", "slider_border.png", "player", "player,time,change", "local", "slider,timer,inactive", "local", "slider,timer,active")
 VERTI_SLIDER("player.volume.slider", "volume_slider_whole", 50, 180, 215, "slider_vertical.png", "slider_vertical_on.png", "slider_border.png", "player", "player,volume,change", "local", "slider,volume,inactive", "local", "slider,volume,active")
 // End macros
 

data/themes/default/structure/screen_suspend.edc

@@ -0,0 +1,115 @@
+//Calaos Home Theme
+//Copyright 2014 Calaos Team
+
+group
+{
+        name: "calaos/screen_suspend";
+
+        parts
+        {
+                part
+                {
+                        name: "whole";
+                        type: RECT;
+                        description
+                        {
+                                state: "default" 0.0;
+                                visible: 0;
+                        }
+                        description
+                        {
+                                state: "deactivate" 0.0;
+                                visible: 1;
+                                color: 0 0 0 0;
+                        }
+                }
+
+                part
+                {
+                        name: "background";
+                        type: RECT;
+                        repeat_events: 1;
+                        description
+                        {
+                                state: "default" 0.0;
+                                visible: 1;
+                                color: 0 0 0 0;
+                        }
+                        description
+                        {
+                                state: "suspend" 0.0;
+                                visible: 1;
+                                color: 0 0 0 255;
+                        }
+                }
+        }
+
+        programs
+        {
+                program
+                {
+                        signal: "event,repeat,deactivate";
+                        source: "calaos";
+                        action: STATE_SET "deactivate" 0.0;
+                        target: "whole";
+                }
+                program
+                {
+                        signal: "event,repeat,activate";
+                        source: "calaos";
+                        action: STATE_SET "default" 0.0;
+                        target: "whole";
+                }
+
+                program
+                {
+                        name: "start_suspend";
+                        signal: "start,suspend";
+                        source: "calaos";
+                        action: STATE_SET "suspend" 0.0;
+                        target: "background";
+                        transition: DECELERATE 3.0;
+                        after: "end_suspend";
+                }
+
+                program
+                {
+                        name: "end_suspend";
+                        action: SIGNAL_EMIT "end,suspend" "object";
+                }
+
+                program
+                {
+                        name: "start_wakeup";
+                        signal: "start,wakeup";
+                        source: "calaos";
+                        action: STATE_SET "default" 0.0;
+                        target: "background";
+                        transition: ACCELERATE 1.5;
+                        after: "end_wakeup";
+                }
+
+                program
+                {
+                        name: "now_wakeup";
+                        signal: "now,wakeup";
+                        source: "calaos";
+                        action: STATE_SET "default" 0.0;
+                        target: "background";
+                }
+
+                program
+                {
+                        name: "end_wakeup";
+                        action: SIGNAL_EMIT "end,wakeup" "object";
+                }
+
+                program
+                {
+                        signal: "start,suspend,stop";
+                        source: "calaos";
+                        action: ACTION_STOP;
+                        target: "start_suspend";
+                }
+        }
+}

debian/control

@@ -3,17 +3,18 @@ Section:  miscellaneous
 Priority: optional
 Maintainer: Michael Bouchaud (yoz) <yoz@fl.so>
 Build-Depends: debhelper (>= 6), cdbs, libtool, pkg-config,
- libelementary-dev, libecore-dev, libedje-dev, libefreet-dev,
- libvmime-dev, libjansson-dev, liblog4cpp5-dev, libsigc++-2.0-dev,
- gettext, libow-dev, libssl-dev, autoconf, automake, autopoint
+ libelementary-dev, libefl-dev | libecore-dev, libefl-dev | libedje-dev,
+ libefl-dev | libefreet-dev, libvmime-dev, libjansson-dev, liblog4cpp5-dev,
+ libsigc++-2.0-dev, gettext, libow-dev, libssl-dev, autoconf, automake,
+ autopoint
 Standards-Version: 3.8.2
 Vcs-Git: https://github.com/calaos/calaos_base
 Vcs-Browser: https://github.com/calaos/calaos_base
 Homepage: http://www.calaos.fr
 
 Package: calaos-server
 Architecture: any
-Depends: ${shlibs:Depends}, libecore1, libvmime0,
+Depends: ${shlibs:Depends}, libvmime0,
  libjansson4, liblog4cpp5, libsigc++-2.0-0c2a, libowcapi-2.8-15
 Description: Calaos is a powerful home automation software.
  It features a complete set of part to automate your house
@@ -24,8 +25,7 @@ Description: Calaos is a powerful home automation software.
 
 Package: calaos-home
 Architecture: any
-Depends: ${shlibs:Depends}, libelementary, libvmime0,
- libjansson4, liblog4cpp5, libsigc++-2.0-0c2a
+Depends: ${shlibs:Depends}, libvmime0, libjansson4, liblog4cpp5
 Description: Calaos is a powerful home automation software.
  It features a complete set of part to automate your house
  from lights to shutter or even music or cameras.