TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
0
0
Fork 0
Code Issues Releases Wiki Activity

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/30/head
Michele Calgaro 11 months ago
parent efb801b0a2
commit 28388d4ea2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
48 changed files with 600 additions and 600 deletions
Show Stats Download Patch File Download Diff File

8
kaffeine/src/input/audiobrowser/googlefetcher.cpp
Unescape View File

@ -232,10 +232,10 @@ TQPixmap GoogleFetcher::pixmap( bool forceFetch )
} }
else { else {
GoogleFetcherDialog dialog("google", m_imageList, m_artist, m_album, 0); GoogleFetcherDialog dialog("google", m_imageList, m_artist, m_album, 0);
connect(&dialog, TQT_SIGNAL(sizeChanged(GoogleFetcher::ImageSize)), connect(&dialog, TQ_SIGNAL(sizeChanged(GoogleFetcher::ImageSize)),
this, TQT_SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize))); this, TQ_SLOT(slotLoadImageURLs(GoogleFetcher::ImageSize)));
connect(this, TQT_SIGNAL(signalNewSearch(GoogleImageList &)), connect(this, TQ_SIGNAL(signalNewSearch(GoogleImageList &)),
&dialog, TQT_SLOT(refreshScreen(GoogleImageList &))); &dialog, TQ_SLOT(refreshScreen(GoogleImageList &)));
dialog.exec(); dialog.exec();
pixmap = dialog.result(); pixmap = dialog.result();
chosen = dialog.takeIt(); chosen = dialog.takeIt();

10
kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
Unescape View File

@ -71,8 +71,8 @@ GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name,
combo->insertItem(i18n("Large")); combo->insertItem(i18n("Large"));
combo->insertItem(i18n("Very Large")); combo->insertItem(i18n("Very Large"));
combo->setCurrentItem(0); combo->setCurrentItem(0);
connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(imgSizeChanged(int))); connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(imgSizeChanged(int)));
connect(m_iconWidget, TQT_SIGNAL( executed(TQIconViewItem*) ), this, TQT_SLOT(slotOk())); connect(m_iconWidget, TQ_SIGNAL( executed(TQIconViewItem*) ), this, TQ_SLOT(slotOk()));
imgSize->adjustSize(); imgSize->adjustSize();
setMainWidget(mainBox); setMainWidget(mainBox);
@ -216,9 +216,9 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const GoogleImage &imag
// Start downloading the image. // Start downloading the image.
m_job = TDEIO::get(image.thumbURL(), false, false); m_job = TDEIO::get(image.thumbURL(), false, false);
connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *))); connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(imageResult(TDEIO::Job *)));
connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); this, TQ_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
} }
CoverIconViewItem::~CoverIconViewItem() CoverIconViewItem::~CoverIconViewItem()

70
kaffeine/src/input/audiobrowser/playlist.cpp
Unescape View File

@ -89,7 +89,7 @@ RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
title = " ##### "; title = " ##### ";
titleOffset = 0; titleOffset = 0;
setTitle( title ); setTitle( title );
connect( &titleTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rollTitle() ) ); connect( &titleTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( rollTitle() ) );
titleTimer.start( 50 ); titleTimer.start( 50 );
} }
@ -416,7 +416,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
layout->addWidget( roller, 0, 1 ); layout->addWidget( roller, 0, 1 );
TDEAccel* accel = new TDEAccel(mainWidget); TDEAccel* accel = new TDEAccel(mainWidget);
accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); accel->insert("Delete selected", TQt::Key_Delete, this, TQ_SLOT(slotRemoveSelected()));
m_isCurrentEntry = UserIcon("playing"); m_isCurrentEntry = UserIcon("playing");
m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("application-x-cda", TDEIcon::Small); m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("application-x-cda", TDEIcon::Small);
@ -435,28 +435,28 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
loadConfig( TDEGlobal::config() ); loadConfig( TDEGlobal::config() );
connect(coverFrame, TQT_SIGNAL(changeCurrentCover()), this, TQT_SLOT(chooseCurrentCover())); connect(coverFrame, TQ_SIGNAL(changeCurrentCover()), this, TQ_SLOT(chooseCurrentCover()));
connect(coverFrame, TQT_SIGNAL(gallery()), this, TQT_SLOT(showGallery())); connect(coverFrame, TQ_SIGNAL(gallery()), this, TQ_SLOT(showGallery()));
connect(browserComb, TQT_SIGNAL(urlActivated( const KURL& )), this, TQT_SLOT(setBrowserURL( const KURL& ))); connect(browserComb, TQ_SIGNAL(urlActivated( const KURL& )), this, TQ_SLOT(setBrowserURL( const KURL& )));
connect(browserComb, TQT_SIGNAL(returnPressed( const TQString& )), this, TQT_SLOT(setBrowserURL( const TQString& ))); connect(browserComb, TQ_SIGNAL(returnPressed( const TQString& )), this, TQ_SLOT(setBrowserURL( const TQString& )));
connect(fileBrowser, TQT_SIGNAL(urlEntered( const KURL& )), this, TQT_SLOT(browserURLChanged( const KURL& ))); connect(fileBrowser, TQ_SIGNAL(urlEntered( const KURL& )), this, TQ_SLOT(browserURLChanged( const KURL& )));
connect(fileBrowser, TQT_SIGNAL(fileSelected(const KFileItem*)), this, TQT_SLOT(fileSelected(const KFileItem*))); connect(fileBrowser, TQ_SIGNAL(fileSelected(const KFileItem*)), this, TQ_SLOT(fileSelected(const KFileItem*)));
connect(m_playlistFilter, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotFindText(const TQString&))); connect(m_playlistFilter, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotFindText(const TQString&)));
connect( searchBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetSearch()) ); connect( searchBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetSearch()) );
connect(m_playlistSelector, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotNewPlaylistName(const TQString&))); connect(m_playlistSelector, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotNewPlaylistName(const TQString&)));
connect(m_playlistSelector, TQT_SIGNAL(activated(int)),this, TQT_SLOT(slotPlaylistActivated(int))); connect(m_playlistSelector, TQ_SIGNAL(activated(int)),this, TQ_SLOT(slotPlaylistActivated(int)));
connect(m_list, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropEvent(TQDropEvent*, TQListViewItem*))); connect(m_list, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropEvent(TQDropEvent*, TQListViewItem*)));
connect(m_list, TQT_SIGNAL(aboutToMove()), this, TQT_SLOT(slotPreDropEvent())); connect(m_list, TQ_SIGNAL(aboutToMove()), this, TQ_SLOT(slotPreDropEvent()));
connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotPlayDirect(TQListViewItem*)));
connect(m_list, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); connect(m_list, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotPlayDirect(TQListViewItem*)));
connect(m_list, TQT_SIGNAL(signalCut()), this, TQT_SLOT(slotCut())); connect(m_list, TQ_SIGNAL(signalCut()), this, TQ_SLOT(slotCut()));
connect(m_list, TQT_SIGNAL(signalCopy()), this, TQT_SLOT(slotCopy())); connect(m_list, TQ_SIGNAL(signalCopy()), this, TQ_SLOT(slotCopy()));
connect(m_list, TQT_SIGNAL(signalPaste()), this, TQT_SLOT(slotPaste())); connect(m_list, TQ_SIGNAL(signalPaste()), this, TQ_SLOT(slotPaste()));
connect(m_list, TQT_SIGNAL(signalSelectAll()), this, TQT_SLOT(slotSelectAll())); connect(m_list, TQ_SIGNAL(signalSelectAll()), this, TQ_SLOT(slotSelectAll()));
connect(m_list, TQT_SIGNAL(signalPlayItem(TQListViewItem*)), this, TQT_SLOT(slotPlayDirect(TQListViewItem*))); connect(m_list, TQ_SIGNAL(signalPlayItem(TQListViewItem*)), this, TQ_SLOT(slotPlayDirect(TQListViewItem*)));
connect(m_list, TQT_SIGNAL(signalPlaylistFromSelected()), this, TQT_SLOT(slotPlaylistFromSelected())); connect(m_list, TQ_SIGNAL(signalPlaylistFromSelected()), this, TQ_SLOT(slotPlaylistFromSelected()));
connect(m_list, TQT_SIGNAL(signalAddToQueue(MRL)), this, TQT_SLOT(slotAddToQueue(MRL))); connect(m_list, TQ_SIGNAL(signalAddToQueue(MRL)), this, TQ_SLOT(slotAddToQueue(MRL)));
connect(m_list->header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSort(int))); connect(m_list->header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSort(int)));
} }
void PlayList::togglePanel() void PlayList::togglePanel()
@ -478,7 +478,7 @@ bool PlayList::execTarget( const TQString &target )
{ {
if ( target=="PLAYLIST" ) { if ( target=="PLAYLIST" ) {
emit showMe( this ); emit showMe( this );
TQTimer::singleShot( 100, this, TQT_SLOT(startPlaylist()) ); TQTimer::singleShot( 100, this, TQ_SLOT(startPlaylist()) );
return true; return true;
} }
return false; return false;
@ -497,19 +497,19 @@ PlayList::~PlayList()
void PlayList::setupActions() void PlayList::setupActions()
{ {
m_repeat = new TDEToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, TQT_SLOT(slotRepeat()), actionCollection(),"playlist_repeat"); m_repeat = new TDEToggleAction(i18n("&Repeat"), 0 , CTRL|Key_E, this, TQ_SLOT(slotRepeat()), actionCollection(),"playlist_repeat");
m_repeat->setStatusText(i18n("Loop playlist")); m_repeat->setStatusText(i18n("Loop playlist"));
m_shuffle = new TDEToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, TQT_SLOT(slotShuffle()), actionCollection(),"playlist_shuffle"); m_shuffle = new TDEToggleAction(i18n("Sh&uffle"), 0 , CTRL|Key_R, this, TQ_SLOT(slotShuffle()), actionCollection(),"playlist_shuffle");
m_shuffle->setStatusText(i18n("Play items in random order")); m_shuffle->setStatusText(i18n("Play items in random order"));
m_autoCover = new TDEToggleAction(i18n("Autodownload covers"), 0 , 0, this, TQT_SLOT(slotAutoCover()), actionCollection(),"playlist_autocover"); m_autoCover = new TDEToggleAction(i18n("Autodownload covers"), 0 , 0, this, TQ_SLOT(slotAutoCover()), actionCollection(),"playlist_autocover");
m_autoCover->setStatusText(i18n("Automatic dowloading of covers")); m_autoCover->setStatusText(i18n("Automatic dowloading of covers"));
m_showPlayer = new TDEToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQT_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer"); m_showPlayer = new TDEToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQ_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer");
m_showPlayer->setStatusText(i18n("Don't switch automatically to player window")); m_showPlayer->setStatusText(i18n("Don't switch automatically to player window"));
new TDEAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQT_SLOT(slotClearList()), actionCollection(), "playlist_clear"); new TDEAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQ_SLOT(slotClearList()), actionCollection(), "playlist_clear");
new TDEAction(i18n("Ne&w Playlist"), "document-new", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new"); new TDEAction(i18n("Ne&w Playlist"), "document-new", 0, this, TQ_SLOT(slotNewList()), actionCollection(), "playlist_new");
new TDEAction(i18n("&Import Playlist..."), "project_open", 0, this, TQT_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load"); new TDEAction(i18n("&Import Playlist..."), "project_open", 0, this, TQ_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load");
new TDEAction(i18n("&Save Current Playlist As..."), "document-save-as", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as"); new TDEAction(i18n("&Save Current Playlist As..."), "document-save-as", 0, this, TQ_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as");
new TDEAction(i18n("Re&move Current Playlist"), "window-close", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove"); new TDEAction(i18n("Re&move Current Playlist"), "window-close", 0, this, TQ_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove");
} }
void PlayList::slotClearList() void PlayList::slotClearList()
@ -1618,7 +1618,7 @@ GalleryDialog::GalleryDialog( TQWidget *parent, GoogleFetcher *goog )
imageFrame = new TQFrame( hbox ); imageFrame = new TQFrame( hbox );
imageFrame->setFixedSize(500,500); imageFrame->setFixedSize(500,500);
setMainWidget(hbox); setMainWidget(hbox);
connect( &next, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNext()) ); connect( &next, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNext()) );
next.start(1000,true); next.start(1000,true);
} }

36
kaffeine/src/input/audiobrowser/urllistview.cpp
Unescape View File

@ -41,20 +41,20 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : TDEListView(pare
m_listCleared(true), m_itemOfContextMenu(NULL) m_listCleared(true), m_itemOfContextMenu(NULL)
{ {
m_contextMenu = new TDEPopupMenu(this); m_contextMenu = new TDEPopupMenu(this);
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem())); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play"), this, TQ_SLOT(slotPlayItem()));
m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext())); m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQ_SLOT(slotPlayNext()));
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-cut", TDEIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-cut", TDEIcon::Small), i18n("C&ut"), this, TQ_SIGNAL(signalCut()), CTRL+Key_X);
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-copy", TDEIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-copy", TDEIcon::Small), i18n("&Copy"), this, TQ_SIGNAL(signalCopy()), CTRL+Key_C);
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-paste", TDEIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-paste", TDEIcon::Small), i18n("&Paste"), this, TQ_SIGNAL(signalPaste()), CTRL+Key_V);
m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A); m_contextMenu->insertItem(i18n("Select &All"), this, TQ_SIGNAL(signalSelectAll()), CTRL+Key_A);
m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected())); m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQ_SIGNAL(signalPlaylistFromSelected()));
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", TDEIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 ); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", TDEIcon::Small), i18n("Add Sub&title..."), this, TQ_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", TDEIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle())); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", TDEIcon::Small), i18n("&Edit Title"), this, TQ_SLOT(slotEditTitle()));
m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("application-vnd.tde.info", TDEIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo())); m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("application-vnd.tde.info", TDEIcon::Small), i18n("&Info"), this, TQ_SLOT(slotShowInfo()));
/* width of the "length"-column */ /* width of the "length"-column */
TQFontMetrics met(TDEGlobalSettings::generalFont()); TQFontMetrics met(TDEGlobalSettings::generalFont());
@ -71,12 +71,12 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : TDEListView(pare
m_column4Track = w1 > w2 ? w1 : w2; m_column4Track = w1 > w2 ? w1 : w2;
m_column4Track += 36; m_column4Track += 36;
connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
this, TQT_SLOT(slotShowContextMenu(TQListViewItem*, const TQPoint&, int))); this, TQ_SLOT(slotShowContextMenu(TQListViewItem*, const TQPoint&, int)));
connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)));
connect(this, TQT_SIGNAL(clicked( TQListViewItem*, const TQPoint&, int )), connect(this, TQ_SIGNAL(clicked( TQListViewItem*, const TQPoint&, int )),
this, TQT_SLOT(slotClicked( TQListViewItem*, const TQPoint&, int ))); this, TQ_SLOT(slotClicked( TQListViewItem*, const TQPoint&, int )));
} }
UrlListView::~UrlListView() UrlListView::~UrlListView()
@ -277,8 +277,8 @@ void UrlListView::slotAddSubtitle()
openSubJob = TDEIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false ); openSubJob = TDEIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false );
openSubJob->addMetaData( "content-type", "Content-Type: text/xml" ); openSubJob->addMetaData( "content-type", "Content-Type: text/xml" );
connect( openSubJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(openSubResult(TDEIO::Job*)) ); connect( openSubJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(openSubResult(TDEIO::Job*)) );
connect( openSubJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(TDEIO::Job*, connect( openSubJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&) ), this, TQ_SLOT(openSubData(TDEIO::Job*,
const TQByteArray&)) ); const TQByteArray&)) );
kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/ kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/

24
kaffeine/src/input/disc/disc.cpp
Unescape View File

@ -116,8 +116,8 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("media-optical-cdaudio-unmounted", TDEIcon::Toolbar) ); cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("media-optical-cdaudio-unmounted", TDEIcon::Toolbar) );
ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) ); ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) );
connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) ); connect( cdBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(startCD()) );
connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) ); connect( ripBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(startRIP()) );
h1 = new TQHBoxLayout(); h1 = new TQHBoxLayout();
h1->addWidget( new TQLabel( i18n("Artist:"), panel ) ); h1->addWidget( new TQLabel( i18n("Artist:"), panel ) );
@ -138,7 +138,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
list = new MListView( panel ); list = new MListView( panel );
list->setHScrollBarMode( TQListView::AlwaysOff ); list->setHScrollBarMode( TQListView::AlwaysOff );
connect( list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(trackSelected(TQListViewItem*)) ); connect( list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(trackSelected(TQListViewItem*)) );
list->addColumn( i18n("Track") ); list->addColumn( i18n("Track") );
list->addColumn( i18n("Title") ); list->addColumn( i18n("Title") );
list->addColumn( i18n("Duration") ); list->addColumn( i18n("Duration") );
@ -162,7 +162,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
enc->setUsesTextLabel( true ); enc->setUsesTextLabel( true );
enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Small) ); enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Small) );
enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); connect( enc, TQ_SIGNAL(clicked()), this, TQ_SLOT(encode()) );
vb->addWidget( encodeWidget ); vb->addWidget( encodeWidget );
encodeWidget->hide(); encodeWidget->hide();
@ -175,7 +175,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
artistLab->setPaletteBackgroundColor( list->paletteBackgroundColor() ); artistLab->setPaletteBackgroundColor( list->paletteBackgroundColor() );
albumLab->setPaletteBackgroundColor( list->paletteBackgroundColor() ); albumLab->setPaletteBackgroundColor( list->paletteBackgroundColor() );
connect( &encodeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(encodeProgress()) ); connect( &encodeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(encodeProgress()) );
setXMLFile("kaffeinedisc.rc"); setXMLFile("kaffeinedisc.rc");
setupActions(); setupActions();
@ -219,19 +219,19 @@ bool Disc::execTarget( const TQString &target )
{ {
if ( target=="DISC_CDDA" ) { if ( target=="DISC_CDDA" ) {
//emit showMe( this ); //emit showMe( this );
TQTimer::singleShot( 100, this, TQT_SLOT(startCD()) ); TQTimer::singleShot( 100, this, TQ_SLOT(startCD()) );
return true; return true;
} }
else if ( target=="DISC_RIP" ) { else if ( target=="DISC_RIP" ) {
TQTimer::singleShot( 100, this, TQT_SLOT(startRIP()) ); TQTimer::singleShot( 100, this, TQ_SLOT(startRIP()) );
return true; return true;
} }
else if ( target=="DISC_DVD" ) { else if ( target=="DISC_DVD" ) {
TQTimer::singleShot( 100, this, TQT_SLOT(startDVD()) ); TQTimer::singleShot( 100, this, TQ_SLOT(startDVD()) );
return true; return true;
} }
else if ( target=="DISC_VCD" ) { else if ( target=="DISC_VCD" ) {
TQTimer::singleShot( 100, this, TQT_SLOT(startVCD()) ); TQTimer::singleShot( 100, this, TQ_SLOT(startVCD()) );
return true; return true;
} }
return false; return false;
@ -266,9 +266,9 @@ TQWidget* Disc::inputMainWidget()
void Disc::setupActions() void Disc::setupActions()
{ {
new TDEAction(i18n("Open &DVD"), "media-optical-dvd-unmounted", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd"); new TDEAction(i18n("Open &DVD"), "media-optical-dvd-unmounted", 0, this, TQ_SLOT(startDVD()), actionCollection(), "file_open_dvd");
new TDEAction(i18n("Open &VCD"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd"); new TDEAction(i18n("Open &VCD"), "media-optical-cdrom-unmounted", 0, this, TQ_SLOT(startVCD()), actionCollection(), "file_open_vcd");
new TDEAction(i18n("Open &Audio-CD"), "media-optical-cdaudio-unmounted", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd"); new TDEAction(i18n("Open &Audio-CD"), "media-optical-cdaudio-unmounted", 0, this, TQ_SLOT(startCD()), actionCollection(), "file_open_audiocd");
} }
void Disc::playerStopped() void Disc::playerStopped()

2
kaffeine/src/input/disc/paranoia.cpp
Unescape View File

@ -59,7 +59,7 @@ KiloConfig::KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList
cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) ); cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
baseDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); baseDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) );
delete icon; delete icon;
connect( baseDirBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setBaseDir() ) ); connect( baseDirBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setBaseDir() ) );
Conf = confile; Conf = confile;
Conf->setGroup( "Paranoia" ); Conf->setGroup( "Paranoia" );
baseDirLineEdit->setText( Conf->readEntry( "Basedir", TQDir::homeDirPath() ) ); baseDirLineEdit->setText( Conf->readEntry( "Basedir", TQDir::homeDirPath() ) );

12
kaffeine/src/input/dvb/audioeditor.cpp
Unescape View File

@ -41,12 +41,12 @@ AudioEditor::AudioEditor( ChannelDesc *chan, TQWidget *parent ) : AudioEditorUI(
if ( channel->napid==channel->maxapid ) newBtn->setEnabled( false ); if ( channel->napid==channel->maxapid ) newBtn->setEnabled( false );
connect( pidList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(showProp(int)) ); connect( pidList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(showProp(int)) );
connect( upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUp()) ); connect( upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemUp()) );
connect( downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDown()) ); connect( downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemDown()) );
connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDelete()) ); connect( delBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemDelete()) );
connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUpdate()) ); connect( updateBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemUpdate()) );
connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemNew()) ); connect( newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemNew()) );
} }
void AudioEditor::insertItem( int index, bool updt ) void AudioEditor::insertItem( int index, bool updt )

2
kaffeine/src/input/dvb/broadcasteditor.cpp
Unescape View File

@ -40,7 +40,7 @@ BroadcastEditor::BroadcastEditor( TQWidget *parent, TQPtrList<ChannelDesc> *ch,
cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) ); cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) );
okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) ); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) );
connect( channelLb, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), this, TQT_SLOT(slotAddChannel(TQListBoxItem*)) ); connect( channelLb, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), this, TQ_SLOT(slotAddChannel(TQListBoxItem*)) );
chan = ch; chan = ch;
list = ret; list = ret;

4
kaffeine/src/input/dvb/channeleditor.cpp
Unescape View File

@ -75,8 +75,8 @@ ChannelEditor::ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtr
} }
nameLe->setText( channel->name ); nameLe->setText( channel->name );
connect( apidBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editAudio()) ); connect( apidBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editAudio()) );
connect( subpidBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSubtitle()) ); connect( subpidBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSubtitle()) );
} }
void ChannelEditor::editAudio() void ChannelEditor::editAudio()

2
kaffeine/src/input/dvb/cleaner.cpp
Unescape View File

@ -31,7 +31,7 @@ Cleaner::Cleaner( const TQString &lpath, const TQString &rpath )
{ {
setPaths( lpath, rpath ); setPaths( lpath, rpath );
connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doClean()) ); connect( &timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doClean()) );
timer.start( 60*1000 ); timer.start( 60*1000 );
} }

2
kaffeine/src/input/dvb/crontimer.cpp
Unescape View File

