/*****************************************************************************
- * ToolbarEdit.cpp : ToolbarEdit and About dialogs
+ * ToolbarEdit.cpp : ToolbarEdit dialog
****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008-2009 the VideoLAN team
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
#include <QLabel>
#include <QComboBox>
#include <QListWidget>
+#include <QSpinBox>
#include <QDragEnterEvent>
#include <QDialogButtonBox>
#include <QInputDialog>
-ToolbarEditDialog *ToolbarEditDialog::instance = NULL;
+#include <assert.h>
-ToolbarEditDialog::ToolbarEditDialog( intf_thread_t *_p_intf)
- : QVLCFrame( _p_intf )
+ToolbarEditDialog::ToolbarEditDialog( QWidget *_w, intf_thread_t *_p_intf)
+ : QVLCDialog( _w, _p_intf )
{
setWindowTitle( qtr( "Toolbars Editor" ) );
+ setWindowRole( "vlc-toolbars-editor" );
QGridLayout *mainLayout = new QGridLayout( this );
setMinimumWidth( 600 );
+ setAttribute( Qt::WA_DeleteOnClose );
/* main GroupBox */
QGroupBox *widgetBox = new QGroupBox( qtr( "Toolbar Elements") , this );
boxLayout->addWidget( styleLabel, 1, 0 );
boxLayout->addWidget( flatBox, 1, 1 );
boxLayout->addWidget( bigBox, 1, 2 );
- boxLayout->addWidget( shinyBox, 1, 3 );
- mainLayout->addWidget( widgetBox, 0, 0, 1, -1 );
+ boxLayout->addWidget( shinyBox, 2, 1 );
+ mainLayout->addWidget( widgetBox, 0, 0, 5, 1 );
/* Main ToolBar */
getSettings()->value( "MainWindow/ToolbarPos", 0 ).toInt() ) );
mainTboxLayout->addWidget( positionCombo, 0, 2, 1, 1 );
- QLabel *line1Label = new QLabel( "Line 1:" );
+ QLabel *line1Label = new QLabel( qtr("Line 1:") );
QString line1 = getSettings()->value( "MainWindow/MainToolbar1",
MAIN_TB1_DEFAULT ).toString();
controller1 = new DroppingController( p_intf, line1,
mainTboxLayout->addWidget( line1Label, 1, 0, 1, 1 );
mainTboxLayout->addWidget( controller1, 1, 1, 1, 2 );
- QLabel *line2Label = new QLabel( "Line 2:" );
+ QLabel *line2Label = new QLabel( qtr("Line 2:") );
QString line2 = getSettings()->value( "MainWindow/MainToolbar2",
MAIN_TB2_DEFAULT ).toString();
controller2 = new DroppingController( p_intf, line2,
mainTboxLayout->addWidget( advLabel, 3, 0, 1, 2 );
mainTboxLayout->addWidget( controllerA, 3, 2, 1, 1 );
- mainLayout->addWidget( mainToolbarBox, 1, 0, 1, -1 );
+ mainLayout->addWidget( mainToolbarBox, 0, 1, 1, -1 );
/* TimeToolBar */
QGroupBox *timeToolbarBox = new QGroupBox( qtr( "Time Toolbar" ) , this );
this );
timeTboxLayout->addWidget( controller, 0, 0, 1, -1 );
- mainLayout->addWidget( timeToolbarBox, 2, 0, 1, -1 );
+ mainLayout->addWidget( timeToolbarBox, 1, 1, 1, -1 );
/* FSCToolBar */
QGroupBox *FSCToolbarBox = new QGroupBox( qtr( "Fullscreen Controller" ),
lineFSC, this );
FSCTboxLayout->addWidget( controllerFSC, 0, 0, 1, -1 );
- mainLayout->addWidget( FSCToolbarBox, 3, 0, 1, -1 );
+ mainLayout->addWidget( FSCToolbarBox, 2, 1, 1, -1 );
/* Profile */
QGroupBox *profileBox = new QGroupBox( qtr( "Profile" ), this );
QToolButton *newButton = new QToolButton;
newButton->setIcon( QIcon( ":/new" ) );
QToolButton *deleteButton = new QToolButton;
- deleteButton->setIcon( QIcon( ":/clear" ) );
+ deleteButton->setIcon( QIcon( ":/toolbar/clear" ) );
deleteButton->setToolTip( qtr( "Delete the current profile" ) );
profileBoxLayout->addWidget( profileLabel, 0, 0 );
profileBoxLayout->addWidget( newButton, 0, 2 );
profileBoxLayout->addWidget( deleteButton, 0, 3 );
- mainLayout->addWidget( profileBox, 4, 0, 1, -1 );
+ mainLayout->addWidget( profileBox, 3, 1, 1, -1 );
/* Fill combos */
int i_size = getSettings()->beginReadArray( "ToolbarProfiles" );
profileCombo->addItem( PROFILE_NAME_2, QString( VALUE_2 ) );
profileCombo->addItem( PROFILE_NAME_3, QString( VALUE_3 ) );
profileCombo->addItem( PROFILE_NAME_4, QString( VALUE_4 ) );
+ profileCombo->addItem( PROFILE_NAME_5, QString( VALUE_5 ) );
}
profileCombo->setCurrentIndex( -1 );
void ToolbarEditDialog::close()
{
msg_Dbg( p_intf, "Close and save" );
- hide();
getSettings()->setValue( "MainWindow/ToolbarPos",
positionCombo->itemData( positionCombo->currentIndex() ).toInt() );
getSettings()->setValue( "MainWindow/MainToolbar1", controller1->getValue() );
getSettings()->setValue( "MainWindow/AdvToolbar", controllerA->getValue() );
getSettings()->setValue( "MainWindow/InputToolbar", controller->getValue() );
getSettings()->setValue( "MainWindow/FSCtoolbar", controllerFSC->getValue() );
+ getSettings()->sync();
+ accept();
}
void ToolbarEditDialog::cancel()
{
- hide();
+ reject();
}
/************************************************
setViewMode( QListView::IconMode );
setSpacing( 20 );
setDragEnabled( true );
- setMinimumHeight( 250 );
/* All the buttons do not need a special rendering */
for( int i = 0; i < BUTTON_MAX; i++ )
{
QListWidgetItem *widgetItem = new QListWidgetItem( this );
- widgetItem->setText( nameL[i] );
+ widgetItem->setText( qtr( nameL[i] ) );
widgetItem->setIcon( QIcon( iconL[i] ) );
widgetItem->setData( Qt::UserRole, QVariant( i ) );
addItem( widgetItem );
}
/* Spacers are yet again a different thing */
- QListWidgetItem *widgetItem = new QListWidgetItem( QIcon( ":/space" ),
+ QListWidgetItem *widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space" ),
qtr( "Spacer" ), this );
widgetItem->setData( Qt::UserRole, WIDGET_SPACER );
addItem( widgetItem );
- widgetItem = new QListWidgetItem( QIcon( ":/space" ),
+ widgetItem = new QListWidgetItem( QIcon( ":/toolbar/space" ),
qtr( "Expanding Spacer" ), this );
widgetItem->setData( Qt::UserRole, WIDGET_SPACER_EXTEND );
addItem( widgetItem );
case VOLUME_SPECIAL:
{
QListWidgetItem *widgetItem = new QListWidgetItem( this );
- widgetItem->setText( "Small Volume" );
- widgetItem->setIcon( QIcon( ":/volume-medium" ) );
+ widgetItem->setText( qtr("Small Volume") );
+ widgetItem->setIcon( QIcon( ":/toolbar/volume-medium" ) );
widgetItem->setData( Qt::UserRole, QVariant( i ) );
addItem( widgetItem );
}
discLayout->setSpacing( 0 ); discLayout->setMargin( 0 );
QToolButton *prevSectionButton = new QToolButton( discFrame );
- prevSectionButton->setIcon( QIcon( ":/dvd_prev" ) );
+ prevSectionButton->setIcon( QIcon( ":/toolbar/dvd_prev" ) );
discLayout->addWidget( prevSectionButton );
QToolButton *menuButton = new QToolButton( discFrame );
- menuButton->setIcon( QIcon( ":/dvd_menu" ) );
+ menuButton->setIcon( QIcon( ":/toolbar/dvd_menu" ) );
discLayout->addWidget( menuButton );
QToolButton *nextButton = new QToolButton( discFrame );
- nextButton->setIcon( QIcon( ":/dvd_next" ) );
+ nextButton->setIcon( QIcon( ":/toolbar/dvd_next" ) );
discLayout->addWidget( nextButton );
widget = discFrame;
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
QToolButton *telexOn = new QToolButton( telexFrame );
- telexOn->setIcon( QIcon( ":/tv" ) );
+ telexOn->setIcon( QIcon( ":/toolbar/tv" ) );
telexLayout->addWidget( telexOn );
QToolButton *telexTransparent = new QToolButton;
- telexOn->setIcon( QIcon( ":/tvtelx" ) );
+ telexOn->setIcon( QIcon( ":/toolbar/tvtelx" ) );
telexLayout->addWidget( telexTransparent );
QSpinBox *telexPage = new QSpinBox;
* to propagate there too
*/
DroppingController::DroppingController( intf_thread_t *_p_intf,
- QString line,
+ const QString& line,
QWidget *_parent )
: AbstractController( _p_intf, _parent )
{
parseAndCreate( line, controlLayout );
}
-void DroppingController::resetLine( QString line )
+void DroppingController::resetLine( const QString& line )
{
hide();
QLayoutItem *child;
- int i =0;
while( (child = controlLayout->takeAt( 0 ) ) != 0 )
{
child->widget()->hide();
buttonType_e i_type,
int i_option )
{
+ doubleInt *value = new doubleInt;
+ value->i_type = i_type;
+ value->i_option = i_option;
+
/* Special case for SPACERS, who aren't QWidgets */
if( i_type == WIDGET_SPACER || i_type == WIDGET_SPACER_EXTEND )
{
- QLabel *label = new QLabel;
- label->setPixmap( QPixmap( ":/space" ) );
+ QLabel *label = new QLabel( this );
+ label->setPixmap( QPixmap( ":/toolbar/space" ) );
if( i_type == WIDGET_SPACER_EXTEND )
{
label->setSizePolicy( QSizePolicy::MinimumExpanding,
if( !widg ) return;
/* Install the Event Filter in order to catch the drag */
+ widg->setParent( this );
widg->installEventFilter( this );
/* We are in a complex widget, we need to stop events on children too */
foreach( child, children )
{
QWidget *childWidg;
- if( childWidg = qobject_cast<QWidget *>( child ) )
+ if( ( childWidg = qobject_cast<QWidget *>( child ) ) )
{
child->installEventFilter( this );
childWidg->setEnabled( true );
/* QList and QBoxLayout don't act the same with insert() */
if( i_index < 0 ) i_index = controlLayout->count() - 1;
- /* Insert in the value listing */
- doubleInt *value = new doubleInt;
- value->i_type = i_type;
- value->i_option = i_option;
widgetList.insert( i_index, value );
}
QPoint origin = mapToGlobal ( point );
QWidget *tempWidg = QApplication::widgetAt( origin );
+ if( tempWidg == NULL )
+ return -1;
- int i = -1;
- if( tempWidg != NULL)
+ int i = controlLayout->indexOf( tempWidg );
+ if( i == -1 )
{
- i = controlLayout->indexOf( tempWidg );
- if( i == -1 )
- {
- i = controlLayout->indexOf( tempWidg->parentWidget() );
- tempWidg = tempWidg->parentWidget();
- }
+ i = controlLayout->indexOf( tempWidg->parentWidget() );
+ tempWidg = tempWidg->parentWidget();
}
/* Return the nearest position */
{
int i = getParentPosInLayout( event->pos() );
+ /* Workaround: do not let the item move to its current
+ position + 1 as it breaks the widgetList */
+ if ( i - 1 == i_dragIndex )
+ --i;
+
QByteArray data = event->mimeData()->data( "vlc/button-bar" );
QDataStream dataStream(&data, QIODevice::ReadOnly);
}
if( i == -1 ) return true;
+ i_dragIndex = i;
+
doubleInt *dI = widgetList.at( i );
int i_type = dI->i_type;
QDrag *drag = new QDrag( widg );
drag->setMimeData( mimeData );
+ /* Remove before the drag to not mess DropEvent,
+ that will createAndAddWidget */
+ widgetList.removeAt( i );
+
/* Start the effective drag */
drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::MoveAction);
-
- widgetList.removeAt( i );
- controlLayout->removeWidget( widg );
widg->hide();
+ controlLayout->removeWidget( widg );
b_draging = false;
}
return true;
projects / vlc / blobdiff