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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/kmail
From:       Laurent Montel <montel () kde ! org>
Date:       2010-01-14 18:54:48
Message-ID: 1263495288.009646.7206.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1074781 by mlaurent:

Backport and adapt fixs from trunk


 M  +9 -1      archivefolderdialog.cpp  
 M  +1 -1      archivefolderdialog.h  


--- branches/work/akonadi-ports/kdepim/kmail/archivefolderdialog.cpp #1074780:1074781
@@ -66,6 +66,8 @@
   QLabel *folderLabel = new QLabel( i18n( "&Folder:" ), mainWidget );
   mainLayout->addWidget( folderLabel, row, 0 );
   mFolderRequester = new FolderRequester( mainWidget );
+  mFolderRequester->setMustBeReadWrite( false );
+  connect( mFolderRequester, SIGNAL( folderChanged( const Akonadi::Collection& ) ), \
SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );  folderLabel->setBuddy( \
mFolderRequester );  mainLayout->addWidget( mFolderRequester, row, 1 );
   row++;
@@ -113,11 +115,17 @@
   resize( 500, minimumSize().height() );
 }
 
+void ArchiveFolderDialog::slotFolderChanged( const Akonadi::Collection &folder )
+{
+  mDeleteCheckBox->setEnabled( folder.rights() & Akonadi::Collection::CanDeleteItem \
); +}
+
 void ArchiveFolderDialog::setFolder( const Akonadi::Collection &defaultCollection )
 {
   mFolderRequester->setFolder( defaultCollection );
   // TODO: what if the file already exists?
   mUrlRequester->setUrl( standardArchivePath( defaultCollection.name() ) );
+  mDeleteCheckBox->setEnabled( defaultCollection.rights() & \
Akonadi::Collection::CanDeleteItem );  }
 
 void ArchiveFolderDialog::slotButtonClicked( int button )
@@ -143,7 +151,7 @@
   backupJob->setRootFolder( mFolderRequester->folderCollection() );
   backupJob->setSaveLocation( mUrlRequester->url() );
   backupJob->setArchiveType( static_cast<BackupJob::ArchiveType>( \
                mFormatComboBox->currentIndex() ) );
-  backupJob->setDeleteFoldersAfterCompletion( mDeleteCheckBox->isChecked() );
+  backupJob->setDeleteFoldersAfterCompletion( mDeleteCheckBox->isChecked() && \
mFolderRequester->folderCollection().rights() & Akonadi::Collection::CanDeleteItem ); \
backupJob->start();  accept();
 }
--- branches/work/akonadi-ports/kdepim/kmail/archivefolderdialog.h #1074780:1074781
@@ -46,7 +46,7 @@
   protected slots:
 
     void slotFixFileExtension();
-
+    void slotFolderChanged( const Akonadi::Collection& );
     /** reimp */
     virtual void slotButtonClicked( int button );
 


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