summaryrefslogtreecommitdiffabout
path: root/kmicromail
Side-by-side diff
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/composemail.cpp28
-rw-r--r--kmicromail/composemailui.ui4
-rw-r--r--kmicromail/selectstoreui.ui8
3 files changed, 27 insertions, 13 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 35ad367..5f7a76f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -9,24 +9,25 @@
/* OPIE */
//#include <opie2/ofiledialog.h>
//#include <opie2/odebug.h>
#include <kfiledialog.h>
//#include <qpe/resource.h>
#include <qpe/global.h>
//#include <qpe/contact.h>
#include <qcombobox.h>
#include <qcheckbox.h>
+#include <qiconset.h>
#include <qtimer.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qmultilineedit.h>
#include <qlabel.h>
#include <qtabwidget.h>
#include <qlistview.h>
#include <kabc/addresseedialog.h>
#include <kabc/stdaddressbook.h>
#include <kabc/addressee.h>
#ifdef DESKTOP_VERSION
#include <kabc/addresseedialog.h>
@@ -101,38 +102,51 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
smtpAccounts.append( smtp );
}
}
connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
mMail = 0;
warnAttach = true;
+ QIconSet icon;
+ //icon = SmallIcon("fileexport");
+ icon = SmallIcon("filesave");
+ SaveButton->setIconSet (icon ) ;
+ if ( QApplication::desktop()->width() < 320 ) {
+ SaveButton->setText ("") ;
+ SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
+ }
+ else
+ SaveButton->setText (i18n("Save"));
+#ifndef DESKTOP_VERSION
+ QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
+ QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
+ QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
+#endif
+ message->setFont ( KOPrefs::instance()->mComposeFont );
+ message->setWordWrap (QMultiLineEdit::WidgetWidth);
if ( smtpAccounts.count() > 0 ) {
fillValues( smtpAccountBox->currentItem() );
} else {
QMessageBox::information( 0, i18n( "Problem" ),
- i18n( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
+ i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),
i18n( "Ok" ) );
return;
- }
+ }
connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) );
- message->setFont ( KOPrefs::instance()->mComposeFont );
- message->setWordWrap (QMultiLineEdit::WidgetWidth);
-#ifndef DESKTOP_VERSION
- QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
-#endif
+
}
void ComposeMail::fillSettings()
{
if ( QApplication::desktop()->width() < 320 )
fromBox->setMaximumWidth( 100 );
QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail);
QStringList::ConstIterator sit = mailList.begin();
int pref = 0;
for (;sit!=mailList.end();++sit) {
fromBox->insertItem((*sit));
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 0a5a750..c66b0c8 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -4,25 +4,25 @@
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>ComposeMailUI</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
<width>276</width>
- <height>262</height>
+ <height>263</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Compose Message</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
@@ -438,25 +438,25 @@
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
</widget>
<widget row="0" column="3" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>SaveButton</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Save</string>
+ <string> S</string>
</property>
</widget>
</grid>
</widget>
<tabstops>
<tabstop>fromBox</tabstop>
<tabstop>toButton</tabstop>
<tabstop>toLine</tabstop>
<tabstop>subjectLine</tabstop>
<tabstop>message</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>ccButton</tabstop>
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 2da103b..89f6ebc 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -3,26 +3,26 @@
<include location="local">tr.h</include>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>selectstoreui</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>279</width>
- <height>304</height>
+ <width>230</width>
+ <height>307</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Select target box</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
@@ -173,25 +173,25 @@
<name>enabled</name>
<bool>false</bool>
</property>
</widget>
<widget row="5" column="0" rowspan="1" colspan="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>newFolderLabel</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Prefix will prepend, no need to enter it!</string>
+ <string>Prefix will prepend, do not enter</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>WordBreak|AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
<property>
<name>wordwrap</name>
</property>
</widget>
@@ -237,25 +237,25 @@
<name>text</name>
<string>Move mail(s)</string>
</property>
</widget>
<widget row="7" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>useSize</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>apply only to mails smaller</string>
+ <string>only mails smaller</string>
</property>
</widget>
<widget row="7" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>sizeSpinBox</cstring>
</property>
<property stdset="1">
<name>suffix</name>
<string> kB</string>
</property>