Qt: allow clearing of global keys

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index fa697f3f5413ad5d541c014a1946b15977f6f666..8d4dbf68fa6463bec3bda4603a3a8e9d92cd2029 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1191,12 +1191,13 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
     table->headerItem()->setText( 1, qtr( "Hotkey" ) );
     table->headerItem()->setText( 2, qtr( "Global" ) );
     table->setAlternatingRowColors( true );
+    table->setSelectionBehavior( QAbstractItemView::SelectItems );
 
     shortcutValue = new KeyShortcutEdit;
     shortcutValue->setReadOnly(true);
 
     QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
-    QPushButton *setButton = new QPushButton( qtr( "Set" ) );
+    QPushButton *setButton = new QPushButton( qtr( "Apply" ) );
     setButton->setDefault( true );
     finish();
 
@@ -1284,6 +1285,8 @@ void KeySelectorControl::finish()
 
     CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
              this, selectKey( QTreeWidgetItem *, int ) );
+    CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
+             this, select( QTreeWidgetItem *, int) );
     CONNECT( table, itemSelectionChanged(),
              this, select1Key() );
 
@@ -1301,6 +1304,11 @@ void KeySelectorControl::filter( const QString &qs_search )
     }
 }
 
+void KeySelectorControl::select( QTreeWidgetItem *keyItem, int column )
+{
+    shortcutValue->setGlobal( column == 2 );
+}
+
 /* Show the key selected from the table in the keySelector */
 void KeySelectorControl::select1Key()
 {