[gnome-system-monitor/wip/procinfo2: 1/6] Port to GtkActionBar

[Stefano Facchini <sfacchini src gnome org>]

commit ff867e3323813a0a9a59f6369c8b5686e81b55c7
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Wed May 7 22:41:12 2014 +0200

    Port to GtkActionBar
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729747

 configure.ac        |    2 +-
 data/interface.ui   |   58 +++++++++++++++++++++-----------------------------
 src/application.cpp |    2 +-
 src/application.h   |    2 +-
 src/interface.cpp   |    4 +-
 5 files changed, 29 insertions(+), 39 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f303a9e..d490621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ LT_INIT
 GLIB_REQUIRED=2.37.3
 LIBWNCK_REQUIRED=2.91.0
 LIBGTOP_REQUIRED=2.28.2
-GTK_REQUIRED=3.9.5
+GTK_REQUIRED=3.12.0
 GNOME_ICON_THEME_REQUIRED=2.31
 GTKMM_REQUIRED=3.3.18
 GIOMM_REQUIRED=2.27
diff --git a/data/interface.ui b/data/interface.ui
index 6435543..5a9bd0d 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -123,51 +123,41 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRevealer" id="proc_toolbar_revealer">
+                  <object class="GtkRevealer" id="proc_actionbar_revealer">
                     <property name="visible">True</property>
                     <property name="transition_type">slide-up</property>
                     <child>
-                      <object class="GtkFrame" id="proc_toolbar_frame">
+                      <object class="GtkActionBar" id="proc_actionbar">
                         <property name="visible">True</property>
-                        <style>
-                          <class name="gsm-proc-toolbar"/>
-                        </style>
                         <child>
-                          <object class="GtkBox" id="proc_toolbar_box">
+                          <object class="GtkButton" id="end_process_button">
+                            <property name="label" translatable="yes">End _Process</property>
                             <property name="visible">True</property>
-                            <property name="orientation">horizontal</property>
-                            <property name="margin">6</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="halign">start</property>
+                            <property name="use_underline">True</property>
+                            <property name="action_name">win.send-signal-end</property>
+                            <property name="action_target">@i 15</property>
+                            <accelerator key="Delete" signal="clicked"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="proc_properties_button">
+                            <property name="visible">True</property>
+                            <property name="tooltip_text" translatable="yes">Show process 
properties</property>
+                            <property name="action_name">win.process-properties</property>
                             <child>
-                              <object class="GtkButton" id="end_process_button">
-                                <property name="label" translatable="yes">End _Process</property>
+                              <object class="GtkImage" id="proc_properties_image">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="halign">start</property>
-                                <property name="use_underline">True</property>
-                                <property name="action_name">win.send-signal-end</property>
-                                <property name="action_target">@i 15</property>
-                                <accelerator key="Delete" signal="clicked"/>
+                                <property name="icon_size">1</property>
+                                <property name="icon_name">document-properties-symbolic</property>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkButton" id="proc_properties_button">
-                                <property name="visible">True</property>
-                                <property name="tooltip_text" translatable="yes">Show process 
properties</property>
-                                <property name="action_name">win.process-properties</property>
-                                <child>
-                                  <object class="GtkImage" id="proc_properties_image">
-                                    <property name="visible">True</property>
-                                    <property name="icon_size">1</property>
-                                    <property name="icon_name">document-properties-symbolic</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="pack_type">end</property>
-                              </packing>
-                            </child>
                           </object>
+                          <packing>
+                            <property name="pack_type">end</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
diff --git a/src/application.cpp b/src/application.cpp
index f9f299e..fb68ec3 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -235,7 +235,7 @@ GsmApplication::load_settings()
 GsmApplication::GsmApplication()
     : Gtk::Application("org.gnome.SystemMonitor", Gio::APPLICATION_HANDLES_COMMAND_LINE),
       tree(NULL),
-      proc_toolbar_revealer(NULL),
+      proc_actionbar_revealer(NULL),
       popup_menu(NULL),
       disk_list(NULL),
       stack(NULL),
diff --git a/src/application.h b/src/application.h
index fd94b28..0819951 100644
--- a/src/application.h
+++ b/src/application.h
@@ -157,7 +157,7 @@ public:
     void shutdown();
 
     GtkWidget        *tree;
-    GtkWidget        *proc_toolbar_revealer;
+    GtkWidget        *proc_actionbar_revealer;
     GtkWidget        *popup_menu;
     GtkWidget        *disk_list;
     GtkWidget        *stack;
diff --git a/src/interface.cpp b/src/interface.cpp
index e43a55a..f255c36 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -75,7 +75,7 @@ create_proc_view(GsmApplication *app, GtkBuilder * builder)
 
     gtk_container_add (GTK_CONTAINER (scrolled), proctree);
 
-    app->proc_toolbar_revealer = GTK_WIDGET (gtk_builder_get_object (builder, "proc_toolbar_revealer"));
+    app->proc_actionbar_revealer = GTK_WIDGET (gtk_builder_get_object (builder, "proc_actionbar_revealer"));
 
     /* create popup_menu for the processes tab */
     GMenuModel *menu_model = G_MENU_MODEL (gtk_builder_get_object (builder, "process-popup-menu"));
@@ -761,6 +761,6 @@ update_sensitivity(GsmApplication *app)
                                      processes_sensitivity & selected_sensitivity);
     }
 
-    gtk_revealer_set_reveal_child (GTK_REVEALER (app->proc_toolbar_revealer),
+    gtk_revealer_set_reveal_child (GTK_REVEALER (app->proc_actionbar_revealer),
                                    selected_sensitivity);
 }