Changeset 4874 for extensions/digikam_export/piwigoexport/piwigowindow.cpp

Timestamp:

Feb 10, 2010, 10:18:02 PM (14 years ago)

Author:

fcoiffie

Message:

[digikam_export] Removal of all useless and commented code

• Temporary files are removed
• Warnings correction
• Selected 'thumbnail size' is stored in the configuration file

File:

• extensions/digikam_export/piwigoexport/piwigowindow.cpp (modified) (21 diffs)

extensions/digikam_export/piwigoexport/piwigowindow.cpp

@@ -39 +39 @@
 #include <QTreeWidgetItem>
 #include <QPointer>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 // KDE includes
@@ -63 +65 @@
 // Local includes
 
-#include "albumdlg.h"
 #include "piwigos.h"
 #include "piwigoconfig.h"
@@ -84 +85 @@
     QTreeWidget*           albumView;
 
-    QPushButton*           newAlbumBtn;
     QPushButton*           addPhotoBtn;
 
@@ -111 +111 @@
     logo = new KUrlLabel;
     logo->setText(QString());
-    logo->setUrl("http://piwigo.menalto.com");
+    logo->setUrl("http://piwigo.org");
     logo->setPixmap(QPixmap(KStandardDirs::locate("data", "kipiplugin_piwigoexport/pics/piwigo_logo.png")));
     logo->setAlignment(Qt::AlignLeft);
@@ -119 +119 @@
     albumView = new QTreeWidget;
     QStringList labels;
-    labels << i18n("Albums"); // << i18n("ID");
+    labels << i18n("Albums");
     albumView->setHeaderLabels(labels);
 
@@ -126 +126 @@
     QFrame *optionFrame = new QFrame;
     QVBoxLayout *vlay   = new QVBoxLayout();
-
-    newAlbumBtn = new QPushButton;
-    newAlbumBtn->setText(i18n("&New Album"));
-    newAlbumBtn->setIcon(KIcon("folder-new"));
-    newAlbumBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    newAlbumBtn->setEnabled(false);
 
     addPhotoBtn = new QPushButton;
@@ -163 +157 @@
     thumbDimensionSpinBox = new QSpinBox;
     thumbDimensionSpinBox->setRange(32,800);
-    thumbDimensionSpinBox->setValue(120);
+    thumbDimensionSpinBox->setValue(128);
 
     captTitleCheckBox->setChecked(true);
@@ -199 +193 @@
     // ---------------------------------------------------------------------------
 
-    vlay->addWidget(newAlbumBtn);
     vlay->addWidget(addPhotoBtn);
     vlay->addWidget(optionsBox);
@@ -226 +219 @@
         d(new Private(this))
 {
-    kDebug() << "BEGIN Window\n";
-
-
     setWindowTitle( i18n("Piwigo Export") );
     setButtons( KDialog::Close | KDialog::User1 | KDialog::Help);
@@ -310 +300 @@
     group.writeEntry("Set description", d->captDescrCheckBox->isChecked());
     group.writeEntry("Maximum Width",   d->dimensionSpinBox->value());
+    group.writeEntry("Thumbnail Width", d->thumbDimensionSpinBox->value());
 
     delete m_talker;
@@ -324 +315 @@
             this , SLOT( slotAlbumSelected() ) );
 
-    connect(d->newAlbumBtn, SIGNAL(clicked()),
-            this, SLOT(slotNewAlbum()));
-
     connect(d->addPhotoBtn, SIGNAL(clicked()),
             this, SLOT(slotAddPhoto()));
@@ -350 +338 @@
     connect(m_talker, SIGNAL(signalAlbums(const QList<GAlbum>&)),
             this, SLOT(slotAlbums(const QList<GAlbum>&)));
