Git commit 7fdbc92e9cc8bf20438c004652a6f322c9f74322 by Jan Kundr?t, on behalf of Glad Deschrijver. Committed on 15/03/2013 at 14:51. Pushed by jkt into branch 'master'.
GUI: replace all QLineEdits by LineEdit -- widget with an integrated "clear" button fixes #66 M +2 -1 src/Gui/ComposeWidget.cpp M +6 -1 src/Gui/ComposeWidget.ui M +8 -1 src/Gui/CreateMailboxDialog.ui M +10 -3 src/Gui/EditIdentity.ui M +13 -6 src/Gui/SettingsImapPage.ui M +13 -6 src/Gui/SettingsOutgoingPage.ui http://commits.kde.org/trojita/7fdbc92e9cc8bf20438c004652a6f322c9f74322 diff --git a/src/Gui/ComposeWidget.cpp b/src/Gui/ComposeWidget.cpp index 9d20675..f92daf7 100644 --- a/src/Gui/ComposeWidget.cpp +++ b/src/Gui/ComposeWidget.cpp @@ -36,6 +36,7 @@ #include "AutoCompletion.h" #include "ComposeWidget.h" #include "FromAddressProxyModel.h" +#include "LineEdit.h" #include "Window.h" #include "ui_ComposeWidget.h" @@ -545,7 +546,7 @@ void ComposeWidget::addRecipient(int position, Composer::RecipientKind kind, con combo->addItem(tr("Cc"), Composer::ADDRESS_CC); combo->addItem(tr("Bcc"), Composer::ADDRESS_BCC); combo->setCurrentIndex(combo->findData(kind)); - QLineEdit *edit = new QLineEdit(address, this); + LineEdit *edit = new LineEdit(address, this); connect(edit, SIGNAL(textEdited(QString)), SLOT(completeRecipients(QString))); connect(edit, SIGNAL(editingFinished()), SLOT(collapseRecipients())); connect(edit, SIGNAL(textChanged(QString)), m_recipientListUpdateTimer, SLOT(start())); diff --git a/src/Gui/ComposeWidget.ui b/src/Gui/ComposeWidget.ui index cc6f302..be97cb5 100644 --- a/src/Gui/ComposeWidget.ui +++ b/src/Gui/ComposeWidget.ui @@ -52,7 +52,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="subject"/> + <widget class="LineEdit" name="subject"/> </item> </layout> </item> @@ -163,6 +163,11 @@ <extends>QListView</extends> <header>ComposerAttachmentsList.h</header> </customwidget> + <customwidget> + <class>LineEdit</class> + <extends>QLineEdit</extends> + <header>LineEdit.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>sender</tabstop> diff --git a/src/Gui/CreateMailboxDialog.ui b/src/Gui/CreateMailboxDialog.ui index 09fd2e4..763e2bf 100644 --- a/src/Gui/CreateMailboxDialog.ui +++ b/src/Gui/CreateMailboxDialog.ui @@ -19,7 +19,7 @@ </widget> </item> <item> - <widget class="QLineEdit" name="mailboxName"/> + <widget class="LineEdit" name="mailboxName"/> </item> </layout> </item> @@ -63,6 +63,13 @@ <tabstop>buttonBox</tabstop> </tabstops> <resources/> + <customwidgets> + <customwidget> + <class>LineEdit</class> + <extends>QLineEdit</extends> + <header>LineEdit.h</header> + </customwidget> + </customwidgets> <connections> <connection> <sender>buttonBox</sender> diff --git a/src/Gui/EditIdentity.ui b/src/Gui/EditIdentity.ui index c965ea1..f15d29e 100644 --- a/src/Gui/EditIdentity.ui +++ b/src/Gui/EditIdentity.ui @@ -31,7 +31,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="realNameLineEdit"/> + <widget class="LineEdit" name="realNameLineEdit"/> </item> <item row="1" column="0"> <widget class="QLabel" name="emailLabel"> @@ -41,10 +41,10 @@ </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="emailLineEdit"/> + <widget class="LineEdit" name="emailLineEdit"/> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="organisationLineEdit"/> + <widget class="LineEdit" name="organisationLineEdit"/> </item> <item row="2" column="0"> <widget class="QLabel" name="organisationLabel"> @@ -76,6 +76,13 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>LineEdit</class> + <extends>QLineEdit</extends> + <header>LineEdit.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> diff --git a/src/Gui/SettingsImapPage.ui b/src/Gui/SettingsImapPage.ui index b56437f..8c1ee20 100644 --- a/src/Gui/SettingsImapPage.ui +++ b/src/Gui/SettingsImapPage.ui @@ -112,7 +112,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="imapHost"> + <widget class="LineEdit" name="imapHost"> <property name="toolTip"> <string>Hostname of the IMAP server</string> </property> @@ -125,7 +125,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="imapPort"> + <widget class="LineEdit" name="imapPort"> <property name="toolTip"> <string>Port number of the IMAP server</string> </property> @@ -154,7 +154,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="5" column="1"> - <widget class="QLineEdit" name="imapUser"> + <widget class="LineEdit" name="imapUser"> <property name="toolTip"> <string>IMAP Username</string> </property> @@ -167,7 +167,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="6" column="1"> - <widget class="QLineEdit" name="imapPass"> + <widget class="LineEdit" name="imapPass"> <property name="toolTip"> <string>IMAP Password</string> </property> @@ -191,7 +191,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="8" column="1"> - <widget class="QLineEdit" name="processPath"> + <widget class="LineEdit" name="processPath"> <property name="whatsThis"> <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -266,7 +266,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="11" column="1"> - <widget class="QLineEdit" name="imapCapabilitiesBlacklist"/> + <widget class="LineEdit" name="imapCapabilitiesBlacklist"/> </item> <item row="3" column="0" colspan="2"> <widget class="QLabel" name="portWarning"> @@ -281,6 +281,13 @@ p, li { white-space: pre-wrap; } </layout> </widget> </widget> + <customwidgets> + <customwidget> + <class>LineEdit</class> + <extends>QLineEdit</extends> + <header>LineEdit.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> diff --git a/src/Gui/SettingsOutgoingPage.ui b/src/Gui/SettingsOutgoingPage.ui index 74d58d9..4631795 100644 --- a/src/Gui/SettingsOutgoingPage.ui +++ b/src/Gui/SettingsOutgoingPage.ui @@ -87,10 +87,10 @@ </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="smtpHost"/> + <widget class="LineEdit" name="smtpHost"/> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="smtpPort"/> + <widget class="LineEdit" name="smtpPort"/> </item> <item row="4" column="1"> <widget class="QCheckBox" name="smtpAuth"> @@ -100,17 +100,17 @@ </widget> </item> <item row="5" column="1"> - <widget class="QLineEdit" name="smtpUser"/> + <widget class="LineEdit" name="smtpUser"/> </item> <item row="6" column="1"> - <widget class="QLineEdit" name="smtpPass"> + <widget class="LineEdit" name="smtpPass"> <property name="echoMode"> <enum>QLineEdit::Password</enum> </property> </widget> </item> <item row="7" column="1"> - <widget class="QLineEdit" name="sendmail"/> + <widget class="LineEdit" name="sendmail"/> </item> <item row="3" column="0"> <widget class="QLabel" name="smtpStartTlsLabel"> @@ -153,7 +153,7 @@ </widget> </item> <item row="9" column="1"> - <widget class="QLineEdit" name="saveFolderName"/> + <widget class="LineEdit" name="saveFolderName"/> </item> <item row="10" column="0"> <widget class="QLabel" name="smtpBurlLabel"> @@ -184,6 +184,13 @@ <tabstop>saveFolderName</tabstop> <tabstop>smtpBurl</tabstop> </tabstops> + <customwidgets> + <customwidget> + <class>LineEdit</class> + <extends>QLineEdit</extends> + <header>LineEdit.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui>