@ -27,7 +27,7 @@
CronTimer::CronTimer( int m, TQWidget *parent ) : CronTimerUI( parent ) CronTimer::CronTimer( int m, TQWidget *parent ) : CronTimerUI( parent )
{ {
connect( cronBtnGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(modeSelected(int)) ); connect( cronBtnGrp, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(modeSelected(int)) );
mode = m; mode = m;
switch ( mode ) { switch ( mode ) {
case Noone : cronBtnGrp->setButton( 0 ); break; case Noone : cronBtnGrp->setButton( 0 ); break;

8
kaffeine/src/input/dvb/dvbcam.cpp
Unescape View File

@ -570,7 +570,7 @@ void DvbCam::showMMI()
{ {
if ( !menuDialog && stdcam ) { if ( !menuDialog && stdcam ) {
menuDialog = new MCamMenuDialog( stdcam ); menuDialog = new MCamMenuDialog( stdcam );
connect( menuDialog, TQT_SIGNAL(enteredResponse(TQString)), this, TQT_SLOT(mmiResponse(TQString)) ); connect( menuDialog, TQ_SIGNAL(enteredResponse(TQString)), this, TQ_SLOT(mmiResponse(TQString)) );
menuDialog->exec(); menuDialog->exec();
closeMMI(); closeMMI();
} }
@ -597,7 +597,7 @@ int DvbCam::showCamDialog()
dlg.appManuLab->setText( getAppManu() ); dlg.appManuLab->setText( getAppManu() );
dlg.manuCodeLab->setText( getManuCode() ); dlg.manuCodeLab->setText( getManuCode() );
dlg.menuStringLab->setText( getMenuString() ); dlg.menuStringLab->setText( getMenuString() );
connect( dlg.camMenuBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(enterMenu()) ); connect( dlg.camMenuBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(enterMenu()) );
dlg.exec(); dlg.exec();
CamMaxService = dlg.maxServiceSpin->value(); CamMaxService = dlg.maxServiceSpin->value();
return CamMaxService; return CamMaxService;
@ -644,8 +644,8 @@ void DvbCam::mmiResponse( TQString s )
MCamMenuDialog::MCamMenuDialog( StandardCam *sc ) MCamMenuDialog::MCamMenuDialog( StandardCam *sc )
{ {
stdcam = sc; stdcam = sc;
connect( inputLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(validateClicked()) ); connect( inputLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(validateClicked()) );
connect( &readTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setMenu()) ); connect( &readTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setMenu()) );
readTimer.start( 500 ); readTimer.start( 500 );
} }

68
kaffeine/src/input/dvb/dvbconfig.cpp
Unescape View File

@ -45,7 +45,7 @@
MSpinBox::MSpinBox( TQWidget *parent, int devNum ) : TQSpinBox( 1, 4, 1, parent ) MSpinBox::MSpinBox( TQWidget *parent, int devNum ) : TQSpinBox( 1, 4, 1, parent )
{ {
deviceNumber = devNum; deviceNumber = devNum;
connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)) ); connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)) );
} }
@ -61,7 +61,7 @@ MPushButton::MPushButton( TQWidget *parent, int devNum, int lnbNum ) : KPushButt
{ {
deviceNumber = devNum; deviceNumber = devNum;
lnbNumber = lnbNum; lnbNumber = lnbNum;
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(isClicked()) ); connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(isClicked()) );
} }
@ -76,7 +76,7 @@ void MPushButton::isClicked()
MCAMButton::MCAMButton( TQWidget *parent, int devNum ) : TQPushButton( i18n("CAM"), parent ) MCAMButton::MCAMButton( TQWidget *parent, int devNum ) : TQPushButton( i18n("CAM"), parent )
{ {
deviceNumber = devNum; deviceNumber = devNum;
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(isClicked()) ); connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(isClicked()) );
} }
@ -92,7 +92,7 @@ MComboBox::MComboBox( TQWidget *parent, int devNum, int lnbNum ) : TQComboBox( p
{ {
deviceNumber = devNum; deviceNumber = devNum;
lnbNumber = lnbNum; lnbNumber = lnbNum;
connect( this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(isActivated(int)) ); connect( this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(isActivated(int)) );
} }
@ -286,11 +286,11 @@ bool DVBconfig::loadDvbData( TQWidget *parent )
downProgress->progressBar()->setTotalSteps( 100 ); downProgress->progressBar()->setTotalSteps( 100 );
//job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); //job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
connect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) ); connect( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(setDownloadResult(TDEIO::Job*)) );
connect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) ); connect( job, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
downProgress->exec(); downProgress->exec();
disconnect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) ); disconnect( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(setDownloadResult(TDEIO::Job*)) );
disconnect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) ); disconnect( job, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
if ( downProgress ) { if ( downProgress ) {
delete downProgress; delete downProgress;
downProgress = 0; downProgress = 0;
@ -615,7 +615,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
if ( dvbConfig->devList.at(i)->hasCAM ) { if ( dvbConfig->devList.at(i)->hasCAM ) {
grid->addWidget( dvbType, gridLine, 1 ); grid->addWidget( dvbType, gridLine, 1 );
MCAMButton *camb = new MCAMButton( gb, i ); MCAMButton *camb = new MCAMButton( gb, i );
connect( camb, TQT_SIGNAL(clicked(int)), pan, TQT_SLOT(camClicked(int)) ); connect( camb, TQ_SIGNAL(clicked(int)), pan, TQ_SLOT(camClicked(int)) );
grid->addWidget( camb, gridLine, 2 ); grid->addWidget( camb, gridLine, 2 );
} }
else else
@ -649,11 +649,11 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lab = new TQLabel( i18n("Number of LNBs:"), gb ); lab = new TQLabel( i18n("Number of LNBs:"), gb );
grid->addWidget( lab, gridLine, 0 ); grid->addWidget( lab, gridLine, 0 );
satNumber[i] = new MSpinBox( gb, i ); satNumber[i] = new MSpinBox( gb, i );
connect( satNumber[i], TQT_SIGNAL(signalValueChanged(int,int)), this, TQT_SLOT(satNumberChanged(int,int))); connect( satNumber[i], TQ_SIGNAL(signalValueChanged(int,int)), this, TQ_SLOT(satNumberChanged(int,int)));
grid->addWidget( satNumber[i], gridLine, 1 ); grid->addWidget( satNumber[i], gridLine, 1 );
usals = new KPushButton( gb ); usals = new KPushButton( gb );
usals->setGuiItem( KGuiItem(i18n("Set rotor coordinates..."), icon->loadIconSet("move", TDEIcon::Small) ) ); usals->setGuiItem( KGuiItem(i18n("Set rotor coordinates..."), icon->loadIconSet("move", TDEIcon::Small) ) );
connect( usals, TQT_SIGNAL(clicked()), this, TQT_SLOT(setUsals())); connect( usals, TQ_SIGNAL(clicked()), this, TQ_SLOT(setUsals()));
grid->addWidget( usals, gridLine, 2 ); grid->addWidget( usals, gridLine, 2 );
++gridLine; ++gridLine;
@ -672,12 +672,12 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lnb0[i]->setGuiItem( KGuiItem(i18n("LNB 1 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) ); lnb0[i]->setGuiItem( KGuiItem(i18n("LNB 1 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
lnb0[i]->setEnabled(true); lnb0[i]->setEnabled(true);
grid->addWidget( lnb0[i], gridLine, 0 ); grid->addWidget( lnb0[i], gridLine, 0 );
connect( lnb0[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); connect( lnb0[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setLnb(int,int)));
rotor0[i] = new MComboBox( gb, i, 0 ); rotor0[i] = new MComboBox( gb, i, 0 );
rotor0[i]->insertStringList( rotorList ); rotor0[i]->insertStringList( rotorList );
rotor0[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[0].rotorType ); rotor0[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[0].rotorType );
grid->addWidget( rotor0[i], gridLine, 1 ); grid->addWidget( rotor0[i], gridLine, 1 );
connect( rotor0[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); connect( rotor0[i], TQ_SIGNAL(activated(int,int,int)), this, TQ_SLOT(setRotor(int,int,int)));
swidg = new TQWidget( gb ); swidg = new TQWidget( gb );
sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 );
sat0[i] = new TQComboBox( swidg ); sat0[i] = new TQComboBox( swidg );
@ -685,7 +685,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
sgrid->addWidget( sat0[i], 0, 0 ); sgrid->addWidget( sat0[i], 0, 0 );
src0[i] = new MPushButton( swidg, i, 0 ); src0[i] = new MPushButton( swidg, i, 0 );
src0[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); src0[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) );
connect( src0[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); connect( src0[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setRotorSources(int,int)) );
sgrid->addWidget( src0[i], 1, 0 ); sgrid->addWidget( src0[i], 1, 0 );
if ( dvbConfig->devList.at(i)->lnb[0].rotorType==0 ) { if ( dvbConfig->devList.at(i)->lnb[0].rotorType==0 ) {
setSource( sat0[i], dvbConfig->devList.at(i)->lnb[0].source[0] ); setSource( sat0[i], dvbConfig->devList.at(i)->lnb[0].source[0] );
@ -701,13 +701,13 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lnb1[i]->setGuiItem( KGuiItem(i18n("LNB 2 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) ); lnb1[i]->setGuiItem( KGuiItem(i18n("LNB 2 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
lnb1[i]->setEnabled(false); lnb1[i]->setEnabled(false);
grid->addWidget( lnb1[i], gridLine, 0 ); grid->addWidget( lnb1[i], gridLine, 0 );
connect( lnb1[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); connect( lnb1[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setLnb(int,int)));
rotor1[i] = new MComboBox( gb, i, 1 ); rotor1[i] = new MComboBox( gb, i, 1 );
rotor1[i]->setEnabled( false ); rotor1[i]->setEnabled( false );
rotor1[i]->insertStringList( rotorList ); rotor1[i]->insertStringList( rotorList );
rotor1[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[1].rotorType ); rotor1[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[1].rotorType );
grid->addWidget( rotor1[i], gridLine, 1 ); grid->addWidget( rotor1[i], gridLine, 1 );
connect( rotor1[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); connect( rotor1[i], TQ_SIGNAL(activated(int,int,int)), this, TQ_SLOT(setRotor(int,int,int)));
swidg = new TQWidget( gb ); swidg = new TQWidget( gb );
sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 );
sat1[i] = new TQComboBox( swidg ); sat1[i] = new TQComboBox( swidg );
@ -717,7 +717,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
src1[i] = new MPushButton( swidg, i, 1 ); src1[i] = new MPushButton( swidg, i, 1 );
src1[i]->setEnabled(false); src1[i]->setEnabled(false);
src1[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); src1[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) );
connect( src1[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); connect( src1[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setRotorSources(int,int)) );
sgrid->addWidget( src1[i], 1, 0 ); sgrid->addWidget( src1[i], 1, 0 );
if ( dvbConfig->devList.at(i)->lnb[1].rotorType==0 ) { if ( dvbConfig->devList.at(i)->lnb[1].rotorType==0 ) {
setSource( sat1[i], dvbConfig->devList.at(i)->lnb[1].source[0] ); setSource( sat1[i], dvbConfig->devList.at(i)->lnb[1].source[0] );
@ -733,13 +733,13 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lnb2[i]->setGuiItem( KGuiItem(i18n("LNB 3 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) ); lnb2[i]->setGuiItem( KGuiItem(i18n("LNB 3 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
lnb2[i]->setEnabled(false); lnb2[i]->setEnabled(false);
grid->addWidget( lnb2[i], gridLine, 0 ); grid->addWidget( lnb2[i], gridLine, 0 );
connect( lnb2[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); connect( lnb2[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setLnb(int,int)));
rotor2[i] = new MComboBox( gb, i, 2 ); rotor2[i] = new MComboBox( gb, i, 2 );
rotor2[i]->setEnabled(false); rotor2[i]->setEnabled(false);
rotor2[i]->insertStringList( rotorList ); rotor2[i]->insertStringList( rotorList );
rotor2[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[2].rotorType ); rotor2[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[2].rotorType );
grid->addWidget( rotor2[i], gridLine, 1 ); grid->addWidget( rotor2[i], gridLine, 1 );
connect( rotor2[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); connect( rotor2[i], TQ_SIGNAL(activated(int,int,int)), this, TQ_SLOT(setRotor(int,int,int)));
swidg = new TQWidget( gb ); swidg = new TQWidget( gb );
sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 );
sat2[i] = new TQComboBox( swidg ); sat2[i] = new TQComboBox( swidg );
@ -749,7 +749,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
src2[i] = new MPushButton( swidg, i, 2 ); src2[i] = new MPushButton( swidg, i, 2 );
src2[i]->setEnabled(false); src2[i]->setEnabled(false);
src2[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); src2[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) );
connect( src2[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); connect( src2[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setRotorSources(int,int)) );
sgrid->addWidget( src2[i], 1, 0 ); sgrid->addWidget( src2[i], 1, 0 );
if ( dvbConfig->devList.at(i)->lnb[2].rotorType==0 ) { if ( dvbConfig->devList.at(i)->lnb[2].rotorType==0 ) {
setSource( sat2[i], dvbConfig->devList.at(i)->lnb[2].source[0] ); setSource( sat2[i], dvbConfig->devList.at(i)->lnb[2].source[0] );
@ -765,13 +765,13 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
lnb3[i]->setGuiItem( KGuiItem(i18n("LNB 4 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) ); lnb3[i]->setGuiItem( KGuiItem(i18n("LNB 4 settings..."), icon->loadIconSet("hwinfo", TDEIcon::Small) ) );
lnb3[i]->setEnabled(false); lnb3[i]->setEnabled(false);
grid->addWidget( lnb3[i], gridLine, 0 ); grid->addWidget( lnb3[i], gridLine, 0 );
connect( lnb3[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setLnb(int,int))); connect( lnb3[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setLnb(int,int)));
rotor3[i] = new MComboBox( gb, i, 3 ); rotor3[i] = new MComboBox( gb, i, 3 );
rotor3[i]->setEnabled(false); rotor3[i]->setEnabled(false);
rotor3[i]->insertStringList( rotorList ); rotor3[i]->insertStringList( rotorList );
rotor3[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[3].rotorType ); rotor3[i]->setCurrentItem( dvbConfig->devList.at(i)->lnb[3].rotorType );
grid->addWidget( rotor3[i], gridLine, 1 ); grid->addWidget( rotor3[i], gridLine, 1 );
connect( rotor3[i], TQT_SIGNAL(activated(int,int,int)), this, TQT_SLOT(setRotor(int,int,int))); connect( rotor3[i], TQ_SIGNAL(activated(int,int,int)), this, TQ_SLOT(setRotor(int,int,int)));
swidg = new TQWidget( gb ); swidg = new TQWidget( gb );
sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 ); sgrid = new TQGridLayout( swidg, 1, 1, 0, 0 );
sat3[i] = new TQComboBox( swidg ); sat3[i] = new TQComboBox( swidg );
@ -781,7 +781,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
src3[i] = new MPushButton( swidg, i, 3 ); src3[i] = new MPushButton( swidg, i, 3 );
src3[i]->setEnabled(false); src3[i]->setEnabled(false);
src3[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) ); src3[i]->setGuiItem( KGuiItem(i18n("Sources list...") ) );
connect( src3[i], TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(setRotorSources(int,int)) ); connect( src3[i], TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(setRotorSources(int,int)) );
sgrid->addWidget( src3[i], 1, 0 ); sgrid->addWidget( src3[i], 1, 0 );
if ( dvbConfig->devList.at(i)->lnb[3].rotorType==0 ) { if ( dvbConfig->devList.at(i)->lnb[3].rotorType==0 ) {
setSource( sat3[i], dvbConfig->devList.at(i)->lnb[3].source[0] ); setSource( sat3[i], dvbConfig->devList.at(i)->lnb[3].source[0] );
@ -983,15 +983,15 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
KPushButton *btn = new KPushButton( p->pluginName(), gb ); KPushButton *btn = new KPushButton( p->pluginName(), gb );
grid->addWidget( btn, 0, 0 ); grid->addWidget( btn, 0, 0 );
connect( btn, TQT_SIGNAL(clicked()), p, TQT_SLOT(configDialog()) ); connect( btn, TQ_SIGNAL(clicked()), p, TQ_SLOT(configDialog()) );
vb->addWidget( gb ); vb->addWidget( gb );
vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
} }
connect( recordDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRecordDir()) ); connect( recordDirBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRecordDir()) );
connect( shiftDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setShiftDir()) ); connect( shiftDirBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setShiftDir()) );
connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadData()) ); connect( updateBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadData()) );
connect( helpNameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(fileTemplateHelp()) ); connect( helpNameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(fileTemplateHelp()) );
delete icon; delete icon;
} }
@ -1283,18 +1283,18 @@ LnbConfig::LnbConfig( LNB *b, TQWidget *parent ) :
TQVBoxLayout *vb = new TQVBoxLayout( page, 6, 6 ); TQVBoxLayout *vb = new TQVBoxLayout( page, 6, 6 );
univ = new TQPushButton( i18n("Universal LNB"), page ); univ = new TQPushButton( i18n("Universal LNB"), page );
connect( univ, TQT_SIGNAL(clicked()), this, TQT_SLOT(setUniversal()) ); connect( univ, TQ_SIGNAL(clicked()), this, TQ_SLOT(setUniversal()) );
vb->addWidget( univ ); vb->addWidget( univ );
cmono = new TQPushButton( i18n("C-Band LNB"), page ); cmono = new TQPushButton( i18n("C-Band LNB"), page );
connect( cmono, TQT_SIGNAL(clicked()), this, TQT_SLOT(setCBandMono()) ); connect( cmono, TQ_SIGNAL(clicked()), this, TQ_SLOT(setCBandMono()) );
vb->addWidget( cmono ); vb->addWidget( cmono );
cmulti = new TQPushButton( i18n("C-Band Multipoint LNB"), page ); cmulti = new TQPushButton( i18n("C-Band Multipoint LNB"), page );
connect( cmulti, TQT_SIGNAL(clicked()), this, TQT_SLOT(setCBandMulti()) ); connect( cmulti, TQ_SIGNAL(clicked()), this, TQ_SLOT(setCBandMulti()) );
vb->addWidget( cmulti ); vb->addWidget( cmulti );
grid = new TQGridLayout( 0, 1, 1 ); grid = new TQGridLayout( 0, 1, 1 );
nLO = new TQButtonGroup( 3, TQt::Horizontal, page ); nLO = new TQButtonGroup( 3, TQt::Horizontal, page );
connect( nLO, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setDual(int)) ); connect( nLO, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setDual(int)) );
new TQRadioButton( i18n("Dual LO"), nLO ); new TQRadioButton( i18n("Dual LO"), nLO );
new TQRadioButton( i18n("Single LO"), nLO ); new TQRadioButton( i18n("Single LO"), nLO );
new TQRadioButton( i18n("H/V LO"), nLO ); new TQRadioButton( i18n("H/V LO"), nLO );
@ -1492,7 +1492,7 @@ RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *parent ) :
vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
addBtn = new TQPushButton( i18n("Add to list"), page ); addBtn = new TQPushButton( i18n("Add to list"), page );
connect( addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()) ); connect( addBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()) );
vb->addWidget( addBtn ); vb->addWidget( addBtn );
vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); vb->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
@ -1501,7 +1501,7 @@ RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *parent ) :
vb->addWidget( listView ); vb->addWidget( listView );
resetBtn = new TQPushButton( i18n("Clear list"), page ); resetBtn = new TQPushButton( i18n("Clear list"), page );
connect( resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) ); connect( resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()) );
vb->addWidget( resetBtn ); vb->addWidget( resetBtn );
vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );

4
kaffeine/src/input/dvb/dvbout.cpp
Unescape View File

@ -61,8 +61,8 @@ DVBout::DVBout( ChannelDesc chan, int anum, int tnum, KaffeineDvbPlugin *p )
timeShifting = beginLive = false; timeShifting = beginLive = false;
haveRec = haveLive = instantRec = haveBroadcast = false; haveRec = haveLive = instantRec = haveBroadcast = false;
patpmt = wpatpmt = false; patpmt = wpatpmt = false;
connect( &stopRecTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopRec()) ); connect( &stopRecTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stopRec()) );
connect( &timerPatPmt, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPatPmt()) ); connect( &timerPatPmt, TQ_SIGNAL(timeout()), this, TQ_SLOT(setPatPmt()) );
if ( !pids.contains(8192) ) if ( !pids.contains(8192) )
timerPatPmt.start(500); timerPatPmt.start(500);
} }

114
kaffeine/src/input/dvb/dvbpanel.cpp
Unescape View File