-
-    connect(m_talker, SIGNAL(signalPhotos(const QList<GPhoto>&)),
-            this, SLOT(slotPhotos(const QList<GPhoto>&)));
 
     connect(m_talker, SIGNAL(signalAddPhotoSucceeded()),
@@ -391 +376 @@
         d->captDescrCheckBox->setChecked(false);
 
+
+    d->thumbDimensionSpinBox->setValue(group.readEntry("Thumbnail Width", 128));
 }
 
@@ -443 +430 @@
     if (val) {
         setCursor(Qt::WaitCursor);
-        d->newAlbumBtn->setEnabled(false);
         d->addPhotoBtn->setEnabled(false);
     } else {
         setCursor(Qt::ArrowCursor);
         bool loggedIn = m_talker->loggedIn();
-// TODO Enable the button to implement the feature
-        //d->newAlbumBtn->setEnabled(loggedIn);
         d->addPhotoBtn->setEnabled(loggedIn && d->albumView->currentItem());
     }
@@ -492 +476 @@
             int i                       = 0;
 
-            kDebug() << "Parent : " << parentRefNum << "\n";
-
             while ( !found && i < parentItemList.size() ) {
                 parentItem = parentItemList.at(i);
-
-                kDebug() << "User : " << parentItem->data(1, Qt::UserRole).toInt() << "\n";
 
                 if (parentItem && (parentItem->data(1, Qt::UserRole).toInt() == parentRefNum)) {
@@ -505 +485 @@
                     item->setData(1, Qt::UserRole, album.ref_num );
                     item->setText(2, i18n("Album") );
-
-                    kDebug() << "Child : " << album.name << " " << album.ref_num << "\n";
 
                     parentItem->addChild(item);
@@ -515 +493 @@
                 i++;
             }
-
-            /*if (!found && i == parentItemList.size() )
-            {
-                workList.append(album);
-            }*/
         }
     }
 }
 
