Changeset 5d04943cbd4190513343beffa30e71d31801b052

Timestamp:

14/05/06 16:36:08 (3 years ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1147617368 +0000

git-parent:

[c7c309ce04d7f3ed5ec59a01136136d2c5acdf6d]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1147617368 +0000

Message:

* new dialogue type to prompt the user for a string
* the core is widget-free now (except for the header to keep wx compiling, hopefully)
* updated the OSX-implementation to reflect the recent changes

more clean up is necessary; testing and any feedback is welcomed

refs #553

Files:

• extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib (modified) (previous)
• include/vlc_interaction.h (modified) (2 diffs)
• modules/gui/macosx/interaction.h (modified) (1 diff)
• modules/gui/macosx/interaction.m (modified) (8 diffs)
• src/interface/interaction.c (modified) (10 diffs)

extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib

@@ -16 +16 @@
-                "o_auth_title" = id; 
-                "o_auth_win" = id; 
+                "o_input_cancel_btn" = id; 
+                "o_input_description" = id; 
+                "o_input_fld" = id; 
+                "o_input_ok_btn" = id; 
+                "o_input_title" = id; 
+                "o_input_win" = id; 
-                "o_prog_bar" = id; 
-                "o_prog_cancel_btn" = id; 

extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib

@@ -9 +9 @@
-    <key>IBOpenObjects</key>
-    <array>
+        <integer>79</integer>
-        <integer>55</integer>
-    </array>

include/vlc_interaction.h

@@ -84 +84 @@
-#define DIALOG_LOGIN_PW_OK_CANCEL   0x20
-#define DIALOG_USER_PROGRESS        0x40
+#define DIALOG_PSZ_INPUT_OK_CANCEL      0x80
-
-/**
@@ -177 +178 @@
-VLC_EXPORT( void, __intf_UserProgressUpdate,( vlc_object_t*, int, const char*, float) );
-
+#define intf_UserStringInput( a, b, c, d ) __intf_UserStringInput( VLC_OBJECT(a),b,c,d )
+VLC_EXPORT( int, __intf_UserStringInput,(vlc_object_t*, const char*, const char*, char **) );
+
-#define intf_UserHide( a, b ) __intf_UserHide( VLC_OBJECT(a), b )
-VLC_EXPORT( void, __intf_UserHide,( vlc_object_t *, int ));

modules/gui/macosx/interaction.h

@@ -50 +50 @@
-    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;

modules/gui/macosx/interaction.m

@@ -111 +111 @@
--(void)runDialog
-{
-    int i = 0;
-    id o_window = NULL;
-    if( !p_dialog )
@@ -125 +124 @@
-        [o_auth_cancel_btn setTitle: _NS("Cancel")];
-        [o_auth_ok_btn setTitle: _NS("OK")];
+        [o_input_ok_btn setTitle: _NS("OK")];
+        [o_input_cancel_btn setTitle: _NS("Cancel")];
-    }
-
@@ -154 +155 @@
-    if( p_dialog->i_id == DIALOG_ERRORS )
-    {
-
-
-
-
+
-    }
-    else
-    {
-        for( i = 0; i < p_dialog->i_widgets; i++ )
-        {
-            msg_Dbg( p_intf, "widget: %s", p_dialog->pp_widgets[i]->psz_text );
-            o_description = [o_description stringByAppendingString: \
-                [NSString stringWithUTF8String: \
-                    p_dialog->pp_widgets[i]->psz_text]];
-        }
-        if( p_dialog->i_flags & DIALOG_OK_CANCEL )
-        {
-            msg_Dbg( p_intf, "requested flag: DIALOG_OK_CANCEL" );
-
-
-
+
+
+
+
-        }
-        else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
-        {
-            msg_Dbg( p_intf, "requested flag: DIALOG_YES_NO_CANCEL" );
-
-
-
+
+
+
+
-        }
-        else if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
@@ -189 +182 @@
-            [o_auth_login_fld setStringValue: @""];
-            [o_auth_pw_fld setStringValue: @""];
- \
+
-                modalDelegate: self didEndSelector: nil contextInfo: nil];
-            [o_auth_win makeKeyWindow];
@@ -199 +192 @@
-            [o_prog_description setStringValue: o_description];
-            [o_prog_bar setDoubleValue: 0];
- \
+
-                modalDelegate: self didEndSelector: nil contextInfo: nil];
-            [o_prog_win makeKeyWindow];
-        }
+        else if( p_dialog->i_flags & DIALOG_PSZ_INPUT_OK_CANCEL )
+        {
+            msg_Dbg( p_intf, "requested flag: DIALOG_STRING_INPUT_OK" );
+            [o_input_title setStringValue: o_title];
+            [o_input_description setStringValue: o_description];
+            [o_input_fld setStringValue: @""];
+            [NSApp beginSheet: o_input_win modalForWindow: o_window
+                modalDelegate: self didEndSelector: nil contextInfo: nil];
+            [o_input_win makeKeyWindow];
+        }
-        else
-not implemented yet
+unknown
-    }
-}
@@ -240 +243 @@
-        [o_prog_bar setDoubleValue: \
-            (double)(p_dialog->val.f_float)];
-        msg_Dbg( p_intf, "new value: %f", [o_prog_bar doubleValue] );
-
-        if( [o_prog_bar doubleValue] == 100.0 )
@@ -263 +265 @@
-        [NSApp endSheet: o_auth_win];
-        [o_auth_win close];
+    }
+    if( p_dialog->i_flags & DIALOG_PSZ_INPUT_OK_CANCEL )
+    {
+        [NSApp endSheet: o_input_win];
+        [o_input_win close];
-    }
-}
@@ -290 +297 @@
-        p_dialog->psz_returned[1] = strdup( [[o_auth_pw_fld stringValue] UTF8String] );
-    }
+    else if( p_dialog->i_flags == DIALOG_PSZ_INPUT_OK_CANCEL )
+        p_dialog->psz_returned[0] = strdup( [[o_input_fld stringValue] UTF8String] );
-    p_dialog->i_return = DIALOG_OK_YES;
-    p_dialog->i_status = ANSWERED_DIALOG;

src/interface/interaction.c

@@ -222 +222 @@
-
-
-
-#define INTERACT_INIT( new )                                            \
-        new = (interaction_dialog_t*)malloc(                            \
-                        sizeof( interaction_dialog_t ) );               \
-        new->i_widgets = 0;                                             \
-        new->pp_widgets = NULL;                                         \
-        new->psz_title = NULL;                                          \
-        new->psz_description = NULL;                                    \
@@ -251 +248 @@
-    va_list args;
-    interaction_dialog_t *p_new = NULL;
-    user_widget_t *p_widget = NULL;
-    int i_id = DIALOG_ERRORS;
-
@@ -273 +269 @@
-    p_new->psz_title = strdup( psz_title );
-
-    p_widget = (user_widget_t* )malloc( sizeof( user_widget_t ) );
-
-    p_widget->i_type = WIDGET_TEXT;
-    p_widget->val.psz_string = NULL;
-
-    va_start( args, psz_format );
-widget->psz_text
+new->psz_description
-    va_end( args );
-
-    INSERT_ELEM ( p_new->pp_widgets,
-                  p_new->i_widgets,
-                  p_new->i_widgets,
-                  p_widget );
-
-    p_new->i_flags |= DIALOG_CLEAR_NOSHOW;
@@ -304 +290 @@
-    int i_ret;
-    interaction_dialog_t *p_new = NULL;
-    user_widget_t *p_widget = NULL;
-
-    INTERACT_INIT( p_new );
@@ -310 +295 @@
-    p_new->i_type = INTERACT_DIALOG_TWOWAY;
-    p_new->psz_title = strdup( psz_title );
-
-
-
-
-
-
-
-
-
+
-    p_new->i_flags = DIALOG_YES_NO_CANCEL;
-
@@ -326 +303 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *  \param p_this           Parent vlc_object
- *  \param psz_title        Title for the dialog
@@ -355 +357 @@
-}
-
-
+ in a dialogue
- *  \param p_this           Parent vlc_object
- *  \param i_id             Identifier of the dialog
@@ -389 +391 @@
-}
-
-box
+dialogue
- *  \param p_this           Parent vlc_object
- *  \param psz_title        Title for the dialog
@@ -421 +423 @@
-        *ppsz_login = strdup( p_new->psz_returned[0] );
-        *ppsz_password = strdup( p_new->psz_returned[1] );
+    }
+    return i_ret;
+}
+
+/** Helper function to make a dialogue asking the user for !password string
+ *  \param p_this           Parent vlc_object
+ *  \param psz_title        Title for the dialog
+ *  \param psz_description  A description
+ *  \param ppsz_usersString Returned login
+ *  \return                 Clicked button code
+ */
+int __intf_UserStringInput( vlc_object_t *p_this,
+                              const char *psz_title,
+                              const char *psz_description,
+                              char **ppsz_usersString )
+{
+
+    int i_ret;
+    interaction_dialog_t *p_new = NULL;
+
+    INTERACT_INIT( p_new );
+
+    p_new->i_type = INTERACT_DIALOG_TWOWAY;
+    p_new->psz_title = strdup( psz_title );
+    p_new->psz_description = strdup( psz_description );
+
+    p_new->i_flags = DIALOG_PSZ_INPUT_OK_CANCEL;
+
+    i_ret = intf_Interact( p_this, p_new );
+
+    if( i_ret != DIALOG_CANCELLED )
+    {
+        *ppsz_usersString = strdup( p_new->psz_returned[0] );
-    }
-    return i_ret;
@@ -630 +665 @@
-static void intf_InteractionDialogDestroy( interaction_dialog_t *p_dialog )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    FREE( p_dialog->psz_title );
-    FREE( p_dialog->psz_description );
-    
-    FREE( p_dialog->psz_returned[0] );
-
+ */
-
-    free( p_dialog );