Bug #2674: smaller edit family window; clean up of display logic, reduced size
svn: r11885
This commit is contained in:
		@@ -629,6 +629,7 @@
 | 
			
		||||
		  <child>
 | 
			
		||||
		    <widget class="GtkTable" id="ftable">
 | 
			
		||||
		      <property name="border_width">6</property>
 | 
			
		||||
		      <property name="width_request">132</property>
 | 
			
		||||
		      <property name="visible">True</property>
 | 
			
		||||
		      <property name="n_rows">4</property>
 | 
			
		||||
		      <property name="n_columns">2</property>
 | 
			
		||||
@@ -755,7 +756,7 @@
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton">
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton_index">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
@@ -782,7 +783,7 @@
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton2">
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton_add">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
@@ -793,7 +794,59 @@
 | 
			
		||||
				<widget class="GtkImage" id="image2697">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-add</property>
 | 
			
		||||
				  <property name="icon_size">1</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>
 | 
			
		||||
				</widget>
 | 
			
		||||
			      </child>
 | 
			
		||||
			    </widget>
 | 
			
		||||
			    <packing>
 | 
			
		||||
			      <property name="padding">0</property>
 | 
			
		||||
			      <property name="expand">False</property>
 | 
			
		||||
			      <property name="fill">False</property>
 | 
			
		||||
			    </packing>
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton_del">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
			      <property name="focus_on_click">True</property>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkImage" id="image2724">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-remove</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>
 | 
			
		||||
				</widget>
 | 
			
		||||
			      </child>
 | 
			
		||||
			    </widget>
 | 
			
		||||
			    <packing>
 | 
			
		||||
			      <property name="padding">0</property>
 | 
			
		||||
			      <property name="expand">False</property>
 | 
			
		||||
			      <property name="fill">False</property>
 | 
			
		||||
			    </packing>
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="fbutton_edit">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
			      <property name="focus_on_click">True</property>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkImage" id="image2725">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-edit</property>
 | 
			
		||||
				  <property name="icon_size">4</property>
 | 
			
		||||
				  <property name="xalign">0.5</property>
 | 
			
		||||
				  <property name="yalign">0.5</property>
 | 
			
		||||
				  <property name="xpad">0</property>
 | 
			
		||||
@@ -874,14 +927,22 @@
 | 
			
		||||
		      </child>
 | 
			
		||||
 | 
			
		||||
		      <child>
 | 
			
		||||
			<widget class="GtkHBox" id="fbox">
 | 
			
		||||
			<widget class="GtkLabel" id="fname">
 | 
			
		||||
			  <property name="visible">True</property>
 | 
			
		||||
			  <property name="homogeneous">False</property>
 | 
			
		||||
			  <property name="spacing">0</property>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <placeholder/>
 | 
			
		||||
			  </child>
 | 
			
		||||
			  <property name="label" translatable="yes"></property>
 | 
			
		||||
			  <property name="use_underline">False</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</property>
 | 
			
		||||
			  <property name="yalign">0.5</property>
 | 
			
		||||
			  <property name="xpad">0</property>
 | 
			
		||||
			  <property name="ypad">0</property>
 | 
			
		||||
			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
 | 
			
		||||
			  <property name="width_chars">-1</property>
 | 
			
		||||
			  <property name="single_line_mode">False</property>
 | 
			
		||||
			  <property name="angle">0</property>
 | 
			
		||||
			</widget>
 | 
			
		||||
			<packing>
 | 
			
		||||
			  <property name="left_attach">1</property>
 | 
			
		||||
@@ -953,6 +1014,7 @@
 | 
			
		||||
		  <child>
 | 
			
		||||
		    <widget class="GtkTable" id="mtable">
 | 
			
		||||
		      <property name="border_width">6</property>
 | 
			
		||||
		      <property name="width_request">132</property>
 | 
			
		||||
		      <property name="visible">True</property>
 | 
			
		||||
		      <property name="n_rows">4</property>
 | 
			
		||||
		      <property name="n_columns">2</property>
 | 
			
		||||
