From 6cedec17680325b0d29ebfcc006a2cdc03db0556 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 10 Jul 2012 12:48:14 +0000 Subject: [PATCH] * email: usability option to enable checkbox for all folders --- felamimail/inc/class.felamimail_hooks.inc.php | 2 ++ felamimail/inc/class.uiwidgets.inc.php | 10 +++++----- felamimail/lang/egw_de.lang | 1 + felamimail/lang/egw_en.lang | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php index 485a68c3a4..90b0227b8a 100644 --- a/felamimail/inc/class.felamimail_hooks.inc.php +++ b/felamimail/inc/class.felamimail_hooks.inc.php @@ -233,6 +233,8 @@ class felamimail_hooks $rowOrderStyle = array( 'felamimail' => lang('FeLaMiMail'), 'outlook' => 'Outlook', + 'felamimail_wCB' => lang('FeLaMiMail').' '.lang('(with checkbox enforced)'), + 'outlook_wCB' => 'Outlook'.' '.lang('(with checkbox enforced)'), ); // otherwise we get warnings during setup diff --git a/felamimail/inc/class.uiwidgets.inc.php b/felamimail/inc/class.uiwidgets.inc.php index 5b5b983160..d8782fe08c 100644 --- a/felamimail/inc/class.uiwidgets.inc.php +++ b/felamimail/inc/class.uiwidgets.inc.php @@ -865,7 +865,9 @@ $j(document).ready(function() { if (empty($_folderName)) error_log(__METHOD__.__LINE__.' Empty FolderName:'.$_folderName.' ->'.$f_md5.' backtrace:'.function_backtrace()); $obj = new egw_grid_columns('felamimail', 'mainview'.$f_md5); //app- and grid-name //error_log(__METHOD__.__LINE__.'SelectMode:'.$GLOBALS['egw_info']['user']['preferences']['common']['select_mode']); - switch($GLOBALS['egw_info']['user']['preferences']['felamimail']['rowOrderStyle']) { + $rowOrderStyle = $GLOBALS['egw_info']['user']['preferences']['felamimail']['rowOrderStyle']; + switch($rowOrderStyle) { + case 'outlook_wCB': case 'outlook': $default_data = array( array( @@ -873,7 +875,7 @@ $j(document).ready(function() { "caption" => lang('Selection'), "type" => EGW_COL_TYPE_CHECKBOX, //"width" => "20px", - "visibility" => EGW_COL_VISIBILITY_INVISIBLE, + "visibility" => ($rowOrderStyle=='outlook_wCB'?EGW_COL_VISIBILITY_ALWAYS_NOSELECT:EGW_COL_VISIBILITY_INVISIBLE), ), array( "id" => "status", @@ -923,7 +925,7 @@ $j(document).ready(function() { "caption" => lang('Selection'), "type" => EGW_COL_TYPE_CHECKBOX, //"width" => "20px", - "visibility" => EGW_COL_VISIBILITY_INVISIBLE, + "visibility" => (stripos($rowOrderStyle,'_wCB')!==false?EGW_COL_VISIBILITY_ALWAYS_NOSELECT:EGW_COL_VISIBILITY_INVISIBLE), ), array( "id" => "status", @@ -1385,8 +1387,6 @@ $j(document).ready(function() { $this->t->set_var('msg_icon_sm',$msg_icon_sm); $this->t->set_var('phpgw_images',EGW_IMAGES); - - } if ($this->use_preview) diff --git a/felamimail/lang/egw_de.lang b/felamimail/lang/egw_de.lang index 0624fba142..f89faa5314 100644 --- a/felamimail/lang/egw_de.lang +++ b/felamimail/lang/egw_de.lang @@ -3,6 +3,7 @@ (only cc/bcc) felamimail de (kein Kopie/Blindkopie) (separate multiple addresses by comma) felamimail de (mehrere Adressen durch Komma trennen) (unknown sender) felamimail de (unbekannter Absender) +(with checkbox enforced) felamimail de (mit Auswahlbox für alle Ordner) 1) keep drafted message (press OK) felamimail de 1) Nachrichtenentwurf behalten (wählen Sie OK) 2) discard the message completely (press Cancel) felamimail de 2) verwerfen der kompletten Nachricht (wählen Sie Abbrechen) 3paneview: if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here (300 seems to be a good working value). the preview will be displayed at the end of the message list on demand (click). felamimail de Vorschauansicht: Wenn Sie eine Vorschauansicht von eMails wünschen, müssen Sie hier die Höhe des Vorschaubereichs und der Nachrichtenliste festlegen. (300 hat sich als zufriedenstellender Wert erwiesen). Sie können ebenfalls die Mindesthöhe der eMail Liste festlegen, indem Sie die gewünschte Mindesthöhe, durch Komma getrennt, an den Wert für die Höhe des Vorschaubereiches anhängen (Bsp.: 300,190). Die Vorschau wird durch einen einfachen Klick auf den Betreff der anzuzeigenden Nachricht aktiviert. diff --git a/felamimail/lang/egw_en.lang b/felamimail/lang/egw_en.lang index 31d50abd52..edf89d4740 100644 --- a/felamimail/lang/egw_en.lang +++ b/felamimail/lang/egw_en.lang @@ -3,6 +3,7 @@ (only cc/bcc) felamimail en Only Cc/Bcc (separate multiple addresses by comma) felamimail en Separate multiple addresses by comma (unknown sender) felamimail en Unknown sender +(with checkbox enforced) felamimail en (with checkbox enforced) 1) keep drafted message (press OK) felamimail en 1) keep drafted message (press OK) 2) discard the message completely (press Cancel) felamimail en 2) discard the message completely (press Cancel) 3paneview: if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here (300 seems to be a good working value). the preview will be displayed at the end of the message list on demand (click). felamimail en 3PaneView: If you want to see a preview of a mail by single click onto the subject, set the height for the message list and the preview area e.g. 300. You may specify the minimum height of the message list too, by adding it after the specified IFrame Preview height, separated by comma (e.g.: 300,190)