removed some unused template elements

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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index f6fce35a1ad7d8d2e81c4c23ded092dbdbc20add..5dbef489d720db2ffbe04211a16a92f8d9529f64 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,13 +1,18 @@
+2005-01-26  Helge Hess  <helge.hess@skyrix.com>
+
+       * disabled some unsupported buttons and template elements (#1209,
+         #1210, #1207, #1208) (v0.9.73)
+
 2005-01-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+        * v0.9.72
+
         * UIxMailWindowCloser.{m,wox}: new component which closes the window
           in its "onLoad".
 
         * UIxMailEditor.m: close window after successful send by opening
           UIxMailWindowCloser. This fixes SOGo Bug #1053.
 
-        * v0.9.72
-
 2005-01-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * {English/French}.lproj/default.strings: changed encoding from

diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index 20e565c363885bfc2e89a8c2e0a19f6ad9991516..0343236a57dc8d091b3ca740507952b19befa824 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004 SKYRIX Software AG
+  Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <SOGoUI/UIxComponent.h>
 
@@ -144,7 +143,7 @@ static NSArray *infoKeys = nil;
 
 /* IMAP4 store */
 
-- (void)patchFlagsInStore {
+- (NSException *)patchFlagsInStore {
   /*
     Flags we should set:
       if the draft is a reply   => [message markAnswered]
@@ -152,6 +151,12 @@ static NSArray *infoKeys = nil;
       
     This is hard, we would need to find the original message in Cyrus.
   */
+  return nil;
+}
+
+- (NSException *)storeMailInSentFolder:(NSString *)_path {
+  [self logWithFormat:@"TODO: store mail in Sent folder: %@", _path];
+  return nil;
 }
 
 /* actions */
@@ -216,11 +221,16 @@ static NSArray *infoKeys = nil;
   
   /* patch flags in store for replies etc */
   
-  [self patchFlagsInStore];
+  if ((error = [self patchFlagsInStore]) != nil)
+     return error;
   
   /* finally store in Sent */
+
+  if ((error = [self storeMailInSentFolder:mailPath]) != nil)
+    return error;
+  
+  /* delete temporary mail file */
   
-  [self logWithFormat:@"TODO: store mail in Sent folder: %@", mailPath];
   if (keepMailTmpFile)
     [self warnWithFormat:@"keeping mail file: '%@'", mailPath];
   else

diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index 7ec09272536b71f460012ee9f795ab791e26b83b..799de8a52de189f06ae4173e86a0ae0800aef042 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -10,9 +10,10 @@
   title="name"
 >
   <div class="titlediv" style="white-space: nowrap;">
+<!-- TODO: enable once implemented: #1209, #1210
     <a rsrc:href="tbird_073_mailwelcome.png"
-    ><var:string label:value="View" />:</a>, <!-- TODO ;-) -->
-    <select name="viewfilter">    <!-- var:popup? -->
+    ><var:string label:value="View" />:</a>,
+    <select name="viewfilter">    => var:popup?
       <option value="all"   ><var:string label:value="All" /></option>
       <option value="unread"><var:string label:value="Unread" /></option>
     </select>
@@ -20,6 +21,7 @@
     Subject or Sender contains:
     <input name="searchtext" type="text" />
     <input name="clear" type="submit" value="Clear" />
+-->
   </div>
 
   <div class="embedwhite_out">

diff --git a/SOGo/UI/Mailer/UIxMailWindowCloser.m b/SOGo/UI/Mailer/UIxMailWindowCloser.m
index b7954de55e20b0882604308c5f8ab8d899e2c765..98c936c89f7ab53a1ceab1e740dc3c707cd72748 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailWindowCloser.m
+++ b/SOGo/UI/Mailer/UIxMailWindowCloser.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OGo
+  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
@@ -18,13 +18,11 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/NGObjWeb.h>
 
 @interface UIxMailWindowCloser : WOComponent
 {
-
 }
 
 @end
@@ -33,4 +31,4 @@
 
 @implementation UIxMailWindowCloser
 
-@end
+@end /* UIxMailWindowCloser */

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index d27cb5634824134c01c3b4e3f78d3fa57997c308..8e97ef97a66364fa87f6e3f3c1a72eb6d70a7a11 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=72
+SUBMINOR_VERSION:=73
 
 # v0.9.70 requires NGExtensions v4.5.136
 # v0.9.69 requires libNGMime    v4.5.203

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 7eb6a814e8b63f92fb8cd39fcb9a077ef996fd7b..75492f061fb63e0fa529be888aa3030a491b0c68 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -94,21 +94,27 @@
                 cssClass = "tbicon_compose"; label = "Write";
               },
             ),
-            ( /* second group */
+/* TODO: enable when implemented
+            ( // second group
               { link = "#"; 
                 cssClass = "tbicon_reply";    label = "Reply";     },
               { link = "#"; 
                 cssClass = "tbicon_replyall"; label = "Reply All"; },
               { link = "#"; cssClass = "tbicon_forward";  label = "Forward";   },
             ),
+*/
             ( /* third group */
               { link = "#"; 
                 cssClass = "tbicon_delete"; label = "Delete"; },
+/* TODO: enable when we know how to mark junk (#971)
               { link = "#"; 
                 cssClass = "tbicon_junk";   label = "Junk";   },
+*/
             ),
             ( /* fourth group */
+/* TODO: enable when we can print (#1207)
               { link = "#"; cssClass = "tbicon_print"; label = "Print"; },
+*/
               { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
             ),
           );
@@ -159,7 +165,8 @@
               { link  = "compose"; target = "_blank";
                 cssClass = "tbicon_compose"; label = "Write"; },
             ),
-            ( /* second group */
+/* TODO: enable when implemented
+            ( // second group
               { link = "reply"; 
                 cssClass = "tbicon_reply";    label = "Reply";     },
               { link = "replyall"; 
@@ -167,14 +174,19 @@
               { link = "forward"; 
                 cssClass = "tbicon_forward";  label = "Forward";   },
             ),
+*/
             ( /* third group */
               { link = "#"; 
                 cssClass = "tbicon_delete"; label = "Delete"; },
+/* TODO: enable when we know how to mark junk (#971)
               { link = "#"; 
                 cssClass = "tbicon_junk";   label = "Junk";   },
+*/
             ),
             ( /* fourth group */
+/* TODO: enable when we can print (#1207)
               { link = "#"; cssClass = "tbicon_print"; label = "Print"; },
+*/
               { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
             ),
           );