Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2014-10-11 19:26:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2014-09-30 19:41:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2014-10-11 19:27:07.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 9 00:02:02 UTC 2014 - badshah400@gmail.com + +- Add meld-format-as-patch-dialog-window.patch: fix vertical + resizing of the format-as-patch dialog (bgo#738120). + +------------------------------------------------------------------- New: ---- meld-format-as-patch-dialog-window.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.dlHHo4/_old 2014-10-11 19:27:08.000000000 +0200 +++ /var/tmp/diff_new_pack.dlHHo4/_new 2014-10-11 19:27:08.000000000 +0200 @@ -26,6 +26,8 @@ Source: http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch dimstar@opensuse.org -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch +# PATCH-FIX-UPSTREAM meld-format-as-patch-dialog-window.patch bgo#738120 badshah400@gmail.com -- Fix vertical resizing of the format-as-patch dialog; taken from upstream git +Patch1: meld-format-as-patch-dialog-window.patch BuildRequires: fdupes # Needed for glib2_gsettings_schema macros BuildRequires: glib2-devel @@ -72,6 +74,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build ++++++ meld-format-as-patch-dialog-window.patch ++++++
From 6628d80c895cf0b7f9bdba5c3374043eceb4eb0c Mon Sep 17 00:00:00 2001 From: Kai Willadsen
Date: Thu, 9 Oct 2014 07:19:12 +1000 Subject: patchdialog: Update to new Glade and fix sourceview expand (bgo#738120)
diff --git a/data/ui/patch-dialog.ui b/data/ui/patch-dialog.ui index 9710e59..4abfff3 100644 --- a/data/ui/patch-dialog.ui +++ b/data/ui/patch-dialog.ui @@ -1,108 +1,163 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.1 --> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.6"/> <object class="GtkDialog" id="patchdialog"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Format as Patch</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> + <object class="GtkBox" id="dialog-vbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button1"> + <property name="label" translatable="yes">Copy to Clipboard</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button9"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <accelerator key="Escape" signal="activate"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button7"> + <property name="label" translatable="yes">Save Patch</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="side_selection_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Use differences between:</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="side_selection_box"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">18</property> + <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkRadioButton" id="left_radiobutton"> + <property name="label" translatable="yes">Left and middle panes</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">12</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkRadioButton" id="right_radiobutton"> + <property name="label" translatable="yes">Middle and right panes</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="left_radiobutton"> - <property name="label" translatable="yes">Left and middle panes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="right_radiobutton"> - <property name="label" translatable="yes">Middle and right panes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">left_radiobutton</property> - <signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="reverse_checkbutton"> <property name="label" translatable="yes">_Reverse patch direction</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_reverse_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -112,8 +167,6 @@ <property name="height_request">400</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="MeldSourceView" id="textview"> @@ -124,74 +177,25 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">3</property> </packing> </child> </object> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">Copy to Clipboard</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="use_action_appearance">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button9"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <accelerator key="Escape" signal="activate"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button7"> - <property name="label" translatable="yes">Save Patch</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> <action-widgets> <action-widget response="1">button1</action-widget> - <action-widget response="0">button7</action-widget> <action-widget response="-6">button9</action-widget> + <action-widget response="0">button7</action-widget> </action-widgets> </object> </interface> diff --git a/meld/patchdialog.py b/meld/patchdialog.py index d6530a9..81e5279 100644 --- a/meld/patchdialog.py +++ b/meld/patchdialog.py @@ -51,8 +51,8 @@ class PatchDialog(gnomeglade.Component): self.reverse_patch = self.reverse_checkbutton.get_active() if self.filediff.num_panes < 3: - self.label3.hide() - self.hbox2.hide() + self.side_selection_label.hide() + self.side_selection_box.hide() meldsettings.connect('changed', self.on_setting_changed) -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de