[gnome-terminal] fix the find dialog
Matthias Clasen
mclasen at fedoraproject.org
Wed Jan 12 16:20:47 UTC 2011
commit e9b9b3bc56c279edca0e71aaf5c84ac5c8057405
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Jan 12 11:20:23 2011 -0500
fix the find dialog
find-dialog.ui | 221 +++++++++++++++++++++++++++++++++++++++++++++++++
gnome-terminal.spec | 9 ++-
terminal-search.patch | 16 ++++
3 files changed, 244 insertions(+), 2 deletions(-)
---
diff --git a/find-dialog.ui b/find-dialog.ui
new file mode 100644
index 0000000..884f06a
--- /dev/null
+++ b/find-dialog.ui
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkDialog" id="find-dialog">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Find</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="icon_name">gtk-find</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="button-close">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="button-find">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-find</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="search-label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Search for:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">search-entry</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="search-entry">
+ <property name="visible">True</property>
+ <property name="has-entry">True</property>
+ <property name="add-tearoffs">False</property>
+ <property name="has-frame">True</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="match-case-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Match case</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="entire-word-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Match _entire word only</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="regex-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Match as _regular expression</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="search-backwards-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Search _backwards</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="wrap-around-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Wrap around</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-7">button-close</action-widget>
+ <action-widget response="-3">button-find</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 4fd13c0..be24a1c 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -9,7 +9,7 @@
Summary: Terminal emulator for GNOME
Name: gnome-terminal
Version: 2.33.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
@@ -17,6 +17,7 @@ URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/gnome-terminal/2.33/gnome-terminal-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=588732
Source1: profile-new-dialog.ui
+Source2: find-dialog.ui
# gconftool-2
Requires(pre): GConf2 >= %{gconf_version}
@@ -45,6 +46,7 @@ clickable URLs.
%prep
%setup -q
+%patch0 -p1 -b .find-dialog
autoreconf -i -f
@@ -54,7 +56,7 @@ autoreconf -i -f
make %{?_smp_mflags}
#cp %{SOURCE1} src
-
+cp %{SOURCE2} src
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -91,6 +93,9 @@ desktop-file-install --vendor gnome --delete-original \
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Wed Jan 12 2011 Matthias Clasen <mclasen at redhat.com> - 2.33.4-2
+- Make the find dialog work again
+
* Tue Jan 11 2011 Matthias Clasen <mclasen at redhat.com> - 2.33.4-1
- Update to 2.33.4
diff --git a/terminal-search.patch b/terminal-search.patch
new file mode 100644
index 0000000..57e520e
--- /dev/null
+++ b/terminal-search.patch
@@ -0,0 +1,16 @@
+diff --git a/src/terminal-search-dialog.c b/src/terminal-search-dialog.c
+index 81e3317..e299ae9 100644
+--- a/src/terminal-search-dialog.c
++++ b/src/terminal-search-dialog.c
+@@ -108,7 +108,11 @@ terminal_search_dialog_new (GtkWindow *parent)
+ priv->store = store = gtk_list_store_new (1, G_TYPE_STRING);
+ g_object_set (G_OBJECT (priv->search_entry),
+ "model", store,
++#if GTK_CHECK_VERSION (2, 91, 0)
++ "entry-text-column", 0,
++#else
+ "text-column", 0,
++#endif
+ NULL);
+
+ priv->completion = completion = gtk_entry_completion_new ();
More information about the scm-commits
mailing list