author | harlekin <harlekin> | 2004-01-08 20:01:50 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-08 20:01:50 (UTC) |
commit | b672058ac470a1b9534296fa8bc4b8725ab7913b (patch) (side-by-side diff) | |
tree | 1a357fe8626431b7d93140546359bf2d48fb4151 /noncore/net | |
parent | 94428da008bea0aaff6db79d7963a2107b0da336 (diff) | |
download | opie-b672058ac470a1b9534296fa8bc4b8725ab7913b.zip opie-b672058ac470a1b9534296fa8bc4b8725ab7913b.tar.gz opie-b672058ac470a1b9534296fa8bc4b8725ab7913b.tar.bz2 |
prepare for context help and online help
-rw-r--r-- | noncore/net/mail/editaccounts.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/pop3configui.ui | 121 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 2 |
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 @@ -78,3 +78,3 @@ void EditAccounts::slotNewAccount( const QString &type ) POP3account *account = new POP3account(); - POP3config pop3( account, this, 0, true ); + POP3config pop3( account, this, 0, true, WStyle_ContextHelp ); pop3.showMaximized(); @@ -90,3 +90,3 @@ void EditAccounts::slotNewAccount( const QString &type ) SMTPaccount *account = new SMTPaccount(); - SMTPconfig smtp( account, this, 0, true ); + SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp ); smtp.showMaximized(); @@ -103,3 +103,3 @@ void EditAccounts::slotNewAccount( const QString &type ) NNTPaccount *account = new NNTPaccount(); - NNTPconfig nntp( account, this, 0, true ); + NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp ); nntp.showMaximized(); @@ -119,3 +119,3 @@ void EditAccounts::slotEditAccount( Account *account ) IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account); - IMAPconfig imap( imapAcc, this, 0, true ); + IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp ); imap.showMaximized(); @@ -126,3 +126,3 @@ void EditAccounts::slotEditAccount( Account *account ) POP3account *pop3Acc = static_cast<POP3account *>(account); - POP3config pop3( pop3Acc, this, 0, true ); + POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp ); pop3.showMaximized(); @@ -133,3 +133,3 @@ void EditAccounts::slotEditAccount( Account *account ) SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account); - SMTPconfig smtp( smtpAcc, this, 0, true ); + SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp ); smtp.showMaximized(); @@ -140,3 +140,3 @@ void EditAccounts::slotEditAccount( Account *account ) NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account); - NNTPconfig nntp( nntpAcc, this, 0, true ); + NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp ); nntp.showMaximized(); 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 @@ -16,3 +16,3 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) - : MainWindow( parent, name, flags ) + : MainWindow( parent, name, WStyle_ContextHelp ) { @@ -44,3 +44,3 @@ 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()) { @@ -93,3 +93,3 @@ void OpieMail::slotEditSettings() { - SettingsDialog settingsDialog( this, 0, true ); + SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); settingsDialog.showMaximized(); @@ -101,3 +101,3 @@ void OpieMail::slotEditAccounts() qDebug( "Edit Accounts" ); - EditAccounts eaDialog( settings, this, 0, true ); + EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); eaDialog.showMaximized(); @@ -117,3 +117,3 @@ void OpieMail::displayMail() RecBody body = folderView->fetchBody(mail); - ViewMail readMail( this ); + ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); readMail.setBody( body ); 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 @@ -13,4 +13,4 @@ <y>0</y> - <width>232</width> - <height>320</height> + <width>314</width> + <height>410</height> </rect> @@ -27,2 +27,11 @@ </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>3</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>3</number> + </property> <widget> @@ -33,11 +42,2 @@ </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>3</x> - <y>3</y> - <width>226</width> - <height>32</height> - </rect> - </property> <hbox> @@ -82,11 +82,2 @@ <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> @@ -101,11 +92,2 @@ </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>3</x> - <y>44</y> - <width>226</width> - <height>70</height> - </rect> - </property> <hbox> @@ -197,11 +179,2 @@ </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>3</x> - <y>117</y> - <width>226</width> - <height>64</height> - </rect> - </property> <vbox> @@ -236,15 +209,28 @@ <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> @@ -356,42 +342,3 @@ </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> 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 @@ -33,3 +33,3 @@ 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(); |