@@ -16,10 +16,12 @@ function galleryformatter_field_formatter_info() {
         'thumb_style' => 'galleryformatter_thumb',
         'style' => 'Greenarrows',
         'link_to_full' => 1,
         'link_to_full_style' => 0,
         'modal' => 'none',
+        'full_image_text' => t('View full image'),
+        'galleryformatter_slideshow' => 0,
       ),
       'description' => t('Display multi-value fields as an jQuery Image gallery.'),
     ),
   );
 }
@@ -105,11 +107,33 @@ function galleryformatter_field_formatter_settings_form($field, $instance, $view
       'visible' => array(
         ':input[name="fields['. $field['field_name'] .'][settings_edit_form][settings][link_to_full]"]' => array('checked' => TRUE),
         )
       )
   );
+  $form['full_image_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Full image text'),
+    '#default_value' => $settings['full_image_text'],
+    '#description' => t('Text to be displayed while hovering over magnifier glass icon. Leave this empty if you do not want any text there.'),
+  );
 
+  $form['galleryformatter_slideshow'] = array(
+    '#type' => 'select',
+    '#title' => t('Enable Slideshow for Gallery Formatter galleries'),
+    '#options' => array(
+				  '0' => t('Disabled'),
+						'2000' => t('Enabled: 2 second delay'),
+						'2500' => t('Enabled: 2.5 second delay'),
+						'3000' => t('Enabled: 3 second delay'),
+						'3500' => t('Enabled: 3.5 second delay'),
+						'4000' => t('Enabled: 4 second delay'),
+						'4500' => t('Enabled: 4.5 second delay'),
+						'5000' => t('Enabled: 5 second delay'),
+						),
+    '#default_value' => $settings['galleryformatter_slideshow'],
+    '#description' => t('If Enabled, a "Slideshow" button will become visible for the default Gallery Formatter container.<br /><em>Note: Modals, like [Colorbox] [Shadowbox] [Lightbox2], have built-in slideshow capability.</em><br />This does not affect Modal Galleries, it only enables slideshows in default gallery/node view.'),
+  );
   return $form;
 }
 
 /**
  * Implements hook_field_formatter_settings_summary().
@@ -128,10 +152,18 @@ function galleryformatter_field_formatter_settings_summary($field, $instance, $v
     $summary[] = t('Full image style: @value', array('@value' => $full_image_style));
 
     $summary[] =  t('Modal used for full image: @value', array('@value' => $settings['modal']));
   }
 
+    $summary[] = t('Full image text: @value', array('@value' => (empty($settings['full_image_text']) ? t('Empty (no text)') : $settings['full_image_text'])));
+
+  if ($settings['galleryformatter_slideshow'] == '0') {
+    $summary[] = t('Gallery Formatter Slideshow: Disabled');
+  } else {
+    $summary[] = t('Gallery Formatter Slideshow: @value', array('@value' => ' Enabled -  ' . $settings['galleryformatter_slideshow'] . 'ms delay'));
+  }
+
   return implode ('<br />', $summary);
 }
 
 /**
  * Implementation of hook_theme().
@@ -199,11 +231,11 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
      */
     // Grab and sanitize image information
     // $renderitems['slides'][$delta]['description'] = $item['description']; // so far no description in d7 image fields
     $item['title'] = (!empty($item['title'])) ? $item['title'] : ''; // prevents php notices
     $renderitems['slides'][$delta]['title'] = $item['title'];
-    $item['filename'] = $item['filename'] = '';
+    // hey MANUEL-why are we losing image filename fallback for alt here?? $item['filename'] = $item['filename'] = '';
 
     // Check if alt attribute is already set, if not use the filename as alt attribute
     $renderitems['slides'][$delta]['alt'] = (isset($item['alt']) && !empty($item['alt'])) ? $item['alt'] : $item['filename'];
     $item['alt'] = $renderitems['slides'][$delta]['alt'];
 
@@ -255,11 +287,11 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
           $link_attributes['rel'] = 'lightbox['. $slideset_id .']';
           break;
       }
       $link_url = $settings['link_to_full_style'] ? image_style_url($settings['link_to_full_style'], $item['uri']) : file_create_url($item['uri']);
       // link the slide image and include the span for the icon
-      $renderitems['slides'][$delta]['image'] = l('<span class="view-full" title="'. t('View the full image') .'">'. t('View the full image') .'</span>', $link_url, array('attributes' => $link_attributes, 'html' => TRUE,)) . $renderitems['slides'][$delta]['image'];
+      $renderitems['slides'][$delta]['image'] = l('<span class="view-full" title="'. $settings['full_image_text'] .'">'. $settings['full_image_text'] .'</span>', $link_url, array('attributes' => $link_attributes, 'html' => TRUE,)) . $renderitems['slides'][$delta]['image'];
     } // END linking to original
 
     /*
      *  prepare thumbs
      */
@@ -276,10 +308,23 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
 
   if($num_of_images > 1){
    $dimensions['thumbs'] = galleryformatter_getimage_dimensions($settings['thumb_style'], $items[0]['uri']);
    drupal_add_js($modulepath . '/theme/infiniteCarousel.js');
    drupal_add_js($modulepath . '/theme/galleryformatter.js');
+    $js_settings = array(
+      // all available/current GF variables - uncomment to get CDATA (jQuery.extend(Drupal.settings,...) variables in source
+						// currently using 'gfslideshowSpeed'; łnoteł-variable names (e.g. 'gfslide_style') only matter to Javascripts
+						'gfslide_style' => variable_get('slide_style', $settings['slide_style']),
+						'gfthumb_style' => variable_get('thumb_style', $settings['thumb_style']),
+						'gfstyle' => variable_get('style', $settings['style']),
+						'gflinktofull' => variable_get('link_to_full', $settings['link_to_full']),
+						'gflinktofullstyle' => variable_get('link_to_full_style', $settings['link_to_full_style']),
+						'gfmodal' => variable_get('modal', $settings['modal']),
+						'gffullimagetext' => variable_get('full_image_text', $settings['full_image_text']),
+				  'gfslideshowSpeed' => variable_get('galleryformatter_slideshow', $settings['galleryformatter_slideshow']),
+						);
+				drupal_add_js(array('galleryformatter' => $js_settings), array('type' => 'setting', 'scope' => JS_DEFAULT));
   }
   galleryformatter_add_css($settings['style']);
   drupal_add_css($modulepath . '/theme/galleryformatter.css');
 
   // prepare the variables for our theme function
@@ -297,16 +342,28 @@ function galleryformatter_field_formatter_view($entity_type, $entity, $field, $i
 /**
  * Fetch the necessary CSS files for the gallery styles.
  */
 function galleryformatter_add_css($style) {
   // Add galleryformatter CSS.
-  drupal_add_css(drupal_get_path('module', 'galleryformatter') . '/theme/galleryformatter.css');
+  drupal_add_css(drupal_get_path('module', 'galleryformatter') . '/theme/galleryformatter.css',
+    array(
+      'type' => 'file',
+      'group' => CSS_DEFAULT,
+      'weight' => 1000,
+    )
+  );

   if ($style != 'nostyle') {
     $style_css = _galleryformatter_get_style_css($style);
-    drupal_add_css($style_css);
-  }
+    drupal_add_css($style_css,
+    array(
+      'type' => 'file',
+      'group' => CSS_THEME,
+      'weight' => 1000,
+    )
+  );
+ }
 }

 /**
  * Helper function to get the css file for given style.
  */