more mailer changes

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@310 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index dc080ec53970ab94a8c1af37094f10407c5764cb..10c4b3c638e316b0643436d431ed950feda30b0f 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -76,6 +76,7 @@
 }
 
 /* URL generation */
+// TODO: I think all this should be done by the clientObject?!
 
 - (NSString *)rootURL {
   WOContext *ctx;

diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 4a6011c75b844a8891533e67801ddff060772a7b..1ab086018f0dc28f09bce8448035439c63027614 100644 (file)
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# GNUstep makefile
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -14,6 +14,8 @@ MailerUI_OBJC_FILES += \
        MailerUIProduct.m       \
        \
        UIxMailMainFrame.m      \
+       UIxMailTree.m           \
+       \
        UIxMailAccountsView.m   \
        UIxMailAccountView.m    \
        UIxMailListView.m       \
@@ -26,6 +28,8 @@ MailerUI_RESOURCE_FILES += \
 
 MailerUI_RESOURCE_FILES += \
        UIxMailMainFrame.wox    \
+       UIxMailTree.wox         \
+       \
        UIxMailAccountsView.wox \
        UIxMailAccountView.wox  \
        UIxMailListView.wox     \

diff --git a/SOGo/UI/Mailer/README b/SOGo/UI/Mailer/README
new file mode 100644 (file)
index 0000000..6fdb052
--- /dev/null
+++ b/SOGo/UI/Mailer/README
@@ -0,0 +1,19 @@
+SOGO Mailer UI
+==============
+
+- own (Thunderbird styled) frame
+- component for tree
+
+TODO
+====
+- a lot ;->
+
+Components
+==========
+UIxMailAccountView.wox
+UIxMailAccountsView.wox
+UIxMailEditor.wox
+UIxMailListView.wox
+UIxMailMainFrame.wox
+UIxMailTree.wox
+UIxMailView.wox

diff --git a/SOGo/UI/Mailer/UIxMailAccountView.wox b/SOGo/UI/Mailer/UIxMailAccountView.wox
index 1aeccab6fbe78ea6810690bcca2c2108f05427b2..b3661e45cc33a985e211de5467d9e40a45c6abe0 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailAccountView.wox
+++ b/SOGo/UI/Mailer/UIxMailAccountView.wox
@@ -1,11 +1,13 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:uix="OGo:uix"
-               xmlns:label="OGo:label"
-               className="UIxMailMainFrame"
-               title="name"
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxMailMainFrame"
+  title="name"
 >
   <h4>Account Settings Page</h4>
   <a rsrc:href="tbird_073_accountview.png">screenshot</a>

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.m b/SOGo/UI/Mailer/UIxMailMainFrame.m
index 6e6f838ce91491e230651d5766262d409b38b65c..025a8d7f9e073eaf389840386042ffeef1d650f0 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMainFrame.m
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.m
@@ -18,11 +18,11 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxPageFrame.m 278 2004-08-26 23:29:09Z helge $
+// $Id: UIxMailMainFrame.m 278 2004-08-26 23:29:09Z helge $
 
 #include <SOGoUI/UIxComponent.h>
 
-@interface UIxPageFrame : UIxComponent
+@interface UIxMailMainFrame : UIxComponent
 {
   NSString *title;
   NSString *rootURL;
@@ -39,7 +39,7 @@
 #include "common.h"
 #include <NGObjWeb/SoComponent.h>
 
-@implementation UIxPageFrame
+@implementation UIxMailMainFrame
 
 - (void)dealloc {
   [self->item        release];
@@ -76,6 +76,8 @@
 }
 
 /* URL generation */
+// TODO: I think all this should be done by the clientObject?!
+// TODO: is the stuff below necessary at all in the mailer frame?
 
 - (NSString *)rootURL {
   WOContext *ctx;
@@ -115,4 +117,4 @@
   return [[self userRootURL] stringByAppendingString:@"Contacts/"];
 }
 
-@end /* UIxPageFrame */
+@end /* UIxMailMainFrame */

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.wox b/SOGo/UI/Mailer/UIxMailMainFrame.wox
index a1260ebc6aca06e40b7b84459e139834d2181c72..6d8f9f3b3b89ab21a64179758b8925f8dca92770 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMainFrame.wox
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox
@@ -26,10 +26,8 @@
       </tr>
       <tr>
         <td width="25%" valign="top">
-          Folder Tree
-  <var:foreach list="clientObject.toManyRelationshipKeys" item="item">
-    <li><a var:href="item"><var:string value="item"/></a></li>
-  </var:foreach>
+          Folder Tree<br />
+          <var:component className="UIxMailTree" />
         </td>
         <td valign="top">
           <var:component-content/>

diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/Mailer/UIxMailTree.m
new file mode 100644 (file)
index 0000000..656e938
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailTree.m
@@ -0,0 +1,57 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: UIxMailTree.m 278 2004-08-26 23:29:09Z helge $
+
+#include <SOGoUI/UIxComponent.h>
+
+@interface UIxMailTree : UIxComponent
+{
+  id item;
+}
+@end
+
+#include "common.h"
+#include <NGObjWeb/SoComponent.h>
+
+@implementation UIxMailTree
+
+- (void)dealloc {
+  [self->item        release];
+  [super dealloc];
+}
+
+/* accessors */
+
+- (void)setItem:(id)_item {
+  ASSIGN(self->item, _item);
+}
+- (id)item {
+  return self->item;
+}
+
+/* notifications */
+
+- (void)sleep {
+  [self->item release]; self->item = nil;
+  [super sleep];
+}
+
+@end /* UIxMailTree */

diff --git a/SOGo/UI/Mailer/UIxMailTree.wox b/SOGo/UI/Mailer/UIxMailTree.wox
new file mode 100644 (file)
index 0000000..14163fe
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailTree.wox
@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="yes"?>
+<span xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
+>
+  <var:foreach list="clientObject.toManyRelationshipKeys" item="item">
+    <li><a var:href="item"><var:string value="item"/></a></li>
+  </var:foreach>
+</span>

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index d27ac42adfe6f2ed6a7bceada0670f3969c0a6ed..9e30f2312bbb06287c8f8d2eac5e5e81a537dfbc 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -2,6 +2,8 @@
   requires = ( MAIN, CommonUI, Mailer );
 
   publicResources = (
+    "uix.css",
+    "mailer.css",
     "tbird_073_accountview.png",
     "tbird_073_compose.png",
     "tbird_073_mailwelcome.png",