[regexxer] Port to Gtkmm 3.0 and gtksourceviewmm 3.0



commit 1191bd1b2c85732b89c04c0f10570ac7512b507d
Author: Fabien Parent <parent f gmail com>
Date:   Thu Feb 24 21:25:48 2011 +0100

    Port to Gtkmm 3.0 and gtksourceviewmm 3.0

 configure.ac      |    4 +-
 src/filebuffer.cc |   13 +-
 src/filebuffer.h  |    2 +-
 src/fileio.cc     |    2 -
 src/filetree.cc   |   19 ++--
 src/filetree.h    |    2 +-
 src/main.cc       |    8 +-
 src/mainwindow.cc |   36 +++--
 src/mainwindow.h  |   16 +-
 src/prefdialog.cc |    6 +-
 src/statusline.cc |   28 ++--
 ui/mainwindow.ui  |  400 +++++++++++++++++++++++++++++++++++-----------------
 12 files changed, 341 insertions(+), 195 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index de430d2..590b30b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,8 @@ AM_GNU_GETTEXT_VERSION([0.11])
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES([REGEXXER_MODULES],
-                  [gtk+-2.0 >= 2.16.0 gtkmm-2.4 >= 2.12.0 glibmm-2.4 >= 2.27.4.1
-                  gtksourceviewmm-2.0 >= 2.9.0])
+                  [gtkmm-3.0 >= 2.99.5 glibmm-2.4 >= 2.27.94
+                  gtksourceviewmm-3.0 >= 2.91.5])
 
 DK_PKG_PATH_PROG([GDK_PIXBUF_CSOURCE], [gdk-pixbuf-2.0], [gdk-pixbuf-csource])
 DK_PKG_PATH_PROG([GTK_UPDATE_ICON_CACHE], [gtk+-2.0], [gtk-update-icon-cache])
diff --git a/src/filebuffer.cc b/src/filebuffer.cc
index b7f0974..fc851dd 100644
--- a/src/filebuffer.cc
+++ b/src/filebuffer.cc
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <algorithm>
 #include <list>
+#include <vector>
 
 #include <config.h>
 
@@ -79,8 +80,8 @@ RegexxerTags::RegexxerTags()
   Glib::RefPtr<Gio::Settings> settings = Regexxer::Settings::instance();
 
   settings->signal_changed().connect(sigc::mem_fun(*this, &RegexxerTags::on_conf_value_changed));
-  std::vector<std::string> keys = settings->list_keys();
-  for (std::vector<std::string>::iterator i = keys.begin(); i != keys.end(); ++i)
+  std::vector<Glib::ustring> keys = settings->list_keys();
+  for (std::vector<Glib::ustring>::iterator i = keys.begin(); i != keys.end(); ++i)
     on_conf_value_changed(*i);
 }
 
@@ -159,7 +160,7 @@ public:
 
 FileBuffer::FileBuffer()
 :
-  gtksourceview::SourceBuffer(Glib::RefPtr<Gtk::TextTagTable>(RegexxerTags::instance())),
+  Gsv::SourceBuffer(Glib::RefPtr<Gtk::TextTagTable>(RegexxerTags::instance())),
   match_set_            (),
   current_match_        (match_set_.end()),
   user_action_stack_    (),
