More work on the scheduling of scenarios

calaos · Mar 13, 2013 · d74c0ed · d74c0ed
1 parent 596b48b
commit d74c0ed
Show file tree

Hide file tree

Showing 7 changed files with 456 additions and 5 deletions.
diff --git a/data/themes/default/elm/elm_genlist_item_simple.edc b/data/themes/default/elm/elm_genlist_item_simple.edc
@@ -486,6 +486,115 @@ group
         }
 }
 
+group
+{
+        name: "elm/genlist/item/simple_header/navigation/default";
+        alias: "elm/genlist/item_compress/simple_header/navigation/default";
+
+        data.item: "selectraise" "on";
+        data.item: "texts" "elm.text";
+        data.item: "contents" "button.valid button.back";
+
+        parts
+        {
+                part
+                {
+                        name: "item_back";
+                        type: RECT;
+                        description
+                        {
+                                state: "default" 0.0;
+                                min: 50 82;
+                                fixed: 0 0;
+                                color: 255 255 255 0;
+                        }
+                }
+                part
+                {
+                        name: "bg";
+                        mouse_events: 0;
+                        description
+                        {
+                                state: "default" 0.0;
+                                image.normal: "popup_carbon.png";
+                                fill { smooth: 1; size { relative: 0.0 0.0; offset: 8 8;} }
+                                rel1 { relative: 0.0 0.0; offset: 0 0; };
+                                rel2 { relative: 1.0 1.0; offset: -1 -1; };
+                        }
+                }
+
+                part
+                {
+                        name: "button.back";
+                        type: SWALLOW;
+                        description
+                        {
+                                state: "default" 0.0;
+                                rel1 { relative: 0.0 0.0; offset: 7    7; }
+                                rel2 { relative: 0.0 0.0; offset: 7+76 7+31; }
+                        }
+                        description
+                        {
+                                state: "hidden" 0.0;
+                                inherit: "default" 0.0;
+                                visible: 0;
+                        }
+                }
+
+                part
+                {
+                        name: "button.valid";
+                        type: SWALLOW;
+                        description
+                        {
+                                state: "default" 0.0;
+                                rel1 { relative: 1.0 0.0; offset: -7-36 7; }
+                                rel2 { relative: 1.0 0.0; offset: -7    7+31; }
+                        }
+                        description
+                        {
+                                state: "hidden" 0.0;
+                                inherit: "default" 0.0;
+                                visible: 0;
+                        }
+                }
+
+                part
+                {
+                        name: "elm.text";
+                        type: TEXTBLOCK;
+                        description
+                        {
+                                state: "default" 0.0;
+                                fixed: 1 1;
+                                rel1 { relative: 0.0 0.0; offset: 10  4; }
+                                rel2 { relative: 1.0 1.0; offset: -5 -4; }
+                                rel1 { relative: 0.0  1.0; offset:  10  7; to_y: "button.back"; }
+                                rel2 { relative: 1.0  1.0; offset: -5  -4; }
+                                text { align: 0.0 1.0; style: "TabWidgetTitle"; text: "Titre de <light_blue>l'item</light_blue><br><small>Sous titre</small>"; }
+                        }
+                }
+
+                part
+                {
+                        name: "sep";
+                        type: RECT;
+                        description
+                        {
+                                state: "default" 0.0;
+                                fixed: 1 1;
+                                color: 255 255 255 28;
+                                rel1 { relative: 0.0  1.0; offset:  0  -2; }
+                                rel2 { relative: 1.0  1.0; offset: -1  -1; }
+                        }
+                }
+        }
+
+        programs
+        {
+        }
+}
+
 group
 {
         name: "elm/genlist/item/simple_info/default";

diff --git a/data/themes/default/structure/popup_actions_pages.edc b/data/themes/default/structure/popup_actions_pages.edc
@@ -38,6 +38,12 @@ group
                                         string: "label" "Actions";
                                 }
                         }
+                        description
+                        {
+                                state: "hidden" 0.0;
+                                inherit: "default" 0.0;
+                                visible: 0;
+                        }
                 }
 
                 part
@@ -56,6 +62,12 @@ group
                                         string: "icon" "calaos/icons/action_button/popup/valid";
                                 }
                         }
+                        description
+                        {
+                                state: "hidden" 0.0;
+                                inherit: "default" 0.0;
+                                visible: 0;
+                        }
                 }
 
                 part
@@ -85,6 +97,27 @@ group
                         }
                 }
         }
+
+        programs
+        {
+                program
+                {
+                        name: "hide_back";
+                        signal: "hide,back";
+                        source: "calaos";
+                        action: STATE_SET "hidden" 0.0;
+                        target: "button.back";
+                }
+
+                program
+                {
+                        name: "hide_valid";
+                        signal: "hide,valid";
+                        source: "calaos";
+                        action: STATE_SET "hidden" 0.0;
+                        target: "button.valid";
+                }
+        }
 }
 
 group

diff --git a/src/bin/calaos_home/controllers/ActivityScheduleScenarioController.cpp b/src/bin/calaos_home/controllers/ActivityScheduleScenarioController.cpp
@@ -39,11 +39,13 @@ void ActivityScheduleScenarioController::createView()
         ActivityScheduleScenarioView *scView = dynamic_cast<ActivityScheduleScenarioView *>(view);
         if (scenario->isScheduled())
         {
-                scView->setTimeRangeInfos(scenario->ioScenario->range_infos);
+                scView->setTimeRangeInfos(scenario->ioScenario->range_infos, (scenario->scenario_data.params["cycle"] == "true"));
                 scView->buttonValidPressed.connect(sigc::mem_fun(*this, &ActivityScheduleScenarioController::validModifySchedule));
         }
         else
         {
+                scenario->ioScenario->range_infos = TimeRangeInfos(); //clear if needed
+                scView->setTimeRangeInfos(scenario->ioScenario->range_infos, (scenario->scenario_data.params["cycle"] == "true"));
                 scView->buttonValidPressed.connect(sigc::mem_fun(*this, &ActivityScheduleScenarioController::validAddSchedule));
         }
 }