| -rw-r--r-- | kmicromail/composemail.cpp | 28 | ||||
| -rw-r--r-- | kmicromail/composemailui.ui | 4 | ||||
| -rw-r--r-- | kmicromail/selectstoreui.ui | 8 |
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 @@ -13,16 +13,17 @@ #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> @@ -105,30 +106,43 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m 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); diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui index 0a5a750..c66b0c8 100644 --- a/kmicromail/composemailui.ui +++ b/kmicromail/composemailui.ui @@ -8,17 +8,17 @@ <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> @@ -442,17 +442,17 @@ <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> diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui index 2da103b..89f6ebc 100644 --- a/kmicromail/selectstoreui.ui +++ b/kmicromail/selectstoreui.ui @@ -7,18 +7,18 @@ <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> @@ -177,17 +177,17 @@ <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> @@ -241,17 +241,17 @@ <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> |