Changeset 3e8d0beb2925c3b2cf6eaa1a45186d5094c40569

Timestamp:

11/06/07 00:01:15 (10 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1194303675 +0000

git-parent:

[d5107810595354bd93f6bf65713c039d1bc7cb8b]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1194303675 +0000

Message:

Qt4 - Improve the hotkeys preferences.

Files:

• modules/gui/qt4/components/preferences_widgets.cpp (modified) (7 diffs)
• modules/gui/qt4/components/preferences_widgets.hpp (modified) (3 diffs)

modules/gui/qt4/components/preferences_widgets.cpp

@@ -979 +979 @@
-    QWidget *keyContainer = new QWidget;
-    QGridLayout *gLayout = new QGridLayout( keyContainer );
+
+    label = new QLabel(
+            qtr( "Select an action to change the associated hotkey") );
-    
-label = new QLabel( qtr("Select an action to change the associated hotkey") );
+/* Deactivated for now
-    QLabel *searchLabel = new QLabel( qtr( "Search" ) );
+    QLineEdit *actionSearch = new QLineEdit;*/
-    
-    table = new QTreeWidget;
@@ -987 +991 @@
-    table->headerItem()->setText( 0, qtr( "Action" ) );
-    table->headerItem()->setText( 1, qtr( "Shortcut" ) );
-
-QLineEdit *shortcutValue = new QLine
+
+shortcutValue = new KeyShortcut
-    shortcutValue->setReadOnly(true);
-
-
+
-    QPushButton *clearButton = new QPushButton( qtr( "Clear" ) );
-    QPushButton *setButton = new QPushButton( qtr( "Set" ) );
-    finish();
-
+
-    gLayout->addWidget( label, 0, 0, 1, 4 );
+  /* deactivated for now
-    gLayout->addWidget( searchLabel, 1, 0, 1, 2 );
-
+*/
-    gLayout->addWidget( table, 2, 0, 1, 4 );
-    gLayout->addWidget( clearButton, 3, 0, 1, 1 );
-    gLayout->addWidget( shortcutValue, 3, 1, 1, 2 ); 
-    gLayout->addWidget( setButton, 3, 3, 1, 1 );
-
+
-    if( !l ) /* This shouldn't happen */
-    {
@@ -1014 +1018 @@
-        l->addWidget( keyContainer, 0, 0, 1, 2 );
-    }
+    CONNECT( clearButton, clicked(), shortcutValue, clear() );
+    BUTTONACT( setButton, setTheKey() );
-}
-
@@ -1046 +1052 @@
-    table->resizeColumnToContents( 0 );
-
+    CONNECT( table, itemClicked( QTreeWidgetItem *, int ),
+             this, select1Key( QTreeWidgetItem * ) );
-    CONNECT( table, itemDoubleClicked( QTreeWidgetItem *, int ),
-             this, selectKey( QTreeWidgetItem * ) );
+    CONNECT( shortcutValue, pressed(), this, selectKey() );
+}
+
+void KeySelectorControl::select1Key( QTreeWidgetItem *keyItem )
+{
+    shortcutValue->setText( keyItem->text( 1 ) );
-}
-
-void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
-{
-
+
+
+
+
+
+
+
+
-                          (keyItem->data( 0, Qt::UserRole ).value<void*>());
-
-
+, widget
-    d->exec();
-    if( d->result() == QDialog::Accepted )
@@ -1069 +1090 @@
-                if( p_keyItem != p_item && p_item->value.i == d->keyValue )
-                    p_item->value.i = 0;
-it->setText( 1,
+shortcutValue->setText(
-            }
-        }
-        else
-keyItem->setText( 1,
+shortcutValue->setText(
-    }
-    delete d;
-}
-
+void KeySelectorControl::setTheKey()
+{
+    table->currentItem()->setText( 1, shortcutValue->text() );
+}
+
-void KeySelectorControl::doApply()
-{
@@ -1087 +1113 @@
-
-KeyInputDialog::KeyInputDialog( QList<module_config_t*>& _values,
-
-
+
+
+
-{
-    setModal( true );
@@ -1152 +1179 @@
-    keyValue = i_vlck;
-}
+
+void KeyShortcutEdit::mousePressEvent( QMouseEvent *)
+{
+    emit pressed();
+}

modules/gui/qt4/components/preferences_widgets.hpp

@@ -413 +413 @@
-{
-public:
-
+, QWidget *
-    int keyValue;
-    bool conflicts;
@@ -426 +426 @@
-};
-
+class KeyShortcutEdit: public QLineEdit
+{
+    Q_OBJECT
+private:
+    virtual void mousePressEvent( QMouseEvent *event );
+signals:
+    void pressed();
+};
+
-class KeySelectorControl : public ConfigControl
-{
@@ -441 +450 @@
-    QLabel *label;
-    QTreeWidget *table;
+    KeyShortcutEdit *shortcutValue;
-    QList<module_config_t *> values;
+    //QWidget *parent;
-private slots:
-
+
+
+
-};
-