diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/select-names.glade | 464 |
2 files changed, 264 insertions, 205 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b1744a651a..03e0092ace 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,10 @@ 2002-04-23 Christopher James Lahey <clahey@ximian.com> + * gui/component/select-names/select-names.glade: Updated this + dialog to match the redesign. + +2002-04-23 Christopher James Lahey <clahey@ximian.com> + * gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused menu items disappear instead of graying out. diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade index 47d178735a..367c5b21bd 100644 --- a/addressbook/gui/component/select-names/select-names.glade +++ b/addressbook/gui/component/select-names/select-names.glade @@ -6,7 +6,7 @@ <program_name>select-names</program_name> <directory></directory> <source_directory>src</source_directory> - <pixmaps_directory>pixmaps</pixmaps_directory> + <pixmaps_directory>../../../../art/</pixmaps_directory> <language>C</language> <gnome_support>True</gnome_support> <gettext_support>True</gettext_support> @@ -35,8 +35,9 @@ <class>GtkVBox</class> <child_name>GnomeDialog:vbox</child_name> <name>dialog-vbox1</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>8</spacing> + <spacing>3</spacing> <child> <padding>4</padding> <expand>True</expand> @@ -83,8 +84,8 @@ <rows>3</rows> <columns>1</columns> <homogeneous>False</homogeneous> - <row_spacing>0</row_spacing> - <column_spacing>0</column_spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <child> <padding>0</padding> <expand>True</expand> @@ -92,10 +93,8 @@ </child> <widget> - <class>GtkVBox</class> - <name>vbox5</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> + <class>GtkHSeparator</class> + <name>hseparator1</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -104,40 +103,109 @@ <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> - <yexpand>True</yexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> + <class>GtkFrame</class> + <name>frame1</name> + <label>Show Contacts</label> + <label_xalign>0</label_xalign> + <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>True</yfill> + <yfill>False</yfill> </child> <widget> <class>GtkTable</class> - <name>table4</name> + <name>table5</name> + <border_width>3</border_width> <rows>2</rows> <columns>2</columns> <homogeneous>False</homogeneous> - <row_spacing>6</row_spacing> - <column_spacing>6</column_spacing> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <widget> - <class>GtkTable</class> - <name>table-recipients</name> - <rows>1</rows> - <columns>2</columns> - <homogeneous>False</homogeneous> - <row_spacing>4</row_spacing> - <column_spacing>4</column_spacing> + <class>GtkLabel</class> + <name>label30</name> + <label>_Folder:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <default_focus_target>optionmenu-folder</default_focus_target> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label31</name> + <label>_Category:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> + <class>GtkOptionMenu</class> + <name>optionmenu-folder</name> + <can_focus>True</can_focus> + <items></items> + <initial_choice>0</initial_choice> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> <top_attach>0</top_attach> - <bottom_attach>2</bottom_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -150,248 +218,234 @@ </widget> <widget> - <class>GtkVBox</class> - <name>vbox6</name> - <homogeneous>False</homogeneous> - <spacing>3</spacing> + <class>Custom</class> + <name>custom-categories</name> + <creation_function>e_select_names_create_categories</creation_function> + <int1>0</int1> + <int2>0</int2> + <last_modification_time>Tue, 19 Feb 2002 23:06:24 GMT</last_modification_time> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>0</top_attach> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> - <yexpand>True</yexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>Custom</class> - <name>table-source</name> - <creation_function>e_addressbook_create_ebook_table</creation_function> - <int1>0</int1> - <int2>0</int2> - <last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - </widget> </widget> </widget> </widget> <widget> <class>GtkVBox</class> - <name>dialog-vbox1</name> + <name>vbox5</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> + <xexpand>False</xexpand> + <yexpand>True</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> <widget> - <class>GtkVBox</class> - <name>vbox3</name> - <border_width>3</border_width> + <class>GtkTable</class> + <name>table4</name> + <rows>3</rows> + <columns>2</columns> <homogeneous>False</homogeneous> - <spacing>3</spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <child> <padding>0</padding> - <expand>False</expand> - <fill>False</fill> + <expand>True</expand> + <fill>True</fill> </child> <widget> - <class>GtkLabel</class> - <name>label4</name> - <label>Show contacts matching the following criteria:</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>0</xalign> + <class>GtkAlignment</class> + <name>alignment4</name> + <xalign>7.45058e-09</xalign> <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkHBox</class> - <name>hbox1</name> - <border_width>3</border_width> - <homogeneous>False</homogeneous> - <spacing>8</spacing> + <xscale>0</xscale> + <yscale>1</yscale> <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkLabel</class> - <name>label5</name> - <label>_Folder:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <default_focus_target>optionmenu-folder</default_focus_target> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> + <xexpand>False</xexpand> + <yexpand>True</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>True</yfill> + </child> <widget> - <class>GtkOptionMenu</class> - <name>optionmenu-folder</name> - <can_focus>True</can_focus> - <items></items> - <initial_choice>0</initial_choice> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - </widget> + <class>GtkVBox</class> + <name>vbox6</name> + <homogeneous>False</homogeneous> + <spacing>3</spacing> - <widget> - <class>GtkLabel</class> - <name>label6</name> - <label>_Category:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <default_focus_target>custom-categories</default_focus_target> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - </widget> + <widget> + <class>GtkHBox</class> + <name>hbox5</name> + <homogeneous>False</homogeneous> + <spacing>3</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> - <widget> - <class>Custom</class> - <name>custom-categories</name> - <can_focus>True</can_focus> - <creation_function>e_select_names_create_categories</creation_function> - <int1>0</int1> - <int2>0</int2> - <last_modification_time>Wed, 27 Jun 2001 01:47:01 GMT</last_modification_time> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> + <widget> + <class>GtkEntry</class> + <name>entry-find</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> + + <widget> + <class>GtkButton</class> + <name>button16</name> + <width>50</width> + <can_focus>True</can_focus> + <label>F_ind</label> + <relief>GTK_RELIEF_NORMAL</relief> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> + </widget> + </widget> + + <widget> + <class>GtkAlignment</class> + <name>alignment3</name> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xscale>1</xscale> + <yscale>1</yscale> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + + <widget> + <class>Custom</class> + <name>table-source</name> + <creation_function>e_addressbook_create_ebook_table</creation_function> + <int1>0</int1> + <int2>0</int2> + <last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time> + </widget> + </widget> </widget> </widget> <widget> - <class>GtkHBox</class> - <name>hbox2</name> - <border_width>3</border_width> + <class>GtkTable</class> + <name>table-recipients</name> + <rows>5</rows> + <columns>2</columns> <homogeneous>False</homogeneous> - <spacing>3</spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>3</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>True</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> </child> <widget> <class>GtkLabel</class> - <name>label7</name> - <label>C_ontaining:</label> + <name>label20</name> + <label>Selected Contacts:</label> <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> + <wrap>True</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - <default_focus_target>entry-find</default_focus_target> <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> </child> </widget> - - <widget> - <class>GtkEntry</class> - <name>entry-find</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - </widget> - - <widget> - <class>GtkHButtonBox</class> - <name>hbuttonbox1</name> - <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style> - <spacing>0</spacing> - <child_min_width>85</child_min_width> - <child_min_height>27</child_min_height> - <child_ipad_x>7</child_ipad_x> - <child_ipad_y>0</child_ipad_y> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkButton</class> - <name>button-find</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <label>F_ind</label> - <relief>GTK_RELIEF_NORMAL</relief> - </widget> - </widget> </widget> - </widget> - <widget> - <class>GtkHSeparator</class> - <name>hseparator1</name> - <child> - <padding>8</padding> - <expand>False</expand> - <fill>False</fill> - </child> + <widget> + <class>GtkLabel</class> + <name>label32</name> + <label>Type a name into the entry, or +select one from the list below:</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> </widget> </widget> |