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

List:       kmail-devel
Subject:    [PATCH] Various small stuff
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2004-12-27 17:31:57
Message-ID: 200412271832.00930.volker.krause () rwth-aachen ! de
[Download RAW message or body]

Hi,

the attached patch contains various small changes for KMail:

* configuredialog[_p].cpp:
A few list views used the QFrame::Sunken frame style which looks inconsistent 
and rather ugly with Plastik.

* kmfoldertree.cpp:
Allow to navigate onto and over folderless nodes using CTRL+Left/Right, eg. 
you can now reach search folders from local folders and vice versa.

* kmheaders.cpp:
Focus the header view when using ALT+Left/Right, the focus rect  isn't shown 
otherwise and you have to navigate blindly.

* kmsearchpattern.h:
Allow to search for messages with status "To Do".

Please let me know if I can commit parts or all of this.

regards
Volker

["kmail-misc-small-stuff.diff" (text/x-diff)]

? .kateconfig
? kmail-misc-small-stuff.diff
? kmail.kateproject
? kmail.kdevelop
? kmail.kdevelop.pcs
? kmail.kdevses
? wallet-bug-workaround.diff
? wallet-bug.sh
Index: configuredialog.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/configuredialog.cpp,v
retrieving revision 1.503
diff -u -p -r1.503 configuredialog.cpp
--- configuredialog.cpp	19 Dec 2004 23:12:13 -0000	1.503
+++ configuredialog.cpp	27 Dec 2004 17:08:34 -0000
@@ -591,7 +591,6 @@ AccountsPageSendingTab::AccountsPageSend
   mTransportList->addColumn( i18n("Name") );
   mTransportList->addColumn( i18n("Type") );
   mTransportList->setAllColumnsShowFocus( true );
-  mTransportList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
   mTransportList->setSorting( -1 );
   connect( mTransportList, SIGNAL(selectionChanged()),
            this, SLOT(slotTransportSelected()) );
@@ -1064,7 +1063,6 @@ AccountsPageReceivingTab::AccountsPageRe
   mAccountList->addColumn( i18n("Type") );
   mAccountList->addColumn( i18n("Folder") );
   mAccountList->setAllColumnsShowFocus( true );
-  mAccountList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
   mAccountList->setSorting( -1 );
   connect( mAccountList, SIGNAL(selectionChanged()),
 	   this, SLOT(slotAccountSelected()) );
@@ -2868,7 +2866,6 @@ ComposerPageHeadersTab::ComposerPageHead
   mTagList->addColumn( i18n("Name") );
   mTagList->addColumn( i18n("Value") );
   mTagList->setAllColumnsShowFocus( true );
-  mTagList->setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
   mTagList->setSorting( -1 );
   connect( mTagList, SIGNAL(selectionChanged()),
 	   this, SLOT(slotMimeHeaderSelectionChanged()) );
Index: configuredialog_p.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/configuredialog_p.cpp,v
retrieving revision 1.28
diff -u -p -r1.28 configuredialog_p.cpp
--- configuredialog_p.cpp	8 Nov 2004 13:34:52 -0000	1.28
+++ configuredialog_p.cpp	27 Dec 2004 17:08:37 -0000
@@ -294,7 +294,6 @@ ProfileDialog::ProfileDialog( QWidget * 
   mListView->addColumn( i18n("Description") );
   mListView->setFullWidth( true );
   mListView->setAllColumnsShowFocus( true );
-  mListView->setFrameStyle( QFrame::WinPanel + QFrame::Sunken );
   mListView->setSorting( -1 );
 
   vlay->addWidget( new QLabel( mListView,
Index: kmfoldertree.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmfoldertree.cpp,v
retrieving revision 1.339
diff -u -p -r1.339 kmfoldertree.cpp
--- kmfoldertree.cpp	21 Dec 2004 22:50:13 -0000	1.339
+++ kmfoldertree.cpp	27 Dec 2004 17:08:42 -0000
@@ -804,7 +804,7 @@ void KMFolderTree::incCurrentFolder()
   QListViewItemIterator it( currentItem() );
   ++it;
   KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current());
-  if (fti && fti->folder()) {
+  if (fti) {
       prepareItem( fti );
       setFocus();
       setCurrentItem( fti );
@@ -817,7 +817,7 @@ void KMFolderTree::decCurrentFolder()
   QListViewItemIterator it( currentItem() );
   --it;
   KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current());
-  if (fti && fti->folder()) {
+  if (fti) {
       prepareItem( fti );
       setFocus();
       setCurrentItem( fti );
@@ -828,7 +828,7 @@ void KMFolderTree::decCurrentFolder()
 void KMFolderTree::selectCurrentFolder()
 {
   KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>( currentItem() );
-  if (fti && fti->folder()) {
+  if (fti) {
       prepareItem( fti );
       doFolderSelected( fti );
   }
Index: kmheaders.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmheaders.cpp,v
retrieving revision 1.694
diff -u -p -r1.694 kmheaders.cpp
--- kmheaders.cpp	19 Dec 2004 23:12:14 -0000	1.694
+++ kmheaders.cpp	27 Dec 2004 17:08:57 -0000
@@ -1689,6 +1689,7 @@ void KMHeaders::incCurrentMessage()
                this,SLOT(highlightMessage(QListViewItem*)));
     setCurrentItem( lvi->itemBelow() );
     ensureCurrentItemVisible();
+    setFocus();
     connect(this,SIGNAL(currentChanged(QListViewItem*)),
                this,SLOT(highlightMessage(QListViewItem*)));
   }
@@ -1702,6 +1703,7 @@ void KMHeaders::decCurrentMessage()
                this,SLOT(highlightMessage(QListViewItem*)));
     setCurrentItem( lvi->itemAbove() );
     ensureCurrentItemVisible();
+    setFocus();
     connect(this,SIGNAL(currentChanged(QListViewItem*)),
             this,SLOT(highlightMessage(QListViewItem*)));
   }
Index: kmsearchpattern.h
===================================================================
RCS file: /home/kde/kdepim/kmail/kmsearchpattern.h,v
retrieving revision 1.30
diff -u -p -r1.30 kmsearchpattern.h
--- kmsearchpattern.h	17 Sep 2004 16:22:17 -0000	1.30
+++ kmsearchpattern.h	27 Dec 2004 17:09:00 -0000
@@ -233,8 +233,8 @@ namespace KMail {
     { I18N_NOOP( "Ignored" ),          "kmmsgignored"   },
     { I18N_NOOP( "Spam" ),             "mark_as_spam"   },
     { I18N_NOOP( "Ham" ),              "mark_as_ham"    },
-    { I18N_NOOP( "Has an Attachment"), "attach"         },
-    { I18N_NOOP( "To Do" ),            "kontact_todo"   }
+    { I18N_NOOP( "To Do" ),            "kontact_todo"   },
+    { I18N_NOOP( "Has an Attachment"), "attach"         }
   };
 
   static const int StatusValueCount =
@@ -242,8 +242,7 @@ namespace KMail {
   // we want to show all status entries in the quick search bar, but only the
   // ones up to attachment in the search/filter dialog, because there the
   // attachment case is handled separately.
-  // Todo is hidden for both because it can currently not be set anywhere
-  static const int StatusValueCountWithoutHidden = StatusValueCount - 2;
+  static const int StatusValueCountWithoutHidden = StatusValueCount - 1;
 }
 
 class KMSearchRuleStatus : public KMSearchRule


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


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

Configure | About | News | Add a list | Sponsored by KoreLogic