Changeset 928454fad876fb8f5dc7b993dca4670460a008af

Timestamp:

14/09/06 23:19:34 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1158268774 +0000

git-parent:

[6cdb3e2829ba401c9781e1532479db658d87c69b]

git-author:

Clément Stenac <zorglub@videolan.org> 1158268774 +0000

Message:

Fix a number of problems with interaction dialogs
Remove the "seeking too far" error, as it happens for broken AVI and is quite confusing

Files:

• modules/access/file.c (modified) (1 diff)
• modules/access/http.c (modified) (1 diff)
• modules/gui/qt4/dialogs/interaction.cpp (modified) (9 diffs)
• modules/gui/qt4/dialogs/interaction.hpp (modified) (2 diffs)
• modules/gui/qt4/dialogs_provider.cpp (modified) (2 diffs)
• modules/gui/qt4/util/qvlcframe.hpp (modified) (2 diffs)
• src/interface/interaction.c (modified) (2 diffs)
• src/playlist/thread.c (modified) (1 diff)

modules/access/file.c

@@ -517 +517 @@
-    {
-        msg_Err( p_access, "seeking too far" );
-        intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), 
-                        _("VLC seeked in the file too far. This usually means "
-                          "that your file is broken and therefore cannot be "
-                          "played." ) );
-        p_access->info.i_pos = p_access->info.i_size;
-    }

modules/access/http.c

@@ -286 +286 @@
-        msg_Dbg( p_access, "authentication failed" );
-        i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"),
- 
+
-                                                &psz_login, &psz_password );
-        if( i_ret == DIALOG_OK_YES )

modules/gui/qt4/dialogs/interaction.cpp

@@ -35 +35 @@
-
-InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
-Widge
+Objec
-                          p_intf( _p_intf), p_dialog( _p_dialog )
-{
-new QVBoxLayout( this )
+NULL
-    int i_ret = -1;
-    panel = NULL;
+    dialog = NULL;
-
-    if( p_dialog->i_flags & DIALOG_BLOCKING_ERROR )
-    {
-this
+NULL
-                                       qfu( p_dialog->psz_description ),
-                                       QMessageBox::Ok, 0, 0 );
@@ -65 +66 @@
-    else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
-    {
-
+
+
-              qfu( p_dialog->psz_title), qfu( p_dialog->psz_description ),
-              p_dialog->psz_default_button ?
@@ -77 +79 @@
-    else if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
-    {
+        dialog = new QWidget( 0 ); layout = new QVBoxLayout( dialog );
+        layout->setMargin( 2 );
-        panel = new QWidget( 0 );
-        QGridLayout *grid = new QGridLayout;
@@ -94 +98 @@
-        layout->addWidget( panel );
-    }
-
+
+
-    {
+        dialog = new QWidget( 0 );layout = new QVBoxLayout( dialog );
+        layout->setMargin( 2 );
-        description = new QLabel( qfu( p_dialog->psz_description ) );
-        layout->addWidget( description );
@@ -107 +114 @@
-    else if( p_dialog->i_flags & DIALOG_PSZ_INPUT_OK_CANCEL )
-    {
+        dialog = new QWidget( 0 );layout = new QVBoxLayout( dialog );
+        layout->setMargin( 2 );
-        description = new QLabel( qfu( p_dialog->psz_description ) );
-        layout->addWidget( description );
@@ -114 +123 @@
-    }
-    else
-"
+ %i", p_dialog->i_flags
-
-    /* We used a message box */
@@ -126 +135 @@
-    /* Custom box, finish it */
-    {
-this
+dialog
-                              &defaultButton, p_dialog->psz_default_button,
-                              &altButton, p_dialog->psz_alternate_button,
-                              &otherButton, p_dialog->psz_other_button );
-        if( p_dialog->psz_default_button )
-
+()
-        if( p_dialog->psz_alternate_button )
-
+()
-        if( p_dialog->psz_other_button )
-
-
-
+()
+dialog->
+dialog->
-    }
-}
-
-U
+u
-{
-    if( p_dialog->i_flags & DIALOG_USER_PROGRESS )
@@ -147 +156 @@
-        assert( progressBar );
-        progressBar->setValue( (int)(p_dialog->val.f_float*1000) );
+        fprintf (stderr, "Setting progress to %i\n", progressBar->value() );
-    }
-}
@@ -152 +162 @@
-InteractionDialog::~InteractionDialog()
-{
-
+
+
-}
-

modules/gui/qt4/dialogs/interaction.hpp

@@ -33 +33 @@
-class QLineEdit;
-
-Widge
+Objec
-{
-    Q_OBJECT
@@ -40 +40 @@
-    virtual ~InteractionDialog();
-
-
+
+
+
-
-private:
-    QWidget *panel;
+    QWidget *dialog;
-    intf_thread_t *p_intf;
-    interaction_dialog_t *p_dialog;

modules/gui/qt4/dialogs_provider.cpp

@@ -124 +124 @@
-        qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( qdialog)
-U
+u
-        break;
-    case INTERACT_HIDE:
@@ -134 +134 @@
-    case INTERACT_DESTROY:
-        qdialog = (InteractionDialog*)(p_dialog->p_private);
-
+
+
-        p_dialog->i_status = DESTROYED_DIALOG;
-        break;

modules/gui/qt4/util/qvlcframe.hpp

@@ -66 +66 @@
-    {
-#ifdef QT42
+        fprintf( stderr, "Gra\n" );
-#else
-        QHBoxLayout *buttons_layout = new QHBoxLayout;
@@ -76 +77 @@
-            fprintf( stderr, "Creating default button %s\n", psz_default );
-            *defaul = new QPushButton(0);
+            (*defaul)->setFocus();
-            buttons_layout->addWidget( *defaul );
-            (*defaul)->setText( qfu( psz_default ) );

src/interface/interaction.c

@@ -368 +368 @@
-    p_new->psz_title = strdup( psz_title );
-    p_new->psz_description = strdup( psz_description );
+    p_new->psz_default_button = strdup( _("Ok" ) );
+    p_new->psz_alternate_button = strdup( _("Cancel" ) );
-
-    p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL;
@@ -373 +375 @@
-    i_ret = DialogSend( p_this, p_new );
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-    return i_ret;

src/playlist/thread.c

@@ -212 +212 @@
-    {
-        intf_InteractionDestroy( p_playlist->p_interaction );
+        fprintf( stderr, "NOW NULL ****\n" );
+        p_playlist->p_interaction = NULL;
-    }
-}