X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fskins2%2Fsrc%2Fdialogs.hpp;h=0e3cebfa12670e3181456d490873279f6c14a1e6;hb=20431e3be581bf2a513f223bc98c93619bb623c9;hp=4976ec155325600b6ae792208cfa39b687fcddba;hpb=adc858d87a4a45299f8d5ccfce2fe94466c6db59;p=vlc

diff --git a/modules/gui/skins2/src/dialogs.hpp b/modules/gui/skins2/src/dialogs.hpp
index 4976ec1553..0e3cebfa12 100644
--- a/modules/gui/skins2/src/dialogs.hpp
+++ b/modules/gui/skins2/src/dialogs.hpp
@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef DIALOGS_HPP
@@ -33,103 +33,106 @@ struct interaction_dialog_t ;
 // Dialogs provider
 class Dialogs: public SkinObject
 {
-    public:
-        /// Get the instance of Dialogs (or NULL if initialization failed)
-        static Dialogs *instance( intf_thread_t *pIntf );
+public:
+    /// Get the instance of Dialogs (or NULL if initialization failed)
+    static Dialogs *instance( intf_thread_t *pIntf );
 
-        /// Delete the instance of Dialogs
-        static void destroy( intf_thread_t *pIntf );
+    /// Delete the instance of Dialogs
+    static void destroy( intf_thread_t *pIntf );
 
-        /// Show the Change Skin dialog
-        void showChangeSkin();
+    /// Show the Change Skin dialog
+    void showChangeSkin();
 
-        /// Show the Load Playlist dialog
-        void showPlaylistLoad();
+    /// Show the Load Playlist dialog
+    void showPlaylistLoad();
 
-        /// Show the Save Playlist dialog
-        void showPlaylistSave();
+    /// Show the Save Playlist dialog
+    void showPlaylistSave();
 
-        /** Show the Quick Open File dialog.
-         *  If play is false, just add the item in the playlist
-         */
-        void showFileSimple( bool play );
+    /** Show the Quick Open File dialog.
+     *  If play is false, just add the item in the playlist
+     */
+    void showFileSimple( bool play );
 
-        /** Show the Open File dialog
-         *  If play is false, just add the item in the playlist
-         */
-        void showFile( bool play );
+    /** Show the Open File dialog
+     *  If play is false, just add the item in the playlist
+     */
+    void showFile( bool play );
 
-        /** Show the Open Directory dialog
-         *  If play is false, just add the item in the playlist
-         */
-        void showDirectory( bool play );
+    /** Show the Open Directory dialog
+     *  If play is false, just add the item in the playlist
+     */
+    void showDirectory( bool play );
 
-        /** Show the Open Disc dialog
-         *  If play is false, just add the item in the playlist
-         */
-        void showDisc( bool play );
+    /** Show the Open Disc dialog
+     *  If play is false, just add the item in the playlist
+     */
+    void showDisc( bool play );
 
-        /** Show the Open Network Stream dialog
-         *  If play is false, just add the item in the playlist
-         */
-        void showNet( bool play );
+    /** Show the Open Network Stream dialog
+     *  If play is false, just add the item in the playlist
+     */
+    void showNet( bool play );
 
-        /// Show the Messages dialog
-        void showMessages();
+    /// Show the Messages dialog
+    void showMessages();
 
-        /// Show the Preferences dialog
-        void showPrefs();
+    /// Show the Preferences dialog
+    void showPrefs();
 
-        /// Show the FileInfo dialog
-        void showFileInfo();
+    /// Show the FileInfo dialog
+    void showFileInfo();
 
-        /// Show the Streaming Wizard dialog
-        void showStreamingWizard();
+    /// Show the Streaming Wizard dialog
+    void showStreamingWizard();
 
-        /// Show the popup menu
-        void showPopupMenu( bool bShow );
+    /// Show the Playlist
+    void showPlaylist();
 
-        /// Show an interaction dialog
-        void showInteraction( interaction_dialog_t * );
+    /// Show a popup menu
+    void showPopupMenu( bool bShow, int popupType );
 
-    private:
-        // Private because it's a singleton
-        Dialogs( intf_thread_t *pIntf );
-        ~Dialogs();
+    /// Show an interaction dialog
+    void showInteraction( interaction_dialog_t * );
 
-        /// DlgCallback is the type of the callbacks of the open/save dialog
-        typedef void DlgCallback( intf_dialog_args_t *pArg );
+private:
+    // Private because it's a singleton
+    Dialogs( intf_thread_t *pIntf );
+    ~Dialogs();
 
-        /// Possible flags for the open/save dialog
-        enum flags_t
-        {
-            kOPEN     = 0x01,
-            kSAVE     = 0x02,
-            kMULTIPLE = 0x04
-        };
+    /// DlgCallback is the type of the callbacks of the open/save dialog
+    typedef void DlgCallback( intf_dialog_args_t *pArg );
 
-        /// Initialization method
-        bool init();
+    /// Possible flags for the open/save dialog
+    enum flags_t
+    {
+        kOPEN     = 0x01,
+        kSAVE     = 0x02,
+        kMULTIPLE = 0x04
+    };
 
-        /** Show a generic open/save dialog, initialized with the given
-         *  parameters
-         *  The 'flags' parameter is a logical or of the flags_t values
-         */
-        void showFileGeneric( const string &rTitle, const string &rExtensions,
-                              DlgCallback callback, int flags );
+    /// Initialization method
+    bool init();
 
-        /// Callback for the Change Skin dialog
-        static void showChangeSkinCB( intf_dialog_args_t *pArg );
+    /** Show a generic open/save dialog, initialized with the given
+     *  parameters
+     *  The 'flags' parameter is a logical or of the flags_t values
+     */
+    void showFileGeneric( const string &rTitle, const string &rExtensions,
+                          DlgCallback callback, int flags );
 
-        /// Callback for the Load Playlist dialog
-        static void showPlaylistLoadCB( intf_dialog_args_t *pArg );
+    /// Callback for the Change Skin dialog
+    static void showChangeSkinCB( intf_dialog_args_t *pArg );
 
-        /// Callback for the Save Playlist dialog
-        static void showPlaylistSaveCB( intf_dialog_args_t *pArg );
+    /// Callback for the Load Playlist dialog
+    static void showPlaylistLoadCB( intf_dialog_args_t *pArg );
 
-        /// Dialogs provider module
-        intf_thread_t *m_pProvider;
-        module_t *m_pModule;
+    /// Callback for the Save Playlist dialog
+    static void showPlaylistSaveCB( intf_dialog_args_t *pArg );
+
+    /// Dialogs provider module
+    intf_thread_t *m_pProvider;
+    module_t *m_pModule;
 };