@ -122,8 +122,8 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
iconView->setVScrollBarMode( TQScrollView::AlwaysOff ); iconView->setVScrollBarMode( TQScrollView::AlwaysOff );
iconView->setHScrollBarMode( TQScrollView::AlwaysOff ); iconView->setHScrollBarMode( TQScrollView::AlwaysOff );
iconView->horizontalScrollBar()->setFixedHeight( 0 ); iconView->horizontalScrollBar()->setFixedHeight( 0 );
connect( iconView, TQT_SIGNAL(rightButtonPressed(TQIconViewItem*,const TQPoint&)), this, TQT_SLOT(catContextMenu(TQIconViewItem*,const TQPoint&)) ); connect( iconView, TQ_SIGNAL(rightButtonPressed(TQIconViewItem*,const TQPoint&)), this, TQ_SLOT(catContextMenu(TQIconViewItem*,const TQPoint&)) );
connect( iconView, TQT_SIGNAL(clicked(TQIconViewItem*)), this, TQT_SLOT(catSelected(TQIconViewItem*)) ); connect( iconView, TQ_SIGNAL(clicked(TQIconViewItem*)), this, TQ_SLOT(catSelected(TQIconViewItem*)) );
iconView->setArrangement(TQIconView::TopToBottom); iconView->setArrangement(TQIconView::TopToBottom);
iconView->setMargin(0); iconView->setMargin(0);
iconView->setSpacing(0); iconView->setSpacing(0);
@ -183,10 +183,10 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
channelsCb = new DListView( panel ); channelsCb = new DListView( panel );
channelsCb->setHScrollBarMode( TQListView::AlwaysOff ); channelsCb->setHScrollBarMode( TQListView::AlwaysOff );
//channelsCb->setPaletteBackgroundColor( TQColor(255,255,200) ); //channelsCb->setPaletteBackgroundColor( TQColor(255,255,200) );
connect( channelsCb, TQT_SIGNAL(itemRenamed(TQListViewItem*)), this, TQT_SLOT(channelNumberChanged(TQListViewItem*)) ); connect( channelsCb, TQ_SIGNAL(itemRenamed(TQListViewItem*)), this, TQ_SLOT(channelNumberChanged(TQListViewItem*)) );
connect( channelsCb, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(channelSelected(TQListViewItem*)) ); connect( channelsCb, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(channelSelected(TQListViewItem*)) );
connect( channelsCb, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(channelClicked(TQListViewItem*)) ); connect( channelsCb, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(channelClicked(TQListViewItem*)) );
connect( channelsCb, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(channelPopup(TQListViewItem*,const TQPoint&,int)) ); connect( channelsCb, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQ_SLOT(channelPopup(TQListViewItem*,const TQPoint&,int)) );
channelsCb->setItemsRenameable( true ); channelsCb->setItemsRenameable( true );
channelsCb->addColumn( i18n("Number") ); channelsCb->addColumn( i18n("Number") );
channelsCb->addColumn( i18n("Name") ); channelsCb->addColumn( i18n("Name") );
@ -254,25 +254,25 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
setXMLFile("kaffeinedvb.rc"); setXMLFile("kaffeinedvb.rc");
setupActions(); setupActions();
connect( this, TQT_SIGNAL(zap(ChannelDesc*)), TQT_SLOT(dvbZap(ChannelDesc*)) ); connect( this, TQ_SIGNAL(zap(ChannelDesc*)), TQ_SLOT(dvbZap(ChannelDesc*)) );
connect( configBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showConfigDialog())); connect( configBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showConfigDialog()));
connect( recallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(recallZap())); connect( recallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallZap()));
connect( recordBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRecord()) ); connect( recordBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRecord()) );
connect( broadcastBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setBroadcast()) ); connect( broadcastBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setBroadcast()) );
connect( infoBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEvents()) ); connect( infoBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEvents()) );
connect( channelsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(scanner()) ); connect( channelsBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(scanner()) );
connect( dateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(showTimers()) ); connect( dateBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(showTimers()) );
connect( osdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dvbOSD())); connect( osdBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(dvbOSD()));
connect( searchBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetSearch()) ); connect( searchBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetSearch()) );
connect(searchLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(searchChannel(const TQString&))); connect(searchLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(searchChannel(const TQString&)));
connect( &timersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkTimers()) ); connect( &timersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkTimers()) );
connect( &osdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resetOSD()) ); connect( &osdTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resetOSD()) );
connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) ); connect( &showOsdTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(dvbOSD()) );
connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); connect( &tuningTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTuning()) );
connect( &stopTuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) ); connect( &stopTuningTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTuning()) );
connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(diskStatus()) ); connect( &diskTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(diskStatus()) );
setConfig(); setConfig();
@ -425,7 +425,7 @@ bool DvbPanel::execTarget( const TQString &target )
return true; return true;
} }
emit showMe( this ); emit showMe( this );
TQTimer::singleShot( 100, this, TQT_SLOT(playLastChannel()) ); TQTimer::singleShot( 100, this, TQ_SLOT(playLastChannel()) );
return true; return true;
} }
return false; return false;
@ -435,19 +435,19 @@ bool DvbPanel::execTarget( const TQString &target )
void DvbPanel::setupActions() void DvbPanel::setupActions()
{ {
new TDEAction(i18n("OSD Next Channel"), "go-next", CTRL+SHIFT+Key_W, this, TQT_SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next"); new TDEAction(i18n("OSD Next Channel"), "go-next", CTRL+SHIFT+Key_W, this, TQ_SLOT(dvbOSDNext()), actionCollection(), "dvb_browse_next");
new TDEAction(i18n("OSD Previous Channel"), "go-previous", CTRL+SHIFT+Key_Q, this, TQT_SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev"); new TDEAction(i18n("OSD Previous Channel"), "go-previous", CTRL+SHIFT+Key_Q, this, TQ_SLOT(dvbOSDPrev()), actionCollection(),"dvb_browse_prev");
new TDEAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQT_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap"); new TDEAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQ_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap");
new TDEAction(i18n("OSD Next Event"), "go-down", CTRL+SHIFT+Key_S, this, TQT_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance"); new TDEAction(i18n("OSD Next Event"), "go-down", CTRL+SHIFT+Key_S, this, TQ_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance");
new TDEAction(i18n("OSD Previous Event"), "go-up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat"); new TDEAction(i18n("OSD Previous Event"), "go-up", CTRL+SHIFT+Key_A, this, TQ_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat");
new TDEAction(i18n("Instant Record"), "document-save", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record"); new TDEAction(i18n("Instant Record"), "document-save", 0, this, TQ_SLOT(setRecord()), actionCollection(), "dvb_instant_record");
new TDEAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall"); new TDEAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQ_SLOT(recallZap()), actionCollection(), "dvb_recall");
new TDEAction(i18n("Show OSD"), "application-vnd.tde.info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd"); new TDEAction(i18n("Show OSD"), "application-vnd.tde.info", Key_O, this, TQ_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd");
new TDEAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg"); new TDEAction(i18n("EPG..."), "view_text", Key_G, this, TQ_SLOT(showEvents()), actionCollection(), "dvb_show_epg");
new TDEAction(i18n("Timers..."), "date", Key_T, this, TQT_SLOT(showTimers()), actionCollection(), "dvb_show_timers"); new TDEAction(i18n("Timers..."), "date", Key_T, this, TQ_SLOT(showTimers()), actionCollection(), "dvb_show_timers");
new TDEAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQT_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast"); new TDEAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQ_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast");
new TDEAction(i18n("Channels..."), "kdvbtv", Key_C, this, TQT_SLOT(scanner()), actionCollection(), "dvb_channels"); new TDEAction(i18n("Channels..."), "kdvbtv", Key_C, this, TQ_SLOT(scanner()), actionCollection(), "dvb_channels");
new TDEAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, TQT_SLOT(showConfigDialog()), actionCollection(), "dvb_config"); new TDEAction(i18n("Configure DVB..."), "configure", CTRL|Key_C, this, TQ_SLOT(showConfigDialog()), actionCollection(), "dvb_config");
} }
@ -1059,11 +1059,11 @@ void DvbPanel::setConfig()
d = new DvbStream( dvbConfig->devList.at(i), dvbConfig->defaultCharset, &events ); d = new DvbStream( dvbConfig->devList.at(i), dvbConfig->defaultCharset, &events );
d->setPlug( plug ); d->setPlug( plug );
dvb.append( d ); dvb.append( d );
connect( d, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(setShiftLed(bool)) ); connect( d, TQ_SIGNAL(shifting(bool)), this, TQ_SLOT(setShiftLed(bool)) );
connect( d, TQT_SIGNAL(isBroadcasting(bool)), this, TQT_SLOT(setBroadcastLed(bool)) ); connect( d, TQ_SIGNAL(isBroadcasting(bool)), this, TQ_SLOT(setBroadcastLed(bool)) );
connect( d, TQT_SIGNAL(timerEnded(RecTimer*)), this, TQT_SLOT(killTimer(RecTimer*)) ); connect( d, TQ_SIGNAL(timerEnded(RecTimer*)), this, TQ_SLOT(killTimer(RecTimer*)) );
connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) ); connect( d, TQ_SIGNAL(isRecording(bool)), this, TQ_SLOT(setRecordLed(bool)) );
connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) ); connect( d, TQ_SIGNAL(playDvb()), this, TQ_SLOT(pipeOpened()) );
} }
fifoName = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts"; fifoName = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts";
TQFile f( fifoName ); TQFile f( fifoName );
@ -1112,9 +1112,9 @@ loop:
for ( i=0; i<(int)dvb.count(); i++ ) for ( i=0; i<(int)dvb.count(); i++ )
dvb.at(i)->probeCam(); dvb.at(i)->probeCam();
DvbConfigDialog dlg( this, dvbConfig, mainWidget, plug ); DvbConfigDialog dlg( this, dvbConfig, mainWidget, plug );
connect( dlg.dumpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dumpEvents()) ); connect( dlg.dumpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(dumpEvents()) );
ret = dlg.exec(); ret = dlg.exec();
disconnect( dlg.dumpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(dumpEvents()) ); disconnect( dlg.dumpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(dumpEvents()) );
if ( ret==DvbConfigDialog::Rejected ) if ( ret==DvbConfigDialog::Rejected )
return; return;
rtp->setSocket( dvbConfig->broadcastAddress, dvbConfig->broadcastPort, dvbConfig->senderPort ); rtp->setSocket( dvbConfig->broadcastAddress, dvbConfig->broadcastPort, dvbConfig->senderPort );
@ -1606,14 +1606,14 @@ void DvbPanel::showTimers()
timersDialog = new KRecord( list, &timers, mainWidget, dvbConfig->timerSize ); timersDialog = new KRecord( list, &timers, mainWidget, dvbConfig->timerSize );
for ( i=0; i<(int)dvb.count(); i++ ) { for ( i=0; i<(int)dvb.count(); i++ ) {
connect( timersDialog, TQT_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQT_SLOT(updateTimer(RecTimer*,int)) ); connect( timersDialog, TQ_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQ_SLOT(updateTimer(RecTimer*,int)) );
} }
connect( this, TQT_SIGNAL(timersChanged()), timersDialog, TQT_SLOT(refresh()) ); connect( this, TQ_SIGNAL(timersChanged()), timersDialog, TQ_SLOT(refresh()) );
timersDialog->exec(); timersDialog->exec();
for ( i=0; i<(int)dvb.count(); i++ ) { for ( i=0; i<(int)dvb.count(); i++ ) {
disconnect( timersDialog, TQT_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQT_SLOT(updateTimer(RecTimer*,int)) ); disconnect( timersDialog, TQ_SIGNAL(updateTimer(RecTimer*,int)), dvb.at(i), TQ_SLOT(updateTimer(RecTimer*,int)) );
} }
disconnect( this, TQT_SIGNAL(timersChanged()), timersDialog, TQT_SLOT(refresh()) ); disconnect( this, TQ_SIGNAL(timersChanged()), timersDialog, TQ_SLOT(refresh()) );
dvbConfig->timerSize = timersDialog->size(); dvbConfig->timerSize = timersDialog->size();
delete timersDialog; delete timersDialog;
timersDialog = 0; timersDialog = 0;
@ -1692,12 +1692,12 @@ void DvbPanel::showEvents()
{ {
events.doClean( false ); events.doClean( false );
KEvents dlg( &channels, &dvb, &events, mainWidget, dvbConfig->epgSize ); KEvents dlg( &channels, &dvb, &events, mainWidget, dvbConfig->epgSize );
connect( &dlg, TQT_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQT_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) ); connect( &dlg, TQ_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQ_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) );
connect( &dlg, TQT_SIGNAL(zapTo(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); connect( &dlg, TQ_SIGNAL(zapTo(const TQString &)), this, TQ_SLOT(channelSelected(const TQString &)) );
dlg.exec(); dlg.exec();
dvbConfig->epgSize = dlg.size(); dvbConfig->epgSize = dlg.size();
disconnect( &dlg, TQT_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQT_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) ); disconnect( &dlg, TQ_SIGNAL(addTimer(TQString,TQString,TQDateTime,TQTime)), this, TQ_SLOT(newTimer(TQString,TQString,TQDateTime,TQTime)) );
disconnect( &dlg, TQT_SIGNAL(zapTo(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); disconnect( &dlg, TQ_SIGNAL(zapTo(const TQString &)), this, TQ_SLOT(channelSelected(const TQString &)) );
events.doClean( true ); events.doClean( true );
} }
@ -1844,7 +1844,7 @@ void DvbPanel::playLastChannel()
} }
} }
if ( ! list.count() ) { if ( ! list.count() ) {
TQTimer::singleShot( 2000, this, TQT_SLOT(playLastChannel()) ); TQTimer::singleShot( 2000, this, TQ_SLOT(playLastChannel()) );
return; return;
} }
d = getWorkingDvb( MODE_BROADCAST, list.at(0) ); d = getWorkingDvb( MODE_BROADCAST, list.at(0) );
@ -1868,7 +1868,7 @@ void DvbPanel::playLastChannel()
else else
fprintf( stderr, "Can't start broadcasting.\n"); fprintf( stderr, "Can't start broadcasting.\n");
TQTimer::singleShot( 2000, this, TQT_SLOT(playLastChannel()) ); TQTimer::singleShot( 2000, this, TQ_SLOT(playLastChannel()) );
return;*/ return;*/
@ -2055,7 +2055,7 @@ void DvbPanel::finalZap( DvbStream *d, ChannelDesc *chan )
recallChannel = dvbConfig->lastChannel; recallChannel = dvbConfig->lastChannel;
dvbConfig->lastChannel = chan->num; dvbConfig->lastChannel = chan->num;
} }
//TQTimer::singleShot( 3000, this, TQT_SLOT(playLastChannel()) ); //TQTimer::singleShot( 3000, this, TQ_SLOT(playLastChannel()) );
} }

26
kaffeine/src/input/dvb/dvbstream.cpp
Unescape View File

@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
cam = NULL; cam = NULL;
plug = NULL; plug = NULL;
connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) ); connect( &statusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkStatus()) );
} }
@ -869,9 +869,9 @@ void DvbStream::removePids( DVBout *o )
void DvbStream::removeOut( DVBout *o ) void DvbStream::removeOut( DVBout *o )
{ {
disconnect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); disconnect( o, TQ_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQ_SLOT(recordEnded(DVBout*,RecTimer*,bool)) );
disconnect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); disconnect( o, TQ_SIGNAL(playDvb()), this, TQ_SLOT(receivePlayDvb()) );
disconnect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); disconnect( o, TQ_SIGNAL(shifting(bool)), this, TQ_SLOT(receiveShifting(bool)) );
delOut = o; delOut = o;
while ( delOut ) while ( delOut )
usleep(100); usleep(100);
@ -1174,9 +1174,9 @@ bool DvbStream::startBroadcast( TQPtrList<ChannelDesc> *list, Ts2Rtp *rtp )
if ( !o ) { if ( !o ) {
o = new DVBout( *list->at(i), dvbDevice->adapter, dvbDevice->tuner, plug ); o = new DVBout( *list->at(i), dvbDevice->adapter, dvbDevice->tuner, plug );
connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); connect( o, TQ_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQ_SLOT(recordEnded(DVBout*,RecTimer*,bool)) );
connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); connect( o, TQ_SIGNAL(playDvb()), this, TQ_SLOT(receivePlayDvb()) );
connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); connect( o, TQ_SIGNAL(shifting(bool)), this, TQ_SLOT(receiveShifting(bool)) );
out.append( o ); out.append( o );
if ( !setPids( o ) ) { if ( !setPids( o ) ) {
removePids( o ); removePids( o );
@ -1288,9 +1288,9 @@ bool DvbStream::startTimer( ChannelDesc *chan, TQString path, int maxsize, RecTi
if ( !o ) { if ( !o ) {
o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug ); o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug );
connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); connect( o, TQ_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQ_SLOT(recordEnded(DVBout*,RecTimer*,bool)) );
connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); connect( o, TQ_SIGNAL(playDvb()), this, TQ_SLOT(receivePlayDvb()) );
connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); connect( o, TQ_SIGNAL(shifting(bool)), this, TQ_SLOT(receiveShifting(bool)) );
out.append( o ); out.append( o );
if ( !setPids( o ) ) { if ( !setPids( o ) ) {
if ( stop ) if ( stop )
@ -1364,9 +1364,9 @@ int DvbStream::goLive( ChannelDesc *chan, const TQString &pipeName, int ringBufS
if ( !o ) { if ( !o ) {
o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug ); o = new DVBout( *chan, dvbDevice->adapter, dvbDevice->tuner, plug );
connect( o, TQT_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQT_SLOT(recordEnded(DVBout*,RecTimer*,bool)) ); connect( o, TQ_SIGNAL(endRecord(DVBout*,RecTimer*,bool)), this, TQ_SLOT(recordEnded(DVBout*,RecTimer*,bool)) );
connect( o, TQT_SIGNAL(playDvb()), this, TQT_SLOT(receivePlayDvb()) ); connect( o, TQ_SIGNAL(playDvb()), this, TQ_SLOT(receivePlayDvb()) );
connect( o, TQT_SIGNAL(shifting(bool)), this, TQT_SLOT(receiveShifting(bool)) ); connect( o, TQ_SIGNAL(shifting(bool)), this, TQ_SLOT(receiveShifting(bool)) );
out.append( o ); out.append( o );
if ( !setPids( o ) ) { if ( !setPids( o ) ) {
if ( stop ) if ( stop )

24
kaffeine/src/input/dvb/kevents.cpp
Unescape View File

@ -143,18 +143,18 @@ KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventT
new EListViewItem( (TQListView*)listView, "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 ); new EListViewItem( (TQListView*)listView, "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 );
resize( size ); resize( size );
connect( resetBtn , TQT_SIGNAL( pressed() ), this, TQT_SLOT( reset() ) ); connect( resetBtn , TQ_SIGNAL( pressed() ), this, TQ_SLOT( reset() ) );
connect( allBtn , TQT_SIGNAL( clicked() ), this, TQT_SLOT( setScheduled() ) ); connect( allBtn , TQ_SIGNAL( clicked() ), this, TQ_SLOT( setScheduled() ) );
connect( currentNextBtn , TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCurrentNext() ) ); connect( currentNextBtn , TQ_SIGNAL( clicked() ), this, TQ_SLOT( setCurrentNext() ) );
connect( currentChannelEpgBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCurrentChannelEpg() ) ); connect( currentChannelEpgBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setCurrentChannelEpg() ) );
connect( searchBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(resetSearch()) ); connect( searchBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(resetSearch()) );
connect( searchLineEdit, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( epgSearch() ) ); connect( searchLineEdit, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( epgSearch() ) );
connect( listView, TQT_SIGNAL( mouseButtonClicked(int,TQListViewItem*,const TQPoint&,int) ), connect( listView, TQ_SIGNAL( mouseButtonClicked(int,TQListViewItem*,const TQPoint&,int) ),
this, TQT_SLOT(mouseClickedSlot(int,TQListViewItem*,const TQPoint&,int)) ); this, TQ_SLOT(mouseClickedSlot(int,TQListViewItem*,const TQPoint&,int)) );
connect( listView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), connect( listView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)),
this, TQT_SLOT(zap(TQListViewItem*,const TQPoint &,int)) ); this, TQ_SLOT(zap(TQListViewItem*,const TQPoint &,int)) );
setMode( 1 ); setMode( 1 );
delete icon; delete icon;

8
kaffeine/src/input/dvb/krecord.cpp
Unescape View File

@ -97,10 +97,10 @@ KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *paren
setCaption( i18n("Timers") ); setCaption( i18n("Timers") );
connect( okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTimer()) ); connect( newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTimer()) );
connect( deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteTimer()) ); connect( deleteBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteTimer()) );
connect( editBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editTimer()) ); connect( editBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editTimer()) );
refresh(); refresh();
resize( size ); resize( size );

20
kaffeine/src/input/dvb/ktimereditor.cpp
Unescape View File

@ -120,12 +120,12 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
setCaption( i18n("Timer Editor") ); setCaption( i18n("Timer Editor") );
connect( okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
connect( cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); connect( cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) );
connect( repeatBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRepeat()) ); connect( repeatBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRepeat()) );
connect( begin, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setMaxEnd(const TQDateTime&)) ); connect( begin, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(setMaxEnd(const TQDateTime&)) );
connect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); connect( end, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(setDuration(const TQDateTime&)) );
connect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); connect( duration, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(setEnd(const TQTime&)) );
setMaxEnd( begin->dateTime() ); setMaxEnd( begin->dateTime() );
delete icon; delete icon;
} }
@ -144,18 +144,18 @@ void KTimerEditor::setMaxEnd( const TQDateTime &dt )
void KTimerEditor::setDuration( const TQDateTime &dt ) void KTimerEditor::setDuration( const TQDateTime &dt )
{ {
disconnect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); disconnect( duration, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(setEnd(const TQTime&)) );
duration->setTime( TQTime().addSecs( begin->dateTime().secsTo( dt ) ) ); duration->setTime( TQTime().addSecs( begin->dateTime().secsTo( dt ) ) );
connect( duration, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(setEnd(const TQTime&)) ); connect( duration, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(setEnd(const TQTime&)) );
} }
void KTimerEditor::setEnd( const TQTime &t ) void KTimerEditor::setEnd( const TQTime &t )
{ {
disconnect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); disconnect( end, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(setDuration(const TQDateTime&)) );
end->setDateTime( begin->dateTime().addSecs( TQTime().secsTo( t ) ) ); end->setDateTime( begin->dateTime().addSecs( TQTime().secsTo( t ) ) );
connect( end, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(setDuration(const TQDateTime&)) ); connect( end, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(setDuration(const TQDateTime&)) );
} }

2
kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
Unescape View File

@ -206,7 +206,7 @@ EventDesc *EventSource::getEventDesc( int nid, int tsid, int sid, int n )
EventTable::EventTable() EventTable::EventTable()
{ {
srcList.setAutoDelete( true ); srcList.setAutoDelete( true );
connect ( &cleanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setClean()) ); connect ( &cleanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setClean()) );
cleanTimer.start( 10000 ); cleanTimer.start( 10000 );
epgLoaded = false; epgLoaded = false;
} }

50
kaffeine/src/input/dvb/scandialog.cpp
Unescape View File

@ -138,7 +138,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
startBtn->setPaletteForegroundColor( TQColor(255,0,0) ); startBtn->setPaletteForegroundColor( TQColor(255,0,0) );
connect( searchComb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDvb(int)) ); connect( searchComb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDvb(int)) );
ds = dvb->at(0); ds = dvb->at(0);
ds->setScanning( true ); ds->setScanning( true );
@ -148,25 +148,25 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
offsetGroup->hide(); offsetGroup->hide();
bool ok=false; bool ok=false;
dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); connect( ds, TQ_SIGNAL(snrStatus(int)), snr, TQ_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); connect( ds, TQ_SIGNAL(signalStatus(int)), signal, TQ_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); connect( ds, TQ_SIGNAL(lockStatus(bool)), this, TQ_SLOT(setLock(bool)) );
connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); connect( dvbsi, TQ_SIGNAL(end(bool)), this, TQ_SLOT(siEnded(bool)) );
connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) ); connect( &checkTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( checkNewChannel() ) );
connect( &progressTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( setProgress() ) ); connect( &progressTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( setProgress() ) );
connect( startBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(scan(bool)) ); connect( startBtn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(scan(bool)) );
connect( addfilteredBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFiltered()) ); connect( addfilteredBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addFiltered()) );
connect( addselectedBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSelected()) ); connect( addselectedBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSelected()) );
connect( channelsList, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(pop(TQListViewItem*,const TQPoint&,int)) ); connect( channelsList, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQ_SLOT(pop(TQListViewItem*,const TQPoint&,int)) );
connect( channelsList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), this, TQT_SLOT( slotChannelChanged(TQListViewItem*,const TQPoint &,int) ) ); connect( channelsList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), this, TQ_SLOT( slotChannelChanged(TQListViewItem*,const TQPoint &,int) ) );
connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChannel()) ); connect( newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newChannel()) );
connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteAll()) ); connect( delBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteAll()) );
connect( selectallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll()) ); connect( selectallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAll()) );
TQAccel *ac = new TQAccel( channelsList ); TQAccel *ac = new TQAccel( channelsList );
ac->insertItem( Key_Delete, 100 ); ac->insertItem( Key_Delete, 100 );
ac->connectItem( 100, this, TQT_SLOT(deleteChannel()) ); ac->connectItem( 100, this, TQ_SLOT(deleteChannel()) );
resize( size ); resize( size );
delete icon; delete icon;
@ -209,20 +209,20 @@ void ScanDialog::setDvb( int index )
checkTimer.stop(); checkTimer.stop();
if ( progressTimer.isActive() ) if ( progressTimer.isActive() )
progressTimer.stop(); progressTimer.stop();
disconnect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); disconnect( ds, TQ_SIGNAL(snrStatus(int)), snr, TQ_SLOT(setProgress(int)) );
disconnect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); disconnect( ds, TQ_SIGNAL(signalStatus(int)), signal, TQ_SLOT(setProgress(int)) );
disconnect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); disconnect( ds, TQ_SIGNAL(lockStatus(bool)), this, TQ_SLOT(setLock(bool)) );
disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); disconnect( dvbsi, TQ_SIGNAL(end(bool)), this, TQ_SLOT(siEnded(bool)) );
ds->setScanning( false ); ds->setScanning( false );
dvbsi->stop(); dvbsi->stop();
delete dvbsi; delete dvbsi;
ds = dvb->at(i); ds = dvb->at(i);
ds->setScanning( true ); ds->setScanning( true );
dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset ); dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) ); connect( ds, TQ_SIGNAL(snrStatus(int)), snr, TQ_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) ); connect( ds, TQ_SIGNAL(signalStatus(int)), signal, TQ_SLOT(setProgress(int)) );
connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) ); connect( ds, TQ_SIGNAL(lockStatus(bool)), this, TQ_SLOT(setLock(bool)) );
connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) ); connect( dvbsi, TQ_SIGNAL(end(bool)), this, TQ_SLOT(siEnded(bool)) );
break; break;
} }
} }

12
kaffeine/src/input/dvb/subeditor.cpp
Unescape View File

@ -43,12 +43,12 @@ SubEditor::SubEditor( ChannelDesc *chan, TQWidget *parent ) : SubEditorUI( paren
if ( channel->nsubpid==channel->maxsubpid ) newBtn->setEnabled( false ); if ( channel->nsubpid==channel->maxsubpid ) newBtn->setEnabled( false );
connect( pidList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(showProp(int)) ); connect( pidList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(showProp(int)) );
connect( upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUp()) ); connect( upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemUp()) );
connect( downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDown()) ); connect( downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemDown()) );
connect( delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemDelete()) ); connect( delBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemDelete()) );
connect( updateBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemUpdate()) ); connect( updateBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemUpdate()) );
connect( newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(itemNew()) ); connect( newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(itemNew()) );
} }

2
kaffeine/src/input/dvb/ts2rtp.cpp
Unescape View File

@ -65,7 +65,7 @@ Ts2Rtp::Ts2Rtp()
psiBufferSize = 20*TS_SIZE; psiBufferSize = 20*TS_SIZE;
psiBuffer = (unsigned char*)malloc(psiBufferSize); psiBuffer = (unsigned char*)malloc(psiBufferSize);
connect( &psiTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPSI()) ); connect( &psiTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setPSI()) );
} }

2
kaffeine/src/input/dvbclient/cdcleaner.cpp
Unescape View File

@ -29,7 +29,7 @@ CdCleaner::CdCleaner( const TQString &path )
{ {
livePath = path; livePath = path;
connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doClean()) ); connect( &timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doClean()) );
timer.start( 60*1000 ); timer.start( 60*1000 );
} }

2
kaffeine/src/input/dvbclient/cddump.cpp
Unescape View File

