[Kde-imaging] kdeextragear-libs-1/kipi-plugins/sendimages

[Gilles Caulier]

CVS commit by cgilles: 

SendImage plugin: Improve progress dialog messages
CCMAIL: kde-imaging at kde.org


  M +17 -3     plugin_sendimages.cpp   1.21


--- kdeextragear-libs-1/kipi-plugins/sendimages/plugin_sendimages.cpp  #1.20:1.21
@@ -247,18 +247,32 @@ void Plugin_SendImages::customEvent(QCus
         if( d->action == KIPISendimagesPlugin::Progress )
            {
-           delete m_progressDlg;
-
            // If we have some errors during the resizing images process, show an error dialog.
 
            if ( m_sendImagesOperation->showErrors() == false )
+              {
+              delete m_progressDlg;
               return;
+              }
+
+#if KDE_VERSION >= 0x30200
+           m_progressDlg->setButtonCancel( KStdGuiItem::close() );
+#else
+           m_progressDlg->setButtonCancelText( i18n("&Close") );
+#endif
+
+           disconnect(m_progressDlg, SIGNAL(cancelClicked()),
+                      this, SLOT(slotCancel()));
 
            // Create a text file with images comments if necessary.
 
            m_sendImagesOperation->makeCommentsFile();
+           m_progressDlg->addedAction(i18n("Creating comments file if necessary..."),
+                                      KIPI::StartingMessage);
 
            // Invoke mailer agent call.
 
            m_sendImagesOperation->invokeMailAgent();
+           m_progressDlg->addedAction(i18n("Starting mailer agent..."),
+                                      KIPI::StartingMessage);
            }
         }