Changeset 54cfbbc8db822f49819f2230c74c7e8865772d7f

Timestamp:

03/08/06 08:10:57 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[1c98d750758a7812c1c433d967564ad92f39ef98]

git-author:

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

Message:

* Some Qt interaction stuff
* More useless interaction cleanup
* Small fix for make beautifier

Files:

• extras/make.pl (modified) (3 diffs)
• include/vlc_interaction.h (modified) (1 diff)
• modules/demux/avi/avi.c (modified) (1 diff)
• modules/demux/avi/libavi.c (modified) (5 diffs)
• modules/gui/qt4/dialogs/interaction.cpp (modified) (6 diffs)
• modules/gui/qt4/util/qvlcframe.hpp (modified) (2 diffs)
• modules/gui/wxwidgets/dialogs/interaction.cpp (modified) (2 diffs)
• src/interface/interaction.c (modified) (3 diffs)

extras/make.pl

@@ -24 +24 @@
-     chomp $line;
-     # Skip entering/leaving directories and incomplete lines
- 
+
-    $line =~ /make\[([0-9]*)\]:.*/ ||
- $line =~ /.*\s\\$/ || 
- 
+$line =~ /.*\s\\$/ ||
+
-        $line =~ /^Making\sclean\sin\s\./ ||
-    $line =~ /then\smv\s-f/ ||
+    $line =~ /.*make\s\s.*/ ||
-        $line =~ /make\s\sall-recursive/ ||
-        $line =~ /[A-z0-9-]*ar\s[A-z0-9]*\s([A-z0-9\-_\/\.]*)\s.*/ ||
@@ -35 +36 @@
-        $line =~ /^touch.*/ ||
-        $line =~ /^srcdir=.*/ ||
- 
+
-        $line =~ s/^rm\s\-f\s(.*)//g )
-     {}
- 
- 
+
+
-          $line =~ s/^.* (lib.*\.so).*/ LINK    : $1/g ||
-          $line =~ s/^.* (lib.*\.o)\s\.\/(.*)/ COMPILE : $2/g ||
-          $line =~ s/^.* (lib.*\.o)\s`.*`(.*);\ \\/ COMPILE : $2/ ||
+          $line =~ s/.*\-o\s([^\s]*)\s`.*`([^\s]*);.*/ COMPILE : $2/g ||
-          $line =~ s/^[A-z0-9-]*ranlib\s(.*)/ RANLIB  : $1/g ||
-          $line =~ s/^Making\sall\sin\s(.*)/MAKE     : $1/g ||
-
-
-
+
-     {
-    print $info.$line.$reset."\n";
@@ -64 +64 @@
-    print $error.$line.$reset."\n";
-     }
- 
+
-     else
-     {
-    print $line."\n";
-     }
-
-}

include/vlc_interaction.h

@@ -82 +82 @@
-
-/**
-Reusable and button
+Dialog
- */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-#define DIALOG_INTF_PROGRESS        0x100
-#define DIALOG_WARNING              0x400
-
-/**

modules/demux/avi/avi.c

@@ -560 +560 @@
-                        "work correctly.\nDo you want to "
-                        "try to repair it (this might take a long time) ?" ),
-NULL
+_( "Cancel")
-            if( i_create == DIALOG_OK_YES )
-            {

modules/demux/avi/libavi.c

@@ -30 +30 @@
-
-#define AVI_DEBUG 1
-
-#define FREE( p ) \
-    if( p ) {free( p ); p = NULL; }
-
-#define __EVEN( x ) ( (x)&0x01 ? (x)+1 : (x) )
@@ -418 +415 @@
-    if( p_strf->common.i_cat == AUDIO_ES )
-    {
-
+NULL
-    }
-    else if( p_strf->common.i_cat == VIDEO_ES )
-    {
-
+NULL
-    }
-}
@@ -472 +469 @@
-    p_chk->idx1.i_entry_count = 0;
-    p_chk->idx1.i_entry_max   = 0;
-
+NULL
-}
-
@@ -557 +554 @@
-    avi_chunk_indx_t *p_indx = (avi_chunk_indx_t*)p_chk;
-
-
-
-
+NULL
+NULL
+NULL
-}
-
@@ -630 +627 @@
-{
-    avi_chunk_STRING_t *p_strz = (avi_chunk_STRING_t*)p_chk;
-
-
+NULL
+NULL
-}
-

modules/gui/qt4/dialogs/interaction.cpp

@@ -21 +21 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
-
+#include <QMessageBox>
-#include "dialogs/interaction.hpp"
-#include "util/qvlcframe.hpp"
@@ -30 +31 @@
-                          p_intf( _p_intf), p_dialog( _p_dialog )
-{
-
+
+
-    uiLogin = NULL;
-    uiProgress = NULL;
-    uiInput = NULL;
-
-
-    if( p_dialog->i_flags & DIALOG_BLOCKING_ERROR )
-    {
-
-    }
-    else if( p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
@@ -46 +46 @@
-    else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
-    {
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    else if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
@@ -66 +72 @@
-        msg_Err( p_intf, "unknown dialog type" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -107 +124 @@
-void InteractionDialog::Finish( int i_ret )
-{
- 
+
-
-    if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
@@ -124 +141 @@
-    p_dialog->i_return = i_ret;
-    hide();
- 
+
-}

modules/gui/qt4/util/qvlcframe.hpp

@@ -58 +58 @@
-    }
-    static void doButtons( QWidget *w, QBoxLayout *l,
-
-
-
+*
+*
+*
-    {
-#ifdef QT42
@@ -71 +71 @@
-        if( psz_default )
-        {
-defaul = new QPushButton
-
-defaul
+*defaul = new QPushButton(0)
+*
+(*defaul)
-        }
-        if( psz_alt )
-        {
-alt = new QPushButton
-
-alt
+*alt = new QPushButton(0)
+*
+(*alt)
-        }
-        if( psz_other )
-        {
-other = new QPushButton
-
-other
+*other = new QPushButton( 0 )
+*
+(*other)
-        }
-        l->addLayout( buttons_layout );

modules/gui/wxwidgets/dialogs/interaction.cpp

@@ -179 +179 @@
-        buttons_sizer->AddButton( cancel );
-    }
+#if 0
-    else if( p_dialog->i_flags & DIALOG_CLEAR_NOSHOW )
-    {
@@ -197 +198 @@
-        buttons_sizer->SetAffirmativeButton( close );
-    }
+#endif
-    widgets_sizer->Layout();
-    widgets_panel->SetSizerAndFit( widgets_sizer );

src/interface/interaction.c

@@ -137 +137 @@
-        case HIDDEN_DIALOG:
-            if( !(p_dialog->i_flags & DIALOG_GOT_ANSWER) ) break;
-
-
-
-
-
-
-
+
+
+
+
-            break;
-        case DESTROYED_DIALOG:
@@ -176 +173 @@
-        p_new->b_cancelled = VLC_FALSE;                                   \
-        p_new->i_status = NEW_DIALOG;                                     \
+        p_new->i_flags = 0; \
-        p_new->i_type = INTERACT_DIALOG_##type;                           \
-        p_new->psz_returned[0] = NULL;                                    \
@@ -197 +195 @@
-    va_list args;
-    DIALOG_INIT( ONEWAY );
-
+
-    p_new->psz_title = strdup( psz_title );
-    FORMAT_DESC;