Add missing actions in popup

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 226ce79ba549aef4a56a3413cc01d8c4e5d44a4c..934b03b57b9f5c9248300439c5df1679aa7e6256 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -34,9 +34,11 @@
 #define I_POP_PLAY N_("Play")
 #define I_POP_PREPARSE N_("Fetch information")
 #define I_POP_DEL N_("Delete")
-#define I_POP_INFO N_("Information")
+#define I_POP_INFO N_("Information...")
 #define I_POP_SORT N_("Sort")
 #define I_POP_ADD N_("Add node")
+#define I_POP_STREAM N_("Stream...")
+#define I_POP_SAVE N_("Save...")
 
 /*************** Preferences *************/
 

diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp
index 3223b17f2cc906d8d746c9a44f44c3bbf1226d83..eb050dbacedf569e9dd62f8b8fd7f8ca258497df 100644 (file)
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/playlist_model.cpp
@@ -694,8 +694,11 @@ void PLModel::popup( QModelIndex & index, QPoint &point, QModelIndexList list )
         current_selection = list;
         QMenu *menu = new QMenu;
         menu->addAction( qfu(I_POP_PLAY), this, SLOT( popupPlay() ) );
-        menu->addAction( qfu(I_POP_PREPARSE), this, SLOT( popupPreparse() ) );
         menu->addAction( qfu(I_POP_DEL), this, SLOT( popupDel() ) );
+        menu->addSeparator();
+        menu->addAction( qfu(I_POP_STREAM), this, SLOT( popupStream() ) );
+        menu->addAction( qfu(I_POP_SAVE), this, SLOT( popupSave() ) );
+        menu->addSeparator();
         menu->addAction( qfu(I_POP_INFO), this, SLOT( popupInfo() ) );
         if( p_item->i_children > -1 )
         {
@@ -721,6 +724,20 @@ void PLModel::popupPlay()
     PL_UNLOCK;
 }
 
+void PLModel::popupInfo()
+{
+    fprintf( stderr, "Popup Info is NOT implemented\n" );
+}
+
+void PLModel::popupStream()
+{
+    fprintf( stderr, "Stream not implemented\n" );
+}
+void PLModel::popupSave()
+{
+    fprintf( stderr, "Save not implemented\n" );
+}
+
 /**********************************************************************
  * Playlist callbacks
  **********************************************************************/

diff --git a/modules/gui/qt4/playlist_model.hpp b/modules/gui/qt4/playlist_model.hpp
index bb7b0bf45af9eb24ef690e08387a46a054501982..38efe739706d5ef1200403427b69dc944870210c 100644 (file)
--- a/modules/gui/qt4/playlist_model.hpp
+++ b/modules/gui/qt4/playlist_model.hpp
@@ -168,6 +168,9 @@ public slots:
 private slots:
     void popupPlay();
     void popupDel();
+    void popupInfo();
+    void popupStream();
+    void popupSave();
 friend class PLItem;
 };
 

diff --git a/modules/misc/profile_parser.c b/modules/misc/profile_parser.c
index bb23a5ab516fced743d767ddfa4909fe5107d334..c1d2265a46b46620b8180b408e7c1df3ec049eeb 100644 (file)
--- a/modules/misc/profile_parser.c
+++ b/modules/misc/profile_parser.c
@@ -55,7 +55,6 @@ static int Open( vlc_object_t *p_this )
     if( !p_xml ) return VLC_EGENERIC;
     p_reader = xml_ReaderCreate( p_xml, p_stream );
 
-
     if( xml_ReaderRead( p_reader ) != 1 || 
         xml_ReaderNodeType( p_reader ) != XML_READER_STARTELEM )
     {

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 22b676ef805c4fc32711ca2b1f13c6a72ac78e16..395ecebf8a296cca63045f5eb0bdab164e10a3fe 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -272,6 +272,7 @@ int __intf_Progress( vlc_object_t *p_this, const char *psz_title,
     p_new->psz_description = strdup( psz_status );
     p_new->val.f_float = f_pos;
     p_new->i_timeToGo = i_time;
+    p_new->psz_alternate_button = strdup( _("Cancel" ) );
 
     if( psz_title )
     {