summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt2
-rw-r--r--kmicromail/composemail.cpp9
2 files changed, 9 insertions, 2 deletions
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 58f4ea8..0d858a8 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -255,20 +255,20 @@
255{ "Reply to this mail","Beantworte diese Mail" }, 255{ "Reply to this mail","Beantworte diese Mail" },
256{ "Su:","Be:" }, 256{ "Su:","Be:" },
257{ "Fr:","Vo:" }, 257{ "Fr:","Vo:" },
258{ "To:","An:" }, 258{ "To:","An:" },
259{ "Download Mail","Mail runterladen" }, 259{ "Download Mail","Mail runterladen" },
260{ "View Source","Zeige Source" }, 260{ "View Source","Zeige Source" },
261{ "Show "To" field in list view","Zeige "An" Feld in Listenansicht" }, 261{ "Show "To" field in list view","Zeige "An" Feld in Listenansicht" },
262{ "Show info fields at startup","Zeige Info Felder beim Start" }, 262{ "Show info fields at startup","Zeige Info Felder beim Start" },
263{ "Show "Subject" info field","Zeige "Betreff" Info Feld" }, 263{ "Show "Subject" info field","Zeige "Betreff" Info Feld" },
264{ "Show "From" info field","Zeige "Von" Info Feld" }, 264{ "Show "From" info field","Zeige "Von" Info Feld" },
265{ "Show "To" info field","Zeige "An" Info Feld" }, 265{ "Show "To" info field","Zeige "An" Info Feld" },
266{ "Mail saved as draft!","Mail als Entwurf gespeichert!" }, 266{ "Mail saved as draft!","Mail als Entwurf gespeichert!" },
267{ "","" }, 267{ "Save signature","Speichere Signatur" },
268{ "","" }, 268{ "","" },
269{ "","" }, 269{ "","" },
270{ "","" }, 270{ "","" },
271{ "","" }, 271{ "","" },
272{ "","" }, 272{ "","" },
273{ "","" }, 273{ "","" },
274{ "","" }, 274{ "","" },
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 3231b45..7b609fc 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -144,25 +144,32 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
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
159void ComposeMail::fillSettings() 166void 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 }