Re: [evolution-patches] calendar/gui/dialogs/calendar-setup.glade: Fixes #57470, #57472



Patch actually attached this time :)

> Hi Guys,
> 
> This patch fixes bugs
> #57470 - New Calendar Dialog: strange button next to URL input field
> #57472 - Calendar Properties Dialog: wrong icons (envelope) in the
> (window list)
> 
> I've lumped them in as one because glade seems to like adding random
> crap to the glade files and they are on the same file and dialog and
> both bugs, hopefully the fixes for both are ok.
> 
> If not, let me know and I'll make a separate patch for one.
> 
> Cheers,
> Trent
> Bur.st
> 
> -- 
> Trent Lloyd <lathiat bur st>
> Bur.st Networking Inc.
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2308
diff -u -r1.2308 ChangeLog
--- a/calendar/ChangeLog	7 May 2004 04:35:36 -0000	1.2308
+++ b/calendar/ChangeLog	7 May 2004 16:26:13 -0000
@@ -1,3 +1,11 @@
+2004-05-06  Trent Lloyd  <lathiat bur st>
+
+	Fixes #57470
+	Fixes #57472
+
+	* gui/dialogs/calendar-setup.glade:
+	- Remove redundant uri_button that does nothing, has no code reference
+	and has a broken icon
+	- Make default width of add-calendar-dialog wider to give more space
+	for URL.
+
 2004-05-06  Larry Ewing  <lewing ximian com>
 
 	* gui/dialogs/calendar-setup.c (source_to_dialog): use random
Index: calendar/gui/dialogs/calendar-setup.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.glade,v
retrieving revision 1.9
diff -u -r1.9 calendar-setup.glade
--- a/calendar/gui/dialogs/calendar-setup.glade	4 May 2004 18:52:10 -0000	1.9
+++ b/calendar/gui/dialogs/calendar-setup.glade	7 May 2004 16:26:19 -0000
@@ -5,12 +5,18 @@
 <requires lib="gnome"/>
 
 <widget class="GtkWindow" id="add-calendar-window">
+  <property name="width_request">350</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">True</property>
   <property name="destroy_with_parent">False</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_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox1">
@@ -104,6 +110,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xscale">0</property>
 	      <property name="yscale">1</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>
 		<widget class="GtkHBox" id="hbox2">
@@ -244,30 +254,6 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="uri-button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image10">
-		      <property name="visible">True</property>
-		      <property name="pixbuf">xine_16x16.png</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>
 	      <property name="left_attach">1</property>
@@ -357,6 +343,7 @@
 	      <property name="dither">True</property>
 	      <property name="use_alpha">False</property>
 	      <property name="title" translatable="yes">Pick a color</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -389,6 +376,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 
@@ -398,6 +386,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 
 	      <child>
 		<widget class="GtkAlignment" id="alignment1">
@@ -406,6 +395,10 @@
 		  <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>
 		    <widget class="GtkHBox" id="hbox1">
@@ -474,6 +467,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</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_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox37">
@@ -535,6 +533,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xscale">0.9</property>
 		      <property name="yscale">1</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>
 			<widget class="GtkEntry" id="name-entry">
@@ -794,6 +796,7 @@
 		  <property name="label">gtk-cancel</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 	      </child>
 
@@ -806,6 +809,7 @@
 		  <property name="label">gtk-ok</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -833,6 +837,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</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_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox84">
@@ -894,6 +903,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xscale">0.9</property>
 		      <property name="yscale">1</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>
 			<widget class="GtkEntry" id="name-entry">
@@ -1153,6 +1166,7 @@
 		  <property name="label">gtk-cancel</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 	      </child>
 
@@ -1165,6 +1179,7 @@
 		  <property name="label">gtk-ok</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -1186,12 +1201,17 @@
 </widget>
 
 <widget class="GtkWindow" id="add-task-list-window">
-  <property name="title" translatable="yes">Add Tasks Group</property>
+  <property name="title" translatable="yes">New Tasks Group</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">True</property>
   <property name="destroy_with_parent">False</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_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox87">
@@ -1310,6 +1330,7 @@
 	      <property name="dither">True</property>
 	      <property name="use_alpha">False</property>
 	      <property name="title" translatable="yes">Pick a color</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -1351,6 +1372,7 @@
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 
 		  <child>
 		    <widget class="GtkImage" id="uri-image">
@@ -1458,6 +1480,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xscale">0</property>
 	      <property name="yscale">1</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>
 		<widget class="GtkHBox" id="hbox130">
@@ -1571,6 +1597,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 
@@ -1580,6 +1607,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 
 	      <child>
 		<widget class="GtkAlignment" id="alignment48">
@@ -1588,6 +1616,10 @@
 		  <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>
 		    <widget class="GtkHBox" id="hbox129">


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