|
|
@ -116,7 +116,8 @@ MainWindow::MainWindow()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQPopupMenu *menu = 0, *settings = static_cast<TQPopupMenu*>(factory()->container( "settings", this ));
|
|
|
|
TQPopupMenu *menu = nullptr;
|
|
|
|
|
|
|
|
TQPopupMenu *settings = static_cast<TQPopupMenu*>(factory()->container( "settings", this ));
|
|
|
|
int id = SubtitleChannelsMenuItemId, index = 0;
|
|
|
|
int id = SubtitleChannelsMenuItemId, index = 0;
|
|
|
|
|
|
|
|
|
|
|
|
#define make_menu( name, text ) \
|
|
|
|
#define make_menu( name, text ) \
|
|
|
@ -263,7 +264,7 @@ MainWindow::setupActions()
|
|
|
|
new TDEAction( i18n("Video Settings..."), "configure", Key_V, this, TQ_SLOT(configure()), ac, "video_settings" );
|
|
|
|
new TDEAction( i18n("Video Settings..."), "configure", Key_V, this, TQ_SLOT(configure()), ac, "video_settings" );
|
|
|
|
new TDEAction( i18n("Configure xine..."), "configure", 0, this, TQ_SLOT(configure()), ac, "xine_settings" );
|
|
|
|
new TDEAction( i18n("Configure xine..."), "configure", 0, this, TQ_SLOT(configure()), ac, "xine_settings" );
|
|
|
|
|
|
|
|
|
|
|
|
(new KWidgetAction( m_positionSlider, i18n("Position Slider"), 0, 0, 0, ac, "position_slider" ))->setAutoSized( true );
|
|
|
|
(new KWidgetAction( m_positionSlider, i18n("Position Slider"), nullptr, nullptr, nullptr, ac, "position_slider" ))->setAutoSized( true );
|
|
|
|
|
|
|
|
|
|
|
|
m_volumeAction = new VolumeAction( toolBar(), ac );
|
|
|
|
m_volumeAction = new VolumeAction( toolBar(), ac );
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -381,7 +382,7 @@ MainWindow::load( const KURL &url )
|
|
|
|
if (url.protocol() == "media") {
|
|
|
|
if (url.protocol() == "media") {
|
|
|
|
#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING)
|
|
|
|
#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING)
|
|
|
|
TDEIO::UDSEntry e;
|
|
|
|
TDEIO::UDSEntry e;
|
|
|
|
if (!TDEIO::NetAccess::stat( url, e, 0 ))
|
|
|
|
if (!TDEIO::NetAccess::stat( url, e, nullptr ))
|
|
|
|
MessageBox::sorry( "There was an internal error with the media slave..." );
|
|
|
|
MessageBox::sorry( "There was an internal error with the media slave..." );
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
TDEIO::UDSEntry::ConstIterator end = e.end();
|
|
|
|
TDEIO::UDSEntry::ConstIterator end = e.end();
|
|
|
@ -571,7 +572,7 @@ MainWindow::fullScreenToggled( bool isFullScreen )
|
|
|
|
delete s_handler;
|
|
|
|
delete s_handler;
|
|
|
|
|
|
|
|
|
|
|
|
// prevent videoWindow() moving around when mouse moves
|
|
|
|
// prevent videoWindow() moving around when mouse moves
|
|
|
|
setCentralWidget( isFullScreen ? 0 : videoWindow() );
|
|
|
|
setCentralWidget( isFullScreen ? nullptr : videoWindow() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
@ -626,7 +627,7 @@ void
|
|
|
|
MainWindow::aboutToShowMenu()
|
|
|
|
MainWindow::aboutToShowMenu()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQPopupMenu *menu = (TQPopupMenu*)sender();
|
|
|
|
TQPopupMenu *menu = (TQPopupMenu*)sender();
|
|
|
|
TQCString name( sender() ? sender()->name() : 0 );
|
|
|
|
TQCString name( sender() ? sender()->name() : nullptr );
|
|
|
|
|
|
|
|
|
|
|
|
// uncheck all items first
|
|
|
|
// uncheck all items first
|
|
|
|
for( uint x = 0; x < menu->count(); ++x )
|
|
|
|
for( uint x = 0; x < menu->count(); ++x )
|
|
|
@ -701,9 +702,9 @@ action( const char *name )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#define QT_FATAL_ASSERT
|
|
|
|
#define QT_FATAL_ASSERT
|
|
|
|
|
|
|
|
|
|
|
|
MainWindow *mainWindow = 0;
|
|
|
|
MainWindow *mainWindow = nullptr;
|
|
|
|
TDEActionCollection *actionCollection = 0;
|
|
|
|
TDEActionCollection *actionCollection = nullptr;
|
|
|
|
TDEAction *action = 0;
|
|
|
|
TDEAction *action = nullptr;
|
|
|
|
|
|
|
|
|
|
|
|
if( mainWindow = (MainWindow*)kapp->mainWidget() )
|
|
|
|
if( mainWindow = (MainWindow*)kapp->mainWidget() )
|
|
|
|
if( actionCollection = mainWindow->actionCollection() )
|
|
|
|
if( actionCollection = mainWindow->actionCollection() )
|
|
|
|