Merge lp:~alanbell/onboard/branding into lp:~onboard/onboard/main
- branding
- Merge into main
Proposed by
Alan Bell
| Status: | Merged |
|---|---|
| Merge reported by: | marmuta |
| Merged at revision: | not available |
| Proposed branch: | lp:~alanbell/onboard/branding |
| Merge into: | lp:~onboard/onboard/main |
| Diff against target: |
261 lines (+94/-72) 4 files modified
Onboard/Config.py (+1/-1) Onboard/KeyGtk.py (+28/-6) layouts/Default-Alpha.svg (+62/-62) layouts/Default.onboard (+3/-3) |
| To merge this branch: | bzr merge lp:~alanbell/onboard/branding |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| marmuta | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Making onboard look nicer and following the Ubuntu branding guidelines a bit, don't think other platforms use it (gnome default will be caribou) so lets make it look like it belongs in post-brown Ubuntu.
To post a comment you must log in.
Revision history for this message
| Alan Bell (alanbell) wrote : | # |
lp:~alanbell/onboard/branding
updated
- 246. By Alan Bell
-
reducing diff and adding circle of friends to the super keys
- 247. By Alan Bell
-
putting the key labels in the centre of the key caps
- 248. By Alan Bell
-
backing out logo keycap change
- 249. By Alan Bell
-
improving calculations and removing whitespace changes
- 250. By Alan Bell
-
silly extra space
- 251. By Alan Bell
-
obsessive diff reduction!
Revision history for this message
| marmuta (marmuta) wrote : | # |
Hi Alan, the layout looks nice, I would like to add my vote for including the design.
Alas, I'm currently not in favor of directly merging the patch. I see a couple of problems with it:
1) Changing the hard-coded stroke color visually breaks the remaining layouts as well as user defined layouts we have no control over.
2) Changing the hard-coded font to Ubuntu may pose problems for distributions other than Ubuntu.
3) Forced shades of Aubergine, though nice on my eyes and suiting Natty well, may not mix well with other distributions desktops.
Here is an alternative vision:
Onboard grows "Themes". Themes separate out color information from the current layout files and allow for custom fonts, round corners, super-key symbol etc.
An Ambiance theme for Ubuntu would be included according to your design, as well as high contrast- and Onboard classic colors.
I have some time to spare currently and have started working on a prototype. There may be something usable by next week.
I realize though that an SRU for Natty is probably out of the question. In my opinion, at this point in the release cycle it may be wise to add your patch to the Ubuntu package.
review:
Needs Fixing
Revision history for this message
| Alan Bell (alanbell) wrote : | # |
1) Actually by happy coincidence I think the hard coded stroke colour defines the edges of the keys rather well in the Full-Dark layout, but I take your point, #dd4814 keycap edges is a very ubuntuish thing (which is why I did it)
2) yes, changing the font to Ubuntu does potentially cause issues for other distros (is anyone else using onboard? - the keys are brown in trunk because it was designed for Ubuntu)
3) Agreed
themes would be great. I can see need for a primary school theme and layout (bright colours, just alpha keys no punctuation other than full stop and comma, lower case keycaps, handwriting font)
luckily enough we shoved a bunch of free software logos in the private use area of the Ubuntu font, so that could be handy for the super key logo on other distros.
Revision history for this message
| marmuta (marmuta) wrote : | # |
> (is anyone else using onboard?
Probably not that many, but I'm seeing current bug reports from Fedora and Mint users.
> the keys are brown in trunk because it was designed for Ubuntu)
I wasn't aware of that, interesting. The dark keyboard was my home grown contribution though.
> themes would be great. I can see need for a primary school theme and layout (bright colours, > just alpha keys no punctuation other than full stop and comma, lower case keycaps, handwriting font)
Sure, why not, although that's actually a special case with a rather strong link between layout and presentation. That would probably have done well with the current system too.
Also perhaps an Android/smart phone layout:
https:/
Revision history for this message
| marmuta (marmuta) wrote : | # |
Alan, I went ahead and merged it locally without the hard coded stuff. The rest will come later with theming. Your layout has morphed into preliminary theme files already. It'll take some time until I push everything to the main branch though. Thanks for the patches.
Would you like to do a primary school layout?
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'Onboard/Config.py' | |||
| 2 | --- Onboard/Config.py 2010-02-17 14:45:58 +0000 | |||
| 3 | +++ Onboard/Config.py 2011-04-22 16:13:30 +0000 | |||
| 4 | @@ -92,7 +92,7 @@ | |||
| 5 | 92 | DEFAULT_LABEL_OFFSET = (2.0, 0.0) | 92 | DEFAULT_LABEL_OFFSET = (2.0, 0.0) |
| 6 | 93 | """ Offset of label from key edge when not specified in layout""" | 93 | """ Offset of label from key edge when not specified in layout""" |
| 7 | 94 | 94 | ||
| 9 | 95 | LABEL_MARGIN = (4,0) | 95 | LABEL_MARGIN = (4,4) |
| 10 | 96 | """ Margin to leave around labels """ | 96 | """ Margin to leave around labels """ |
| 11 | 97 | 97 | ||
| 12 | 98 | def __new__(cls, *args, **kwargs): | 98 | def __new__(cls, *args, **kwargs): |
| 13 | 99 | 99 | ||
| 14 | === modified file 'Onboard/KeyGtk.py' | |||
| 15 | --- Onboard/KeyGtk.py 2010-06-22 19:16:02 +0000 | |||
| 16 | +++ Onboard/KeyGtk.py 2011-04-22 16:13:30 +0000 | |||
| 17 | @@ -17,6 +17,7 @@ | |||
| 18 | 17 | ######################## | 17 | ######################## |
| 19 | 18 | 18 | ||
| 20 | 19 | BASE_FONTDESCRIPTION_SIZE = 10000000 | 19 | BASE_FONTDESCRIPTION_SIZE = 10000000 |
| 21 | 20 | PangoUnscale = 1.0/pango.SCALE | ||
| 22 | 20 | 21 | ||
| 23 | 21 | class Key(KeyCommon): | 22 | class Key(KeyCommon): |
| 24 | 22 | def __init__(self): | 23 | def __init__(self): |
| 25 | @@ -32,8 +33,6 @@ | |||
| 26 | 32 | 33 | ||
| 27 | 33 | def paint_font(self, scale, location, context): | 34 | def paint_font(self, scale, location, context): |
| 28 | 34 | 35 | ||
| 29 | 35 | context.move_to((location[0] + self.label_offset[0]) * scale[0], | ||
| 30 | 36 | (location[1] + self.label_offset[1]) * scale[1]) | ||
| 31 | 37 | 36 | ||
| 32 | 38 | context.set_source_rgba(self.label_rgba[0], self.label_rgba[1], | 37 | context.set_source_rgba(self.label_rgba[0], self.label_rgba[1], |
| 33 | 39 | self.label_rgba[2], self.label_rgba[3]) | 38 | self.label_rgba[2], self.label_rgba[3]) |
| 34 | @@ -41,9 +40,14 @@ | |||
| 35 | 41 | layout.set_text(self.labels[self.label_index]) | 40 | layout.set_text(self.labels[self.label_index]) |
| 36 | 42 | font_description = pango.FontDescription() | 41 | font_description = pango.FontDescription() |
| 37 | 43 | font_description.set_size(self.font_size) | 42 | font_description.set_size(self.font_size) |
| 39 | 44 | font_description.set_family("Normal") | 43 | font_description.set_family("Ubuntu") |
| 40 | 45 | layout.set_font_description(font_description) | 44 | layout.set_font_description(font_description) |
| 41 | 46 | context.update_layout(layout) | 45 | context.update_layout(layout) |
| 42 | 46 | #now put it in the centre of the keycap | ||
| 43 | 47 | w,h=layout.get_size() | ||
| 44 | 48 | leftmargin=0.5*((self.geometry[0]* scale[0])-(w * PangoUnscale)) | ||
| 45 | 49 | topmargin=0.5*((self.geometry[1]* scale[1])-(h * PangoUnscale)) | ||
| 46 | 50 | context.move_to(location[0] * scale[0] + leftmargin,(location[1] * scale[1]+ topmargin) ) | ||
| 47 | 47 | context.show_layout(layout) | 51 | context.show_layout(layout) |
| 48 | 48 | 52 | ||
| 49 | 49 | 53 | ||
| 50 | @@ -147,7 +151,7 @@ | |||
| 51 | 147 | 151 | ||
| 52 | 148 | def paint(self, scale, context = None): | 152 | def paint(self, scale, context = None): |
| 53 | 149 | 153 | ||
| 55 | 150 | context.rectangle(self.location[0] * scale[0], | 154 | self.roundedrec(context,self.location[0] * scale[0], |
| 56 | 151 | self.location[1] * scale[1], | 155 | self.location[1] * scale[1], |
| 57 | 152 | self.geometry[0] * scale[0], | 156 | self.geometry[0] * scale[0], |
| 58 | 153 | self.geometry[1] * scale[1]) | 157 | self.geometry[1] * scale[1]) |
| 59 | @@ -162,7 +166,7 @@ | |||
| 60 | 162 | context.set_source_rgba(self.rgba[0], self.rgba[1],self.rgba[2],self.rgba[3]) | 166 | context.set_source_rgba(self.rgba[0], self.rgba[1],self.rgba[2],self.rgba[3]) |
| 61 | 163 | 167 | ||
| 62 | 164 | context.fill_preserve() | 168 | context.fill_preserve() |
| 64 | 165 | context.set_source_rgb(0, 0, 0) | 169 | context.set_source_rgb(221.0/255, 72.0/255, 20.0/255) |
| 65 | 166 | context.stroke() | 170 | context.stroke() |
| 66 | 167 | 171 | ||
| 67 | 168 | def paint_font(self, scale, context = None): | 172 | def paint_font(self, scale, context = None): |
| 68 | @@ -178,7 +182,7 @@ | |||
| 69 | 178 | layout.set_text(self.labels[self.label_index]) | 182 | layout.set_text(self.labels[self.label_index]) |
| 70 | 179 | font_description = pango.FontDescription() | 183 | font_description = pango.FontDescription() |
| 71 | 180 | font_description.set_size(BASE_FONTDESCRIPTION_SIZE) | 184 | font_description.set_size(BASE_FONTDESCRIPTION_SIZE) |
| 73 | 181 | font_description.set_family("Normal") | 185 | font_description.set_family("Ubuntu") |
| 74 | 182 | layout.set_font_description(font_description) | 186 | layout.set_font_description(font_description) |
| 75 | 183 | 187 | ||
| 76 | 184 | # In Pango units | 188 | # In Pango units |
| 77 | @@ -201,3 +205,21 @@ | |||
| 78 | 201 | else: | 205 | else: |
| 79 | 202 | return int(floor(size_for_maximum_height)) | 206 | return int(floor(size_for_maximum_height)) |
| 80 | 203 | 207 | ||
| 81 | 208 | def roundedrec(self,context,x,y,w,h,r = 15): | ||
| 82 | 209 | "Draw a rounded rectangle" | ||
| 83 | 210 | # A****BQ | ||
| 84 | 211 | # H C | ||
| 85 | 212 | # * * | ||
| 86 | 213 | # G D | ||
| 87 | 214 | # F****E | ||
| 88 | 215 | |||
| 89 | 216 | context.move_to(x+r,y) # Move to A | ||
| 90 | 217 | context.line_to(x+w-r,y) # Straight line to B | ||
| 91 | 218 | context.curve_to(x+w,y,x+w,y,x+w,y+r) # Curve to C, Control points are both at Q | ||
| 92 | 219 | context.line_to(x+w,y+h-r) # Move to D | ||
| 93 | 220 | context.curve_to(x+w,y+h,x+w,y+h,x+w-r,y+h) # Curve to E | ||
| 94 | 221 | context.line_to(x+r,y+h) # Line to F | ||
| 95 | 222 | context.curve_to(x,y+h,x,y+h,x,y+h-r) # Curve to G | ||
| 96 | 223 | context.line_to(x,y+r) # Line to H | ||
| 97 | 224 | context.curve_to(x,y,x,y,x+r,y) # Curve to A | ||
| 98 | 225 | return | ||
| 99 | 204 | 226 | ||
| 100 | === modified file 'layouts/Default-Alpha.svg' | |||
| 101 | --- layouts/Default-Alpha.svg 2009-12-13 20:47:19 +0000 | |||
| 102 | +++ layouts/Default-Alpha.svg 2011-04-22 16:13:30 +0000 | |||
| 103 | @@ -3,66 +3,66 @@ | |||
| 104 | 3 | <svg height="98.0" id="svg2" version="1.0" width="294.0" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"> | 3 | <svg height="98.0" id="svg2" version="1.0" width="294.0" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"> |
| 105 | 4 | 4 | ||
| 106 | 5 | 5 | ||
| 169 | 6 | <rect height="18.0" id="AB01" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="47.0" y="58.0"/> | 6 | <rect height="18.0" id="AB01" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="47.0" y="58.0"/> |
| 170 | 7 | <rect height="18.0" id="AE02" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="40.0" y="1.0"/> | 7 | <rect height="18.0" id="AE02" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="40.0" y="1.0"/> |
| 171 | 8 | <rect height="18.0" id="AE03" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="59.0" y="1.0"/> | 8 | <rect height="18.0" id="AE03" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="59.0" y="1.0"/> |
| 172 | 9 | <rect height="18.0" id="AD09" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="183.0" y="20.0"/> | 9 | <rect height="18.0" id="AD09" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="183.0" y="20.0"/> |
| 173 | 10 | <rect height="18.0" id="AE01" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="21.0" y="1.0"/> | 10 | <rect height="18.0" id="AE01" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="21.0" y="1.0"/> |
| 174 | 11 | <rect height="18.0" id="AE06" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="116.0" y="1.0"/> | 11 | <rect height="18.0" id="AE06" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="116.0" y="1.0"/> |
| 175 | 12 | <rect height="18.0" id="AE07" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="135.0" y="1.0"/> | 12 | <rect height="18.0" id="AE07" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="135.0" y="1.0"/> |
| 176 | 13 | <rect height="18.0" id="AE04" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="78.0" y="1.0"/> | 13 | <rect height="18.0" id="AE04" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="78.0" y="1.0"/> |
| 177 | 14 | <rect height="18.0" id="AE05" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="97.0" y="1.0"/> | 14 | <rect height="18.0" id="AE05" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="97.0" y="1.0"/> |
| 178 | 15 | <rect height="18.0" id="AD03" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="69.0" y="20.0"/> | 15 | <rect height="18.0" id="AD03" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="69.0" y="20.0"/> |
| 179 | 16 | <rect height="18.0" id="AD02" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="50.0" y="20.0"/> | 16 | <rect height="18.0" id="AD02" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="50.0" y="20.0"/> |
| 180 | 17 | <rect height="18.0" id="AD01" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="31.0" y="20.0"/> | 17 | <rect height="18.0" id="AD01" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="31.0" y="20.0"/> |
| 181 | 18 | <rect height="18.0" id="AE09" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="173.0" y="1.0"/> | 18 | <rect height="18.0" id="AE09" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="173.0" y="1.0"/> |
| 182 | 19 | <rect height="18.0" id="AD07" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="145.0" y="20.0"/> | 19 | <rect height="18.0" id="AD07" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="145.0" y="20.0"/> |
| 183 | 20 | <rect height="18.0" id="AD06" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="126.0" y="20.0"/> | 20 | <rect height="18.0" id="AD06" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="126.0" y="20.0"/> |
| 184 | 21 | <rect height="18.0" id="AD05" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="107.0" y="20.0"/> | 21 | <rect height="18.0" id="AD05" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="107.0" y="20.0"/> |
| 185 | 22 | <rect height="18.0" id="AD04" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="88.0" y="20.0"/> | 22 | <rect height="18.0" id="AD04" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="88.0" y="20.0"/> |
| 186 | 23 | <rect height="18.0" id="AB10" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="218.0" y="58.0"/> | 23 | <rect height="18.0" id="AB10" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="218.0" y="58.0"/> |
| 187 | 24 | <rect height="18.0" id="AC11" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="226.0" y="39.0"/> | 24 | <rect height="18.0" id="AC11" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="226.0" y="39.0"/> |
| 188 | 25 | <rect height="18.0" id="AC10" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="207.0" y="39.0"/> | 25 | <rect height="18.0" id="AC10" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="207.0" y="39.0"/> |
| 189 | 26 | <rect height="18.0" id="TLDE" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="2.0" y="1.0"/> | 26 | <rect height="18.0" id="TLDE" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="2.0" y="1.0"/> |
| 190 | 27 | <rect height="18.0" id="LSGT" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="28.0" y="58.0"/> | 27 | <rect height="18.0" id="LSGT" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="28.0" y="58.0"/> |
| 191 | 28 | <rect height="18.0" id="BKSL" style="fill:#e5d8b2;stroke:#000000;" width="28.0" x="259.0" y="20.0"/> | 28 | <rect height="18.0" id="BKSL" style="fill:#f1f1f1;stroke:#000000;" width="28.0" x="259.0" y="20.0"/> |
| 192 | 29 | <rect height="18.0" id="AD10" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="202.0" y="20.0"/> | 29 | <rect height="18.0" id="AD10" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="202.0" y="20.0"/> |
| 193 | 30 | <rect height="18.0" id="AD11" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="221.0" y="20.0"/> | 30 | <rect height="18.0" id="AD11" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="221.0" y="20.0"/> |
| 194 | 31 | <rect height="18.0" id="AD12" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="240.0" y="20.0"/> | 31 | <rect height="18.0" id="AD12" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="240.0" y="20.0"/> |
| 195 | 32 | <rect height="18.0" id="AB08" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="180.0" y="58.0"/> | 32 | <rect height="18.0" id="AB08" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="180.0" y="58.0"/> |
| 196 | 33 | <rect height="18.0" id="AE11" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="211.0" y="1.0"/> | 33 | <rect height="18.0" id="AE11" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="211.0" y="1.0"/> |
| 197 | 34 | <rect height="18.0" id="AE10" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="192.0" y="1.0"/> | 34 | <rect height="18.0" id="AE10" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="192.0" y="1.0"/> |
| 198 | 35 | <rect height="18.0" id="AE12" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="230.0" y="1.0"/> | 35 | <rect height="18.0" id="AE12" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="230.0" y="1.0"/> |
| 199 | 36 | <rect height="18.0" id="AC04" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="93.0" y="39.0"/> | 36 | <rect height="18.0" id="AC04" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="93.0" y="39.0"/> |
| 200 | 37 | <rect height="18.0" id="AC05" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="112.0" y="39.0"/> | 37 | <rect height="18.0" id="AC05" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="112.0" y="39.0"/> |
| 201 | 38 | <rect height="18.0" id="AC06" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="131.0" y="39.0"/> | 38 | <rect height="18.0" id="AC06" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="131.0" y="39.0"/> |
| 202 | 39 | <rect height="18.0" id="AC07" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="150.0" y="39.0"/> | 39 | <rect height="18.0" id="AC07" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="150.0" y="39.0"/> |
| 203 | 40 | <rect height="18.0" id="AB09" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="199.0" y="58.0"/> | 40 | <rect height="18.0" id="AB09" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="199.0" y="58.0"/> |
| 204 | 41 | <rect height="18.0" id="AC01" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="36.0" y="39.0"/> | 41 | <rect height="18.0" id="AC01" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="36.0" y="39.0"/> |
| 205 | 42 | <rect height="18.0" id="AC02" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="55.0" y="39.0"/> | 42 | <rect height="18.0" id="AC02" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="55.0" y="39.0"/> |
| 206 | 43 | <rect height="18.0" id="AC03" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="74.0" y="39.0"/> | 43 | <rect height="18.0" id="AC03" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="74.0" y="39.0"/> |
| 207 | 44 | <rect height="18.0" id="AB05" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="123.0" y="58.0"/> | 44 | <rect height="18.0" id="AB05" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="123.0" y="58.0"/> |
| 208 | 45 | <rect height="18.0" id="AB04" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="104.0" y="58.0"/> | 45 | <rect height="18.0" id="AB04" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="104.0" y="58.0"/> |
| 209 | 46 | <rect height="18.0" id="AE08" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="154.0" y="1.0"/> | 46 | <rect height="18.0" id="AE08" style="fill:#f2d8e6;stroke:#000000;" width="18.0" x="154.0" y="1.0"/> |
| 210 | 47 | <rect height="18.0" id="AB06" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="142.0" y="58.0"/> | 47 | <rect height="18.0" id="AB06" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="142.0" y="58.0"/> |
| 211 | 48 | <rect height="18.0" id="AC08" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="169.0" y="39.0"/> | 48 | <rect height="18.0" id="AC08" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="169.0" y="39.0"/> |
| 212 | 49 | <rect height="18.0" id="AC09" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="188.0" y="39.0"/> | 49 | <rect height="18.0" id="AC09" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="188.0" y="39.0"/> |
| 213 | 50 | <rect height="18.0" id="AB03" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="85.0" y="58.0"/> | 50 | <rect height="18.0" id="AB03" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="85.0" y="58.0"/> |
| 214 | 51 | <rect height="18.0" id="AB02" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="66.0" y="58.0"/> | 51 | <rect height="18.0" id="AB02" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="66.0" y="58.0"/> |
| 215 | 52 | <rect height="18.0" id="AD08" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="164.0" y="20.0"/> | 52 | <rect height="18.0" id="AD08" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="164.0" y="20.0"/> |
| 216 | 53 | <rect height="18.0" id="AB07" style="fill:#e5d8b2;stroke:#000000;" width="18.0" x="161.0" y="58.0"/> | 53 | <rect height="18.0" id="AB07" style="fill:#f1f1f1;stroke:#000000;" width="18.0" x="161.0" y="58.0"/> |
| 217 | 54 | <rect height="18.0" id="RCTL" style="fill:#f2e5d8;stroke:#000000;" width="23.0" x="264.0" y="77.0"/> | 54 | <rect height="18.0" id="RCTL" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="264.0" y="77.0"/> |
| 218 | 55 | <rect height="18.0" id="LCTL" style="fill:#f2e5d8;stroke:#000000;" width="27.0" x="2.0" y="77.0"/> | 55 | <rect height="18.0" id="LCTL" style="fill:#e1e1e1;stroke:#000000;" width="27.0" x="2.0" y="77.0"/> |
| 219 | 56 | <rect height="18.0" id="RALT" style="fill:#f2e5d8;stroke:#000000;" width="23.0" x="192.0" y="77.0"/> | 56 | <rect height="18.0" id="RALT" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="192.0" y="77.0"/> |
| 220 | 57 | <rect height="18.0" id="LALT" style="fill:#f2e5d8;stroke:#000000;" width="23.0" x="54.0" y="77.0"/> | 57 | <rect height="18.0" id="LALT" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="54.0" y="77.0"/> |
| 221 | 58 | <rect height="18.0" id="MENU" style="fill:#d8cca5;stroke:#000000;" width="23.0" x="240.0" y="77.0"/> | 58 | <rect height="18.0" id="MENU" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="240.0" y="77.0"/> |
| 222 | 59 | <rect height="18.0" id="RWIN" style="fill:#d8cca5;stroke:#000000;" width="23.0" x="216.0" y="77.0"/> | 59 | <rect height="18.0" id="RWIN" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="216.0" y="77.0"/> |
| 223 | 60 | <rect height="18.0" id="SPCE" style="fill:#e5d8b2;stroke:#000000;" width="113.0" x="78.0" y="77.0"/> | 60 | <rect height="18.0" id="SPCE" style="fill:#f5ad94;stroke:#000000;" width="113.0" x="78.0" y="77.0"/> |
| 224 | 61 | <rect height="18.0" id="LWIN" style="fill:#f2e5d8;stroke:#000000;" width="23.0" x="30.0" y="77.0"/> | 61 | <rect height="18.0" id="LWIN" style="fill:#e1e1e1;stroke:#000000;" width="23.0" x="30.0" y="77.0"/> |
| 225 | 62 | <rect height="18.0" id="BKSP" style="fill:#d8cca5;stroke:#000000;" width="38.0" x="249.0" y="1.0"/> | 62 | <rect height="18.0" id="BKSP" style="fill:#d98fb7;stroke:#000000;" width="38.0" x="249.0" y="1.0"/> |
| 226 | 63 | <rect height="18.0" id="TAB" style="fill:#d8cca5;stroke:#000000;" width="28.0" x="2.0" y="20.0"/> | 63 | <rect height="18.0" id="TAB" style="fill:#d98fb7;stroke:#000000;" width="28.0" x="2.0" y="20.0"/> |
| 227 | 64 | <rect height="18.0" id="CAPS" style="fill:#f2e5d8;stroke:#000000;" width="33.0" x="2.0" y="39.0"/> | 64 | <rect height="18.0" id="CAPS" style="fill:#d98fb7;stroke:#000000;" width="33.0" x="2.0" y="39.0"/> |
| 228 | 65 | <rect height="18.0" id="RTRN" style="fill:#d8cca5;stroke:#000000;" width="42.0" x="245.0" y="39.0"/> | 65 | <rect height="18.0" id="RTRN" style="fill:#d98fb7;stroke:#000000;" width="42.0" x="245.0" y="39.0"/> |
| 229 | 66 | <rect height="18.0" id="LFSH" style="fill:#f2e5d8;stroke:#000000;" width="25.0" x="2.0" y="58.0"/> | 66 | <rect height="18.0" id="LFSH" style="fill:#f5ad94;stroke:#000000;" width="25.0" x="2.0" y="58.0"/> |
| 230 | 67 | <rect height="18.0" id="RTSH" style="fill:#f2e5d8;stroke:#000000;" width="50.0" x="237.0" y="58.0"/> | 67 | <rect height="18.0" id="RTSH" style="fill:#f5ad94;stroke:#000000;" width="50.0" x="237.0" y="58.0"/> |
| 231 | 68 | </svg> | 68 | </svg> |
| 232 | 69 | 69 | ||
| 233 | === modified file 'layouts/Default.onboard' | |||
| 234 | --- layouts/Default.onboard 2010-05-21 18:58:14 +0000 | |||
| 235 | +++ layouts/Default.onboard 2011-04-22 16:13:30 +0000 | |||
| 236 | @@ -1,6 +1,6 @@ | |||
| 237 | 1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
| 238 | 2 | <keyboard id="Default"> | 2 | <keyboard id="Default"> |
| 240 | 3 | <pane backgroundAlpha="0.3" backgroundBlue="0" backgroundGreen="0" backgroundRed="0" filename="Default-Alpha.svg" id="Alpha"> | 3 | <pane backgroundAlpha="0.2" backgroundBlue="0" backgroundGreen="0" backgroundRed="0" filename="Default-Alpha.svg" id="Alpha"> |
| 241 | 4 | <key group="alphanumeric" id="AB01" keycode="52" sticky="false"/> | 4 | <key group="alphanumeric" id="AB01" keycode="52" sticky="false"/> |
| 242 | 5 | <key group="alphanumeric" id="AE02" keycode="11" sticky="false"/> | 5 | <key group="alphanumeric" id="AE02" keycode="11" sticky="false"/> |
| 243 | 6 | <key group="alphanumeric" id="AE03" keycode="12" sticky="false"/> | 6 | <key group="alphanumeric" id="AE03" keycode="12" sticky="false"/> |
| 244 | @@ -64,7 +64,7 @@ | |||
| 245 | 64 | <key group="shifts" id="LFSH" label="⇧" modifier="shift" sticky="true"/> | 64 | <key group="shifts" id="LFSH" label="⇧" modifier="shift" sticky="true"/> |
| 246 | 65 | <key group="shifts" id="RTSH" label="⇧" modifier="shift" sticky="true"/> | 65 | <key group="shifts" id="RTSH" label="⇧" modifier="shift" sticky="true"/> |
| 247 | 66 | </pane> | 66 | </pane> |
| 249 | 67 | <pane backgroundAlpha="0.3" backgroundBlue="0.7" backgroundGreen="0.3" backgroundRed="0.3" filename="Default-Editing.svg" id="Editing"> | 67 | <pane backgroundAlpha="0.8" backgroundBlue="0.078431373" backgroundGreen="0.282352941" backgroundRed="0.866666667" filename="Default-Editing.svg" id="Editing"> |
| 250 | 68 | <key group="keypadmisc" id="KPDL" keypress_name="delete" label="Del" sticky="false"/> | 68 | <key group="keypadmisc" id="KPDL" keypress_name="delete" label="Del" sticky="false"/> |
| 251 | 69 | <key group="keypadmisc" id="NMLK" label="Nm | 69 | <key group="keypadmisc" id="NMLK" label="Nm |
| 252 | 70 | Lk" modifier="mod2" sticky="true"/> | 70 | Lk" modifier="mod2" sticky="true"/> |
| 253 | @@ -105,7 +105,7 @@ | |||
| 254 | 105 | <key group="snippets" id="m7" macro="7" sticky="false"/> | 105 | <key group="snippets" id="m7" macro="7" sticky="false"/> |
| 255 | 106 | <key group="snippets" id="m8" macro="8" sticky="false"/> | 106 | <key group="snippets" id="m8" macro="8" sticky="false"/> |
| 256 | 107 | </pane> | 107 | </pane> |
| 258 | 108 | <pane backgroundAlpha="0.3" backgroundBlue="0.7" backgroundGreen="0.3" backgroundRed="0.6" filename="Default-Functions.svg" id="Functions"> | 108 | <pane backgroundAlpha="0.8" backgroundBlue="0.325490196" backgroundGreen="0.160784314" backgroundRed="0.466666667" filename="Default-Functions.svg" id="Functions"> |
| 259 | 109 | <key script='' sticky='false' id='middleClick' label='Middle Click' group='scripts'/> | 109 | <key script='' sticky='false' id='middleClick' label='Middle Click' group='scripts'/> |
| 260 | 110 | <key script='' sticky='false' id='secondaryClick' label='Right Click' group='scripts'/> | 110 | <key script='' sticky='false' id='secondaryClick' label='Right Click' group='scripts'/> |
| 261 | 111 | <key group="scripts" id="settings" label="Settings" script="sokSettings" sticky="false"/> | 111 | <key group="scripts" id="settings" label="Settings" script="sokSettings" sticky="false"/> |
screenshot of before and after http://