[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kipi-plugins/galleryexport
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2008-10-23 9:28:52
Message-ID: 1224754132.229594.12092.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 875088 by adjam:

New (simple) algorithm in GalleryWindow slotAlbum function. 
Now it shows an albums/photos tree.
Removed eccessive kWarning(ing..)



 M  +1 -9      gallerytalker.cpp  
 M  +25 -6     gallerywindow.cpp  


--- trunk/extragear/graphics/kipi-plugins/galleryexport/gallerytalker.cpp \
#875087:875088 @@ -93,8 +93,6 @@
     form.addPair("password", passwd);
     form.finish();
 
-    kWarning() << endl << endl << " form : " << form.formData() << endl << endl;
-
     m_job = KIO::http_post(m_url, form.formData(), KIO::HideProgressInfo);
     m_job->addMetaData("content-type", form.contentType());
     m_job->addMetaData("cookies", "manual");
@@ -326,7 +324,7 @@
             break;
     }
 
-    if (m_state == GE_LOGIN && m_loggedIn)      // FIXME adjust cookies..
+    if (m_state == GE_LOGIN && m_loggedIn)
     {
         QStringList cookielist = (tempjob->queryMetaData("setcookies")).split('\n');
         m_cookie = "Cookie:";
@@ -385,8 +383,6 @@
         }
     }
 
-    kWarning() << endl << endl << "authToken = " << s_authToken << endl << endl;
-
     if (!foundResponse) {
         emit signalLoginFailed(i18n("Gallery URL probably incorrect"));
         return;
@@ -558,15 +554,11 @@
 
         if (!foundResponse) {
             foundResponse = line.startsWith("#__GR2PROTO__");
-            kWarning() << "foundResponse: " << foundResponse << endl;
         } else {
             QStringList strlist = line.split('=');
             if (strlist.count() == 2) {
-                kWarning() << "line count = 2 " << endl;
                 QString key   = strlist[0];
                 QString value = strlist[1];
-                kWarning() << "key = " << key <<endl;
-                kWarning() << "value =  " << value  << endl;
                 if (key == "status") {      // key == "status" NOT FOUND!!!
                     success = (value == "0");
                     kWarning( 51000 ) << "Create Album. success: " << success << \
                endl;
--- trunk/extragear/graphics/kipi-plugins/galleryexport/gallerywindow.cpp \
#875087:875088 @@ -387,16 +387,35 @@
     d->albumDict.clear();
     d->albumView->clear();
 
-    typedef QList<GAlbum> GAlbumList;
-    GAlbumList::const_iterator iterator;
-    for (iterator = albumList.begin(); iterator != albumList.end(); ++iterator) {
-        if ( (*iterator).parent_ref_num != 0 ) {
+//     typedef QList<GAlbum> GAlbumList;
+    QVector<int> ref_num_vect( albumList.size() );
+
+    for (int i = 0; i < albumList.size(); ++i) 
+    {
+        const GAlbum& album = albumList.at(i);
+        ref_num_vect.insert( i, album.name.toInt() );
+
+        int parentRefNum = album.parent_ref_num;
+        if ( parentRefNum == 0 ) 
+        {
             QTreeWidgetItem *item = new QTreeWidgetItem();
-            item->setText(0, (*iterator).title );
+            item->setText(0, album.title );
             item->setIcon(0, KIcon("inode-directory") );
+
             d->albumView->addTopLevelItem(item);
+            d->albumDict.insert(album.title, album);
+        }
+        else
+        {
+            int n = ref_num_vect.indexOf( parentRefNum );
+            const GAlbum& parentAlbum = albumList.at(n);    // ERROR
+            QString parentTitle = parentAlbum.title;
+            QTreeWidgetItem *parentItem = ( d->albumView->findItems(parentTitle, \
Qt::MatchExactly) ).at(0);  
-            const GAlbum& album = *iterator;
+            QTreeWidgetItem *item = new QTreeWidgetItem(parentItem);
+            item->setText(0, album.title );
+            item->setIcon(0, KIcon("inode-directory") );
+        
             d->albumDict.insert(album.title, album);
         }
     }


[prev in list] [next in list] [prev in thread] [next in thread]