9 files changed, 69 insertions, 7 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 1183704..0e739e2 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -11,6 +11,7 @@
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 
 /* QT */
 #include <qmessagebox.h>
@@ -31,6 +32,7 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
     connect( this, SIGNAL(clicked(QListViewItem*) ),this,
              SLOT( slotMouseClicked(QListViewItem*) ) );
     m_currentItem = 0;
+    readSettings();
 }
 
 AccountView::~AccountView()
@@ -39,6 +41,13 @@ AccountView::~AccountView()
     mhAccounts.clear();
 }
 
+void AccountView::readSettings()
+{
+    Config cfg("mail");
+    cfg.setGroup( "Settings" );
+    m_clickopens = cfg.readBoolEntry("clickOpensFolder",true);
+}
+
 void AccountView::slotSelectionChanged(QListViewItem*item)
 {
     if (!item) {
@@ -98,7 +107,7 @@ void AccountView::slotLeftButton(int, QListViewItem *,const QPoint&,int)
 void AccountView::slotMouseClicked(QListViewItem*item)
 {
     if (m_rightPressed) return;
-    if (!item || m_currentItem == item) return;
+    if (!item || m_currentItem == item||!m_clickopens) return;
     /* ### ToDo check settings if on single tab it should open */
     m_currentItem = item;
     refresh(m_currentItem);
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 5c4b559..418f4f3 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -33,6 +33,7 @@ public slots:
     virtual void refresh(QListViewItem *item);
     virtual void refreshCurrent();
     virtual void slotContextMenu(int id);
+    virtual void readSettings();
 
     void setupFolderselect(Selectstore*sels);
 
@@ -46,6 +47,7 @@ protected:
     QValueList<IMAPviewItem*> imapAccounts;
     QValueList<MHviewItem*> mhAccounts;
     bool m_rightPressed:1;
+    bool m_clickopens:1;
 
 protected slots:
     virtual void slotRightButton(int, QListViewItem *,const QPoint&,int);
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index 5fcbf0f..50d63dd 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -17,6 +17,7 @@
 #define PIC_LOCALFOLDER     "mail/localfolder"
 
 #define PIC_OFFLINE         "mail/notconnected"
+#define PIC_DOCUMENT        "DocsIcon"
 
 #define ICON_COMPOSEMAIL    QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) )
 #define ICON_SENDQUEUED     QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) )
@@ -25,6 +26,7 @@
 #define ICON_EDITSETTINGS   QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) )
 #define ICON_EDITACCOUNTS   QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) )
 #define ICON_SYNC           QIconSet( Resource::loadPixmap( PIC_SYNC ) )
+#define ICON_READMAIL       QIconSet( Resource::loadPixmap( PIC_DOCUMENT))
 
 #define PIXMAP_IMAPFOLDER   QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) )
 #define PIXMAP_POP3FOLDER   QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) )
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 3689352..b587424 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -63,11 +63,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
+    readMail = new QAction(tr("Read current mail"),ICON_READMAIL,0,0,this);
+    readMail->addTo(toolBar);
+    readMail->addTo(mailMenu);
+    connect(readMail,SIGNAL(activated()),this,SLOT(displayMail()));
+
     composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
+
     sendQueued = new QAction( tr( "Send queued mails" ), ICON_SENDQUEUED,
                               0, 0, this );
     sendQueued->addTo( toolBar );
@@ -122,6 +128,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect(folderView,SIGNAL(serverSelected(int)),this,SLOT(serverSelected(int)));
     connect(serverMenu,SIGNAL(activated(int)),folderView,SLOT(slotContextMenu(int)));
     connect(folderMenu,SIGNAL(activated(int)),folderView,SLOT(slotContextMenu(int)));
+    connect(this,SIGNAL(settingsChanged()),folderView,SLOT(readSettings()));
 
 
     layout->addWidget( folderView );
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index b781d62..6449ce8 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -49,13 +49,15 @@ protected:
     QPopupMenu *mailMenu, *settingsMenu,*serverMenu,*folderMenu;
 
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
-            *editSettings, *editAccounts, *syncFolders;
+            *editSettings, *editAccounts, *syncFolders,*readMail;
     AccountView *folderView;
     QListView *mailView;
     QBoxLayout *layout;
     int m_Rotate;
     QCopChannel* m_sysChannel;
     int m_ServerMenuId,m_FolderMenuId;
+signals:
+    void settingsChanged();
 };
 
 #endif
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 1bc81e4..fb8877a 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -15,6 +15,7 @@
 #include <opie2/odebug.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 
 /* QT */
 #include <qmap.h>
@@ -106,6 +107,10 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags  )
         : MainWindow( parent, name, WStyle_ContextHelp )
 {
     setup_signalblocking();
+    Config cfg("mail");
+    cfg.setGroup( "Settings" );
+    m_clickopens = cfg.readBoolEntry("clickOpensMail",true);
+
     settings = new Settings();
     folderView->populate( settings->getAccounts() );
     connect(folderView,SIGNAL(refreshMenues(int)),this,SLOT(refreshMenu(int)));
@@ -234,7 +239,12 @@ void OpieMail::slotSearchMails()
 void OpieMail::slotEditSettings()
 {
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
-    QPEApplication::execDialog( &settingsDialog );
+    if (QPEApplication::execDialog( &settingsDialog )) {
+        Config cfg("mail");
+        cfg.setGroup( "Settings" );
+        m_clickopens = cfg.readBoolEntry("clickOpensMail",true);
+        emit settingsChanged();
+    }
 }
 
 void OpieMail::slotEditAccounts()
@@ -342,6 +352,7 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 
 void OpieMail::mailLeftClicked(int button, QListViewItem *item,const QPoint&,int )
 {
+    if (!m_clickopens) return;
     /* just LEFT button - or tap with stylus on pda */
     if (button!=1) return;
     if (!item) return;
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 75a0b2d..327bef7 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -43,8 +43,11 @@ protected slots:
 protected:
     void setup_signalblocking();
 
+    bool m_clickopens:1;
+
 private:
     Settings *settings;
+signals:
 
 };
 
diff --git a/noncore/net/mail/settingsdialog.cpp b/noncore/net/mail/settingsdialog.cpp
index 6441948..74b8b12 100644
--- a/noncore/net/mail/settingsdialog.cpp
+++ b/noncore/net/mail/settingsdialog.cpp
@@ -20,6 +20,8 @@ void SettingsDialog::readConfig() {
     Config cfg("mail");
     cfg.setGroup( "Settings" );
     showHtmlButton->setChecked( cfg.readBoolEntry( "showHtml", false ) );
+    clickOpenMailButton->setChecked(cfg.readBoolEntry("clickOpensMail",true));
+    clickOpenFolderButton->setChecked(cfg.readBoolEntry("clickOpensFolder",true));
     cfg.setGroup( "Compose" );
     checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
     cfg.setGroup( "Applet" );
@@ -33,6 +35,8 @@ void SettingsDialog::readConfig() {
 void SettingsDialog::writeConfig() {
     Config cfg( "mail" );
     cfg.setGroup( "Settings" );
+    cfg.writeEntry("clickOpensMail",clickOpenMailButton->isChecked());
+    cfg.writeEntry("clickOpensFolder",clickOpenFolderButton->isChecked());
     cfg.writeEntry( "showHtml", showHtmlButton->isChecked() );
     cfg.setGroup( "Compose" );
     cfg.writeEntry( "sendLater", checkBoxLater->isChecked() );
diff --git a/noncore/net/mail/settingsdialogui.ui b/noncore/net/mail/settingsdialogui.ui
index 4acd84a..0a97da0 100644
--- a/noncore/net/mail/settingsdialogui.ui
+++ b/noncore/net/mail/settingsdialogui.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>312</width>
-            <height>379</height>
+            <width>304</width>
+            <height>378</height>
         </rect>
     </property>
     <property stdset="1">
@@ -59,11 +59,11 @@
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>3</number>
+                        <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>3</number>
+                        <number>6</number>
                     </property>
                     <widget>
                         <class>QCheckBox</class>
@@ -76,6 +76,28 @@
                             <string>View mail as Html</string>
                         </property>
                     </widget>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>clickOpenMailButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Click opens mail</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>clickOpenFolderButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Click activate server/folder</string>
+                        </property>
+                    </widget>
                     <spacer>
                         <property>
                             <name>name</name>