@@ -1135,7 +1197,7 @@
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton">
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton_index">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
@@ -1162,7 +1224,7 @@
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton2">
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton_add">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
@@ -1173,7 +1235,7 @@
 | 
			
		||||
				<widget class="GtkImage" id="image2698">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-add</property>
 | 
			
		||||
				  <property name="icon_size">1</property>
 | 
			
		||||
				  <property name="icon_size">4</property>
 | 
			
		||||
				  <property name="xalign">0.5</property>
 | 
			
		||||
				  <property name="yalign">0.5</property>
 | 
			
		||||
				  <property name="xpad">0</property>
 | 
			
		||||
@@ -1219,7 +1281,55 @@
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <placeholder/>
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton_del">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
			      <property name="focus_on_click">True</property>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkImage" id="image2726">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-remove</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>
 | 
			
		||||
				</widget>
 | 
			
		||||
			      </child>
 | 
			
		||||
			    </widget>
 | 
			
		||||
			    <packing>
 | 
			
		||||
			      <property name="padding">0</property>
 | 
			
		||||
			      <property name="expand">False</property>
 | 
			
		||||
			      <property name="fill">False</property>
 | 
			
		||||
			    </packing>
 | 
			
		||||
			  </child>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <widget class="GtkButton" id="mbutton_edit">
 | 
			
		||||
			      <property name="visible">True</property>
 | 
			
		||||
			      <property name="can_focus">True</property>
 | 
			
		||||
			      <property name="relief">GTK_RELIEF_NONE</property>
 | 
			
		||||
			      <property name="focus_on_click">True</property>
 | 
			
		||||
 | 
			
		||||
			      <child>
 | 
			
		||||
				<widget class="GtkImage" id="image2727">
 | 
			
		||||
				  <property name="visible">True</property>
 | 
			
		||||
				  <property name="stock">gtk-edit</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>
 | 
			
		||||
				</widget>
 | 
			
		||||
			      </child>
 | 
			
		||||
			    </widget>
 | 
			
		||||
			    <packing>
 | 
			
		||||
			      <property name="padding">0</property>
 | 
			
		||||
			      <property name="expand">False</property>
 | 
			
		||||
			      <property name="fill">False</property>
 | 
			
		||||
			    </packing>
 | 
			
		||||
			  </child>
 | 
			
		||||
			</widget>
 | 
			
		||||
			<packing>
 | 
			
		||||
@@ -1232,14 +1342,22 @@
 | 
			
		||||
		      </child>
 | 
			
		||||
 | 
			
		||||
		      <child>
 | 
			
		||||
			<widget class="GtkHBox" id="mbox">
 | 
			
		||||
			<widget class="GtkLabel" id="mname">
 | 
			
		||||
			  <property name="visible">True</property>
 | 
			
		||||
			  <property name="homogeneous">False</property>
 | 
			
		||||
			  <property name="spacing">0</property>
 | 
			
		||||
 | 
			
		||||
			  <child>
 | 
			
		||||
			    <placeholder/>
 | 
			
		||||
			  </child>
 | 
			
		||||
			  <property name="label" translatable="yes"></property>
 | 
			
		||||
			  <property name="use_underline">False</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</property>
 | 
			
		||||
			  <property name="yalign">0.5</property>
 | 
			
		||||
			  <property name="xpad">0</property>
 | 
			
		||||
			  <property name="ypad">0</property>
 | 
			
		||||
			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
 | 
			
		||||
			  <property name="width_chars">-1</property>
 | 
			
		||||
			  <property name="single_line_mode">False</property>
 | 
			
		||||
			  <property name="angle">0</property>
 | 
			
		||||
			</widget>
 | 
			
		||||
			<packing>
 | 
			
		||||
			  <property name="left_attach">1</property>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user