← Back to branch summary

~ubuntu-branches/ubuntu/karmic/edubuntu-artwork/karmic

« back to all changes in this revision

Viewing changes to usplashcolors-e.patch

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2007-03-15 14:51:34 UTC
  • Revision ID: james.westby@ubuntu.com-20070315145134-kk9dy0uxicmbxy3l
Tags: 0.1.0-47
* fix versioning in the default homepage
* update links in the default homepage
* update to new wallpapers
* update to new session splash
* add Seveas' patch for usplash font colors
* fix gdm theme

Show diffs side-by-side

added added

removed removed

Lines of Context:
usplashcolors-e.patch
 
1
diff -Nru /tmp/xWRnDd2p66/edubuntu-artwork-0.1.0/art/usplash/usplash-theme-edubuntu.c /tmp/ujlsJb649P/edubuntu-artwork-0.1.0/art/usplash/usplash-theme-edubuntu.c
 
2
--- /tmp/xWRnDd2p66/edubuntu-artwork-0.1.0/art/usplash/usplash-theme-edubuntu.c 2006-09-25 14:49:32.000000000 +0200
 
3
+++ /tmp/ujlsJb649P/edubuntu-artwork-0.1.0/art/usplash/usplash-theme-edubuntu.c 2007-03-15 16:00:25.000000000 +0100
 
4
@@ -47,13 +47,13 @@
 
5
        .pixmap = &pixmap_usplash_640_480,
 
6
 
 
7
        /* Palette indexes */
 
8
-       .background             = 0x0,
 
9
-       .progressbar_background = 0x7,
 
10
-       .progressbar_foreground = 0x156,
 
11
-       .text_background        = 0x0,
 
12
-       .text_foreground        = 0x15,
 
13
-       .text_success           = 0x33,
 
14
-       .text_failure           = 0x144,
 
15
+       .background             = 0,
 
16
+       .progressbar_background = 7,
 
17
+       .progressbar_foreground = 68,
 
18
+       .text_background        = 0,
 
19
+       .text_foreground        = 159,
 
20
+       .text_success           = 47,
 
21
+       .text_failure           = 83,
 
22
 
 
23
        /* Progress bar position and size in pixels */
 
24
        .progressbar_x      = 212, /* 640/2-216/2 */
 
25
@@ -90,13 +90,13 @@
 
26
        .pixmap = &pixmap_usplash_800_600,
 
27
 
 
28
        /* Palette indexes */
 
29
-       .background             = 0x0,
 
30
-       .progressbar_background = 0x7,
 
31
-       .progressbar_foreground = 0x156,
 
32
-       .text_background        = 0x0,
 
33
-       .text_foreground        = 0x15,
 
34
-       .text_success           = 0x33,
 
35
-       .text_failure           = 0x144,
 
36
+       .background             = 0,
 
37
+       .progressbar_background = 7,
 
38
+       .progressbar_foreground = 68,
 
39
+       .text_background        = 0,
 
40
+       .text_foreground        = 159,
 
41
+       .text_success           = 47,
 
42
+       .text_failure           = 83,
 
43
 
 
44
        /* Progress bar position and size in pixels */
 
45
        .progressbar_x      = 292, /* 800/2-216/2 */
 
46
@@ -131,13 +131,13 @@
 
47
        .pixmap = &pixmap_usplash_1024_768,
 
48
 
 
49
        /* Palette indexes */
 
50
-       .background             = 0x0,
 
51
-       .progressbar_background = 0x7,
 
52
-       .progressbar_foreground = 0x156,
 
53
-       .text_background        = 0x0,
 
54
-       .text_foreground        = 0x15,
 
55
-       .text_success           = 0x33,
 
56
-       .text_failure           = 0x144,
 
57
+       .background             = 0,
 
58
+       .progressbar_background = 7,
 
59
+       .progressbar_foreground = 68,
 
60
+       .text_background        = 0,
 
61
+       .text_foreground        = 159,
 
62
+       .text_success           = 47,
 
63
+       .text_failure           = 83,
 
64
 
 
65
        /* Progress bar position and size in pixels */
 
66
        .progressbar_x      = 404, /* 1024/2 - 216/2 */
 
67
@@ -172,13 +172,13 @@
 
68
        .pixmap = &pixmap_usplash_1365_768_scaled,
 
69
 
 
70
        /* Palette indexes */
 
71
-       .background             = 0x0,
 
72
-       .progressbar_background = 0x7,
 
73
-       .progressbar_foreground = 0x156,
 
74
-       .text_background        = 0x0,
 
75
-       .text_foreground        = 0x15,
 
76
-       .text_success           = 0x33,
 
77
-       .text_failure           = 0x144,
 
78
+       .background             = 0,
 
79
+       .progressbar_background = 7,
 
80
+       .progressbar_foreground = 68,
 
81
+       .text_background        = 0,
 
82
+       .text_foreground        = 159,
 
83
+       .text_success           = 47,
 
84
+       .text_failure           = 83,
 
85
 
 
86
        /* Progress bar position and size in pixels */
 
87
        .progressbar_x      = 404, /* 1024/2 - 216/2 */
 
88
@@ -233,7 +233,7 @@
 
89
     static int pulsate_step = 0;
 
90
     static int pulse_width = 28;
 
91
     static int step_width = 2;
 
92
-    static int num_steps = (216 - 28)/2;
 
93
+    static int num_steps = (320 - 28)/2;
 
94
     int x1;
 
95
 
 
96
     if (pulsating) {
 
97
@@ -242,7 +242,7 @@
 
98
         if(pulsate_step < num_steps/2+1)
 
99
                x1 = 2 * step_width * pulsate_step;
 
100
         else
 
101
-               x1 = 216 - pulse_width - 2 * step_width * (pulsate_step - num_steps/2+1);
 
102
+               x1 = 320 - pulse_width - 2 * step_width * (pulsate_step - num_steps/2+1);
 
103
 
 
104
         usplash_put_part(theme->progressbar_x + x1, theme->progressbar_y, pulse_width,
 
105
                          pixmap_throbber_fore.height, &pixmap_throbber_fore, x1, 0);