*** empty log message ***

svn path=/trunk/; revision=5695

1 files changed, 113 insertions, 10 deletions

diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade
index 809eb38f8f..5f52030d71 100644
--- a/calendar/gui/e-meeting-dialog.glade
+++ b/calendar/gui/e-meeting-dialog.glade
@@ -15,7 +15,7 @@
 <widget>
   <class>GtkWindow</class>
   <name>meeting_window</name>
-  <width>400</width>
+  <width>486</width>
   <height>330</height>
   <visible>False</visible>
   <title>Meeting Invitations</title>
@@ -114,7 +114,7 @@ Meeting</label>
 	<name>organizer_entry</name>
 	<width>252</width>
 	<can_focus>True</can_focus>
-	<editable>False</editable>
+	<editable>True</editable>
 	<text_visible>True</text_visible>
 	<text_max_length>0</text_max_length>
 	<text></text>
@@ -212,10 +212,9 @@ Meeting</label>
       <widget>
 	<class>GtkCList</class>
 	<name>attendee_list</name>
-	<border_width>3</border_width>
 	<can_focus>True</can_focus>
-	<columns>2</columns>
-	<column_widths>222,80</column_widths>
+	<columns>4</columns>
+	<column_widths>145,141,60,80</column_widths>
 	<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
 	<show_titles>True</show_titles>
 	<shadow_type>GTK_SHADOW_IN</shadow_type>
@@ -223,9 +222,35 @@ Meeting</label>
 	<widget>
 	  <class>GtkLabel</class>
 	  <child_name>CList:title</child_name>
-	  <name>attendee_label</name>
+	  <name>label8</name>
 	  <label>Attendee</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0.5</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <child_name>CList:title</child_name>
+	  <name>label5</name>
+	  <label>Role</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0.5</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <child_name>CList:title</child_name>
+	  <name>label6</name>
+	  <label>RSVP</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
@@ -236,7 +261,7 @@ Meeting</label>
 	<widget>
 	  <class>GtkLabel</class>
 	  <child_name>CList:title</child_name>
-	  <name>status_label</name>
+	  <name>label7</name>
 	  <label>Status</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -252,9 +277,9 @@ Meeting</label>
 
 <widget>
   <class>GnomeDialog</class>
-  <name>add_dialog</name>
+  <name>edit_dialog</name>
   <width>344</width>
-  <height>115</height>
+  <height>152</height>
   <visible>False</visible>
   <title>Attendee</title>
   <type>GTK_WINDOW_DIALOG</type>
@@ -355,6 +380,84 @@ Meeting</label>
 	</child>
       </widget>
     </widget>
+
+    <widget>
+      <class>GtkHBox</class>
+      <name>hbox4</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label9</name>
+	<label>Role</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>5</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkCombo</class>
+	<name>role_combo</name>
+	<width>160</width>
+	<value_in_list>False</value_in_list>
+	<ok_if_empty>True</ok_if_empty>
+	<case_sensitive>False</case_sensitive>
+	<use_arrows>True</use_arrows>
+	<use_arrows_always>False</use_arrows_always>
+	<items>Chair
+Required Participant
+Optional Participant
+Non-Participant
+Other
+
+
+</items>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <child_name>GtkCombo:entry</child_name>
+	  <name>role_entry</name>
+	  <can_focus>True</can_focus>
+	  <editable>False</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text>Required Participant</text>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>rsvp_check</name>
+	<can_focus>True</can_focus>
+	<label>RSVP</label>
+	<active>True</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+    </widget>
   </widget>
 </widget>