← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kdenetwork-kde4/hardy-backports

« back to all changes in this revision

Viewing changes to kopete/kopete/config/avdevice/avdeviceconfig.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2008-01-31 17:38:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080131173828-0pex3q204v5jglp7
Tags: 4:4.0.1-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kopete/kopete/config/avdevice/avdeviceconfig.cpp
49
49
 : KCModule( KopeteAVDeviceConfigFactory::componentData(), parent, args )
50
50
{
51
51
        kDebug() << "kopete:config (avdevice): KopeteAVDeviceConfigFactory::componentData() called. ";
52
 
//      QVBoxLayout *layout = new QVBoxLayout(this);
53
 
 
54
 
//      mAVDeviceTabCtl = new QTabWidget(this);
55
 
//      layout->addWidget( mAVDeviceTabCtl );
56
 
 
57
52
// "Video" TAB ============================================================
58
 
//      QWidget *w = new QWidget(this);
59
53
        mPrfsVideoDevice = new Ui_AVDeviceConfig_VideoDevice();
60
54
        mPrfsVideoDevice->setupUi(this);
61
55
 
63
57
        mPrfsVideoDevice->mVideoImageLabel->setScaledContents(false);
64
58
        mPrfsVideoDevice->mVideoImageLabel->setPixmap(KIcon("camera-web").pixmap(128,128));
65
59
 
66
 
//      mAVDeviceTabCtl->addTab(w, i18n("Video"));
67
 
//      mPrfsVideoDevice = new Ui_AVDeviceConfig_VideoDevice(mAVDeviceTabCtl);
68
60
        connect(mPrfsVideoDevice->mDeviceKComboBox,              SIGNAL(activated(int)),    this, SLOT(slotDeviceKComboBoxChanged(int)));
69
61
        connect(mPrfsVideoDevice->mInputKComboBox,               SIGNAL(activated(int)),    this, SLOT(slotInputKComboBoxChanged(int)));
70
62
        connect(mPrfsVideoDevice->mStandardKComboBox,            SIGNAL(activated(int)),    this, SLOT(slotStandardKComboBoxChanged(int)));
77
69
        connect(mPrfsVideoDevice->mImageAutoColorCorrection,     SIGNAL(toggled(bool)),     this, SLOT(slotImageAutoColorCorrectionChanged(bool)));
78
70
        connect(mPrfsVideoDevice->mImageAsMirror,                SIGNAL(toggled(bool)),     this, SLOT(slotImageAsMirrorChanged(bool)));
79
71
 
80
 
        // why is this here?
81
 
        // mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap);
82
 
//      mAVDeviceTabCtl->addTab(mPrfsVideoDevice,tr2i18n("&Video",0)); // Problematic. Need to be uncommented after fixing it.
83
72
        mVideoDevicePool = Kopete::AV::VideoDevicePool::self();
84
73
        mVideoDevicePool->open();
85
74
        mVideoDevicePool->setSize(320, 240);
87
76
        mVideoDevicePool->fillDeviceKComboBox(mPrfsVideoDevice->mDeviceKComboBox);
88
77
        mVideoDevicePool->fillInputKComboBox(mPrfsVideoDevice->mInputKComboBox);
89
78
        mVideoDevicePool->fillStandardKComboBox(mPrfsVideoDevice->mStandardKComboBox);
 
79
        setVideoInputParameters();
90
80
 
91
81
        mVideoDevicePool->startCapturing();
92
82
 
249
239
 
250
240
void AVDeviceConfig::deviceRegistered( const QString & udi )
251
241
{
252
 
        kDebug() << "not updating combo boxes due to bugs in videodevicepool!";
253
 
        //mVideoDevicePool->fillDeviceKComboBox(mPrfsVideoDevice->mDeviceKComboBox);
254
 
        //mVideoDevicePool->fillInputKComboBox(mPrfsVideoDevice->mInputKComboBox);
255
 
        //mVideoDevicePool->fillStandardKComboBox(mPrfsVideoDevice->mStandardKComboBox);
 
242
        mVideoDevicePool->fillDeviceKComboBox(mPrfsVideoDevice->mDeviceKComboBox);
 
243
        mVideoDevicePool->fillInputKComboBox(mPrfsVideoDevice->mInputKComboBox);
 
244
        mVideoDevicePool->fillStandardKComboBox(mPrfsVideoDevice->mStandardKComboBox);
256
245
}
257
246
 
258
247
 
259
248
void AVDeviceConfig::deviceUnregistered( const QString & udi )
260
249
{
261
 
        kDebug() << "not updating combo boxes due to bugs in videodevicepool!";
262
 
        //mVideoDevicePool->fillDeviceKComboBox(mPrfsVideoDevice->mDeviceKComboBox);
263
 
        //mVideoDevicePool->fillInputKComboBox(mPrfsVideoDevice->mInputKComboBox);
264
 
        //mVideoDevicePool->fillStandardKComboBox(mPrfsVideoDevice->mStandardKComboBox);
265
 
}
 
250
/*      mVideoDevicePool->fillDeviceKComboBox(mPrfsVideoDevice->mDeviceKComboBox);
 
251
        mVideoDevicePool->fillInputKComboBox(mPrfsVideoDevice->mInputKComboBox);
 
252
        mVideoDevicePool->fillStandardKComboBox(mPrfsVideoDevice->mStandardKComboBox);
 
253
*/}