X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Finteraction.h;h=bde4badb3cfdfebbb78fffc44e06aed9517e967f;hb=8a5d95d032dd1d3773858ece1d5efe2f970d6bab;hp=444b1300156f69cae7ddafcd3cb6eb4a38b92c28;hpb=4db8257a88e991b8d84d1bdce3119eaa3558b544;p=vlc

diff --git a/modules/gui/macosx/interaction.h b/modules/gui/macosx/interaction.h
index 444b130015..bde4badb3c 100644
--- a/modules/gui/macosx/interaction.h
+++ b/modules/gui/macosx/interaction.h
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program 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
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc_interaction.h>
+#include <vlc_common.h>
+#include <vlc_interface.h>
 #include <Cocoa/Cocoa.h>
 
 /*****************************************************************************
@@ -31,12 +31,13 @@
 
 @interface VLCInteraction : NSObject
 {
-    /* progress widget */
+    /* progress dialogue */
     IBOutlet id o_prog_bar;
     IBOutlet id o_prog_cancel_btn;
     IBOutlet id o_prog_description;
     IBOutlet id o_prog_title;
     IBOutlet id o_prog_win;
+    IBOutlet id o_prog_timeToGo;
 
     /* authentication dialogue */
     IBOutlet id o_auth_cancel_btn;
@@ -49,13 +50,23 @@
     IBOutlet id o_auth_title;
     IBOutlet id o_auth_win;
 
+    /* string input dialogue */
+    IBOutlet id o_input_cancel_btn;
+    IBOutlet id o_input_description;
+    IBOutlet id o_input_fld;
+    IBOutlet id o_input_ok_btn;
+    IBOutlet id o_input_title;
+    IBOutlet id o_input_win;
+
     interaction_dialog_t * p_dialog;
     intf_thread_t * p_intf;
+    NSProgressIndicator * o_mainIntfPgbar;
     BOOL nib_interact_loaded;
 }
 
 - (IBAction)cancelAndClose:(id)sender;
 - (IBAction)okayAndClose:(id)sender;
+- (IBAction)cancelDialog:(id)sender;
 
 -(id)initDialog: (interaction_dialog_t *)_p_dialog;
 -(void)runDialog;
@@ -65,16 +76,40 @@
 
 @end
 
+@interface VLCErrorInteractionPanel : NSObject
+{
+    IBOutlet id o_window;
+    IBOutlet id o_cleanup_button;
+    IBOutlet id o_error_table;
+    IBOutlet id o_messages_btn;
+
+    NSMutableArray * o_errors;
+    NSMutableArray * o_icons;
+
+    BOOL nib_interact_errpanel_loaded;
+}
+- (IBAction)cleanupTable:(id)sender;
+- (IBAction)showMessages:(id)sender;
+
+-(void)showPanel;
+-(void)addError: (NSString *)o_error withMsg:(NSString *)o_msg;
+-(void)addWarning: (NSString *)o_warning withMsg:(NSString *)o_msg;
+
+@end
+
 /*****************************************************************************
  * VLCInteractionList interface
  *****************************************************************************/
 @interface VLCInteractionList : NSObject
 {
     NSMutableArray *o_interaction_list;
+    VLCErrorInteractionPanel *o_error_panel;
 }
 
 -(void)newInteractionEvent: (NSNotification *)o_notification;
 -(void)addInteraction: (interaction_dialog_t *)p_dialog;
 -(void)removeInteraction: (VLCInteraction *)p_interaction;
 
+-(id)getErrorPanel;
+
 @end