author | zautrix <zautrix> | 2005-02-17 10:52:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-17 10:52:04 (UTC) |
commit | 002e4f8cea2352e4b9a046b98f66be946fbeb5fc (patch) (unidiff) | |
tree | 7dde06f92ed54ec8ee40e68eaa312d2a2d379fb1 /kmicromail | |
parent | ec18172021a9adc0f6fa1fe80aec71e9a905a351 (diff) | |
download | kdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.zip kdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.tar.gz kdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.tar.bz2 |
desktop fix
-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 | |||
@@ -108,97 +108,104 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo | |||
108 | if ( QApplication::desktop()->width() < 320 ) | 108 | if ( QApplication::desktop()->width() < 320 ) |
109 | smtpAccountBox->setMaximumWidth( 80 ); | 109 | smtpAccountBox->setMaximumWidth( 80 ); |
110 | Account *it; | 110 | Account *it; |
111 | for ( it = accounts.first(); it; it = accounts.next() ) { | 111 | for ( it = accounts.first(); it; it = accounts.next() ) { |
112 | if ( it->getType()==MAILLIB::A_SMTP ) { | 112 | if ( it->getType()==MAILLIB::A_SMTP ) { |
113 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 113 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
114 | smtpAccountBox->insertItem( smtp->getAccountName() ); | 114 | smtpAccountBox->insertItem( smtp->getAccountName() ); |
115 | smtpAccounts.append( smtp ); | 115 | smtpAccounts.append( smtp ); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); | 118 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); |
119 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); | 119 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); |
120 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); | 120 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); |
121 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); | 121 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); |
122 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); | 122 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); |
123 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); | 123 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); |
124 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); | 124 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); |
125 | mMail = 0; | 125 | mMail = 0; |
126 | warnAttach = true; | 126 | warnAttach = true; |
127 | QIconSet icon; | 127 | QIconSet icon; |
128 | //icon = SmallIcon("fileexport"); | 128 | //icon = SmallIcon("fileexport"); |
129 | icon = SmallIcon("filesave"); | 129 | icon = SmallIcon("filesave"); |
130 | SaveButton->setIconSet (icon ) ; | 130 | SaveButton->setIconSet (icon ) ; |
131 | if ( QApplication::desktop()->width() < 320 ) { | 131 | if ( QApplication::desktop()->width() < 320 ) { |
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() |
181 | { | 188 | { |
182 | 189 | ||
183 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); | 190 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); |
184 | mail->setMail(fromBox->currentText()); | 191 | mail->setMail(fromBox->currentText()); |
185 | mail->setTo( toLine->text() ); | 192 | mail->setTo( toLine->text() ); |
186 | mail->setName(senderNameEdit->text()); | 193 | mail->setName(senderNameEdit->text()); |
187 | mail->setCC( ccLine->text() ); | 194 | mail->setCC( ccLine->text() ); |
188 | mail->setBCC( bccLine->text() ); | 195 | mail->setBCC( bccLine->text() ); |
189 | mail->setReply( replyLine->text() ); | 196 | mail->setReply( replyLine->text() ); |
190 | mail->setSubject( subjectLine->text() ); | 197 | mail->setSubject( subjectLine->text() ); |
191 | if (!m_replyid.isEmpty()) { | 198 | if (!m_replyid.isEmpty()) { |
192 | QStringList ids; | 199 | QStringList ids; |
193 | ids.append(m_replyid); | 200 | ids.append(m_replyid); |
194 | mail->setInreply(ids); | 201 | mail->setInreply(ids); |
195 | } | 202 | } |
196 | QString txt = message->text(); | 203 | QString txt = message->text(); |
197 | if ( !sigMultiLine->text().isEmpty() ) { | 204 | if ( !sigMultiLine->text().isEmpty() ) { |
198 | txt.append( "\n--\n" ); | 205 | txt.append( "\n--\n" ); |
199 | txt.append( sigMultiLine->text() ); | 206 | txt.append( sigMultiLine->text() ); |
200 | } | 207 | } |
201 | mail->setMessage( txt ); | 208 | mail->setMessage( txt ); |
202 | mail->setCharset (mEncoding); | 209 | mail->setCharset (mEncoding); |
203 | /* only use the default drafts folder name! */ | 210 | /* only use the default drafts folder name! */ |
204 | Storemail wrapper(AbstractMail::draftFolder()); | 211 | Storemail wrapper(AbstractMail::draftFolder()); |