From 0601d918c1fc2d4e54cbbab2d93b834f7e7f40e9 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 20 Sep 2004 12:58:46 +0000 Subject: [PATCH] more mailer changes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@310 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Common/UIxPageFrame.m | 1 + SOGo/UI/Mailer/GNUmakefile | 6 ++- SOGo/UI/Mailer/README | 19 +++++++++ SOGo/UI/Mailer/UIxMailAccountView.wox | 16 ++++---- SOGo/UI/Mailer/UIxMailMainFrame.m | 10 +++-- SOGo/UI/Mailer/UIxMailMainFrame.wox | 6 +-- SOGo/UI/Mailer/UIxMailTree.m | 57 +++++++++++++++++++++++++++ SOGo/UI/Mailer/UIxMailTree.wox | 11 ++++++ SOGo/UI/Mailer/product.plist | 2 + 9 files changed, 112 insertions(+), 16 deletions(-) create mode 100644 SOGo/UI/Mailer/README create mode 100644 SOGo/UI/Mailer/UIxMailTree.m create mode 100644 SOGo/UI/Mailer/UIxMailTree.wox diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m index dc080ec5..10c4b3c6 100644 --- 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 4a6011c7..1ab08601 100644 --- 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 index 00000000..6fdb0523 --- /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 1aeccab6..b3661e45 100644 --- a/SOGo/UI/Mailer/UIxMailAccountView.wox +++ b/SOGo/UI/Mailer/UIxMailAccountView.wox @@ -1,11 +1,13 @@ -

Account Settings Page

screenshot diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.m b/SOGo/UI/Mailer/UIxMailMainFrame.m index 6e6f838c..025a8d7f 100644 --- 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 -@interface UIxPageFrame : UIxComponent +@interface UIxMailMainFrame : UIxComponent { NSString *title; NSString *rootURL; @@ -39,7 +39,7 @@ #include "common.h" #include -@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 a1260ebc..6d8f9f3b 100644 --- a/SOGo/UI/Mailer/UIxMailMainFrame.wox +++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox @@ -26,10 +26,8 @@ - Folder Tree - -
    • -     + Folder Tree
    + diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/Mailer/UIxMailTree.m new file mode 100644 index 00000000..656e938f --- /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 + +@interface UIxMailTree : UIxComponent +{ + id item; +} +@end + +#include "common.h" +#include + +@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 index 00000000..14163fe5 --- /dev/null +++ b/SOGo/UI/Mailer/UIxMailTree.wox @@ -0,0 +1,11 @@ + + + +
    • +     +     diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist index d27ac42a..9e30f231 100644 --- 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", -- 2.39.5