-// FIXME: avoid duplications
-void PiwigoWindow::slotPhotos(const QList<GPhoto>& photoList)
-{
-    QTreeWidgetItem* parentItem = d->albumView->currentItem();
-
-    typedef QList<GPhoto> GPhotoList;
-    GPhotoList::const_iterator iterator;
-    for (iterator = photoList.begin(); iterator != photoList.end(); ++iterator) {
-        QString plain = (*iterator).caption;
-        QTreeWidgetItem *item = new QTreeWidgetItem(parentItem);
-        item->setText(0, cleanName(plain) );
-        item->setIcon(0, KIcon("image-x-generic") );
-        item->setText(1, (*iterator).name);
-        item->setText(2, i18n("Image") );
-    }
-}
-
 void PiwigoWindow::slotAlbumSelected()
 {
     QTreeWidgetItem* item = d->albumView->currentItem();
-
-    kDebug() << "slotAlbumSelected\n";
 
     // stop loading if user clicked an image
     if ( item->text(2) == i18n("Image") )
         return;
-
-    kDebug() << "Album\n";
 
     if (!item) {
@@ -562 +514 @@
         if (m_talker->loggedIn() && albumId ) {
             d->addPhotoBtn->setEnabled(true);
-            //m_talker->listPhotos(albumName);
         } else {
             d->addPhotoBtn->setEnabled(false);
@@ -569 +520 @@
 }
 
-void PiwigoWindow::slotNewAlbum()
-{
-    QPointer<AlbumDlg> dlg = new AlbumDlg(d->widget);
-    dlg->titleEdit->setFocus();
-    if ( dlg->exec() != QDialog::Accepted ) {
-        delete dlg;
+void PiwigoWindow::slotAddPhoto()
+{
+    KUrl::List *urls = new KUrl::List(m_interface->currentSelection().images());
+
+    if (urls == NULL || urls->isEmpty()) {
+        KMessageBox::error(this, i18n("Nothing to upload - please select photos to upload."));
         return;
     }
 
-    QString name    = dlg->nameEdit->text();
-    QString title   = dlg->titleEdit->text();
-    QString caption = dlg->captionEdit->text();
-
-    delete dlg;
-
-    // check for prohibited chars in the album name
-    // \ / * ? " ' & < > | . + # ( ) or spaces
-    // TODO: Change this to a QRegExp check.
-    QChar ch;
-    bool  clean = true;
-
-    for (int i = 0; i < name.length(); ++i) {
-        ch = name[i];
-        if (ch == '\\') {
-            clean = false;
-            break;
-        } else if (ch == '/') {
-            clean = false;
-            break;
-        } else if (ch == '*') {
-            clean = false;
-            break;
-        } else if (ch == '?') {
-            clean = false;
-            break;
-        } else if (ch == '"') {
-            clean = false;
-            break;
-        } else if (ch == '\'') {
-            clean = false;
-            break;
-        } else if (ch == '&') {
-            clean = false;
-            break;
-        } else if (ch == '<') {
-            clean = false;
-            break;
-        } else if (ch == '>') {
-            clean = false;
-            break;
-        } else if (ch == '|') {
-            clean = false;
-            break;
-        } else if (ch == '.') {
-            clean = false;
-            break;
-        } else if (ch == '+') {
-            clean = false;
-            break;
-        } else if (ch == '#') {
-            clean = false;
-            break;
-        } else if (ch == '(') {
-            clean = false;
-            break;
-        } else if (ch == ')') {
-            clean = false;
-            break;
-        }
-        /*
-        else if (ch == ' ')
-        {
-            clean = false;
-            break;
-        }
-        */
-    }
-
-    if (!clean) {
-        KMessageBox::error(this, i18n("Sorry, these characters are not allowed in album name: \\ / * ? \" \' & &lt; &gt; | . + # ( ) or spaces"));
-        return;
-    }
-
-    QString parentAlbumName;
-
-    QTreeWidgetItem* item = d->albumView->currentItem();
-    int column            = d->albumView->currentColumn();
-    if (item) {
-        const GAlbum& album = d->albumDict.value( item->text(column) );
-        parentAlbumName     = album.name;
-        m_talker->createAlbum( parentAlbumName, name, title, caption);
-    } else {
-        m_talker->createAlbum( firstAlbumName, name, title, caption );
-    }
-}
-
-void PiwigoWindow::slotAddPhoto()
-{
-#if 0
-    QTreeWidgetItem* item = d->albumView->currentItem();
-    int column            = d->albumView->currentColumn();
-    if (!item)
-        return;     // NO album selected: FIXME: do something
-
-    // albumName
-    QString albumTitle = item->text(column);
-    if (!d->albumDict.contains(albumTitle))
-        return;     // NO album name found: FIXME: do something
-
-    // photoPath
-    KUrl::List urls = KIPIPlugins::ImageDialog::getImageUrls(this, m_interface);
-    if (urls.isEmpty())
-        return; // NO photo selected: FIXME: do something
-
-    for (KUrl::List::iterator it = urls.begin(); it != urls.end(); ++it) {
+    for (KUrl::List::iterator it = urls->begin(); it != urls->end(); ++it) {
         mpUploadList->append( (*it).path() );
     }
@@ -692 +538 @@
     m_uploadCount = 0;
     slotAddPhotoNext();
-#endif
-    KUrl::List *urls = new KUrl::List(m_interface->currentSelection().images());
-
-    if (urls == NULL || urls->isEmpty()) {
-        KMessageBox::error(this, i18n("Nothing to upload - please select photos to upload."));
-        return;
-    }
-
-    for (KUrl::List::iterator it = urls->begin(); it != urls->end(); ++it) {
-        mpUploadList->append( (*it).path() );
-    }
-
-    m_uploadTotal = mpUploadList->count();
-    m_progressDlg->reset();
-    m_progressDlg->setMaximum(m_uploadTotal);
-    m_uploadCount = 0;
-    slotAddPhotoNext();
 }
 
@@ -716 +545 @@
         m_progressDlg->reset();
         m_progressDlg->hide();
-        //slotAlbumSelected();        // ?
         return;
     }