From b672058ac470a1b9534296fa8bc4b8725ab7913b Mon Sep 17 00:00:00 2001 From: harlekin Date: Thu, 08 Jan 2004 20:01:50 +0000 Subject: prepare for context help and online help --- (limited to 'noncore/net') 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 @@ -76,7 +76,7 @@ void EditAccounts::slotNewAccount( const QString &type ) } else if ( type.compare( "POP3" ) == 0 ) { 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() ) { settings->addAccount( account ); @@ -88,7 +88,7 @@ void EditAccounts::slotNewAccount( const QString &type ) } else if ( type.compare( "SMTP" ) == 0 ) { 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() ) { settings->addAccount( account ); @@ -101,7 +101,7 @@ void EditAccounts::slotNewAccount( const QString &type ) } else if ( type.compare( "NNTP" ) == 0 ) { 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() ) { settings->addAccount( account ); @@ -117,28 +117,28 @@ void EditAccounts::slotEditAccount( Account *account ) { if ( account->getType().compare( "IMAP" ) == 0 ) { IMAPaccount *imapAcc = static_cast(account); - IMAPconfig imap( imapAcc, this, 0, true ); + IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp ); imap.showMaximized(); if ( QDialog::Accepted == imap.exec() ) { slotFillLists(); } } else if ( account->getType().compare( "POP3" ) == 0 ) { POP3account *pop3Acc = static_cast(account); - POP3config pop3( pop3Acc, this, 0, true ); + POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp ); pop3.showMaximized(); if ( QDialog::Accepted == pop3.exec() ) { slotFillLists(); } } else if ( account->getType().compare( "SMTP" ) == 0 ) { SMTPaccount *smtpAcc = static_cast(account); - SMTPconfig smtp( smtpAcc, this, 0, true ); + SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp ); smtp.showMaximized(); if ( QDialog::Accepted == smtp.exec() ) { slotFillLists(); } } else if ( account->getType().compare( "NNTP" ) == 0 ) { NNTPaccount *nntpAcc = static_cast(account); - NNTPconfig nntp( nntpAcc, this, 0, true ); + NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp ); nntp.showMaximized(); if ( QDialog::Accepted == nntp.exec() ) { slotFillLists(); 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 @@ -14,7 +14,7 @@ #include "selectstore.h" OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) - : MainWindow( parent, name, flags ) + : MainWindow( parent, name, WStyle_ContextHelp ) { settings = new Settings(); @@ -42,7 +42,7 @@ 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()) { compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); @@ -91,7 +91,7 @@ void OpieMail::slotSearchMails() void OpieMail::slotEditSettings() { - SettingsDialog settingsDialog( this, 0, true ); + SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); settingsDialog.showMaximized(); settingsDialog.exec(); } @@ -99,7 +99,7 @@ void OpieMail::slotEditSettings() void OpieMail::slotEditAccounts() { qDebug( "Edit Accounts" ); - EditAccounts eaDialog( settings, this, 0, true ); + EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); eaDialog.showMaximized(); eaDialog.slotAdjustColumns(); eaDialog.exec(); @@ -115,7 +115,7 @@ void OpieMail::displayMail() if (!item) return; 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 ); readMail.showMaximized(); @@ -124,7 +124,7 @@ void OpieMail::displayMail() if ( readMail.deleted ) { folderView->refreshCurrent(); } 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 @@ -11,8 +11,8 @@ 0 0 - 232 - 320 + 314 + 410 @@ -25,375 +25,322 @@ layoutSpacing - - QLayoutWidget + - name - Layout12 + margin + 3 - geometry - - 3 - 3 - 226 - 32 - + spacing + 3 - + + QLayoutWidget - margin - 0 + name + Layout12 - - spacing - 6 - - - QLabel - - name - accountLabel - + - text - Account + margin + 0 - - - QLineEdit - name - accountLine - - - toolTip - Name of the Account + spacing + 6 - - - - - Line - - name - line1 - - - geometry - - 3 - 38 - 226 - 16 - - - - orientation - Horizontal - - - - QLayoutWidget - - name - Layout11 - - - geometry - - 3 - 44 - 226 - 70 - - - + + QLabel + + name + accountLabel + + + text + Account + + + + QLineEdit + + name + accountLine + + + toolTip + Name of the Account + + + + + + Line + + name + line1 + - margin - 0 + orientation + Horizontal + + + QLayoutWidget - spacing - 6 + name + Layout11 - - QLayoutWidget + - name - Layout9 + margin + 0 - - - margin - 0 - + + spacing + 6 + + + QLayoutWidget - spacing - 6 + name + Layout9 - - QLabel + - name - serverLabel + margin + 0 - text - Server + spacing + 6 - - - QLabel + + QLabel + + name + serverLabel + + + text + Server + + + + QLabel + + name + portLabel + + + text + Port + + + + + + QLayoutWidget + + name + Layout10 + + - name - portLabel + margin + 0 - text - Port + spacing + 6 - - - - - QLayoutWidget + + QLineEdit + + name + serverLine + + + + QLineEdit + + name + portLine + + + + + + + + QLayoutWidget + + name + Layout13 + + + + margin + 0 + - name - Layout10 + spacing + 6 - + + QLabel - margin - 0 + name + TextLabel1 - spacing - 6 + text + Use secure sockets: - - QLineEdit - - name - serverLine - - - - QLineEdit - - name - portLine - - - - - - - - QLayoutWidget - - name - Layout13 - - - geometry - - 3 - 117 - 226 - 64 - - - + + + QComboBox + + name + ComboBox1 + + + + + + QLineEdit - margin - 0 + name + CommandEdit - spacing - 6 + text + ssh $SERVER exec imapd + + + + Line + + name + line2 - - QLabel - - name - TextLabel1 - - - text - Use secure sockets: - - - - QComboBox - - name - ComboBox1 - - - - - - QLayoutWidget - - name - Layout6 - - - geometry - - 3 - 223 - 226 - 70 - - - - margin - 0 + orientation + Horizontal + + + QLayoutWidget - spacing - 6 + name + Layout6 - - QLayoutWidget + - name - Layout4 + margin + 0 - - - margin - 0 - + + spacing + 6 + + + QLayoutWidget - spacing - 6 + name + Layout4 - - QLabel - - name - userLabel - + - text - User + margin + 0 - - - QLabel - name - passLabel + spacing + 6 - - text - Password - - - - - - QLayoutWidget - - name - Layout5 - - - - margin - 0 - + + QLabel + + name + userLabel + + + text + User + + + + QLabel + + name + passLabel + + + text + Password + + + + + + QLayoutWidget - spacing - 6 + name + Layout5 - - QLineEdit + - name - userLine + margin + 0 - - - QLineEdit - name - passLine + spacing + 6 - - echoMode - Password - - - - - - - - - name - spacer - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLineEdit - - name - CommandEdit - - - geometry - - 0 - 180 - 226 - 30 - - - - text - ssh $SERVER exec imapd - - - - Line - - name - line2 - - - geometry - - 3 - 204 - 226 - 16 - - - - orientation - Horizontal - - + + QLineEdit + + name + userLine + + + + QLineEdit + + name + passLine + + + echoMode + Password + + + + + + + + + name + spacer + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + accountLine 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 @@ -31,7 +31,7 @@ class ViewMail : public ViewMailBase Q_OBJECT 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(); void hide(); -- cgit v0.9.0.2