@ -43,7 +43,7 @@ CdDump::CdDump( const TQString &pipe )
isRunning = false; isRunning = false;
fifoName = pipe; fifoName = pipe;
connect( &timerPatPmt, TQT_SIGNAL(timeout()), this, TQT_SLOT(setPatPmt()) ); connect( &timerPatPmt, TQ_SIGNAL(timeout()), this, TQ_SLOT(setPatPmt()) );
timerPatPmt.start( 500 ); timerPatPmt.start( 500 );
} }

2
kaffeine/src/input/dvbclient/cdlisten.cpp
Unescape View File

@ -29,7 +29,7 @@
CdListen::CdListen() CdListen::CdListen()
{ {
connect( &timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()) ); connect( &timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList()) );
} }

6
kaffeine/src/input/dvbclient/cdwidget.cpp
Unescape View File

@ -72,8 +72,8 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
} }
else { else {
dump = new CdDump( fifoName ); dump = new CdDump( fifoName );
connect( channelsLb, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(channelSelected(const TQString &)) ); connect( channelsLb, TQ_SIGNAL(selected(const TQString &)), this, TQ_SLOT(channelSelected(const TQString &)) );
connect( listen, TQT_SIGNAL(listChanged(const TQString&)), this, TQT_SLOT(updateList(const TQString&)) ); connect( listen, TQ_SIGNAL(listChanged(const TQString&)), this, TQ_SLOT(updateList(const TQString&)) );
} }
lastChannel = 0; lastChannel = 0;
@ -106,7 +106,7 @@ bool CdWidget::execTarget( const TQString &target )
{ {
if ( target=="DVBCLIENT" ) { if ( target=="DVBCLIENT" ) {
emit showMe( this ); emit showMe( this );
TQTimer::singleShot( 100, this, TQT_SLOT(playLastChannel()) ); TQTimer::singleShot( 100, this, TQ_SLOT(playLastChannel()) );
return true; return true;
} }
return false; return false;

20
kaffeine/src/inputmanager.cpp
Unescape View File

@ -350,15 +350,15 @@ bool InputManager::close()
void InputManager::add( KaffeineInput *p, const TQPixmap &icon, const TQString &name ) void InputManager::add( KaffeineInput *p, const TQPixmap &icon, const TQString &name )
{ {
mtBar->appendTab( icon, nextId, name ); mtBar->appendTab( icon, nextId, name );
connect( mtBar->tab( nextId ), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(show(int)) ); connect( mtBar->tab( nextId ), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(show(int)) );
stack->addWidget( p->inputMainWidget(), nextId ); stack->addWidget( p->inputMainWidget(), nextId );
plugs.append( new InputPlugin( p, nextId, name ) ); plugs.append( new InputPlugin( p, nextId, name ) );
connect( p, TQT_SIGNAL(play(const MRL&,KaffeineInput*)), this, TQT_SLOT(play(const MRL&,KaffeineInput*))); connect( p, TQ_SIGNAL(play(const MRL&,KaffeineInput*)), this, TQ_SLOT(play(const MRL&,KaffeineInput*)));
connect( p, TQT_SIGNAL(setCurrentPlugin(KaffeineInput*)), this, TQT_SLOT(setCurrentPlugin(KaffeineInput*))); connect( p, TQ_SIGNAL(setCurrentPlugin(KaffeineInput*)), this, TQ_SLOT(setCurrentPlugin(KaffeineInput*)));
connect( p, TQT_SIGNAL(statusBarMessage(const TQString&)), this, TQT_SLOT(statusBarMessage(const TQString&))); connect( p, TQ_SIGNAL(statusBarMessage(const TQString&)), this, TQ_SLOT(statusBarMessage(const TQString&)));
connect( p, TQT_SIGNAL(stop()), this, TQT_SLOT(stop())); connect( p, TQ_SIGNAL(stop()), this, TQ_SLOT(stop()));
connect( p, TQT_SIGNAL(pause()), this, TQT_SLOT(pause())); connect( p, TQ_SIGNAL(pause()), this, TQ_SLOT(pause()));
connect( p, TQT_SIGNAL(showMe(KaffeineInput*)), this, TQT_SLOT(showMe(KaffeineInput*))); connect( p, TQ_SIGNAL(showMe(KaffeineInput*)), this, TQ_SLOT(showMe(KaffeineInput*)));
if ( !currentPlugin ) if ( !currentPlugin )
currentPlugin = plugs.current()->plug; currentPlugin = plugs.current()->plug;
++nextId; ++nextId;
@ -371,7 +371,7 @@ void InputManager::addPlayerWidget( TQWidget *w, const TQPixmap &icon, const TQS
{ {
playerWidget = w; playerWidget = w;
mtBar->appendTab( icon, 2, name ); mtBar->appendTab( icon, 2, name );
connect( mtBar->tab(2), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(show(int)) ); connect( mtBar->tab(2), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(show(int)) );
stack->addWidget( playerWidget, 2 ); stack->addWidget( playerWidget, 2 );
} }
@ -381,12 +381,12 @@ void InputManager::addStartWindow( TQWidget *w, const TQPixmap &icon, const TQSt
{ {
startWindow = w; startWindow = w;
mtBar->appendTab( icon, 1, name ); mtBar->appendTab( icon, 1, name );
connect( mtBar->tab(1), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(show(int)) ); connect( mtBar->tab(1), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(show(int)) );
stack->addWidget( startWindow, 1 ); stack->addWidget( startWindow, 1 );
mtBar->setTab( 1, true ); mtBar->setTab( 1, true );
stack->raiseWidget( 1 ); stack->raiseWidget( 1 );
oldMainWidget = currentMainWidget = startWindow; oldMainWidget = currentMainWidget = startWindow;
connect( (StartWindow*)w, TQT_SIGNAL(execTarget(const TQString&)), this, TQT_SLOT(execTarget(const TQString&)) ); connect( (StartWindow*)w, TQ_SIGNAL(execTarget(const TQString&)), this, TQ_SLOT(execTarget(const TQString&)) );
} }

2
kaffeine/src/instwizard.cpp
Unescape View File

@ -150,7 +150,7 @@ void InstWizard::internalWizard()
info << "<br><hr><b>" << i18n("DVD Drive") << "...</b><br>"; info << "<br><hr><b>" << i18n("DVD Drive") << "...</b><br>";
TDEProcess process; TDEProcess process;
process << "/sbin/hdparm" << "-d" << "/dev/dvd"; process << "/sbin/hdparm" << "-d" << "/dev/dvd";
connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQT_SLOT(slotStdout(TDEProcess*, char*, int))); connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQ_SLOT(slotStdout(TDEProcess*, char*, int)));
process.start(TDEProcess::Block, TDEProcess::Stdout); process.start(TDEProcess::Block, TDEProcess::Stdout);
if (stdout.contains('1')) if (stdout.contains('1'))

154
kaffeine/src/kaffeine.cpp
Unescape View File

@ -197,9 +197,9 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted", TDEIcon::Small), i18n( "Audio CD") ); inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted", TDEIcon::Small), i18n( "Audio CD") );
guiFactory()->addClient( cddisc ); guiFactory()->addClient( cddisc );
connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&))); connect(m_playlist, TQ_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQ_SLOT(startDVD(const TQString&)));
connect(m_playlist, TQT_SIGNAL(signalRequestForVCD(const TQString&)), cddisc, TQT_SLOT(startVCD(const TQString&))); connect(m_playlist, TQ_SIGNAL(signalRequestForVCD(const TQString&)), cddisc, TQ_SLOT(startVCD(const TQString&)));
connect(m_playlist, TQT_SIGNAL(signalRequestForAudioCD(const TQString&)), cddisc, TQT_SLOT(startCD(const TQString&))); connect(m_playlist, TQ_SIGNAL(signalRequestForAudioCD(const TQString&)), cddisc, TQ_SLOT(startCD(const TQString&)));
#ifdef HAVE_DVB #ifdef HAVE_DVB
if ( dvbPanel ) if ( dvbPanel )
@ -247,13 +247,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
else else
kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl; kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl;
connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFakeKeyEvent())); connect(&m_screensaverTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFakeKeyEvent()));
m_screensaverTimer.start( 55000 ); m_screensaverTimer.start( 55000 );
connect( &m_numKeyHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRequestForTrackNumber()) ); connect( &m_numKeyHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRequestForTrackNumber()) );
TDEAccel* accel = new TDEAccel(this); TDEAccel* accel = new TDEAccel(this);
accel->insert("Escape Fullscreen", Key_Escape, this, TQT_SLOT(slotEscapeFullscreen())); accel->insert("Escape Fullscreen", Key_Escape, this, TQ_SLOT(slotEscapeFullscreen()));
loadConfig(); loadConfig();
//slotChangeStatusbar(i18n("Kaffeine Player") + " " + KAFFEINE_VERSION); //slotChangeStatusbar(i18n("Kaffeine Player") + " " + KAFFEINE_VERSION);
@ -381,7 +381,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
//player container widget, will contain the player part //player container widget, will contain the player part
m_playerContainer = new PlayerContainer(playerWidget); m_playerContainer = new PlayerContainer(playerWidget);
connect(m_playerContainer, TQT_SIGNAL(signalURLDropEvent(const TQStringList&)), this, TQT_SLOT(slotLoadURLS(const TQStringList&))); connect(m_playerContainer, TQ_SIGNAL(signalURLDropEvent(const TQStringList&)), this, TQ_SLOT(slotLoadURLS(const TQStringList&)));
if (service->serviceTypes().contains("KaffeinePart")) { if (service->serviceTypes().contains("KaffeinePart")) {
kdDebug() << "This is a KaffeinePart..." << endl; kdDebug() << "This is a KaffeinePart..." << endl;
@ -391,40 +391,40 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage()); KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
} }
else { else {
connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SLOT(slotChangeCaption(const TQString&))); connect(m_mediaPart, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SLOT(slotChangeCaption(const TQString&)));
//connect(m_mediaPart, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SLOT(slotChangeStatusbar(const TQString&))); //connect(m_mediaPart, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SLOT(slotChangeStatusbar(const TQString&)));
connect(m_mediaPart, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotLoadingCanceled(const TQString&))); connect(m_mediaPart, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotLoadingCanceled(const TQString&)));
connect(m_mediaPart, TQT_SIGNAL(signalPlaybackFailed()), this, TQT_SLOT(slotPlaybackFailed())); connect(m_mediaPart, TQ_SIGNAL(signalPlaybackFailed()), this, TQ_SLOT(slotPlaybackFailed()));
connect(m_mediaPart, TQT_SIGNAL(signalTrackFinished()), this, TQT_SLOT(slotNext())); connect(m_mediaPart, TQ_SIGNAL(signalTrackFinished()), this, TQ_SLOT(slotNext()));
connect(m_mediaPart, TQT_SIGNAL(signalNewMeta(const MRL &)), this, TQT_SLOT(slotMetaFromPlayer(const MRL &))); connect(m_mediaPart, TQ_SIGNAL(signalNewMeta(const MRL &)), this, TQ_SLOT(slotMetaFromPlayer(const MRL &)));
connect(m_mediaPart, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQT_SLOT(slotNewFrameSize(const TQSize&))); connect(m_mediaPart, TQ_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQ_SLOT(slotNewFrameSize(const TQSize&)));
connect(m_mediaPart, TQT_SIGNAL(signalRequestCurrentTrack()), this, TQT_SLOT(slotRequestForCurrentTrack())); connect(m_mediaPart, TQ_SIGNAL(signalRequestCurrentTrack()), this, TQ_SLOT(slotRequestForCurrentTrack()));
connect(m_mediaPart, TQT_SIGNAL(signalRequestNextTrack()), this, TQT_SLOT(slotRequestForNextTrack())); connect(m_mediaPart, TQ_SIGNAL(signalRequestNextTrack()), this, TQ_SLOT(slotRequestForNextTrack()));
connect(m_mediaPart, TQT_SIGNAL(signalRequestPreviousTrack()), this, TQT_SLOT(slotRequestForPreviousTrack())); connect(m_mediaPart, TQ_SIGNAL(signalRequestPreviousTrack()), this, TQ_SLOT(slotRequestForPreviousTrack()));
connect(m_mediaPart, TQT_SIGNAL(signalToggleMinimalMode()), this, TQT_SLOT(slotToggleMinimalModeFromPlayer())); connect(m_mediaPart, TQ_SIGNAL(signalToggleMinimalMode()), this, TQ_SLOT(slotToggleMinimalModeFromPlayer()));
if ( service->library()=="libxinepart" ) if ( service->library()=="libxinepart" )
connect( this, TQT_SIGNAL(showOSD(const TQString&,int,int)), m_mediaPart, TQT_SLOT(requestForOSD(const TQString&,int,int)) ); connect( this, TQ_SIGNAL(showOSD(const TQString&,int,int)), m_mediaPart, TQ_SLOT(requestForOSD(const TQString&,int,int)) );
#ifdef HAVE_DVB #ifdef HAVE_DVB
if ( service->library()=="libxinepart" && dvbPanel ) { if ( service->library()=="libxinepart" && dvbPanel ) {
connect( dvbPanel, TQT_SIGNAL(dvbPause(bool)), m_mediaPart, TQT_SLOT(slotTogglePause(bool)) ); connect( dvbPanel, TQ_SIGNAL(dvbPause(bool)), m_mediaPart, TQ_SLOT(slotTogglePause(bool)) );
connect( dvbPanel, TQT_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQT_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) ); connect( dvbPanel, TQ_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQ_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) );
connect( dvbPanel, TQT_SIGNAL(dvbStop()), m_mediaPart, TQT_SLOT(slotStop()) ); connect( dvbPanel, TQ_SIGNAL(dvbStop()), m_mediaPart, TQ_SLOT(slotStop()) );
connect( m_mediaPart, TQT_SIGNAL(stopDvb()), dvbPanel, TQT_SLOT(stopLive()) ); connect( m_mediaPart, TQ_SIGNAL(stopDvb()), dvbPanel, TQ_SLOT(stopLive()) );
connect( m_mediaPart, TQT_SIGNAL(playerPause()), dvbPanel, TQT_SLOT(pauseLiveTV()) ); connect( m_mediaPart, TQ_SIGNAL(playerPause()), dvbPanel, TQ_SLOT(pauseLiveTV()) );
connect( dvbPanel, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) ); connect( dvbPanel, TQ_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQ_SLOT(getTimeShiftFilename(const TQString&)) );
connect( dvbPanel, TQT_SIGNAL(showOSD(const TQString&,int,int)), m_mediaPart, TQT_SLOT(requestForOSD(const TQString&,int,int)) ); connect( dvbPanel, TQ_SIGNAL(showOSD(const TQString&,int,int)), m_mediaPart, TQ_SLOT(requestForOSD(const TQString&,int,int)) );
connect( dvbPanel, TQT_SIGNAL(showDvbOSD(const TQString&, const TQStringList&)), m_mediaPart, TQT_SLOT(setDvbCurrentNext(const TQString&, const TQStringList&)) ); connect( dvbPanel, TQ_SIGNAL(showDvbOSD(const TQString&, const TQStringList&)), m_mediaPart, TQ_SLOT(setDvbCurrentNext(const TQString&, const TQStringList&)) );
connect( m_mediaPart, TQT_SIGNAL(dvbOSDHide()), dvbPanel, TQT_SLOT(dvbOSDHide())); connect( m_mediaPart, TQ_SIGNAL(dvbOSDHide()), dvbPanel, TQ_SLOT(dvbOSDHide()));
dvbPanel->enableLiveDvb( true ); dvbPanel->enableLiveDvb( true );
} }
#endif #endif
if ( service->library()=="libxinepart" && dvbClient ) { if ( service->library()=="libxinepart" && dvbClient ) {
connect( dvbClient, TQT_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQT_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) ); connect( dvbClient, TQ_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQ_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) );
connect( m_mediaPart, TQT_SIGNAL(stopDvb()), dvbClient, TQT_SLOT(stopLive()) ); connect( m_mediaPart, TQ_SIGNAL(stopDvb()), dvbClient, TQ_SLOT(stopLive()) );
connect( dvbClient, TQT_SIGNAL(dvbStop()), m_mediaPart, TQT_SLOT(slotStop()) ); connect( dvbClient, TQ_SIGNAL(dvbStop()), m_mediaPart, TQ_SLOT(slotStop()) );
connect( m_mediaPart, TQT_SIGNAL(playerPause()), dvbClient, TQT_SLOT(pauseLiveTV()) ); connect( m_mediaPart, TQ_SIGNAL(playerPause()), dvbClient, TQ_SLOT(pauseLiveTV()) );
connect( dvbClient, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) ); connect( dvbClient, TQ_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQ_SLOT(getTimeShiftFilename(const TQString&)) );
dvbClient->enableLive( true ); dvbClient->enableLive( true );
} }
m_currentPartService = desktopName; m_currentPartService = desktopName;
@ -505,7 +505,7 @@ void Kaffeine::slotPlay(const MRL& mrl)
{ {
m_mediaPart->openURL(mrl); m_mediaPart->openURL(mrl);
if ( !mrl.mime().contains("audio") ) if ( !mrl.mime().contains("audio") )
TQTimer::singleShot(300, this, TQT_SLOT(slotSwitchToPlayerWindow())); TQTimer::singleShot(300, this, TQ_SLOT(slotSwitchToPlayerWindow()));
} }
} }
@ -664,35 +664,35 @@ void Kaffeine::dropEvent(TQDropEvent* dev)
void Kaffeine::setupActions() void Kaffeine::setupActions()
{ {
/* file menu */ /* file menu */
KStdAction::open(this, TQT_SLOT(slotOpenFile()), actionCollection(), "file_open"); KStdAction::open(this, TQ_SLOT(slotOpenFile()), actionCollection(), "file_open");
new TDEAction(i18n("Open &URL..."), "www", CTRL|Key_U, this, TQT_SLOT(slotOpenURL()), actionCollection(), "file_open_url"); new TDEAction(i18n("Open &URL..."), "www", CTRL|Key_U, this, TQ_SLOT(slotOpenURL()), actionCollection(), "file_open_url");
new TDEAction(i18n("Open D&irectory..."), "folder_video", 0, this, TQT_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory"); new TDEAction(i18n("Open D&irectory..."), "folder_video", 0, this, TQ_SLOT(slotOpenDirectory()), actionCollection(), "file_open_directory");
m_recent = KStdAction::openRecent(this, TQT_SLOT(slotPlayRecent(const KURL&)), actionCollection(), "file_open_recent"); m_recent = KStdAction::openRecent(this, TQ_SLOT(slotPlayRecent(const KURL&)), actionCollection(), "file_open_recent");
m_sleepAfterPlay = new TDEToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, this, TQT_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play"); m_sleepAfterPlay = new TDEToggleAction(i18n("Quit && Shutoff Monitor After This Track"), 0, 0, this, TQ_SLOT(slotSleepAfterPlayMenu()), actionCollection(), "sleep_after_play");
m_quitAfterPlay = new TDEToggleAction(i18n("Quit After This Track"), 0, 0, this, TQT_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play"); m_quitAfterPlay = new TDEToggleAction(i18n("Quit After This Track"), 0, 0, this, TQ_SLOT(slotQuitAfterPlayMenu()), actionCollection(), "quit_after_play");
m_quitAfterPlaylist = new TDEToggleAction(i18n("Quit After Playlist"), 0, 0, this, TQT_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist"); m_quitAfterPlaylist = new TDEToggleAction(i18n("Quit After Playlist"), 0, 0, this, TQ_SLOT(slotQuitAfterPlaylistMenu()), actionCollection(), "quit_after_playlist");
KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
/*view menu */ /*view menu */
m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), actionCollection(), this, "view_fullscreen"); m_fullscreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullscreen()), actionCollection(), this, "view_fullscreen");
m_minimal = new TDEToggleAction(i18n("&Minimal Mode"), 0, Key_M, this, TQT_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal"); m_minimal = new TDEToggleAction(i18n("&Minimal Mode"), 0, Key_M, this, TQ_SLOT(slotToggleMinimalMode()), actionCollection(), "view_minimal");
new TDEAction(i18n("Toggle &Playlist/Player"), 0, Key_P, this, TQT_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab"); new TDEAction(i18n("Toggle &Playlist/Player"), 0, Key_P, this, TQ_SLOT(slotTogglePlaylist()), actionCollection(), "view_toggle_tab");
m_originalAspect = new TDEToggleAction(i18n("Keep &Original Aspect"), 0, 0, this, TQT_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect"); m_originalAspect = new TDEToggleAction(i18n("Keep &Original Aspect"), 0, 0, this, TQ_SLOT(slotOriginalAspect()), actionCollection(), "view_original_aspect");
m_autoResizeOff = new TDEToggleAction(i18n("Off"), 0, ALT|Key_0, this, TQT_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off"); m_autoResizeOff = new TDEToggleAction(i18n("Off"), 0, ALT|Key_0, this, TQ_SLOT(slotAutoresizeOff()), actionCollection(), "view_auto_resize_off");
m_autoResizeOriginal = new TDEToggleAction(i18n("Original Size"), 0, ALT|Key_1, this, TQT_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original"); m_autoResizeOriginal = new TDEToggleAction(i18n("Original Size"), 0, ALT|Key_1, this, TQ_SLOT(slotAutoresizeOriginal()), actionCollection(), "view_auto_resize_original");
m_autoResizeDouble = new TDEToggleAction(i18n("Double Size"), 0, ALT|Key_2, this, TQT_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double"); m_autoResizeDouble = new TDEToggleAction(i18n("Double Size"), 0, ALT|Key_2, this, TQ_SLOT(slotAutoresizeDouble()), actionCollection(), "view_auto_resize_double");
m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, this, TQT_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple"); m_autoResizeTriple = new TDEToggleAction(i18n("Triple Size"), 0, ALT|Key_3, this, TQ_SLOT(slotAutoresizeTriple()), actionCollection(), "view_auto_resize_triple");
m_playersMenu = new TDEActionMenu(i18n("&Player Engine"), actionCollection(), "options_player"); m_playersMenu = new TDEActionMenu(i18n("&Player Engine"), actionCollection(), "options_player");
m_instWizard = new TDEAction(i18n("Installation &Wizard"), 0, 0, this, TQT_SLOT(slotInstWizard()), actionCollection(), "inst_wizard"); m_instWizard = new TDEAction(i18n("Installation &Wizard"), 0, 0, this, TQ_SLOT(slotInstWizard()), actionCollection(), "inst_wizard");
KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection(), "options_preferences"); KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection(), "options_preferences");
/* fill players action menu */ /* fill players action menu */
TQSignalMapper* mapper = new TQSignalMapper(this); TQSignalMapper* mapper = new TQSignalMapper(this);
connect(mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(slotLoadPart(const TQString&))); connect(mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(slotLoadPart(const TQString&)));
TDEAction* action = NULL; TDEAction* action = NULL;
TQStringList mediaParts; TQStringList mediaParts;
@ -703,7 +703,7 @@ void Kaffeine::setupActions()
{ {
KService::Ptr ptr = (*it); KService::Ptr ptr = (*it);
action = new TDEAction(ptr->name(), ptr->icon(), 0, mapper, TQT_SLOT(map()), actionCollection()); action = new TDEAction(ptr->name(), ptr->icon(), 0, mapper, TQ_SLOT(map()), actionCollection());
if (!ptr->comment().isNull()) if (!ptr->comment().isNull())
action->setToolTip(ptr->comment()); action->setToolTip(ptr->comment());
mapper->setMapping(action, ptr->desktopEntryName()); mapper->setMapping(action, ptr->desktopEntryName());
@ -722,7 +722,7 @@ void Kaffeine::setupActions()
acn->insertItem( Key_7, 17 ); acn->insertItem( Key_7, 17 );
acn->insertItem( Key_8, 18 ); acn->insertItem( Key_8, 18 );
acn->insertItem( Key_9, 19 ); acn->insertItem( Key_9, 19 );
connect( acn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotNumKeyInput(int)) ); connect( acn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotNumKeyInput(int)) );
} }
void Kaffeine::slotDVBNextBack(int dir) void Kaffeine::slotDVBNextBack(int dir)
@ -885,13 +885,13 @@ void Kaffeine::slotPreferences()
KaffeinePreferences dlg; KaffeinePreferences dlg;
dlg.setConfig(m_pauseVideo, m_embedSystemTray, m_osdDuration, m_useAlternateEncoding, m_alternateEncoding); dlg.setConfig(m_pauseVideo, m_embedSystemTray, m_osdDuration, m_useAlternateEncoding, m_alternateEncoding);
dlg.setDvbClient( m_dvbClientEnabled, m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath ); dlg.setDvbClient( m_dvbClientEnabled, m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath );
connect(&dlg, TQT_SIGNAL(signalClearRecent()), this, TQT_SLOT(slotClearRecent())); connect(&dlg, TQ_SIGNAL(signalClearRecent()), this, TQ_SLOT(slotClearRecent()));
connect(&dlg, TQT_SIGNAL(signalEmbedSystemTray(bool)), this, TQT_SLOT(slotSystemTray(bool))); connect(&dlg, TQ_SIGNAL(signalEmbedSystemTray(bool)), this, TQ_SLOT(slotSystemTray(bool)));
connect(&dlg, TQT_SIGNAL(signalUseAlternateEncoding(bool)), this, TQT_SLOT(slotUseAlternateEncoding(bool))); connect(&dlg, TQ_SIGNAL(signalUseAlternateEncoding(bool)), this, TQ_SLOT(slotUseAlternateEncoding(bool)));
connect(&dlg, TQT_SIGNAL(signalAlternateEncoding(const TQString&)), this, TQT_SLOT(slotAlternateEncoding(const TQString&))); connect(&dlg, TQ_SIGNAL(signalAlternateEncoding(const TQString&)), this, TQ_SLOT(slotAlternateEncoding(const TQString&)));
connect(&dlg, TQT_SIGNAL(signalSetOSDTimeout(uint)), this, TQT_SLOT(slotSetOSDTimeout(uint))); connect(&dlg, TQ_SIGNAL(signalSetOSDTimeout(uint)), this, TQ_SLOT(slotSetOSDTimeout(uint)));
connect(&dlg, TQT_SIGNAL(signalPauseVideo(bool)), this, TQT_SLOT(slotPauseVideo(bool))); connect(&dlg, TQ_SIGNAL(signalPauseVideo(bool)), this, TQ_SLOT(slotPauseVideo(bool)));
connect(&dlg, TQT_SIGNAL(signalDvbClient(bool,const TQString&,int,int,const TQString&)), this, TQT_SLOT(slotDvbClient(bool,const TQString&,int,int,const TQString&))); connect(&dlg, TQ_SIGNAL(signalDvbClient(bool,const TQString&,int,int,const TQString&)), this, TQ_SLOT(slotDvbClient(bool,const TQString&,int,int,const TQString&)));
dlg.exec(); dlg.exec();
} }
@ -909,11 +909,11 @@ void Kaffeine::slotDvbClient( bool enabled, const TQString &address, int port, i
dvbClient = new CdWidget(address, port, info, tspath, this, this, "cdwidget"); dvbClient = new CdWidget(address, port, info, tspath, this, this, "cdwidget");
if ( m_mediaPart ) if ( m_mediaPart )
{ {
connect( dvbClient, TQT_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQT_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) ); connect( dvbClient, TQ_SIGNAL(dvbOpen(const TQString&,const TQString&,int)), m_mediaPart, TQ_SLOT(slotDvbOpen(const TQString&,const TQString&,int)) );
connect( m_mediaPart, TQT_SIGNAL(stopDvb()), dvbClient, TQT_SLOT(stopLive()) ); connect( m_mediaPart, TQ_SIGNAL(stopDvb()), dvbClient, TQ_SLOT(stopLive()) );
connect( dvbClient, TQT_SIGNAL(dvbStop()), m_mediaPart, TQT_SLOT(slotStop()) ); connect( dvbClient, TQ_SIGNAL(dvbStop()), m_mediaPart, TQ_SLOT(slotStop()) );
connect( m_mediaPart, TQT_SIGNAL(playerPause()), dvbClient, TQT_SLOT(pauseLiveTV()) ); connect( m_mediaPart, TQ_SIGNAL(playerPause()), dvbClient, TQ_SLOT(pauseLiveTV()) );
connect( dvbClient, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) ); connect( dvbClient, TQ_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQ_SLOT(getTimeShiftFilename(const TQString&)) );
dvbClient->enableLive( true ); dvbClient->enableLive( true );
} }
inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", TDEIcon::Small), i18n( "DVB client") ); inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", TDEIcon::Small), i18n( "DVB client") );
@ -962,8 +962,8 @@ void Kaffeine::optionsConfigureToolbars()
// use the standard toolbar editor // use the standard toolbar editor
KEditToolbar dlg(factory()); KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
this, TQT_SLOT(applyNewToolbarConfig())); this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec(); dlg.exec();
} }
@ -980,12 +980,12 @@ void Kaffeine::slotSystemTray(bool embed)
if (!m_systemTray) if (!m_systemTray)
{ {
m_systemTray = new SystemTray(this); m_systemTray = new SystemTray(this);
connect(m_systemTray, TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlayUnPause())); connect(m_systemTray, TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotPlayUnPause()));
connect(m_systemTray, TQT_SIGNAL(signalNext()), this, TQT_SLOT(slotRequestForNextTrack())); connect(m_systemTray, TQ_SIGNAL(signalNext()), this, TQ_SLOT(slotRequestForNextTrack()));
connect(m_systemTray, TQT_SIGNAL(signalPrevious()), this, TQT_SLOT(slotRequestForPreviousTrack())); connect(m_systemTray, TQ_SIGNAL(signalPrevious()), this, TQ_SLOT(slotRequestForPreviousTrack()));
connect(m_systemTray, TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop())); connect(m_systemTray, TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotStop()));
connect(m_systemTray, TQT_SIGNAL(signalMute()), this, TQT_SLOT(slotMute())); connect(m_systemTray, TQ_SIGNAL(signalMute()), this, TQ_SLOT(slotMute()));
connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit()));
m_systemTray->show(); m_systemTray->show();
} }
} }

