-rw-r--r-- | kmicromail/composemail.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 3231b45..7b609fc 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -132,49 +132,56 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo | |||
132 | SaveButton->setText ("") ; | 132 | SaveButton->setText ("") ; |
133 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; | 133 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; |
134 | } | 134 | } |
135 | else | 135 | else |
136 | SaveButton->setText (i18n("Save")); | 136 | SaveButton->setText (i18n("Save")); |
137 | #ifndef DESKTOP_VERSION | 137 | #ifndef DESKTOP_VERSION |
138 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); | 138 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); |
139 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); | 139 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); |
140 | QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold ); | 140 | QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold ); |
141 | #endif | 141 | #endif |
142 | message->setFont ( KOPrefs::instance()->mComposeFont ); | 142 | message->setFont ( KOPrefs::instance()->mComposeFont ); |
143 | message->setWordWrap (QMultiLineEdit::WidgetWidth); | 143 | message->setWordWrap (QMultiLineEdit::WidgetWidth); |
144 | if ( smtpAccounts.count() > 0 ) { | 144 | if ( smtpAccounts.count() > 0 ) { |
145 | fillValues( smtpAccountBox->currentItem() ); | 145 | fillValues( smtpAccountBox->currentItem() ); |
146 | } else { | 146 | } else { |
147 | QMessageBox::information( 0, i18n( "Problem" ), | 147 | QMessageBox::information( 0, i18n( "Problem" ), |
148 | i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ), | 148 | i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ), |
149 | i18n( "Ok" ) ); | 149 | i18n( "Ok" ) ); |
150 | return; | 150 | return; |
151 | } | 151 | } |
152 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); | 152 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); |
153 | connect( SaveSigButton, SIGNAL( clicked() ), SLOT( saveSig()) ); | 153 | connect( SaveSigButton, SIGNAL( clicked() ), SLOT( saveSig()) ); |
154 | if ( smtpAccountBox->count()) | 154 | if ( smtpAccountBox->count()) |
155 | fillValues(0); | 155 | fillValues(0); |
156 | 156 | #ifdef DESKTOP_VERSION | |
157 | if ( QApplication::desktop()->width() <= 800 ) { | ||
158 | resize( QApplication::desktop()->size() ); | ||
159 | } else | ||
160 | resize( 800, 600 ); | ||
161 | if ( QApplication::desktop()->width() >= 640 ) | ||
162 | senderNameEdit->setFixedWidth( 200 ); | ||
163 | #endif | ||
157 | } | 164 | } |
158 | 165 | ||
159 | void ComposeMail::fillSettings() | 166 | void ComposeMail::fillSettings() |
160 | { | 167 | { |
161 | if ( QApplication::desktop()->width() < 320 ) | 168 | if ( QApplication::desktop()->width() < 320 ) |
162 | fromBox->setMaximumWidth( 100 ); | 169 | fromBox->setMaximumWidth( 100 ); |
163 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); | 170 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); |
164 | QStringList::ConstIterator sit = mailList.begin(); | 171 | QStringList::ConstIterator sit = mailList.begin(); |
165 | int pref = 0; | 172 | int pref = 0; |
166 | for (;sit!=mailList.end();++sit) { | 173 | for (;sit!=mailList.end();++sit) { |
167 | fromBox->insertItem((*sit)); | 174 | fromBox->insertItem((*sit)); |
168 | } | 175 | } |
169 | senderNameEdit->setText(KOPrefs::instance()->mName); | 176 | senderNameEdit->setText(KOPrefs::instance()->mName); |
170 | } | 177 | } |
171 | void ComposeMail::saveSig() | 178 | void ComposeMail::saveSig() |
172 | { | 179 | { |
173 | if ( smtpAccountBox->count()) { | 180 | if ( smtpAccountBox->count()) { |
174 | int cur = smtpAccountBox->currentItem (); | 181 | int cur = smtpAccountBox->currentItem (); |
175 | SMTPaccount *smtp = smtpAccounts.at( cur ); | 182 | SMTPaccount *smtp = smtpAccounts.at( cur ); |
176 | if ( smtp ) | 183 | if ( smtp ) |
177 | smtp->setSignature( sigMultiLine->text()); | 184 | smtp->setSignature( sigMultiLine->text()); |
178 | } | 185 | } |
179 | } | 186 | } |
180 | void ComposeMail::saveAsDraft() | 187 | void ComposeMail::saveAsDraft() |