@@ -641,7 +642,7 @@ void FileBuffer::on_erase(const FileBuffer::iterator& rbegin, const FileBuffer::
       ++backward_chars;
       --pos;
 
-      typedef std::list< Glib::RefPtr<Mark> > MarkList;
+      typedef std::vector< Glib::RefPtr<Mark> > MarkList;
       const MarkList marks (const_cast<iterator&>(pos).get_marks());  // XXX
 
       for (MarkList::const_iterator pmark = marks.begin(); pmark != marks.end(); ++pmark)
@@ -787,7 +788,7 @@ void FileBuffer::replace_match(MatchSet::const_iterator pos, const Glib::ustring
  */
 void FileBuffer::remove_match_at_iter(const FileBuffer::iterator& start)
 {
-  typedef std::list< Glib::RefPtr<Mark> > MarkList;
+  typedef std::vector< Glib::RefPtr<Mark> > MarkList;
   const MarkList marks (const_cast<iterator&>(start).get_marks()); // XXX
 
   for (MarkList::const_iterator pmark = marks.begin(); pmark != marks.end(); ++pmark)
@@ -883,7 +884,7 @@ void FileBuffer::apply_tag_current()
 // static
 bool FileBuffer::is_match_start(const iterator& where)
 {
-  typedef std::list< Glib::RefPtr<Mark> > MarkList;
+  typedef std::vector< Glib::RefPtr<Mark> > MarkList;
   const MarkList marks (const_cast<iterator&>(where).get_marks()); // XXX
 
   return (std::find_if(marks.begin(), marks.end(), &MatchData::is_match_mark) != marks.end());
diff --git a/src/filebuffer.h b/src/filebuffer.h
index b51111d..c625a91 100644
--- a/src/filebuffer.h
+++ b/src/filebuffer.h
@@ -36,7 +36,7 @@ namespace Regexxer
 class FileBufferActionRemoveMatch;
 
 
-class FileBuffer : public gtksourceview::SourceBuffer
+class FileBuffer : public Gsv::SourceBuffer
 {
 public:
   static Glib::RefPtr<FileBuffer> create();
diff --git a/src/fileio.cc b/src/fileio.cc
index 563abb2..b00b7ae 100644
--- a/src/fileio.cc
+++ b/src/fileio.cc
@@ -29,8 +29,6 @@
 #include <gtksourceviewmm.h> 
 #include <cstring>
 
-namespace Gsv=gtksourceview;
-
 namespace
 {
 
diff --git a/src/filetree.cc b/src/filetree.cc
index eeb5f16..58466a1 100644
--- a/src/filetree.cc
+++ b/src/filetree.cc
@@ -279,17 +279,16 @@ int FileTree::get_modified_count() const
 
 /**** Regexxer::FileTree -- protected **************************************/
 
-void FileTree::on_style_changed(const Glib::RefPtr<Gtk::Style>& previous_style)
+void FileTree::on_style_updated()
 {
-  const Glib::ustring detail = "regexxer-filetree";
+  pixbuf_directory_   = render_icon_pixbuf(Gtk::Stock::DIRECTORY,     Gtk::ICON_SIZE_MENU);
+  pixbuf_file_        = render_icon_pixbuf(Gtk::Stock::FILE,          Gtk::ICON_SIZE_MENU);
+  pixbuf_load_failed_ = render_icon_pixbuf(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_MENU);
 
-  pixbuf_directory_   = render_icon(Gtk::Stock::DIRECTORY,     Gtk::ICON_SIZE_MENU, detail);
-  pixbuf_file_        = render_icon(Gtk::Stock::FILE,          Gtk::ICON_SIZE_MENU, detail);
-  pixbuf_load_failed_ = render_icon(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_MENU, detail);
+  Gdk::RGBA rgba = get_style_context()->get_color(Gtk::STATE_FLAG_INSENSITIVE);
+  color_load_failed_.set_rgb_p(rgba.get_red(), rgba.get_green(), rgba.get_blue());
 
-  color_load_failed_ = get_style()->get_text(Gtk::STATE_INSENSITIVE);
-
-  Gtk::TreeView::on_style_changed(previous_style);
+  Gtk::TreeView::on_style_updated();
 }
 
 /**** Regexxer::FileTree -- private ****************************************/
@@ -914,14 +913,14 @@ void FileTree::load_file_with_fallback(const Gtk::TreeModel::iterator& iter,
   catch (const Glib::Error& error)
   {
     fileinfo->buffer = FileBuffer::create_with_error_message(
-        render_icon(Gtk::Stock::DIALOG_ERROR, Gtk::ICON_SIZE_DIALOG), error.what());
+        render_icon_pixbuf(Gtk::Stock::DIALOG_ERROR, Gtk::ICON_SIZE_DIALOG), error.what());
   }
   catch (const ErrorBinaryFile&)
   {
     const Glib::ustring filename = (*iter)[FileTreeColumns::instance().filename];
 
     fileinfo->buffer = FileBuffer::create_with_error_message(
-        render_icon(Gtk::Stock::DIALOG_ERROR, Gtk::ICON_SIZE_DIALOG),
+        render_icon_pixbuf(Gtk::Stock::DIALOG_ERROR, Gtk::ICON_SIZE_DIALOG),
         Util::compose(_("\342\200\234%1\342\200\235 seems to be a binary file."), filename));
   }
 
diff --git a/src/filetree.h b/src/filetree.h
index 90e4710..ba72227 100644
--- a/src/filetree.h
+++ b/src/filetree.h
@@ -77,7 +77,7 @@ public:
   sigc::signal<void, int, const Glib::ustring&, FileInfoPtr> signal_feedback;
 
 protected:
-  virtual void on_style_changed(const Glib::RefPtr<Gtk::Style>& previous_style);
+  virtual void on_style_updated();
 
 private:
   class  TreeRowRef;
diff --git a/src/main.cc b/src/main.cc
index bb5553b..851f789 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -24,7 +24,7 @@
 #include "translation.h"
 
 #include <glib.h>
-#include <gtk/gtkwindow.h> /* for gtk_window_set_default_icon_name() */
+#include <gtk/gtk.h> /* for gtk_window_set_default_icon_name() */
 #include <glibmm.h>
 #include <gtkmm/iconfactory.h>
 #include <gtkmm/iconset.h>
@@ -168,7 +168,7 @@ void register_stock_items()
   for (unsigned int item = 0; item < G_N_ELEMENTS(regexxer_stock_items); ++item)
   {
     const StockItemData& stock = regexxer_stock_items[item];
-    Gtk::IconSet icon_set;
+    Glib::RefPtr<Gtk::IconSet> icon_set = Gtk::IconSet::create();
 
     for (int icon = 0; icon < stock.n_icons; ++icon)
     {
@@ -181,7 +181,7 @@ void register_stock_items()
       // Unset wildcarded for all but the the last icon.
       source.set_size_wildcarded(icon == stock.n_icons - 1);
 
-      icon_set.add_source(source);
+      icon_set->add_source(source);
     }
 
     const Gtk::StockID stock_id (stock.id);
@@ -203,7 +203,7 @@ int main(int argc, char** argv)
 
     std::auto_ptr<RegexxerOptions> options = RegexxerOptions::create();
     Gtk::Main main_instance (argc, argv, options->context());
-    gtksourceview::init();
+    Gsv::init();
     Gio::init();
 
     Glib::set_application_name(PACKAGE_NAME);
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 6fba846..623418d 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -181,7 +181,7 @@ MainWindow::MainWindow()
   toolbar_                (0),
   table_file_             (0),
   button_folder_          (0),
-  combo_entry_pattern_    (Gtk::manage(new Gtk::ComboBoxEntryText())),
+  combo_entry_pattern_    (Gtk::manage(new Gtk::ComboBoxText(true))),
   button_recursive_       (0),
   button_hidden_          (0),
   entry_regex_            (0),
@@ -195,7 +195,7 @@ MainWindow::MainWindow()
   filetree_               (Gtk::manage(new FileTree())),
   scrollwin_filetree_     (0),
   scrollwin_textview_     (0),
-  textview_               (Gtk::manage(new gtksourceview::SourceView())),
+  textview_               (Gtk::manage(new Gsv::SourceView())),
   entry_preview_          (0),
   statusline_             (Gtk::manage(new StatusLine())),
   busy_action_running_    (false),
@@ -213,7 +213,7 @@ MainWindow::MainWindow()
 
   vbox_main_->pack_start(*statusline_, Gtk::PACK_SHRINK);
   scrollwin_filetree_->add(*filetree_);
-  table_file_->attach(*combo_entry_pattern_, 1, 2, 1, 2);
+  table_file_->attach(*combo_entry_pattern_, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::FILL);
 
   scrollwin_textview_->add(*textview_);
 
@@ -254,17 +254,16 @@ void MainWindow::initialize(const InitState& init)
   const bool folder_exists = button_folder_->set_current_folder(folder);
 
   combo_entry_pattern_->get_entry()->set_text((init.pattern.empty()) ? Glib::ustring(1, '*') : init.pattern);
-  entry_regex_  ->set_text(init.regex);
-  
+
   entry_regex_->set_text(init.regex);
   entry_regex_->set_completion(entry_regex_completion_);
   entry_substitution_->set_text(init.substitution);
   entry_substitution_->set_completion(entry_substitution_completion_);
 
   comboboxentry_regex_->set_model(entry_regex_completion_stack_.get_completion_model());
-  comboboxentry_regex_->set_text_column(entry_regex_completion_stack_.get_completion_column());
+  comboboxentry_regex_->set_entry_text_column(entry_regex_completion_stack_.get_completion_column());
   comboboxentry_substitution_->set_model(entry_substitution_completion_stack_.get_completion_model());
-  comboboxentry_substitution_->set_text_column(entry_substitution_completion_stack_.get_completion_column());
+  comboboxentry_substitution_->set_entry_text_column(entry_substitution_completion_stack_.get_completion_column());
 
   entry_regex_completion_->set_model(entry_regex_completion_stack_.get_completion_model());
   entry_regex_completion_->set_text_column(entry_regex_completion_stack_.get_completion_column());
@@ -281,13 +280,14 @@ void MainWindow::initialize(const InitState& init)
   button_multiple_ ->set_active(!init.no_global);
   button_caseless_ ->set_active(init.ignorecase);
 
+  combo_entry_pattern_->set_entry_text_column(0);
   const std::list<Glib::ustring> patterns =
       settings->get_string_array(conf_key_files_patterns);
   for (std::list<Glib::ustring>::const_iterator pattern = patterns.begin();
        pattern != patterns.end();
        ++pattern)
   {
-    combo_entry_pattern_->append_text(*pattern);
+    combo_entry_pattern_->append(*pattern);
   }
 
   if (init.feedback)
@@ -338,7 +338,7 @@ void MainWindow::connect_signals()
   using sigc::mem_fun;
 
   window_->signal_hide         ().connect(mem_fun(*this, &MainWindow::on_hide));
-  window_->signal_style_changed().connect(mem_fun(*this, &MainWindow::on_style_changed));
+  window_->signal_style_updated().connect(mem_fun(*this, &MainWindow::on_style_updated));
   window_->signal_delete_event ().connect(mem_fun(*this, &MainWindow::on_delete_event));
 
   combo_entry_pattern_->get_entry()->signal_activate().connect(controller_.find_files.slot());
@@ -422,7 +422,7 @@ void MainWindow::on_hide()
   }
 }
 
-void MainWindow::on_style_changed(const Glib::RefPtr<Gtk::Style>&)
+void MainWindow::on_style_updated()
 {
   FileBuffer::pango_context_changed(window_->get_pango_context());
 }
@@ -995,6 +995,9 @@ void MainWindow::on_about()
   else
   {
     std::auto_ptr<Gtk::AboutDialog> dialog (new Gtk::AboutDialog());
+    std::vector<Glib::ustring> authors;
+    for (int i = 0; program_authors[i]; i++)
+      authors.push_back(program_authors[i]);
 
     dialog->set_version(PACKAGE_VERSION);
     dialog->set_logo_icon_name(PACKAGE_TARNAME);
@@ -1002,7 +1005,7 @@ void MainWindow::on_about()
     dialog->set_copyright("Copyright \302\251 2002-2007 Daniel Elstner");
     dialog->set_website("http://regexxer.sourceforge.net/";);
 
-    dialog->set_authors(program_authors);
+    dialog->set_authors(authors);
     dialog->set_translator_credits(_("translator-credits"));
     dialog->set_license(program_license);
     dialog->set_wrap_license(true);
@@ -1049,9 +1052,14 @@ void MainWindow::on_conf_value_changed(const Glib::ustring& key)
 {
   if (key == conf_key_textview_font)
   {
-    const Pango::FontDescription font (Settings::instance()->get_string(key));
-    textview_     ->modify_font(font);
-    entry_preview_->modify_font(font);
+    std::string style = "GtkTextView { font: ";
+    style += Settings::instance()->get_string(key);
+    style += "}";
+    Glib::RefPtr<Gtk::CssProvider> css = Gtk::CssProvider::create();
+    css->load_from_data(style, style.size());
+
+    textview_     ->get_style_context()->add_provider(css, 1);
+    entry_preview_->get_style_context()->add_provider(css, 1);
   }
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 2f0c4e1..c8a1097 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -42,15 +42,15 @@ class Entry;
 class FileChooser;
 class Toolbar;
 class Window;
-class ComboBoxEntry;
-class ComboBoxEntryText;
+class ComboBox;
+class ComboBoxText;
 class VBox;
 class ScrolledWindow;
 class Table;
 class EntryCompletion;
 }
 
-namespace gtksourceview
+namespace Gsv
 {
 class SourceView;
 }
@@ -102,17 +102,17 @@ private:
   Gtk::Table*                 table_file_;
   Gtk::FileChooser*           button_folder_;
 
-  Gtk::ComboBoxEntryText*     combo_entry_pattern_;
+  Gtk::ComboBoxText*          combo_entry_pattern_;
 
   Gtk::CheckButton*           button_recursive_;
   Gtk::CheckButton*           button_hidden_;
 
-  Gtk::ComboBoxEntry*         comboboxentry_regex_;
+  Gtk::ComboBoxText*          comboboxentry_regex_;
   Gtk::Entry*                 entry_regex_;
   CompletionStack             entry_regex_completion_stack_;
   Glib::RefPtr<Gtk::EntryCompletion> entry_regex_completion_;
 
-  Gtk::ComboBoxEntry*         comboboxentry_substitution_;
+  Gtk::ComboBoxText*          comboboxentry_substitution_;
   Gtk::Entry*                 entry_substitution_;
   CompletionStack             entry_substitution_completion_stack_;
   Glib::RefPtr<Gtk::EntryCompletion> entry_substitution_completion_;
@@ -123,7 +123,7 @@ private:
   FileTree*                   filetree_;
   Gtk::ScrolledWindow*        scrollwin_filetree_;
   Gtk::ScrolledWindow*        scrollwin_textview_;
-  gtksourceview::SourceView*  textview_;
+  Gsv::SourceView*            textview_;
   Gtk::Entry*                 entry_preview_;
 
   StatusLine*                 statusline_;
@@ -145,7 +145,7 @@ private:
   void save_window_state();
 
   void on_hide();
-  void on_style_changed(const Glib::RefPtr<Gtk::Style>& previous_style);
+  void on_style_updated();
   bool on_delete_event(GdkEventAny* event);
 
   void on_cut();
diff --git a/src/prefdialog.cc b/src/prefdialog.cc
index 496ba7a..782fcbe 100644
--- a/src/prefdialog.cc
+++ b/src/prefdialog.cc
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <gtkmm.h>
-#include <list>
+#include <vector>
 
 #include <config.h>
 
@@ -138,9 +138,9 @@ void PrefDialog::on_conf_value_changed(const Glib::ustring& key)
 void PrefDialog::initialize_configuration()
 {
   Glib::RefPtr<Gio::Settings> settings = Settings::instance();
-  const std::list<Glib::ustring> entries = settings->list_keys();
+  const std::vector<Glib::ustring> entries = settings->list_keys();
 
-  for (std::list<Glib::ustring>::const_iterator p = entries.begin(); p != entries.end(); ++p)
+  for (std::vector<Glib::ustring>::const_iterator p = entries.begin(); p != entries.end(); ++p)
     on_conf_value_changed(*p);
 
   settings->bind(conf_key_textview_font, button_textview_font_, "font_name");
diff --git a/src/statusline.cc b/src/statusline.cc
index 3ac370d..3d79d7e 100644
--- a/src/statusline.cc
+++ b/src/statusline.cc
@@ -55,7 +55,7 @@ private:
   Glib::ustring number_to_string(int number);
 
   void recalculate_label_width();
-  void on_label_style_changed(const Glib::RefPtr<Gtk::Style>& previous_style);
+  void on_label_style_updated();
 };
 
 CounterBox::CounterBox(const Glib::ustring& label)
@@ -89,8 +89,8 @@ CounterBox::CounterBox(const Glib::ustring& label)
   label_index_->set_single_line_mode(true);
   label_count_->set_single_line_mode(true);
 
-  label_index_->signal_style_changed().connect(
-      sigc::mem_fun(*this, &CounterBox::on_label_style_changed));
+  label_index_->signal_style_updated().connect(
+      sigc::mem_fun(*this, &CounterBox::on_label_style_updated));
 
   try // don't abort if the user-specified locale doesn't exist
   {
@@ -184,7 +184,7 @@ void CounterBox::recalculate_label_width()
  * The code relies on both labels having the same style.
  * I think that's a quite safe assumption to make ;)
  */
-void CounterBox::on_label_style_changed(const Glib::RefPtr<Gtk::Style>&)
+void CounterBox::on_label_style_updated()
 {
   const Glib::RefPtr<Pango::Layout> layout = label_index_->create_pango_layout("");
 
@@ -233,17 +233,19 @@ StatusLine::StatusLine()
   // The statusbar looks ugly if the stop button gets its default size,
   // so let's reduce the button's size request to a reasonable amount.
 
-  RC::parse_string("style \"regexxer-stop-button-style\"\n"
-                   "{\n"
-                   "  ythickness = 0\n"
-                   "  GtkWidget::interior_focus = 0\n"
-                   "  GtkWidget::focus_padding = 0\n"
-                   "}\n"
-                   "widget \"*.regexxer-stop-button\" style \"regexxer-stop-button-style\"\n");
+  std::string style = "GtkButton#regexxer-stop-button\n"
+                      "{\n"
+                      "  padding-left: 0;"
+                      "  -GtkWidget-interior-focus: 0;\n"
+                      "  -GtkWidget-focus-padding: 0;\n"
+                      "}";
+  Glib::RefPtr<Gtk::CssProvider> css = Gtk::CssProvider::create();
+  css->load_from_data(style, style.size());
 
   stop_button_ = new Button(_("Stop"));
   pack_start(*manage(stop_button_), PACK_SHRINK);
   stop_button_->set_name("regexxer-stop-button");
+  stop_button_->get_style_context()->add_provider(css, 1);
 
   progressbar_ = new ProgressBar();
   pack_start(*manage(progressbar_), PACK_SHRINK);
@@ -326,7 +328,7 @@ void StatusLine::on_hierarchy_changed(Gtk::Widget* previous_toplevel)
   if (Gtk::Window *const window = dynamic_cast<Gtk::Window*>(previous_toplevel))
   {
     stop_button_->remove_accelerator(
-        window->get_accel_group(), GDK_Escape, Gdk::ModifierType(0));
+        window->get_accel_group(), GDK_KEY_Escape, Gdk::ModifierType(0));
   }
 
   Gtk::HBox::on_hierarchy_changed(previous_toplevel);
@@ -335,7 +337,7 @@ void StatusLine::on_hierarchy_changed(Gtk::Widget* previous_toplevel)
   {
     stop_button_->add_accelerator(
         "activate", window->get_accel_group(),
-        GDK_Escape, Gdk::ModifierType(0), Gtk::AccelFlags(0));
+        GDK_KEY_Escape, Gdk::ModifierType(0), Gtk::AccelFlags(0));
   }
 }
 
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 46e9d66..011f282 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="mainwindow">
+    <property name="can_focus">False</property>
     <property name="default_width">640</property>
     <property name="default_height">480</property>
     <accel-groups>
@@ -11,21 +11,27 @@
     <child>
       <object class="GtkVBox" id="vbox_main">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="menuitem_file">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem_file_menu">
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_save">
                         <property name="label">gtk-save</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -34,8 +40,10 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_save_all">
-                        <property name="label" translatable="yes">Save all</property>
+                        <property name="label">Save all</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -44,12 +52,15 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="menuitem_separator1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_quit">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -63,14 +74,19 @@
             <child>
               <object class="GtkMenuItem" id="menuitem_edit">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem_edit_menu">
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_undo">
                         <property name="label">gtk-undo</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -80,12 +96,15 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="menuitem_separator2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_cut">
                         <property name="label">gtk-cut</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -96,6 +115,8 @@
                       <object class="GtkImageMenuItem" id="menuitem_copy">
                         <property name="label">gtk-copy</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -106,6 +127,8 @@
                       <object class="GtkImageMenuItem" id="menuitem_paste">
                         <property name="label">gtk-paste</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -116,6 +139,8 @@
                       <object class="GtkImageMenuItem" id="menuitem_delete">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -124,12 +149,15 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="menuitem_separator3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_preferences">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -142,14 +170,19 @@
             <child>
               <object class="GtkMenuItem" id="menuitem_match">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Match</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem_match_menu">
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_prev_file">
-                        <property name="label" translatable="yes">_Previous file</property>
+                        <property name="label">_Previous file</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -160,6 +193,8 @@
                       <object class="GtkImageMenuItem" id="menuitem_prev_match">
                         <property name="label">gtk-go-back</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -170,6 +205,8 @@
                       <object class="GtkImageMenuItem" id="menuitem_next_match">
                         <property name="label">gtk-go-forward</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -178,8 +215,10 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_next_file">
-                        <property name="label" translatable="yes">_Next file</property>
+                        <property name="label">_Next file</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -189,12 +228,15 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="menuitem_separator4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_replace">
-                        <property name="label" translatable="yes">Replace _current</property>
+                        <property name="label">Replace _current</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -203,8 +245,10 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_replace_file">
-                        <property name="label" translatable="yes">Replace in _this file</property>
+                        <property name="label">Replace in _this file</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -212,8 +256,10 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_replace_all">
-                        <property name="label" translatable="yes">Replace in _all files</property>
+                        <property name="label">Replace in _all files</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -226,14 +272,19 @@
             <child>
               <object class="GtkMenuItem" id="menuitem_help">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem_help_menu">
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_about">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">mainwindow_accelgroup</property>
@@ -253,9 +304,12 @@
         <child>
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkToolButton" id="button_save">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="is_important">True</property>
                 <property name="stock_id">gtk-save</property>
               </object>
@@ -267,6 +321,8 @@
             <child>
               <object class="GtkToolButton" id="button_save_all">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="is_important">True</property>
                 <property name="stock_id">regexxer-save-all</property>
               </object>
@@ -278,6 +334,7 @@
             <child>
               <object class="GtkSeparatorToolItem" id="separatortoolitem1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -286,6 +343,8 @@
             <child>
               <object class="GtkToolButton" id="button_undo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="is_important">True</property>
                 <property name="stock_id">gtk-undo</property>
               </object>
@@ -297,6 +356,7 @@
             <child>
               <object class="GtkSeparatorToolItem" id="separatortoolitem2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -305,6 +365,8 @@
             <child>
               <object class="GtkToolButton" id="button_quit">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="is_important">True</property>
                 <property name="stock_id">gtk-quit</property>
               </object>
@@ -323,8 +385,8 @@
         <child>
           <object class="GtkVBox" id="vbox_interior">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
             <child>
               <object class="GtkHPaned" id="paned">
                 <property name="visible">True</property>
@@ -332,12 +394,13 @@
                 <child>
                   <object class="GtkVBox" id="vbox_left">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkTable" id="table_file">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
@@ -345,6 +408,7 @@
                         <child>
                           <object class="GtkLabel" id="label_pattern">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Pattern:</property>
                           </object>
@@ -358,11 +422,12 @@
                         <child>
                           <object class="GtkHBox" id="hbox_file">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">9</property>
                             <child>
                               <object class="GtkVBox" id="vbox_options">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">3</property>
                                 <child>
                                   <object class="GtkCheckButton" id="button_recursive">
@@ -371,6 +436,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Recurse into subdirectories</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
@@ -388,6 +454,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Also find hidden files</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -407,6 +474,7 @@
                             <child>
                               <object class="GtkAlignment" id="alignment_options">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="yalign">1</property>
                                 <property name="xscale">0</property>
@@ -417,18 +485,22 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="tooltip_text" translatable="yes">Find all files that match the filename pattern</property>
+                                    <property name="use_action_appearance">False</property>
                                     <child>
                                       <object class="GtkAlignment" id="alignment_button_find_files">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xscale">0</property>
                                         <property name="yscale">0</property>
                                         <child>
                                           <object class="GtkHBox" id="hbox_button_find_files">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="spacing">2</property>
                                             <child>
                                               <object class="GtkImage" id="image_button_find_files">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="stock">gtk-find</property>
                                               </object>
                                               <packing>
@@ -440,6 +512,7 @@
                                             <child>
                                               <object class="GtkLabel" id="label_button_find_files">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">Find fi_les</property>
                                                 <property name="use_underline">True</property>
                                               </object>
@@ -468,12 +541,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_folder">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Fol_der:</property>
                             <property name="use_underline">True</property>
@@ -510,13 +585,12 @@
                     <child>
                       <object class="GtkFrame" id="frame_filetree">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrollwin_filetree">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -524,6 +598,8 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -536,12 +612,13 @@
                 <child>
                   <object class="GtkVBox" id="vbox_right">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkTable" id="table_regex">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">3</property>
                         <property name="column_spacing">6</property>
@@ -549,17 +626,19 @@
                         <child>
                           <object class="GtkLabel" id="label_search">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Search:</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_replace">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Replace:</property>
                           </object>
@@ -567,12 +646,13 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkHBox" id="hbox_options">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="button_multiple">
@@ -581,6 +661,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Find all possible matches in a line</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -597,6 +678,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Do case insensitive matching</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -610,7 +692,7 @@
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
@@ -620,6 +702,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="tooltip_text" translatable="yes">Find all matches of the regular expression</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -628,30 +711,44 @@
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxEntry" id="comboboxentry_regex">
+                          <object class="GtkComboBoxText" id="comboboxentry_regex">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">A regular expression in Perl syntax</property>
+                            <property name="has_entry">True</property>
+                            <child internal-child="entry">
+                              <object class="GtkEntry" id="comboboxentry_entry">
+                                <property name="can_focus">True</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxEntry" id="comboboxentry_substitution">
+                          <object class="GtkComboBoxText" id="comboboxentry_substitution">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_entry">True</property>
+                            <child internal-child="entry">
+                              <object class="GtkEntry" id="comboboxentry_entry1">
+                                <property name="can_focus">True</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                       </object>
@@ -664,29 +761,31 @@
                     <child>
                       <object class="GtkFrame" id="frame_textview">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <child>
                           <object class="GtkVBox" id="vbox_textview">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">3</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrollwin_textview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
                                 <child>
                                   <placeholder/>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry_preview">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Preview of the substitution</property>
                                 <property name="editable">False</property>
                                 <property name="has_frame">False</property>
@@ -706,6 +805,8 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -717,122 +818,21 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="action_area">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">2</property>
                 <property name="spacing">10</property>
                 <child>
-                  <object class="GtkHBox" id="box_move">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkButton" id="button_prev_file">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="button_prev_file-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">File backward</property>
-                            <property name="AtkObject::accessible-description" translatable="yes">Go to the previous matching file</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImage" id="image_button_prev_file">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-goto-first</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button_prev_match">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="button_prev_match-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Backward</property>
-                            <property name="AtkObject::accessible-description" translatable="yes">Go to previous match</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImage" id="image_button_prev_match">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-back</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button_next_match">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="button_next_match-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Forward</property>
-                            <property name="AtkObject::accessible-description" translatable="yes">Go to next match</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImage" id="image_button_next_match">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-forward</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button_next_file">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="button_next_file-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">File forward</property>
-                            <property name="AtkObject::accessible-description" translatable="yes">Go to the next matching file</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImage" id="image_button_next_file">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-goto-last</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkHBox" id="box_replace">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -840,6 +840,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="button_replace-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes">Replace current match</property>
@@ -848,15 +849,18 @@
                         <child>
                           <object class="GtkAlignment" id="alignment_button_replace">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xscale">0</property>
                             <property name="yscale">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox_button_replace">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="image_button_replace">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-convert</property>
                                   </object>
                                   <packing>
@@ -868,6 +872,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label_button_replace">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">_Replace</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -884,6 +889,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -892,6 +898,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="button_replace_file-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes">Replace all matches in the current file</property>
@@ -900,15 +907,18 @@
                         <child>
                           <object class="GtkAlignment" id="alignment_button_replace_file">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xscale">0</property>
                             <property name="yscale">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox_button_replace_file">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="image_button_replace_file">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-convert</property>
                                   </object>
                                   <packing>
@@ -920,6 +930,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label_button_replace_file">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">_This file</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -936,6 +947,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -944,6 +956,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="button_replace_all-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes">Replace all matches in all files</property>
@@ -952,15 +965,18 @@
                         <child>
                           <object class="GtkAlignment" id="alignment_button_replace_all">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xscale">0</property>
                             <property name="yscale">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox_button_replace_all">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="image_button_replace_all">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-convert</property>
                                   </object>
                                   <packing>
@@ -972,6 +988,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label_button_replace_all">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">_All files</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -988,6 +1005,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -999,6 +1017,124 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkHBox" id="box_move">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <object class="GtkButton" id="button_prev_file">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="button_prev_file-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">File backward</property>
+                            <property name="AtkObject::accessible-description" translatable="yes">Go to the previous matching file</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="image_button_prev_file">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-goto-first</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button_prev_match">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="button_prev_match-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Backward</property>
+                            <property name="AtkObject::accessible-description" translatable="yes">Go to previous match</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="image_button_prev_match">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-go-back</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button_next_match">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="button_next_match-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Forward</property>
+                            <property name="AtkObject::accessible-description" translatable="yes">Go to next match</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="image_button_next_match">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-go-forward</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button_next_file">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="button_next_file-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">File forward</property>
+                            <property name="AtkObject::accessible-description" translatable="yes">Go to the next matching file</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="image_button_next_file">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-goto-last</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1008,6 +1144,8 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>



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