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

List:       kde-commits
Subject:    KDE/kdepim
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-03 13:04:41
Message-ID: 20101203130441.59549AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203260 by tokoe:

Move FilterController and associated classes to
mailcommon/
Replace former filter configuration in kmail with
a UI that is consistent to account and favorites handling


 M  +4 -1      mailcommon/CMakeLists.txt  
 A             mailcommon/filterconfigwidget.ui   \
mobile/mail/filterconfigwidget.ui#1203166  A             \
mailcommon/filtercontroller.cpp   mobile/mail/filtercontroller.cpp#1203166 [License: \
LGPL (v2+)]  A             mailcommon/filtercontroller.h   \
mobile/mail/filtercontroller.h#1203166 [License: LGPL (v2+)]  A             \
mailcommon/filtereditdialog.cpp   mobile/mail/filtereditdialog.cpp#1203166 [License: \
GPL (v2+)]  A             mailcommon/filtereditdialog_p.h   \
mobile/mail/filtereditdialog_p.h#1203166 [License: GPL (v2+)]  A             \
mailcommon/filtermodel.cpp   mobile/mail/filtermodel.cpp#1203166 [License: GPL (v2+)] \
A             mailcommon/filtermodel_p.h   mobile/mail/filtermodel.h#1203166 \
[License: GPL (v2+)]  M  +4 -7      mobile/mail/CMakeLists.txt  
 D             mobile/mail/FilterActions.qml  
 D             mobile/mail/FilterConfigDialog.qml  
 A             mobile/mail/FilterEditor.qml   [License: LGPL (v2+)]
 A             mobile/mail/FilterList.qml   [License: LGPL (v2+)]
 M  +6 -1      mobile/mail/KMailActions.qml  
 D             mobile/mail/filterconfigwidget.ui  
 D             mobile/mail/filtercontroller.cpp  
 D             mobile/mail/filtercontroller.h  
 D             mobile/mail/filtereditdialog.cpp  
 D             mobile/mail/filtereditdialog_p.h  
 A             mobile/mail/filtereditor.cpp   [License: LGPL (v2+)]
 A             mobile/mail/filtereditor.h   [License: LGPL (v2+)]
 D             mobile/mail/filtermodel.cpp  
 D             mobile/mail/filtermodel.h  
 M  +0 -7      mobile/mail/kmail-mobile.qml  
 M  +4 -6      mobile/mail/mainview.cpp  


--- trunk/KDE/kdepim/mailcommon/CMakeLists.txt #1203259:1203260
@@ -19,9 +19,12 @@
   expirypropertiesdialog.cpp
   filteraction.cpp
   filteractionwidget.cpp
+  filtercontroller.cpp
+  filtereditdialog.cpp
   filterimporterexporter.cpp
   filterlog.cpp
   filtermanager.cpp
+  filtermodel.cpp
   foldercollection.cpp
   foldercollectionmonitor.cpp
   folderjob.cpp
@@ -49,7 +52,7 @@
   snippetvariabledialog.cpp
 )
 
-kde4_add_ui_files(libmailcommon_SRCS snippetdialog.ui)
+kde4_add_ui_files(libmailcommon_SRCS filterconfigwidget.ui snippetdialog.ui)
 
 if ( NOT WINCE )
 set(libmailcommon_SRCS ${libmailcommon_SRCS}
--- trunk/KDE/kdepim/mobile/mail/CMakeLists.txt #1203259:1203260
@@ -33,10 +33,7 @@
   emailsguistatemanager.cpp
   emailsfilterproxymodel.cpp
   emailsimporthandler.cpp
-  filtercontroller.cpp
-  filterconfigwidget.cpp
-  filtereditdialog.cpp
-  filtermodel.cpp
+  filtereditor.cpp
   mailactionmanager.cpp
   mailthreadgroupercomparator.cpp
   mainview.cpp
@@ -53,7 +50,7 @@
   vacationmanager.cpp
 )
 
-qt4_wrap_ui(kmail_mobile_srcs configwidget.ui filterconfigwidget.ui \
messagelistsettingseditor.ui searchwidget.ui) +qt4_wrap_ui(kmail_mobile_srcs \
configwidget.ui messagelistsettingseditor.ui searchwidget.ui)  
 if(KDEPIM_ENTERPRISE_BUILD)
   set(WARN_TOOMANY_RECIPIENTS_DEFAULT true)
