Changeset 2003 in subversion

Timestamp:

Oct 22, 2008 1:41:22 PM (5 years ago)

Author:

alec

Message:

• Added option focus_on_new_message (#1485374)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/js/app.js (modified) (1 diff)
• program/localization/en_GB/labels.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/localization/ru_RU/labels.inc (modified) (1 diff)
• program/steps/mail/check_recent.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (2 diffs)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/10/22 (alec)
+----------
+- Added option focus_on_new_message (#1485374)
 
 2008/10/18 (alec)

trunk/roundcubemail/config/main.inc.php.dist

@@ -356 +356 @@
 $rcmail_config['preview_pane'] = FALSE;
 
+// focus new window if new message arrives
+$rcmail_config['focus_on_new_message'] = true;
+
 // Clear Trash on logout
 $rcmail_config['logout_purge'] = FALSE;

trunk/roundcubemail/program/js/app.js

@@ -3583 +3583 @@
     };
 
+  // notifies that a new message(s) has hit the mailbox
+  this.new_message_focus = function()
+    {
+    // focus main window
+    if (this.env.framed && window.parent)
+      window.parent.focus();
+    else
+      window.focus();
+    }
+
   // add row to contacts list
   this.add_contact_row = function(cid, cols, select)

trunk/roundcubemail/program/localization/en_GB/labels.inc

@@ -233 +233 @@
 $labels['2047folding'] = 'Full RFC 2047 (other)';
 $labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -291 +291 @@
 $labels['2047folding'] = 'Full RFC 2047 (other)';
 $labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
 
 $labels['folder']  = 'Folder';

trunk/roundcubemail/program/localization/pl_PL/labels.inc

@@ -260 +260 @@
 $labels['everynminutes'] = 'co $n minut';
 $labels['never'] = 'nigdy';
+$labels['focusonnewmessage'] = 'Informuj przeglÄ
+darkę o nowej wiadomości';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Foldery';

trunk/roundcubemail/program/localization/ru_RU/labels.inc

@@ -254 +254 @@
  прПграЌЌ)';
 $labels['advancedoptions'] = 'ДПпПлМОтельМые МастрПйкО';
+$labels['focusonnewmessage'] = 'ЀПкусОрПвать ПкМП браузера прО МПвПЌ сППбщеМОО';
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'ПапкО';

trunk/roundcubemail/program/steps/mail/check_recent.inc

@@ -42 +42 @@
       $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
 
+      if (rcmail::get_instance()->config->get('focus_on_new_message',true))
+        $OUTPUT->command('new_message_focus');
+
       // add new message headers to list
       $a_headers = array();

trunk/roundcubemail/program/steps/settings/func.inc

@@ -149 +149 @@
   $table = new html_table(array('cols' => 2));
 
+  if (!isset($no_override['focus_on_new_message'])) {
+    $field_id = 'rcmfd_focus_on_new_message';
+    $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
+    $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
+    $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
+  }
+
   // show config parameter for preview pane
   if (!isset($no_override['preview_pane'])) {
@@ -295 +302 @@
     $table->add(null, $input_purge->show($config['skip_deleted']?1:0));
   }
-  
+
   // Trash purging on logout
   if (!isset($no_override['logout_purge'])) {

trunk/roundcubemail/program/steps/settings/save_prefs.inc

@@ -31 +31 @@
   'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
   'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+  'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
   'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
   'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE,