From b95ca5c259e42de788af821ef1ec5b4e7705223d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 19 Sep 2014 08:31:25 +0200
Subject: [PATCH] Fixes for toolbar editor.

---
 resources/text/CHANGELOG |   1 +
 src/gui/formsettings.cpp |  21 ++++++
 src/gui/formsettings.h   |   4 +
 src/gui/formsettings.ui  | 156 +++++++++++++++++++--------------------
 src/gui/toolbareditor.h  |   8 ++
 5 files changed, 112 insertions(+), 78 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 3a36cb6b0..576e5e705 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -3,6 +3,7 @@
 
 Fixed:
 <ul>
+<li>List of actions in toolbar editor now do not allow copying of items.</li>
 <li>Keyboard search for message list should now work with Qt 4.</li>
 <li>Overall code cleanups and refactoring primarily in area of feed/message models and recycle bin functionality.</li>
 <li>Fixed bug #66, #67, #69, #64.</li>
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index 1f2acc3eb..b642ba03e 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -45,6 +45,7 @@
 #include <QNetworkProxy>
 #include <QColorDialog>
 #include <QFileDialog>
+#include <QKeyEvent>
 
 
 FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormSettings) {
@@ -54,6 +55,11 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
   setWindowIcon(qApp->icons()->fromTheme("application-settings"));
 
+  m_ui->m_editorMessagesToolbar->activeItemsWidget()->viewport()->installEventFilter(this);
+  m_ui->m_editorFeedsToolbar->activeItemsWidget()->viewport()->installEventFilter(this);
+  m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
+  m_ui->m_editorFeedsToolbar->availableItemsWidget()->viewport()->installEventFilter(this);
+
 #if !defined(Q_OS_WIN)
   MessageBox::iconify(m_ui->m_buttonBox);
 #endif
@@ -784,3 +790,18 @@ void FormSettings::saveInterface() {
   qApp->mainForm()->tabWidget()->checkTabBarVisibility();
   qApp->mainForm()->tabWidget()->feedMessageViewer()->refreshVisualProperties();
 }
+
+
+bool FormSettings::eventFilter(QObject *obj, QEvent *e) {
+  Q_UNUSED(obj)
+
+  if (e->type() == QEvent::Drop) {
+    QDropEvent *drop_event = static_cast<QDropEvent*>(e);
+
+    if (drop_event->keyboardModifiers() != Qt::NoModifier) {
+      drop_event->setDropAction(Qt::MoveAction);
+    }
+  }
+
+  return false;
+}
diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h
index f49d8747f..c64eb2d3d 100644
--- a/src/gui/formsettings.h
+++ b/src/gui/formsettings.h
@@ -49,6 +49,8 @@ class FormSettings : public QDialog {
     // Does check of controls before dialog can be submitted.
     bool doSaveCheck();
 
+    bool eventFilter(QObject *obj, QEvent *e);
+
   protected slots:
     // Displays "restart" dialog if some critical settings changed.
     void promptForRestart();
@@ -97,4 +99,6 @@ class FormSettings : public QDialog {
     QStringList m_changedDataTexts;
 };
 
+
+
 #endif // FORMSETTINGS_H
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index feff44928..8567b24df 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -14,10 +14,86 @@
    <string>Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="m_listSettings">
+     <property name="minimumSize">
+      <size>
+       <width>220</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>220</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="movement">
+      <enum>QListView::Static</enum>
+     </property>
+     <property name="selectionRectVisible">
+      <bool>false</bool>
+     </property>
+     <property name="currentRow">
+      <number>-1</number>
+     </property>
+     <item>
+      <property name="text">
+       <string extracomment="General settings section.">General</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Data storage</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Keyboard shortcuts</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>User interface</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string extracomment="Language settings section.">Language</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Web browser &amp; proxy</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Feeds &amp; messages</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="m_buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -353,7 +429,7 @@ Authors of this application are NOT responsible for lost data.</string>
           <enum>QTabWidget::North</enum>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>3</number>
          </property>
          <widget class="QWidget" name="m_tabIconSkin">
           <attribute name="title">
@@ -1201,82 +1277,6 @@ Authors of this application are NOT responsible for lost data.</string>
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="m_buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QListWidget" name="m_listSettings">
-     <property name="minimumSize">
-      <size>
-       <width>220</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>220</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="movement">
-      <enum>QListView::Static</enum>
-     </property>
-     <property name="selectionRectVisible">
-      <bool>false</bool>
-     </property>
-     <property name="currentRow">
-      <number>-1</number>
-     </property>
-     <item>
-      <property name="text">
-       <string extracomment="General settings section.">General</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Data storage</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Keyboard shortcuts</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>User interface</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string extracomment="Language settings section.">Language</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Web browser &amp; proxy</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Feeds &amp; messages</string>
-      </property>
-     </item>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/gui/toolbareditor.h b/src/gui/toolbareditor.h
index 0042935c4..34e169ac2 100644
--- a/src/gui/toolbareditor.h
+++ b/src/gui/toolbareditor.h
@@ -41,6 +41,14 @@ class ToolBarEditor : public QWidget {
     void loadFromToolBar(BaseToolBar *tool_bar);
     void saveToolBar();
 
+    inline QListWidget *activeItemsWidget() {
+      return m_ui->m_listActivatedActions;
+    }
+
+    inline QListWidget *availableItemsWidget() {
+      return m_ui->m_listAvailableActions;
+    }
+
   private slots:
     // Insert common controls.
     void insertSpacer();