6
kaffeine/src/player-parts/dummy-part/dummy_part.cpp
Unescape View File

@ -114,9 +114,9 @@ void DummyPart::slotMute()
void DummyPart::initActions() void DummyPart::initActions()
{ {
new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play"); new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQ_SLOT(slotPlay()), actionCollection(), "player_play");
new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQ_SLOT(slotTogglePause()), actionCollection(), "player_pause");
new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop"); new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQ_SLOT(slotStop()), actionCollection(), "player_stop");
} }
#include "dummy_part.moc" #include "dummy_part.moc"

52
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
Unescape View File

@ -78,7 +78,7 @@ GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/
kdDebug() << "GStreamerPart: Creating video window" << endl; kdDebug() << "GStreamerPart: Creating video window" << endl;
m_video = new VideoWindow( parentWidget, m_videosink ); m_video = new VideoWindow( parentWidget, m_videosink );
connect( m_video, TQT_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQT_SIGNAL(signalNewFrameSize(const TQSize&)) ); connect( m_video, TQ_SIGNAL(signalNewFrameSize(const TQSize&)), this, TQ_SIGNAL(signalNewFrameSize(const TQSize&)) );
m_video->setFocusPolicy( TQWidget::ClickFocus ); m_video->setFocusPolicy( TQWidget::ClickFocus );
setWidget( m_video ); setWidget( m_video );
@ -92,7 +92,7 @@ GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/
m_logoPath = locate( "data", "kaffeine/logo" ); m_logoPath = locate( "data", "kaffeine/logo" );
kdDebug() << "GStreamerPart: Found logo animation: " << m_logoPath << endl; kdDebug() << "GStreamerPart: Found logo animation: " << m_logoPath << endl;
connect( &busTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotReadBus()) ); connect( &busTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotReadBus()) );
} }
@ -266,7 +266,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
m_playlist.append( m_mrl ); m_playlist.append( m_mrl );
} }
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQ_SLOT(slotPlay()));
return true; return true;
} }
@ -504,10 +504,10 @@ void GStreamerPart::slotVideoSettings()
g_object_get( G_OBJECT(m_videosink), "brightness", &bright, NULL ); g_object_get( G_OBJECT(m_videosink), "brightness", &bright, NULL );
m_videoSettings = new VideoSettings( hue, sat, contr, bright ); m_videoSettings = new VideoSettings( hue, sat, contr, bright );
connect( m_videoSettings, TQT_SIGNAL(signalNewBrightness(int)), this, TQT_SLOT(slotBrightness(int)) ); connect( m_videoSettings, TQ_SIGNAL(signalNewBrightness(int)), this, TQ_SLOT(slotBrightness(int)) );
connect( m_videoSettings, TQT_SIGNAL(signalNewContrast(int)), this, TQT_SLOT(slotContrast(int)) ); connect( m_videoSettings, TQ_SIGNAL(signalNewContrast(int)), this, TQ_SLOT(slotContrast(int)) );
connect( m_videoSettings, TQT_SIGNAL(signalNewHue(int)), this, TQT_SLOT(slotHue(int)) ); connect( m_videoSettings, TQ_SIGNAL(signalNewHue(int)), this, TQ_SLOT(slotHue(int)) );
connect( m_videoSettings, TQT_SIGNAL(signalNewSaturation(int)), this, TQT_SLOT(slotSaturation(int)) ); connect( m_videoSettings, TQ_SIGNAL(signalNewSaturation(int)), this, TQ_SLOT(slotSaturation(int)) );
} }
m_videoSettings->show(); m_videoSettings->show();
@ -692,43 +692,43 @@ void GStreamerPart::slotPrepareForFullscreen( bool fullscreen )
void GStreamerPart::initActions() void GStreamerPart::initActions()
{ {
new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode"); new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQ_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play"); new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQ_SLOT(slotPlay()), actionCollection(), "player_play");
new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); new TDEAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQ_SLOT(slotTogglePause()), actionCollection(), "player_pause");
new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop"); new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQ_SLOT(slotStop()), actionCollection(), "player_stop");
new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQT_SLOT(slotNext()), actionCollection(), "player_next"); new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQ_SLOT(slotNext()), actionCollection(), "player_next");
new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQ_SLOT(slotPrevious()), actionCollection(), "player_previous");
m_timer = new Timer(); m_timer = new Timer();
new KWidgetAction(m_timer->getSlider(), i18n("Position"), 0, 0, 0, actionCollection(), "player_position"); new KWidgetAction(m_timer->getSlider(), i18n("Position"), 0, 0, 0, actionCollection(), "player_position");
new KWidgetAction((TQWidget*)m_timer->getLabel(), i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); new KWidgetAction((TQWidget*)m_timer->getLabel(), i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visual"); m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visual");
connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetVisualPlugin(const TQString&))); connect(m_audioVisual, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotSetVisualPlugin(const TQString&)));
m_audioVisualPluginList.prepend("none"); m_audioVisualPluginList.prepend("none");
m_audioVisual->setItems(m_audioVisualPluginList); m_audioVisual->setItems(m_audioVisualPluginList);
m_audioVisual->setCurrentItem(m_audioVisual->items().findIndex(m_visualPluginName)); m_audioVisual->setCurrentItem(m_audioVisual->items().findIndex(m_visualPluginName));
new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQ_SLOT(slotMute()), actionCollection(), "audio_mute");
new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_video, TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_video, TQ_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_video, TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_video, TQ_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_video, TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_video, TQ_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_video, TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_video, TQ_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_video, TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_video, TQ_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings"); new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQ_SLOT(slotVideoSettings()), actionCollection(), "video_settings");
new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQ_SLOT(slotInfo()), actionCollection(), "player_track_info");
m_volume = new TQSlider(TQt::Horizontal, 0); m_volume = new TQSlider(TQt::Horizontal, 0);
TQToolTip::add(m_volume, i18n("Volume")); TQToolTip::add(m_volume, i18n("Volume"));
m_volume->setRange(0, 100); m_volume->setRange(0, 100);
m_volume->setSteps(1, 5); m_volume->setSteps(1, 5);
m_volume->setFixedWidth(75); m_volume->setFixedWidth(75);
connect(m_volume, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVolume(int))); connect(m_volume, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVolume(int)));
slotSetVolume(m_savedVolume); slotSetVolume(m_savedVolume);
new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume"); new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume");
new TDEAction(i18n("&GStreamer Engine Parameters"), "edit", 0, this, TQT_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter"); new TDEAction(i18n("&GStreamer Engine Parameters"), "edit", 0, this, TQ_SLOT(slotConfigDialog()), actionCollection(), "settings_gst_parameter");
connect(m_video, TQT_SIGNAL(signalRightClick(const TQPoint&)), this, TQT_SLOT(slotContextMenu(const TQPoint&))); connect(m_video, TQ_SIGNAL(signalRightClick(const TQPoint&)), this, TQ_SLOT(slotContextMenu(const TQPoint&)));
} }
@ -995,7 +995,7 @@ void GStreamerPart::slotReadBus()
if (m_url != m_logoPath) { if (m_url != m_logoPath) {
errorMessage = error->message; errorMessage = error->message;
errorDetails = debug; errorDetails = debug;
TQTimer::singleShot( 0, this, TQT_SLOT(slotEngineError()) ); TQTimer::singleShot( 0, this, TQ_SLOT(slotEngineError()) );
} }
g_error_free( error ); g_error_free( error );
g_free( debug ); g_free( debug );

6
kaffeine/src/player-parts/gstreamer-part/timer.cpp
Unescape View File

@ -45,7 +45,7 @@ Timer::Timer() : TQObject()
m_slider->setMinValue( 0 ); m_slider->setMinValue( 0 );
m_slider->setEnabled( false ); m_slider->setEnabled( false );
connect( &updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()) ); connect( &updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()) );
m_pos = GST_CLOCK_TIME_NONE; m_pos = GST_CLOCK_TIME_NONE;
m_len = GST_CLOCK_TIME_NONE; m_len = GST_CLOCK_TIME_NONE;
@ -53,8 +53,8 @@ Timer::Timer() : TQObject()
m_play = NULL; m_play = NULL;
seeking = false; seeking = false;
connect( m_slider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotSeekStart()) ); connect( m_slider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotSeekStart()) );
connect( m_slider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSeek()) ); connect( m_slider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSeek()) );
} }

2
kaffeine/src/player-parts/gstreamer-part/video.cpp
Unescape View File

@ -58,7 +58,7 @@ VideoWindow::VideoWindow( TQWidget *parent, GstElement *_element )
setPaletteBackgroundColor(TQColor(0,0,0)); //black setPaletteBackgroundColor(TQColor(0,0,0)); //black
setUpdatesEnabled(false); setUpdatesEnabled(false);
connect( &m_mouseHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHideMouse()) ); connect( &m_mouseHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHideMouse()) );
} }

10
kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
Unescape View File

@ -44,7 +44,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
m_hueSlider->setRange(-1000, 1000); m_hueSlider->setRange(-1000, 1000);
m_hueSlider->setSteps(10, 100); m_hueSlider->setSteps(10, 100);
m_hueSlider->setValue(hue); m_hueSlider->setValue(hue);
connect(m_hueSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewHue(int))); connect(m_hueSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewHue(int)));
grid->addWidget(hueText, 0, 0); grid->addWidget(hueText, 0, 0);
grid->addWidget(m_hueSlider, 0, 1); grid->addWidget(m_hueSlider, 0, 1);
@ -54,7 +54,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
m_satSlider->setRange(-1000, 1000); m_satSlider->setRange(-1000, 1000);
m_satSlider->setSteps(10, 100); m_satSlider->setSteps(10, 100);
m_satSlider->setValue(sat); m_satSlider->setValue(sat);
connect(m_satSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewSaturation(int))); connect(m_satSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewSaturation(int)));
grid->addWidget(satText, 1, 0); grid->addWidget(satText, 1, 0);
grid->addWidget(m_satSlider, 1, 1); grid->addWidget(m_satSlider, 1, 1);
@ -64,7 +64,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
m_contrastSlider->setRange(-1000, 1000); m_contrastSlider->setRange(-1000, 1000);
m_contrastSlider->setSteps(10, 100); m_contrastSlider->setSteps(10, 100);
m_contrastSlider->setValue(contr); m_contrastSlider->setValue(contr);
connect(m_contrastSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewContrast(int))); connect(m_contrastSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewContrast(int)));
grid->addWidget(contrastText, 2, 0); grid->addWidget(contrastText, 2, 0);
grid->addWidget(m_contrastSlider, 2, 1); grid->addWidget(m_contrastSlider, 2, 1);
@ -74,11 +74,11 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
m_brightSlider->setRange(-1000, 1000); m_brightSlider->setRange(-1000, 1000);
m_brightSlider->setSteps(10, 100); m_brightSlider->setSteps(10, 100);
m_brightSlider->setValue(bright); m_brightSlider->setValue(bright);
connect(m_brightSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewBrightness(int))); connect(m_brightSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewBrightness(int)));
grid->addWidget(brightText, 3, 0); grid->addWidget(brightText, 3, 0);
grid->addWidget(m_brightSlider, 3, 1); grid->addWidget(m_brightSlider, 3, 1);
connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotSetDefaultValues())); connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotSetDefaultValues()));
} }
VideoSettings::~VideoSettings() VideoSettings::~VideoSettings()

6
kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
Unescape View File

@ -75,12 +75,12 @@ DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent,
m_customBox = new TQCheckBox(i18n("User defined"), mainWidget); m_customBox = new TQCheckBox(i18n("User defined"), mainWidget);
grid->addMultiCellWidget(m_customBox, 6, 6, 0, 1); grid->addMultiCellWidget(m_customBox, 6, 6, 0, 1);
connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool))); connect(m_customBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCustomBoxToggled(bool)));
m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget); m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget);
m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
grid->addWidget(m_customConfigButton, 7, 1); grid->addWidget(m_customConfigButton, 7, 1);
connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show())); connect(m_customConfigButton, TQ_SIGNAL(clicked()), filterDialog, TQ_SLOT(show()));
TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget); TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget);
note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter); note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
@ -125,7 +125,7 @@ void DeinterlaceQuality::setQuality(uint qu)
m_qualitySlider->setValue(qu-10); m_qualitySlider->setValue(qu-10);
m_customBox->setChecked(true); m_customBox->setChecked(true);
} }
connect(m_qualitySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLevelChanged(int))); connect(m_qualitySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLevelChanged(int)));
} }
uint DeinterlaceQuality::getQuality() const uint DeinterlaceQuality::getQuality() const

26
kaffeine/src/player-parts/xine-part/equalizer.cpp
Unescape View File

@ -39,12 +39,12 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
on = new TQCheckBox( i18n("On"), page ); on = new TQCheckBox( i18n("On"), page );
mainGrid->addWidget( on, 0, 0 ); mainGrid->addWidget( on, 0, 0 );
connect(on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetEnabled(bool))); connect(on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetEnabled(bool)));
volumeGain = new TQCheckBox( i18n("Volume gain"), page ); volumeGain = new TQCheckBox( i18n("Volume gain"), page );
TQToolTip::add(volumeGain, i18n("Volume Gain for Equalizer - If the sound becomes noisy disable this")); TQToolTip::add(volumeGain, i18n("Volume Gain for Equalizer - If the sound becomes noisy disable this"));
mainGrid->addWidget( volumeGain, 1, 0 ); mainGrid->addWidget( volumeGain, 1, 0 );
connect(volumeGain, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(signalSetVolumeGain(bool))); connect(volumeGain, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(signalSetVolumeGain(bool)));
equalGroup = new TQGroupBox( TQString(), page ); equalGroup = new TQGroupBox( TQString(), page );
mainGrid->addWidget( equalGroup, 2, 0 ); mainGrid->addWidget( equalGroup, 2, 0 );
@ -59,7 +59,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq30Slider->setSteps(1, 10); eq30Slider->setSteps(1, 10);
eq30Slider->setTickInterval(50); eq30Slider->setTickInterval(50);
eq30Slider->setTickmarks(TQSlider::Right); eq30Slider->setTickmarks(TQSlider::Right);
connect(eq30Slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq30(int))); connect(eq30Slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq30(int)));
equalGrid->addWidget(eq30Text, 1, 0); equalGrid->addWidget(eq30Text, 1, 0);
equalGrid->addWidget(eq30Slider, 0, 0); equalGrid->addWidget(eq30Slider, 0, 0);
@ -67,7 +67,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq60Slider = new TQSlider(TQt::Vertical, equalGroup); eq60Slider = new TQSlider(TQt::Vertical, equalGroup);
eq60Slider->setRange(-100, -1); eq60Slider->setRange(-100, -1);
eq60Slider->setSteps(1, 10); eq60Slider->setSteps(1, 10);
connect(eq60Slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq60(int))); connect(eq60Slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq60(int)));
equalGrid->addWidget(eq60Text, 1, 1); equalGrid->addWidget(eq60Text, 1, 1);
equalGrid->addWidget(eq60Slider, 0, 1); equalGrid->addWidget(eq60Slider, 0, 1);
@ -75,7 +75,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq125Slider = new TQSlider(TQt::Vertical, equalGroup); eq125Slider = new TQSlider(TQt::Vertical, equalGroup);
eq125Slider->setRange(-100, -1); eq125Slider->setRange(-100, -1);
eq125Slider->setSteps(1, 10); eq125Slider->setSteps(1, 10);
connect(eq125Slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq125(int))); connect(eq125Slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq125(int)));
equalGrid->addWidget(eq125Text, 1, 2); equalGrid->addWidget(eq125Text, 1, 2);
equalGrid->addWidget(eq125Slider, 0, 2); equalGrid->addWidget(eq125Slider, 0, 2);
@ -83,7 +83,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq250Slider = new TQSlider(TQt::Vertical, equalGroup); eq250Slider = new TQSlider(TQt::Vertical, equalGroup);
eq250Slider->setRange(-100, -1); eq250Slider->setRange(-100, -1);
eq250Slider->setSteps(1, 10); eq250Slider->setSteps(1, 10);
connect(eq250Slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq250(int))); connect(eq250Slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq250(int)));
equalGrid->addWidget(eq250Text, 1, 3); equalGrid->addWidget(eq250Text, 1, 3);
equalGrid->addWidget(eq250Slider, 0, 3); equalGrid->addWidget(eq250Slider, 0, 3);
@ -91,7 +91,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq500Slider = new TQSlider(TQt::Vertical, equalGroup); eq500Slider = new TQSlider(TQt::Vertical, equalGroup);
eq500Slider->setRange(-100, -1); eq500Slider->setRange(-100, -1);
eq500Slider->setSteps(1, 10); eq500Slider->setSteps(1, 10);
connect(eq500Slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq500(int))); connect(eq500Slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq500(int)));
equalGrid->addWidget(eq500Text, 1, 4); equalGrid->addWidget(eq500Text, 1, 4);
equalGrid->addWidget(eq500Slider, 0, 4); equalGrid->addWidget(eq500Slider, 0, 4);
@ -99,7 +99,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq1kSlider = new TQSlider(TQt::Vertical, equalGroup); eq1kSlider = new TQSlider(TQt::Vertical, equalGroup);
eq1kSlider->setRange(-100, -1); eq1kSlider->setRange(-100, -1);
eq1kSlider->setSteps(1, 10); eq1kSlider->setSteps(1, 10);
connect(eq1kSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq1k(int))); connect(eq1kSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq1k(int)));
equalGrid->addWidget(eq1kText, 1, 5); equalGrid->addWidget(eq1kText, 1, 5);
equalGrid->addWidget(eq1kSlider, 0, 5); equalGrid->addWidget(eq1kSlider, 0, 5);
@ -107,7 +107,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq2kSlider = new TQSlider(TQt::Vertical, equalGroup); eq2kSlider = new TQSlider(TQt::Vertical, equalGroup);
eq2kSlider->setRange(-100, -1); eq2kSlider->setRange(-100, -1);
eq2kSlider->setSteps(1, 10); eq2kSlider->setSteps(1, 10);
connect(eq2kSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq2k(int))); connect(eq2kSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq2k(int)));
equalGrid->addWidget(eq2kText, 1, 6); equalGrid->addWidget(eq2kText, 1, 6);
equalGrid->addWidget(eq2kSlider, 0, 6); equalGrid->addWidget(eq2kSlider, 0, 6);
@ -115,7 +115,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq4kSlider = new TQSlider(TQt::Vertical, equalGroup); eq4kSlider = new TQSlider(TQt::Vertical, equalGroup);
eq4kSlider->setRange(-100, -1); eq4kSlider->setRange(-100, -1);
eq4kSlider->setSteps(1, 10); eq4kSlider->setSteps(1, 10);
connect(eq4kSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq4k(int))); connect(eq4kSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq4k(int)));
equalGrid->addWidget(eq4kText, 1, 7); equalGrid->addWidget(eq4kText, 1, 7);
equalGrid->addWidget(eq4kSlider, 0, 7); equalGrid->addWidget(eq4kSlider, 0, 7);
@ -123,7 +123,7 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq8kSlider = new TQSlider(TQt::Vertical, equalGroup); eq8kSlider = new TQSlider(TQt::Vertical, equalGroup);
eq8kSlider->setRange(-100, -1); eq8kSlider->setRange(-100, -1);
eq8kSlider->setSteps(1, 10); eq8kSlider->setSteps(1, 10);
connect(eq8kSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq8k(int))); connect(eq8kSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq8k(int)));
equalGrid->addWidget(eq8kText, 1, 8); equalGrid->addWidget(eq8kText, 1, 8);
equalGrid->addWidget(eq8kSlider, 0, 8); equalGrid->addWidget(eq8kSlider, 0, 8);
@ -133,11 +133,11 @@ Equalizer::Equalizer(TQWidget *parent, const char *name)
eq16kSlider->setSteps(1, 10); eq16kSlider->setSteps(1, 10);
eq16kSlider->setTickInterval(50); eq16kSlider->setTickInterval(50);
eq16kSlider->setTickmarks(TQSlider::Left); eq16kSlider->setTickmarks(TQSlider::Left);
connect(eq16kSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewEq16k(int))); connect(eq16kSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewEq16k(int)));
equalGrid->addWidget(eq16kText, 1, 9); equalGrid->addWidget(eq16kText, 1, 9);
equalGrid->addWidget(eq16kSlider, 0, 9); equalGrid->addWidget(eq16kSlider, 0, 9);
connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotSetDefaultValues())); connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotSetDefaultValues()));
} }

