-rw-r--r-- | kmicromail/composemail.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 5f7a76f..c504fdd 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -85,71 +85,68 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
85 | 85 | ||
86 | } else { | 86 | } else { |
87 | fillSettings(); | 87 | fillSettings(); |
88 | } | 88 | } |
89 | checkBoxLater->setChecked( KOPrefs::instance()->mSendLater ); | 89 | checkBoxLater->setChecked( KOPrefs::instance()->mSendLater ); |
90 | 90 | ||
91 | attList->addColumn( i18n( "Name" ) ); | 91 | attList->addColumn( i18n( "Name" ) ); |
92 | attList->addColumn( i18n( "Size" ) ); | 92 | attList->addColumn( i18n( "Size" ) ); |
93 | QList<Account> accounts = settings->getAccounts(); | 93 | QList<Account> accounts = settings->getAccounts(); |
94 | 94 | ||
95 | if ( QApplication::desktop()->width() < 320 ) | 95 | if ( QApplication::desktop()->width() < 320 ) |
96 | smtpAccountBox->setMaximumWidth( 80 ); | 96 | smtpAccountBox->setMaximumWidth( 80 ); |
97 | Account *it; | 97 | Account *it; |
98 | for ( it = accounts.first(); it; it = accounts.next() ) { | 98 | for ( it = accounts.first(); it; it = accounts.next() ) { |
99 | if ( it->getType()==MAILLIB::A_SMTP ) { | 99 | if ( it->getType()==MAILLIB::A_SMTP ) { |
100 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 100 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
101 | smtpAccountBox->insertItem( smtp->getAccountName() ); | 101 | smtpAccountBox->insertItem( smtp->getAccountName() ); |
102 | smtpAccounts.append( smtp ); | 102 | smtpAccounts.append( smtp ); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); | 105 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); |
106 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); | 106 | connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); |
107 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); | 107 | connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); |
108 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); | 108 | connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) ); |
109 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); | 109 | connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) ); |
110 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); | 110 | connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); |
111 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); | 111 | connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); |
112 | mMail = 0; | 112 | mMail = 0; |
113 | warnAttach = true; | 113 | warnAttach = true; |
114 | QIconSet icon; | 114 | QIconSet icon; |
115 | //icon = SmallIcon("fileexport"); | 115 | //icon = SmallIcon("fileexport"); |
116 | icon = SmallIcon("filesave"); | 116 | icon = SmallIcon("filesave"); |
117 | |||
118 | SaveButton->setText ("") ; | ||
117 | SaveButton->setIconSet (icon ) ; | 119 | SaveButton->setIconSet (icon ) ; |
118 | if ( QApplication::desktop()->width() < 320 ) { | 120 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; |
119 | SaveButton->setText ("") ; | ||
120 | SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ; | ||
121 | } | ||
122 | else | ||
123 | SaveButton->setText (i18n("Save")); | ||
124 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
125 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); | 122 | QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold ); |
126 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); | 123 | QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold ); |
127 | QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold ); | 124 | QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold ); |
128 | #endif | 125 | #endif |
129 | message->setFont ( KOPrefs::instance()->mComposeFont ); | 126 | message->setFont ( KOPrefs::instance()->mComposeFont ); |
130 | message->setWordWrap (QMultiLineEdit::WidgetWidth); | 127 | message->setWordWrap (QMultiLineEdit::WidgetWidth); |
131 | if ( smtpAccounts.count() > 0 ) { | 128 | if ( smtpAccounts.count() > 0 ) { |
132 | fillValues( smtpAccountBox->currentItem() ); | 129 | fillValues( smtpAccountBox->currentItem() ); |
133 | } else { | 130 | } else { |
134 | QMessageBox::information( 0, i18n( "Problem" ), | 131 | QMessageBox::information( 0, i18n( "Problem" ), |
135 | i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ), | 132 | i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ), |
136 | i18n( "Ok" ) ); | 133 | i18n( "Ok" ) ); |
137 | return; | 134 | return; |
138 | } | 135 | } |
139 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); | 136 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); |
140 | 137 | ||
141 | 138 | ||
142 | } | 139 | } |
143 | 140 | ||
144 | void ComposeMail::fillSettings() | 141 | void ComposeMail::fillSettings() |
145 | { | 142 | { |
146 | if ( QApplication::desktop()->width() < 320 ) | 143 | if ( QApplication::desktop()->width() < 320 ) |
147 | fromBox->setMaximumWidth( 100 ); | 144 | fromBox->setMaximumWidth( 100 ); |
148 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); | 145 | QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail); |
149 | QStringList::ConstIterator sit = mailList.begin(); | 146 | QStringList::ConstIterator sit = mailList.begin(); |
150 | int pref = 0; | 147 | int pref = 0; |
151 | for (;sit!=mailList.end();++sit) { | 148 | for (;sit!=mailList.end();++sit) { |
152 | fromBox->insertItem((*sit)); | 149 | fromBox->insertItem((*sit)); |
153 | } | 150 | } |
154 | senderNameEdit->setText(KOPrefs::instance()->mName); | 151 | senderNameEdit->setText(KOPrefs::instance()->mName); |
155 | } | 152 | } |