#56

iOSClient/Library/MWPhotoBrowser/MWPhotoBrowser.h

@@ -33,6 +33,7 @@
 - (NSString *)photoBrowser:(MWPhotoBrowser *)photoBrowser titleForPhotoAtIndex:(NSUInteger)index;
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser didDisplayPhotoAtIndex:(NSUInteger)index;
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser actionButtonPressedForPhotoAtIndex:(NSUInteger)index;
+- (void)photoBrowser:(MWPhotoBrowser *)photoBrowser shareButtonPressedForPhotoAtIndex:(NSUInteger)index;
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser deleteButtonPressedForPhotoAtIndex:(NSUInteger)index deleteButton:(UIBarButtonItem *)deleteButton;
 - (BOOL)photoBrowser:(MWPhotoBrowser *)photoBrowser isPhotoSelectedAtIndex:(NSUInteger)index;
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index selectedChanged:(BOOL)selected;
@@ -50,6 +51,7 @@
 @property (nonatomic) BOOL zoomPhotosToFill;
 @property (nonatomic) BOOL displayNavArrows;
 @property (nonatomic) BOOL displayActionButton;
+@property (nonatomic) BOOL displayShareButton;      //TWS
 @property (nonatomic) BOOL displayDeleteButton;     //TWS
 @property (nonatomic) BOOL displaySelectionButtons;
 @property (nonatomic) BOOL displayPopoverButton;    //TWS
@@ -66,7 +68,7 @@
 @property (nonatomic, strong) NSString *customImageSelectedIconName;
 @property (nonatomic, strong) NSString *customImageSelectedSmallIconName;
 
-@property (nonatomic, strong) UIBarButtonItem *previousButton, *nextButton, *actionButton, *doneButton, *popoverButton, *deleteButton; //TWS
+@property (nonatomic, strong) UIBarButtonItem *previousButton, *nextButton, *actionButton, *doneButton, *popoverButton, *deleteButton, *shareButton; //TWS
 
 //TWS Video
 @property (nonatomic, strong) MPMoviePlayerViewController *currentVideoPlayerViewController;

iOSClient/Library/MWPhotoBrowser/MWPhotoBrowser.m

@@ -66,6 +66,7 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
     _currentPageIndex = 0;
     _previousPageIndex = NSUIntegerMax;
     _displayActionButton = YES;
+    _displayShareButton = YES;
     _displayDeleteButton = YES;
     _displayNavArrows = NO;
     _zoomPhotosToFill = YES;
@@ -186,6 +187,10 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
         _actionButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonPressed:)];
     }
     
+    if (self.displayShareButton) {
+        _shareButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"shareUser"] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
+    }
+    
     // Update
     [self reloadData];
     
@@ -267,6 +272,11 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
             [items addObject:_deleteButton];
             [items addObject:fixedSpaceMini];
         }
+        if (_shareButton) {
+            
+            [items addObject:_shareButton];
+            [items addObject:fixedSpaceMini];
+        }
         [items addObject:_actionButton];
         
     } else {
@@ -1593,6 +1603,14 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
         [self.delegate photoBrowser:self deleteButtonPressedForPhotoAtIndex:_currentPageIndex deleteButton:self.deleteButton];
 }
 
+#pragma mark - Share
+
+- (void)shareButtonPressed:(id)sender {
+    
+    if ([self.delegate respondsToSelector:@selector(photoBrowser:shareButtonPressedForPhotoAtIndex:)])
+        [self.delegate photoBrowser:self shareButtonPressedForPhotoAtIndex:_currentPageIndex];
+}
+
 #pragma mark - Actions
 
 - (void)actionButtonPressed:(id)sender {

iOSClient/Main/CCDetail.m

@@ -41,6 +41,7 @@
     UIToolbar *_toolbar;
     
     UIBarButtonItem *_buttonAction;
+    UIBarButtonItem *_buttonShare;
     UIBarButtonItem *_buttonDelete;
     
     BOOL _reload;
@@ -180,9 +181,10 @@
     UIBarButtonItem *fixedSpaceMini = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:self action:nil];
     fixedSpaceMini.width = 25;
     _buttonAction = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_actionSheetOpenIn] style:UIBarButtonItemStylePlain target:self action:@selector(actionButtonPressed:)];
+    _buttonShare  = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_shareUser] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
     _buttonDelete = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteButtonPressed:)];
     
-    [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonAction,  nil]];
+    [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonShare, fixedSpaceMini, _buttonAction,  nil]];
     [_toolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin];
     
     [self.view addSubview:_toolbar];
@@ -687,6 +689,13 @@
     [self.docController presentOptionsMenuFromBarButtonItem:photoBrowser.actionButton animated:YES];
 }
 
+- (void)photoBrowser:(MWPhotoBrowser *)photoBrowser shareButtonPressedForPhotoAtIndex:(NSUInteger)index
+{
+    CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
+    
+    [app.activeMain openWindowShare:metadata];
+}
+
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser deleteButtonPressedForPhotoAtIndex:(NSUInteger)index deleteButton:(UIBarButtonItem *)deleteButton
 {
     CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
@@ -1044,6 +1053,11 @@
     [self.docController presentOptionsMenuFromBarButtonItem:sender animated:YES];
 }
 
+- (void)shareButtonPressed:(UIBarButtonItem *)sender
+{
+    [app.activeMain openWindowShare:self.metadataDetail];
+}
+
 - (void)deleteButtonPressed:(UIBarButtonItem *)sender
 {
     if ([self.metadataDetail.fileNamePrint length] == 0) return;

iOSClient/Main/CCMain.h

@@ -93,12 +93,10 @@
 - (void)requestSharedByServer;
 - (void)requestServerInformation;
 
+- (void)openWindowShare:(CCMetadata *)metadata;
 - (void)synchronizeFolderGraphicsServerUrl:(NSString *)serverUrl animation:(BOOL)animation;
-
 - (void)clearDateReadDataSource:(NSNotification *)notification;
-
 - (void)cancelSearchBar;
-
 - (BOOL)shouldPerformSegue;
 
 @end