Commit f437e6eb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Hotkeys, correct some unicode problem and change the default behaviour.

parent d8fd7df3
......@@ -423,7 +423,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
controlLayout->setColumnStretch( 7 , 2 );
/*
* Other first Line buttons
* Might need to be inside a frame to avoid a few resizing pb
......@@ -449,7 +449,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
controlLayout->addWidget( extSettingsButton, 3, 12 );
controlLayout->setColumnStretch( 14, 5 );
/* Volume */
VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
......
......@@ -1130,13 +1130,14 @@ KeyInputDialog::KeyInputDialog( QList<module_config_t*>& _values,
l->addWidget( selected , Qt::AlignCenter );
l->addWidget( warning, Qt::AlignCenter );
QDialogButtonBox *buttonBox = new QDialogButtonBox;
buttonBox = new QDialogButtonBox;
QPushButton *ok = new QPushButton( qtr("OK") );
QPushButton *cancel = new QPushButton( qtr("Cancel") );
buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );
l->addWidget( buttonBox );
buttonBox->hide();
CONNECT( buttonBox, accepted(), this, accept() );
CONNECT( buttonBox, rejected(), this, reject() );
......@@ -1146,6 +1147,7 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
{
conflicts = false;
module_config_t *p_current = NULL;
/* Search for conflicts */
foreach( p_current, values )
{
if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
......@@ -1155,13 +1157,15 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
break;
}
}
if( conflicts )
{
warning->setText(
qtr("Warning: the key is already assigned to \"") +
QString( p_current->psz_text ) + "\"" );
qfu( p_current->psz_text ) + "\"" );
buttonBox->hide();
}
else warning->setText( "" );
else accept();
}
void KeyInputDialog::keyPressEvent( QKeyEvent *e )
......
......@@ -50,6 +50,7 @@ class QTreeWidget;
class QTreeWidgetItem;
class QGroupBox;
class QGridLayout;
class QDialogButtonBox;
class ConfigControl : public QObject
{
......@@ -423,6 +424,7 @@ private:
QLabel *warning;
const char * keyToChange;
QList<module_config_t*> values;
QDialogButtonBox *buttonBox;
};
class KeyShortcutEdit: public QLineEdit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment