Fix playtree deletion

Should support deletion through the delete key. But the delete key is not recognized par X11 skins2.

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index a256c1f1fb482b8333fb00ce527260b3b4bf4f7a..4e4ef855ecfe9d00555177b62fb0ca2368a36e61 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -216,6 +216,12 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         int key = ((EvtKey&)rEvent).getKey();
         VarTree::Iterator it;
         bool previousWasSelected = false;
+
+        /* Delete the selection */
+        if( key == KEY_DELETE )
+        {
+            m_rTree.delSelected();
+        }
         for( it = m_rTree.begin(); it != m_rTree.end();
              it = m_rTree.getNextVisibleItem( it ) )
         {

diff --git a/share/skins2/playtree/theme.xml b/share/skins2/playtree/theme.xml
index 3ca89f62383e2ca7d783ab0c8e9371e0c8641026..cfbc6dc33a3c102a38f3f4f08ff3655226696324 100644 (file)
--- a/share/skins2/playtree/theme.xml
+++ b/share/skins2/playtree/theme.xml
@@ -121,8 +121,8 @@
       <Image image="resize" x="392" y="232" lefttop="rightbottom" rightbottom="rightbottom" action="resizeSE"/>
 
       <Button x="374" y="12" lefttop="righttop" rightbottom="righttop" up="add_item" down="add_item_onclick" over="add_item" action="playlist.add()" tooltiptext="Add item"/>
-      <Button x="374" y="40" up="delete_item" lefttop="righttop" rightbottom="righttop" down="delete_item_onclick" over="delete_item" action="playlist.del()" tooltiptext="Del item"/>
-      <Button x="374" y="68" up="sort_button" lefttop="righttop" rightbottom="righttop" down="sort_button_onclick" over="sort_button" action="playlist.sort()" tooltiptext="Sort the playlist"/>
+      <Button x="374" y="40" up="delete_item" lefttop="righttop" rightbottom="righttop" down="delete_item_onclick" over="delete_item" action="playtree.del()" tooltiptext="Del item"/>
+      <Button x="374" y="68" up="sort_button" lefttop="righttop" rightbottom="righttop" down="sort_button_onclick" over="sort_button" action="playtree.sort()" tooltiptext="Sort the playlist"/>
   <!-- <Checkbox x="374" y="96" up1="vout_button" lefttop="righttop" rightbottom="righttop" down1="vout_button_onclick" up2="vout_button2" down2="vout_button_onclick2" state="vout_window.isVisible" action1="vout_window.show()" action2="vout_window.hide()" tooltiptext1="Show Video Window" tooltiptext2="Hide Video Window"/> -->
       <Playtree id="playlist" x="17" y="15" width="333" height="204" lefttop="lefttop" rightbottom="rightbottom" font="playlist_font" fgcolor="#000000" playcolor="#ff0000" bgcolor1="#ffffff" bgcolor2="#e0e0ff" selcolor="#4e8bc7" openimage="open_triangle" closedimage="closed_triangle">
         <Slider id="playlist_slider" x="358" y="25" lefttop="righttop" rightbottom="rightbottom" up="slider_volume" down="slider_volume_onclick" points="(0,185),(0,0)"/>