[kde-doc-english] [trojita] src/Gui: GUI: use icons for message threading

[Jan Kundrát]

Git commit d72bd77480b6b2c6b5ff2a1dae2734084888e542 by Jan Kundrát.
Committed on 02/01/2014 at 22:46.
Pushed by jkt into branch 'master'.

GUI: use icons for message threading

M  +4    -3    src/Gui/ComposeWidget.cpp
M  +1    -1    src/Gui/Window.cpp

http://commits.kde.org/trojita/d72bd77480b6b2c6b5ff2a1dae2734084888e542

diff --git a/src/Gui/ComposeWidget.cpp b/src/Gui/ComposeWidget.cpp
index 3b0ef6d..ecb34b8 100644
--- a/src/Gui/ComposeWidget.cpp
+++ b/src/Gui/ComposeWidget.cpp
@@ -46,6 +46,7 @@
 #include "Gui/AutoCompletion.h"
 #include "Gui/ComposeWidget.h"
 #include "Gui/FromAddressProxyModel.h"
+#include "Gui/IconLoader.h"
 #include "Gui/LineEdit.h"
 #include "Gui/OverlayWidget.h"
 #include "Gui/PasswordDialog.h"
@@ -125,16 +126,16 @@ ComposeWidget::ComposeWidget(MainWindow *mainWindow, QSettings *settings, MSA::M
 
     m_markButton = new QToolButton(ui->buttonBox);
     m_markButton->setPopupMode(QToolButton::MenuButtonPopup);
-    m_markButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
+    m_markButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_markAsReply = new QActionGroup(m_markButton);
     m_markAsReply->setExclusive(true);
     auto *asReplyMenu = new QMenu(m_markButton);
     m_markButton->setMenu(asReplyMenu);
-    m_actionStandalone = asReplyMenu->addAction(tr("Standalone"));
+    m_actionStandalone = asReplyMenu->addAction(Gui::loadIcon(QLatin1String("mail-view-flat")), tr("New Thread"));
     m_actionStandalone->setActionGroup(m_markAsReply);
     m_actionStandalone->setCheckable(true);
     m_actionStandalone->setToolTip(tr("This mail will be sent as a standalone message.<hr/>Change to preserve the reply hierarchy."));
-    m_actionInReplyTo = asReplyMenu->addAction(tr("Threaded"));
+    m_actionInReplyTo = asReplyMenu->addAction(Gui::loadIcon(QLatin1String("mail-view-threaded")), tr("Threaded"));
     m_actionInReplyTo->setActionGroup(m_markAsReply);
     m_actionInReplyTo->setCheckable(true);
 
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index 3575f97..4f2da9e 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -359,7 +359,7 @@ void MainWindow::createActions()
     m_replyGuess = ShortcutHandler::instance()->createAction(QLatin1String("action_reply_guess"), this, SLOT(slotReplyGuess()), this);
     m_replyGuess->setEnabled(true);
 
-    actionThreadMsgList = new QAction(tr("Show Messages in &Threads"), this);
+    actionThreadMsgList = new QAction(Gui::loadIcon(QLatin1String("mail-view-threaded")), tr("Show Messages in &Threads"), this);
     actionThreadMsgList->setCheckable(true);
     // This action is enabled/disabled by model's capabilities
     actionThreadMsgList->setEnabled(false);