Changeset a94647f04b28484b49f16ce252523b38343b6b58

Timestamp:

09/12/06 19:12:05 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[ff5e7fa774f237f3a8d1204cd9a5b61c1df93079]

git-author:

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

Message:

Misc cleanups in Qt4. (Closes:#736)
Fix m3u export

Files:

• NEWS (modified) (1 diff)
• include/vlc_intf_strings.h (modified) (2 diffs)
• modules/gui/qt4/components/playlist/standardpanel.cpp (modified) (8 diffs)
• modules/gui/qt4/dialogs/messages.cpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.cpp (modified) (7 diffs)
• modules/gui/qt4/dialogs_provider.hpp (modified) (2 diffs)
• modules/gui/qt4/menus.cpp (modified) (5 diffs)
• modules/misc/playlist/m3u.c (modified) (2 diffs)

NEWS

@@ -12 +12 @@
- * This version of VLC contains a new interface for Windows and Linux. This
-   interface lacks a few features that used to be present in vlc 0.8.6: 
-
-
-
+
+
+
+
+
-
-Changes:

include/vlc_intf_strings.h

@@ -31 +31 @@
-/*************** Open dialogs **************/
-
-
+
+
+
+
+
-
-/******************* Menus *****************/
+
+#define I_MENU_INFO  N_("Information...")
+#define I_MENU_MSG   N_("Messages...")
+#define I_MENU_EXT   N_("Extended settings...")
+
+#define I_MENU_ABOUT N_("About VLC media player...")
-
-/* Playlist popup */
@@ -45 +55 @@
-#define I_POP_SAVE N_("Save...")
-
+/*************** Playlist *************/
+
+#define I_PL_LOOP       N_("Repeat all")
+#define I_PL_REPEAT     N_("Repeat one")
+#define I_PL_NOREPEAT   N_("No repeat")
+
+#define I_PL_RANDOM     N_("Random")
+#define I_PL_NORANDOM   N_("No random")
+
+#define I_PL_ADDPL      N_("Add to playlist")
+#define I_PL_ADDML      N_("Add to media library")
+
+#define I_PL_ADDF       N_("Add file...")
+#define I_PL_ADVADD     N_("Advanced open...")
+#define I_PL_ADDDIR     N_("Add directory...")
+
+#define I_PL_SAVE       N_("Save playlist to file...")
+#define I_PL_LOAD       N_("Load playlist file...")
+
+#define I_PL_SEARCH     N_("Search")
+#define I_PL_FILTER     N_("Search filter")
+
+#define I_PL_SD         N_("Additional sources")
+
-/*************** Preferences *************/
-

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -27 +27 @@
-#include "components/playlist/panels.hpp"
-#include "util/customwidgets.hpp"
+
+#include <vlc_intf_strings.h>
-
-#include <QTreeView>
@@ -54 +56 @@
-    view->setAlternatingRowColors( true );
-    view->header()->resizeSection( 0, 230 );
-2, 6
+1, 17
-    view->header()->setSortIndicatorShown( true );
-    view->header()->setClickable( true );
@@ -96 +98 @@
-    QSpacerItem *spacer = new QSpacerItem( 10, 20 );buttons->addItem( spacer );
-
-fu( "&Search:" 
+tr(I_PL_SEARCH
-    buttons->addWidget( filter );
-fu( "Playlist filter" 
+tr(I_PL_FILTER
-    CONNECT( searchLine, textChanged(QString), this, search(QString));
-    buttons->addWidget( searchLine ); filter->setBuddy( searchLine );
@@ -118 +120 @@
-    {
-        model->setRepeat( false ); model->setLoop( true );
- "Repeat All" 
+I_PL_LOOP
-    }
-    else if( model->hasLoop() )
-    {
-        model->setRepeat( false ) ; model->setLoop( false );
- "No Repeat" 
+I_PL_NOREPEAT
-    }
-    else
-    {
-        model->setRepeat( true );
- "Repeat One" 
+I_PL_REPEAT
-    }
-}
@@ -136 +138 @@
-    bool prev = model->hasRandom();
-    model->setRandom( !prev );
- "No Random" ) : qtr( "Random" 
+I_PL_NORANDOM) : qtr(I_PL_RANDOM
-}
-
@@ -160 +162 @@
-    {
-        addButton->setEnabled( true );
-"Add to playlist" 
+I_PL_ADDPL
-    }
-    else if( currentRootId == THEPL->p_ml_category->i_id ||
@@ -166 +168 @@
-    {
-        addButton->setEnabled( true );
-"Add to media library" 
+I_PL_ADDML
-    }
-    else
@@ -178 +180 @@
-        currentRootId == THEPL->p_local_onelevel->i_id )
-    {
-
-
+
+
+
-    }
-    else if( currentRootId == THEPL->p_ml_category->i_id ||
-             currentRootId == THEPL->p_ml_onelevel->i_id )
-    {
-"Add file"), THEDP, SLOT( simpleMLAppendDialog() ) 
-"Advanced add"
-"Directory"), THEDP, SLOT( openMLDirectory
+I_PL_ADDF), THEDP, SLOT(simpleMLAppendDialog())
+I_PL_ADVADD
+I_PL_ADDDIR), THEDP, SLOT( MLAppendDir
-    }
-    popup->popup( QCursor::pos() );

modules/gui/qt4/dialogs/messages.cpp

@@ -157 +157 @@
-            "Texts / Logs (*.log *.txt);; All (*.*) ");
-
-saveLogFileName != NULL
+!saveLogFileName.isNull()
-    {
-        QFile file(saveLogFileName);

modules/gui/qt4/dialogs_provider.cpp

@@ -67 +67 @@
-}
-
+void DialogsProvider::quit()
+{
+    p_intf->b_die = VLC_TRUE;
+    QApplication::quit();
+}
+
-void DialogsProvider::customEvent( QEvent *event )
-{
@@ -91 +97 @@
-               popupMenu( de->i_dialog ); break;
-            case INTF_DIALOG_FILEINFO:
-M
+m
-            case INTF_DIALOG_INTERACTION:
-               doInteraction( de->p_arg ); break;
@@ -104 +110 @@
-}
-
+/****************************************************************************
+ * Individual simple dialogs
+ ****************************************************************************/
-void DialogsProvider::playlistDialog()
-{
@@ -109 +118 @@
-}
-
+void DialogsProvider::prefsDialog()
+{
+    PrefsDialog::getInstance( p_intf )->toggleVisible();
+}
+void DialogsProvider::extendedDialog()
+{
+    ExtendedDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::messagesDialog()
+{
+    MessagesDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::helpDialog()
+{
+    HelpDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::aboutDialog()
+{
+    AboutDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::mediaInfoDialog()
+{
+    MediaInfoDialog::getInstance( p_intf )->toggleVisible();
+}
+
+void DialogsProvider::bookmarksDialog()
+{
+}
+
+/****************************************************************************
+ * All the open/add stuff
+ ****************************************************************************/
+
-void DialogsProvider::openDialog()
-{
@@ -123 +169 @@
-    OpenDialog::getInstance( p_intf->p_sys->p_mi  , p_intf )->showTab( i_tab );
-}
+
+/**** Simple open ****/
+
+QStringList DialogsProvider::showSimpleOpen()
+{
+    QString FileTypes;
+    FileTypes = _("Media Files");
+    FileTypes += " ( ";
+    FileTypes += EXTENSIONS_MEDIA;
+    FileTypes += ");;";
+    FileTypes += _("Video Files");
+    FileTypes += " ( ";
+    FileTypes += EXTENSIONS_VIDEO;
+    FileTypes += ");;";
+    FileTypes += _("Sound Files");
+    FileTypes += " ( ";
+    FileTypes += EXTENSIONS_AUDIO;
+    FileTypes += ");;";
+    FileTypes += _("PlayList Files");
+    FileTypes += " ( ";
+    FileTypes += EXTENSIONS_PLAYLIST;
+    FileTypes += ");;";
+    FileTypes += _("All Files");
+    FileTypes += " (*.*)";
+    FileTypes.replace(QString(";*"), QString(" *"));
+    return QFileDialog::getOpenFileNames( NULL, qfu(I_OP_SEL_FILES ),
+                    p_intf->p_libvlc->psz_homedir, FileTypes );
+}
+
+void DialogsProvider::addFromSimple( bool pl, bool go)
+{
+    QStringList files = DialogsProvider::showSimpleOpen();
+    int i = 0;
+    foreach( QString file, files )
+    {
+        const char * psz_utf8 = qtu( file );
+        playlist_Add( THEPL, psz_utf8, NULL,
+                      go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) |
+                                               ( i ? PLAYLIST_PREPARSE : 0 ) )
+                         : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
+                      PLAYLIST_END,
+                      pl ? VLC_TRUE : VLC_FALSE );
+        i++;
+    }
+}
+
+void DialogsProvider::simplePLAppendDialog()
+{
+    addFromSimple( true, false );
+}
+
+void DialogsProvider::simpleMLAppendDialog()
+{
+    addFromSimple( false, false );
+}
+
+void DialogsProvider::simpleOpenDialog()
+{
+    addFromSimple( true, true );
+}
+
+void DialogsProvider::openPlaylist()
+{
+    QStringList files = showSimpleOpen();
+    foreach( QString file, files )
+    {
+        playlist_Import( THEPL, qtu(file) );
+    }
+}
+
+void DialogsProvider::savePlaylist()
+{
+    QFileDialog *qfd = new QFileDialog( NULL,
+                                   qtr("Choose a filename to save playlist"),
+                                   p_intf->p_libvlc->psz_homedir,
+                                   qfu("XSPF playlist (*.xspf);; ") +
+                                   qfu("M3U playlist (*.m3u);; Any (*.*) ") );
+    qfd->setFileMode( QFileDialog::AnyFile );
+    qfd->setAcceptMode( QFileDialog::AcceptSave );
+    qfd->setConfirmOverwrite( true );
+
+    if( qfd->exec() == QDialog::Accepted )
+    {
+        if( qfd->selectedFiles().count() > 0 )
+        {
+            char *psz_module, *psz_m3u = "export-m3u",
+                 *psz_xspf = "export-xspf";
+
+            QString file = qfd->selectedFiles().first();
+            QString filter = qfd->selectedFilter();
+
+            if( file.contains(".xsp") ||
+                ( filter.contains(".xspf") && !file.contains(".m3u") ) )
+            {
+                psz_module = psz_xspf;
+                if( !file.contains( ".xsp" ) )
+                    file.append( ".xspf" );
+            }
+            else
+            {
+                psz_module = psz_m3u;
+                if( !file.contains( ".m3u" ) )
+                    file.append( ".m3u" );
+            }
+
+            playlist_Export( THEPL, qtu(file), THEPL->p_playlist_category,
+                             psz_module);
+        }
+    }
+    delete qfd;
+}
+
+static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
+{
+    QString dir = QFileDialog::getExistingDirectory ( 0,
+                                                     _("Open directory") );
+    input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
+                                               0, NULL, -1 );
+    playlist_AddInput( THEPL, p_input,
+                       go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
+                       PLAYLIST_END, pl);
+    input_Read( THEPL, p_input, VLC_FALSE );
+}
+
+void DialogsProvider::PLAppendDir()
+{
+    openDirectory( p_intf, true, false );
+}
+
+void DialogsProvider::MLAppendDir()
+{
+    openDirectory( p_intf, false , false );
+}
+
+
+/****************************************************************************
+ * Sout emulation
+ ****************************************************************************/
+
+void DialogsProvider::streamingDialog()
+{
+    OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
+    if ( o->exec() == QDialog::Accepted )
+    {
+        SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf );
+        if( s->exec() == QDialog::Accepted )
+        {
+            msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
+            /* Just do it */
+            int i_len = strlen( qtu(s->mrl) ) + 10;
+            char *psz_option = (char*)malloc(i_len);
+            snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
+
+            playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming",
+                             PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
+                             -1, &psz_option, 1, VLC_TRUE );
+        }
+        delete s;
+    }
+    delete o;
+}
+
+/****************************************************************************
+ * Menus / Interaction
+ ****************************************************************************/
+
+void DialogsProvider::menuAction( QObject *data )
+{
+    QVLCMenu::DoAction( p_intf, data );
+}
+
+void DialogsProvider::menuUpdateAction( QObject *data )
+{
+    MenuFunc * f = qobject_cast<MenuFunc *>(data);
+    f->doFunc( p_intf );
+}
+
+void DialogsProvider::SDMenuAction( QString data )
+{
+    char *psz_sd = data.toUtf8().data();
+    if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
+        playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
+    else
+        playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
+}
+
-
-void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
@@ -156 +388 @@
-}
-
-void DialogsProvider::quit()
-{
-    p_intf->b_die = VLC_TRUE;
-    QApplication::quit();
-}
-
-void DialogsProvider::MediaInfoDialog()
-{
-    MediaInfoDialog::getInstance( p_intf )->toggleVisible();
-}
-
-void DialogsProvider::streamingDialog()
-{
-    OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
-    if ( o->exec() == QDialog::Accepted )
-    {
-        SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf );
-        if( s->exec() == QDialog::Accepted )
-        {
-            msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
-            /* Just do it */
-            int i_len = strlen( qtu(s->mrl) ) + 10;
-            char *psz_option = (char*)malloc(i_len);
-            snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
-
-            playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming",
-                             PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
-                             -1, &psz_option, 1, VLC_TRUE );
-        }
-        delete s;
-    }
-    delete o;
-}
-
-void DialogsProvider::prefsDialog()
-{
-    PrefsDialog::getInstance( p_intf )->toggleVisible();
-}
-void DialogsProvider::extendedDialog()
-{
-    ExtendedDialog::getInstance( p_intf )->toggleVisible();
-}
-
-void DialogsProvider::messagesDialog()
-{
-    MessagesDialog::getInstance( p_intf )->toggleVisible();
-}
-
-void DialogsProvider::helpDialog()
-{
-    HelpDialog::getInstance( p_intf )->toggleVisible();
-}
-
-void DialogsProvider::aboutDialog()
-{
-    AboutDialog::getInstance( p_intf )->toggleVisible();
-}
-
-void DialogsProvider::menuAction( QObject *data )
-{
-    QVLCMenu::DoAction( p_intf, data );
-}
-
-void DialogsProvider::menuUpdateAction( QObject *data )
-{
-    MenuFunc * f = qobject_cast<MenuFunc *>(data);
-    f->doFunc( p_intf );
-}
-
-void DialogsProvider::SDMenuAction( QString data )
-{
-    char *psz_sd = data.toUtf8().data();
-    if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
-        playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
-    else
-        playlist_ServicesDiscoveryRemove( THEPL, psz_sd );
-}
-
-
-void DialogsProvider::simplePLAppendDialog()
-{
-    QStringList files = showSimpleOpen();
-    QString file;
-    foreach( file, files )
-    {
-        const char * psz_utf8 = qtu( file );
-        playlist_Add( THEPL, psz_utf8, NULL,
-                PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END, VLC_TRUE );
-    }
-}
-
-void DialogsProvider::simpleMLAppendDialog()
-{
-    QStringList files = showSimpleOpen();
-    QString file;
-    foreach( file, files )
-    {
-        const char * psz_utf8 =  qtu( file );
-        playlist_Add( THEPL, psz_utf8, psz_utf8,
-                      PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END,
-                      VLC_TRUE);
-    }
-}
-
-void DialogsProvider::simpleOpenDialog()
-{
-    QStringList files = showSimpleOpen();
-    QString file;
-    for( size_t i = 0 ; i< files.size(); i++ )
-    {
-        const char * psz_utf8 = qtu( files[i] );
-        /* Play the first one, parse and enqueue the other ones */
-        playlist_Add( THEPL, psz_utf8, NULL,
-                      PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
-                      ( i ? PLAYLIST_PREPARSE : 0 ),
-                      PLAYLIST_END, VLC_TRUE );
-    }
-}
-
-void DialogsProvider::openPlaylist()
-{
-    QStringList files = showSimpleOpen();
-    QString file;
-    for( size_t i = 0 ; i< files.size(); i++ )
-    {
-        const char * psz_utf8 = qtu( files[i] );
-        playlist_Import( THEPL, psz_utf8 );
-    }
-}
-
-void DialogsProvider::openDirectory()
-{
-    QString dir = QFileDialog::getExistingDirectory ( 0,
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-    input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
-                                               0, NULL, -1 );
-    playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE);
-    input_Read( THEPL, p_input, VLC_FALSE );
-}
-void DialogsProvider::openMLDirectory()
-{
-    QString dir = QFileDialog::getExistingDirectory ( 0,
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-    input_item_t *p_input = input_ItemNewExt( THEPL, psz_utf8, NULL,
-                                               0, NULL, -1 );
-    playlist_AddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END,
-                        VLC_FALSE );
-    input_Read( THEPL, p_input, VLC_FALSE );
-}
-
-QStringList DialogsProvider::showSimpleOpen()
-{
-    QString FileTypes;
-    FileTypes = _("Media Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_MEDIA;
-    FileTypes += ");;";
-    FileTypes += _("Video Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_VIDEO;
-    FileTypes += ");;";
-    FileTypes += _("Sound Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_AUDIO;
-    FileTypes += ");;";
-    FileTypes += _("PlayList Files");
-    FileTypes += " ( ";
-    FileTypes += EXTENSIONS_PLAYLIST;
-    FileTypes += ");;";
-    FileTypes += _("All Files");
-    FileTypes += " (*.*)";
-    FileTypes.replace(QString(";*"), QString(" *"));
-    return QFileDialog::getOpenFileNames( NULL, qfu(I_POP_SEL_FILES ),
-                    p_intf->p_libvlc->psz_homedir, FileTypes );
-}
-
-void DialogsProvider::switchToSkins()
-{
@@ -339 +393 @@
-}
-
-void DialogsProvider::bookmarksDialog()
-{
-}
-
-void DialogsProvider::popupMenu( int i_dialog )
-{
-
-
+

modules/gui/qt4/dialogs_provider.hpp

@@ -71 +71 @@
-    static DialogsProvider *instance;
-    QStringList showSimpleOpen();
+    void addFromSimple( bool, bool );
-
-public slots:
-    void playlistDialog();
-    void bookmarksDialog();
-M
+m
-    void prefsDialog();
-    void extendedDialog();
@@ -93 +94 @@
-    void streamingDialog();
-    void openPlaylist();
-
-
+
+
+
-    void quit();
-    void switchToSkins();

modules/gui/qt4/menus.cpp

@@ -28 +28 @@
-#include <QSignalMapper>
-
+#include <vlc_intf_strings.h>
+
-#include "main_interface.hpp"
-
-#include "menus.hpp"
-#include "dialogs_provider.hpp"
@@ -156 +157 @@
-    menu->addSeparator();
-
- "Open playlist file"
-//    DP_SADD( qtr( "Save playlist to file" 
+I_PL_LOAD
+    DP_SADD( qtr(I_PL_SAVE
-    menu->addSeparator();
-    menu->addAction( qtr("Undock from interface"), mi,
@@ -176 +177 @@
-        menu->addSeparator();
-    }
-
-
-
-
+
+
+
-    if( mi )
-    {
@@ -291 +291 @@
-{
-    QMenu *menu = new QMenu();
- "Additional sources" 
+I_PL_SD
-    vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
-                                        FIND_ANYWHERE );
@@ -332 +332 @@
-    DP_SADD( qtr("Help") , "", "", helpDialog() );
-                menu->addSeparator();
-"About VLC media player..."
+I_MENU_ABOUT
-    return menu;
-}

modules/misc/playlist/m3u.c

@@ -43 +43 @@
- * Export_M3U: main export function
- *****************************************************************************/
-
+
+
-{
-    playlist_t *p_playlist = (playlist_t*)p_this;
-    playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
-    int i, j;
-
-    msg_Dbg(p_playlist, "saving using M3U format");
-
-    /* Write header */
-    fprintf( p_export->p_file, "#EXTM3U\n" );
-
-    /* Go through the playlist and add items */
-export->p_
+
-    {
-export->p_
+
-        if( p_current->i_flags & PLAYLIST_SAVE_FLAG )
-            continue;
+
+        if( p_current->i_children >= 0 )
+        {
+            DoChildren( p_playlist, p_export, p_current );
+            continue;
+        }
+
+        assert( p_current->p_input->psz_uri );
-
-        /* General info */
@@ -100 +102 @@
-                 p_current->p_input->psz_uri );
-    }
+}
+
+int Export_M3U( vlc_object_t *p_this )
+{
+    playlist_t *p_playlist = (playlist_t*)p_this;
+    playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
+
+    msg_Dbg(p_playlist, "saving using M3U format");
+
+    /* Write header */
+    fprintf( p_export->p_file, "#EXTM3U\n" );
+
+    DoChildren( p_playlist, p_export, p_export->p_root );
-    return VLC_SUCCESS;
-}
+