12
kaffeine/src/player-parts/xine-part/filterdialog.cpp
Unescape View File

@ -50,7 +50,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
TQCheckBox* useAudioFiltersCB = new TQCheckBox( audioPage ); TQCheckBox* useAudioFiltersCB = new TQCheckBox( audioPage );
useAudioFiltersCB->setText( i18n("Enable audio filters") ); useAudioFiltersCB->setText( i18n("Enable audio filters") );
useAudioFiltersCB->setChecked( true ); useAudioFiltersCB->setChecked( true );
connect( useAudioFiltersCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseAudioFilters(bool))); connect( useAudioFiltersCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseAudioFilters(bool)));
audioGrid->addMultiCellWidget( useAudioFiltersCB, 0, 0, 0, 2 ); audioGrid->addMultiCellWidget( useAudioFiltersCB, 0, 0, 0, 2 );
@ -58,9 +58,9 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
m_audioFilterCombo->insertStringList( audioFilters ); m_audioFilterCombo->insertStringList( audioFilters );
m_addAudioButton = new KPushButton( i18n("Add Filter"), audioPage ); m_addAudioButton = new KPushButton( i18n("Add Filter"), audioPage );
connect( m_addAudioButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAudioClicked() )); connect( m_addAudioButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAudioClicked() ));
m_removeAudioButton = new KPushButton( i18n("Remove All Filters"), audioPage ); m_removeAudioButton = new KPushButton( i18n("Remove All Filters"), audioPage );
connect( m_removeAudioButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( signalRemoveAllAudioFilters() )); connect( m_removeAudioButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( signalRemoveAllAudioFilters() ));
audioGrid->addWidget( m_audioFilterCombo, 1, 0 ); audioGrid->addWidget( m_audioFilterCombo, 1, 0 );
audioGrid->addWidget( m_removeAudioButton, 1, 2 ); audioGrid->addWidget( m_removeAudioButton, 1, 2 );
@ -83,7 +83,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
TQCheckBox* useVideoFiltersCB = new TQCheckBox( videoPage ); TQCheckBox* useVideoFiltersCB = new TQCheckBox( videoPage );
useVideoFiltersCB->setText( i18n("Enable video filters") ); useVideoFiltersCB->setText( i18n("Enable video filters") );
useVideoFiltersCB->setChecked( true ); useVideoFiltersCB->setChecked( true );
connect( useVideoFiltersCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseVideoFilters(bool))); connect( useVideoFiltersCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseVideoFilters(bool)));
videoGrid->addMultiCellWidget( useVideoFiltersCB, 0, 0, 0, 2 ); videoGrid->addMultiCellWidget( useVideoFiltersCB, 0, 0, 0, 2 );
@ -91,9 +91,9 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
m_videoFilterCombo->insertStringList( videoFilters ); m_videoFilterCombo->insertStringList( videoFilters );
m_addVideoButton = new KPushButton( i18n("Add Filter"), videoPage ); m_addVideoButton = new KPushButton( i18n("Add Filter"), videoPage );
connect( m_addVideoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddVideoClicked() )); connect( m_addVideoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddVideoClicked() ));
m_removeVideoButton = new KPushButton( i18n("Remove All Filters"), videoPage ); m_removeVideoButton = new KPushButton( i18n("Remove All Filters"), videoPage );
connect( m_removeVideoButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( signalRemoveAllVideoFilters() )); connect( m_removeVideoButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( signalRemoveAllVideoFilters() ));
videoGrid->addWidget( m_videoFilterCombo, 1, 0 ); videoGrid->addWidget( m_videoFilterCombo, 1, 0 );
videoGrid->addWidget( m_removeVideoButton, 1, 2 ); videoGrid->addWidget( m_removeVideoButton, 1, 2 );

30
kaffeine/src/player-parts/xine-part/kxinewidget.cpp
Unescape View File

@ -92,7 +92,7 @@ KXineWidget::KXineWidget(TQWidget* parent, const char* name,
dvbHaveVideo = 0; dvbHaveVideo = 0;
dvbOSD = 0; dvbOSD = 0;
dvbColor[0] = 0; dvbColor[0] = 0;
connect( &dvbOSDHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbHideOSD()) ); connect( &dvbOSDHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(dvbHideOSD()) );
if (pathToConfigFile.isNull()) if (pathToConfigFile.isNull())
{ {
@ -111,11 +111,11 @@ KXineWidget::KXineWidget(TQWidget* parent, const char* name,
m_audioFilterList.setAutoDelete(true); /*** delete post plugin on removing from list ***/ m_audioFilterList.setAutoDelete(true); /*** delete post plugin on removing from list ***/
#endif #endif
connect(&m_posTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSendPosition())); connect(&m_posTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSendPosition()));
connect(&m_lengthInfoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotEmitLengthInfo())); connect(&m_lengthInfoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotEmitLengthInfo()));
connect(&m_mouseHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHideMouse())); connect(&m_mouseHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHideMouse()));
connect(&m_osdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotOSDHide())); connect(&m_osdTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotOSDHide()));
connect(&m_recentMessagesTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoRecentMessage())); connect(&m_recentMessagesTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoRecentMessage()));
setUpdatesEnabled(false); setUpdatesEnabled(false);
setMouseTracking(true); setMouseTracking(true);
@ -691,7 +691,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
{ {
if ( !TimeShiftFilename.isEmpty() ) if ( !TimeShiftFilename.isEmpty() )
{ {
TQTimer::singleShot(0, this, TQT_SLOT(slotPlayTimeShift())); TQTimer::singleShot(0, this, TQ_SLOT(slotPlayTimeShift()));
break; break;
} }
if ( m_trackURL=="DVB" || m_trackURL.contains(".kaxtv") ) if ( m_trackURL=="DVB" || m_trackURL.contains(".kaxtv") )
@ -709,7 +709,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
xine_stop(m_xineStream); xine_stop(m_xineStream);
} }
else else
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQ_SLOT(slotPlay()));
break; break;
} }
case TIMER_EVENT_NEW_CHANNELS: case TIMER_EVENT_NEW_CHANNELS:
@ -1870,7 +1870,7 @@ void KXineWidget::setDvbCurrentNext( const TQString &channelName, const TQString
m_dvbChannelName = channelName; m_dvbChannelName = channelName;
TQTimer::singleShot( 0, this, TQT_SLOT(dvbShowOSD()) ); TQTimer::singleShot( 0, this, TQ_SLOT(dvbShowOSD()) );
} }
void KXineWidget::setDvb( const TQString &pipeName, const TQString &chanName, int haveVideo ) void KXineWidget::setDvb( const TQString &pipeName, const TQString &chanName, int haveVideo )
@ -1900,7 +1900,7 @@ bool KXineWidget::openDvb()
else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii()); else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii());
m_trackURL = "DVB"; m_trackURL = "DVB";
emit signalXineStatus(i18n("DVB: opening...")); emit signalXineStatus(i18n("DVB: opening..."));
TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) ); TQTimer::singleShot( 0, this, TQ_SLOT(playDvb()) );
return true; return true;
} }
@ -2148,7 +2148,7 @@ void KXineWidget::slotPlay()
} }
/*** we need a little delay for some meta info ***/ /*** we need a little delay for some meta info ***/
TQTimer::singleShot(1000, this, TQT_SLOT(slotGetInfoDelayed())); TQTimer::singleShot(1000, this, TQ_SLOT(slotGetInfoDelayed()));
m_trackLength = getLengthInfo(); m_trackLength = getLengthInfo();
@ -2266,7 +2266,7 @@ void KXineWidget::sendXineError()
{ {
errorOut(error); errorOut(error);
errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL)); errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL));
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQ_SLOT(slotPlay()));
} }
} }
@ -2359,7 +2359,7 @@ void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent)
unwireVideoFilters(); unwireVideoFilters();
PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent); PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent);
connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteVideoFilter(PostFilter*))); connect(filter, TQ_SIGNAL(signalDeleteMe(PostFilter*)), this, TQ_SLOT(slotDeleteVideoFilter(PostFilter*)));
m_videoFilterList.append(filter); m_videoFilterList.append(filter);
wireVideoFilters(); wireVideoFilters();
@ -2375,7 +2375,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
unwireAudioFilters(); unwireAudioFilters();
PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent); PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent);
connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteAudioFilter(PostFilter*))); connect(filter, TQ_SIGNAL(signalDeleteMe(PostFilter*)), this, TQ_SLOT(slotDeleteAudioFilter(PostFilter*)));
m_audioFilterList.append(filter); m_audioFilterList.append(filter);
wireAudioFilters(); wireAudioFilters();
@ -2897,7 +2897,7 @@ void KXineWidget::slotStop()
else else
{ {
appendToQueue(m_logoFile); appendToQueue(m_logoFile);
TQTimer::singleShot(0, this, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, this, TQ_SLOT(slotPlay()));
} }
emit signalXineStatus(i18n("Stop")); emit signalXineStatus(i18n("Stop"));

4
kaffeine/src/player-parts/xine-part/positionslider.cpp
Unescape View File

@ -29,8 +29,8 @@
PositionSlider::PositionSlider(TQt::Orientation o, TQWidget *parent, const char* name) : PositionSlider::PositionSlider(TQt::Orientation o, TQWidget *parent, const char* name) :
TQSlider(o, parent, name), m_userChange(false) TQSlider(o, parent, name), m_userChange(false)
{ {
connect(this, TQT_SIGNAL(sliderPressed()), this ,TQT_SLOT(slotSliderPressed())); connect(this, TQ_SIGNAL(sliderPressed()), this ,TQ_SLOT(slotSliderPressed()));
connect(this, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased())); connect(this, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSliderReleased()));
installEventFilter(this); installEventFilter(this);
} }

24
kaffeine/src/player-parts/xine-part/postfilter.cpp
Unescape View File

@ -82,7 +82,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
PostFilterParameterCombo(m_xinePostParameter->name, m_xinePostParameter->offset, PostFilterParameterCombo(m_xinePostParameter->name, m_xinePostParameter->offset,
*(int*)(m_data+m_xinePostParameter->offset), *(int*)(m_data+m_xinePostParameter->offset),
m_xinePostParameter->enum_values, m_groupBox ); m_xinePostParameter->enum_values, m_groupBox );
connect(parameter, TQT_SIGNAL(signalIntValue(int, int)), this, TQT_SLOT(slotApplyIntValue(int, int))); connect(parameter, TQ_SIGNAL(signalIntValue(int, int)), this, TQ_SLOT(slotApplyIntValue(int, int)));
m_parameterList.append(parameter); m_parameterList.append(parameter);
grid->addWidget(parameter->getWidget(), row, 0); grid->addWidget(parameter->getWidget(), row, 0);
@ -95,7 +95,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
(int)m_xinePostParameter->range_min, (int)m_xinePostParameter->range_max, (int)m_xinePostParameter->range_min, (int)m_xinePostParameter->range_max,
m_groupBox); m_groupBox);
connect(parameter, TQT_SIGNAL( signalIntValue(int, int)), this, TQT_SLOT( slotApplyIntValue(int, int))); connect(parameter, TQ_SIGNAL( signalIntValue(int, int)), this, TQ_SLOT( slotApplyIntValue(int, int)));
m_parameterList.append(parameter); m_parameterList.append(parameter);
grid->addWidget(parameter->getWidget(), row, 0); grid->addWidget(parameter->getWidget(), row, 0);
@ -110,7 +110,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
(double)m_xinePostParameter->range_min, (double)m_xinePostParameter->range_max, (double)m_xinePostParameter->range_min, (double)m_xinePostParameter->range_max,
m_groupBox); m_groupBox);
connect(parameter, TQT_SIGNAL(signalDoubleValue(int, double)), this, TQT_SLOT(slotApplyDoubleValue(int, double))); connect(parameter, TQ_SIGNAL(signalDoubleValue(int, double)), this, TQ_SLOT(slotApplyDoubleValue(int, double)));
m_parameterList.append(parameter); m_parameterList.append(parameter);
grid->addWidget(parameter->getWidget(), row, 0); grid->addWidget(parameter->getWidget(), row, 0);
@ -123,7 +123,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
(char*)(m_data+m_xinePostParameter->offset), m_xinePostParameter->size, (char*)(m_data+m_xinePostParameter->offset), m_xinePostParameter->size,
m_groupBox); m_groupBox);
connect( parameter, TQT_SIGNAL(signalCharValue(int, const TQString&)), this, TQT_SLOT(slotApplyCharValue(int, const TQString&))); connect( parameter, TQ_SIGNAL(signalCharValue(int, const TQString&)), this, TQ_SLOT(slotApplyCharValue(int, const TQString&)));
m_parameterList.append(parameter); m_parameterList.append(parameter);
grid->addWidget(parameter->getWidget(), row, 0); grid->addWidget(parameter->getWidget(), row, 0);
@ -137,7 +137,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
PostFilterParameterBool(m_xinePostParameter->name, m_xinePostParameter->offset, PostFilterParameterBool(m_xinePostParameter->name, m_xinePostParameter->offset,
(bool) *(int*)(m_data+m_xinePostParameter->offset), m_groupBox); (bool) *(int*)(m_data+m_xinePostParameter->offset), m_groupBox);
connect(parameter, TQT_SIGNAL(signalIntValue(int, int)), this, TQT_SLOT(slotApplyIntValue(int, int))); connect(parameter, TQ_SIGNAL(signalIntValue(int, int)), this, TQ_SLOT(slotApplyIntValue(int, int)));
m_parameterList.append(parameter); m_parameterList.append(parameter);
grid->addWidget(parameter->getWidget(), row, 0); grid->addWidget(parameter->getWidget(), row, 0);
@ -158,14 +158,14 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
row++; row++;
KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox); KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed())); connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotDeletePressed()));
grid->addWidget(deleteButton, row, 0); grid->addWidget(deleteButton, row, 0);
if(inputAPI) if(inputAPI)
{ {
KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox); KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox);
helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed())); connect(helpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelpPressed()));
grid->addWidget(helpButton, row, 1); grid->addWidget(helpButton, row, 1);
} }
@ -334,7 +334,7 @@ PostFilterParameterInt::PostFilterParameterInt(const TQString& name, int offset,
{ {
m_numInput = new KIntNumInput(value, parent); m_numInput = new KIntNumInput(value, parent);
m_numInput->setRange( min, max, 1, false); m_numInput->setRange( min, max, 1, false);
connect(m_numInput, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotIntValue(int))); connect(m_numInput, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotIntValue(int)));
} }
PostFilterParameterDouble::PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* parent) PostFilterParameterDouble::PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* parent)
@ -343,7 +343,7 @@ PostFilterParameterDouble::PostFilterParameterDouble(const TQString& name, int o
m_numInput = new KDoubleNumInput(parent); m_numInput = new KDoubleNumInput(parent);
m_numInput->setValue(value); m_numInput->setValue(value);
m_numInput->setRange(min, max, 0.01, false); m_numInput->setRange(min, max, 0.01, false);
connect(m_numInput, TQT_SIGNAL(valueChanged( double)), this, TQT_SLOT(slotDoubleValue( double))); connect(m_numInput, TQ_SIGNAL(valueChanged( double)), this, TQ_SLOT(slotDoubleValue( double)));
} }
PostFilterParameterChar::PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent) PostFilterParameterChar::PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent)
@ -351,7 +351,7 @@ PostFilterParameterChar::PostFilterParameterChar(const TQString& name, int offse
{ {
m_charInput = new KLineEdit(value, parent); m_charInput = new KLineEdit(value, parent);
m_charInput->setMaxLength(size); m_charInput->setMaxLength(size);
connect(m_charInput, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotCharValue(const TQString&))); connect(m_charInput, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotCharValue(const TQString&)));
} }
PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent) PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent)
@ -363,7 +363,7 @@ PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int off
m_comboBox->insertItem(enums[i]); m_comboBox->insertItem(enums[i]);
} }
m_comboBox->setCurrentItem(value); m_comboBox->setCurrentItem(value);
connect(m_comboBox, TQT_SIGNAL( activated(int)), this, TQT_SLOT( slotIntValue(int))); connect(m_comboBox, TQ_SIGNAL( activated(int)), this, TQ_SLOT( slotIntValue(int)));
} }
PostFilterParameterBool::PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent) PostFilterParameterBool::PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent)
@ -371,7 +371,7 @@ PostFilterParameterBool::PostFilterParameterBool(const TQString& name, int offse
{ {
m_checkBox = new TQCheckBox(parent); m_checkBox = new TQCheckBox(parent);
m_checkBox->setChecked(value); m_checkBox->setChecked(value);
connect(m_checkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBoolValue( bool))); connect(m_checkBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBoolValue( bool)));
} }
PostFilterHelp::PostFilterHelp(TQWidget *parent, const char *name, const TQString& text) PostFilterHelp::PostFilterHelp(TQWidget *parent, const char *name, const TQString& text)

14
kaffeine/src/player-parts/xine-part/videosettings.cpp
Unescape View File

@ -53,7 +53,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_hueSlider->setRange(0, 65535); m_hueSlider->setRange(0, 65535);
m_hueSlider->setSteps(10, 1000); m_hueSlider->setSteps(10, 1000);
m_hueSlider->setValue(hue); m_hueSlider->setValue(hue);
connect(m_hueSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewHue(int))); connect(m_hueSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewHue(int)));
videoGrid->addWidget(hueText, 0, 0); videoGrid->addWidget(hueText, 0, 0);
videoGrid->addWidget(m_hueSlider, 0, 1); videoGrid->addWidget(m_hueSlider, 0, 1);
@ -63,7 +63,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_satSlider->setRange(0, 65535); m_satSlider->setRange(0, 65535);
m_satSlider->setSteps(10, 1000); m_satSlider->setSteps(10, 1000);
m_satSlider->setValue(sat); m_satSlider->setValue(sat);
connect(m_satSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewSaturation(int))); connect(m_satSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewSaturation(int)));
videoGrid->addWidget(satText, 1, 0); videoGrid->addWidget(satText, 1, 0);
videoGrid->addWidget(m_satSlider, 1, 1); videoGrid->addWidget(m_satSlider, 1, 1);
@ -73,7 +73,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_contrastSlider->setRange(0, 65535); m_contrastSlider->setRange(0, 65535);
m_contrastSlider->setSteps(10, 1000); m_contrastSlider->setSteps(10, 1000);
m_contrastSlider->setValue(contrast); m_contrastSlider->setValue(contrast);
connect(m_contrastSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewContrast(int))); connect(m_contrastSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewContrast(int)));
videoGrid->addWidget(contrastText, 2, 0); videoGrid->addWidget(contrastText, 2, 0);
videoGrid->addWidget(m_contrastSlider, 2, 1); videoGrid->addWidget(m_contrastSlider, 2, 1);
@ -83,7 +83,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_brightSlider->setRange(0, 65535); m_brightSlider->setRange(0, 65535);
m_brightSlider->setSteps(10, 1000); m_brightSlider->setSteps(10, 1000);
m_brightSlider->setValue(bright); m_brightSlider->setValue(bright);
connect(m_brightSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewBrightness(int))); connect(m_brightSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewBrightness(int)));
videoGrid->addWidget(brightText, 3, 0); videoGrid->addWidget(brightText, 3, 0);
videoGrid->addWidget(m_brightSlider, 3, 1); videoGrid->addWidget(m_brightSlider, 3, 1);
@ -93,7 +93,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
m_avOffsetSlider->setSteps(100, 10000); m_avOffsetSlider->setSteps(100, 10000);
m_avOffsetSlider->setValue(avOffset); m_avOffsetSlider->setValue(avOffset);
connect(m_avOffsetSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewAVOffset(int))); connect(m_avOffsetSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewAVOffset(int)));
videoGrid->addWidget(avOffsetText, 4, 0); videoGrid->addWidget(avOffsetText, 4, 0);
videoGrid->addWidget(m_avOffsetSlider, 4, 1); videoGrid->addWidget(m_avOffsetSlider, 4, 1);
@ -103,11 +103,11 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
m_spuOffsetSlider->setRange(-90000, 90000); // +/- 1 sec m_spuOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
m_spuOffsetSlider->setSteps(100, 10000); m_spuOffsetSlider->setSteps(100, 10000);
m_spuOffsetSlider->setValue(spuOffset); m_spuOffsetSlider->setValue(spuOffset);
connect(m_spuOffsetSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(signalNewSpuOffset(int))); connect(m_spuOffsetSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(signalNewSpuOffset(int)));
videoGrid->addWidget(spuOffsetText, 5, 0); videoGrid->addWidget(spuOffsetText, 5, 0);
videoGrid->addWidget(m_spuOffsetSlider, 5, 1); videoGrid->addWidget(m_spuOffsetSlider, 5, 1);
connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotSetDefaultValues())); connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotSetDefaultValues()));
} }

258
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape View File

