Merge lp:~danrabbit/switchboard/libpeas-isis-design-fixes into lp:~elementary-pantheon/switchboard/switchboard-gmodule

Proposed by Danielle Foré
Status: Merged
Approved by: Corentin Noël
Approved revision: 411
Merged at revision: 411
Proposed branch: lp:~danrabbit/switchboard/libpeas-isis-design-fixes
Merge into: lp:~elementary-pantheon/switchboard/switchboard-gmodule
Diff against target: 29 lines (+4/-2)
1 file modified
src/Switchboard.vala (+4/-2)
To merge this branch: bzr merge lp:~danrabbit/switchboard/libpeas-isis-design-fixes
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+195159@code.launchpad.net

Commit message

add 5px margin and remove ellipsis from SearchEntry, add transition to Gtk.Stack

Description of the change

This branch:

* Adds a 5px margin to the right of SearchEntry
* Removes the ellipsis from SearchEntry
* Adds a transition type to Gtk.Stack

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

Super !

review: Approve
Revision history for this message
Danielle Foré (danrabbit) wrote :

Hey Corentin, I don't think RabbitBot is watching your branch, so you have to manually merge ;p

Revision history for this message
Corentin Noël (tintou) wrote :

Oh, I thought It was a launchpad feature xD

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Switchboard.vala'
2--- src/Switchboard.vala 2013-11-09 17:35:55 +0000
3+++ src/Switchboard.vala 2013-11-14 02:17:35 +0000
4@@ -125,6 +125,7 @@
5 alert_view.set_vexpand (true);
6
7 stack = new Gtk.Stack ();
8+ stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
9 stack.expand = true;
10 main_window.add (stack);
11 stack.add_named (category_scrolled, "main");
12@@ -221,7 +222,8 @@
13
14 // Searchbar
15 search_box = new Gtk.SearchEntry ();
16- search_box.set_placeholder_text (_("Search Settings…"));
17+ search_box.set_placeholder_text (_("Search Settings"));
18+ search_box.margin_right = 5;
19 search_box.changed.connect(() => {
20 category_view.filter_plugs(search_box.get_text ());
21 });
22@@ -237,7 +239,7 @@
23 });
24
25 // Nav button
26- navigation_button = new Gtk.Button.from_icon_name ("go-previous", Gtk.IconSize.BUTTON);
27+ navigation_button = new Gtk.Button.from_icon_name ("go-previous", Gtk.IconSize.LARGE_TOOLBAR);
28 navigation_button.clicked.connect (handle_navigation_button_clicked);
29 navigation_button.set_sensitive (false);
30

Subscribers

People subscribed via source and target branches

to all changes: