diff --git a/ChangeLog b/ChangeLog index d8113abec..c86728024 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-20 Wolfgang Sourdeau + + * 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 * UI/MainUI/SOGoBrowsersPanel.[hm]: new template class that helps diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index 4ecf884bf..2031d9061 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -83,6 +83,9 @@ "Manage identities..." = "Identiteiten beheren..."; "Signature" = "Signature"; +/* Additional Parameters */ +"Additional Parameters" = "Additional Parameters"; + /* password */ "New password:" = "Nieuw wachtwoord:"; "Confirmation:" = "Bevestig wachtwoord:"; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 17f07d788..2513db8a3 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -86,6 +86,9 @@ "Manage identities..." = "Manage identities..."; "Signature" = "Signature"; +/* Additional Parameters */ +"Additional Parameters" = "Additional Parameters"; + /* password */ "New password:" = "New password:"; "Confirmation:" = "Confirmation:"; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index 1d50be6e5..3d11f5331 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -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 :"; diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile index 21227112b..52551cf9c 100644 --- a/UI/PreferencesUI/GNUmakefile +++ b/UI/PreferencesUI/GNUmakefile @@ -12,7 +12,8 @@ PreferencesUI_OBJC_FILES = \ PreferencesUIProduct.m \ \ UIxJSONPreferences.m \ - UIxPreferences.m + UIxPreferences.m \ + UIxAdditionalPreferences.m PreferencesUI_RESOURCE_FILES += \ Version \ diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index b7598c625..66562a02d 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -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:"; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index 9e290c8e4..0fa16e3d8 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -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:"; diff --git a/UI/PreferencesUI/Spanish.lproj/Localizable.strings b/UI/PreferencesUI/Spanish.lproj/Localizable.strings index ad11fc7f4..978bad3d3 100644 --- a/UI/PreferencesUI/Spanish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Spanish.lproj/Localizable.strings @@ -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:"; /* ??? */ diff --git a/UI/PreferencesUI/UIxAdditionalPreferences.h b/UI/PreferencesUI/UIxAdditionalPreferences.h new file mode 100644 index 000000000..f3a11de17 --- /dev/null +++ b/UI/PreferencesUI/UIxAdditionalPreferences.h @@ -0,0 +1,27 @@ +/* UIxAdditionalPreferences.h - this file is part of SOGo + * + * Copyright (C) 2008 Inverse groupe conseil + * + * Author: Wolfgang Sourdeau + * + * 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 + +@interface UIxAdditionalPreferences : UIxComponent + +@end diff --git a/UI/PreferencesUI/UIxAdditionalPreferences.m b/UI/PreferencesUI/UIxAdditionalPreferences.m new file mode 100644 index 000000000..275a498a7 --- /dev/null +++ b/UI/PreferencesUI/UIxAdditionalPreferences.m @@ -0,0 +1,27 @@ +/* UIxAdditionalPreferences.m - this file is part of SOGo + * + * Copyright (C) 2008 Inverse groupe conseil + * + * Author: Wolfgang Sourdeau + * + * 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 diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 88631587d..8859c5e3e 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -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; diff --git a/UI/Templates/PreferencesUI/UIxAdditionalPreferences.wox b/UI/Templates/PreferencesUI/UIxAdditionalPreferences.wox new file mode 100644 index 000000000..074b9d838 --- /dev/null +++ b/UI/Templates/PreferencesUI/UIxAdditionalPreferences.wox @@ -0,0 +1,11 @@ + + + + + diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 9da672d28..4a40deed0 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -1,6 +1,7 @@ - - -
    • -     + +
    • +     + + +
    +
    + +
    diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index 5311349cb..09a2325a2 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -26,6 +26,8 @@ function onChoiceChanged(event) { function initPreferences() { _setupEvents(true); + if (typeof (initAdditionalPreferences) != "undefined") + initAdditionalPreferences(); } FastInit.addOnLoad(initPreferences);