summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-17 10:52:04 (UTC)
committer zautrix <zautrix>2005-02-17 10:52:04 (UTC)
commit002e4f8cea2352e4b9a046b98f66be946fbeb5fc (patch) (unidiff)
tree7dde06f92ed54ec8ee40e68eaa312d2a2d379fb1
parentec18172021a9adc0f6fa1fe80aec71e9a905a351 (diff)
downloadkdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.zip
kdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.tar.gz
kdepimpi-002e4f8cea2352e4b9a046b98f66be946fbeb5fc.tar.bz2
desktop fix
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
@@ -243,32 +243,32 @@
243{ "Language","Sprache" }, 243{ "Language","Sprache" },
244{ "Time Format","Zeit Format" }, 244{ "Time Format","Zeit Format" },
245{ "%1 groups subscribed","%1 Guppen abboniert" }, 245{ "%1 groups subscribed","%1 Guppen abboniert" },
246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, 246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
247{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, 247{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
248{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, 248{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
249{ "Save settings","Speichere Einstellungen" }, 249{ "Save settings","Speichere Einstellungen" },
250{ "Save standard","Speichere Standard" }, 250{ "Save standard","Speichere Standard" },
251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, 251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
252{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, 252{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
253{ "Data storage path","Daten Speicherpfad" }, 253{ "Data storage path","Daten Speicherpfad" },
254{ "userdefined","benutzerdefiniert" }, 254{ "userdefined","benutzerdefiniert" },
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
@@ -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
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 }
169 senderNameEdit->setText(KOPrefs::instance()->mName); 176 senderNameEdit->setText(KOPrefs::instance()->mName);
170} 177}
171void ComposeMail::saveSig() 178void 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}
180void ComposeMail::saveAsDraft() 187void ComposeMail::saveAsDraft()