@ -120,9 +120,9 @@ XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* par
m_xine = new KXineWidget(parentWidget, widgetName, configPath, logoPath, m_xine = new KXineWidget(parentWidget, widgetName, configPath, logoPath,
audioDriver, videoDriver, /* start xine manual*/true, verbose); audioDriver, videoDriver, /* start xine manual*/true, verbose);
connect(m_xine, TQT_SIGNAL(signalXineFatal(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); connect(m_xine, TQ_SIGNAL(signalXineFatal(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&)));
connect(m_xine, TQT_SIGNAL(stopDvb()), this, TQT_SIGNAL(stopDvb())); connect(m_xine, TQ_SIGNAL(stopDvb()), this, TQ_SIGNAL(stopDvb()));
connect(m_xine, TQT_SIGNAL(signalDvbOSDHidden()), this, TQT_SIGNAL(dvbOSDHide())); connect(m_xine, TQ_SIGNAL(signalDvbOSDHidden()), this, TQ_SIGNAL(dvbOSDHide()));
m_xine->setFocusPolicy(TQWidget::ClickFocus); m_xine->setFocusPolicy(TQWidget::ClickFocus);
setWidget(m_xine); setWidget(m_xine);
@ -131,7 +131,7 @@ XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* par
initActions(); initActions();
initConnections(); initConnections();
TQTimer::singleShot(0, this, TQT_SLOT(slotDisableAllActions())); TQTimer::singleShot(0, this, TQ_SLOT(slotDisableAllActions()));
m_oldPosition = m_xine->mapToGlobal(TQPoint(0,0)); m_oldPosition = m_xine->mapToGlobal(TQPoint(0,0));
m_posCheckTimer.start(333); m_posCheckTimer.start(333);
} }
@ -314,7 +314,7 @@ void XinePart::slotPlay(bool forcePlay)
return; return;
} }
else else
TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, m_xine, TQ_SLOT(slotPlay()));
} }
else else
{ {
@ -331,7 +331,7 @@ void XinePart::slotPlay(bool forcePlay)
return; return;
} }
else else
TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, m_xine, TQ_SLOT(slotPlay()));
} }
else else
kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl; kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl;
@ -354,7 +354,7 @@ void XinePart::slotStop()
m_playlist[m_current] = MRL("dvd://" + TQString::number(title) + "." + TQString::number(chapter)); m_playlist[m_current] = MRL("dvd://" + TQString::number(title) + "." + TQString::number(chapter));
} }
TQTimer::singleShot(0, m_xine, TQT_SLOT(slotStop())); TQTimer::singleShot(0, m_xine, TQ_SLOT(slotStop()));
stateChanged("not_playing"); stateChanged("not_playing");
m_pauseButton->setChecked(false); m_pauseButton->setChecked(false);
m_playTime->setText("0:00:00"); m_playTime->setText("0:00:00");
@ -416,7 +416,7 @@ void XinePart::slotDvbOpen( const TQString &filename, const TQString &chanName,
return; return;
m_playlist.clear(); m_playlist.clear();
m_xine->setDvb( filename, chanName, haveVideo ); m_xine->setDvb( filename, chanName, haveVideo );
TQTimer::singleShot(0, m_xine, TQT_SLOT(openDvb())); TQTimer::singleShot(0, m_xine, TQ_SLOT(openDvb()));
//m_xine->openDvb( filename, chanName, haveVideo ); //m_xine->openDvb( filename, chanName, haveVideo );
} }
@ -588,7 +588,7 @@ void XinePart::slotSaveStream()
m_xine->clearQueue(); m_xine->clearQueue();
m_xine->appendToQueue(m_playlist[m_current].url() + "#save:" + kurl.path()); m_xine->appendToQueue(m_playlist[m_current].url() + "#save:" + kurl.path());
TQTimer::singleShot(0, m_xine, TQT_SLOT(slotPlay())); TQTimer::singleShot(0, m_xine, TQ_SLOT(slotPlay()));
m_pauseButton->setChecked(false); m_pauseButton->setChecked(false);
} }
@ -835,14 +835,14 @@ void XinePart::slotFilterDialog()
if (!m_filterDialog) if (!m_filterDialog)
{ {
m_filterDialog = new FilterDialog(m_xine->getAudioFilterNames(), m_xine->getVideoFilterNames()); m_filterDialog = new FilterDialog(m_xine->getAudioFilterNames(), m_xine->getVideoFilterNames());
connect(m_filterDialog, TQT_SIGNAL(signalCreateAudioFilter(const TQString&, TQWidget*)), connect(m_filterDialog, TQ_SIGNAL(signalCreateAudioFilter(const TQString&, TQWidget*)),
m_xine, TQT_SLOT(slotCreateAudioFilter(const TQString&, TQWidget*))); m_xine, TQ_SLOT(slotCreateAudioFilter(const TQString&, TQWidget*)));
connect(m_filterDialog, TQT_SIGNAL(signalCreateVideoFilter(const TQString&, TQWidget*)), connect(m_filterDialog, TQ_SIGNAL(signalCreateVideoFilter(const TQString&, TQWidget*)),
m_xine, TQT_SLOT(slotCreateVideoFilter(const TQString&, TQWidget*))); m_xine, TQ_SLOT(slotCreateVideoFilter(const TQString&, TQWidget*)));
connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllAudioFilters()), m_xine, TQT_SLOT(slotRemoveAllAudioFilters())); connect(m_filterDialog, TQ_SIGNAL(signalRemoveAllAudioFilters()), m_xine, TQ_SLOT(slotRemoveAllAudioFilters()));
connect(m_filterDialog, TQT_SIGNAL(signalRemoveAllVideoFilters()), m_xine, TQT_SLOT(slotRemoveAllVideoFilters())); connect(m_filterDialog, TQ_SIGNAL(signalRemoveAllVideoFilters()), m_xine, TQ_SLOT(slotRemoveAllVideoFilters()));
connect(m_filterDialog, TQT_SIGNAL(signalUseAudioFilters(bool)), m_xine, TQT_SLOT(slotEnableAudioFilters(bool))); connect(m_filterDialog, TQ_SIGNAL(signalUseAudioFilters(bool)), m_xine, TQ_SLOT(slotEnableAudioFilters(bool)));
connect(m_filterDialog, TQT_SIGNAL(signalUseVideoFilters(bool)), m_xine, TQT_SLOT(slotEnableVideoFilters(bool))); connect(m_filterDialog, TQ_SIGNAL(signalUseVideoFilters(bool)), m_xine, TQ_SLOT(slotEnableVideoFilters(bool)));
} }
m_filterDialog->show(); m_filterDialog->show();
m_filterDialog->raise(); m_filterDialog->raise();
@ -854,8 +854,8 @@ void XinePart::slotDeinterlaceQuality()
return; return;
DeinterlaceQuality* deinterlaceQuality = new DeinterlaceQuality((TQWidget*)m_deinterlacerConfigWidget); DeinterlaceQuality* deinterlaceQuality = new DeinterlaceQuality((TQWidget*)m_deinterlacerConfigWidget);
deinterlaceQuality->setQuality(m_lastDeinterlaceQuality); deinterlaceQuality->setQuality(m_lastDeinterlaceQuality);
connect(deinterlaceQuality, TQT_SIGNAL(signalSetDeinterlaceConfig(const TQString&)), connect(deinterlaceQuality, TQ_SIGNAL(signalSetDeinterlaceConfig(const TQString&)),
m_xine, TQT_SLOT(slotSetDeinterlaceConfig(const TQString&))); m_xine, TQ_SLOT(slotSetDeinterlaceConfig(const TQString&)));
deinterlaceQuality->exec(); deinterlaceQuality->exec();
@ -903,12 +903,12 @@ void XinePart::slotPictureSettings()
int hue, sat, contrast, bright, avOffset, spuOffset; int hue, sat, contrast, bright, avOffset, spuOffset;
m_xine->getVideoSettings(hue, sat, contrast, bright, avOffset, spuOffset); m_xine->getVideoSettings(hue, sat, contrast, bright, avOffset, spuOffset);
m_pictureSettings = new VideoSettings(hue, sat, contrast, bright, avOffset, spuOffset); m_pictureSettings = new VideoSettings(hue, sat, contrast, bright, avOffset, spuOffset);
connect(m_pictureSettings, TQT_SIGNAL(signalNewHue(int)), this, TQT_SLOT(slotSetHue(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewHue(int)), this, TQ_SLOT(slotSetHue(int)));
connect(m_pictureSettings, TQT_SIGNAL(signalNewSaturation(int)), this, TQT_SLOT(slotSetSaturation(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewSaturation(int)), this, TQ_SLOT(slotSetSaturation(int)));
connect(m_pictureSettings, TQT_SIGNAL(signalNewContrast(int)), this, TQT_SLOT(slotSetContrast(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewContrast(int)), this, TQ_SLOT(slotSetContrast(int)));
connect(m_pictureSettings, TQT_SIGNAL(signalNewBrightness(int)), this, TQT_SLOT(slotSetBrightness(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewBrightness(int)), this, TQ_SLOT(slotSetBrightness(int)));
connect(m_pictureSettings, TQT_SIGNAL(signalNewAVOffset(int)), m_xine, TQT_SLOT(slotSetAVOffset(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewAVOffset(int)), m_xine, TQ_SLOT(slotSetAVOffset(int)));
connect(m_pictureSettings, TQT_SIGNAL(signalNewSpuOffset(int)), m_xine, TQT_SLOT(slotSetSpuOffset(int))); connect(m_pictureSettings, TQ_SIGNAL(signalNewSpuOffset(int)), m_xine, TQ_SLOT(slotSetSpuOffset(int)));
} }
m_pictureSettings->show(); m_pictureSettings->show();
m_pictureSettings->raise(); m_pictureSettings->raise();
@ -1073,7 +1073,7 @@ void XinePart::slotTrackPlaying()
kdDebug() << "XinePart: xine is playing" << endl; kdDebug() << "XinePart: xine is playing" << endl;
m_pauseButton->setChecked(false); m_pauseButton->setChecked(false);
TQTimer::singleShot(100, this, TQT_SLOT(slotEnablePlayActions())); TQTimer::singleShot(100, this, TQ_SLOT(slotEnablePlayActions()));
if ( m_xine->getURL()=="DVB" ) if ( m_xine->getURL()=="DVB" )
{ {
@ -1276,9 +1276,9 @@ void XinePart::slotFinalize()
actionCollection()->action("file_save_screenshot")->plug(m_embeddedContext); actionCollection()->action("file_save_screenshot")->plug(m_embeddedContext);
actionCollection()->action("file_save_stream")->plug(m_embeddedContext); actionCollection()->action("file_save_stream")->plug(m_embeddedContext);
m_embeddedContext->insertSeparator(); m_embeddedContext->insertSeparator();
action = new TDEAction(i18n("Copy URL to Clipboard"), "edit-copy", 0, this, TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard"); action = new TDEAction(i18n("Copy URL to Clipboard"), "edit-copy", 0, this, TQ_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard");
action->plug(m_embeddedContext); action->plug(m_embeddedContext);
action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, this, TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally"); action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, this, TQ_SLOT(slotLaunchExternally()), actionCollection(), "play_externally");
action->plug(m_embeddedContext); action->plug(m_embeddedContext);
} }
@ -1287,7 +1287,7 @@ void XinePart::slotFinalize()
m_audioVisual->setItems(visuals); m_audioVisual->setItems(visuals);
loadConfig(); loadConfig();
TQTimer::singleShot(0, this, TQT_SLOT(slotEnableAllActions())); TQTimer::singleShot(0, this, TQ_SLOT(slotEnableAllActions()));
} }
void XinePart::slotCopyToClipboard() void XinePart::slotCopyToClipboard()
@ -1302,7 +1302,7 @@ void XinePart::slotLaunchExternally()
{ {
slotStop(); slotStop();
TQTimer::singleShot(1000, this, TQT_SLOT(slotLaunchDelayed())); TQTimer::singleShot(1000, this, TQ_SLOT(slotLaunchDelayed()));
} }
void XinePart::slotLaunchDelayed() void XinePart::slotLaunchDelayed()
@ -1319,98 +1319,98 @@ void XinePart::initActions()
{ {
TDEAction* action = NULL; TDEAction* action = NULL;
/* file menu */ /* file menu */
m_broadcastSend = new TDEToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, this, TQT_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send"); m_broadcastSend = new TDEToggleAction(i18n("&Send Broadcast Stream..."), 0, 0, this, TQ_SLOT(slotToggleBroadcastSend()), actionCollection(), "network_send");
new TDEAction(i18n("&Receive Broadcast Stream..."), "network", 0, this, TQT_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive"); new TDEAction(i18n("&Receive Broadcast Stream..."), "network", 0, this, TQ_SLOT(slotBroadcastReceive()), actionCollection(), "network_receive");
new TDEAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, this, TQT_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot"); new TDEAction(i18n("&Save Screenshot..."), "frame_image", CTRL|Key_S, this, TQ_SLOT(slotScreenshot()), actionCollection(), "file_save_screenshot");
action = new TDEAction(i18n("Save Stream..."), "player_record", Key_R, this, TQT_SLOT(slotSaveStream()), actionCollection(), "file_save_stream"); action = new TDEAction(i18n("Save Stream..."), "player_record", Key_R, this, TQ_SLOT(slotSaveStream()), actionCollection(), "file_save_stream");
action->setWhatsThis(i18n("Saves current stream to harddisc. This feature was disabled for some formats (e.g. Real Media) to prevent potential legal problems.")); action->setWhatsThis(i18n("Saves current stream to harddisc. This feature was disabled for some formats (e.g. Real Media) to prevent potential legal problems."));
/* player menu */ /* player menu */
new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQT_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode"); new TDEAction(i18n("Toggle Minimal Mode"), 0, 0, this, TQ_SIGNAL(signalToggleMinimalMode()), actionCollection(), "player_minimal_mode");
new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQT_SLOT(slotPlay()), actionCollection(), "player_play"); new TDEAction(i18n("Play"), "media-playback-start", 0, this, TQ_SLOT(slotPlay()), actionCollection(), "player_play");
m_pauseButton = new TDEToggleAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQT_SLOT(slotTogglePause()), actionCollection(), "player_pause"); m_pauseButton = new TDEToggleAction(i18n("Pause"), "media-playback-pause", Key_Space, this, TQ_SLOT(slotTogglePause()), actionCollection(), "player_pause");
new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQT_SLOT(slotNext()), actionCollection(), "player_next"); new TDEAction(i18n("&Next"), "media-skip-forward", Key_PageDown, this, TQ_SLOT(slotNext()), actionCollection(), "player_next");
new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQT_SLOT(slotPrevious()), actionCollection(), "player_previous"); new TDEAction(i18n("&Previous"), "media-skip-backward", Key_PageUp, this, TQ_SLOT(slotPrevious()), actionCollection(), "player_previous");
new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQT_SLOT(slotStop()), actionCollection(), "player_stop"); new TDEAction(i18n("Stop"), "media-playback-stop", Key_Backspace, this, TQ_SLOT(slotStop()), actionCollection(), "player_stop");
new TDEAction(i18n("&Fast Forward"), "media-seek-forward", ALT|Key_Right, this, TQT_SLOT(slotFastForward()), actionCollection(), "player_ff"); new TDEAction(i18n("&Fast Forward"), "media-seek-forward", ALT|Key_Right, this, TQ_SLOT(slotFastForward()), actionCollection(), "player_ff");
new TDEAction(i18n("Slow &Motion"), 0, ALT|Key_Left, this, TQT_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion"); new TDEAction(i18n("Slow &Motion"), 0, ALT|Key_Left, this, TQ_SLOT(slotSlowMotion()), actionCollection(), "player_slowmotion");
new TDEAction(i18n("Skip Forward (20s)"), NULL, Key_Right, this, TQT_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small"); new TDEAction(i18n("Skip Forward (20s)"), NULL, Key_Right, this, TQ_SLOT(slotPosPlusSmall()), actionCollection(), "player_posplus_small");
new TDEAction(i18n("Skip Backward (20s)"), NULL, Key_Left, this, TQT_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small"); new TDEAction(i18n("Skip Backward (20s)"), NULL, Key_Left, this, TQ_SLOT(slotPosMinusSmall()), actionCollection(), "player_posminus_small");
new TDEAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, this, TQT_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium"); new TDEAction(i18n("Skip Forward (1m)"), NULL, CTRL|Key_PageUp, this, TQ_SLOT(slotPosPlusMedium()), actionCollection(), "player_posplus_medium");
new TDEAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, this, TQT_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium"); new TDEAction(i18n("Skip Backward (1m)"), NULL, CTRL|Key_PageDown, this, TQ_SLOT(slotPosMinusMedium()), actionCollection(), "player_posminus_medium");
new TDEAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, this, TQT_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large"); new TDEAction(i18n("Skip Forward (10m)"), NULL, ALT|Key_PageUp, this, TQ_SLOT(slotPosPlusLarge()), actionCollection(), "player_posplus_large");
new TDEAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, this, TQT_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large"); new TDEAction(i18n("Skip Backward (10m)"), NULL, ALT|Key_PageDown, this, TQ_SLOT(slotPosMinusLarge()), actionCollection(), "player_posminus_large");
new TDEAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, this, TQT_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to"); new TDEAction(i18n("Jump to Position..."), "goto", CTRL|Key_J, this, TQ_SLOT(slotJumpToPosition()), actionCollection(), "player_jump_to");
new TDEAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, this, TQT_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft"); new TDEAction(i18n("DVD Menu Left"), 0, CTRL|Key_Left, this, TQ_SLOT(slotDVDMenuLeft()), actionCollection(), "dvdmenuleft");
new TDEAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, this, TQT_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright"); new TDEAction(i18n("DVD Menu Right"), 0, CTRL|Key_Right, this, TQ_SLOT(slotDVDMenuRight()), actionCollection(), "dvdmenuright");
new TDEAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, this, TQT_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup"); new TDEAction(i18n("DVD Menu Up"), 0, CTRL|Key_Up, this, TQ_SLOT(slotDVDMenuUp()), actionCollection(), "dvdmenuup");
new TDEAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, this, TQT_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown"); new TDEAction(i18n("DVD Menu Down"), 0, CTRL|Key_Down, this, TQ_SLOT(slotDVDMenuDown()), actionCollection(), "dvdmenudown");
new TDEAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, this, TQT_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect"); new TDEAction(i18n("DVD Menu Select"), 0, CTRL|Key_Return, this, TQ_SLOT(slotDVDMenuSelect()), actionCollection(), "dvdmenuselect");
m_audioChannels = new TDESelectAction(i18n("Audio Channel"), 0, actionCollection(), "audio_channels"); m_audioChannels = new TDESelectAction(i18n("Audio Channel"), 0, actionCollection(), "audio_channels");
m_audioChannels->setToolTip(i18n("Select audio channel")); m_audioChannels->setToolTip(i18n("Select audio channel"));
m_audioChannels->setComboWidth( 50 ); m_audioChannels->setComboWidth( 50 );
connect(m_audioChannels, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetAudioChannel(int ))); connect(m_audioChannels, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetAudioChannel(int )));
new TDEAction(i18n("&Next Audio Channel"), 0, 0, this, TQT_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels"); new TDEAction(i18n("&Next Audio Channel"), 0, 0, this, TQ_SLOT(slotNextAudioChannel()), actionCollection(), "next_audio_channels");
m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visualization"); m_audioVisual = new TDESelectAction(i18n("Audio &Visualization"), 0, actionCollection(), "audio_visualization");
connect(m_audioVisual, TQT_SIGNAL(activated(const TQString&)), m_xine, TQT_SLOT(slotSetVisualPlugin(const TQString&))); connect(m_audioVisual, TQ_SIGNAL(activated(const TQString&)), m_xine, TQ_SLOT(slotSetVisualPlugin(const TQString&)));
new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQT_SLOT(slotMute()), actionCollection(), "audio_mute"); new TDEAction(i18n("&Mute"), "player_mute", Key_U, this, TQ_SLOT(slotMute()), actionCollection(), "audio_mute");
new TDEAction(i18n("Volume Up"), NULL, Key_Plus, this, TQT_SLOT(slotVolumeUp()), actionCollection(), "volume_increase"); new TDEAction(i18n("Volume Up"), NULL, Key_Plus, this, TQ_SLOT(slotVolumeUp()), actionCollection(), "volume_increase");
new TDEAction(i18n("Volume Down"), NULL, Key_Minus, this, TQT_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease"); new TDEAction(i18n("Volume Down"), NULL, Key_Minus, this, TQ_SLOT(slotVolumeDown()), actionCollection(), "volume_decrease");
m_deinterlaceEnabled = new TDEToggleAction(i18n("&Deinterlace"), 0, Key_I, m_xine, TQT_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace"); m_deinterlaceEnabled = new TDEToggleAction(i18n("&Deinterlace"), 0, Key_I, m_xine, TQ_SLOT(slotToggleDeinterlace()), actionCollection(), "video_deinterlace");
m_deinterlaceEnabled->setWhatsThis(i18n("Activate this for interlaced streams, some DVD's for example.")); m_deinterlaceEnabled->setWhatsThis(i18n("Activate this for interlaced streams, some DVD's for example."));
new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_xine, TQT_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto"); new TDEAction(i18n("&Auto"), "zoom-fit-best", Key_F5, m_xine, TQ_SLOT(slotAspectRatioAuto()), actionCollection(), "aspect_auto");
new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_xine, TQT_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43"); new TDEAction(i18n("&4:3"), "zoom-fit-best", Key_F6, m_xine, TQ_SLOT(slotAspectRatio4_3()), actionCollection(), "aspect_43");
new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_xine, TQT_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic"); new TDEAction(i18n("A&namorphic"), "zoom-fit-best", Key_F7, m_xine, TQ_SLOT(slotAspectRatioAnamorphic()), actionCollection(), "aspect_anamorphic");
new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_xine, TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb"); new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, m_xine, TQ_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_xine, TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square"); new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, m_xine, TQ_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
KStdAction::zoomIn(m_xine, TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); KStdAction::zoomIn(m_xine, TQ_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
KStdAction::zoomOut(m_xine, TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); KStdAction::zoomOut(m_xine, TQ_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
KStdAction::fitToPage(m_xine, TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off"); KStdAction::fitToPage(m_xine, TQ_SLOT(slotZoomOff()), actionCollection(), "zoom_off");
new TDEAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, m_xine, TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x"); new TDEAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, m_xine, TQ_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
new TDEAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, m_xine, TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x"); new TDEAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, m_xine, TQ_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
new TDEAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, m_xine, TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y"); new TDEAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, m_xine, TQ_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
new TDEAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, m_xine, TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y"); new TDEAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, m_xine, TQ_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
new TDEAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, this, TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality"); new TDEAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, this, TQ_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality");
new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture"); new TDEAction(i18n("&Video Settings"), "configure", Key_V, this, TQ_SLOT(slotPictureSettings()), actionCollection(), "video_picture");
new TDEAction(i18n("&Equalizer"), NULL, Key_E, this, TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer"); new TDEAction(i18n("&Equalizer"), NULL, Key_E, this, TQ_SLOT(slotEqualizer()), actionCollection(), "equalizer");
m_subtitles = new TDESelectAction(i18n("Subtitle"), 0, actionCollection(), "player_subtitles"); m_subtitles = new TDESelectAction(i18n("Subtitle"), 0, actionCollection(), "player_subtitles");
m_subtitles->setToolTip(i18n("Select Subtitle")); m_subtitles->setToolTip(i18n("Select Subtitle"));
m_subtitles->setComboWidth( 50 ); m_subtitles->setComboWidth( 50 );
connect(m_subtitles, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetSubtitle(int))); connect(m_subtitles, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetSubtitle(int)));
new TDEAction(i18n("&Next Subtitle Channel"), 0, 0, this, TQT_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles"); new TDEAction(i18n("&Next Subtitle Channel"), 0, 0, this, TQ_SLOT(slotNextSubtitleChannel()), actionCollection(), "next_player_subtitles");
new TDEAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, this, TQT_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub"); new TDEAction(i18n("Delay Subtitle"), 0, CTRL|ALT|Key_Left, this, TQ_SLOT(slotDelaySubTitle()), actionCollection(), "adv_sub");
new TDEAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, this, TQT_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub"); new TDEAction(i18n("Advance Subtitle"), 0, CTRL|ALT|Key_Right, this, TQ_SLOT(slotAdvanceSubTitle()), actionCollection(), "delay_sub");
new TDEAction(i18n("Add subtitle..."), 0, 0, this, TQT_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle"); new TDEAction(i18n("Add subtitle..."), 0, 0, this, TQ_SLOT(slotAddSubtitle()), actionCollection(), "add_subtitle");
new TDEAction(i18n("&Menu Toggle"), "view_detailed", Key_D, m_xine, TQT_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle"); new TDEAction(i18n("&Menu Toggle"), "view_detailed", Key_D, m_xine, TQ_SLOT(slotMenuToggle()), actionCollection(), "dvd_toggle");
new TDEAction(i18n("&Title"), NULL, 0, m_xine, TQT_SLOT(slotMenuTitle()), actionCollection(), "dvd_title"); new TDEAction(i18n("&Title"), NULL, 0, m_xine, TQ_SLOT(slotMenuTitle()), actionCollection(), "dvd_title");
new TDEAction(i18n("&Root"), NULL, 0, m_xine, TQT_SLOT(slotMenuRoot()), actionCollection(), "dvd_root"); new TDEAction(i18n("&Root"), NULL, 0, m_xine, TQ_SLOT(slotMenuRoot()), actionCollection(), "dvd_root");
new TDEAction(i18n("&Subpicture"), NULL, 0, m_xine, TQT_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture"); new TDEAction(i18n("&Subpicture"), NULL, 0, m_xine, TQ_SLOT(slotMenuSubpicture()), actionCollection(), "dvd_subpicture");
new TDEAction(i18n("&Audio"), NULL, 0, m_xine, TQT_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio"); new TDEAction(i18n("&Audio"), NULL, 0, m_xine, TQ_SLOT(slotMenuAudio()), actionCollection(), "dvd_audio");
new TDEAction(i18n("An&gle"), NULL, 0, m_xine, TQT_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle"); new TDEAction(i18n("An&gle"), NULL, 0, m_xine, TQ_SLOT(slotMenuAngle()), actionCollection(), "dvd_angle");
new TDEAction(i18n("&Part"), NULL, 0, m_xine, TQT_SLOT(slotMenuPart()), actionCollection(), "dvd_part"); new TDEAction(i18n("&Part"), NULL, 0, m_xine, TQ_SLOT(slotMenuPart()), actionCollection(), "dvd_part");
m_dvdTitles = new TDESelectAction(i18n("Titles"), 0, actionCollection(), "dvd_title_menu"); m_dvdTitles = new TDESelectAction(i18n("Titles"), 0, actionCollection(), "dvd_title_menu");
connect(m_dvdTitles, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDTitle(const TQString&))); connect(m_dvdTitles, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotSetDVDTitle(const TQString&)));
m_dvdChapters = new TDESelectAction(i18n("Chapters"), 0, actionCollection(), "dvd_chapter_menu"); m_dvdChapters = new TDESelectAction(i18n("Chapters"), 0, actionCollection(), "dvd_chapter_menu");
connect(m_dvdChapters, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDChapter(const TQString&))); connect(m_dvdChapters, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotSetDVDChapter(const TQString&)));
m_dvdAngles = new TDESelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu"); m_dvdAngles = new TDESelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu");
connect(m_dvdAngles, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetDVDAngle(const TQString&))); connect(m_dvdAngles, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotSetDVDAngle(const TQString&)));
new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQT_SLOT(slotInfo()), actionCollection(), "player_track_info"); new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , this, TQ_SLOT(slotInfo()), actionCollection(), "player_track_info");
new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, this, TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters"); new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, this, TQ_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters");
/* settings menu */ /* settings menu */
new TDEAction(i18n("&xine Engine Parameters"), "edit", 0, this, TQT_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter"); new TDEAction(i18n("&xine Engine Parameters"), "edit", 0, this, TQ_SLOT(slotConfigXine()), actionCollection(), "settings_xine_parameter");
m_volume = new VolumeSlider(); m_volume = new VolumeSlider();
TQToolTip::add TQToolTip::add
@ -1419,8 +1419,8 @@ void XinePart::initActions()
m_volume->setSteps(1, 10); m_volume->setSteps(1, 10);
m_volume->setFocusPolicy(TQWidget::NoFocus); m_volume->setFocusPolicy(TQWidget::NoFocus);
m_volume->setFixedWidth(75); m_volume->setFixedWidth(75);
connect(m_volume, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVolumeChanged(int))); connect(m_volume, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVolumeChanged(int)));
connect(m_xine, TQT_SIGNAL(signalSyncVolume()), this, TQT_SLOT(slotSyncVolume())); connect(m_xine, TQ_SIGNAL(signalSyncVolume()), this, TQ_SLOT(slotSyncVolume()));
new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume"); new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume");
m_position = new PositionSlider(Horizontal); m_position = new PositionSlider(Horizontal);
@ -1431,10 +1431,10 @@ void XinePart::initActions()
m_position->setTracking(false); m_position->setTracking(false);
m_position->setFocusPolicy(TQWidget::NoFocus); m_position->setFocusPolicy(TQWidget::NoFocus);
m_position->setMinimumWidth(180); m_position->setMinimumWidth(180);
connect(m_position, TQT_SIGNAL(sliderMoved(int)), m_xine, TQT_SLOT(slotSeekToPosition(int))); connect(m_position, TQ_SIGNAL(sliderMoved(int)), m_xine, TQ_SLOT(slotSeekToPosition(int)));
connect(m_position, TQT_SIGNAL(sliderLastMove(int)), m_xine, TQT_SLOT(slotSeekToPositionBlocking(int))); connect(m_position, TQ_SIGNAL(sliderLastMove(int)), m_xine, TQ_SLOT(slotSeekToPositionBlocking(int)));
connect(m_position, TQT_SIGNAL(signalStartSeeking()), m_xine, TQT_SLOT(slotStartSeeking())); connect(m_position, TQ_SIGNAL(signalStartSeeking()), m_xine, TQ_SLOT(slotStartSeeking()));
connect(m_position, TQT_SIGNAL(signalStopSeeking()), m_xine, TQT_SLOT(slotStopSeeking())); connect(m_position, TQ_SIGNAL(signalStopSeeking()), m_xine, TQ_SLOT(slotStopSeeking()));
new KWidgetAction(m_position, i18n("Position"), 0, 0, 0, actionCollection(), "player_position"); new KWidgetAction(m_position, i18n("Position"), 0, 0, 0, actionCollection(), "player_position");
m_playTime = new TQPushButton(0); m_playTime = new TQPushButton(0);
@ -1445,42 +1445,42 @@ void XinePart::initActions()
m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_playTime->setFocusPolicy(TQWidget::NoFocus); m_playTime->setFocusPolicy(TQWidget::NoFocus);
new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime"); new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
connect(m_playTime, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotButtonTimerPressed())); connect(m_playTime, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotButtonTimerPressed()));
connect(m_playTime, TQT_SIGNAL(released()), this, TQT_SLOT(slotButtonTimerReleased())); connect(m_playTime, TQ_SIGNAL(released()), this, TQ_SLOT(slotButtonTimerReleased()));
m_playTime->setText("0:00:00"); m_playTime->setText("0:00:00");
m_equalizer = new Equalizer(); m_equalizer = new Equalizer();
connect(m_equalizer, TQT_SIGNAL(signalNewEq30(int)), m_xine, TQT_SLOT(slotSetEq30(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq30(int)), m_xine, TQ_SLOT(slotSetEq30(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq60(int)), m_xine, TQT_SLOT(slotSetEq60(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq60(int)), m_xine, TQ_SLOT(slotSetEq60(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq125(int)), m_xine, TQT_SLOT(slotSetEq125(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq125(int)), m_xine, TQ_SLOT(slotSetEq125(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq250(int)), m_xine, TQT_SLOT(slotSetEq250(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq250(int)), m_xine, TQ_SLOT(slotSetEq250(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq500(int)), m_xine, TQT_SLOT(slotSetEq500(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq500(int)), m_xine, TQ_SLOT(slotSetEq500(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq1k(int)), m_xine, TQT_SLOT(slotSetEq1k(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq1k(int)), m_xine, TQ_SLOT(slotSetEq1k(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq2k(int)), m_xine, TQT_SLOT(slotSetEq2k(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq2k(int)), m_xine, TQ_SLOT(slotSetEq2k(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq4k(int)), m_xine, TQT_SLOT(slotSetEq4k(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq4k(int)), m_xine, TQ_SLOT(slotSetEq4k(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq8k(int)), m_xine, TQT_SLOT(slotSetEq8k(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq8k(int)), m_xine, TQ_SLOT(slotSetEq8k(int)));
connect(m_equalizer, TQT_SIGNAL(signalNewEq16k(int)), m_xine, TQT_SLOT(slotSetEq16k(int))); connect(m_equalizer, TQ_SIGNAL(signalNewEq16k(int)), m_xine, TQ_SLOT(slotSetEq16k(int)));
connect(m_equalizer, TQT_SIGNAL(signalSetVolumeGain(bool)), m_xine, TQT_SLOT(slotSetVolumeGain(bool))); connect(m_equalizer, TQ_SIGNAL(signalSetVolumeGain(bool)), m_xine, TQ_SLOT(slotSetVolumeGain(bool)));
} }
void XinePart::initConnections() void XinePart::initConnections()
{ {
connect(&m_posCheckTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckMoved())); connect(&m_posCheckTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckMoved()));
connect(&m_osdTimerEnabler, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotToggleOsdTimer())); connect(&m_osdTimerEnabler, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotToggleOsdTimer()));
connect(m_xine, TQT_SIGNAL(signalXineReady()), this, TQT_SLOT(slotFinalize())); connect(m_xine, TQ_SIGNAL(signalXineReady()), this, TQ_SLOT(slotFinalize()));
connect(m_xine, TQT_SIGNAL(signalNewChannels(const TQStringList&, const TQStringList&, int, int )), connect(m_xine, TQ_SIGNAL(signalNewChannels(const TQStringList&, const TQStringList&, int, int )),
this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int ))); this, TQ_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int )));
connect(m_xine, TQT_SIGNAL(signalXinePlaying()), this, TQT_SLOT(slotTrackPlaying())); connect(m_xine, TQ_SIGNAL(signalXinePlaying()), this, TQ_SLOT(slotTrackPlaying()));
connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), this, TQT_SLOT(slotNewPosition(int, const TQTime&))); connect(m_xine, TQ_SIGNAL(signalNewPosition(int, const TQTime&)), this, TQ_SLOT(slotNewPosition(int, const TQTime&)));
connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), this, TQT_SLOT(slotStatus(const TQString&))); connect(m_xine, TQ_SIGNAL(signalXineStatus(const TQString&)), this, TQ_SLOT(slotStatus(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), this, TQT_SLOT(slotError(const TQString&))); connect(m_xine, TQ_SIGNAL(signalXineError(const TQString&)), this, TQ_SLOT(slotError(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), this, TQT_SLOT(slotMessage(const TQString&))); connect(m_xine, TQ_SIGNAL(signalXineMessage(const TQString&)), this, TQ_SLOT(slotMessage(const TQString&)));
connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), this, TQT_SLOT(slotPlaybackFinished())); connect(m_xine, TQ_SIGNAL(signalPlaybackFinished()), this, TQ_SLOT(slotPlaybackFinished()));
connect(m_xine, TQT_SIGNAL(signalTitleChanged()), this, TQT_SLOT(slotNewTitle())); connect(m_xine, TQ_SIGNAL(signalTitleChanged()), this, TQ_SLOT(slotNewTitle()));
connect(m_xine, TQT_SIGNAL(signalLengthChanged()), this, TQT_SLOT(slotNewLength())); connect(m_xine, TQ_SIGNAL(signalLengthChanged()), this, TQ_SLOT(slotNewLength()));
connect(m_xine, TQT_SIGNAL(signalVideoSizeChanged()), this, TQT_SLOT(slotNewFrameSize())); connect(m_xine, TQ_SIGNAL(signalVideoSizeChanged()), this, TQ_SLOT(slotNewFrameSize()));
connect(m_xine, TQT_SIGNAL(signalRightClick(const TQPoint&)), this, TQT_SLOT(slotContextMenu(const TQPoint&))); connect(m_xine, TQ_SIGNAL(signalRightClick(const TQPoint&)), this, TQ_SLOT(slotContextMenu(const TQPoint&)));
} }
void XinePart::loadConfig() void XinePart::loadConfig()

14
kaffeine/src/player-parts/xine-part/xineconfig.cpp
Unescape View File

@ -68,7 +68,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
else else
m_stringEdit->setPaletteForegroundColor(TQColor(black)); m_stringEdit->setPaletteForegroundColor(TQColor(black));
grid->addWidget(m_stringEdit, row ,0); grid->addWidget(m_stringEdit, row ,0);
connect(m_stringEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotStringChanged(const TQString&))); connect(m_stringEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotStringChanged(const TQString&)));
break; break;
} }
case XINE_CONFIG_TYPE_ENUM: case XINE_CONFIG_TYPE_ENUM:
@ -86,7 +86,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
else else
m_enumEdit->setPaletteForegroundColor(TQColor(black)); m_enumEdit->setPaletteForegroundColor(TQColor(black));
grid->addWidget(m_enumEdit, row, 0); grid->addWidget(m_enumEdit, row, 0);
connect(m_enumEdit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotNumChanged(int))); connect(m_enumEdit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotNumChanged(int)));
break; break;
} }
case XINE_CONFIG_TYPE_NUM: case XINE_CONFIG_TYPE_NUM:
@ -98,7 +98,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
else else
m_numEdit->setPaletteForegroundColor(TQColor(black)); m_numEdit->setPaletteForegroundColor(TQColor(black));
grid->addWidget(m_numEdit, row, 0); grid->addWidget(m_numEdit, row, 0);
connect(m_numEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotNumChanged(int))); connect(m_numEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotNumChanged(int)));
break; break;
} }
case XINE_CONFIG_TYPE_RANGE: case XINE_CONFIG_TYPE_RANGE:
@ -111,7 +111,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
else else
m_numEdit->setPaletteForegroundColor(TQColor(black)); m_numEdit->setPaletteForegroundColor(TQColor(black));
grid->addWidget(m_numEdit, row, 0); grid->addWidget(m_numEdit, row, 0);
connect(m_numEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotNumChanged(int))); connect(m_numEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotNumChanged(int)));
break; break;
} }
case XINE_CONFIG_TYPE_BOOL: case XINE_CONFIG_TYPE_BOOL:
@ -123,7 +123,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
else else
m_boolEdit->setPaletteForegroundColor(TQColor(black)); m_boolEdit->setPaletteForegroundColor(TQColor(black));
grid->addWidget(m_boolEdit, row, 0); grid->addWidget(m_boolEdit, row, 0);
connect(m_boolEdit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBoolChanged(bool))); connect(m_boolEdit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBoolChanged(bool)));
break; break;
} }
} }
@ -287,8 +287,8 @@ XineConfig::XineConfig(const xine_t* const xine) :
createPage(*it, true, xineExpertPage); createPage(*it, true, xineExpertPage);
} }
connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotOkPressed())); connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotOkPressed()));
connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyPressed())); connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotApplyPressed()));
} }
XineConfig::~XineConfig() XineConfig::~XineConfig()

