From 32bb1ca449fb8be976724847e61c4a4a75170c05 Mon Sep 17 00:00:00 2001
From: Camila San <hello@camila.codes>
Date: Mon, 30 Jul 2018 22:09:27 +0200
Subject: [PATCH] Aligns copy button to the left in the activity widget.

Signed-off-by: Camila San <hello@camila.codes>
---
 src/gui/activitywidget.cpp |  5 ++--
 src/gui/activitywidget.h   |  2 --
 src/gui/activitywidget.ui  | 58 +++++++++++++++++++++++++-------------
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 0bfff6d9fa..8327e9adc9 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -77,9 +77,8 @@ ActivityWidget::ActivityWidget(AccountState *accountState, QWidget *parent)
     connect(_model, &ActivityListModel::activityJobStatusCode,
         this, &ActivityWidget::slotAccountActivityStatus);
 
-    _copyBtn = _ui->_dialogButtonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole);
-    _copyBtn->setToolTip(tr("Copy the activity list to the clipboard."));
-    connect(_copyBtn, &QAbstractButton::clicked, this, &ActivityWidget::copyToClipboard);
+    _ui->_copyButton->setToolTip(tr("Copy the activity list to the clipboard."));
+    connect(_ui->_copyButton, &QPushButton::click, this, &ActivityWidget::copyToClipboard);
 
     connect(_model, &QAbstractItemModel::rowsInserted, this, &ActivityWidget::rowsInserted);
 
diff --git a/src/gui/activitywidget.h b/src/gui/activitywidget.h
index 660a84ec94..ffd301d40b 100644
--- a/src/gui/activitywidget.h
+++ b/src/gui/activitywidget.h
@@ -104,8 +104,6 @@ private:
     void showLabels();
     QString timeString(QDateTime dt, QLocale::FormatType format) const;
     Ui::ActivityWidget *_ui;
-    QPushButton *_copyBtn;
-
     QSet<QString> _accountsWithoutActivities;
     QMap<Activity::Identifier, NotificationWidget *> _widgetForNotifId;
     QElapsedTimer _guiLogTimer;
diff --git a/src/gui/activitywidget.ui b/src/gui/activitywidget.ui
index 759065dbcf..b6aa092ef6 100644
--- a/src/gui/activitywidget.ui
+++ b/src/gui/activitywidget.ui
@@ -78,25 +78,6 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="_bottomLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="_dialogButtonBox"/>
-   </item>
    <item row="0" column="0">
     <widget class="QListView" name="_activityList">
      <property name="sizePolicy">
@@ -204,11 +185,48 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="_bottomLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="_copyButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">margin-left:40px;</string>
+     </property>
+     <property name="text">
+      <string>Copy</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>_activityList</tabstop>
-  <tabstop>_dialogButtonBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>