Merge lp:~samuel-buffet/entertainer/more_base_on_widgets into lp:entertainer
- more_base_on_widgets
- Merge into trunk
Proposed by
Samuel Buffet
| Status: | Merged |
|---|---|
| Approved by: | Matt Layman |
| Approved revision: | 394 |
| Merged at revision: | not available |
| Proposed branch: | lp:~samuel-buffet/entertainer/more_base_on_widgets |
| Merge into: | lp:entertainer |
| Diff against target: | None lines |
| To merge this branch: | bzr merge lp:~samuel-buffet/entertainer/more_base_on_widgets |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Matt Layman | Approve | ||
|
Review via email:
|
|||
Commit message
More widgets now inherit from the Base Class.
Description of the change
To post a comment you must log in.
Revision history for this message
| Samuel Buffet (samuel-buffet) wrote : | # |
Revision history for this message
| Matt Layman (mblayman) wrote : | # |
Sweet, this is exactly the kind of clean up that I had envisioned doing with the rest of the widgets, but I never got around to it. Thanks for picking up that torch and running with it.
I didn't want to approve this branch immediately because I don't want Tarmac to auto-land it, but my comments that need fixing are very minor. Nice job.
I'm assuming that you've done some visual inspection of your changes to make sure things looked the same before and after your modifications.
GLOBAL:
* Please kill or improve the init docstrings for the widget classes. Some are flat out wrong and most have the @param doxygen stuff that we aren't using.
* What do you think about killing off the creat_indicator type methods that are in many of the screens? Those methods don't seem to do anything special that can't be done in init (especially since you've greatly simplified their creation).
album.py audio_play.py disc.py feed.py movie.py photo_albums.py photographs.py rss.py tv_episodes.py albums_tab.py artists_tab.py lyrics_tab.py movies_tab.py series_tab.py tracks_tab.py video_clips_tab.py arrow_texture.py eyecandy_
* No comments.
list_indicator.py:
* I'm not sure about the modification for the "text_x_pos = width / 3" code. If I remember correctly, I think I set the code that way because the horizontal vs vertical orientation caused different spacing issues. Have you checked both? Have you checked both when there are many values in the indicator (e.g., some amount over 100)? You may have considered all these things and everything may be functioning perfectly, but I just wanted to highlight this because my brained raised a red flag when I saw those lines of code.
loading_
* set_anchor_point in init has incorrect spacing around the / characters.
reflection_
* No comments.
rounded_texture.py:
* Is there a better variable than xx and yy? Those names are pretty vague.
scroll_area.py test_arrowtextu
* No comments.
test_eyecandyte
* Import order is incorrect. os is a core module but gtk is not.
test_listindica
* No comments.
test_reflection
* Import order is incorrect. os is a core module but gtk is not.
review:
Needs Fixing
- 393. By Samuel Buffet
-
Fixes after Matt's comments.
Revision history for this message
| Samuel Buffet (samuel-buffet) wrote : | # |
Matt,
> I'm assuming that you've done some visual inspection of your changes to make
> sure things looked the same before and after your modifications.
Yes I've checked visually everything. There result is roughly the same but not exactly the same but I think that globally it's slightly improved. I remember to have made the LoadingAnimation on disc.py MUCH bigger.
> GLOBAL:
> * Please kill or improve the init docstrings for the widget classes. Some are
> flat out wrong and most have the @param doxygen stuff that we aren't using.
Removed.
> * What do you think about killing off the creat_indicator type methods that
> are in many of the screens? Those methods don't seem to do anything special
> that can't be done in init (especially since you've greatly simplified their
> creation).
Well I'm all for that. Was about to suggest that to you in fact :)
But I'd prefer to do that in another branch. I don't like to mix everything as you may have noticed. It's MUCH more easy to resolve merge conflicts when a branch does one and only one thing at the same time.
> list_indicator.py:
> * I'm not sure about the modification for the "text_x_pos = width / 3" code.
> If I remember correctly, I think I set the code that way because the
> horizontal vs vertical orientation caused different spacing issues. Have you
> checked both? Have you checked both when there are many values in the
> indicator (e.g., some amount over 100)? You may have considered all these
> things and everything may be functioning perfectly, but I just wanted to
> highlight this because my brained raised a red flag when I saw those lines of
> code.
Well, this modification gives better results on my screen but it may not be the same on yours. Could you please compare and report your result here? Thanks.
> loading_
> * set_anchor_point in init has incorrect spacing around the / characters.
Yeah, /2 is now / 2
> rounded_texture.py:
> * Is there a better variable than xx and yy? Those names are pretty vague.
Those variables were useless. I've simply removed them.
> test_eyecandyte
> * Import order is incorrect. os is a core module but gtk is not.
>
> test_reflection
> * Import order is incorrect. os is a core module but gtk is not.
Fixed.
Thanks for you review Matt.
Samuel-
Revision history for this message
| Samuel Buffet (samuel-buffet) wrote : | # |
Download full text (7.6 KiB)
incremental diff:
=== modified file 'entertainerlib
--- entertainerlib/
+++ entertainerlib/
@@ -17,14 +17,6 @@
ARC_TO_BEZIER = 0.55228475
def __init__(self, x, y, size, fg_color, bg_color, direction):
- """
- Initialize ArrowTexture
- @param size: Width and height of the texture
- @param fg_color: Foreground color (arrows)
- @param bg_color: Background color (background)
- @param direction: Arrow direction UP,DOWN,RIGHT or LEFT (class
- constant)
- """
abs_size = self.get_
=== modified file 'entertainerlib
--- entertainerlib/
+++ entertainerlib/
@@ -16,10 +16,6 @@
"""
def __init__(self, x, y, width, height, pixbuf):
- """
- Initialize new eye candy texture
- @param imagefile: Absoulte path to PNG file
- """
=== modified file 'entertainerlib
--- entertainerlib/
+++ entertainerlib/
@@ -20,12 +20,6 @@
VERTICAL = 1
def __init__(self, x, y, width, height, direction):
- """
- Initialize actor.
- @param width: Width of the widget in percentage (0-1)
- @param height: Height of the widget in percentage (0-1)
- @param direction: Direction (constant of this class)
- """
@@ -46,7 +40,7 @@
text_x_pos = width / 3
- self.text = Label(height * 0.8, "text", text_x_pos, (height / 2),
+ self.text = Label(height * 0.8, "text", text_x_pos, height / 2,
=== modified file 'entertainerlib
--- entertainerlib/
+++ entertainerlib/
@@ -18,22 +18,13 @@
def __init__(self, x, y, size=0.03, inner_radius=0.25, outter_radius=0.45,
- """
- Initialize LoadingAnimation
- @param size: Width and height of the texture
- @param fg_color: Foreground color
- @param bg_color: Background color
- @param inner_radius: Distance from origo to line start point 0-1
- @param outter_radius: Distance from origo to line end point 0-1
- @param thinkness: Lines thickness 0-1
- """
abs_size = self.get_
- 394. By Samuel Buffet
-
Back to previous behaviour of text_x_pos in list_indicator.py.
Revision history for this message
| Matt Layman (mblayman) wrote : | # |
Things look good now.
review:
Approve
Revision history for this message
| Paul Hummer (rockstar) wrote : | # |
Download full text (123.5 KiB)
`which trial` entertainerlib.
entertainerlib.
ArrowTextureTest
test_bounce ... /home/rockstar/
/home/rockstar/
/home/rockstar/
/home/rockstar/
test_create ... [ERROR]
entertainerlib.
BaseTest
testCreate ... [OK]
testGetAbsX ... [ERROR]
testGetAbsY ... [ERROR]
entertainerlib.
ConfigurationTest
testBorg ... [OK]
testCreate ... [OK]
testGetCfgDir ... [OK]
testGetSlid
testGetStag
testGetStag
testGetThem
testSetStag
testSetStag
testStartAu
testTrayIco
test_create_dir ... [OK]
test_
test_sanitize ... [ERROR]
test_taint ... [OK]
test_
test_
test_
entertainerlib.
ConnectionSer
testPortBinding ... [OK]
entertainerlib.
DatabaseTest
testCreate ... [OK]
testUseExisting ... [OK]
entertainerlib.
EyeCandyTextu
test_create ... [ERROR]
entertainerlib.
FeedConfigTo...
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'entertainerlib/frontend/gui/screens/album.py' | |||
| 2 | --- entertainerlib/frontend/gui/screens/album.py 2009-05-06 03:40:22 +0000 | |||
| 3 | +++ entertainerlib/frontend/gui/screens/album.py 2009-05-10 07:43:27 +0000 | |||
| 4 | @@ -39,13 +39,8 @@ | |||
| 5 | 39 | self.add(self.screen_title) | 39 | self.add(self.screen_title) |
| 6 | 40 | 40 | ||
| 7 | 41 | #List indicator | 41 | #List indicator |
| 13 | 42 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 42 | self.li = ListIndicator(0.74, 0.8, 0.2, 0.045, ListIndicator.VERTICAL) |
| 9 | 43 | self.li.set_position(self.config.get_stage_width() - \ | ||
| 10 | 44 | self.li.get_width() - self.get_abs_x(0.066), | ||
| 11 | 45 | self.config.get_stage_height() - self.get_abs_y(0.11)) | ||
| 12 | 46 | self.li.set_delimiter(" | ") | ||
| 14 | 47 | self.li.set_maximum(self.track_menu.get_number_of_items()) | 43 | self.li.set_maximum(self.track_menu.get_number_of_items()) |
| 15 | 48 | self.li.set_current(1) | ||
| 16 | 49 | self.add(self.li) | 44 | self.add(self.li) |
| 17 | 50 | 45 | ||
| 18 | 51 | def _create_album_cover_texture(self): | 46 | def _create_album_cover_texture(self): |
| 19 | @@ -59,9 +54,7 @@ | |||
| 20 | 59 | else: | 54 | else: |
| 21 | 60 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 55 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 22 | 61 | self.theme.getImage("default_album_art")) | 56 | self.theme.getImage("default_album_art")) |
| 26 | 62 | self.art = EyeCandyTexture(pixbuf, self.get_abs_x(0.3148), | 57 | self.art = EyeCandyTexture(0.1, 0.13, 0.3148, 0.5599, pixbuf) |
| 24 | 63 | self.get_abs_y(0.5599)) | ||
| 25 | 64 | self.art.set_position(self.get_abs_x(0.1), self.get_abs_y(0.13)) | ||
| 27 | 65 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) | 58 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) |
| 28 | 66 | self.add(self.art) | 59 | self.add(self.art) |
| 29 | 67 | 60 | ||
| 30 | 68 | 61 | ||
| 31 | === modified file 'entertainerlib/frontend/gui/screens/audio_play.py' | |||
| 32 | --- entertainerlib/frontend/gui/screens/audio_play.py 2009-05-26 17:32:56 +0000 | |||
| 33 | +++ entertainerlib/frontend/gui/screens/audio_play.py 2009-05-28 20:23:17 +0000 | |||
| 34 | @@ -26,9 +26,7 @@ | |||
| 35 | 26 | else: | 26 | else: |
| 36 | 27 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 27 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 37 | 28 | self.theme.getImage("default_album_art")) | 28 | self.theme.getImage("default_album_art")) |
| 41 | 29 | self.art = EyeCandyTexture(pixbuf, self.get_abs_x(0.3148), | 29 | self.art = EyeCandyTexture(0.1, 0.22, 0.3148, 0.5599, pixbuf) |
| 39 | 30 | self.get_abs_y(0.5599)) | ||
| 40 | 31 | self.art.set_position(self.get_abs_x(0.1), self.get_abs_y(0.22)) | ||
| 42 | 32 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) | 30 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) |
| 43 | 33 | self.add(self.art) | 31 | self.add(self.art) |
| 44 | 34 | 32 | ||
| 45 | 35 | 33 | ||
| 46 | === modified file 'entertainerlib/frontend/gui/screens/disc.py' | |||
| 47 | --- entertainerlib/frontend/gui/screens/disc.py 2009-05-06 03:40:22 +0000 | |||
| 48 | +++ entertainerlib/frontend/gui/screens/disc.py 2009-05-10 07:43:27 +0000 | |||
| 49 | @@ -47,9 +47,7 @@ | |||
| 50 | 47 | self.add(screen_title) | 47 | self.add(screen_title) |
| 51 | 48 | 48 | ||
| 52 | 49 | # Display throbber animation while loading CD metadata | 49 | # Display throbber animation while loading CD metadata |
| 56 | 50 | self.throbber = LoadingAnimation(40, clutter.Color(255, 255, 255, 255), | 50 | self.throbber = LoadingAnimation(0.5, 0.5, 0.1) |
| 54 | 51 | clutter.Color(128, 128, 128, 128)) | ||
| 55 | 52 | self.throbber.set_position(self.get_abs_x(0.5), self.get_abs_y(0.5)) | ||
| 57 | 53 | self.throbber.show() | 51 | self.throbber.show() |
| 58 | 54 | self.add(self.throbber) | 52 | self.add(self.throbber) |
| 59 | 55 | 53 | ||
| 60 | @@ -145,9 +143,7 @@ | |||
| 61 | 145 | pixbuf = gtk.gdk.pixbuf_new_from_file(coverfile) | 143 | pixbuf = gtk.gdk.pixbuf_new_from_file(coverfile) |
| 62 | 146 | else: | 144 | else: |
| 63 | 147 | pixbuf = gtk.gdk.pixbuf_new_from_file(self.theme.getImage("disc")) | 145 | pixbuf = gtk.gdk.pixbuf_new_from_file(self.theme.getImage("disc")) |
| 67 | 148 | self.art = EyeCandyTexture(pixbuf, self.get_abs_x(0.3148), | 146 | self.art = EyeCandyTexture(0.1, 0.13, 0.3148, 0.5599, pixbuf) |
| 65 | 149 | self.get_abs_y(0.5599)) | ||
| 66 | 150 | self.art.set_position(self.get_abs_x(0.1), self.get_abs_y(0.13)) | ||
| 68 | 151 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) | 147 | self.art.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) |
| 69 | 152 | self.add(self.art) | 148 | self.add(self.art) |
| 70 | 153 | 149 | ||
| 71 | @@ -194,14 +190,8 @@ | |||
| 72 | 194 | self.add(self.track_menu) | 190 | self.add(self.track_menu) |
| 73 | 195 | 191 | ||
| 74 | 196 | def _create_list_indicator(self): | 192 | def _create_list_indicator(self): |
| 83 | 197 | """ | 193 | '''Create list indicator for track list.''' |
| 84 | 198 | Create list indicator widget | 194 | self.li = ListIndicator(0.75, 0.8, 0.2, 0.045, ListIndicator.VERTICAL) |
| 77 | 199 | """ | ||
| 78 | 200 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | ||
| 79 | 201 | self.li.set_position(self.config.get_stage_width() - \ | ||
| 80 | 202 | self.li.get_width() - self.get_abs_x(0.06589), | ||
| 81 | 203 | self.config.get_stage_height() - self.get_abs_y(0.1953)) | ||
| 82 | 204 | self.li.set_delimiter(" | ") | ||
| 85 | 205 | self.li.set_maximum(self.track_menu.get_number_of_items()) | 195 | self.li.set_maximum(self.track_menu.get_number_of_items()) |
| 86 | 206 | self.add(self.li) | 196 | self.add(self.li) |
| 87 | 207 | 197 | ||
| 88 | 208 | 198 | ||
| 89 | === modified file 'entertainerlib/frontend/gui/screens/feed.py' | |||
| 90 | --- entertainerlib/frontend/gui/screens/feed.py 2009-06-15 03:19:46 +0000 | |||
| 91 | +++ entertainerlib/frontend/gui/screens/feed.py 2009-06-25 19:06:28 +0000 | |||
| 92 | @@ -55,13 +55,8 @@ | |||
| 93 | 55 | self.add(date) | 55 | self.add(date) |
| 94 | 56 | 56 | ||
| 95 | 57 | #List indicator | 57 | #List indicator |
| 101 | 58 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 58 | self.li = ListIndicator(0.57, 0.9, 0.2, 0.045, ListIndicator.VERTICAL) |
| 97 | 59 | self.li.set_position(self.get_abs_x(0.7562) - self.li.get_width(), | ||
| 98 | 60 | self.config.get_stage_height() - self.li.get_height() - \ | ||
| 99 | 61 | self.get_abs_y(0.03906)) | ||
| 100 | 62 | self.li.set_delimiter(" | ") | ||
| 102 | 63 | self.li.set_maximum(self.menu.get_number_of_items()) | 59 | self.li.set_maximum(self.menu.get_number_of_items()) |
| 103 | 64 | self.li.set_current(1) | ||
| 104 | 65 | self.add(self.li) | 60 | self.add(self.li) |
| 105 | 66 | 61 | ||
| 106 | 67 | def _create_entry_menu(self): | 62 | def _create_entry_menu(self): |
| 107 | 68 | 63 | ||
| 108 | === modified file 'entertainerlib/frontend/gui/screens/movie.py' | |||
| 109 | --- entertainerlib/frontend/gui/screens/movie.py 2009-06-02 10:24:20 +0000 | |||
| 110 | +++ entertainerlib/frontend/gui/screens/movie.py 2009-06-05 05:10:21 +0000 | |||
| 111 | @@ -52,9 +52,7 @@ | |||
| 112 | 52 | else: | 52 | else: |
| 113 | 53 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 53 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 114 | 54 | self.theme.getImage("default_movie_art")) | 54 | self.theme.getImage("default_movie_art")) |
| 118 | 55 | movie_art = EyeCandyTexture(pixbuf, self.get_abs_x(0.1), | 55 | movie_art = EyeCandyTexture(0.33, 0.1, 0.1, 0.25, pixbuf) |
| 116 | 56 | self.get_abs_y(0.25)) | ||
| 117 | 57 | movie_art.set_position(self.get_abs_x(0.33), self.get_abs_y(0.1)) | ||
| 119 | 58 | self.add(movie_art) | 56 | self.add(movie_art) |
| 120 | 59 | 57 | ||
| 121 | 60 | # Movie title | 58 | # Movie title |
| 122 | 61 | 59 | ||
| 123 | === modified file 'entertainerlib/frontend/gui/screens/photo_albums.py' | |||
| 124 | --- entertainerlib/frontend/gui/screens/photo_albums.py 2009-05-06 03:40:22 +0000 | |||
| 125 | +++ entertainerlib/frontend/gui/screens/photo_albums.py 2009-05-10 07:43:27 +0000 | |||
| 126 | @@ -114,31 +114,31 @@ | |||
| 127 | 114 | images = album.get_preview_images(3) | 114 | images = album.get_preview_images(3) |
| 128 | 115 | self.preview_textures = [] | 115 | self.preview_textures = [] |
| 129 | 116 | 116 | ||
| 130 | 117 | max_w = 0.4026 | ||
| 131 | 118 | max_h = 0.5599 | ||
| 132 | 119 | abs_max_w = self.get_abs_x(max_w) | ||
| 133 | 120 | abs_max_h = self.get_abs_y(max_h) | ||
| 134 | 121 | |||
| 135 | 117 | for image in images: | 122 | for image in images: |
| 136 | 118 | pix_buffer = gtk.gdk.pixbuf_new_from_file(image.get_thumbnail_url()) | 123 | pix_buffer = gtk.gdk.pixbuf_new_from_file(image.get_thumbnail_url()) |
| 139 | 119 | texture = EyeCandyTexture(pix_buffer, pix_buffer.get_width(), | 124 | ratio = float(pix_buffer.get_width()) |
| 140 | 120 | pix_buffer.get_height()) | 125 | ratio /= float(pix_buffer.get_height()) |
| 141 | 126 | |||
| 142 | 127 | # Resize and center preview texture | ||
| 143 | 128 | if ratio > 1: | ||
| 144 | 129 | texture = EyeCandyTexture(0.0, 0.0, max_w, max_h / ratio, | ||
| 145 | 130 | pix_buffer) | ||
| 146 | 131 | new_y = int((abs_max_h - abs_max_h / ratio) / 2.0) | ||
| 147 | 132 | texture.set_position(0, new_y) | ||
| 148 | 133 | else: | ||
| 149 | 134 | texture = EyeCandyTexture(0.0, 0.0, max_w * ratio, | ||
| 150 | 135 | max_h, pix_buffer) | ||
| 151 | 136 | new_x = int((abs_max_w - abs_max_w * ratio) / 2.0) | ||
| 152 | 137 | texture.set_position(new_x, 0) | ||
| 153 | 138 | |||
| 154 | 121 | texture.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) | 139 | texture.set_rotation(clutter.Y_AXIS, 25, 0, 0, 0) |
| 155 | 122 | texture.set_opacity(0) | 140 | texture.set_opacity(0) |
| 156 | 123 | 141 | ||
| 157 | 124 | # Resize and center preview texture | ||
| 158 | 125 | max_w = self.get_abs_x(0.4026) | ||
| 159 | 126 | max_h = self.get_abs_y(0.5599) | ||
| 160 | 127 | width = pix_buffer.get_width() | ||
| 161 | 128 | height = pix_buffer.get_height() | ||
| 162 | 129 | x_ratio = max_w / float(width) | ||
| 163 | 130 | y_ratio = max_h / float(height) | ||
| 164 | 131 | if x_ratio > y_ratio: | ||
| 165 | 132 | texture.set_scale(max_h /float(height), max_h / float(height)) | ||
| 166 | 133 | new_width = int(width * (max_h / float(height))) | ||
| 167 | 134 | new_x = int((max_w - new_width) / 2.0) | ||
| 168 | 135 | texture.set_position(new_x, 0) | ||
| 169 | 136 | else: | ||
| 170 | 137 | texture.set_scale(max_w / float(width), max_w / float(width)) | ||
| 171 | 138 | new_height = int(height * (max_w/ float(width))) | ||
| 172 | 139 | new_y = int((max_h - new_height) / 2.0) | ||
| 173 | 140 | texture.set_position(0, new_y) | ||
| 174 | 141 | |||
| 175 | 142 | self.preview_textures.append(texture) | 142 | self.preview_textures.append(texture) |
| 176 | 143 | group.add(texture) | 143 | group.add(texture) |
| 177 | 144 | self.preview_textures[0].set_opacity(255) | 144 | self.preview_textures[0].set_opacity(255) |
| 178 | @@ -244,16 +244,9 @@ | |||
| 179 | 244 | return True | 244 | return True |
| 180 | 245 | 245 | ||
| 181 | 246 | def _create_list_indicator(self): | 246 | def _create_list_indicator(self): |
| 190 | 247 | """ | 247 | '''Create list indicator for albums list.''' |
| 191 | 248 | Create list indicator for albums list. | 248 | self.li = ListIndicator(0.77, 0.9, 0.2, 0.045, ListIndicator.VERTICAL) |
| 184 | 249 | """ | ||
| 185 | 250 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | ||
| 186 | 251 | self.li.set_position(self.get_abs_x(0.9297) - self.li.get_width(), | ||
| 187 | 252 | self.config.get_stage_height() - self.li.get_height() - \ | ||
| 188 | 253 | self.get_abs_y(0.03906)) | ||
| 189 | 254 | self.li.set_delimiter(" | ") | ||
| 192 | 255 | self.li.set_maximum(self.menu.get_number_of_items()) | 249 | self.li.set_maximum(self.menu.get_number_of_items()) |
| 193 | 256 | self.li.set_current(1) | ||
| 194 | 257 | self.add(self.li) | 250 | self.add(self.li) |
| 195 | 258 | 251 | ||
| 196 | 259 | def _move_menu(self, menu_direction): | 252 | def _move_menu(self, menu_direction): |
| 197 | 260 | 253 | ||
| 198 | === modified file 'entertainerlib/frontend/gui/screens/photographs.py' | |||
| 199 | --- entertainerlib/frontend/gui/screens/photographs.py 2009-05-06 03:40:22 +0000 | |||
| 200 | +++ entertainerlib/frontend/gui/screens/photographs.py 2009-05-10 07:43:27 +0000 | |||
| 201 | @@ -2,7 +2,6 @@ | |||
| 202 | 2 | '''Photographs - Screen contains a list/grid of photographs''' | 2 | '''Photographs - Screen contains a list/grid of photographs''' |
| 203 | 3 | 3 | ||
| 204 | 4 | import pango | 4 | import pango |
| 205 | 5 | import clutter | ||
| 206 | 6 | import gobject | 5 | import gobject |
| 207 | 7 | 6 | ||
| 208 | 8 | from entertainerlib.frontend.gui.screens.screen import Screen | 7 | from entertainerlib.frontend.gui.screens.screen import Screen |
| 209 | @@ -38,9 +37,7 @@ | |||
| 210 | 38 | self.add(self.image_desc) | 37 | self.add(self.image_desc) |
| 211 | 39 | 38 | ||
| 212 | 40 | # Display throbber animation while loading photographs | 39 | # Display throbber animation while loading photographs |
| 216 | 41 | self.throbber = LoadingAnimation(40, clutter.Color(255, 255, 255, 255), | 40 | self.throbber = LoadingAnimation(0.9, 0.9) |
| 214 | 42 | clutter.Color(128, 128, 128, 128)) | ||
| 215 | 43 | self.throbber.set_position(self.get_abs_x(0.9), self.get_abs_y(0.9)) | ||
| 217 | 44 | self.throbber.show() | 41 | self.throbber.show() |
| 218 | 45 | self.add(self.throbber) | 42 | self.add(self.throbber) |
| 219 | 46 | 43 | ||
| 220 | @@ -99,15 +96,10 @@ | |||
| 221 | 99 | self.image_desc.set_size(0.366, 0.0911) | 96 | self.image_desc.set_size(0.366, 0.0911) |
| 222 | 100 | 97 | ||
| 223 | 101 | def _create_list_indicator(self): | 98 | def _create_list_indicator(self): |
| 231 | 102 | """ | 99 | '''Create list indicator for albums list.''' |
| 232 | 103 | Create list indicator for albums list. | 100 | self.li = ListIndicator(0.77, 0.8, 0.18, 0.045, |
| 233 | 104 | """ | 101 | ListIndicator.HORIZONTAL) |
| 227 | 105 | self.li = ListIndicator(0.18, 0.045, ListIndicator.HORIZONTAL) | ||
| 228 | 106 | self.li.set_position(self.get_abs_x(0.9297) - self.li.get_width(), | ||
| 229 | 107 | self.get_abs_y(0.7943)) | ||
| 230 | 108 | self.li.set_delimiter(" | ") | ||
| 234 | 109 | self.li.set_maximum(len(self.images)) | 102 | self.li.set_maximum(len(self.images)) |
| 235 | 110 | self.li.set_current(1) | ||
| 236 | 111 | self.add(self.li) | 103 | self.add(self.li) |
| 237 | 112 | 104 | ||
| 238 | 113 | def _move_menu(self, menu_direction): | 105 | def _move_menu(self, menu_direction): |
| 239 | 114 | 106 | ||
| 240 | === modified file 'entertainerlib/frontend/gui/screens/rss.py' | |||
| 241 | --- entertainerlib/frontend/gui/screens/rss.py 2009-06-14 19:55:40 +0000 | |||
| 242 | +++ entertainerlib/frontend/gui/screens/rss.py 2009-06-25 19:06:28 +0000 | |||
| 243 | @@ -98,13 +98,8 @@ | |||
| 244 | 98 | self.add(self.menu) | 98 | self.add(self.menu) |
| 245 | 99 | 99 | ||
| 246 | 100 | def _create_feed_menu_indicator(self): | 100 | def _create_feed_menu_indicator(self): |
| 254 | 101 | """ | 101 | '''Create a ListIndicator for feed menu.''' |
| 255 | 102 | Create a ListIndicator for feed menu. | 102 | self.li = ListIndicator(0.7, 0.9, 0.2, 0.045, ListIndicator.VERTICAL) |
| 249 | 103 | """ | ||
| 250 | 104 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | ||
| 251 | 105 | self.li.set_position(self.get_abs_x(0.8858) - self.li.get_width(), | ||
| 252 | 106 | self.get_abs_y(0.9)) | ||
| 253 | 107 | self.li.set_delimiter(" | ") | ||
| 256 | 108 | self.li.set_maximum(self.menu.get_number_of_items()) | 103 | self.li.set_maximum(self.menu.get_number_of_items()) |
| 257 | 109 | self.add(self.li) | 104 | self.add(self.li) |
| 258 | 110 | 105 | ||
| 259 | 111 | 106 | ||
| 260 | === modified file 'entertainerlib/frontend/gui/screens/tv_episodes.py' | |||
| 261 | --- entertainerlib/frontend/gui/screens/tv_episodes.py 2009-05-06 03:40:22 +0000 | |||
| 262 | +++ entertainerlib/frontend/gui/screens/tv_episodes.py 2009-07-01 11:15:57 +0000 | |||
| 263 | @@ -39,13 +39,8 @@ | |||
| 264 | 39 | self._create_episode_info_box() | 39 | self._create_episode_info_box() |
| 265 | 40 | 40 | ||
| 266 | 41 | #List indicator | 41 | #List indicator |
| 272 | 42 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 42 | self.li = ListIndicator(0.8, 0.9, 0.2, 0.045, ListIndicator.VERTICAL) |
| 268 | 43 | self.li.set_position(self.config.get_stage_width() - | ||
| 269 | 44 | self.li.get_width() - self.get_abs_x(0.06589), | ||
| 270 | 45 | self.config.get_stage_height() - self.get_abs_y(0.1953)) | ||
| 271 | 46 | self.li.set_delimiter(" | ") | ||
| 273 | 47 | self.li.set_maximum(self.episode_menu.get_number_of_items()) | 43 | self.li.set_maximum(self.episode_menu.get_number_of_items()) |
| 274 | 48 | self.li.set_current(1) | ||
| 275 | 49 | self.add(self.li) | 44 | self.add(self.li) |
| 276 | 50 | 45 | ||
| 277 | 51 | # Add the additional actions that are needed but not handled by default | 46 | # Add the additional actions that are needed but not handled by default |
| 278 | @@ -91,15 +86,15 @@ | |||
| 279 | 91 | thumbnail = menu_item.get_userdata().get_thumbnail_url() | 86 | thumbnail = menu_item.get_userdata().get_thumbnail_url() |
| 280 | 92 | if(thumbnail is not None): | 87 | if(thumbnail is not None): |
| 281 | 93 | pixbuf = gtk.gdk.pixbuf_new_from_file(thumbnail) | 88 | pixbuf = gtk.gdk.pixbuf_new_from_file(thumbnail) |
| 286 | 94 | thumb_width = self.get_abs_x(0.2928) | 89 | thumb_width = 0.2928 |
| 287 | 95 | thumb_height = self.get_abs_y(0.2799) | 90 | thumb_height = 0.2799 |
| 288 | 96 | thumb_x = self.get_abs_x(0.05) | 91 | thumb_x = 0.05 |
| 289 | 97 | thumb_y = self.get_abs_y(0.2) | 92 | thumb_y = 0.2 |
| 290 | 98 | else: | 93 | else: |
| 295 | 99 | thumb_width = self.get_abs_x(0.1098) | 94 | thumb_width = 0.1098 |
| 296 | 100 | thumb_height = self.get_abs_y(0.2799) | 95 | thumb_height = 0.2799 |
| 297 | 101 | thumb_x = self.get_abs_x(0.20) | 96 | thumb_x = 0.20 |
| 298 | 102 | thumb_y = self.get_abs_y(0.15) | 97 | thumb_y = 0.15 |
| 299 | 103 | if(self.tv_series.has_cover_art()): | 98 | if(self.tv_series.has_cover_art()): |
| 300 | 104 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 99 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 301 | 105 | self.tv_series.get_cover_art_url()) | 100 | self.tv_series.get_cover_art_url()) |
| 302 | @@ -107,8 +102,8 @@ | |||
| 303 | 107 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 102 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 304 | 108 | self.theme.getImage("default_movie_art")) | 103 | self.theme.getImage("default_movie_art")) |
| 305 | 109 | 104 | ||
| 308 | 110 | self.thumb = EyeCandyTexture(pixbuf, thumb_width, thumb_height) | 105 | self.thumb = EyeCandyTexture(thumb_x, thumb_y, thumb_width, |
| 309 | 111 | self.thumb.set_position(thumb_x, thumb_y) | 106 | thumb_height, pixbuf) |
| 310 | 112 | self.add(self.thumb) | 107 | self.add(self.thumb) |
| 311 | 113 | 108 | ||
| 312 | 114 | def _create_episode_info_box(self): | 109 | def _create_episode_info_box(self): |
| 313 | 115 | 110 | ||
| 314 | === modified file 'entertainerlib/frontend/gui/screens/tv_series.py' | |||
| 315 | --- entertainerlib/frontend/gui/screens/tv_series.py 2009-05-06 03:40:22 +0000 | |||
| 316 | +++ entertainerlib/frontend/gui/screens/tv_series.py 2009-07-01 11:15:57 +0000 | |||
| 317 | @@ -31,13 +31,8 @@ | |||
| 318 | 31 | self._create_season_menu() | 31 | self._create_season_menu() |
| 319 | 32 | 32 | ||
| 320 | 33 | #List indicator | 33 | #List indicator |
| 326 | 34 | self.li = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 34 | self.li = ListIndicator(0.8, 0.9, 0.2, 0.045, ListIndicator.VERTICAL) |
| 322 | 35 | self.li.set_position(self.config.get_stage_width() - | ||
| 323 | 36 | self.li.get_width() - self.get_abs_x(0.0659), | ||
| 324 | 37 | self.config.get_stage_height() - self.get_abs_y(0.1953)) | ||
| 325 | 38 | self.li.set_delimiter(" | ") | ||
| 327 | 39 | self.li.set_maximum(self.season_menu.get_number_of_items()) | 35 | self.li.set_maximum(self.season_menu.get_number_of_items()) |
| 328 | 40 | self.li.set_current(1) | ||
| 329 | 41 | self.add(self.li) | 36 | self.add(self.li) |
| 330 | 42 | 37 | ||
| 331 | 43 | def _create_season_menu(self): | 38 | def _create_season_menu(self): |
| 332 | @@ -74,9 +69,7 @@ | |||
| 333 | 74 | else: | 69 | else: |
| 334 | 75 | pixbuf = gtk.gdk.pixbuf_new_from_file( | 70 | pixbuf = gtk.gdk.pixbuf_new_from_file( |
| 335 | 76 | self.theme.getImage("default_movie_art")) | 71 | self.theme.getImage("default_movie_art")) |
| 339 | 77 | self.art = EyeCandyTexture(pixbuf, self.get_abs_x(0.2196), | 72 | self.art = EyeCandyTexture(0.16, 0.15, 0.2196, 0.5859, pixbuf) |
| 337 | 78 | self.get_abs_y(0.5859)) | ||
| 338 | 79 | self.art.set_position(self.get_abs_x(0.16), self.get_abs_y(0.15)) | ||
| 340 | 80 | self.add(self.art) | 73 | self.add(self.art) |
| 341 | 81 | 74 | ||
| 342 | 82 | def _move_menu(self, menu_direction): | 75 | def _move_menu(self, menu_direction): |
| 343 | 83 | 76 | ||
| 344 | === modified file 'entertainerlib/frontend/gui/tabs/albums_tab.py' | |||
| 345 | --- entertainerlib/frontend/gui/tabs/albums_tab.py 2009-05-12 06:40:51 +0000 | |||
| 346 | +++ entertainerlib/frontend/gui/tabs/albums_tab.py 2009-05-14 03:22:31 +0000 | |||
| 347 | @@ -23,10 +23,7 @@ | |||
| 348 | 23 | Tab.__init__(self, name, tab_title, move_to_new_screen_callback) | 23 | Tab.__init__(self, name, tab_title, move_to_new_screen_callback) |
| 349 | 24 | 24 | ||
| 350 | 25 | # Start the loading animation while the menu is loading | 25 | # Start the loading animation while the menu is loading |
| 355 | 26 | self.throbber = LoadingAnimation(40, | 26 | self.throbber = LoadingAnimation(0.6, 0.1) |
| 352 | 27 | clutter.Color(255, 255, 255, 255), | ||
| 353 | 28 | clutter.Color(128, 128, 128, 128)) | ||
| 354 | 29 | self.throbber.set_position(self.get_abs_x(0.1), self.get_abs_y(0.1)) | ||
| 356 | 30 | self.throbber.show() | 27 | self.throbber.show() |
| 357 | 31 | self.add(self.throbber) | 28 | self.add(self.throbber) |
| 358 | 32 | 29 | ||
| 359 | @@ -73,12 +70,9 @@ | |||
| 360 | 73 | 70 | ||
| 361 | 74 | self.add(self.menu) | 71 | self.add(self.menu) |
| 362 | 75 | 72 | ||
| 367 | 76 | self.li = ListIndicator(0.18, 0.045, ListIndicator.HORIZONTAL) | 73 | self.li = ListIndicator(0.77, 0.8, 0.18, 0.045, |
| 368 | 77 | self.li.set_position(self.get_abs_x(0.9297) - self.li.get_width(), | 74 | ListIndicator.HORIZONTAL) |
| 365 | 78 | self.get_abs_y(0.7943)) | ||
| 366 | 79 | self.li.set_delimiter(" | ") | ||
| 369 | 80 | self.li.set_maximum(len(albums)) | 75 | self.li.set_maximum(len(albums)) |
| 370 | 81 | self.li.set_current(1) | ||
| 371 | 82 | self.li.show() | 76 | self.li.show() |
| 372 | 83 | self.add(self.li) | 77 | self.add(self.li) |
| 373 | 84 | 78 | ||
| 374 | 85 | 79 | ||
| 375 | === modified file 'entertainerlib/frontend/gui/tabs/artists_tab.py' | |||
| 376 | --- entertainerlib/frontend/gui/tabs/artists_tab.py 2009-05-12 11:25:32 +0000 | |||
| 377 | +++ entertainerlib/frontend/gui/tabs/artists_tab.py 2009-05-14 03:22:31 +0000 | |||
| 378 | @@ -23,10 +23,7 @@ | |||
| 379 | 23 | self.library = music_library | 23 | self.library = music_library |
| 380 | 24 | 24 | ||
| 381 | 25 | # Start the loading animation while the menu is loading | 25 | # Start the loading animation while the menu is loading |
| 386 | 26 | self.throbber = LoadingAnimation(40, | 26 | self.throbber = LoadingAnimation(0.1, 0.1) |
| 383 | 27 | clutter.Color(255, 255, 255, 255), | ||
| 384 | 28 | clutter.Color(128, 128, 128, 128)) | ||
| 385 | 29 | self.throbber.set_position(self.get_abs_x(0.1), self.get_abs_y(0.1)) | ||
| 387 | 30 | self.throbber.show() | 27 | self.throbber.show() |
| 388 | 31 | self.add(self.throbber) | 28 | self.add(self.throbber) |
| 389 | 32 | 29 | ||
| 390 | @@ -56,12 +53,9 @@ | |||
| 391 | 56 | self.add(self.artist_tracks) | 53 | self.add(self.artist_tracks) |
| 392 | 57 | 54 | ||
| 393 | 58 | # Create artis menu list indicator | 55 | # Create artis menu list indicator |
| 398 | 59 | self.li = ListIndicator(0.18, 0.045, ListIndicator.HORIZONTAL) | 56 | self.li = ListIndicator(0.77, 0.8, 0.18, 0.045, |
| 399 | 60 | self.li.set_position(self.get_abs_x(0.929) - self.li.get_width(), | 57 | ListIndicator.HORIZONTAL) |
| 396 | 61 | self.get_abs_y(0.794)) | ||
| 397 | 62 | self.li.set_delimiter(" | ") | ||
| 400 | 63 | self.li.set_maximum(len(artists)) | 58 | self.li.set_maximum(len(artists)) |
| 401 | 64 | self.li.set_current(1) | ||
| 402 | 65 | self.add(self.li) | 59 | self.add(self.li) |
| 403 | 66 | 60 | ||
| 404 | 67 | self._async_menu_build(artists) | 61 | self._async_menu_build(artists) |
| 405 | 68 | 62 | ||
| 406 | === modified file 'entertainerlib/frontend/gui/tabs/lyrics_tab.py' | |||
| 407 | --- entertainerlib/frontend/gui/tabs/lyrics_tab.py 2009-05-11 18:23:38 +0000 | |||
| 408 | +++ entertainerlib/frontend/gui/tabs/lyrics_tab.py 2009-05-14 03:22:31 +0000 | |||
| 409 | @@ -2,7 +2,6 @@ | |||
| 410 | 2 | '''Lyrics tab for the audio play screen''' | 2 | '''Lyrics tab for the audio play screen''' |
| 411 | 3 | 3 | ||
| 412 | 4 | import pango | 4 | import pango |
| 413 | 5 | import clutter | ||
| 414 | 6 | 5 | ||
| 415 | 7 | from entertainerlib.frontend.gui.tabs.tab import Tab | 6 | from entertainerlib.frontend.gui.tabs.tab import Tab |
| 416 | 8 | from entertainerlib.frontend.gui.widgets.label import Label | 7 | from entertainerlib.frontend.gui.widgets.label import Label |
| 417 | @@ -34,10 +33,7 @@ | |||
| 418 | 34 | self.connect('deactivated', self._on_deactivated) | 33 | self.connect('deactivated', self._on_deactivated) |
| 419 | 35 | else: | 34 | else: |
| 420 | 36 | # Display throbber animation while searching for lyrics | 35 | # Display throbber animation while searching for lyrics |
| 425 | 37 | white = clutter.Color(255, 255, 255, 255) | 36 | self.throbber = LoadingAnimation(0.7, 0.5, 0.1) |
| 422 | 38 | gray = clutter.Color(128, 128, 128, 128) | ||
| 423 | 39 | self.throbber = LoadingAnimation(50, white, gray) | ||
| 424 | 40 | self.throbber.set_position(self.get_abs_x(0.7), self.get_abs_y(0.5)) | ||
| 426 | 41 | self.throbber.show() | 37 | self.throbber.show() |
| 427 | 42 | self.add(self.throbber) | 38 | self.add(self.throbber) |
| 428 | 43 | self.track.fetch_lyrics(self._lyrics_search_callback) | 39 | self.track.fetch_lyrics(self._lyrics_search_callback) |
| 429 | 44 | 40 | ||
| 430 | === modified file 'entertainerlib/frontend/gui/tabs/movies_tab.py' | |||
| 431 | --- entertainerlib/frontend/gui/tabs/movies_tab.py 2009-05-12 10:15:40 +0000 | |||
| 432 | +++ entertainerlib/frontend/gui/tabs/movies_tab.py 2009-05-14 03:22:31 +0000 | |||
| 433 | @@ -82,8 +82,7 @@ | |||
| 434 | 82 | if movie.has_cover_art(): | 82 | if movie.has_cover_art(): |
| 435 | 83 | pix_buffer = gtk.gdk.pixbuf_new_from_file( | 83 | pix_buffer = gtk.gdk.pixbuf_new_from_file( |
| 436 | 84 | movie.get_cover_art_url()) | 84 | movie.get_cover_art_url()) |
| 439 | 85 | texture = RoundedTexture(pix_buffer, self.get_abs_x(0.1), | 85 | texture = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer) |
| 438 | 86 | self.get_abs_y(0.25)) | ||
| 440 | 87 | else: | 86 | else: |
| 441 | 88 | texture = clutter.CloneTexture(default_cover) | 87 | texture = clutter.CloneTexture(default_cover) |
| 442 | 89 | item = ImageMenuItem(0.1, 1.41, texture) | 88 | item = ImageMenuItem(0.1, 1.41, texture) |
| 443 | @@ -99,12 +98,9 @@ | |||
| 444 | 99 | self.add(self.menu) | 98 | self.add(self.menu) |
| 445 | 100 | 99 | ||
| 446 | 101 | # Create list indicator | 100 | # Create list indicator |
| 451 | 102 | self.list_indicator = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 101 | self.list_indicator = ListIndicator(0.75, 0.76, 0.2, 0.045, |
| 452 | 103 | self.list_indicator.set_position(self.get_abs_x(0.75), | 102 | ListIndicator.VERTICAL) |
| 449 | 104 | self.get_abs_y(0.76)) | ||
| 450 | 105 | self.list_indicator.set_delimiter(" | ") | ||
| 453 | 106 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) | 103 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) |
| 454 | 107 | self.list_indicator.set_current(1) | ||
| 455 | 108 | self.show() | 104 | self.show() |
| 456 | 109 | self.add(self.list_indicator) | 105 | self.add(self.list_indicator) |
| 457 | 110 | 106 | ||
| 458 | 111 | 107 | ||
| 459 | === modified file 'entertainerlib/frontend/gui/tabs/series_tab.py' | |||
| 460 | --- entertainerlib/frontend/gui/tabs/series_tab.py 2009-05-11 18:28:52 +0000 | |||
| 461 | +++ entertainerlib/frontend/gui/tabs/series_tab.py 2009-05-14 03:22:31 +0000 | |||
| 462 | @@ -81,8 +81,7 @@ | |||
| 463 | 81 | if series.has_cover_art(): | 81 | if series.has_cover_art(): |
| 464 | 82 | pix_buffer = gtk.gdk.pixbuf_new_from_file( | 82 | pix_buffer = gtk.gdk.pixbuf_new_from_file( |
| 465 | 83 | series.get_cover_art_url()) | 83 | series.get_cover_art_url()) |
| 468 | 84 | texture = RoundedTexture(pix_buffer, self.get_abs_x(0.1), | 84 | texture = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer) |
| 467 | 85 | self.get_abs_y(0.25)) | ||
| 469 | 86 | else: | 85 | else: |
| 470 | 87 | texture = clutter.CloneTexture(default_cover) | 86 | texture = clutter.CloneTexture(default_cover) |
| 471 | 88 | 87 | ||
| 472 | @@ -100,12 +99,9 @@ | |||
| 473 | 100 | self.add(self.menu) | 99 | self.add(self.menu) |
| 474 | 101 | 100 | ||
| 475 | 102 | # Create list indicator | 101 | # Create list indicator |
| 480 | 103 | self.list_indicator = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 102 | self.list_indicator = ListIndicator(0.75, 0.76, 0.2, 0.045, |
| 481 | 104 | self.list_indicator.set_position(self.get_abs_x(0.75), | 103 | ListIndicator.VERTICAL) |
| 478 | 105 | self.get_abs_y(0.76)) | ||
| 479 | 106 | self.list_indicator.set_delimiter(" | ") | ||
| 482 | 107 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) | 104 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) |
| 483 | 108 | self.list_indicator.set_current(1) | ||
| 484 | 109 | self.list_indicator.show() | 105 | self.list_indicator.show() |
| 485 | 110 | self.add(self.list_indicator) | 106 | self.add(self.list_indicator) |
| 486 | 111 | 107 | ||
| 487 | 112 | 108 | ||
| 488 | === modified file 'entertainerlib/frontend/gui/tabs/tracks_tab.py' | |||
| 489 | --- entertainerlib/frontend/gui/tabs/tracks_tab.py 2009-05-11 10:10:27 +0000 | |||
| 490 | +++ entertainerlib/frontend/gui/tabs/tracks_tab.py 2009-05-14 03:22:31 +0000 | |||
| 491 | @@ -55,12 +55,9 @@ | |||
| 492 | 55 | self.track_length = Label(0.037, "subtitle", 0.22, 0.91, "") | 55 | self.track_length = Label(0.037, "subtitle", 0.22, 0.91, "") |
| 493 | 56 | self.add(self.track_length) | 56 | self.add(self.track_length) |
| 494 | 57 | 57 | ||
| 499 | 58 | self.li = ListIndicator(0.18, 0.045, ListIndicator.HORIZONTAL) | 58 | self.li = ListIndicator(0.77, 0.8, 0.18, 0.045, |
| 500 | 59 | self.li.set_position(self.get_abs_x(0.9297) - self.li.get_width(), | 59 | ListIndicator.HORIZONTAL) |
| 497 | 60 | self.get_abs_y(0.7943)) | ||
| 498 | 61 | self.li.set_delimiter(" | ") | ||
| 501 | 62 | self.li.set_maximum(self.menu.get_number_of_items()) | 60 | self.li.set_maximum(self.menu.get_number_of_items()) |
| 502 | 63 | self.li.set_current(1) | ||
| 503 | 64 | self.li.show() | 61 | self.li.show() |
| 504 | 65 | self.add(self.li) | 62 | self.add(self.li) |
| 505 | 66 | 63 | ||
| 506 | 67 | 64 | ||
| 507 | === modified file 'entertainerlib/frontend/gui/tabs/video_clips_tab.py' | |||
| 508 | --- entertainerlib/frontend/gui/tabs/video_clips_tab.py 2009-05-11 10:12:11 +0000 | |||
| 509 | +++ entertainerlib/frontend/gui/tabs/video_clips_tab.py 2009-05-14 03:22:31 +0000 | |||
| 510 | @@ -75,8 +75,7 @@ | |||
| 511 | 75 | clips = self.video_library.get_video_clips() | 75 | clips = self.video_library.get_video_clips() |
| 512 | 76 | for clip in clips: | 76 | for clip in clips: |
| 513 | 77 | pix_buffer = gtk.gdk.pixbuf_new_from_file(clip.get_thumbnail_url()) | 77 | pix_buffer = gtk.gdk.pixbuf_new_from_file(clip.get_thumbnail_url()) |
| 516 | 78 | texture = RoundedTexture(pix_buffer, self.get_abs_x(0.233), | 78 | texture = RoundedTexture(0.0, 0.0, 0.233, 0.25, pix_buffer) |
| 515 | 79 | self.get_abs_y(0.25)) | ||
| 517 | 80 | item = ImageMenuItem(0.233, 0.5625, texture) | 79 | item = ImageMenuItem(0.233, 0.5625, texture) |
| 518 | 81 | item.set_userdata(clip) | 80 | item.set_userdata(clip) |
| 519 | 82 | self.menu.add_actor(item) | 81 | self.menu.add_actor(item) |
| 520 | @@ -90,12 +89,9 @@ | |||
| 521 | 90 | self.add(self.menu) | 89 | self.add(self.menu) |
| 522 | 91 | 90 | ||
| 523 | 92 | # Create list indicator | 91 | # Create list indicator |
| 528 | 93 | self.list_indicator = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 92 | self.list_indicator = ListIndicator(0.7, 0.8, 0.2, 0.045, |
| 529 | 94 | self.list_indicator.set_position(self.get_abs_x(0.67), | 93 | ListIndicator.VERTICAL) |
| 526 | 95 | self.get_abs_y(0.76)) | ||
| 527 | 96 | self.list_indicator.set_delimiter(" | ") | ||
| 530 | 97 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) | 94 | self.list_indicator.set_maximum(self.menu.get_number_of_items()) |
| 531 | 98 | self.list_indicator.set_current(1) | ||
| 532 | 99 | self.list_indicator.show() | 95 | self.list_indicator.show() |
| 533 | 100 | self.add(self.list_indicator) | 96 | self.add(self.list_indicator) |
| 534 | 101 | 97 | ||
| 535 | 102 | 98 | ||
| 536 | === modified file 'entertainerlib/frontend/gui/widgets/arrow_texture.py' | |||
| 537 | --- entertainerlib/frontend/gui/widgets/arrow_texture.py 2009-05-06 03:40:22 +0000 | |||
| 538 | +++ entertainerlib/frontend/gui/widgets/arrow_texture.py 2009-06-30 20:11:01 +0000 | |||
| 539 | @@ -4,7 +4,9 @@ | |||
| 540 | 4 | import clutter | 4 | import clutter |
| 541 | 5 | from cluttercairo import CairoTexture | 5 | from cluttercairo import CairoTexture |
| 542 | 6 | 6 | ||
| 544 | 7 | class ArrowTexture(CairoTexture): | 7 | from entertainerlib.frontend.gui.widgets.base import Base |
| 545 | 8 | |||
| 546 | 9 | class ArrowTexture(Base, CairoTexture): | ||
| 547 | 8 | """Clutter CairoTexture which represents an arrow.""" | 10 | """Clutter CairoTexture which represents an arrow.""" |
| 548 | 9 | 11 | ||
| 549 | 10 | # Arrow direction (One of these should be passed as a paramter) | 12 | # Arrow direction (One of these should be passed as a paramter) |
| 550 | @@ -14,7 +16,7 @@ | |||
| 551 | 14 | LEFT = 3 | 16 | LEFT = 3 |
| 552 | 15 | ARC_TO_BEZIER = 0.55228475 | 17 | ARC_TO_BEZIER = 0.55228475 |
| 553 | 16 | 18 | ||
| 555 | 17 | def __init__(self, size, fg_color, bg_color, direction): | 19 | def __init__(self, x, y, size, fg_color, bg_color, direction): |
| 556 | 18 | """ | 20 | """ |
| 557 | 19 | Initialize ArrowTexture | 21 | Initialize ArrowTexture |
| 558 | 20 | @param size: Width and height of the texture | 22 | @param size: Width and height of the texture |
| 559 | @@ -23,9 +25,15 @@ | |||
| 560 | 23 | @param direction: Arrow direction UP,DOWN,RIGHT or LEFT (class | 25 | @param direction: Arrow direction UP,DOWN,RIGHT or LEFT (class |
| 561 | 24 | constant) | 26 | constant) |
| 562 | 25 | """ | 27 | """ |
| 564 | 26 | CairoTexture.__init__(self, size, size) | 28 | Base.__init__(self) |
| 565 | 29 | |||
| 566 | 30 | abs_size = self.get_abs_x(size) | ||
| 567 | 31 | |||
| 568 | 32 | CairoTexture.__init__(self, abs_size, abs_size) | ||
| 569 | 33 | |||
| 570 | 27 | context = self.cairo_create() | 34 | context = self.cairo_create() |
| 572 | 28 | context.scale(size, size) | 35 | context.scale(abs_size, abs_size) |
| 573 | 36 | |||
| 574 | 29 | fg_cairo = self._color_to_cairo_color(fg_color) | 37 | fg_cairo = self._color_to_cairo_color(fg_color) |
| 575 | 30 | bg_cairo = self._color_to_cairo_color(bg_color) | 38 | bg_cairo = self._color_to_cairo_color(bg_color) |
| 576 | 31 | 39 | ||
| 577 | @@ -69,6 +77,8 @@ | |||
| 578 | 69 | self.behaviour = clutter.BehaviourScale(1.0, 1.0, 1.5, 1.5, self.alpha) | 77 | self.behaviour = clutter.BehaviourScale(1.0, 1.0, 1.5, 1.5, self.alpha) |
| 579 | 70 | self.behaviour.apply(self) | 78 | self.behaviour.apply(self) |
| 580 | 71 | 79 | ||
| 581 | 80 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 582 | 81 | |||
| 583 | 72 | def bounce(self): | 82 | def bounce(self): |
| 584 | 73 | """ | 83 | """ |
| 585 | 74 | Execute bounce effect for this array. | 84 | Execute bounce effect for this array. |
| 586 | @@ -116,3 +126,4 @@ | |||
| 587 | 116 | cr.rel_line_to(0, -height + 2 * radius_y) | 126 | cr.rel_line_to(0, -height + 2 * radius_y) |
| 588 | 117 | cr.rel_curve_to(0.0, -c2, radius_x - c1, -radius_y, radius_x, -radius_y) | 127 | cr.rel_curve_to(0.0, -c2, radius_x - c1, -radius_y, radius_x, -radius_y) |
| 589 | 118 | cr.close_path() | 128 | cr.close_path() |
| 590 | 129 | |||
| 591 | 119 | 130 | ||
| 592 | === modified file 'entertainerlib/frontend/gui/widgets/eyecandy_texture.py' | |||
| 593 | --- entertainerlib/frontend/gui/widgets/eyecandy_texture.py 2009-05-06 03:40:22 +0000 | |||
| 594 | +++ entertainerlib/frontend/gui/widgets/eyecandy_texture.py 2009-05-10 07:43:27 +0000 | |||
| 595 | @@ -3,27 +3,33 @@ | |||
| 596 | 3 | 3 | ||
| 597 | 4 | import clutter | 4 | import clutter |
| 598 | 5 | 5 | ||
| 599 | 6 | from entertainerlib.frontend.gui.widgets.base import Base | ||
| 600 | 6 | from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture | 7 | from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture |
| 601 | 7 | from entertainerlib.frontend.gui.widgets.reflection_texture import ( | 8 | from entertainerlib.frontend.gui.widgets.reflection_texture import ( |
| 602 | 8 | ReflectionTexture) | 9 | ReflectionTexture) |
| 603 | 9 | 10 | ||
| 605 | 10 | class EyeCandyTexture(clutter.Group): | 11 | class EyeCandyTexture(Base, clutter.Group): |
| 606 | 11 | """ | 12 | """ |
| 607 | 12 | Just a simple wrapper class for RoundedTexture and ReflectionTexture. | 13 | Just a simple wrapper class for RoundedTexture and ReflectionTexture. |
| 608 | 13 | 14 | ||
| 609 | 14 | EyeCandyTexture is a texture with rounded corners and reflection below. | 15 | EyeCandyTexture is a texture with rounded corners and reflection below. |
| 610 | 15 | """ | 16 | """ |
| 611 | 16 | 17 | ||
| 613 | 17 | def __init__(self, pixbuf, width, height): | 18 | def __init__(self, x, y, width, height, pixbuf): |
| 614 | 18 | """ | 19 | """ |
| 615 | 19 | Initialize new eye candy texture | 20 | Initialize new eye candy texture |
| 616 | 20 | @param imagefile: Absoulte path to PNG file | 21 | @param imagefile: Absoulte path to PNG file |
| 617 | 21 | """ | 22 | """ |
| 618 | 23 | Base.__init__(self) | ||
| 619 | 22 | clutter.Group.__init__(self) | 24 | clutter.Group.__init__(self) |
| 622 | 23 | rounded = RoundedTexture(pixbuf, width, height) | 25 | |
| 623 | 24 | reflection = ReflectionTexture(pixbuf, width, height, | 26 | rounded = RoundedTexture(0.0, 0.0, width, height, pixbuf) |
| 624 | 27 | reflection = ReflectionTexture(0.0, 0.0, width, height, pixbuf, | ||
| 625 | 25 | round_corners=True) | 28 | round_corners=True) |
| 627 | 26 | reflection.set_position(0, height) | 29 | |
| 628 | 30 | reflection.set_position(0, rounded.get_height()) | ||
| 629 | 31 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 630 | 32 | |||
| 631 | 27 | self.add(rounded) | 33 | self.add(rounded) |
| 632 | 28 | self.add(reflection) | 34 | self.add(reflection) |
| 633 | 29 | 35 | ||
| 634 | 30 | 36 | ||
| 635 | === modified file 'entertainerlib/frontend/gui/widgets/list_indicator.py' | |||
| 636 | --- entertainerlib/frontend/gui/widgets/list_indicator.py 2009-05-06 03:40:22 +0000 | |||
| 637 | +++ entertainerlib/frontend/gui/widgets/list_indicator.py 2009-05-10 07:43:27 +0000 | |||
| 638 | @@ -4,10 +4,11 @@ | |||
| 639 | 4 | import clutter | 4 | import clutter |
| 640 | 5 | 5 | ||
| 641 | 6 | from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture | 6 | from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture |
| 642 | 7 | from entertainerlib.frontend.gui.widgets.base import Base | ||
| 643 | 7 | from entertainerlib.frontend.gui.widgets.label import Label | 8 | from entertainerlib.frontend.gui.widgets.label import Label |
| 644 | 8 | from entertainerlib.utils.configuration import Configuration | 9 | from entertainerlib.utils.configuration import Configuration |
| 645 | 9 | 10 | ||
| 647 | 10 | class ListIndicator(clutter.Group): | 11 | class ListIndicator(Base, clutter.Group): |
| 648 | 11 | """ | 12 | """ |
| 649 | 12 | ListIndicator displays 'current / maximum' value label and arrows. | 13 | ListIndicator displays 'current / maximum' value label and arrows. |
| 650 | 13 | """ | 14 | """ |
| 651 | @@ -18,22 +19,24 @@ | |||
| 652 | 18 | HORIZONTAL = 0 | 19 | HORIZONTAL = 0 |
| 653 | 19 | VERTICAL = 1 | 20 | VERTICAL = 1 |
| 654 | 20 | 21 | ||
| 656 | 21 | def __init__(self, width, height, direction): | 22 | def __init__(self, x, y, width, height, direction): |
| 657 | 22 | """ | 23 | """ |
| 658 | 23 | Initialize actor. | 24 | Initialize actor. |
| 659 | 24 | @param width: Width of the widget in percentage (0-1) | 25 | @param width: Width of the widget in percentage (0-1) |
| 660 | 25 | @param height: Height of the widget in percentage (0-1) | 26 | @param height: Height of the widget in percentage (0-1) |
| 661 | 26 | @param direction: Direction (constant of this class) | 27 | @param direction: Direction (constant of this class) |
| 662 | 27 | """ | 28 | """ |
| 663 | 29 | Base.__init__(self) | ||
| 664 | 28 | clutter.Group.__init__(self) | 30 | clutter.Group.__init__(self) |
| 665 | 31 | |||
| 666 | 29 | self.config = Configuration() | 32 | self.config = Configuration() |
| 667 | 30 | 33 | ||
| 668 | 31 | # Size | 34 | # Size |
| 671 | 32 | self.width = int(self.config.get_stage_width() * width) | 35 | self.width = self.get_abs_x(width) |
| 672 | 33 | self.height = int(self.config.get_stage_height() * height) | 36 | self.height = self.get_abs_y(height) |
| 673 | 34 | 37 | ||
| 674 | 35 | self.direction = direction | 38 | self.direction = direction |
| 676 | 36 | self.delimiter = " / " | 39 | self.delimiter = " | " |
| 677 | 37 | self.current = 1 | 40 | self.current = 1 |
| 678 | 38 | self.maximum = 1 | 41 | self.maximum = 1 |
| 679 | 39 | 42 | ||
| 680 | @@ -41,10 +44,7 @@ | |||
| 681 | 41 | self.fg = self.theme.get_color("arrow_foreground") | 44 | self.fg = self.theme.get_color("arrow_foreground") |
| 682 | 42 | self.bg = self.theme.get_color("arrow_background") | 45 | self.bg = self.theme.get_color("arrow_background") |
| 683 | 43 | 46 | ||
| 688 | 44 | if direction == ListIndicator.VERTICAL: | 47 | text_x_pos = width / 3 |
| 685 | 45 | text_x_pos = width / 3 | ||
| 686 | 46 | else: | ||
| 687 | 47 | text_x_pos = width / 2 | ||
| 689 | 48 | 48 | ||
| 690 | 49 | self.text = Label(height * 0.8, "text", text_x_pos, (height / 2), | 49 | self.text = Label(height * 0.8, "text", text_x_pos, (height / 2), |
| 691 | 50 | str(self.maximum) + self.delimiter + str(self.maximum)) | 50 | str(self.maximum) + self.delimiter + str(self.maximum)) |
| 692 | @@ -53,30 +53,22 @@ | |||
| 693 | 53 | 53 | ||
| 694 | 54 | # Create arrows and calculate positions on screen | 54 | # Create arrows and calculate positions on screen |
| 695 | 55 | if direction == ListIndicator.VERTICAL: | 55 | if direction == ListIndicator.VERTICAL: |
| 705 | 56 | self.arrow1 = ArrowTexture( | 56 | self.arrow1 = ArrowTexture(5 * width / 7, height / 2, height / 2, |
| 706 | 57 | self.height, self.fg, self.bg, ArrowTexture.UP) | 57 | self.fg, self.bg, ArrowTexture.UP) |
| 707 | 58 | self.arrow2 = ArrowTexture( | 58 | self.arrow2 = ArrowTexture(6 * width / 7, height / 2, height / 2, |
| 708 | 59 | self.height, self.fg, self.bg, ArrowTexture.DOWN) | 59 | self.fg, self.bg, ArrowTexture.DOWN) |
| 700 | 60 | self.arrow1.set_position( | ||
| 701 | 61 | int(self.width - self.height / 2.0), int(self.height / 2.0)) | ||
| 702 | 62 | self.arrow2.set_position( | ||
| 703 | 63 | int(self.width - (self.height * 1.5 + self.height / 6.0)), | ||
| 704 | 64 | int(self.height / 2.0)) | ||
| 709 | 65 | 60 | ||
| 710 | 66 | elif direction == ListIndicator.HORIZONTAL: | 61 | elif direction == ListIndicator.HORIZONTAL: |
| 720 | 67 | self.arrow1 = ArrowTexture( | 62 | self.arrow1 = ArrowTexture(height / 2, height / 2, height / 2, |
| 721 | 68 | self.height, self.fg, self.bg, ArrowTexture.LEFT) | 63 | self.fg, self.bg, ArrowTexture.LEFT) |
| 722 | 69 | self.arrow2 = ArrowTexture( | 64 | self.arrow2 = ArrowTexture(6 * width / 7, height / 2, height / 2, |
| 723 | 70 | self.height, self.fg, self.bg, ArrowTexture.RIGHT) | 65 | self.fg, self.bg, ArrowTexture.RIGHT) |
| 715 | 71 | self.arrow1.set_position( | ||
| 716 | 72 | int(self.height / 2.0), | ||
| 717 | 73 | int(self.height / 2.0)) | ||
| 718 | 74 | self.arrow2.set_position( | ||
| 719 | 75 | int(self.width - self.height / 2.0), int(self.height / 2.0)) | ||
| 724 | 76 | 66 | ||
| 725 | 77 | self.add(self.arrow1) | 67 | self.add(self.arrow1) |
| 726 | 78 | self.add(self.arrow2) | 68 | self.add(self.arrow2) |
| 727 | 79 | 69 | ||
| 728 | 70 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 729 | 71 | |||
| 730 | 80 | def set_current(self, value): | 72 | def set_current(self, value): |
| 731 | 81 | """ | 73 | """ |
| 732 | 82 | Set current value | 74 | Set current value |
| 733 | 83 | 75 | ||
| 734 | === modified file 'entertainerlib/frontend/gui/widgets/loading_animation.py' | |||
| 735 | --- entertainerlib/frontend/gui/widgets/loading_animation.py 2009-05-06 03:40:22 +0000 | |||
| 736 | +++ entertainerlib/frontend/gui/widgets/loading_animation.py 2009-05-10 07:43:27 +0000 | |||
| 737 | @@ -7,15 +7,17 @@ | |||
| 738 | 7 | import gobject | 7 | import gobject |
| 739 | 8 | from cluttercairo import CairoTexture | 8 | from cluttercairo import CairoTexture |
| 740 | 9 | 9 | ||
| 742 | 10 | class LoadingAnimation(CairoTexture): | 10 | from entertainerlib.frontend.gui.widgets.base import Base |
| 743 | 11 | |||
| 744 | 12 | class LoadingAnimation(Base, CairoTexture): | ||
| 745 | 11 | """ | 13 | """ |
| 746 | 12 | Loading animation widget | 14 | Loading animation widget |
| 747 | 13 | 15 | ||
| 748 | 14 | This widget is used when we want to tell user that Entertainer is loading. | 16 | This widget is used when we want to tell user that Entertainer is loading. |
| 749 | 15 | """ | 17 | """ |
| 750 | 16 | 18 | ||
| 753 | 17 | def __init__(self, size, fg_color, bg_color, inner_radius = 0.25, | 19 | def __init__(self, x, y, size=0.03, inner_radius=0.25, outter_radius=0.45, |
| 754 | 18 | outter_radius = 0.45, thickness = 0.08): | 20 | thickness=0.08): |
| 755 | 19 | """ | 21 | """ |
| 756 | 20 | Initialize LoadingAnimation | 22 | Initialize LoadingAnimation |
| 757 | 21 | @param size: Width and height of the texture | 23 | @param size: Width and height of the texture |
| 758 | @@ -25,14 +27,19 @@ | |||
| 759 | 25 | @param outter_radius: Distance from origo to line end point 0-1 | 27 | @param outter_radius: Distance from origo to line end point 0-1 |
| 760 | 26 | @param thinkness: Lines thickness 0-1 | 28 | @param thinkness: Lines thickness 0-1 |
| 761 | 27 | """ | 29 | """ |
| 767 | 28 | CairoTexture.__init__(self, size, size) | 30 | Base.__init__(self) |
| 768 | 29 | self.set_anchor_point(size /2, size /2) | 31 | |
| 769 | 30 | 32 | abs_size = self.get_abs_x(size) | |
| 770 | 31 | c = self._clutterColorToCairoColor(fg_color) | 33 | |
| 771 | 32 | bg = self._clutterColorToCairoColor(bg_color) | 34 | CairoTexture.__init__(self, abs_size, abs_size) |
| 772 | 35 | |||
| 773 | 36 | self.set_anchor_point(abs_size /2, abs_size /2) | ||
| 774 | 37 | |||
| 775 | 38 | c = self._clutterColorToCairoColor(clutter.Color(255, 255, 255, 255)) | ||
| 776 | 39 | bg = self._clutterColorToCairoColor(clutter.Color(128, 128, 128, 128)) | ||
| 777 | 33 | 40 | ||
| 778 | 34 | context = self.cairo_create() | 41 | context = self.cairo_create() |
| 780 | 35 | context.scale(size, size) | 42 | context.scale(abs_size, abs_size) |
| 781 | 36 | context.set_line_width (thickness) | 43 | context.set_line_width (thickness) |
| 782 | 37 | context.set_line_cap(cairo.LINE_CAP_ROUND) | 44 | context.set_line_cap(cairo.LINE_CAP_ROUND) |
| 783 | 38 | 45 | ||
| 784 | @@ -44,6 +51,8 @@ | |||
| 785 | 44 | 51 | ||
| 786 | 45 | self.keep_going = False | 52 | self.keep_going = False |
| 787 | 46 | 53 | ||
| 788 | 54 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 789 | 55 | |||
| 790 | 47 | def _draw_line(self, context, bg_col, fg_col, radius, in_radius, number): | 56 | def _draw_line(self, context, bg_col, fg_col, radius, in_radius, number): |
| 791 | 48 | """Draw one line""" | 57 | """Draw one line""" |
| 792 | 49 | if number < 2: | 58 | if number < 2: |
| 793 | 50 | 59 | ||
| 794 | === modified file 'entertainerlib/frontend/gui/widgets/reflection_texture.py' | |||
| 795 | --- entertainerlib/frontend/gui/widgets/reflection_texture.py 2009-05-06 03:40:22 +0000 | |||
| 796 | +++ entertainerlib/frontend/gui/widgets/reflection_texture.py 2009-07-01 10:52:59 +0000 | |||
| 797 | @@ -6,7 +6,9 @@ | |||
| 798 | 6 | import clutter | 6 | import clutter |
| 799 | 7 | from cluttercairo import CairoTexture | 7 | from cluttercairo import CairoTexture |
| 800 | 8 | 8 | ||
| 802 | 9 | class ReflectionTexture(CairoTexture): | 9 | from entertainerlib.frontend.gui.widgets.base import Base |
| 803 | 10 | |||
| 804 | 11 | class ReflectionTexture(Base, CairoTexture): | ||
| 805 | 10 | """ | 12 | """ |
| 806 | 11 | Reflection texture | 13 | Reflection texture |
| 807 | 12 | 14 | ||
| 808 | @@ -14,7 +16,7 @@ | |||
| 809 | 14 | is rendered with Cairo. | 16 | is rendered with Cairo. |
| 810 | 15 | """ | 17 | """ |
| 811 | 16 | 18 | ||
| 813 | 17 | def __init__(self, pixbuf, width, height, ref_height=0.3, opacity=0.3, | 19 | def __init__(self, x, y, width, height, pixbuf, ref_height=0.3, opacity=0.3, |
| 814 | 18 | round_corners=False, margin=1, radius=15): | 20 | round_corners=False, margin=1, radius=15): |
| 815 | 19 | """ | 21 | """ |
| 816 | 20 | Create a new reflection texture | 22 | Create a new reflection texture |
| 817 | @@ -27,7 +29,13 @@ | |||
| 818 | 27 | @param margin: number of pixels to cut off from sides | 29 | @param margin: number of pixels to cut off from sides |
| 819 | 28 | @param radius: Radius for rounded corners | 30 | @param radius: Radius for rounded corners |
| 820 | 29 | """ | 31 | """ |
| 822 | 30 | CairoTexture.__init__(self, width, height) | 32 | Base.__init__(self) |
| 823 | 33 | |||
| 824 | 34 | abs_width = self.get_abs_x(width) | ||
| 825 | 35 | abs_height = self.get_abs_y(height) | ||
| 826 | 36 | |||
| 827 | 37 | CairoTexture.__init__(self, abs_width, abs_height) | ||
| 828 | 38 | |||
| 829 | 31 | context = self.cairo_create() | 39 | context = self.cairo_create() |
| 830 | 32 | ct = gtk.gdk.CairoContext(context) | 40 | ct = gtk.gdk.CairoContext(context) |
| 831 | 33 | 41 | ||
| 832 | @@ -35,13 +43,13 @@ | |||
| 833 | 35 | if round_corners: | 43 | if round_corners: |
| 834 | 36 | x = 0 + margin | 44 | x = 0 + margin |
| 835 | 37 | y = 0 + margin | 45 | y = 0 + margin |
| 838 | 38 | w1 = width - (margin * 2) | 46 | w1 = abs_width - (margin * 2) |
| 839 | 39 | h1 = height - (margin * 2) | 47 | h1 = abs_height - (margin * 2) |
| 840 | 40 | self.roundedCorners(context, x, y, w1, h1, radius, radius) | 48 | self.roundedCorners(context, x, y, w1, h1, radius, radius) |
| 841 | 41 | 49 | ||
| 842 | 42 | # Scale context area | 50 | # Scale context area |
| 845 | 43 | wr = width / float(pixbuf.get_width()) | 51 | wr = abs_width / float(pixbuf.get_width()) |
| 846 | 44 | hr = height / float(pixbuf.get_height()) | 52 | hr = abs_height / float(pixbuf.get_height()) |
| 847 | 45 | context.scale(wr, hr) | 53 | context.scale(wr, hr) |
| 848 | 46 | 54 | ||
| 849 | 47 | # Create gradient mask | 55 | # Create gradient mask |
| 850 | @@ -59,6 +67,8 @@ | |||
| 851 | 59 | self.set_rotation(clutter.Z_AXIS, 180, 0, 0, 0) | 67 | self.set_rotation(clutter.Z_AXIS, 180, 0, 0, 0) |
| 852 | 60 | self.set_rotation(clutter.Y_AXIS, 180, 0, 0, 0) | 68 | self.set_rotation(clutter.Y_AXIS, 180, 0, 0, 0) |
| 853 | 61 | 69 | ||
| 854 | 70 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 855 | 71 | |||
| 856 | 62 | def roundedCorners(self, context, x, y, w, h, radius_x, radius_y): | 72 | def roundedCorners(self, context, x, y, w, h, radius_x, radius_y): |
| 857 | 63 | """ | 73 | """ |
| 858 | 64 | Clip cairo texture with rounded rectangle. | 74 | Clip cairo texture with rounded rectangle. |
| 859 | @@ -87,3 +97,4 @@ | |||
| 860 | 87 | -radius_y) | 97 | -radius_y) |
| 861 | 88 | context.close_path() | 98 | context.close_path() |
| 862 | 89 | context.clip() | 99 | context.clip() |
| 863 | 100 | |||
| 864 | 90 | 101 | ||
| 865 | === modified file 'entertainerlib/frontend/gui/widgets/rounded_texture.py' | |||
| 866 | --- entertainerlib/frontend/gui/widgets/rounded_texture.py 2009-05-06 03:40:22 +0000 | |||
| 867 | +++ entertainerlib/frontend/gui/widgets/rounded_texture.py 2009-05-10 07:43:27 +0000 | |||
| 868 | @@ -4,7 +4,9 @@ | |||
| 869 | 4 | from cluttercairo import CairoTexture | 4 | from cluttercairo import CairoTexture |
| 870 | 5 | import gtk | 5 | import gtk |
| 871 | 6 | 6 | ||
| 873 | 7 | class RoundedTexture(CairoTexture): | 7 | from entertainerlib.frontend.gui.widgets.base import Base |
| 874 | 8 | |||
| 875 | 9 | class RoundedTexture(Base, CairoTexture): | ||
| 876 | 8 | """ | 10 | """ |
| 877 | 9 | Texture with rounded corners | 11 | Texture with rounded corners |
| 878 | 10 | 12 | ||
| 879 | @@ -12,7 +14,7 @@ | |||
| 880 | 12 | rounded smooth corners. | 14 | rounded smooth corners. |
| 881 | 13 | """ | 15 | """ |
| 882 | 14 | 16 | ||
| 884 | 15 | def __init__(self, pixbuf, width, height, margin=1, radius=15): | 17 | def __init__(self, x, y, width, height, pixbuf, margin=1, radius=15): |
| 885 | 16 | """ | 18 | """ |
| 886 | 17 | Create a new cairo based texture from GDK pixel buffer. This texture is | 19 | Create a new cairo based texture from GDK pixel buffer. This texture is |
| 887 | 18 | similar to clutter.Texture, but this is rendered with cairo and it adds | 20 | similar to clutter.Texture, but this is rendered with cairo and it adds |
| 888 | @@ -22,26 +24,34 @@ | |||
| 889 | 22 | @param margin: number of pixels to cut off from sides | 24 | @param margin: number of pixels to cut off from sides |
| 890 | 23 | @param radius: Radius for rounded corners | 25 | @param radius: Radius for rounded corners |
| 891 | 24 | """ | 26 | """ |
| 893 | 25 | CairoTexture.__init__(self, width, height) | 27 | Base.__init__(self) |
| 894 | 28 | |||
| 895 | 29 | abs_width = self.get_abs_x(width) | ||
| 896 | 30 | abs_height = self.get_abs_y(height) | ||
| 897 | 31 | |||
| 898 | 32 | CairoTexture.__init__(self, abs_width, abs_height) | ||
| 899 | 33 | |||
| 900 | 26 | context = self.cairo_create() | 34 | context = self.cairo_create() |
| 901 | 27 | ct = gtk.gdk.CairoContext(context) | 35 | ct = gtk.gdk.CairoContext(context) |
| 902 | 28 | 36 | ||
| 903 | 29 | # Round corners | 37 | # Round corners |
| 909 | 30 | x = 0 + margin | 38 | xx = 0 + margin |
| 910 | 31 | y = 0 + margin | 39 | yy = 0 + margin |
| 911 | 32 | w1 = width - (margin * 2) | 40 | w1 = abs_width - (margin * 2) |
| 912 | 33 | h1 = height - (margin * 2) | 41 | h1 = abs_height - (margin * 2) |
| 913 | 34 | self.roundedCorners(context, x, y, w1, h1, radius, radius) | 42 | self.roundedCorners(context, xx, yy, w1, h1, radius, radius) |
| 914 | 35 | 43 | ||
| 915 | 36 | # Scale context area | 44 | # Scale context area |
| 918 | 37 | wr = width / float(pixbuf.get_width()) | 45 | wr = abs_width / float(pixbuf.get_width()) |
| 919 | 38 | hr = height / float(pixbuf.get_height()) | 46 | hr = abs_height / float(pixbuf.get_height()) |
| 920 | 39 | context.scale(wr, hr) | 47 | context.scale(wr, hr) |
| 921 | 40 | ct.set_source_pixbuf(pixbuf, 0, 0) | 48 | ct.set_source_pixbuf(pixbuf, 0, 0) |
| 922 | 41 | context.paint() | 49 | context.paint() |
| 923 | 42 | del context # Update texture | 50 | del context # Update texture |
| 924 | 43 | del ct | 51 | del ct |
| 925 | 44 | 52 | ||
| 926 | 53 | self.set_position(self.get_abs_x(x), self.get_abs_y(y)) | ||
| 927 | 54 | |||
| 928 | 45 | def roundedCorners(self, context, x, y, w, h, radius_x, radius_y): | 55 | def roundedCorners(self, context, x, y, w, h, radius_x, radius_y): |
| 929 | 46 | """ | 56 | """ |
| 930 | 47 | Clip cairo texture with rounded rectangle. | 57 | Clip cairo texture with rounded rectangle. |
| 931 | 48 | 58 | ||
| 932 | === modified file 'entertainerlib/frontend/gui/widgets/scroll_area.py' | |||
| 933 | --- entertainerlib/frontend/gui/widgets/scroll_area.py 2009-05-06 03:40:22 +0000 | |||
| 934 | +++ entertainerlib/frontend/gui/widgets/scroll_area.py 2009-05-10 07:43:27 +0000 | |||
| 935 | @@ -30,12 +30,9 @@ | |||
| 936 | 30 | self.get_abs_y(y_pos_percent)) | 30 | self.get_abs_y(y_pos_percent)) |
| 937 | 31 | 31 | ||
| 938 | 32 | # Create content position indicator | 32 | # Create content position indicator |
| 940 | 33 | self.indicator = ListIndicator(0.2, 0.045, ListIndicator.VERTICAL) | 33 | self.indicator = ListIndicator(3 * x_size_percent / 4, y_size_percent, |
| 941 | 34 | 0.2, 0.045, ListIndicator.VERTICAL) | ||
| 942 | 34 | self.indicator.hide_position() | 35 | self.indicator.hide_position() |
| 943 | 35 | self.indicator.set_current(1) | ||
| 944 | 36 | self.indicator.set_position( | ||
| 945 | 37 | self.area_width - self.indicator.get_width(), | ||
| 946 | 38 | self.area_height + self.get_abs_y(0.01)) | ||
| 947 | 39 | self.add(self.indicator) | 36 | self.add(self.indicator) |
| 948 | 40 | 37 | ||
| 949 | 41 | if active: | 38 | if active: |
| 950 | 42 | 39 | ||
| 951 | === added file 'entertainerlib/tests/test_arrowtexture.py' | |||
| 952 | --- entertainerlib/tests/test_arrowtexture.py 1970-01-01 00:00:00 +0000 | |||
| 953 | +++ entertainerlib/tests/test_arrowtexture.py 2009-06-30 20:11:01 +0000 | |||
| 954 | @@ -0,0 +1,25 @@ | |||
| 955 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 956 | 2 | '''Tests ArrowTexture.''' | ||
| 957 | 3 | |||
| 958 | 4 | from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture | ||
| 959 | 5 | from entertainerlib.tests import EntertainerTest | ||
| 960 | 6 | |||
| 961 | 7 | class ArrowTextureTest(EntertainerTest): | ||
| 962 | 8 | '''Test for entertainerlib.frontend.gui.widgets.arrow_texture.''' | ||
| 963 | 9 | |||
| 964 | 10 | def setUp(self): | ||
| 965 | 11 | '''Set up the test.''' | ||
| 966 | 12 | EntertainerTest.setUp(self) | ||
| 967 | 13 | |||
| 968 | 14 | self.arrow = ArrowTexture(0.5, 0.9, 0.40, (21, 45, 83, 255), | ||
| 969 | 15 | (255, 0, 0, 255), ArrowTexture.UP) | ||
| 970 | 16 | |||
| 971 | 17 | def test_create(self): | ||
| 972 | 18 | '''Test correct ArrowTexture initialization.''' | ||
| 973 | 19 | self.assertTrue(isinstance(self.arrow, ArrowTexture)) | ||
| 974 | 20 | |||
| 975 | 21 | def test_bounce(self): | ||
| 976 | 22 | '''Test the bounce method.''' | ||
| 977 | 23 | self.arrow.bounce() | ||
| 978 | 24 | self.assertTrue(self.arrow.timeline.is_playing()) | ||
| 979 | 25 | |||
| 980 | 0 | 26 | ||
| 981 | === added file 'entertainerlib/tests/test_eyecandytexture.py' | |||
| 982 | --- entertainerlib/tests/test_eyecandytexture.py 1970-01-01 00:00:00 +0000 | |||
| 983 | +++ entertainerlib/tests/test_eyecandytexture.py 2009-06-30 22:02:55 +0000 | |||
| 984 | @@ -0,0 +1,25 @@ | |||
| 985 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 986 | 2 | '''Tests ArrowTexture.''' | ||
| 987 | 3 | |||
| 988 | 4 | import gtk | ||
| 989 | 5 | import os | ||
| 990 | 6 | |||
| 991 | 7 | from entertainerlib.frontend.gui.widgets.eyecandy_texture import EyeCandyTexture | ||
| 992 | 8 | from entertainerlib.tests import EntertainerTest | ||
| 993 | 9 | |||
| 994 | 10 | THIS_DIR = os.path.dirname(__file__) | ||
| 995 | 11 | |||
| 996 | 12 | class EyeCandyTextureTest(EntertainerTest): | ||
| 997 | 13 | '''Test for entertainerlib.frontend.gui.widgets.eyecandy_texture.''' | ||
| 998 | 14 | |||
| 999 | 15 | def setUp(self): | ||
| 1000 | 16 | '''Set up the test.''' | ||
| 1001 | 17 | EntertainerTest.setUp(self) | ||
| 1002 | 18 | |||
| 1003 | 19 | filename = os.path.join(THIS_DIR, 'data/ImageThumbnailer/test.jpg') | ||
| 1004 | 20 | pix_buffer = gtk.gdk.pixbuf_new_from_file(filename) | ||
| 1005 | 21 | self.eyecandy = EyeCandyTexture(0.5, 0.9, 0.40, 0.4, pix_buffer) | ||
| 1006 | 22 | |||
| 1007 | 23 | def test_create(self): | ||
| 1008 | 24 | '''Test correct EyeCandyTexture initialization.''' | ||
| 1009 | 25 | self.assertTrue(isinstance(self.eyecandy, EyeCandyTexture)) | ||
| 1010 | 0 | 26 | ||
| 1011 | === added file 'entertainerlib/tests/test_listindicator.py' | |||
| 1012 | --- entertainerlib/tests/test_listindicator.py 1970-01-01 00:00:00 +0000 | |||
| 1013 | +++ entertainerlib/tests/test_listindicator.py 2009-06-30 22:18:48 +0000 | |||
| 1014 | @@ -0,0 +1,37 @@ | |||
| 1015 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 1016 | 2 | '''Tests ListIndicator.''' | ||
| 1017 | 3 | |||
| 1018 | 4 | from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator | ||
| 1019 | 5 | from entertainerlib.tests import EntertainerTest | ||
| 1020 | 6 | |||
| 1021 | 7 | class ListIndicatorTest(EntertainerTest): | ||
| 1022 | 8 | '''Test for entertainerlib.frontend.gui.widgets.list_indicator.''' | ||
| 1023 | 9 | |||
| 1024 | 10 | def setUp(self): | ||
| 1025 | 11 | '''Set up the test.''' | ||
| 1026 | 12 | EntertainerTest.setUp(self) | ||
| 1027 | 13 | |||
| 1028 | 14 | self.indicator = ListIndicator(0.7, 0.8, 0.2, 0.045, | ||
| 1029 | 15 | ListIndicator.HORIZONTAL) | ||
| 1030 | 16 | |||
| 1031 | 17 | def test_create(self): | ||
| 1032 | 18 | '''Test correct ListIndicator initialization.''' | ||
| 1033 | 19 | self.assertTrue(isinstance(self.indicator, ListIndicator)) | ||
| 1034 | 20 | |||
| 1035 | 21 | def test_currentmax(self): | ||
| 1036 | 22 | '''Test methods to handle the current and maximum attributes.''' | ||
| 1037 | 23 | self.indicator.set_current(10) | ||
| 1038 | 24 | self.assertEqual(self.indicator.get_current(), 1) | ||
| 1039 | 25 | self.indicator.set_current(-99) | ||
| 1040 | 26 | self.assertEqual(self.indicator.get_current(), 1) | ||
| 1041 | 27 | self.indicator.set_maximum(10) | ||
| 1042 | 28 | self.indicator.set_current(5) | ||
| 1043 | 29 | self.assertEqual(self.indicator.get_current(), 5) | ||
| 1044 | 30 | |||
| 1045 | 31 | def test_setdelimiter(self): | ||
| 1046 | 32 | '''Test the set_delimiter method.''' | ||
| 1047 | 33 | self.indicator.set_maximum(100) | ||
| 1048 | 34 | self.indicator.set_current(50) | ||
| 1049 | 35 | self.indicator.set_delimiter(" * ") | ||
| 1050 | 36 | self.assertEqual(self.indicator.text.get_text(), "50 * 100") | ||
| 1051 | 37 | |||
| 1052 | 0 | 38 | ||
| 1053 | === added file 'entertainerlib/tests/test_loadinganimation.py' | |||
| 1054 | --- entertainerlib/tests/test_loadinganimation.py 1970-01-01 00:00:00 +0000 | |||
| 1055 | +++ entertainerlib/tests/test_loadinganimation.py 2009-07-01 11:07:28 +0000 | |||
| 1056 | @@ -0,0 +1,28 @@ | |||
| 1057 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 1058 | 2 | '''Tests LoadingAnimation.''' | ||
| 1059 | 3 | |||
| 1060 | 4 | from entertainerlib.frontend.gui.widgets.loading_animation import ( | ||
| 1061 | 5 | LoadingAnimation) | ||
| 1062 | 6 | from entertainerlib.tests import EntertainerTest | ||
| 1063 | 7 | |||
| 1064 | 8 | class LoadingAnimationTest(EntertainerTest): | ||
| 1065 | 9 | '''Test for entertainerlib.frontend.gui.widgets.loading_animation.''' | ||
| 1066 | 10 | |||
| 1067 | 11 | def setUp(self): | ||
| 1068 | 12 | '''Set up the test.''' | ||
| 1069 | 13 | EntertainerTest.setUp(self) | ||
| 1070 | 14 | |||
| 1071 | 15 | self.animation = LoadingAnimation(0.5, 0.5) | ||
| 1072 | 16 | |||
| 1073 | 17 | def test_create(self): | ||
| 1074 | 18 | '''Test correct LoadingAnimation initialization.''' | ||
| 1075 | 19 | self.assertTrue(isinstance(self.animation, LoadingAnimation)) | ||
| 1076 | 20 | |||
| 1077 | 21 | def test_hide(self): | ||
| 1078 | 22 | '''Test the hide method.''' | ||
| 1079 | 23 | self.assertTrue(self.animation.hide) | ||
| 1080 | 24 | |||
| 1081 | 25 | def test_show(self): | ||
| 1082 | 26 | '''Test the show method.''' | ||
| 1083 | 27 | self.assertTrue(self.animation.show) | ||
| 1084 | 28 | |||
| 1085 | 0 | 29 | ||
| 1086 | === added file 'entertainerlib/tests/test_reflectiontexture.py' | |||
| 1087 | --- entertainerlib/tests/test_reflectiontexture.py 1970-01-01 00:00:00 +0000 | |||
| 1088 | +++ entertainerlib/tests/test_reflectiontexture.py 2009-07-01 11:07:28 +0000 | |||
| 1089 | @@ -0,0 +1,27 @@ | |||
| 1090 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 1091 | 2 | '''Tests ReflectionTexture.''' | ||
| 1092 | 3 | |||
| 1093 | 4 | import gtk | ||
| 1094 | 5 | import os | ||
| 1095 | 6 | |||
| 1096 | 7 | from entertainerlib.frontend.gui.widgets.reflection_texture import ( | ||
| 1097 | 8 | ReflectionTexture) | ||
| 1098 | 9 | from entertainerlib.tests import EntertainerTest | ||
| 1099 | 10 | |||
| 1100 | 11 | THIS_DIR = os.path.dirname(__file__) | ||
| 1101 | 12 | |||
| 1102 | 13 | class ReflectionTextureTest(EntertainerTest): | ||
| 1103 | 14 | '''Test for entertainerlib.frontend.gui.widgets.reflection_texture.''' | ||
| 1104 | 15 | |||
| 1105 | 16 | def setUp(self): | ||
| 1106 | 17 | '''Set up the test.''' | ||
| 1107 | 18 | EntertainerTest.setUp(self) | ||
| 1108 | 19 | |||
| 1109 | 20 | filename = os.path.join(THIS_DIR, 'data/ImageThumbnailer/test.jpg') | ||
| 1110 | 21 | pix_buffer = gtk.gdk.pixbuf_new_from_file(filename) | ||
| 1111 | 22 | self.texture = ReflectionTexture(0.5, 0.9, 0.40, 0.4, pix_buffer) | ||
| 1112 | 23 | |||
| 1113 | 24 | def test_create(self): | ||
| 1114 | 25 | '''Test correct ReflectionTexture initialization.''' | ||
| 1115 | 26 | self.assertTrue(isinstance(self.texture, ReflectionTexture)) | ||
| 1116 | 27 | |||
| 1117 | 0 | 28 | ||
| 1118 | === added file 'entertainerlib/tests/test_roundedtexture.py' | |||
| 1119 | --- entertainerlib/tests/test_roundedtexture.py 1970-01-01 00:00:00 +0000 | |||
| 1120 | +++ entertainerlib/tests/test_roundedtexture.py 2009-07-01 11:16:44 +0000 | |||
| 1121 | @@ -0,0 +1,26 @@ | |||
| 1122 | 1 | # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2 | ||
| 1123 | 2 | '''Tests RoundedTexture.''' | ||
| 1124 | 3 | |||
| 1125 | 4 | import gtk | ||
| 1126 | 5 | import os | ||
| 1127 | 6 | |||
| 1128 | 7 | from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture | ||
| 1129 | 8 | from entertainerlib.tests import EntertainerTest | ||
| 1130 | 9 | |||
| 1131 | 10 | THIS_DIR = os.path.dirname(__file__) | ||
| 1132 | 11 | |||
| 1133 | 12 | class RoundedTextureTest(EntertainerTest): | ||
| 1134 | 13 | '''Test for entertainerlib.frontend.gui.widgets.rounded_texture.''' | ||
| 1135 | 14 | |||
| 1136 | 15 | def setUp(self): | ||
| 1137 | 16 | '''Set up the test.''' | ||
| 1138 | 17 | EntertainerTest.setUp(self) | ||
| 1139 | 18 | |||
| 1140 | 19 | filename = os.path.join(THIS_DIR, 'data/ImageThumbnailer/test.jpg') | ||
| 1141 | 20 | pix_buffer = gtk.gdk.pixbuf_new_from_file(filename) | ||
| 1142 | 21 | self.texture = RoundedTexture(0.5, 0.9, 0.40, 0.4, pix_buffer) | ||
| 1143 | 22 | |||
| 1144 | 23 | def test_create(self): | ||
| 1145 | 24 | '''Test correct RoundedTexture initialization.''' | ||
| 1146 | 25 | self.assertTrue(isinstance(self.texture, RoundedTexture)) | ||
| 1147 | 26 | |||
Devs,
This branch is there to continue what Matt started with Labels, Textures etc.
We have now more widgets inheriting from Base. I have excluded some widgets from this branch because either there's a refactoring in progress or an "idea" of refactoring.
Why base?
Not only it allows us to have readable instantiation of or widgets (avoiding the get_abs...) but it now also can be the Base (the name is really good Matt :)) of future work extending the Base Class.
I've also taken the opportunity to do some improvments and to create test for all the modified widgets (even if test is limited to a creation test for some of them).
Good review.
Samuel-