[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 502732 by cgilles:

digikam from trunk : Showfoto/IE common GUI implementation : polish slotLoadingStarted/slotLoadingFinished and slotSavingStarted/finishSaving method. Saving still bugly

CCMAIL: digikam-devel at kde.org

 M  +22 -4     showfoto/showfoto.cpp  
 M  +15 -7     utilities/imageeditor/editor/imagewindow.cpp  


--- trunk/extragear/graphics/digikam/showfoto/showfoto.cpp #502731:502732
@@ -783,7 +783,11 @@
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
     
-    //TODO: Disable actions as appropriate
+    // Disable actions as appropriate during loading
+    m_rightSidebar->noCurrentItem();
+    toggleActions(false);
+    m_openFilesInFolderAction->setEnabled(false);
+    m_fileOpenAction->setEnabled(false);
 
     m_nameLabel->progressBarVisible(true);
 }
@@ -791,11 +795,17 @@
 void ShowFoto::slotLoadingFinished(const QString &filename, bool success, bool isReadOnly)
 {
     //TODO: handle success == false
+    
     m_nameLabel->progressBarVisible(false);
     m_isReadOnly = isReadOnly;
     slotUpdateItemInfo();
 
-    //TODO: Enable actions as appropriate
+    // Enable actions as appropriate after loading
+    // No need to re-enable image properties sidebar here, it's will be done
+    // automaticly by a signal from canvas
+    toggleActions(true);
+    m_openFilesInFolderAction->setEnabled(true);
+    m_fileOpenAction->setEnabled(true);
 
     QApplication::restoreOverrideCursor();
 }
@@ -804,7 +814,11 @@
 {
     kapp->setOverrideCursor( KCursor::waitCursor() );
     
-    //TODO: disable actions as appropriate
+    // Disable actions as appropriate during saving
+    m_rightSidebar->noCurrentItem();
+    toggleActions(false);
+    m_openFilesInFolderAction->setEnabled(false);
+    m_fileOpenAction->setEnabled(false);
     
     m_nameLabel->progressBarVisible(true);
 }
@@ -818,7 +832,11 @@
         m_savingContext->progressDialog->close();
     }
 
-    //TODO: Enable actions as appropriate
+    // Enable actions as appropriate after saving
+    // TODO updated image propertie side bar!
+    toggleActions(true);
+    m_openFilesInFolderAction->setEnabled(true);
+    m_fileOpenAction->setEnabled(true);
 
     m_nameLabel->progressBarVisible(false);
 }
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #502731:502732
@@ -547,22 +547,26 @@
 void ImageWindow::slotLoadingStarted(const QString &filename)
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
-        
-    //TODO: Disable actions as appropriate
+    
+    // Disable actions as appropriate during loading
+    m_rightSidebar->noCurrentItem();
+    toggleActions(false);
 
     m_nameLabel->progressBarVisible(true);
 }
 
 void ImageWindow::slotLoadingFinished(const QString &filename, bool success, bool isReadOnly)
 {
-    //TODO: enable actions as appropriate
     //TODO: handle success == false
 
     m_nameLabel->progressBarVisible(false);
     m_isReadOnly = isReadOnly;
     slotUpdateItemInfo();
 
-    //TODO: Enable actions as appropriate
+    // Enable actions as appropriate after loading
+    // No need to re-enable image properties sidebar here, it's will be done
+    // automaticly by a signal from canvas
+    toggleActions(true);
 
     QApplication::restoreOverrideCursor();
 }
@@ -571,8 +575,10 @@
 {
     kapp->setOverrideCursor( KCursor::waitCursor() );
     
-    //TODO: disable actions as appropriate
-    
+    // Disable actions as appropriate during saving
+    m_rightSidebar->noCurrentItem();
+    toggleActions(false);
+
     m_nameLabel->progressBarVisible(true);
 }
 
@@ -585,7 +591,9 @@
         m_savingContext->progressDialog->close();
     }
 
-    //TODO: Enable actions as appropriate
+    // Enable actions as appropriate after saving
+    // TODO updated image propertie side bar!
+    toggleActions(true);
 
     m_nameLabel->progressBarVisible(false);
 }