Monotone-Parent: 40f77d0f9e67b4e3fd56c1a7eb0b966cabaca41f
Monotone-Revision: d56786bfd4252cac6fabbec16a507890e9920737 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-21T02:36:04 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
e9c35d8950
commit
4c7d2820ec
|
@ -1,3 +1,10 @@
|
|||
2008-08-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/PreferencesUI/UIxAdditionalPreferences.[hm]: new template
|
||||
class that enables the user to append links or other infos needed
|
||||
to change preferences not handled by SOGo. The tab will display
|
||||
when setting the ud key "SOGoUIxAdditionalPreferences" to YES.
|
||||
|
||||
2008-08-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/MainUI/SOGoBrowsersPanel.[hm]: new template class that helps
|
||||
|
|
|
@ -83,6 +83,9 @@
|
|||
"Manage identities..." = "Identiteiten beheren...";
|
||||
"Signature" = "Signature";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Additional Parameters";
|
||||
|
||||
/* password */
|
||||
"New password:" = "Nieuw wachtwoord:";
|
||||
"Confirmation:" = "Bevestig wachtwoord:";
|
||||
|
|
|
@ -86,6 +86,9 @@
|
|||
"Manage identities..." = "Manage identities...";
|
||||
"Signature" = "Signature";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Additional Parameters";
|
||||
|
||||
/* password */
|
||||
"New password:" = "New password:";
|
||||
"Confirmation:" = "Confirmation:";
|
||||
|
|
|
@ -84,6 +84,9 @@
|
|||
"Manage identities..." = "Gérer les identitiés...";
|
||||
"Signature" = "Signature";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Paramètres supplémentaires";
|
||||
|
||||
/* password */
|
||||
"New password:" = "Nouveau mot de passe :";
|
||||
"Confirmation:" = "Confirmation :";
|
||||
|
|
|
@ -12,7 +12,8 @@ PreferencesUI_OBJC_FILES = \
|
|||
PreferencesUIProduct.m \
|
||||
\
|
||||
UIxJSONPreferences.m \
|
||||
UIxPreferences.m
|
||||
UIxPreferences.m \
|
||||
UIxAdditionalPreferences.m
|
||||
|
||||
PreferencesUI_RESOURCE_FILES += \
|
||||
Version \
|
||||
|
|
|
@ -83,6 +83,9 @@
|
|||
"Manage identities..." = "Identitäten verwalten...";
|
||||
"Signature" = "Unterschrift";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Additional Parameters";
|
||||
|
||||
/* password */
|
||||
"New password:" = "Neues Passwort:";
|
||||
"Confirmation:" = "Bestätigung:";
|
||||
|
|
|
@ -84,6 +84,9 @@
|
|||
"Manage identities..." = "Gestisci identità...";
|
||||
"Signature" = "Firma";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Additional Parameters";
|
||||
|
||||
/* password */
|
||||
"New password:" = "Nuova password:";
|
||||
"Confirmation:" = "Ripeti nuova password:";
|
||||
|
|
|
@ -95,6 +95,9 @@
|
|||
"Manage identities..." = "Gestionar identidades...";
|
||||
"Signature" = "Firma";
|
||||
|
||||
/* Additional Parameters */
|
||||
"Additional Parameters" = "Additional Parameters";
|
||||
|
||||
/* password */
|
||||
"New password:" = "Contraseña nueva:";
|
||||
"Confirmation:" = "Confirmar contraseña nueva:"; /* ??? */
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
/* UIxAdditionalPreferences.h - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2008 Inverse groupe conseil
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <SOGoUI/UIxComponent.h>
|
||||
|
||||
@interface UIxAdditionalPreferences : UIxComponent
|
||||
|
||||
@end
|
|
@ -0,0 +1,27 @@
|
|||
/* UIxAdditionalPreferences.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2008 Inverse groupe conseil
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import "UIxAdditionalPreferences.h"
|
||||
|
||||
@implementation UIxAdditionalPreferences
|
||||
|
||||
@end
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
static BOOL defaultsRead = NO;
|
||||
static BOOL shouldDisplayPasswordChange = NO;
|
||||
static BOOL shouldDisplayAdditionalPreferences = NO;
|
||||
|
||||
@implementation UIxPreferences
|
||||
|
||||
|
@ -56,6 +57,8 @@ static BOOL shouldDisplayPasswordChange = NO;
|
|||
ud = [NSUserDefaults standardUserDefaults];
|
||||
shouldDisplayPasswordChange
|
||||
= [ud boolForKey: @"SOGoUIxUserCanChangePassword"];
|
||||
shouldDisplayAdditionalPreferences
|
||||
= [ud boolForKey: @"SOGoUIxAdditionalPreferences"];
|
||||
defaultsRead = YES;
|
||||
}
|
||||
}
|
||||
|
@ -548,6 +551,11 @@ static BOOL shouldDisplayPasswordChange = NO;
|
|||
return [user canAccessModule: @"Mail"];
|
||||
}
|
||||
|
||||
- (BOOL) shouldDisplayAdditionalPreferences
|
||||
{
|
||||
return shouldDisplayAdditionalPreferences;
|
||||
}
|
||||
|
||||
- (BOOL) shouldDisplayPasswordChange
|
||||
{
|
||||
return shouldDisplayPasswordChange;
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" standalone="yes"?>
|
||||
<!DOCTYPE container>
|
||||
<container
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:xml="http://www.w3.org/XML/1998/namespace"
|
||||
xmlns:var="http://www.skyrix.com/od/binding"
|
||||
xmlns:const="http://www.skyrix.com/od/constant"
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:label="OGo:label">
|
||||
<!-- space -->
|
||||
</container>
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" standalone="yes"?>
|
||||
<!DOCTYPE var:component>
|
||||
<var:component xmlns="http://www.w3.org/1999/xhtml"
|
||||
<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"
|
||||
|
@ -25,9 +26,12 @@
|
|||
<li target="identitiesView"><var:string
|
||||
label:value="Signature"/></li>
|
||||
</var:if>
|
||||
<var:if condition="shouldDisplayPasswordChange">
|
||||
<li target="passwordView"><var:string label:value="Password"/></li>
|
||||
</var:if>
|
||||
<var:if condition="shouldDisplayAdditionalPreferences">
|
||||
<li target="additionalView"><var:string label:value="Additional Parameters"/></li>
|
||||
</var:if>
|
||||
<!-- <var:if condition="shouldDisplayPasswordChange"> -->
|
||||
<!-- <li target="passwordView"><var:string label:value="Password"/></li> -->
|
||||
<!-- </var:if> -->
|
||||
</ul>
|
||||
<div id="generalView" class="tab">
|
||||
<label><var:string label:value="Current Time Zone :"/>
|
||||
|
@ -123,6 +127,10 @@
|
|||
var:value="signature"/>
|
||||
</div>
|
||||
</var:if>
|
||||
<var:if condition="shouldDisplayAdditionalPreferences"
|
||||
><div id="additionalView" class="tab">
|
||||
<var:component className="UIxAdditionalPreferences"/>
|
||||
</div></var:if>
|
||||
<!-- <var:if condition="shouldDisplayPasswordChange"> -->
|
||||
<!-- <div id="passwordView" class="tab"> -->
|
||||
<!-- <label><var:string label:value="New password:" -->
|
||||
|
|
|
@ -26,6 +26,8 @@ function onChoiceChanged(event) {
|
|||
|
||||
function initPreferences() {
|
||||
_setupEvents(true);
|
||||
if (typeof (initAdditionalPreferences) != "undefined")
|
||||
initAdditionalPreferences();
|
||||
}
|
||||
|
||||
FastInit.addOnLoad(initPreferences);
|
||||
|
|
Loading…
Reference in New Issue