X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fvlm.cpp;h=407c02e6fdbdf6922cd7dcdc454fb0ac2af9be6e;hb=2e1e9ce57502b4128d8b96ea14732c45cec7f812;hp=12ad9bf4e4411750dd8266dee0557cd307bea3e4;hpb=d0389324b91b56a96bc6bbcb2c417ca824a892ab;p=vlc diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index 12ad9bf4e4..407c02e6fd 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -32,6 +32,7 @@ #ifdef ENABLE_VLM #include "dialogs/open.hpp" #include "dialogs/sout.hpp" +#include "util/qt_dirs.hpp" #include #include @@ -53,11 +54,8 @@ #include #include -static const char *psz_type[] = { "Broadcast", "Schedule", "VOD" }; -VLMDialog *VLMDialog::instance = NULL; - -VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( parent, _p_intf ) +VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ) { p_vlm = vlm_New( p_intf ); @@ -73,9 +71,9 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa ui.saveButton->hide(); #define ADDMEDIATYPES( str, type ) ui.mediaType->addItem( qtr( str ), QVariant( type ) ); - ADDMEDIATYPES( "Broadcast", QVLM_Broadcast ); - ADDMEDIATYPES( "Schedule", QVLM_Schedule ); - ADDMEDIATYPES( "Video On Demand ( VOD )", QVLM_VOD ); + ADDMEDIATYPES( N_("Broadcast"), QVLM_Broadcast ); + ADDMEDIATYPES( N_("Schedule"), QVLM_Schedule ); + ADDMEDIATYPES( N_("Video On Demand ( VOD )"), QVLM_VOD ); #undef ADDMEDIATYPES /* Schedule Stuffs */ @@ -130,10 +128,10 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding); vlmItemLayout->addItem( spacer ); - QPushButton *importButton = new QPushButton( qtr( "Import" ) ); + QPushButton *importButton = new QPushButton( qtr( "I&mport" ) ); ui.buttonBox->addButton( importButton, QDialogButtonBox::ActionRole ); - QPushButton *exportButton = new QPushButton( qtr( "Export" ) ); + QPushButton *exportButton = new QPushButton( qtr( "E&xport" ) ); ui.buttonBox->addButton( exportButton, QDialogButtonBox::ActionRole ); QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); @@ -158,13 +156,15 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa BUTTONACT( ui.saveButton, saveModifications() ); BUTTONACT( ui.inputButton, selectInput() ); BUTTONACT( ui.outputButton, selectOutput() ); + //readSettings( "VLM", QSize( 700, 500 ) ); } VLMDialog::~VLMDialog() { delete vlmWrapper; - /* FIXME :you have to destroy vlm here to close + //writeSettings( "VLM" ); + /* TODO :you have to destroy vlm here to close * but we shouldn't destroy vlm here in case somebody else wants it */ if( p_vlm ) { @@ -185,7 +185,7 @@ void VLMDialog::selectVLMItem( int i ) ui.vlmItemScroll->ensureWidgetVisible( vlmItems.at( i ) ); } -bool VLMDialog::isNameGenuine( QString name ) +bool VLMDialog::isNameGenuine( const QString& name ) { for( int i = 0; i < vlmItems.size(); i++ ) { @@ -219,6 +219,7 @@ void VLMDialog::addVLMItem() int repeatnum = scherepeatnumber->value(); int repeatdays = repeatDays->value(); VLMAWidget * vlmAwidget; + outputText.remove( ":sout=" ); switch( type ) { @@ -226,22 +227,17 @@ void VLMDialog::addVLMItem() typeShortName = "Bcast"; vlmAwidget = new VLMBroadcast( name, inputText, outputText, b_checked, b_looped, this ); - VLMWrapper::AddBroadcast( name, inputText, outputText, b_checked, - b_looped ); break; case QVLM_VOD: typeShortName = "VOD"; vlmAwidget = new VLMVod( name, inputText, outputText, b_checked, ui.muxLedit->text(), this ); - VLMWrapper::AddVod( name, inputText, outputText, b_checked ); break; case QVLM_Schedule: typeShortName = "Sched"; vlmAwidget = new VLMSchedule( name, inputText, outputText, schetime, schedate, repeatnum, repeatdays, b_checked, this ); - VLMWrapper::AddSchedule( name, inputText, outputText, schetime, - schedate, repeatnum, repeatdays, b_checked); break; default: msg_Warn( p_intf, "Something bad happened" ); @@ -259,13 +255,13 @@ void VLMDialog::addVLMItem() clearWidgets(); } -// FIXME : VOD are not exported to the file +/* TODO : VOD are not exported to the file */ bool VLMDialog::exportVLMConf() { - QString saveVLMConfFileName = QFileDialog::getSaveFileName( - this, qtr( "Choose a filename to save the VLM configuration..." ), - qfu( config_GetHomeDir() ), - qtr( "VLM conf (*.vlm) ;; All (*.*)" ) ); + QString saveVLMConfFileName = QFileDialog::getSaveFileName( this, + qtr( "Save VLM configuration as..." ), + QVLCUserDir( VLC_DOCUMENTS_DIR ), + qtr( "VLM conf (*.vlm);;All (*)" ) ); if( !saveVLMConfFileName.isEmpty() ) { @@ -275,6 +271,7 @@ bool VLMDialog::exportVLMConf() vlm_MessageDelete( message ); return true; } + return false; } @@ -332,10 +329,11 @@ void VLMDialog::mediasPopulator() bool VLMDialog::importVLMConf() { - QString openVLMConfFileName = QFileDialog::getOpenFileName( - this, qtr( "Open a VLM Configuration File" ), - qfu( config_GetHomeDir() ), - qtr( "VLM conf (*.vlm) ;; All (*.*)" ) ); + QString openVLMConfFileName = toNativeSeparators( + QFileDialog::getOpenFileName( + this, qtr( "Open VLM configuration..." ), + QVLCUserDir( VLC_DOCUMENTS_DIR ), + qtr( "VLM conf (*.vlm);;All (*)" ) ) ); if( !openVLMConfFileName.isEmpty() ) { @@ -382,7 +380,7 @@ void VLMDialog::selectInput() void VLMDialog::selectOutput() { - SoutDialog *s = SoutDialog::getInstance( this, p_intf, false ); + SoutDialog *s = new SoutDialog( this, p_intf ); if( s->exec() == QDialog::Accepted ) ui.outputLedit->setText( s->getMrl() ); } @@ -435,7 +433,7 @@ void VLMDialog::saveModifications() if( vlmObj ) { vlmObj->input = ui.inputLedit->text(); - vlmObj->output = ui.outputLedit->text(); + vlmObj->output = ui.outputLedit->text().remove( ":sout=" ); vlmObj->setChecked( ui.enableCheck->isChecked() ); vlmObj->b_enabled = ui.enableCheck->isChecked(); switch( vlmObj->type ) @@ -454,8 +452,7 @@ void VLMDialog::saveModifications() break; // vlmObj-> } - vlmObj->update(); /* It should call the correct function is VLMAWidget - is abstract, but I am far from sure... FIXME ? */ + vlmObj->update(); } clearWidgets(); } @@ -464,9 +461,9 @@ void VLMDialog::saveModifications() * VLMAWidget - Abstract class ********************************/ -VLMAWidget::VLMAWidget( QString _name, - QString _input, - QString _output, +VLMAWidget::VLMAWidget( const QString& _name, + const QString& _input, + const QString& _output, bool _enabled, VLMDialog *_parent, int _type ) @@ -492,11 +489,11 @@ VLMAWidget::VLMAWidget( QString _name, objLayout->addWidget( time, 1, 3, 1, 2 );*/ QToolButton *modifyButton = new QToolButton; - modifyButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_settings_16px.png" ) ) ); + modifyButton->setIcon( QIcon( ":/menu/settings" ) ); objLayout->addWidget( modifyButton, 0, 5 ); QToolButton *deleteButton = new QToolButton; - deleteButton->setIcon( QIcon( QPixmap( ":/pixmaps/menus_quit_16px.png" ) ) ); + deleteButton->setIcon( QIcon( ":/menu/quit" ) ); objLayout->addWidget( deleteButton, 0, 6 ); BUTTONACT( modifyButton, modify() ); @@ -514,12 +511,6 @@ void VLMAWidget::del() parent->removeVLMItem( this ); } -//FIXME, remove me before release -void VLMAWidget::enterEvent( QEvent *event ) -{ - printf( "test" ); -} - void VLMAWidget::toggleEnabled( bool b_enable ) { VLMWrapper::EnableItem( name, b_enable ); @@ -528,22 +519,23 @@ void VLMAWidget::toggleEnabled( bool b_enable ) /**************** * VLMBroadcast ****************/ -VLMBroadcast::VLMBroadcast( QString _name, QString _input, QString _output, - bool _enabled, bool _looped, VLMDialog *_parent) +VLMBroadcast::VLMBroadcast( const QString& _name, const QString& _input, + const QString& _output, bool _enabled, + bool _looped, VLMDialog *_parent ) : VLMAWidget( _name, _input, _output, _enabled, _parent, QVLM_Broadcast ) { - nameLabel->setText( "Broadcast: " + name ); + nameLabel->setText( qtr("Broadcast: ") + name ); type = QVLM_Broadcast; b_looped = _looped; playButton = new QToolButton; - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); objLayout->addWidget( playButton, 1, 0 ); b_playing = true; QToolButton *stopButton = new QToolButton; - stopButton->setIcon( QIcon( QPixmap( ":/pixmaps/stop_16px.png" ) ) ); + stopButton->setIcon( QIcon( ":/toolbar/stop_b" ) ); objLayout->addWidget( stopButton, 1, 1 ); loopButton = new QToolButton; @@ -560,22 +552,22 @@ void VLMBroadcast::update() { VLMWrapper::EditBroadcast( name, input, output, b_enabled, b_looped ); if( b_looped ) - loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_all.png" ) ) ); + loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) ); else - loopButton->setIcon( QIcon( QPixmap( ":/pixmaps/playlist_repeat_off.png" ) ) ); + loopButton->setIcon( QIcon( ":/buttons/playlist/repeat_off" ) ); } void VLMBroadcast::togglePlayPause() { - if( b_playing = true ) + if( b_playing ) { VLMWrapper::ControlBroadcast( name, ControlBroadcastPause ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/pause_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/pause" ) ); } else { VLMWrapper::ControlBroadcast( name, ControlBroadcastPlay ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); } b_playing = !b_playing; } @@ -589,19 +581,19 @@ void VLMBroadcast::toggleLoop() void VLMBroadcast::stop() { VLMWrapper::ControlBroadcast( name, ControlBroadcastStop ); - playButton->setIcon( QIcon( QPixmap( ":/pixmaps/play_16px.png" ) ) ); + playButton->setIcon( QIcon( ":/menu/play" ) ); } /**************** * VLMSchedule ****************/ -VLMSchedule::VLMSchedule( QString name, QString input, QString output, - QDateTime _schetime, QDateTime _schedate, - int _scherepeatnumber, int _repeatDays, - bool enabled, VLMDialog *parent ) +VLMSchedule::VLMSchedule( const QString& name, const QString& input, + const QString& output, QDateTime _schetime, + QDateTime _schedate, int _scherepeatnumber, + int _repeatDays, bool enabled, VLMDialog *parent ) : VLMAWidget( name, input, output, enabled, parent, QVLM_Schedule ) { - nameLabel->setText( "Schedule: " + name ); + nameLabel->setText( qtr("Schedule: ") + name ); schetime = _schetime; schedate = _schedate; rNumber = _scherepeatnumber; @@ -619,11 +611,11 @@ void VLMSchedule::update() /**************** * VLMVOD ****************/ -VLMVod::VLMVod( QString name, QString input, QString output, - bool enabled, QString _mux, VLMDialog *parent) +VLMVod::VLMVod( const QString& name, const QString& input, const QString& output, + bool enabled, const QString& _mux, VLMDialog *parent) : VLMAWidget( name, input, output, enabled, parent, QVLM_VOD ) { - nameLabel->setText( "VOD:" + name ); + nameLabel->setText( qtr("VOD: ") + name ); mux = _mux; muxLabel = new QLabel; @@ -654,8 +646,8 @@ VLMWrapper::~VLMWrapper() p_vlm = NULL; } -void VLMWrapper::AddBroadcast( const QString name, QString input, - QString output, +void VLMWrapper::AddBroadcast( const QString& name, const QString& input, + const QString& output, bool b_enabled, bool b_loop ) { vlm_message_t *message; @@ -665,8 +657,8 @@ void VLMWrapper::AddBroadcast( const QString name, QString input, EditBroadcast( name, input, output, b_enabled, b_loop ); } -void VLMWrapper::EditBroadcast( const QString name, const QString input, - const QString output, +void VLMWrapper::EditBroadcast( const QString& name, const QString& input, + const QString& output, bool b_enabled, bool b_loop ) { vlm_message_t *message; @@ -698,18 +690,20 @@ void VLMWrapper::EditBroadcast( const QString name, const QString input, } } -void VLMWrapper::EnableItem( const QString name, bool b_enable ) +void VLMWrapper::EnableItem( const QString& name, bool b_enable ) { vlm_message_t *message; QString command = "setup \"" + name + ( b_enable ? " enable" : " disable" ); + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); } -void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, +void VLMWrapper::ControlBroadcast( const QString& name, int BroadcastStatus, unsigned int seek ) { vlm_message_t *message; - QString command = "control \"" + name; + QString command = "control \"" + name + "\""; switch( BroadcastStatus ) { case ControlBroadcastPlay: @@ -729,9 +723,9 @@ void VLMWrapper::ControlBroadcast( const QString name, int BroadcastStatus, vlm_MessageDelete( message ); } -void VLMWrapper::AddVod( const QString name, const QString input, - const QString output, - bool b_enabled, const QString mux ) +void VLMWrapper::AddVod( const QString& name, const QString& input, + const QString& output, + bool b_enabled, const QString& mux ) { vlm_message_t *message; QString command = "new \"" + name + "\" vod"; @@ -740,10 +734,10 @@ void VLMWrapper::AddVod( const QString name, const QString input, EditVod( name, input, output, b_enabled, mux ); } -void VLMWrapper::EditVod( const QString name, const QString input, - const QString output, +void VLMWrapper::EditVod( const QString& name, const QString& input, + const QString& output, bool b_enabled, - const QString mux ) + const QString& mux ) { vlm_message_t *message; QString command = "setup \"" + name + "\" input \"" + input + "\""; @@ -771,11 +765,11 @@ void VLMWrapper::EditVod( const QString name, const QString input, } } -void VLMWrapper::AddSchedule( const QString name, const QString input, - const QString output, QDateTime _schetime, +void VLMWrapper::AddSchedule( const QString& name, const QString& input, + const QString& output, QDateTime _schetime, QDateTime _schedate, int _scherepeatnumber, int _repeatDays, - bool b_enabled, const QString mux ) + bool b_enabled, const QString& mux ) { vlm_message_t *message; QString command = "new \"" + name + "\" schedule"; @@ -785,11 +779,11 @@ void VLMWrapper::AddSchedule( const QString name, const QString input, _scherepeatnumber, _repeatDays, b_enabled, mux ); } -void VLMWrapper::EditSchedule( const QString name, const QString input, - const QString output, QDateTime _schetime, - QDateTime _schedate, int _scherepeatnumber, - int _repeatDays, bool b_enabled, - const QString mux ) +void VLMWrapper::EditSchedule( const QString& name, const QString& input, + const QString& output, QDateTime _schetime, + QDateTime _schedate, int _scherepeatnumber, + int _repeatDays, bool b_enabled, + const QString& mux ) { vlm_message_t *message; QString command = "setup \"" + name + "\" input \"" + input + "\""; @@ -822,12 +816,35 @@ void VLMWrapper::EditSchedule( const QString name, const QString input, _schetime.toString( "hh:mm:ss" ) + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); + if( _scherepeatnumber > 0 ) { command = "setup \"" + name + "\" repeat \"" + _scherepeatnumber + "\""; vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); vlm_MessageDelete( message ); } + + if( _repeatDays > 0 ) + { + command = "setup \"" + name + "\" period \"" + _repeatDays + "\""; + vlm_ExecuteCommand( p_vlm, qtu( command ), &message ); + vlm_MessageDelete( message ); + } +} + +void VLMDialog::toggleVisible() +{ + QList::iterator it; + for( it = vlmItems.begin(); it != vlmItems.end(); it++ ) + { + VLMAWidget *item = *it; + delete item; + item = NULL; + } + vlmItems.clear(); + ui.vlmListItem->clear(); + mediasPopulator(); + QVLCDialog::toggleVisible(); }