theme - packagekit - make theme match default for module

legacy/elementary/data/themes/Makefile.am

@@ -385,6 +385,9 @@ img/icon_prev.png \
 img/icon_refresh.png \
 img/icon_rewind_mono.png \
 img/icon_rewind.png \
+img/icon_spanner.png  \
+img/icon_splat.png \
+img/icon_splat_half.png \
 img/icon_stop_mono.png \
 img/icon_stop.png \
 img/icon_system-lock-screen.png \
@@ -402,6 +405,7 @@ img/icon_wallpaper_pan.png \
 img/icon_wallpaper_stretch.png \
 img/icon_wallpaper_tile.png \
 img/icon_wallpaper_within.png \
+img/icon_warning.png \
 img/ic_win_move.png \
 img/ic_win_resize.png \
 img/img_example_1.png \
@@ -484,18 +488,6 @@ img/mini_box_glow.png \
 img/music_control_icon.png \
 img/outline_glow.png \
 img/packagekit_base.png \
-img/packagekit_info_bugfix.png \
-img/packagekit_info_enhancement.png \
-img/packagekit_info_important.png \
-img/packagekit_info_low.png \
-img/packagekit_info_normal.png \
-img/packagekit_info_security.png \
-img/packagekit_work1.png \
-img/packagekit_work2.png \
-img/packagekit_work3.png \
-img/packagekit_work4.png \
-img/packagekit_updated.png \
-img/packagekit_error.png \
 img/pointer_entry_bar.png \
 img/pointer_glow.png \
 img/pointer_mono.png \

legacy/elementary/data/themes/edc/packagekit.edc

@@ -1,29 +1,10 @@
-
-images {
-   image: "packagekit_base.png" COMP;
-   image: "packagekit_info_bugfix.png" COMP;
-   image: "packagekit_info_enhancement.png" COMP;
-   image: "packagekit_info_important.png" COMP;
-   image: "packagekit_info_low.png" COMP;
-   image: "packagekit_info_normal.png" COMP;
-   image: "packagekit_info_security.png" COMP;
-   image: "packagekit_work1.png" COMP;
-   image: "packagekit_work2.png" COMP;
-   image: "packagekit_work3.png" COMP;
-   image: "packagekit_work4.png" COMP;
-   image: "packagekit_updated.png" COMP;
-   image: "packagekit_error.png" COMP;
-}
-
 group { name: "icon";
    max: 24 24;
+   images.image: "packagekit_base.png" COMP;
    parts {
-      part { name: "image";
-         type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "packagekit_base.png";
          }
       }
@@ -31,94 +12,94 @@ group { name: "icon";
 }
 
 group { name: "e/modules/packagekit/icon/bugfix";
+   images.image: "icon_spanner.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image";  mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_bugfix.png";
+            image.normal: "icon_spanner.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/enhancement";
+   images.image: "icon_arrow_up.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_enhancement.png";
+            image.normal: "icon_arrow_up.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/important";
+   images.image: "icon_warning.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_important.png";
+            image.normal: "icon_warning.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/low";
+   images.image: "icon_splat_half.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_low.png";
+            image.normal: "icon_splat_half.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/normal";
+   images.image: "icon_splat.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_normal.png";
+            image.normal: "icon_splat.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/security";
+   images.image: "icon_system-lock-screen.png" COMP;
    parts {
-      part { name: "image"; type: IMAGE;
-         mouse_events: 0;
+      part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "packagekit_info_security.png";
+            image.normal: "icon_system-lock-screen.png";
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/main";
-   max: 128 128;
+   max: 160 160;
+   images.image: "packagekit_base.png" COMP;
+   images.image: "icon_border_remember.png" COMP;
+   images.image: "glow_exclam.png" COMP;
+   images.image: "glow_round_corners_small.png" COMP;
+   images.image: "knob_round_small_busy.png" COMP;
    parts {
-      part { name: "base"; type: IMAGE;
+      part { name: "base"; 
          description { state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "packagekit_base.png";
          }
       }
-      part { name: "status"; type: IMAGE;
+      part { name: "status"; 
          description { state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             visible: 0;
+            rel1.relative: (36/160) (60/160);
+            rel2.relative: ((36+88)/160) ((60+88)/160);
          }
          description { state: "running" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
-            image.normal: "packagekit_work1.png";
-            image.tween: "packagekit_work2.png";
-            image.tween: "packagekit_work3.png";
-            image.tween: "packagekit_work4.png";
          }
          description { state: "updates" 0.0;
             inherit: "default" 0.0;
@@ -126,57 +107,138 @@ group { name: "e/modules/packagekit/main";
          description { state: "updated" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            image.normal: "packagekit_updated.png";
+            image.normal: "icon_border_remember.png";
+            max: 16 16;
          }
          description { state: "error" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            image.normal: "packagekit_error.png";
+            image.normal: "glow_exclam.png";
+            max: 16 16;
          }
       }
       part { name: "num_updates"; type: TEXT;
+         scale: 1;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            text {
-               font: FNBD;
-               size: 11;
-               align: 0.5 0.8;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
+            text { font: FNBD; size: 10;
             }
          }
       }
+      part { name: "busy_clip"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "busy" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+            visible: 1;
+         }
+      }
+      part { name: "knob"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "knob_round_small_busy.png";
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            max: 20 20;
+            rel1.relative: (36/160) (60/160);
+            rel2.relative: ((36+88)/160) ((60+88)/160);
+         }
+      }
+      part { name: "knob_spinner"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "knob";
+            rel2.to: "knob";
+            image.normal: "glow_round_corners_small.png";
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "knob";
+         }
+         description { state: "spin" 0.0;
+            inherit: "default" 0.0;
+            map.rotation.z: 360;
+         }
+      }
+      
    }
    programs {
+      program { name: "spin";
+         signal: "e,state,hung"; source: "e";
+         action: STATE_SET "spin" 0.0;
+         transition: LINEAR 1.0;
+         target: "knob_spinner";
+         after: "spin2";
+      }
+      program { name: "spin2";
+         action: STATE_SET "default" 0.0;
+         target: "knob_spinner";
+         after: "spin";
+      }
+      program { name: "busy-on";
+         signal: "e,state,hung"; source: "e";
+         action: STATE_SET "busy" 0.0;
+         transition: SINUSOIDAL 0.25;
+         target: "busy_clip";
+      }
+      program { name: "busy-off";
+         signal: "e,state,unhung"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "busy_clip";
+         after: "spin3";
+      }
+      program { name: "spin3";
+         action: ACTION_STOP;
+         target: "spin";
+         target: "spin2";
+         after: "spin4";
+      }
+      program { name: "spin4";
+         action: STATE_SET "default" 0.0;
+         target: "knob_spinner";
+      }
+      
       program {
          signal: "packagekit,state,none"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "status";
+         after: "busy-off";
       }
       program {
          signal: "packagekit,state,working"; source: "e";
          action: STATE_SET "running" 0.0;
          target: "status";
-         after: "running";
+         after: "spin";
       }
       program {
-         name: "running";
+         signal: "packagekit,state,working"; source: "e";
          action: STATE_SET "running" 0.0;
          target: "status";
-         transition: LINEAR 0.3;
-         after: "running";
+         after: "busy-on";
       }
       program {
          signal: "packagekit,state,updates"; source: "e";
          action: STATE_SET "updates" 0.0;
          target: "status";
+         after: "busy-off";
       }
       program {
          signal: "packagekit,state,updated"; source: "e";
          action: STATE_SET "updated" 0.0;
          target: "status";
+         after: "busy-off";
       }
       program {
          signal: "packagekit,state,error"; source: "e";
          action: STATE_SET "error" 0.0;
          target: "status";
+         after: "busy-off";
       }
    }
 }