prepare for context help and online help

4 files changed, 47 insertions, 100 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 439b619..0c0ecaf 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -77,5 +77,5 @@ void EditAccounts::slotNewAccount( const QString &type )
         qDebug( "-> config POP3" );
         POP3account *account = new POP3account();
-        POP3config pop3( account, this, 0, true );
+        POP3config pop3( account, this, 0, true, WStyle_ContextHelp );
         pop3.showMaximized();
         if ( QDialog::Accepted == pop3.exec() ) {
@@ -89,5 +89,5 @@ void EditAccounts::slotNewAccount( const QString &type )
         qDebug( "-> config SMTP" );
         SMTPaccount *account = new SMTPaccount();
-        SMTPconfig smtp( account, this, 0, true );
+        SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp );
         smtp.showMaximized();
         if ( QDialog::Accepted == smtp.exec() ) {
@@ -102,5 +102,5 @@ void EditAccounts::slotNewAccount( const QString &type )
         qDebug( "-> config NNTP" );
         NNTPaccount *account = new NNTPaccount();
-        NNTPconfig nntp( account, this, 0, true );
+        NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp );
         nntp.showMaximized();
         if ( QDialog::Accepted == nntp.exec() ) {
@@ -118,5 +118,5 @@ void EditAccounts::slotEditAccount( Account *account )
     if ( account->getType().compare( "IMAP" ) == 0 ) {
         IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account);
-        IMAPconfig imap( imapAcc, this, 0, true );
+        IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp );
         imap.showMaximized();
         if ( QDialog::Accepted == imap.exec() ) {
@@ -125,5 +125,5 @@ void EditAccounts::slotEditAccount( Account *account )
     } else if ( account->getType().compare( "POP3" ) == 0 ) {
         POP3account *pop3Acc = static_cast<POP3account *>(account);
-        POP3config pop3( pop3Acc, this, 0, true );
+        POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp );
         pop3.showMaximized();
         if ( QDialog::Accepted == pop3.exec() ) {
@@ -132,5 +132,5 @@ void EditAccounts::slotEditAccount( Account *account )
     } else if ( account->getType().compare( "SMTP" ) == 0 ) {
         SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account);
-        SMTPconfig smtp( smtpAcc, this, 0, true );
+        SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp );
         smtp.showMaximized();
         if ( QDialog::Accepted == smtp.exec() ) {
@@ -139,5 +139,5 @@ void EditAccounts::slotEditAccount( Account *account )
     } else if ( account->getType().compare( "NNTP" ) == 0 ) {
         NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account);
-        NNTPconfig nntp( nntpAcc, this, 0, true );
+        NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp );
         nntp.showMaximized();
         if ( QDialog::Accepted == nntp.exec() ) {
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index dee3f70..39e3a64 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -15,5 +15,5 @@
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
-    : MainWindow( parent, name, flags )
+    : MainWindow( parent, name, WStyle_ContextHelp )
 {
     settings = new Settings();
@@ -43,5 +43,5 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
-    ComposeMail compose( settings, this, 0 , true );
+    ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
     if (!email.isEmpty()) {
         if (!name.isEmpty()) {
@@ -92,5 +92,5 @@ void OpieMail::slotSearchMails()
 void OpieMail::slotEditSettings()
 {
-    SettingsDialog settingsDialog( this,  0, true );
+    SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
     settingsDialog.showMaximized();
     settingsDialog.exec();
@@ -100,5 +100,5 @@ void OpieMail::slotEditAccounts()
 {
     qDebug( "Edit Accounts" );
-    EditAccounts eaDialog( settings, this, 0, true );
+    EditAccounts eaDialog( settings, this, 0, true,  WStyle_ContextHelp );
     eaDialog.showMaximized();
     eaDialog.slotAdjustColumns();
@@ -116,5 +116,5 @@ void OpieMail::displayMail()
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
-    ViewMail readMail( this );
+    ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp  );
     readMail.setBody( body );
     readMail.setMail( mail );
diff --git a/noncore/net/mail/pop3configui.ui b/noncore/net/mail/pop3configui.ui
index 95cbdc2..1014ef4 100644
--- a/noncore/net/mail/pop3configui.ui
+++ b/noncore/net/mail/pop3configui.ui
@@ -12,6 +12,6 @@
             <x>0</x>
             <y>0</y>
-            <width>232</width>
-            <height>320</height>
+            <width>314</width>
+            <height>410</height>
         </rect>
     </property>
@@ -26,4 +26,13 @@
         <name>layoutSpacing</name>
     </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>3</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>3</number>
+        </property>
     <widget>
         <class>QLayoutWidget</class>
@@ -32,13 +41,4 @@
             <cstring>Layout12</cstring>
         </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>3</y>
-                <width>226</width>
-                <height>32</height>
-            </rect>
-        </property>
         <hbox>
             <property stdset="1">
@@ -81,13 +81,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>38</y>
-                <width>226</width>
-                <height>16</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>orientation</name>
             <enum>Horizontal</enum>
@@ -100,13 +91,4 @@
             <cstring>Layout11</cstring>
         </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>44</y>
-                <width>226</width>
-                <height>70</height>
-            </rect>
-        </property>
         <hbox>
             <property stdset="1">
@@ -196,13 +178,4 @@
             <cstring>Layout13</cstring>
         </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>117</y>
-                <width>226</width>
-                <height>64</height>
-            </rect>
-        </property>
         <vbox>
             <property stdset="1">
@@ -235,17 +208,30 @@
     </widget>
     <widget>
-        <class>QLayoutWidget</class>
+            <class>QLineEdit</class>
         <property stdset="1">
             <name>name</name>
-            <cstring>Layout6</cstring>
+                <cstring>CommandEdit</cstring>
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>223</y>
-                <width>226</width>
-                <height>70</height>
-            </rect>
+                <name>text</name>
+                <string>ssh $SERVER exec imapd</string>
+            </property>
+        </widget>
+        <widget>
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>line2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6</cstring>
         </property>
         <hbox>
@@ -355,44 +341,5 @@
         </property>
     </spacer>
-    <widget>
-        <class>QLineEdit</class>
-        <property stdset="1">
-            <name>name</name>
-            <cstring>CommandEdit</cstring>
-        </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>0</x>
-                <y>180</y>
-                <width>226</width>
-                <height>30</height>
-            </rect>
-        </property>
-        <property stdset="1">
-            <name>text</name>
-            <string>ssh $SERVER exec imapd</string>
-        </property>
-    </widget>
-    <widget>
-        <class>Line</class>
-        <property stdset="1">
-            <name>name</name>
-            <cstring>line2</cstring>
-        </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>3</x>
-                <y>204</y>
-                <width>226</width>
-                <height>16</height>
-            </rect>
-        </property>
-        <property stdset="1">
-            <name>orientation</name>
-            <enum>Horizontal</enum>
-        </property>
-    </widget>
+    </vbox>
 </widget>
 <tabstops>
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 2d0e024..abbd5b3 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -32,5 +32,5 @@ class ViewMail : public ViewMailBase
 
 public:
-	ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
+	ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 	~ViewMail();