16
kaffeine/src/pref.cpp
Unescape View File

@ -71,7 +71,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
gb = new TQGroupBox( "", looknfeel ); gb = new TQGroupBox( "", looknfeel );
grid = new TQGridLayout( gb, 1, 1, 20, 6 ); grid = new TQGridLayout( gb, 1, 1, 20, 6 );
m_systemTray = new TQCheckBox(i18n("Embed in system tray"), gb); m_systemTray = new TQCheckBox(i18n("Embed in system tray"), gb);
connect(m_systemTray, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEmbedInTrayToggled(bool))); connect(m_systemTray, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEmbedInTrayToggled(bool)));
grid->addMultiCellWidget(m_systemTray, 0, 0, 0, 1); grid->addMultiCellWidget(m_systemTray, 0, 0, 0, 1);
m_osdTimeout = new TQSpinBox(gb); m_osdTimeout = new TQSpinBox(gb);
m_osdTimeout->setMinValue(0); m_osdTimeout->setMinValue(0);
@ -81,7 +81,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
grid->addWidget(m_osdTimeout, 1,0); grid->addWidget(m_osdTimeout, 1,0);
TQLabel* osdTimeoutLabel = new TQLabel(i18n("Duration of title announcement in system tray"), gb); TQLabel* osdTimeoutLabel = new TQLabel(i18n("Duration of title announcement in system tray"), gb);
osdTimeoutLabel->setDisabled(true); osdTimeoutLabel->setDisabled(true);
connect(m_systemTray, TQT_SIGNAL(toggled(bool)), osdTimeoutLabel, TQT_SLOT(setEnabled(bool))); connect(m_systemTray, TQ_SIGNAL(toggled(bool)), osdTimeoutLabel, TQ_SLOT(setEnabled(bool)));
grid->addWidget(osdTimeoutLabel, 1,1); grid->addWidget(osdTimeoutLabel, 1,1);
vb->addWidget( gb ); vb->addWidget( gb );
@ -94,7 +94,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
vb->addWidget( m_dcEnabled ); vb->addWidget( m_dcEnabled );
gb = new TQGroupBox( "", dc ); gb = new TQGroupBox( "", dc );
gb->setDisabled(true); gb->setDisabled(true);
connect(m_dcEnabled, TQT_SIGNAL(toggled(bool)), gb, TQT_SLOT(setEnabled(bool))); connect(m_dcEnabled, TQ_SIGNAL(toggled(bool)), gb, TQ_SLOT(setEnabled(bool)));
grid = new TQGridLayout( gb, 1, 1, 20, 6 ); grid = new TQGridLayout( gb, 1, 1, 20, 6 );
TQLabel *lab = new TQLabel( i18n("Broadcast address:"), gb ); TQLabel *lab = new TQLabel( i18n("Broadcast address:"), gb );
grid->addWidget( lab, 0, 0 ); grid->addWidget( lab, 0, 0 );
@ -117,7 +117,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
m_shiftDirBtn = new TQToolButton( gb ); m_shiftDirBtn = new TQToolButton( gb );
m_shiftDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); m_shiftDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) );
grid->addWidget( m_shiftDirBtn, 3, 2 ); grid->addWidget( m_shiftDirBtn, 3, 2 );
connect( m_shiftDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setShiftDir()) ); connect( m_shiftDirBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setShiftDir()) );
vb->addWidget( gb ); vb->addWidget( gb );
vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
@ -130,7 +130,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
gb->setInsideSpacing(6); gb->setInsideSpacing(6);
m_useAlternateEncoding = new TQCheckBox(i18n("Use alternate (non-Unicode) encoding for Meta tags"), gb); m_useAlternateEncoding = new TQCheckBox(i18n("Use alternate (non-Unicode) encoding for Meta tags"), gb);
connect(m_useAlternateEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseAlternateEncodingToggled(bool))); connect(m_useAlternateEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseAlternateEncodingToggled(bool)));
m_alternateEncoding = new TQComboBox(gb); m_alternateEncoding = new TQComboBox(gb);
TQStringList codecNames = TDEGlobal::charsets()->descriptiveEncodingNames(); TQStringList codecNames = TDEGlobal::charsets()->descriptiveEncodingNames();
@ -142,7 +142,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
grid = new TQGridLayout( gb, 1, 1, 20, 6 ); grid = new TQGridLayout( gb, 1, 1, 20, 6 );
KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb); KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb);
clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent())); connect(clearRecent, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalClearRecent()));
grid->addWidget(clearRecent, 0, 0); grid->addWidget(clearRecent, 0, 0);
TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb); TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb);
grid->addWidget(clearLabel, 0, 1); grid->addWidget(clearLabel, 0, 1);
@ -152,8 +152,8 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
delete icon; delete icon;
connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotOkPressed())); connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotOkPressed()));
connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyPressed())); connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotApplyPressed()));
} }
void KaffeinePreferences::setConfig(bool pauseVideo, bool tray, uint duration, bool useEncoding, const TQString& encoding) void KaffeinePreferences::setConfig(bool pauseVideo, bool tray, uint duration, bool useEncoding, const TQString& encoding)

4
kaffeine/src/startwindow.cpp
Unescape View File

@ -43,7 +43,7 @@
MToolButton::MToolButton( TQWidget *parent, const TQString& targ ) : TQToolButton( parent ) MToolButton::MToolButton( TQWidget *parent, const TQString& targ ) : TQToolButton( parent )
{ {
target = targ; target = targ;
connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(mClicked()) ); connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(mClicked()) );
} }
MToolButton::~MToolButton() MToolButton::~MToolButton()
@ -121,7 +121,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
TQSize size = btn->sizeHint(); TQSize size = btn->sizeHint();
size.setHeight( size.height()+5 ); size.setHeight( size.height()+5 );
btn->resize( size ); btn->resize( size );
connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) ); connect( btn, TQ_SIGNAL(executed(const TQString&)), this, TQ_SIGNAL(execTarget(const TQString&)) );
buttons.append( btn ); buttons.append( btn );
btn->show(); btn->show();
arrangeButtons( TQSize( width(),height() ) ); arrangeButtons( TQSize( width(),height() ) );

12
kaffeine/src/systemtray.cpp
Unescape View File

@ -57,11 +57,11 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
kdDebug() << "SystemTray: Create System Tray" << endl; kdDebug() << "SystemTray: Create System Tray" << endl;
TDEAction* play = new TDEAction(i18n("Play / Pause"), "media-playback-start", 0, this, TQT_SIGNAL(signalPlay()), actionCollection(), "trayplay"); TDEAction* play = new TDEAction(i18n("Play / Pause"), "media-playback-start", 0, this, TQ_SIGNAL(signalPlay()), actionCollection(), "trayplay");
TDEAction* next = new TDEAction(i18n("&Next"), "go-next", 0, this, TQT_SIGNAL(signalNext()), actionCollection(), "traynext"); TDEAction* next = new TDEAction(i18n("&Next"), "go-next", 0, this, TQ_SIGNAL(signalNext()), actionCollection(), "traynext");
TDEAction* previous = new TDEAction(i18n("&Previous"), "go-previous", 0, this, TQT_SIGNAL(signalPrevious()), actionCollection(), "trayprevious"); TDEAction* previous = new TDEAction(i18n("&Previous"), "go-previous", 0, this, TQ_SIGNAL(signalPrevious()), actionCollection(), "trayprevious");
TDEAction* stop = new TDEAction(i18n("Stop"), "media-playback-stop", 0, this, TQT_SIGNAL(signalStop()), actionCollection(), "traystop"); TDEAction* stop = new TDEAction(i18n("Stop"), "media-playback-stop", 0, this, TQ_SIGNAL(signalStop()), actionCollection(), "traystop");
TDEAction* mute = new TDEAction(i18n("&Mute"), "player_mute", 0, this, TQT_SIGNAL(signalMute()), actionCollection(), "traymute"); TDEAction* mute = new TDEAction(i18n("&Mute"), "player_mute", 0, this, TQ_SIGNAL(signalMute()), actionCollection(), "traymute");
play->plug(contextMenu()); play->plug(contextMenu());
next->plug(contextMenu()); next->plug(contextMenu());
@ -73,7 +73,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain); m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain);
m_osd->setLineWidth(1); m_osd->setLineWidth(1);
m_osd->setAlignment(SingleLine); m_osd->setAlignment(SingleLine);
connect(&m_hideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHideOSD())); connect(&m_hideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHideOSD()));
setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Panel, 22)); setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", TDEIcon::Panel, 22));
TQToolTip::add(this, i18n("Kaffeine Player")); TQToolTip::add(this, i18n("Kaffeine Player"));

6
kaffeine/src/tdemultitabbar.cpp
Unescape View File

@ -396,7 +396,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
setFixedWidth(24); setFixedWidth(24);
m_id=id; m_id=id;
TQToolTip::add(this,text); TQToolTip::add(this,text);
connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
} }
KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
@ -411,7 +411,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
setFixedWidth(24); setFixedWidth(24);
m_id=id; m_id=id;
TQToolTip::add(this,text); TQToolTip::add(this,text);
connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
} }
KMultiTabBarButton::~KMultiTabBarButton() { KMultiTabBarButton::~KMultiTabBarButton() {
@ -905,7 +905,7 @@ void KMultiTabBar::updateSeparator() {
int KMultiTabBar::appendTab(const TQPixmap &pic ,int id ,const TQString& text) int KMultiTabBar::appendTab(const TQPixmap &pic ,int id ,const TQString& text)
{ {
m_internal->appendTab(pic,id,text); m_internal->appendTab(pic,id,text);
connect( tab(id),TQT_SIGNAL(clicked(int)), this, TQT_SLOT(tabClicked(int)) ); connect( tab(id),TQ_SIGNAL(clicked(int)), this, TQ_SLOT(tabClicked(int)) );
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save