[Commits] (morgen) Fix for bug 2528 -- Accounts list should be more
in user-terms, r=capps
commits at osafoundation.org
commits at osafoundation.org
Fri Mar 4 16:41:47 PST 2005
Commit by: morgen
Modified files:
chandler/application/dialogs/AccountPreferences.py 1.34 1.35
chandler/application/dialogs/AccountPreferences.wdr 1.14 1.15
chandler/application/dialogs/AccountPreferences_wdr.xrc 1.13 1.14
chandler/parcels/osaf/framework/sharing/accounts/parcel.xml 1.6 1.7
chandler/parcels/osaf/mail/parcel.xml 1.24 1.25
Log message:
Fix for bug 2528 -- Accounts list should be more in user-terms, r=capps
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/AccountPreferences.py.diff?r1=text&tr1=1.34&r2=text&tr2=1.35
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/AccountPreferences.wdr.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/AccountPreferences_wdr.xrc.diff?r1=text&tr1=1.13&r2=text&tr2=1.14
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/accounts/parcel.xml.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/mail/parcel.xml.diff?r1=text&tr1=1.24&r2=text&tr2=1.25
Index: chandler/application/dialogs/AccountPreferences.py
diff -u chandler/application/dialogs/AccountPreferences.py:1.34 chandler/application/dialogs/AccountPreferences.py:1.35
--- chandler/application/dialogs/AccountPreferences.py:1.34 Thu Feb 17 19:46:12 2005
+++ chandler/application/dialogs/AccountPreferences.py Fri Mar 4 16:41:45 2005
@@ -97,6 +97,7 @@
"id" : "IMAPPanel",
"saveHandler" : IMAPSaveHandler,
"displayName" : "IMAP_DESCRIPTION",
+ "description" : "Incoming mail (IMAP)",
},
"SMTP" : {
"fields" : {
@@ -135,6 +136,7 @@
},
"id" : "SMTPPanel",
"displayName" : "SMTP_DESCRIPTION",
+ "description" : "Outgoing mail (SMTP)",
},
"WebDAV" : {
"fields" : {
@@ -179,6 +181,7 @@
},
"id" : "WebDAVPanel",
"displayName" : "WEBDAV_DESCRIPTION",
+ "description" : "Sharing (WebDAV)",
"callbacks" : (
("WEBDAV_TEST", "OnTestWebDAV"),
)
@@ -230,10 +233,12 @@
typeNames = []
for (key, value) in PANELS.iteritems():
- typeNames.append(key)
+ # store a tuple with account type description, and name
+ typeNames.append( (value['description'], key) )
typeNames.sort()
- for name in typeNames:
- self.choiceNewType.Append(name)
+ for (description, name) in typeNames:
+ newIndex = self.choiceNewType.Append(description)
+ self.choiceNewType.SetClientData(newIndex, name)
self.choiceNewType.SetSelection(0)
self.currentIndex = None # the list index of account in detail panel
@@ -589,7 +594,7 @@
if selection == 0:
return
- accountType = self.choiceNewType.GetString(selection)
+ accountType = self.choiceNewType.GetClientData(selection)
self.choiceNewType.SetSelection(0)
accountName = "New %s account" % accountType
Index: chandler/application/dialogs/AccountPreferences_wdr.xrc
diff -u chandler/application/dialogs/AccountPreferences_wdr.xrc:1.13 chandler/application/dialogs/AccountPreferences_wdr.xrc:1.14
--- chandler/application/dialogs/AccountPreferences_wdr.xrc:1.13 Tue Feb 8 17:24:59 2005
+++ chandler/application/dialogs/AccountPreferences_wdr.xrc Fri Mar 4 16:41:45 2005
@@ -29,7 +29,7 @@
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
<size>300,-1</size>
- <label>SMTP (Outoing Mail)</label>
+ <label>SMTP</label>
</object>
</object>
<object class="sizeritem">
@@ -162,10 +162,9 @@
<vgap>0</vgap>
<hgap>0</hgap>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Account type:</label>
</object>
@@ -175,14 +174,13 @@
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
<size>300,-1</size>
- <label>IMAP (Incoming Mail)</label>
+ <label>IMAP</label>
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Description:</label>
</object>
@@ -196,10 +194,9 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Email address:</label>
</object>
@@ -213,10 +210,9 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Full name:</label>
</object>
@@ -230,12 +226,11 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
- <label>Server:</label>
+ <label>Incoming mail server:</label>
</object>
</object>
<object class="sizeritem">
@@ -247,10 +242,9 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Username:</label>
</object>
@@ -264,10 +258,9 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Password:</label>
</object>
@@ -282,10 +275,9 @@
</object>
</object>
<object class="sizeritem">
- <flag>wxALIGN_CENTER|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <size>110,-1</size>
<style>wxALIGN_RIGHT</style>
<label>Port number:</label>
</object>
@@ -344,7 +336,7 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
- <label>SMTP account:</label>
+ <label>Outgoing mail server (SMTP):</label>
</object>
</object>
<object class="sizeritem">
@@ -386,7 +378,7 @@
<border>5</border>
<object class="wxStaticText" name="ID_TEXT">
<size>300,-1</size>
- <label>WebDAV (Collection publishing)</label>
+ <label>WebDAV</label>
</object>
</object>
<object class="sizeritem">
@@ -545,7 +537,7 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxButton" name="WEBDAV_TEST">
- <label>Click to test this account now</label>
+ <label>Test this account</label>
</object>
</object>
</object>
Index: chandler/parcels/osaf/framework/sharing/accounts/parcel.xml
diff -u chandler/parcels/osaf/framework/sharing/accounts/parcel.xml:1.6 chandler/parcels/osaf/framework/sharing/accounts/parcel.xml:1.7
--- chandler/parcels/osaf/framework/sharing/accounts/parcel.xml:1.6 Mon Feb 7 21:55:01 2005
+++ chandler/parcels/osaf/framework/sharing/accounts/parcel.xml Fri Mar 4 16:41:45 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
-<!-- $Date: 2005/02/08 05:55:01 $ -->
+<!-- $Revision: 1.7 $ -->
+<!-- $Date: 2005/03/05 00:41:45 $ -->
<!-- Copyright (c) 2003-2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -12,7 +12,7 @@
>
<share:WebDAVAccount itsName="OSAFWebDAVAccount">
- <displayName value="OSAF WebDAV"/>
+ <displayName value="OSAF sharing"/>
<currentItemOf itemref="current:WebDAVAccount"/>
<host value="pilikia.osafoundation.org"/>
<path value="/dev1"/>
@@ -23,7 +23,7 @@
</share:WebDAVAccount>
<share:WebDAVAccount itsName="XythosWebDAVAccount">
- <displayName value="Xythos WebDAV"/>
+ <displayName value="Xythos sharing"/>
<host value="www.sharemation.com"/>
<path value="/OSAFdot5"/>
<username value="OSAFdot5"/>
@@ -33,7 +33,7 @@
</share:WebDAVAccount>
<share:WebDAVAccount itsName="VenueWebDAVAccount">
- <displayName value="Venue WebDAV"/>
+ <displayName value="Venue sharing"/>
<host value="webdav.venuecom.com"/>
<path value="/calendar/OSAFdot5/calendars"/>
<username value="OSAFdot5"/>
Index: chandler/parcels/osaf/mail/parcel.xml
diff -u chandler/parcels/osaf/mail/parcel.xml:1.24 chandler/parcels/osaf/mail/parcel.xml:1.25
--- chandler/parcels/osaf/mail/parcel.xml:1.24 Mon Feb 7 21:55:01 2005
+++ chandler/parcels/osaf/mail/parcel.xml Fri Mar 4 16:41:46 2005
@@ -7,7 +7,7 @@
xmlns:mail="http://osafoundation.org/parcels/osaf/mail">
<content:IMAPAccount itsName="PredefinedIMAPAccount">
- <displayName>IMAP</displayName>
+ <displayName>Incoming mail</displayName>
<!-- This points replyToAddress to the email address item below-->
<replyToAddress itemref="mail:PredefinedReplyAddress" />
<!-- This points to the SMTPAccount item below -->
@@ -18,7 +18,7 @@
<content:EmailAddress itsName="PredefinedReplyAddress" />
<content:SMTPAccount itsName="PredefinedSMTPAccount">
- <displayName>SMTP</displayName>
+ <displayName>Outgoing mail</displayName>
<currentItemOf itemref="current:SMTPAccount"/>
</content:SMTPAccount>
More information about the Commits
mailing list