@@ -109,8 +106,8 @@
   AttachmentEditor.qml
   BulkActionComponent.qml
   ConfigDialog.qml
-  FilterActions.qml
-  FilterConfigDialog.qml
+  FilterEditor.qml
+  FilterList.qml
   ForwardOptionsPage.qml
   HeaderView.qml
   MarkAsPage.qml
--- trunk/KDE/kdepim/mobile/mail/KMailActions.qml #1203259:1203260
@@ -46,7 +46,6 @@
     ScriptActionItem { name : "to_selection_screen"; title: KDE.i18n( "Select \
Multiple Folders" ) }  ActionListItem { name : "akonadi_empty_all_trash" }
     ActionListItem { name : "import_emails" }
-    ScriptActionItem { name : "filters_configure"; title: KDE.i18n( "Configure \
Filters" ) }  }
 
   FavoriteManager{
@@ -61,6 +60,12 @@
     model : agentInstanceList
   }
 
+  FilterList {
+    category : "home"
+    name : "filter_menu"
+    text : KDE.i18n( "Filter" )
+  }
+
   ActionListItem {
     category : "home"
     name : "kmail_mobile_identities"
--- trunk/KDE/kdepim/mobile/mail/kmail-mobile.qml #1203259:1203260
@@ -404,13 +404,6 @@
                 }
               },
               KPIM.ScriptAction {
-                name : "filters_configure"
-                script : {
-                  actionPanel.collapse();
-                  guiStateManager.pushState( \
                Mail.EmailsGuiStateManager.ManageFiltersState );
-                }
-              },
-              KPIM.ScriptAction {
                 name : "edit_acls"
                 script : {
                   actionPanel.collapse();
--- trunk/KDE/kdepim/mobile/mail/mainview.cpp #1203259:1203260
@@ -29,8 +29,7 @@
 #include "composerview.h"
 #include "configwidget.h"
 #include "declarativewidgetbase.h"
-#include "filterconfigwidget.h"
-#include "filtermodel.h"
+#include "filtereditor.h"
 #include "emailsexporthandler.h"
 #include "emailsfilterproxymodel.h"
 #include "emailsguistatemanager.h"
@@ -122,7 +121,6 @@
 QML_DECLARE_TYPE( EmailsGuiStateManager )
 QML_DECLARE_TYPE( MessageViewer::MessageViewItem )
 QML_DECLARE_TYPE( DeclarativeConfigWidget )
-QML_DECLARE_TYPE( DeclarativeFilterConfigWidget )
 QML_DECLARE_TYPE( DeclarativeSearchWidget )
 
 using namespace Akonadi;
@@ -321,8 +319,9 @@
   mEmailTemplateModel->setFilterBehavior( \
KSelectionProxyModel::ChildrenOfExactSelection );  rootContext()->setContextProperty( \
"_emailTemplateModel", mEmailTemplateModel );  
-  mFilterModel = new FilterModel;
-  rootContext()->setContextProperty( "_filterModel", mFilterModel );
+  FilterEditor *filterEditor = new FilterEditor( actionCollection(), this );
+  rootContext()->setContextProperty( "filterEditor", filterEditor );
+  rootContext()->setContextProperty( "filterModel", filterEditor->model() );
 
   mAclEditor = new AclEditor( actionCollection(), this );
   rootContext()->setContextProperty( "aclEditor", mAclEditor );
@@ -346,7 +345,6 @@
 
   qmlRegisterType<MessageViewer::MessageViewItem>( "org.kde.messageviewer", 4, 5, \
"MessageView" );  qmlRegisterType<DeclarativeConfigWidget>( "org.kde.akonadi.mail", \
                4, 5, "ConfigWidget" );
-  qmlRegisterType<DeclarativeFilterConfigWidget>( "org.kde.akonadi.mail", 4, 5, \
"FilterConfigWidget" );  qmlRegisterType<DeclarativeSearchWidget>( \
"org.kde.akonadi.mail", 4, 5, "SearchWidget" );  \
qmlRegisterUncreatableType<EmailsGuiStateManager>( "org.kde.akonadi.mail", 4, 5, \
"EmailsGuiStateManager", QLatin1String( "This type is only exported for its enums" ) \
);  #ifdef KDEQMLPLUGIN_STATIC


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