aboutsummaryrefslogtreecommitdiffstats
path: root/data/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-02 16:15:32 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-02 16:15:32 +0900
commit9993341ad97819dafe7e54a86fb07e1c8b7d932e (patch)
treec75e7427691217ac3418bf08654c32d5e222e4fc /data/themes
parentadd tests to window moves. (diff)
downloadelementary-9993341ad97819dafe7e54a86fb07e1c8b7d932e.tar.gz
theme - packagekit - make theme match default for module
Diffstat (limited to 'data/themes')
-rw-r--r--data/themes/Makefile.am16
-rw-r--r--data/themes/edc/packagekit.edc186
-rw-r--r--data/themes/img/icon_spanner.pngbin0 -> 3959 bytes
-rw-r--r--data/themes/img/icon_splat.pngbin0 -> 5825 bytes
-rw-r--r--data/themes/img/icon_splat_half.pngbin0 -> 6666 bytes
-rw-r--r--data/themes/img/icon_warning.pngbin0 -> 3888 bytes
-rw-r--r--data/themes/img/packagekit_base.pngbin3889 -> 5660 bytes
-rw-r--r--data/themes/img/packagekit_error.pngbin2216 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_bugfix.pngbin3604 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_enhancement.pngbin2591 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_important.pngbin2718 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_low.pngbin2769 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_normal.pngbin2511 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_info_security.pngbin2825 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_updated.pngbin1775 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_work1.pngbin3074 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_work2.pngbin3027 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_work3.pngbin3083 -> 0 bytes
-rw-r--r--data/themes/img/packagekit_work4.pngbin3032 -> 0 bytes
-rw-r--r--data/themes/orig/package.svgzbin0 -> 2270 bytes
-rw-r--r--data/themes/orig/splat.svgzbin0 -> 1672 bytes
-rw-r--r--data/themes/orig/splat2.svgzbin0 -> 1769 bytes
-rw-r--r--data/themes/orig/warn.svgzbin0 -> 2097 bytes
23 files changed, 128 insertions, 74 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 253185784..250d6812c 100644
--- a/data/themes/Makefile.am
+++ b/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 \
diff --git a/data/themes/edc/packagekit.edc b/data/themes/edc/packagekit.edc
index 3059044a6..39c11798c 100644
--- a/data/themes/edc/packagekit.edc
+++ b/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";
}
}
}
diff --git a/data/themes/img/icon_spanner.png b/data/themes/img/icon_spanner.png
new file mode 100644
index 000000000..6593f6182
--- /dev/null
+++ b/data/themes/img/icon_spanner.png
Binary files differ
diff --git a/data/themes/img/icon_splat.png b/data/themes/img/icon_splat.png
new file mode 100644
index 000000000..a5ac69f5f
--- /dev/null
+++ b/data/themes/img/icon_splat.png
Binary files differ
diff --git a/data/themes/img/icon_splat_half.png b/data/themes/img/icon_splat_half.png
new file mode 100644
index 000000000..6a4a83283
--- /dev/null
+++ b/data/themes/img/icon_splat_half.png
Binary files differ
diff --git a/data/themes/img/icon_warning.png b/data/themes/img/icon_warning.png
new file mode 100644
index 000000000..4a560fe16
--- /dev/null
+++ b/data/themes/img/icon_warning.png
Binary files differ
diff --git a/data/themes/img/packagekit_base.png b/data/themes/img/packagekit_base.png
index ffb1f7eba..4fa9397e5 100644
--- a/data/themes/img/packagekit_base.png
+++ b/data/themes/img/packagekit_base.png
Binary files differ
diff --git a/data/themes/img/packagekit_error.png b/data/themes/img/packagekit_error.png
deleted file mode 100644
index e1ad3577d..000000000
--- a/data/themes/img/packagekit_error.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_bugfix.png b/data/themes/img/packagekit_info_bugfix.png
deleted file mode 100644
index 54569985d..000000000
--- a/data/themes/img/packagekit_info_bugfix.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_enhancement.png b/data/themes/img/packagekit_info_enhancement.png
deleted file mode 100644
index 084b75448..000000000
--- a/data/themes/img/packagekit_info_enhancement.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_important.png b/data/themes/img/packagekit_info_important.png
deleted file mode 100644
index 2d4ecae66..000000000
--- a/data/themes/img/packagekit_info_important.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_low.png b/data/themes/img/packagekit_info_low.png
deleted file mode 100644
index e7ad6084a..000000000
--- a/data/themes/img/packagekit_info_low.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_normal.png b/data/themes/img/packagekit_info_normal.png
deleted file mode 100644
index 95a86cbfc..000000000
--- a/data/themes/img/packagekit_info_normal.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_info_security.png b/data/themes/img/packagekit_info_security.png
deleted file mode 100644
index 6223571ae..000000000
--- a/data/themes/img/packagekit_info_security.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_updated.png b/data/themes/img/packagekit_updated.png
deleted file mode 100644
index 4192116c8..000000000
--- a/data/themes/img/packagekit_updated.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_work1.png b/data/themes/img/packagekit_work1.png
deleted file mode 100644
index 5dc2630b2..000000000
--- a/data/themes/img/packagekit_work1.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_work2.png b/data/themes/img/packagekit_work2.png
deleted file mode 100644
index 007ebc590..000000000
--- a/data/themes/img/packagekit_work2.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_work3.png b/data/themes/img/packagekit_work3.png
deleted file mode 100644
index 7aecc0911..000000000
--- a/data/themes/img/packagekit_work3.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/img/packagekit_work4.png b/data/themes/img/packagekit_work4.png
deleted file mode 100644
index 5bac72aaa..000000000
--- a/data/themes/img/packagekit_work4.png
+++ /dev/null
Binary files differ
diff --git a/data/themes/orig/package.svgz b/data/themes/orig/package.svgz
new file mode 100644
index 000000000..ebfd21128
--- /dev/null
+++ b/data/themes/orig/package.svgz
Binary files differ
diff --git a/data/themes/orig/splat.svgz b/data/themes/orig/splat.svgz
new file mode 100644
index 000000000..c641d31a5
--- /dev/null
+++ b/data/themes/orig/splat.svgz
Binary files differ
diff --git a/data/themes/orig/splat2.svgz b/data/themes/orig/splat2.svgz
new file mode 100644
index 000000000..ae8a3a1cd
--- /dev/null
+++ b/data/themes/orig/splat2.svgz
Binary files differ
diff --git a/data/themes/orig/warn.svgz b/data/themes/orig/warn.svgz
new file mode 100644
index 000000000..b4d871728
--- /dev/null
+++ b/data/themes/orig/warn.svgz
Binary files differ