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

List:       kde-commits
Subject:    branches/work/soc-livingkde/kmail
From:       Sachin Gupta <sachin.gopal1 () gmail ! com>
Date:       2005-08-31 18:26:12
Message-ID: 1125512772.162329.11850.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455520 by sachingupta:

just about to finish

 M  +1 -1      Makefile.am  
 A             filterdialog.cpp   [License: GPL (v2+) (wrong address)]
 A             filterdialog.h   [License: GPL (v2+) (wrong address)]
 M  +16 -0     kmheaders.cpp  
 M  +1 -1      kmlabels.cpp  
 M  +2 -1      kmmainwidget.h  
 M  +10 -7     labelspane.cpp  
 M  +7 -16     labelspane.h  


--- branches/work/soc-livingkde/kmail/Makefile.am #455519:455520
@@ -48,7 +48,7 @@
 kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 kmail_LDADD   = libkmailprivate.la
 
-libkmailprivate_la_SOURCES = kminputlabel.cpp kmlabels.cpp labelspane.cpp \
kmmessage.cpp \ +libkmailprivate_la_SOURCES = kminputlabel.cpp filterdialog.cpp \
                kmlabels.cpp labelspane.cpp kmmessage.cpp \
                 labeldisplay.cpp unreadlabels.cpp kmmainwin.cpp configuredialog.cpp \
\  configuredialog_p.cpp klistviewindexedsearchline.cpp \
                 simplestringlisteditor.cpp index.cpp  \
--- branches/work/soc-livingkde/kmail/kmheaders.cpp #455519:455520
@@ -2178,7 +2178,23 @@
 
   int idx = item->msgId();
   KMMessage *msg = mFolder->getMsg(idx);
+/*
+  // test code -- to be removed
+  kdDebug(5006)<<"------xx--------xx----------xx---------xx----------xx-----"<<endl;
+  kdDebug(5006)<<"From: "<<msg->from()<<endl;
+  //kdDebug(5006)<<"To: "<<msg->from();
+  kdDebug(5006)<<"Subject: "<<msg->subject()<<endl;
+  kdDebug(5006)<<"From1: "<<msg->headerField("from")<<endl;
+  kdDebug(5006)<<"Subject1: "<<msg->headerField("subject")<<endl;
+  kdDebug(5006)<<"To1: "<<msg->headerField("to")<<endl;
 
+  //kdDebug(5006)<<"Subject: "<<msg->subject()<<endl;
+
+  kdDebug(5006)<<"------yy--------yy----------y---------yy----------yy-----"<<endl;
+
+  // -------xx--------------xx-----xx-------xx----------*/
+
+  //QTimer::singleShot(50, mOwner, SLOT(displayLabels(item->msgSerNum())));
   mOwner->displayLabels(item->msgSerNum());
 
   if (mReaderWindowActive) {
--- branches/work/soc-livingkde/kmail/kmlabels.cpp #455519:455520
@@ -329,7 +329,7 @@
     //if (sernum is in line then only append label name to list)
     while( (mess=line.section(':',i,i).toUInt()) )
     {
-      kdDebug(5006)<<endl<<"message to compare : "<<mess<<endl;cin>>ch;
+      //kdDebug(5006)<<endl<<"message to compare : "<<mess<<endl;cin>>ch;
       if (mess==message) {
         labels.append (getLabel);
         kdDebug(5006)<<"\n>>>>>>>>>>>>>>>appending label: "<<getLabel<<" \
                <<<<<<<<<\n";
--- branches/work/soc-livingkde/kmail/kmmainwidget.h #455519:455520
@@ -92,7 +92,7 @@
   // for Labels
   //QStringList mLabelList;
   //KMLabels* labelsAPI() { return static_cast<KMMainWin*>(parent())->labelsAPI(); }
-  void displayLabels(Q_UINT32 serNum);
+  // void displayLabels(Q_UINT32 serNum);
   void refreshLabelList();
 
   void destruct();
@@ -181,6 +181,7 @@
   void setAccelsEnabled( bool enabled = true );
 
 public slots:
+  void displayLabels(Q_UINT32 serNum);
   void slotMoveMsgToFolder( KMFolder *dest);
   void slotTrashMsg();   // move to trash
 
--- branches/work/soc-livingkde/kmail/labelspane.cpp #455519:455520
@@ -28,25 +28,27 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
+
+#include "filterdialog.h"
 #include "kmmainwidget.h"
 #include "headeritem.h"
 #include "kmlabels.h"
 #include "labelspane.h"
 #include "kminputlabel.h"
+#include "filterdialog.h"
+#include "unreadlabels.h"
 
 #include "kmcommands.h"
 #include "kmmsgbase.h"
 
-#include "unreadlabels.h"
-
-#include <kdebug.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 
-#include<iostream>
+#include <kdebug.h>
+
+#include <iostream>
 using namespace std;
 
-
 using namespace KMLabels;
 
 //#include "kmheaders.h"
@@ -55,7 +57,7 @@
 //LabelsPane::LabelsPane (KMMainWidget *mainWidget, QWidget *parent, const char \
*name) : QVBox (parent,name)  //LabelsPane::LabelsPane (QWidget *parent, const char \
*name):QVBox (parent,name)  //LabelsPane::LabelsPane (KMHeaders *headers, QWidget \
                *parent, const char *name):QVBox (parent,name)
-LabelsPane::LabelsPane (KMMainWidget *mainWidget, KMHeaders *headers, QWidget \
*parent, const char *name):QVBox (parent,name) +LabelsPane::LabelsPane (KMMainWidget \
*mainWidget, KMHeaders *headers, QWidget *parent, const char *name) : QVBox (parent, \
name)  {
   mMainWidget = mainWidget;
   mHeaders = headers;
@@ -95,7 +97,8 @@
 
 void LabelsPane::showFiltersDialog()
 {
-
+  mFilterDialog = new FilterDialog( mMainWidget );
+  mFilterDialog->show();
 }
 
 void LabelsPane::btnRemLabelClicked()
--- branches/work/soc-livingkde/kmail/labelspane.h #455519:455520
@@ -31,30 +31,26 @@
 #ifndef LABELSPANE_H
 #define LABELSPANE_H
 
-
-
 #include "kmlabels.h"
-
-//#include "kmmainwidget.h"  // enabling this gives strange compile errors - cant \
decl LabelsPane with no type +#include "kmlabels.h"
 #include "kmheaders.h"
 
+
 #include <qvbox.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 
 
+class FilterDialog;
 
-//class KMMainWidget;
-
 class LabelsPane : public QVBox
 {
   Q_OBJECT
-  //protected:
-
-  private:
+private:
   KMMainWidget *mMainWidget;
   KMHeaders *mHeaders;
 
+  FilterDialog *mFilterDialog;
   QListView *labelListView;
   QPushButton *btnAddLabel, *btnRemLabel, *btnFilters;
 
@@ -63,21 +59,16 @@
 
   void setupLabelsPane();
 
-  public:
+public:
   LabelsPane (KMMainWidget* mainWidget, KMHeaders *headers, QWidget *parent=0, const \
char *name=0);  // int labelsPaneLabelsChanged();  //refresh labels pane and combobox
 
-  public slots:
+public slots:
   int labelClicked (QListViewItem *item);
   void btnAddLabelClicked();
   void btnRemLabelClicked();
   void showFiltersDialog();
   void updateLabelsPane();
-
-
-
 };
 
-
-
 #endif


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