Merge lp://qastaging/~gordallott/unity/dash-legal-link into lp://qastaging/unity
Proposed by
Gord Allott
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2965 | ||||||||
Proposed branch: | lp://qastaging/~gordallott/unity/dash-legal-link | ||||||||
Merge into: | lp://qastaging/unity | ||||||||
Diff against target: |
304 lines (+138/-8) 6 files modified
dash/LensBar.cpp (+94/-5) dash/LensBar.h (+19/-2) plugins/unityshell/resources/information_icon.svg (+14/-0) plugins/unityshell/resources/searchingthedashlegalnotice.html (+1/-0) unity-shared/DashStyle.cpp (+7/-0) unity-shared/DashStyle.h (+3/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/dash-legal-link | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Timo Jyrinki | Approve | ||
Review via email:
|
Commit message
adds a legal link to the dash, also a new resource
Description of the change
adds a legal link to the dash
To post a comment you must log in.
Looks good and works well...
29 + glib::String cachedir( g_strdup( g_get_user_ cache_dir( )));
No need to strdup it, just assign that to std::string... It should be never NULL, in case just check for that.
30 + legal_seen_ file_path_ = cachedir.Str() + "/unitydashlega lseen";
Since we have an unity .cache dir, I'd just add there... i.e. cachedir/ unity/dashlegal seen
68 + QueueRelayout();
69 + QueueDraw();
The first is enough, as does also redraw.
64 + info_icon_ ->SetVisible( info_previously _shown_ ); >SetVisible( !info_previousl y_shown_ );
65 + legal_-
67 + DoOpenLegalise();
Wouldn't be better to open the legalise (and close the dash) and then switch the icon visibility?
95 + std::string legal_file_path = "file://"; path.append( PKGDATADIR) ; path.append( "/searchingthed ashlegalnotice. html");
96 + legal_file_
97 + legal_file_
Why not just doing: ashlegalnotice. html";
std::string legal_file_path = "file://" PKGDATADIR "/searchingthed
221 + nux::LayeredLayout* layered_layout_;
222 + nux::HLayout *legal_layout_;
It seems you don't need to keep these in class.
Finally, both the icon and the text are always built, only their visibility is switched, couldn't avoid this (and then only allocate only the needed resources)?