[gnome-system-monitor/wip/newdesign: 7/7] Merged from master

[Robert Roth <robertroth src gnome org>]

commit bebce1e45a3d4d424ae20136fcb402a013ba2eb9
Merge: 7a5e96d 95f4b99
Author: Robert Roth <robert roth off gmail com>
Date:   Sat Aug 17 14:33:33 2013 +0300

    Merged from master

 Makefile.am            |    4 +
 data/gsm.css           |    9 ++
 data/interface.ui      |  149 ++++++++++++++--------
 po/tg.po               |  324 ++++++++++++++++++++++++------------------------
 src/application.cpp    |   17 +++
 src/application.h      |    1 +
 src/gsm.gresource.xml  |    1 +
 src/gsm_color_button.c |    4 +-
 src/interface.cpp      |   19 ++-
 9 files changed, 305 insertions(+), 223 deletions(-)
---
diff --cc Makefile.am
index bcfb1f7,cef93eb..ac4ea3e
--- a/Makefile.am
+++ b/Makefile.am
@@@ -11,6 -11,13 +11,9 @@@ ui_files = 
        data/interface.ui \
        data/menus.ui
  
+ css_files = \
+       data/gsm.css
+ 
 -pixmap_files = \
 -      pixmaps/download.svg \
 -      pixmaps/upload.svg
 -
  runnabledir = $(pkglibexecdir)
  runnable_SCRIPTS = scripts/gsm-renice \
                     scripts/gsm-kill
@@@ -20,6 -27,8 +23,7 @@@ org.gnome.gnome-system-monitor.policy.i
  
  EXTRA_DIST = \
        $(ui_files) \
+       $(css_files) \
 -      $(pixmap_files) \
        $(runnable_SCRIPTS) \
        org.gnome.gnome-system-monitor.policy.in.in \
        gnome-system-monitor.desktop.in \
diff --cc data/interface.ui
index 782fe56,5f90cf4..ee7d5a2
--- a/data/interface.ui
+++ b/data/interface.ui
@@@ -7,80 -7,66 +7,75 @@@
      <property name="default_width">440</property>
      <property name="default_height">495</property>
      <property name="has_resize_grip">False</property>
-     <property name="hide_titlebar_when_maximized">True</property>
-     <child>
-       <object class="GtkBox" id="main_box">
+     <child type="titlebar">
+       <object class="GtkHeaderBar" id="header_bar">
          <property name="visible">True</property>
-         <property name="can_focus">False</property>
-         <property name="orientation">vertical</property>
+         <property name="show_close_button">True</property>
+         <style>
+           <class name="titlebar"/>
+           <class name="gsm-titlebar"/>
+         </style>
+         <child type="title">
+           <object class="GtkStackSwitcher" id="stack_switcher">
+             <property name="visible">True</property>
+             <property name="stack">stack</property>
+           </object>
+         </child>
          <child>
-           <object class="GtkHeaderBar" id="header_bar">
+           <object class="GtkToggleButton" id="search_button">
              <property name="visible">True</property>
-             <child type="title">
-               <object class="GtkStackSwitcher" id="stack_switcher">
-                 <property name="visible">True</property>
-                 <property name="stack">stack</property>
-               </object>
-             </child>
+             <property name="action_name">win.search</property>
+             <style>
+               <class name="image-button"/>
+             </style>
              <child>
-               <object class="GtkButton" id="end_process_button">
-                 <property name="label" translatable="yes">End _Process</property>
+               <object class="GtkImage" id="search_image">
                  <property name="visible">True</property>
 +                <property name="can_focus">True</property>
 +                <property name="receives_default">True</property>
 +                <property name="halign">end</property>
 +                <property name="use_underline">True</property>
 +                <property name="action_name">win.send-signal-end</property>
 +                <property name="action_target">@i 15</property>
 +                <style>
 +                    <class name="text-button"/>
 +                </style>
+                 <property name="icon_size">1</property>
+                 <property name="icon_name">edit-find-symbolic</property>
                </object>
-               <packing>
-                 <property name="pack_type">start</property>
-               </packing>
-             </child>
-             <child>
-               <object class="GtkToggleButton" id="search_button">
-                 <property name="visible">True</property>
-                 <property name="action_name">win.search</property>
-                 <style>
-                     <class name="image-button"/>
-                 </style>
-                 <child>
-                   <object class="GtkImage" id="search_image">
-                     <property name="visible">True</property>
-                     <property name="icon_size">1</property>
-                     <property name="icon_name">edit-find-symbolic</property>
-                   </object>
-                 </child>
-               </object>
-               <packing>
-                 <property name="pack_type">end</property>
-               </packing>
              </child>
+           </object>
+           <packing>
+             <property name="pack_type">end</property>
+           </packing>
+         </child>
+         <child>
+           <object class="GtkMenuButton" id="process_menu_button">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="halign">end</property>
+             <style>
+               <class name="image-button"/>
+             </style>
              <child>
-               <object class="GtkMenuButton" id="process_menu_button">
+               <object class="GtkImage" id="menu_button_image">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="halign">end</property>
-                 <style>
-                     <class name="image-button"/>
-                 </style>
-                 <child>
-                   <object class="GtkImage" id="menu_button_image">
-                     <property name="visible">True</property>
-                     <property name="icon_size">1</property>
-                     <property name="icon_name">emblem-system-symbolic</property>
-                   </object>
-                 </child>
+                 <property name="icon_size">1</property>
+                 <property name="icon_name">emblem-system-symbolic</property>
                </object>
-               <packing>
-                 <property name="pack_type">end</property>
-               </packing>
              </child>
            </object>
+           <packing>
+             <property name="pack_type">end</property>
+           </packing>
          </child>
+       </object>
+     </child>
+     <child>
+       <object class="GtkBox" id="main_box">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
          <child>
            <object class="GtkStack" id="stack">
              <property name="visible">True</property>