rpms/gedit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make buttons behave

Browse Source
This commit is contained in:
Matthias Clasen 2009-07-16 18:04:05 +00:00
parent 1fb68b3403
commit a96f0023d7
2 changed files with 522 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

514
button-images.patch Normal file
View File

@ -0,0 +1,514 @@
diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/sort/sort.ui
--- gedit-2.27.2/plugins/sort/sort.ui.button-images 2009-07-16 13:54:14.208338015 -0400
+++ gedit-2.27.2/plugins/sort/sort.ui 2009-07-16 13:56:25.653333726 -0400
@@ -9,6 +9,10 @@
<property name="page_size">0</property>
<property name="value">1</property>
</object>
+ <object class="GtkImage" id="sort_image">
+ <property name="stock">gtk-sort-ascending</property>
+ <property name="icon_size">4</property>
+ </object>
<object class="GtkDialog" id="sort_dialog">
<property name="title" translatable="yes">Sort</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -50,66 +54,9 @@
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
- <child>
- <object class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="stock">gtk-sort-ascending</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Sort</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="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>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">sort_image</property>
+ <property name="label" translatable="yes">_Sort</property>
+ <property name="use_underline">True</property>
</object>
</child>
<child>
diff -up gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c
--- gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images 2009-07-16 13:51:51.765583774 -0400
+++ gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c 2009-07-16 13:48:42.535583423 -0400
@@ -223,12 +223,18 @@ create_dialog (GeditSpellCheckerDialog *
GtkTreeViewColumn *column;
GtkCellRenderer *cell;
GtkTreeSelection *selection;
- gboolean ret;
- gchar *ui_file;
gchar *root_objects[] = {
"content",
+ "check_word_image",
+ "add_word_image",
+ "ignore_image",
+ "change_image",
+ "ignore_all_image",
+ "change_all_image",
NULL
};
+ gboolean ret;
+ gchar *ui_file;
g_return_if_fail (dlg != NULL);
diff -up gedit-2.27.2/plugins/spell/spell-checker.ui.button-images gedit-2.27.2/plugins/spell/spell-checker.ui
--- gedit-2.27.2/plugins/spell/spell-checker.ui.button-images 2009-07-16 13:08:59.501579700 -0400
+++ gedit-2.27.2/plugins/spell/spell-checker.ui 2009-07-16 13:48:08.324355869 -0400
@@ -1,6 +1,30 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkImage" id="check_word_image">
+ <property name="stock">gtk-spell-check</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="add_word_image">
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="ignore_image">
+ <property name="stock">gtk-go-down</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="change_image">
+ <property name="stock">gtk-convert</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="ignore_all_image">
+ <property name="stock">gtk-goto-bottom</property>
+ <property name="icon_size">4</property>
+ </object>
+ <object class="GtkImage" id="change_all_image">
+ <property name="stock">gtk-convert</property>
+ <property name="icon_size">4</property>
+ </object>
<object class="GtkWindow" id="check_spelling_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Check spelling</property>
@@ -121,58 +145,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-spell-check</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Check _Word</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">check_word_image</property>
+ <property name="label" translatable="yes">Check _Word</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="padding">0</property>
@@ -272,58 +247,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-go-down</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Ignore</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">ignore_image</property>
+ <property name="label" translatable="yes">_Ignore</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -338,58 +264,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image21">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cha_nge</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">change_image</property>
+ <property name="label" translatable="yes">Cha_nge</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -404,58 +281,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-goto-bottom</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ignore _All</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">ignore_all_image</property>
+ <property name="label" translatable="yes">Ignore _All</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -470,58 +298,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment22">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox31">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image22">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label43">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Change A_ll</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">change_all_image</property>
+ <property name="label" translatable="yes">Change A_ll</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -573,58 +352,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add w_ord</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>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">add_word_image</property>
+ <property name="label" translatable="yes">Add w_ord</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="padding">0</property>

9
gedit.spec
View File

@ -18,7 +18,7 @@
Summary: Text editor for the GNOME desktop
Name: gedit
Version: 2.27.2
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: Applications/Editors
@ -48,6 +48,9 @@ Patch2: gedit-2.25.5-fix-python-path.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=587053
Patch3: print-to-file.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=588806
Patch4: button-images.patch
BuildRequires: gnome-common
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: pango-devel >= %{pango_version}
@ -114,6 +117,7 @@ Install gedit-devel if you want to write plugins for gedit.
%patch2 -p1 -b .fix-python-path
%patch3 -p1 -b .print-to-file
%patch4 -p1 -b .button-images
%build
autoreconf -f -i
@ -229,6 +233,9 @@ fi
%changelog
* Thu Jul 16 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.27.2-2
- Make some stubborn buttons behave
* Tue Jun 30 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.27.2-1
- Update to 2.27.2