[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: 2009-10-07 18:08:38
Message-ID: 1254938918.094536.12321.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1032388 by mlaurent:
Comment other code
M +10 -3 CMakeLists.txt
M +1 -1 accountdialog.cpp
M +2 -2 configuredialog.cpp
M +1 -1 expirypropertiesdialog.cpp
M +1 -1 folderrequester.cpp
M +3 -1 folderview.cpp
M +1 -1 identitydialog.cpp
M +4 -4 kmail_part.cpp
M +2 -1 kmail_part.h
M +1 -1 kmfilteraction.cpp
M +1 -1 kmkernel.cpp
M +7 -3 kmmainwidget.cpp
M +4 -4 kmmainwidget.h
M +1 -1 kmreadermainwin.cpp
M +1 -1 kmsystemtray.cpp
M +1 -1 mainfolderview.cpp
M +1 -1 searchwindow.cpp
--- branches/work/akonadi-ports/kdepim/kmail/CMakeLists.txt #1032387:1032388
@@ -72,10 +72,14 @@
simplestringlisteditor.cpp
identitylistview.cpp
identitydialog.cpp
- kmfolderdialog.cpp
+
+ kmfolderdialog.cpp
+
kmfoldercombobox.cpp
folderview.cpp
- mainfolderview.cpp
+
+ #mainfolderview.cpp
+
kmaccount.cpp
listjob.cpp
snippetdlg.cpp
@@ -105,8 +109,11 @@
kmsearchpatternedit.cpp
kmfilteraction.cpp
kmsearchpattern.cpp
+
folderselectiontreewidget.cpp
+
folderselectiondialog.cpp
+
kmfilter.cpp
kmfilterdlg.cpp
kmmsgbase.cpp
@@ -192,7 +199,7 @@
recipientspicker.cpp
kwindowpositioner.cpp
distributionlistdialog.cpp
- expirypropertiesdialog.cpp
+ #expirypropertiesdialog.cpp
mailinglistpropertiesdialog.cpp
newfolderdialog.cpp
accountwizard.cpp
--- branches/work/akonadi-ports/kdepim/kmail/accountdialog.cpp #1032387:1032388
@@ -28,7 +28,7 @@
#include "kmfoldermgr.h"
#include "protocols.h"
#include "folderrequester.h"
-#include "mainfolderview.h"
+
#include "kmmainwidget.h"
#include "kmfolder.h"
#include <kpimidentities/identitymanager.h>
--- branches/work/akonadi-ports/kdepim/kmail/configuredialog.cpp #1032387:1032388
@@ -56,7 +56,7 @@
#include "kmfolder.h"
#include "kmmainwidget.h"
#include "kmmessagetag.h"
-#include "mainfolderview.h"
+
#include "recentaddresses.h"
using KPIM::RecentAddresses;
#include "completionordereditor.h"
@@ -87,7 +87,7 @@
#include <mailtransport/transportmanagementwidget.h>
using MailTransport::TransportManagementWidget;
-
+#include "folderview.h"
// other KDE headers:
#include <klineedit.h>
#include <klocale.h>
--- branches/work/akonadi-ports/kdepim/kmail/expirypropertiesdialog.cpp \
#1032387:1032388 @@ -2,8 +2,8 @@
#include "expirypropertiesdialog.h"
#include "folderrequester.h"
#include "kmfolder.h"
-#include "mainfolderview.h"
+
#include <QVariant>
#include <QPushButton>
#include <QCheckBox>
--- branches/work/akonadi-ports/kdepim/kmail/folderrequester.cpp #1032387:1032388
@@ -29,7 +29,7 @@
#include "folderrequester.h"
#include "kmfolder.h"
-#include "mainfolderview.h"
+
#include "folderselectiondialog.h"
#include "libmessageviewer/autoqpointer.h"
--- branches/work/akonadi-ports/kdepim/kmail/folderview.cpp #1032387:1032388
@@ -36,7 +36,7 @@
#include "accountmanager.h"
#include "acljobs.h"
#include "expirypropertiesdialog.h"
-#include "mainfolderview.h" // ugly, derived class: should be moved from here :/
+ // ugly, derived class: should be moved from here :/
#include "foldershortcutdialog.h"
#include "folderstorage.h"
#include "messagecopyhelper.h"
@@ -247,8 +247,10 @@
{
// We don't use mManager here since we want to be really sure
// that KMMainWidget didn't delete it yet (may happen at shutdown).
+#ifdef OLD_FOLDERVIEW
if ( mainWidget()->folderViewManager() )
mainWidget()->folderViewManager()->detachView( this );
+#endif
}
void FolderView::readConfig()
--- branches/work/akonadi-ports/kdepim/kmail/identitydialog.cpp #1032387:1032388
@@ -36,7 +36,7 @@
#include "folderrequester.h"
using KMail::FolderRequester;
#include "kmfoldermgr.h"
-#include "mainfolderview.h"
+
#include "kleo_util.h"
#include "kmmainwidget.h"
#include "kmfolder.h"
--- branches/work/akonadi-ports/kdepim/kmail/kmail_part.cpp #1032387:1032388
@@ -32,7 +32,7 @@
#include "aboutdata.h"
#include "kmfolder.h"
#include "accountmanager.h"
-#include "mainfolderview.h"
+
#include <QPixmap>
#include <QVBoxLayout>
using KMail::AccountManager;
@@ -119,8 +119,8 @@
mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
// Get to know when the user clicked on a folder in the KMail part and update the \
headerWidget of Kontact +#ifdef OLD_FOLDERVIEW
connect( mainWidget->folderViewManager(), SIGNAL(folderActivated(KMFolder*)), \
this, SLOT(exportFolder(KMFolder*)) );
-#ifdef OLD_FOLDERVIEW
connect( mainWidget->mainFolderView(), SIGNAL(iconChanged(FolderViewItem*)),
this, SLOT(slotIconChanged(FolderViewItem*)) );
@@ -167,7 +167,7 @@
emit iconChanged( KIcon( fti->normalIcon() ).pixmap( 22, 22 ) );
#endif
}
-
+#ifdef OLD_FOLDERVIEW
void KMailPart::slotIconChanged( FolderViewItem *fti )
{
emit iconChanged( KIcon( fti->normalIcon() ).pixmap( 22, 22 ) );
@@ -177,7 +177,7 @@
{
emit textChanged( fti->folder()->label() );
}
-
+#endif
//-----------------------------------------------------------------------------
void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
--- branches/work/akonadi-ports/kdepim/kmail/kmail_part.h #1032387:1032388
@@ -68,9 +68,10 @@
Q_SCRIPTABLE void exit();
void updateEditMenu() {}
void exportFolder( KMFolder* folder );
+#ifdef OLD_FOLDERVIEW
void slotIconChanged( FolderViewItem *fti );
void slotNameChanged( FolderViewItem *fti );
-
+#endif
signals:
void textChanged( const QString& );
void iconChanged( const QPixmap& );
--- branches/work/akonadi-ports/kdepim/kmail/kmfilteraction.cpp #1032387:1032388
@@ -14,7 +14,7 @@
#include "kmmainwidget.h"
#include "kmfawidgets.h"
#include "folderrequester.h"
-#include "mainfolderview.h"
+
using KMail::FolderRequester;
#include "kmmsgbase.h"
#include "templateparser.h"
--- branches/work/akonadi-ports/kdepim/kmail/kmkernel.cpp #1032387:1032388
@@ -51,7 +51,7 @@
#include "jobscheduler.h"
#include "templateparser.h"
using KMail::TemplateParser;
-#include "mainfolderview.h"
+
#include "messagelist/core/configprovider.h"
#include <kmessagebox.h>
--- branches/work/akonadi-ports/kdepim/kmail/kmmainwidget.cpp #1032387:1032388
@@ -148,7 +148,7 @@
#include "messagecopyhelper.h"
#include "managesievescriptsdialog.h"
#include "customtemplatesmenu.h"
-#include "mainfolderview.h"
+
#include "messagetree.h"
#include "libmessageviewer/autoqpointer.h"
@@ -235,8 +235,9 @@
// Create the FolderViewManager that will handle the views for this widget.
// We need it to be created before all the FolderView instances are created
// and destroyed after they are destroyed.
+#ifdef OLD_FOLDERVIEW
mFolderViewManager = new KMail::FolderViewManager( this, "FolderViewManager" );
-
+#endif
// FIXME This should become a line separator as soon as the API
// is extended in kdelibs.
mToolbarActionSeparator = new QAction( this );
@@ -256,9 +257,10 @@
QTimer::singleShot( 0, this, SLOT( slotShowStartupFolder() ));
+#ifdef OLD_FOLDERVIEW
connect( mFolderViewManager, SIGNAL( folderActivated( KMFolder *, bool ) ),
this, SLOT( slotFolderViewManagerFolderActivated( KMFolder *, bool ) ) );
-
+#endif
connect( kmkernel->acctMgr(), SIGNAL( checkedMail( bool, bool, const QMap<QString, \
int> & ) ),
this, SLOT( slotMailChecked( bool, bool, const QMap<QString, int> & ) ) \
);
@@ -326,8 +328,10 @@
delete mCustomTemplateMenus;
mSystemTray = 0;
mCustomTemplateMenus = 0;
+#ifdef OLD_FOLDERVIEW
delete mFolderViewManager;
mFolderViewManager = 0;
+#endif
mDestructed = true;
}
--- branches/work/akonadi-ports/kdepim/kmail/kmmainwidget.h #1032387:1032388
@@ -89,7 +89,6 @@
class FavoriteFolderView;
class StatusBarLabel;
class MainFolderView;
- class FolderViewManager;
}
class KMAIL_EXPORT KMMainWidget : public QWidget
@@ -133,9 +132,10 @@
#ifdef OLD_FOLDERVIEW
KMail::MainFolderView * mainFolderView() const
{ return mMainFolderView; }
+
+ KMail::FolderViewManager * folderViewManager() const
+ { return mFolderViewManager; }
#endif
- KMail::FolderViewManager * folderViewManager() const
- { return mFolderViewManager; }
#ifdef OLD_MESSAGELIST
KMail::MessageListView::Pane * messageListView() const
{ return mMessageListView; }
@@ -685,8 +685,8 @@
KTreeWidgetSearchLine *mFolderQuickSearch;
#ifdef OLD_FOLDERVIEW
KMail::MainFolderView *mMainFolderView;
+ KMail::FolderViewManager *mFolderViewManager;
#endif
- KMail::FolderViewManager *mFolderViewManager;
KMReaderWin *mMsgView;
QSplitter *mSplitter1, *mSplitter2, *mFolderViewSplitter;
KMFolder *mTemplateFolder;
--- branches/work/akonadi-ports/kdepim/kmail/kmreadermainwin.cpp #1032387:1032388
@@ -51,8 +51,8 @@
#include "customtemplatesmenu.h"
#include "messageactions.h"
#include "kmmsgdict.h"
-#include "mainfolderview.h"
+
#include <kabc/stdaddressbook.h>
#include <kpimutils/email.h>
#include <kmime/kmime_message.h>
--- branches/work/akonadi-ports/kdepim/kmail/kmsystemtray.cpp #1032387:1032388
@@ -27,8 +27,8 @@
using KMail::AccountManager;
#include "globalsettings.h"
-#include "mainfolderview.h"
+
#include <kxmlguiwindow.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
--- branches/work/akonadi-ports/kdepim/kmail/mainfolderview.cpp #1032387:1032388
@@ -21,8 +21,8 @@
*
*****************************************************************************/
-#include "mainfolderview.h"
+
#include "globalsettings.h"
#include "kmfolder.h"
--- branches/work/akonadi-ports/kdepim/kmail/searchwindow.cpp #1032387:1032388
@@ -53,7 +53,7 @@
#include "kmmsgdict.h"
#include "kmsearchpatternedit.h"
#include "kmsearchpattern.h"
-#include "mainfolderview.h"
+
#include "messagecopyhelper.h"
#include "regexplineedit.h"
#include "textsource.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic