[Commits] (donn) Layout changes for the Detail View
commits at osafoundation.org
commits at osafoundation.org
Tue Sep 21 17:45:58 PDT 2004
Commit by: donn
Modified files:
chandler/parcels/osaf/framework/blocks/ContainerBlocks.py 1.130 1.131
chandler/parcels/osaf/framework/blocks/parcel.xml 1.113 1.114
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.32 1.33
chandler/parcels/osaf/framework/blocks/detail/parcel.xml 1.27 1.28
Log message:
Layout changes for the Detail View
----------------------------------
* Removed the scroll bar
- Fixes bug 1955, 1958
* Removed items in the Markup Bar (bug 1909)
* Put Date and Kind on one line with kind in parens
* Removed the ":" on field labels
* Right aligned the "Send" button (bug 1930)
* Changed "displayName" to "title" (bug 1921)
* "From" and "To" fields are now single line (bug 1915)
* Changed mouse-over message for mail icon (bug 1913)
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.130&r2=text&tr2=1.131
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/parcel.xml.diff?r1=text&tr1=1.113&r2=text&tr2=1.114
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.32&r2=text&tr2=1.33
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/parcel.xml.diff?r1=text&tr1=1.27&r2=text&tr2=1.28
Index: chandler/parcels/osaf/framework/blocks/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.113 chandler/parcels/osaf/framework/blocks/parcel.xml:1.114
--- chandler/parcels/osaf/framework/blocks/parcel.xml:1.113 Mon Sep 20 00:06:03 2004
+++ chandler/parcels/osaf/framework/blocks/parcel.xml Tue Sep 21 17:45:54 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.113 $ -->
-<!-- $Date: 2004/09/20 07:06:03 $ -->
+<!-- $Revision: 1.114 $ -->
+<!-- $Date: 2004/09/22 00:45:54 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -1111,7 +1111,7 @@
<Kind itsName="SelectionContainer">
<classes key="python">osaf.framework.blocks.ContainerBlocks.SelectionContainer</classes>
- <superKinds itemref="docSchema:ScrolledContainer"/>
+ <superKinds itemref="docSchema:BoxContainer"/>
<attributes itemref="docSchema:selection"/>
</Kind>
Index: chandler/parcels/osaf/framework/blocks/ContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.130 chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.131
--- chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.130 Tue Sep 14 00:07:06 2004
+++ chandler/parcels/osaf/framework/blocks/ContainerBlocks.py Tue Sep 21 17:45:54 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.130 $"
-__date__ = "$Date: 2004/09/14 07:07:06 $"
+__version__ = "$Revision: 1.131 $"
+__date__ = "$Date: 2004/09/22 00:45:54 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -214,7 +214,7 @@
return widget
-class SelectionContainer(ScrolledContainer):
+class SelectionContainer(BoxContainer):
"""
SelectionContainer
Keeps track of the current selected item
Index: chandler/parcels/osaf/framework/blocks/detail/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.27 chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.28
--- chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.27 Thu Sep 16 12:23:13 2004
+++ chandler/parcels/osaf/framework/blocks/detail/parcel.xml Tue Sep 21 17:45:55 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.27 $ -->
-<!-- $Date: 2004/09/16 19:23:13 $ -->
+<!-- $Revision: 1.28 $ -->
+<!-- $Date: 2004/09/22 00:45:55 $ -->
<!-- Copyright (c) 2003-2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -91,7 +91,7 @@
<childrenBlocks itemref="doc:MarkupBar"/>
<childrenBlocks itemref="doc:FromAndToArea"/>
<childrenBlocks itemref="doc:ContactFullNameArea"/>
- <childrenBlocks itemref="doc:CoreIndent"/>
+ <childrenBlocks itemref="doc:CoreArea"/>
<childrenBlocks itemref="doc:NotesArea"/>
<childrenBlocks itemref="doc:SendShareButton"/>
<!-- Attributes -->
@@ -106,21 +106,9 @@
itemClass="osaf.framework.blocks.detail.Detail.MarkupBar">
<blockName>MarkupBar</blockName>
<!-- Children Blocks-->
- <childrenBlocks itemref="doc:TriageButton"/>
<childrenBlocks itemref="doc:MailMessageButton"/>
<childrenBlocks itemref="doc:TaskStamp"/>
<childrenBlocks itemref="doc:CalendarStamp"/>
- <childrenBlocks itemref="doc:Spacer1"/>
- <childrenBlocks itemref="doc:NeedsReplyButton"/>
- <childrenBlocks itemref="doc:Spacer2"/>
- <childrenBlocks itemref="doc:OutboxFlag"/>
- <childrenBlocks itemref="doc:RepliedFlag"/>
- <childrenBlocks itemref="doc:ForwardedFlag"/>
- <childrenBlocks itemref="doc:RedirectedFlag"/>
- <childrenBlocks itemref="doc:DraftFlag"/>
- <childrenBlocks itemref="doc:QueuedFlag"/>
- <childrenBlocks itemref="doc:Spacer3"/>
- <childrenBlocks itemref="doc:PrivateButton"/>
<!-- Attributes -->
<colorStyle itemref="doc:GrayBackground3"/>
<toolSize>24,24</toolSize>
@@ -131,24 +119,14 @@
<!--
ToolbarItems
-->
- <ToolbarItem itsName="TriageButton">
- <blockName>TriageButton</blockName>
- <title>Triage</title>
- <bitmap>application/images/triage.png</bitmap>
- <selectedBitmap></selectedBitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Decide when to do...</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
<ToolbarItem itsName="MailMessageButton"
itemClass="osaf.framework.blocks.detail.Detail.MailMessageButton">
<blockName>MailMessageButton</blockName>
- <title>Sharing</title>
+ <title>Message</title>
<bitmap>application/images/markup_message.gif</bitmap>
<toolbarItemKind>Button</toolbarItemKind>
<toggle>True</toggle>
- <helpString>Enable sharing</helpString>
+ <helpString>Send as message</helpString>
<event itemref="doc:ButtonPressed"/>
</ToolbarItem>
@@ -174,94 +152,6 @@
<event itemref="doc:ButtonPressed"/>
</ToolbarItem>
- <ToolbarItem itsName="Spacer1">
- <blockName>Spacer1</blockName>
- <toolbarItemKind>Separator</toolbarItemKind>
- </ToolbarItem>
-
- <ToolbarItem itsName="NeedsReplyButton">
- <blockName>NeedsReplyButton</blockName>
- <title>Needs reply</title>
- <bitmap>application/images/reply.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <toggle>True</toggle>
- <helpString>Needs a reply</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="Spacer2">
- <blockName>Spacer2</blockName>
- <toolbarItemKind>Separator</toolbarItemKind>
- </ToolbarItem>
-
- <ToolbarItem itsName="OutboxFlag">
- <blockName>OutboxFlag</blockName>
- <title>Outbox</title>
- <bitmap>application/images/outbox.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>In the Out box</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="RepliedFlag">
- <blockName>RepliedFlag</blockName>
- <title>Replied</title>
- <bitmap>application/images/replied.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>A reply has been sent</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="ForwardedFlag">
- <blockName>ForwardedFlag</blockName>
- <title>Forwarded</title>
- <bitmap>application/images/forwarded.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Has been forwarded</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="RedirectedFlag">
- <blockName>RedirectedFlag</blockName>
- <title>Redirected</title>
- <bitmap>application/images/redirected.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Message has been redirected</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="DraftFlag">
- <blockName>DraftFlag</blockName>
- <title>Draft</title>
- <bitmap>application/images/draft.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Message saved as a draft</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="QueuedFlag">
- <blockName>QueuedFlag</blockName>
- <title>Queued</title>
- <bitmap>application/images/queued.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Message has been queued</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
- <ToolbarItem itsName="Spacer3">
- <blockName>Spacer3</blockName>
- <toolbarItemKind>Separator</toolbarItemKind>
- </ToolbarItem>
-
- <ToolbarItem itsName="PrivateButton">
- <blockName>PrivateButton</blockName>
- <title>Private</title>
- <bitmap>application/images/private.png</bitmap>
- <toolbarItemKind>Button</toolbarItemKind>
- <helpString>Make item Private</helpString>
- <event itemref="doc:NULL"/>
- </ToolbarItem>
-
<!-- FromAndToArea -->
<ContentItemDetail itsName="FromAndToArea">
<blockName value="FromAndToArea"/>
@@ -286,20 +176,20 @@
<blockName value="FromString"/>
<title>From: </title>
<characterStyle itemref="doc:LabelStyle"/>
- <textAlignmentEnum>Left</textAlignmentEnum>
+ <textAlignmentEnum>Right</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</StaticText>
<EditText itsName="FromEditField1"
itemClass="osaf.framework.blocks.detail.Detail.FromEditField">
<blockName value="FromEditField1"/>
<characterStyle itemref="doc:TextStyle"/>
- <lineStyleEnum>MultiLine</lineStyleEnum>
+ <lineStyleEnum>SingleLine</lineStyleEnum>
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>True</readOnly>
<textAlignmentEnum>Left</textAlignmentEnum>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</EditText>
<ContentItemDetail itsName="ContactFullNameArea"
@@ -316,9 +206,9 @@
<blockName value="ContactFullNameString"/>
<title>Full Name: </title>
<characterStyle itemref="doc:LabelStyle"/>
- <textAlignmentEnum>Left</textAlignmentEnum>
+ <textAlignmentEnum>Right</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</StaticText>
<EditText itsName="ContactFullNameEditField"
@@ -345,72 +235,37 @@
<StaticText itsName="ToString"
itemClass="osaf.framework.blocks.detail.Detail.StaticRedirectAttribute">
<blockName value="ToString"/>
- <title>To: </title>
+ <title>To </title>
<characterStyle itemref="doc:LabelStyle"/>
- <textAlignmentEnum>Left</textAlignmentEnum>
+ <textAlignmentEnum>Right</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</StaticText>
<EditText itsName="ToEditField1"
itemClass="osaf.framework.blocks.detail.Detail.ToEditField">
<blockName value="ToEditField1"/>
<characterStyle itemref="doc:TextStyle"/>
- <lineStyleEnum>MultiLine</lineStyleEnum>
+ <lineStyleEnum>SingleLine</lineStyleEnum>
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
<textAlignmentEnum>Left</textAlignmentEnum>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>-1, 24</minimumSize>
</EditText>
- <!-- CoreIndent -->
- <ContentItemDetail itsName="CoreIndent">
- <blockName value="DetailRootTemplate"/>
- <childrenBlocks itemref="doc:Indent"/>
- <childrenBlocks itemref="doc:CoreArea"/>
- <childrenBlocks itemref="doc:Indent2"/>
- <!-- Attributes -->
- <stretchFactor>2</stretchFactor>
- </ContentItemDetail>
-
- <ContentItemDetail itsName="Indent">
- <!-- Attributes -->
- <blockName value="Indent"/>
- <size>80,80</size>
- <stretchFactor>0</stretchFactor>
- </ContentItemDetail>
-
- <ContentItemDetail itsName="Indent2">
- <!-- Attributes -->
- <blockName value="Indent2"/>
- <size>80,80</size>
- <stretchFactor>0</stretchFactor>
- </ContentItemDetail>
-
<!-- CoreArea -->
<ContentItemDetail itsName="CoreArea">
<blockName value="CoreArea"/>
- <childrenBlocks itemref="doc:KindLabel"/>
<childrenBlocks itemref="doc:HeadlineArea"/>
<childrenBlocks itemref="doc:EmailAddressArea"/>
- <childrenBlocks itemref="doc:DateTime"/>
+ <childrenBlocks itemref="doc:DateKindArea"/>
<childrenBlocks itemref="doc:CalendarStartTime"/>
<childrenBlocks itemref="doc:CalendarDuration"/>
<!-- Attributes -->
<orientationEnum>Vertical</orientationEnum>
<stretchFactor>2</stretchFactor>
</ContentItemDetail>
-
- <StaticText itsName="KindLabel"
- itemClass="osaf.framework.blocks.detail.Detail.KindLabel">
- <blockName value="KindLabel"/>
- <title>Kind</title>
- <characterStyle itemref="doc:LabelStyle"/>
- <textAlignmentEnum>Center</textAlignmentEnum>
- <stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
- </StaticText>
-
+
<ContentItemDetail itsName="HeadlineArea"
itemClass="osaf.framework.blocks.detail.Detail.LabeledTextAttributeBlock">
<blockName value="HeadlineArea"/>
@@ -428,7 +283,7 @@
<blockName value="StaticHeadline"/>
<title>Subject</title>
<characterStyle itemref="doc:LabelStyle"/>
- <textAlignmentEnum>Center</textAlignmentEnum>
+ <textAlignmentEnum>Right</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
<minimumSize>80, 40</minimumSize>
</StaticText>
@@ -441,7 +296,6 @@
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
<textAlignmentEnum>Left</textAlignmentEnum>
- <stretchFactor>0.0</stretchFactor>
<minimumSize>380, 40</minimumSize>
</EditText>
@@ -479,12 +333,32 @@
<minimumSize>280, 24</minimumSize>
</EditText>
+ <ContentItemDetail itsName="DateKindArea">
+ <blockName value="DateKindArea"/>
+ <childrenBlocks itemref="doc:DateTime"/>
+ <childrenBlocks itemref="doc:KindLabel"/>
+ <!-- Attributes -->
+ <orientationEnum>Horizontal</orientationEnum>
+ <stretchFactor>0.0</stretchFactor>
+ <minimumSize>280, 24</minimumSize>
+ </ContentItemDetail>
+
<StaticText itsName="DateTime"
itemClass="osaf.framework.blocks.detail.Detail.DateTimeBlock">
<blockName value="DateTime"/>
<title>Date/Time</title>
- <characterStyle itemref="doc:TextStyle"/>
- <textAlignmentEnum>Center</textAlignmentEnum>
+ <characterStyle itemref="doc:LabelStyle"/>
+ <textAlignmentEnum>Right</textAlignmentEnum>
+ <stretchFactor>0.0</stretchFactor>
+ <minimumSize>80, 24</minimumSize>
+ </StaticText>
+
+ <StaticText itsName="KindLabel"
+ itemClass="osaf.framework.blocks.detail.Detail.KindLabel">
+ <blockName value="KindLabel"/>
+ <title>Kind</title>
+ <characterStyle itemref="doc:LabelStyle"/>
+ <textAlignmentEnum>Left</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
<minimumSize>80, 24</minimumSize>
</StaticText>
@@ -504,11 +378,11 @@
<StaticText itsName="StaticCalendarStartTime"
itemClass="osaf.framework.blocks.detail.Detail.StaticTimeAttribute">
<blockName value="StaticCalendarStartTime"/>
- <title>Start Time</title>
+ <title>start time</title>
<characterStyle itemref="doc:LabelStyle"/>
<textAlignmentEnum>Center</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</StaticText>
<EditText itsName="EditCalendarStartTime"
@@ -519,7 +393,6 @@
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
<textAlignmentEnum>Left</textAlignmentEnum>
- <stretchFactor>0.0</stretchFactor>
<minimumSize>380, 30</minimumSize>
</EditText>
@@ -537,11 +410,11 @@
<StaticText itsName="StaticCalendarDuration"
itemClass="osaf.framework.blocks.detail.Detail.StaticDurationAttribute">
<blockName value="StaticCalendarDuration"/>
- <title>Duration</title>
+ <title>duration</title>
<characterStyle itemref="doc:LabelStyle"/>
<textAlignmentEnum>Center</textAlignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <minimumSize>80, 24</minimumSize>
+ <minimumSize>180, 24</minimumSize>
</StaticText>
<EditText itsName="EditCalendarDuration"
@@ -552,7 +425,6 @@
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
<textAlignmentEnum>Left</textAlignmentEnum>
- <stretchFactor>0.0</stretchFactor>
<minimumSize>380, 30</minimumSize>
</EditText>
@@ -582,7 +454,7 @@
<minimumSize>60,30</minimumSize>
<border>2.0, 2.0, 2.0, 2.0</border>
<event itemref="doc:SendShareItem"/>
- <alignmentEnum>alignCenter</alignmentEnum>
+ <alignmentEnum>alignMiddleRight</alignmentEnum>
<stretchFactor>0.0</stretchFactor>
</Button>
Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.32 chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.33
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.32 Thu Sep 16 16:09:01 2004
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py Tue Sep 21 17:45:55 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.32 $"
-__date__ = "$Date: 2004/09/16 23:09:01 $"
+__version__ = "$Revision: 1.33 $"
+__date__ = "$Date: 2004/09/22 00:45:55 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -294,12 +294,20 @@
kindName = item.itsKind.displayName
except AttributeError:
kindName = item.itsKind.itsName
+ kindName = ' (' + kindName +')'
return kindName
class StaticRedirectAttribute (StaticTextLabel):
"""
Static Text that displays the name of the selected item's Attribute
"""
+ # map internal attribute names into nicer display strings
+ # DLDTBD - display mapping should come out of the repository
+ displayMapping = {"displayName":_("title"),
+ "fromAddress":_("from"),
+ "toAddress":_("to"),
+ }
+
def shouldShow (self, item):
contactKind = Contacts.ContactsParcel.getContactKind ()
if item is None or item.isItemOf (contactKind):
@@ -314,8 +322,13 @@
redirectAttr = redirectName
if redirectAttr is None:
redirectAttr = redirectName
+ # lookup better names for display of some attributes
+ try:
+ redirectAttr = self.displayMapping[redirectAttr]
+ except KeyError:
+ pass
if len (redirectAttr) > 0:
- redirectAttr = ' ' + redirectAttr + ': '
+ redirectAttr = ' ' + redirectAttr + ' '
return redirectAttr
class LabeledTextAttributeBlock (ControlBlocks.ContentItemDetail):
@@ -718,7 +731,7 @@
elif 'work' in redirectName:
label = 'work email address'
if len (label) > 0:
- label = ' ' + label + ': '
+ label = label + ' '
return label
def shouldShow (self, item):
@@ -779,7 +792,7 @@
return shouldShow
def staticTextLabelValue (self, item):
- timeLabel = self.title + _(': ')
+ timeLabel = self.title + _(' ')
return timeLabel
@@ -845,7 +858,7 @@
return item.isItemOf (calendarMixinKind)
def staticTextLabelValue (self, item):
- durationLabel = self.title + _(': ')
+ durationLabel = self.title + _(' ')
return durationLabel
class EditDurationAttribute (EditRedirectAttribute):
More information about the Commits
mailing list