aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-05-10 01:41:31 +0800
committerChris Lahey <clahey@src.gnome.org>2000-05-10 01:41:31 +0800
commit4623ccd1ed26f2b83c14f32e30fe80607e853189 (patch)
tree36b2aa49b96de393634ecc0587388fb5eff866c0
parent627ae5c6cada568578ed99160fc9ac9031eaa148 (diff)
downloadgsoc2013-evolution-4623ccd1ed26f2b83c14f32e30fe80607e853189.tar.gz
gsoc2013-evolution-4623ccd1ed26f2b83c14f32e30fe80607e853189.tar.zst
gsoc2013-evolution-4623ccd1ed26f2b83c14f32e30fe80607e853189.zip
Replaced the Address button with a label and rearranged the address area a
2000-05-09 Christopher James Lahey <clahey@helixcode.com> * contact-editor/contact-editor.glade, contact-editor/e-contact-editor-strings.h: Replaced the Address button with a label and rearranged the address area a bit. svn path=/trunk/; revision=2955
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/contact-editor/contact-editor.glade61
-rw-r--r--addressbook/contact-editor/e-contact-editor-strings.h2
-rw-r--r--addressbook/gui/contact-editor/contact-editor.glade61
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-strings.h2
5 files changed, 72 insertions, 60 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 37c2a1c09d..7f2cc03970 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2000-05-09 Christopher James Lahey <clahey@helixcode.com>
+ * contact-editor/contact-editor.glade,
+ contact-editor/e-contact-editor-strings.h: Replaced the Address
+ button with a label and rearranged the address area a bit.
+
+2000-05-09 Christopher James Lahey <clahey@helixcode.com>
+
* gui/minicard/e-minicard.c: Reenable editting.
* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index 4e6b00888e..976508d41c 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -480,7 +480,6 @@
<name>checkbutton-mailingaddress</name>
<cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
- <can_focus>True</can_focus>
<label>This is the mailing address</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -488,28 +487,6 @@
</widget>
<widget>
- <class>GtkButton</class>
- <name>button-address</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_focus>True</can_focus>
- <label>A_ddress...</label>
- <child>
- <left_attach>5</left_attach>
- <right_attach>7</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
- </widget>
-
- <widget>
<class>GtkAlignment</class>
<name>alignment3</name>
<cxx_use_heap>True</cxx_use_heap>
@@ -984,7 +961,6 @@
<name>checkbutton-htmlmail</name>
<cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
- <can_focus>True</can_focus>
<label>Wants HTML mail</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -992,6 +968,33 @@
</widget>
<widget>
+ <class>GtkLabel</class>
+ <name>label-address1</name>
+ <cxx_use_heap>True</cxx_use_heap>
+ <label>Business</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>5</left_attach>
+ <right_attach>6</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
<class>GtkAlignment</class>
<name>alignment4</name>
<cxx_use_heap>True</cxx_use_heap>
@@ -1002,8 +1005,8 @@
<child>
<left_attach>6</left_attach>
<right_attach>7</right_attach>
- <top_attach>6</top_attach>
- <bottom_attach>7</bottom_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1027,9 +1030,9 @@
<widget>
<class>GtkLabel</class>
- <name>label-address1</name>
+ <name>address-label</name>
<cxx_use_heap>True</cxx_use_heap>
- <label>Business</label>
+ <label>Address:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1038,7 +1041,7 @@
<ypad>0</ypad>
<child>
<left_attach>5</left_attach>
- <right_attach>6</right_attach>
+ <right_attach>7</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<xpad>0</xpad>
diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h
index 436a8b7216..07aff370ad 100644
--- a/addressbook/contact-editor/e-contact-editor-strings.h
+++ b/addressbook/contact-editor/e-contact-editor-strings.h
@@ -16,9 +16,9 @@ gchar *s = N_("Company:");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("This is the mailing address");
-gchar *s = N_("A_ddress...");
gchar *s = N_("Wants HTML mail");
gchar *s = N_("Business");
+gchar *s = N_("Address:");
gchar *s = N_("General");
gchar *s = N_("Department:");
gchar *s = N_("Office:");
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 4e6b00888e..976508d41c 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -480,7 +480,6 @@
<name>checkbutton-mailingaddress</name>
<cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
- <can_focus>True</can_focus>
<label>This is the mailing address</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -488,28 +487,6 @@
</widget>
<widget>
- <class>GtkButton</class>
- <name>button-address</name>
- <cxx_use_heap>True</cxx_use_heap>
- <can_focus>True</can_focus>
- <label>A_ddress...</label>
- <child>
- <left_attach>5</left_attach>
- <right_attach>7</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
- </widget>
-
- <widget>
<class>GtkAlignment</class>
<name>alignment3</name>
<cxx_use_heap>True</cxx_use_heap>
@@ -984,7 +961,6 @@
<name>checkbutton-htmlmail</name>
<cxx_use_heap>True</cxx_use_heap>
<visible>False</visible>
- <can_focus>True</can_focus>
<label>Wants HTML mail</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
@@ -992,6 +968,33 @@
</widget>
<widget>
+ <class>GtkLabel</class>
+ <name>label-address1</name>
+ <cxx_use_heap>True</cxx_use_heap>
+ <label>Business</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>5</left_attach>
+ <right_attach>6</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
<class>GtkAlignment</class>
<name>alignment4</name>
<cxx_use_heap>True</cxx_use_heap>
@@ -1002,8 +1005,8 @@
<child>
<left_attach>6</left_attach>
<right_attach>7</right_attach>
- <top_attach>6</top_attach>
- <bottom_attach>7</bottom_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1027,9 +1030,9 @@
<widget>
<class>GtkLabel</class>
- <name>label-address1</name>
+ <name>address-label</name>
<cxx_use_heap>True</cxx_use_heap>
- <label>Business</label>
+ <label>Address:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
@@ -1038,7 +1041,7 @@
<ypad>0</ypad>
<child>
<left_attach>5</left_attach>
- <right_attach>6</right_attach>
+ <right_attach>7</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<xpad>0</xpad>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h
index 436a8b7216..07aff370ad 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-strings.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-strings.h
@@ -16,9 +16,9 @@ gchar *s = N_("Company:");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("This is the mailing address");
-gchar *s = N_("A_ddress...");
gchar *s = N_("Wants HTML mail");
gchar *s = N_("Business");
+gchar *s = N_("Address:");
gchar *s = N_("General");
gchar *s = N_("Department:");
gchar *s = N_("Office:");