SVN_MERGE

Merged revisions 1136206-1136207,1136213,1136219,1136236,1136245,1136254,1136259,1136261-1136262,1136264,1136277,1136284-1136286,1136318,1136328,1136330-1136331,1136354,1136359,1136373,1136375,1136380,1136386,1136630,1136633,1136644-1136646,1136668,1136670,1136672 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ................ r1136206 | mlaurent | 2010-06-09 10:12:12 +0200 (Wed, 09 Jun 2010) | 2 lines In kmail2 QuotaUnit is not necessary ................ r1136207 | mlaurent | 2010-06-09 10:13:59 +0200 (Wed, 09 Jun 2010) | 2 lines Bye bye default-mailbox-format too ................ r1136213 | tilladam | 2010-06-09 10:18:36 +0200 (Wed, 09 Jun 2010) | 4 lines Make it possible to use a distinct selection model in the foldertreewidget. In the folderrequester, we don't want to trigger collection fetches when we select a folder. So avoid that, by using a distinct selection model. ................ r1136219 | tilladam | 2010-06-09 10:37:22 +0200 (Wed, 09 Jun 2010) | 1 line Avoid unnessecary modify jobs. ................ r1136236 | mlaurent | 2010-06-09 11:38:50 +0200 (Wed, 09 Jun 2010) | 2 lines Fix error in text ................ r1136245 | mlaurent | 2010-06-09 12:06:10 +0200 (Wed, 09 Jun 2010) | 2 lines Fix crash ................ r1136254 | mlaurent | 2010-06-09 12:30:01 +0200 (Wed, 09 Jun 2010) | 2 lines Fix app icon name ................ r1136259 | smartins | 2010-06-09 12:53:21 +0200 (Wed, 09 Jun 2010) | 2 lines emit signal when collection changes so application knows when access rights changed. ................ r1136261 | smartins | 2010-06-09 12:57:03 +0200 (Wed, 09 Jun 2010) | 2 lines make collectionFromModel work with tree models. ................ r1136262 | krake | 2010-06-09 13:02:13 +0200 (Wed, 09 Jun 2010) | 2 lines Do not overwrite error text from folderForCollectionMethod, otherwise the reported path is non-sense ................ r1136264 | krake | 2010-06-09 13:06:04 +0200 (Wed, 09 Jun 2010) | 3 lines Disable interval checking on IMAP resources before runing the imapcache importer and enable it (if configured) when the importer has finished. Otherwise the resource will start downloading folders the importer hasn't processed yet ................ r1136277 | smartins | 2010-06-09 13:51:22 +0200 (Wed, 09 Jun 2010) | 2 lines remove warning, incidence->readOnly() isn't part of the payload ................ r1136284 | winterz | 2010-06-09 14:18:07 +0200 (Wed, 09 Jun 2010) | 10 lines SVN_SILENT: Blocked revisions 1136283 via svnmerge ........ r1136283 | winterz | 2010-06-09 08:16:49 -0400 (Wed, 09 Jun 2010) | 4 lines Remove groupwise and groupdav kresources and adjust the wizard accordingly MERGE: none ........ ................ r1136285 | winterz | 2010-06-09 14:19:42 +0200 (Wed, 09 Jun 2010) | 9 lines SVN_SILENT: Blocked revisions 1135917 via svnmerge ........ r1135917 | ludwigreiter | 2010-06-08 06:18:07 -0400 (Tue, 08 Jun 2010) | 1 line Update after test of the 2010-06-04 newslog ........ ................ r1136286 | winterz | 2010-06-09 14:20:43 +0200 (Wed, 09 Jun 2010) | 14 lines SVN_SILENT: Recorded merge of revisions 1136056 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1136056 | winterz | 2010-06-08 16:38:15 -0400 (Tue, 08 Jun 2010) | 6 lines when dropping plain old text of emails, decode the whole thing so we don't lose out on the displayName, comments, etc. kolab/issue341l MERGE: trunk ........ ................ r1136318 | mlaurent | 2010-06-09 15:44:38 +0200 (Wed, 09 Jun 2010) | 2 lines I don't delete cache after but I want to finish import :) ................ r1136328 | mlaurent | 2010-06-09 16:20:15 +0200 (Wed, 09 Jun 2010) | 2 lines Add missing conversion ................ r1136330 | krake | 2010-06-09 16:24:04 +0200 (Wed, 09 Jun 2010) | 3 lines Skip IMAP folders on import when they or one of their ancestors have been locally unsubscribed. Still need to unsubscribe them with Akonadi ................ r1136331 | krake | 2010-06-09 16:27:11 +0200 (Wed, 09 Jun 2010) | 3 lines Ups, wrong object ................ r1136354 | krake | 2010-06-09 17:41:06 +0200 (Wed, 09 Jun 2010) | 2 lines Locally unsubscribe collections for IMAP folders which were unsubscribed locally ................ r1136359 | krake | 2010-06-09 17:58:08 +0200 (Wed, 09 Jun 2010) | 2 lines Need to specifically enable interval checking ................ r1136373 | lueck | 2010-06-09 18:38:38 +0200 (Wed, 09 Jun 2010) | 1 line typo fix spotted by Freek de Kruijf ................ r1136375 | krake | 2010-06-09 18:47:57 +0200 (Wed, 09 Jun 2010) | 2 lines Make migratePassword() a member function so we can keep the Wallet instance and don't bother the user with wallet password input for every single resource that gets its password migrated ................ r1136380 | krake | 2010-06-09 18:58:29 +0200 (Wed, 09 Jun 2010) | 2 lines Oops, revert local test config ................ r1136386 | mlaurent | 2010-06-09 19:11:38 +0200 (Wed, 09 Jun 2010) | 4 lines Migrate Trash/Folder destination for resources. Now I think that all is migrated ................ r1136630 | mlaurent | 2010-06-10 11:09:48 +0200 (Thu, 10 Jun 2010) | 2 lines Fix duplicate code ................ r1136633 | mlaurent | 2010-06-10 11:26:54 +0200 (Thu, 10 Jun 2010) | 2 lines not necessary ................ r1136644 | mlaurent | 2010-06-10 12:25:38 +0200 (Thu, 10 Jun 2010) | 2 lines Add missing slot ................ r1136645 | mlaurent | 2010-06-10 12:38:51 +0200 (Thu, 10 Jun 2010) | 2 lines Fix crash when we try to rename a not item ................ r1136646 | mlaurent | 2010-06-10 12:41:06 +0200 (Thu, 10 Jun 2010) | 2 lines Fix crash ................ r1136668 | mlaurent | 2010-06-10 14:16:40 +0200 (Thu, 10 Jun 2010) | 2 lines All is done ................ r1136670 | mlaurent | 2010-06-10 14:24:22 +0200 (Thu, 10 Jun 2010) | 2 lines Kevin is right. We can remove it. all is perfect now :) (we hope :) ) ................ r1136672 | cgiboudeaux | 2010-06-10 14:29:59 +0200 (Thu, 10 Jun 2010) | 6 lines "Fix the icons and shortcuts with RTL. BUG: 205288 MERGE:4.4 FIXED-IN: 1.6.5 ................ svn path=/branches/work/komo/kdepim/; revision=1136705
16 years ago · b52835d014
parent 5b1cfc705c
commit b52835d014
6 changed files with 13 additions and 7 deletions
--- a/aboutdata.cpp
+++ b/aboutdata.cpp
@ -242,6 +242,7 @@ namespace KMail {
                  ki18n("Copyright © 1997–2010, KMail authors"), KLocalizedString(),
                  "http://kontact.kde.org/kmail/" )
  {
+    setProgramIconName("kmail");
    using KMail::authors;
    using KMail::credits;
    for ( unsigned int i = 0 ; i < sizeof authors / sizeof *authors ; ++i )
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@ -1679,7 +1679,7 @@ void AppearancePage::MessageTagTab::swapTagsInListBox( const int first,

 void AppearancePage::MessageTagTab::slotRecordTagSettings( int aIndex )
 {
-  if ( ( aIndex < 0 ) || ( aIndex >= int( mTagListBox->count() ) ) )
+  if ( ( aIndex < 0 ) || ( aIndex >= int( mTagListBox->count() ) ) || (mMsgTagList.count() <= aIndex) )
    return;

  KMail::Tag::Ptr tmp_desc = mMsgTagList.at( aIndex );
@ -1708,7 +1708,7 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
  //We are just updating the display, so no need to mark dirty
  mEmitChanges = false;
  //Check if selection is valid
-  if ( ( aIndex < 0 ) || ( mTagListBox->currentRow() < 0 ) ) {
+  if ( ( aIndex < 0 ) || ( mTagListBox->currentRow() < 0 ) || ( mMsgTagList.count() <= aIndex ) ) {
    mTagRemoveButton->setEnabled( false );
    mTagUpButton->setEnabled( false );
    mTagDownButton->setEnabled( false );
--- a/folderselectiondialog.cpp
+++ b/folderselectiondialog.cpp
@ -62,6 +62,7 @@ FolderSelectionDialog::FolderSelectionDialog( QWidget *parent, SelectionFolderOp
  FolderTreeWidget::TreeViewOptions opt= FolderTreeWidget::None;
  if ( options & FolderSelectionDialog::ShowUnreadCount )
    opt |= FolderTreeWidget::ShowUnreadCount;
+  opt |= FolderTreeWidget::UseDistinctSelectionModel;

  d->folderTreeWidget = new FolderTreeWidget( this, 0, opt);
  d->folderTreeWidget->disableContextMenuAndExtraColumn();
--- a/foldertreewidget.cpp
+++ b/foldertreewidget.cpp
@ -110,6 +110,9 @@ FolderTreeWidget::FolderTreeWidget( QWidget *parent, KXMLGUIClient *xmlGuiClient
  d->filterTreeViewModel->setFilterCaseSensitivity( Qt::CaseInsensitive );
  d->folderTreeView->setModel( d->filterTreeViewModel );

+  if ( options & UseDistinctSelectionModel )
+    d->folderTreeView->setSelectionModel( new QItemSelectionModel( d->filterTreeViewModel, this ) );
+
  lay->addWidget( d->folderTreeView );
  if ( ( options & UseLineEditForFiltering ) ) {
    connect( d->filterFolderLineEdit, SIGNAL( textChanged(QString) ),
--- a/foldertreewidget.h
+++ b/foldertreewidget.h
@ -49,7 +49,8 @@ public:
  {
    None = 0,
    ShowUnreadCount = 1,
-    UseLineEditForFiltering = 2
+    UseLineEditForFiltering = 2,
+    UseDistinctSelectionModel = 4
  };
  Q_DECLARE_FLAGS( TreeViewOptions, TreeViewOption )

--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@ -171,14 +171,14 @@ KMKernel::KMKernel (QObject *parent, const char *name) :
 #endif
  if ( KMessageBox::questionYesNo(
        0,
-        i18n( "You are attempting to start an <b>unstable development version</b> of KMail.<br>"
+        i18n( "You are attempting to start an <b>unstable development version</b> of KMail.<br />"
              "KMail 2 is currently being ported to Akonadi and is under heavy development. "
              "Do not use this version for real mails, you will <b>lose data</b>. If you use this "
              "version now, your mails will not be correctly migrated, and you will not be able to "
-              "migrate them afterwards.<br>"
+              "migrate them afterwards.<br />"
              "Because of the current development, there are many bugs and regressions as well as "
-              "missing features. <b>Essentially KMail 2 does not work at the moment, do not try to use it.</b><br>"
-              "Please do not report any bugs for this version yet.<br><br>"
+              "missing features. <b>Essentially KMail 2 does not work at the moment, do not try to use it.</b><br />"
+              "Please do not report any bugs for this version yet.<br /><br />"
              "If you want to use KMail for real mails, please use the version from the KDE SC 4.4 branch instead." ),
        i18n( "Unstable Development version of KMail" ),
        KGuiItem( i18n( "Lose Data" ) ),