From: Jean-Philippe Andre <jpeg@via.ecp.fr>
Date: Wed, 13 Aug 2008 23:35:52 +0000 (-0400)
Subject: Qt menus: show 'Select skin' in the skins2 popup menu
X-Git-Tag: 0.9.0~343
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e3e58c86234bc077d20340d36074b0b979b4e097;p=vlc

Qt menus: show 'Select skin' in the skins2 popup menu

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 4a6d0e5289..7b0e0c6d8d 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -850,6 +850,25 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
                 action->setCheckable( true );
                 action->setChecked( mi->isFullScreen() );
             }
+            else /* We are using the skins interface.
+                    If not, this entry will not show. */
+            {
+                objects.clear();
+                varnames.clear();
+                vlc_object_t *p_object = ( vlc_object_t* )
+                     vlc_object_find( p_intf, VLC_OBJECT_INTF, FIND_PARENT );
+                if( p_object )
+                {
+                    objects.push_back( p_object->i_object_id );
+                    varnames.push_back( "intf-skins" );
+                    Populate( p_intf, submenu, varnames, objects );
+                    vlc_object_release( p_object );
+                }
+                else
+                {
+                    msg_Dbg( p_intf, "could not find parent interface" );
+                }
+            }
             menu->addMenu( submenu );
         }