[gnome-boxes] Make selection toolbar look like gnome-documents



commit 15ede51abedec4a36c87b25928df890856ccd781
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Oct 25 19:51:27 2012 +0200

    Make selection toolbar look like gnome-documents
    
    This uses the standard Adwaita themeing, plus it copies the size
    and positioning of the toolbar from documents. It also uses
    the same left/right group split.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686883

 src/selectionbar.vala |   53 +++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/src/selectionbar.vala b/src/selectionbar.vala
index d9f5f7f..9e9db62 100644
--- a/src/selectionbar.vala
+++ b/src/selectionbar.vala
@@ -4,33 +4,47 @@ using Gtk;
 
 private class Boxes.Selectionbar: GLib.Object {
     public Clutter.Actor actor { get { return gtk_actor; } }
-    public static const float spacing = 60.0f;
+    public static const int default_toolbar_width = 500;
 
     private GtkClutter.Actor gtk_actor;
     private Gtk.Toolbar toolbar;
-    private Gtk.ToggleToolButton favorite_btn;
-    private Gtk.ToolButton pause_btn;
-    private Gtk.ToggleToolButton remove_btn;
+    private Gtk.ToggleButton favorite_btn;
+    private Gtk.Button pause_btn;
+    private Gtk.ToggleButton remove_btn;
 
     public Selectionbar () {
         toolbar = new Gtk.Toolbar ();
         toolbar.show_arrow = false;
         toolbar.icon_size = Gtk.IconSize.LARGE_TOOLBAR;
+        toolbar.set_size_request (default_toolbar_width, -1);
 
-        var bin = new Gtk.Alignment (0,0,1,1);
-        draw_as_css_box (bin);
-        bin.add (toolbar);
-        bin.get_style_context ().add_class ("selectionbar");
+        toolbar.get_style_context ().add_class ("osd");
 
-        gtk_actor = new GtkClutter.Actor.with_contents (bin);
+        var leftbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        var leftgroup = new Gtk.ToolItem ();
+        leftgroup.add (leftbox);
+        toolbar.insert(leftgroup, -1);
+
+        var separator = new Gtk.SeparatorToolItem();
+        separator.set_expand (true);
+        separator.draw = false;
+        toolbar.insert(separator, -1);
+
+        var rightbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        var rightgroup = new Gtk.ToolItem ();
+        rightgroup.add (rightbox);
+        toolbar.insert(rightgroup, -1);
+
+        gtk_actor = new GtkClutter.Actor.with_contents (toolbar);
         gtk_actor.get_widget ().get_style_context ().add_class ("boxes-bg");
         gtk_actor.opacity = 0;
+        gtk_actor.set_margin_bottom (32);
         gtk_actor.x_align = Clutter.ActorAlign.CENTER;
         gtk_actor.y_align = Clutter.ActorAlign.END;
 
-        favorite_btn = new Gtk.ToggleToolButton ();
-        toolbar.insert (favorite_btn, -1);
-        favorite_btn.icon_name = "emblem-favorite-symbolic";
+        favorite_btn = new Gtk.ToggleButton ();
+        leftbox.add (favorite_btn);
+        favorite_btn.image = new Gtk.Image.from_icon_name ("emblem-favorite-symbolic", Gtk.IconSize.MENU);
         favorite_btn.clicked.connect (() => {
            foreach (var item in App.app.selected_items) {
                var machine = item as Machine;
@@ -40,9 +54,9 @@ private class Boxes.Selectionbar: GLib.Object {
            }
         });
 
-        pause_btn = new Gtk.ToolButton (null, null);
-        toolbar.insert (pause_btn, -1);
-        pause_btn.icon_name = "media-playback-pause-symbolic";
+        pause_btn = new Gtk.Button ();
+        leftbox.add (pause_btn);
+        pause_btn.image = new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.MENU);
         pause_btn.clicked.connect (() => {
            foreach (var item in App.app.selected_items) {
                var machine = item as Machine;
@@ -58,12 +72,9 @@ private class Boxes.Selectionbar: GLib.Object {
            }
         });
 
-        var separator = new Gtk.SeparatorToolItem();
-        toolbar.insert(separator, -1);
-
-        remove_btn = new Gtk.ToggleToolButton ();
-        toolbar.insert (remove_btn, -1);
-        remove_btn.icon_name = "edit-delete-symbolic";
+        remove_btn = new Gtk.ToggleButton ();
+        rightbox.add (remove_btn);
+        remove_btn.image = new Gtk.Image.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.MENU);
         remove_btn.clicked.connect (() => {
             App.app.remove_selected_items ();
         });



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]