new icons, from exalt-client, by rasterman.

SVN revision: 44852

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 5963f61..81aef7c 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -7010,6 +7010,10 @@ collections { /* begin the collection of edje groups that are in this file */
       images {
          image: "connman-disconnect.png" COMP;
          image: "connman-disconnect-offline.png" COMP;
+         image: "connman-connecting-1.png" COMP;
+         image: "connman-connecting-2.png" COMP;
+         image: "connman-connecting-3.png" COMP;
+         image: "connman-connecting-4.png" COMP;
          image: "connman-ethernet.png" COMP;
          image: "connman-wifi-good.png" COMP;
          image: "connman-wifi-medium.png" COMP;
@@ -7084,64 +7088,75 @@ collections { /* begin the collection of edje groups that are in this file */
                color: 255 255 255 255;
             }
             description {
-               state: "pulse" 0.0;
-               color: 255 255 255 128;
+               state: "inverted" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+         }
+         part { name: "state-inverted-clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+            description {
+               state: "inverted" 0.0;
+               color: 255 255 255 255;
+               visible: 1;
             }
          }
          programs {
             program { name: "e,changed,state,ready";
                signal: "e,changed,state,ready";
                source: "e";
-               script {
-                  stop_program(PROGRAM:"state,pulse,0");
-                  stop_program(PROGRAM:"state,pulse,1");
-               }
-               after: "state,ready,apply";
+               action: STATE_SET "default" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
             }
-            program { name: "state,ready,apply";
+            program { name: "e,changed,state,failure";
+               signal: "e,changed,state,failure";
+               source: "e";
                action: STATE_SET "default" 0.0;
                target: "state-clipper";
-               transition: LINEAR 0.1;
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
             }
 
             program { name: "e,changed,state,association";
                signal: "e,changed,state,association";
                source: "e";
-               after: "state,pulse,0";
+               action: STATE_SET "inverted" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting";
             }
             program { name: "e,changed,state,configuration";
                signal: "e,changed,state,configuration";
                source: "e";
-               after: "state,pulse,0";
+               action: STATE_SET "inverted" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting";
             }
 
-            program { name: "e,changed,state,failure";
-               signal: "e,changed,state,failure";
-               source: "e";
-               script {
-                  stop_program(PROGRAM:"state,pulse,0");
-                  stop_program(PROGRAM:"state,pulse,1");
-               }
-               after: "state,failure,apply";
+            program { name: "state-connecting-stop";
+               action: ACTION_STOP;
+               target: "state-connecting";
+               after: "state-connecting-stop2";
             }
-            program { name: "state,failure,apply";
+            program { name: "state-connecting-stop2";
                action: STATE_SET "default" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.1;
-               // TODO: something else to notify failure?
+               target: "connecting";
             }
 
-            program { name: "state,pulse,0";
-               action: STATE_SET "default" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.8;
-               after: "state,pulse,1";
-            }
-            program { name: "state,pulse,1";
-               action: STATE_SET "pulse" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.8;
-               after: "state,pulse,0";
+            program { name: "state-connecting";
+               action: STATE_SET "connecting" 0.0;
+               target: "connecting";
+               transition: LINEAR 0.5333;
+               after: "state-connecting";
             }
          }
 
@@ -7176,6 +7191,26 @@ collections { /* begin the collection of edje groups that are in this file */
             }
          }
 
+         part { name: "connecting";
+            type: IMAGE;
+            mouse_events: 0;
+            clip_to: "state-inverted-clipper";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               fixed: 1 1;
+               image.normal: "connman-disconnect.png";
+            }
+            description { state: "connecting" 0.0;
+               inherit: "default" 0.0;
+               image.tween: "connman-connecting-1.png";
+               image.tween: "connman-connecting-2.png";
+               image.tween: "connman-connecting-3.png";
+               image.normal: "connman-connecting-4.png";
+            }
+         }
+
          part { name: "ethernet-visibility";
             type: RECT;
             mouse_events: 0;
@@ -7371,6 +7406,10 @@ collections { /* begin the collection of edje groups that are in this file */
          image: "inset_sunk.png" COMP;
          image: "connman-disconnect.png" COMP;
          image: "connman-disconnect-offline.png" COMP;
+         image: "connman-connecting-1.png" COMP;
+         image: "connman-connecting-2.png" COMP;
+         image: "connman-connecting-3.png" COMP;
+         image: "connman-connecting-4.png" COMP;
          image: "connman-ethernet.png" COMP;
          image: "connman-wifi.png" COMP;
       }
@@ -7413,64 +7452,75 @@ collections { /* begin the collection of edje groups that are in this file */
                color: 255 255 255 255;
             }
             description {
-               state: "pulse" 0.0;
-               color: 255 255 255 128;
+               state: "inverted" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+         }
+         part { name: "state-inverted-clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+            description {
+               state: "inverted" 0.0;
+               color: 255 255 255 255;
+               visible: 1;
             }
          }
          programs {
             program { name: "e,changed,state,ready";
                signal: "e,changed,state,ready";
                source: "e";
-               script {
-                  stop_program(PROGRAM:"state,pulse,0");
-                  stop_program(PROGRAM:"state,pulse,1");
-               }
-               after: "state,ready,apply";
+               action: STATE_SET "default" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
             }
-            program { name: "state,ready,apply";
+            program { name: "e,changed,state,failure";
+               signal: "e,changed,state,failure";
+               source: "e";
                action: STATE_SET "default" 0.0;
                target: "state-clipper";
-               transition: LINEAR 0.1;
+               target: "state-inverted-clipper";
+               after: "state-connecting-stop";
             }
 
             program { name: "e,changed,state,association";
                signal: "e,changed,state,association";
                source: "e";
-               after: "state,pulse,0";
+               action: STATE_SET "inverted" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting";
             }
             program { name: "e,changed,state,configuration";
                signal: "e,changed,state,configuration";
                source: "e";
-               after: "state,pulse,0";
+               action: STATE_SET "inverted" 0.0;
+               target: "state-clipper";
+               target: "state-inverted-clipper";
+               after: "state-connecting";
             }
 
-            program { name: "e,changed,state,failure";
-               signal: "e,changed,state,failure";
-               source: "e";
-               script {
-                  stop_program(PROGRAM:"state,pulse,0");
-                  stop_program(PROGRAM:"state,pulse,1");
-               }
-               after: "state,failure,apply";
+            program { name: "state-connecting-stop";
+               action: ACTION_STOP;
+               target: "state-connecting";
+               after: "state-connecting-stop2";
             }
-            program { name: "state,failure,apply";
+            program { name: "state-connecting-stop2";
                action: STATE_SET "default" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.1;
-               // TODO: something else to notify failure?
+               target: "connecting";
             }
 
-            program { name: "state,pulse,0";
-               action: STATE_SET "default" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.8;
-               after: "state,pulse,1";
-            }
-            program { name: "state,pulse,1";
-               action: STATE_SET "pulse" 0.0;
-               target: "state-clipper";
-               transition: LINEAR 0.8;
-               after: "state,pulse,0";
+            program { name: "state-connecting";
+               action: STATE_SET "connecting" 0.0;
+               target: "connecting";
+               transition: LINEAR 0.5333;
+               after: "state-connecting";
             }
          }
 
@@ -7534,6 +7584,28 @@ collections { /* begin the collection of edje groups that are in this file */
             }
          }
 
+         part { name: "connecting";
+            type: IMAGE;
+            mouse_events: 0;
+            clip_to: "state-inverted-clipper";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               fixed: 1 1;
+               image.normal: "connman-disconnect.png";
+               rel1.to: "technology";
+               rel2.to: "technology";
+            }
+            description { state: "connecting" 0.0;
+               inherit: "default" 0.0;
+               image.tween: "connman-connecting-1.png";
+               image.tween: "connman-connecting-2.png";
+               image.tween: "connman-connecting-3.png";
+               image.normal: "connman-connecting-4.png";
+            }
+         }
+
          part { name: "ethernet-visibility";
             type: RECT;
             mouse_events: 0;

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

diff --git a/data/themes/images/connman-connecting-2.png b/data/themes/images/connman-connecting-2.png
new file mode 100644 (file)
index 0000000..ee32df3
Binary files /dev/null and b/data/themes/images/connman-connecting-2.png differ

diff --git a/data/themes/images/connman-connecting-3.png b/data/themes/images/connman-connecting-3.png
new file mode 100644 (file)
index 0000000..1c8cae2
Binary files /dev/null and b/data/themes/images/connman-connecting-3.png differ

diff --git a/data/themes/images/connman-connecting-4.png b/data/themes/images/connman-connecting-4.png
new file mode 100644 (file)
index 0000000..f4d9d9f
Binary files /dev/null and b/data/themes/images/connman-connecting-4.png differ

diff --git a/src/modules/connman/e-module-connman.edj b/src/modules/connman/e-module-connman.edj
index dbe735f..923d477 100644 (file)
Binary files a/src/modules/connman/e-module-connman.edj and b/src/modules/connman/e-module-connman.edj differ