| -rw-r--r-- | noncore/net/mail/editaccounts.cpp | 14 | ||||
| -rw-r--r-- | noncore/net/mail/opiemail.cpp | 12 | ||||
| -rw-r--r-- | noncore/net/mail/pop3configui.ui | 581 | ||||
| -rw-r--r-- | noncore/net/mail/viewmail.h | 2 |
4 files changed, 278 insertions, 331 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 ); @@ -126,3 +126,3 @@ void OpieMail::displayMail() } else { - ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "") ); + ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) ); } 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,371 +27,318 @@ </property> - <widget> - <class>QLayoutWidget</class> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>Layout12</cstring> + <name>margin</name> + <number>3</number> </property> <property stdset="1"> - <name>geometry</name> - <rect> - <x>3</x> - <y>3</y> - <width>226</width> - <height>32</height> - </rect> + <name>spacing</name> + <number>3</number> </property> - <hbox> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>name</name> + <cstring>Layout12</cstring> </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>accountLabel</cstring> - </property> + <hbox> <property stdset="1"> - <name>text</name> - <string>Account</string> + <name>margin</name> + <number>0</number> </property> - </widget> - <widget> - <class>QLineEdit</class> <property stdset="1"> - <name>name</name> - <cstring>accountLine</cstring> - </property> - <property> - <name>toolTip</name> - <string>Name of the Account</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - </hbox> - </widget> - <widget> - <class>Line</class> - <property stdset="1"> - <name>name</name> - <cstring>line1</cstring> - </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> - </property> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <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> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>accountLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Account</string> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>accountLine</cstring> + </property> + <property> + <name>toolTip</name> + <string>Name of the Account</string> + </property> + </widget> + </hbox> + </widget> + <widget> + <class>Line</class> + <property stdset="1"> + <name>name</name> + <cstring>line1</cstring> + </property> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>orientation</name> + <enum>Horizontal</enum> </property> + </widget> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>name</name> + <cstring>Layout11</cstring> </property> - <widget> - <class>QLayoutWidget</class> + <hbox> <property stdset="1"> - <name>name</name> - <cstring>Layout9</cstring> + <name>margin</name> + <number>0</number> </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>name</name> + <cstring>Layout9</cstring> </property> - <widget> - <class>QLabel</class> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>serverLabel</cstring> + <name>margin</name> + <number>0</number> </property> <property stdset="1"> - <name>text</name> - <string>Server</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - <widget> - <class>QLabel</class> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>serverLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Server</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>portLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Port</string> + </property> + </widget> + </vbox> + </widget> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout10</cstring> + </property> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>portLabel</cstring> + <name>margin</name> + <number>0</number> </property> <property stdset="1"> - <name>text</name> - <string>Port</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - </vbox> - </widget> - <widget> - <class>QLayoutWidget</class> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>serverLine</cstring> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>portLine</cstring> + </property> + </widget> + </vbox> + </widget> + </hbox> + </widget> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout13</cstring> + </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> <property stdset="1"> - <name>name</name> - <cstring>Layout10</cstring> + <name>spacing</name> + <number>6</number> </property> - <vbox> + <widget> + <class>QLabel</class> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>name</name> + <cstring>TextLabel1</cstring> </property> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>text</name> + <string>Use secure sockets:</string> </property> - <widget> - <class>QLineEdit</class> - <property stdset="1"> - <name>name</name> - <cstring>serverLine</cstring> - </property> - </widget> - <widget> - <class>QLineEdit</class> - <property stdset="1"> - <name>name</name> - <cstring>portLine</cstring> - </property> - </widget> - </vbox> - </widget> - </hbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <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> + </widget> + <widget> + <class>QComboBox</class> + <property stdset="1"> + <name>name</name> + <cstring>ComboBox1</cstring> + </property> + </widget> + </vbox> + </widget> + <widget> + <class>QLineEdit</class> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>name</name> + <cstring>CommandEdit</cstring> </property> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <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> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Use secure sockets:</string> - </property> - </widget> - <widget> - <class>QComboBox</class> - <property stdset="1"> - <name>name</name> - <cstring>ComboBox1</cstring> - </property> - </widget> - </vbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout6</cstring> - </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>3</x> - <y>223</y> - <width>226</width> - <height>70</height> - </rect> - </property> - <hbox> <property stdset="1"> - <name>margin</name> - <number>0</number> + <name>orientation</name> + <enum>Horizontal</enum> </property> + </widget> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>name</name> + <cstring>Layout6</cstring> </property> - <widget> - <class>QLayoutWidget</class> + <hbox> <property stdset="1"> - <name>name</name> - <cstring>Layout4</cstring> + <name>margin</name> + <number>0</number> </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>name</name> + <cstring>Layout4</cstring> </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>userLabel</cstring> - </property> + <vbox> <property stdset="1"> - <name>text</name> - <string>User</string> + <name>margin</name> + <number>0</number> </property> - </widget> - <widget> - <class>QLabel</class> <property stdset="1"> - <name>name</name> - <cstring>passLabel</cstring> + <name>spacing</name> + <number>6</number> </property> - <property stdset="1"> - <name>text</name> - <string>Password</string> - </property> - </widget> - </vbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout5</cstring> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>userLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>User</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>passLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Password</string> + </property> + </widget> + </vbox> + </widget> + <widget> + <class>QLayoutWidget</class> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>name</name> + <cstring>Layout5</cstring> </property> - <widget> - <class>QLineEdit</class> + <vbox> <property stdset="1"> - <name>name</name> - <cstring>userLine</cstring> + <name>margin</name> + <number>0</number> </property> - </widget> - <widget> - <class>QLineEdit</class> <property stdset="1"> - <name>name</name> - <cstring>passLine</cstring> + <name>spacing</name> + <number>6</number> </property> - <property stdset="1"> - <name>echoMode</name> - <enum>Password</enum> - </property> - </widget> - </vbox> - </widget> - </hbox> - </widget> - <spacer> - <property> - <name>name</name> - <cstring>spacer</cstring> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> - </property> - <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> - </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> - </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> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>userLine</cstring> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>passLine</cstring> + </property> + <property stdset="1"> + <name>echoMode</name> + <enum>Password</enum> + </property> + </widget> + </vbox> + </widget> + </hbox> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>spacer</cstring> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Vertical</enum> + </property> + <property stdset="1"> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </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(); |