~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/setup/setupcamera.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
 
65
65
public:
66
66
 
67
 
    SetupCameraItem(QTreeWidget *parent, CameraType *ctype)
 
67
    SetupCameraItem(QTreeWidget* parent, CameraType* ctype)
68
68
        : QTreeWidgetItem(parent), m_ctype(0)
69
69
    {
70
70
        setCameraType(ctype);
75
75
        delete m_ctype;
76
76
    };
77
77
 
78
 
    void setCameraType(CameraType *ctype)
 
78
    void setCameraType(CameraType* ctype)
79
79
    {
80
80
        if (m_ctype)
 
81
        {
81
82
            delete m_ctype;
 
83
        }
82
84
 
83
85
        m_ctype = new CameraType(*ctype);
84
86
 
103
105
 
104
106
// -------------------------------------------------------------------
105
107
 
106
 
CameraAutoDetectThread::CameraAutoDetectThread(QObject *parent)
107
 
                      : DBusyThread(parent)
 
108
CameraAutoDetectThread::CameraAutoDetectThread(QObject* parent)
 
109
    : DBusyThread(parent)
108
110
{
109
111
    m_result = -1;
110
112
}
140
142
{
141
143
public:
142
144
 
143
 
    SetupCameraPriv()
 
145
    SetupCameraPriv() :
 
146
        addButton(0),
 
147
        removeButton(0),
 
148
        editButton(0),
 
149
        autoDetectButton(0),
 
150
        listView(0)
144
151
    {
145
 
        listView         = 0;
146
 
        addButton        = 0;
147
 
        removeButton     = 0;
148
 
        editButton       = 0;
149
 
        autoDetectButton = 0;
150
152
    }
151
153
 
152
154
    QPushButton*         addButton;
158
160
};
159
161
 
160
162
SetupCamera::SetupCamera( QWidget* parent )
161
 
           : QScrollArea(parent), d(new SetupCameraPriv)
 
163
    : QScrollArea(parent), d(new SetupCameraPriv)
162
164
{
163
 
    QWidget *panel = new QWidget(viewport());
 
165
    QWidget* panel = new QWidget(viewport());
164
166
    setWidget(panel);
165
167
    setWidgetResizable(true);
166
168
 
207
209
 
208
210
    QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
209
211
 
210
 
    KUrlLabel *gphotoLogoLabel = new KUrlLabel(panel);
 
212
    KUrlLabel* gphotoLogoLabel = new KUrlLabel(panel);
211
213
    gphotoLogoLabel->setText(QString());
212
214
    gphotoLogoLabel->setUrl("http://www.gphoto.org");
213
215
    gphotoLogoLabel->setPixmap(QPixmap(KStandardDirs::locate("data", "digikam/data/logo-gphoto.png")));
262
264
    {
263
265
        QList<CameraType*>* cl = clist->cameraList();
264
266
 
265
 
        foreach (CameraType *ctype, *cl)
 
267
        foreach (CameraType* ctype, *cl)
266
268
        {
267
269
            new SetupCameraItem(d->listView, ctype);
268
270
        }
287
289
 
288
290
void SetupCamera::slotSelectionChanged()
289
291
{
290
 
    QTreeWidgetItem *item = d->listView->currentItem();
 
292
    QTreeWidgetItem* item = d->listView->currentItem();
 
293
 
291
294
    if (!item)
292
295
    {
293
296
        d->removeButton->setEnabled(false);
301
304
 
302
305
void SetupCamera::slotAddCamera()
303
306
{
304
 
    CameraSelection *select = new CameraSelection;
 
307
    CameraSelection* select = new CameraSelection;
305
308
 
306
309
    connect(select, SIGNAL(signalOkClicked(const QString&, const QString&,
307
310
                                           const QString&, const QString&)),
320
323
 
321
324
void SetupCamera::slotRemoveCamera()
322
325
{
323
 
    SetupCameraItem *item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
 
326
    SetupCameraItem* item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
 
327
 
324
328
    if (item)
 
329
    {
325
330
        delete item;
 
331
    }
326
332
}
327
333
 
328
334
void SetupCamera::slotEditCamera()
329
335
{
330
 
    SetupCameraItem *item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
331
 
    if (!item) return;
 
336
    SetupCameraItem* item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
 
337
 
 
338
    if (!item)
 
339
    {
 
340
        return;
 
341
    }
332
342
 
333
343
    CameraType* ctype = item->cameraType();
334
 
    if (!ctype) return;
335
 
 
336
 
    CameraSelection *select = new CameraSelection;
 
344
 
 
345
    if (!ctype)
 
346
    {
 
347
        return;
 
348
    }
 
349
 
 
350
    CameraSelection* select = new CameraSelection;
337
351
    select->setCamera(ctype->title(), ctype->model(), ctype->port(), ctype->path());
338
352
 
339
353
    connect(select, SIGNAL(signalOkClicked(const QString&, const QString&,
347
361
void SetupCamera::slotEditedCamera(const QString& title, const QString& model,
348
362
                                   const QString& port, const QString& path)
349
363
{
350
 
    SetupCameraItem *item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
351
 
    if (!item) return;
 
364
    SetupCameraItem* item = dynamic_cast<SetupCameraItem*>(d->listView->currentItem());
 
365
 
 
366
    if (!item)
 
367
    {
 
368
        return;
 
369
    }
352
370
 
353
371
    CameraType ctype(title, model, port, path, 1);
354
372
    item->setCameraType(&ctype);
356
374
 
357
375
void SetupCamera::slotAutoDetectCamera()
358
376
{
359
 
    DBusyDlg *dlg                  = new DBusyDlg(i18n("Device detection under progress, please wait..."), this);
360
 
    CameraAutoDetectThread *thread = new CameraAutoDetectThread(this);
 
377
    DBusyDlg* dlg                  = new DBusyDlg(i18n("Device detection under progress, please wait..."), this);
 
378
    CameraAutoDetectThread* thread = new CameraAutoDetectThread(this);
361
379
    dlg->setBusyThread(thread);
362
380
    dlg->exec();
363
381
 
375
393
 
376
394
    // NOTE: See note in digikam/digikam/cameralist.cpp
377
395
    if (port.startsWith(QLatin1String("usb:")))
378
 
    port = "usb:";
 
396
    {
 
397
        port = "usb:";
 
398
    }
379
399
 
380
400
    if (!d->listView->findItems(model, Qt::MatchExactly, 1).isEmpty())
381
401
    {
391
411
void SetupCamera::applySettings()
392
412
{
393
413
    CameraList* clist = CameraList::defaultList();
 
414
 
394
415
    if (clist)
395
416
    {
396
417
        clist->clear();
397
418
 
398
419
        QTreeWidgetItemIterator it(d->listView);
 
420
 
399
421
        while (*it)
400
422
        {
401
 
            SetupCameraItem *item = dynamic_cast<SetupCameraItem*>(*it);
 
423
            SetupCameraItem* item = dynamic_cast<SetupCameraItem*>(*it);
 
424
 
402
425
            if (item)
403
426
            {
404
427
                CameraType* ctype = item->cameraType();
 
428
 
405
429
                if (ctype)
406
430
                {
407
431
                    clist->insert(new CameraType(*ctype));
408
432
                }
409
433
            }
 
434
 
410
435
            ++it;
411
436
        }
412
437