AskUbuntu Lens

Merge lp:~kokoto-java/askubuntu-lens/icon-fix-for-CardView into lp:askubuntu-lens

  1. icon-fix-for-CardView
  2. Merge into precise
Proposed by George Karavasilev
Status: Needs review
Proposed branch: lp:~kokoto-java/askubuntu-lens/icon-fix-for-CardView
Merge into: lp:askubuntu-lens
Diff against target: 71 lines (+10/-5)
3 files modified
askubuntu_bridge.py (+3/-3)
setup.py (+5/-0)
unity-askubuntu-daemon (+2/-2)
To merge this branch: bzr merge lp:~kokoto-java/askubuntu-lens/icon-fix-for-CardView
Reviewer Review Type Date Requested Status
Mark Tully Pending
Review via email: mp+110680@code.launchpad.net

Description of the change

Makes the lens use custom icons, hence resulting in fixing the black outline CardView issue.

To post a comment you must log in.
lp:~kokoto-java/askubuntu-lens/icon-fix-for-CardView updated
15. By George Karavasilev

Added the .png files -_-

Unmerged revisions

15. By George Karavasilev

Added the .png files -_-

14. By George Karavasilev

A patch to fix cardview bug that draws black outline around non perfect square icons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'accepted-answers.png'
2Binary files accepted-answers.png 1970-01-01 00:00:00 +0000 and accepted-answers.png 2012-06-17 13:17:17 +0000 differ
3=== added file 'ask-your-own-question.png'
4Binary files ask-your-own-question.png 1970-01-01 00:00:00 +0000 and ask-your-own-question.png 2012-06-17 13:17:17 +0000 differ
5=== modified file 'askubuntu_bridge.py'
6--- askubuntu_bridge.py 2012-05-11 23:22:50 +0000
7+++ askubuntu_bridge.py 2012-06-17 13:17:17 +0000
8@@ -215,17 +215,17 @@
9 url = "http://%s/questions/%d" % (site, _id)
10 title = i['title']
11 if i['answer_count'] >= 1:
12- icon = Gio.ThemedIcon.new("help-browser").to_string()
13+ icon = Gio.ThemedIcon.new("/opt/extras.ubuntu.com/unity-lens-askubuntu/aswered-questions.png").to_string()
14 category = ANSWERED
15 text = "%s votes, " % (i['up_vote_count'] - i['down_vote_count'])
16 text2 = "%s responses" % i["answer_count"]
17 text = text + text2
18 else:
19- icon = Gio.ThemedIcon.new("application-default-icon").to_string()
20+ icon = Gio.ThemedIcon.new("/opt/extras.ubuntu.com/unity-lens-askubuntu/unaswered-questions.png").to_string()
21 category = UNANSWERED
22 text = "%s votes" % (i['up_vote_count'] - i['down_vote_count'])
23 if "accepted_answer_id" in i:
24- icon = Gio.ThemedIcon.new("gtk-ok").to_string()
25+ icon = Gio.ThemedIcon.new("/opt/extras.ubuntu.com/unity-lens-askubuntu/accepted-answers.png").to_string()
26 category = SOLVED
27 text = "%s votes" % (i['up_vote_count'] - i['down_vote_count'])
28 tags = "[" + '] ['.join(i['tags'][:2]) + "]"
29
30=== added file 'aswered-questions.png'
31Binary files aswered-questions.png 1970-01-01 00:00:00 +0000 and aswered-questions.png 2012-06-17 13:17:17 +0000 differ
32=== added file 'search-on-askubuntu.png'
33Binary files search-on-askubuntu.png 1970-01-01 00:00:00 +0000 and search-on-askubuntu.png 2012-06-17 13:17:17 +0000 differ
34=== modified file 'setup.py'
35--- setup.py 2012-05-11 23:22:50 +0000
36+++ setup.py 2012-06-17 13:17:17 +0000
37@@ -15,5 +15,10 @@
38 ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['askubuntu_bridge.py']),
39 ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['unity-askubuntu-daemon']),
40 ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['askubuntu-logo.svg']),
41+ ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['accepted-answers.png']),
42+ ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['ask-your-own-question.png']),
43+ ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['aswered-questions.png']),
44+ ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['search-on-askubuntu.png']),
45+ ('/opt/extras.ubuntu.com/unity-lens-askubuntu', ['unaswered-questions.png']),
46 ], cmdclass={"build": build_extra.build_extra, })
47
48
49=== added file 'unaswered-questions.png'
50Binary files unaswered-questions.png 1970-01-01 00:00:00 +0000 and unaswered-questions.png 2012-06-17 13:17:17 +0000 differ
51=== modified file 'unity-askubuntu-daemon'
52--- unity-askubuntu-daemon 2012-05-11 23:22:50 +0000
53+++ unity-askubuntu-daemon 2012-06-17 13:17:17 +0000
54@@ -161,7 +161,7 @@
55
56 if search.lower() not in self.special_searches:
57 model.append("http://askubuntu.com/questions/ask",
58- Gio.ThemedIcon.new("help-faq").to_string(),
59+ Gio.ThemedIcon.new("/opt/extras.ubuntu.com/unity-lens-askubuntu/ask-your-own-question.png").to_string(),
60 EVERYTHING,
61 "text/html",
62 "Ask your own question",
63@@ -170,7 +170,7 @@
64
65 if search and search.lower() not in self.special_searches:
66 model.append("http://askubuntu.com/search?q=" + search.strip(),
67- Gio.ThemedIcon.new("search").to_string(),
68+ Gio.ThemedIcon.new("/opt/extras.ubuntu.com/unity-lens-askubuntu/search-on-askubuntu.png").to_string(),
69 EVERYTHING,
70 "text/html",
71 "Search on Ask Ubuntu",

Subscribers

People subscribed via source and target branches

to all changes: