From 2977e1142c4bb472b9d73711e6d18b7258b1cef5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 6 May 2015 09:45:59 +0200
Subject: [PATCH] Some fixing of toolbar.

---
 src/gui/toolbareditor.cpp | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/gui/toolbareditor.cpp b/src/gui/toolbareditor.cpp
index dc55810e0..3bbc669f4 100755
--- a/src/gui/toolbareditor.cpp
+++ b/src/gui/toolbareditor.cpp
@@ -35,10 +35,8 @@ ToolBarEditor::ToolBarEditor(QWidget *parent)
   connect(m_ui->m_btnMoveActionUp, SIGNAL(clicked()), this, SLOT(moveActionUp()));
   connect(m_ui->m_btnMoveActionDown, SIGNAL(clicked()), this, SLOT(moveActionDown()));
 
-  connect(m_ui->m_listAvailableActions, SIGNAL(itemSelectionChanged()),
-          this, SLOT(updateActionsAvailability()));
-  connect(m_ui->m_listActivatedActions, SIGNAL(itemSelectionChanged()),
-          this, SLOT(updateActionsAvailability()));
+  connect(m_ui->m_listAvailableActions, SIGNAL(itemSelectionChanged()), this, SLOT(updateActionsAvailability()));
+  connect(m_ui->m_listActivatedActions, SIGNAL(itemSelectionChanged()), this, SLOT(updateActionsAvailability()));
 }
 
 ToolBarEditor::~ToolBarEditor() {
@@ -95,10 +93,9 @@ void ToolBarEditor::loadFromToolBar(BaseToolBar *tool_bar) {
         action_item->setToolTip(action->toolTip());
       }
     }
-
-    m_ui->m_listAvailableActions->sortItems(Qt::AscendingOrder);
   }
 
+  m_ui->m_listAvailableActions->sortItems(Qt::AscendingOrder);
   updateActionsAvailability();
 }
 
@@ -124,37 +121,25 @@ void ToolBarEditor::updateActionsAvailability() {
 
 void ToolBarEditor::insertSpacer() {
   int current_row = m_ui->m_listActivatedActions->currentRow();
-
   QListWidgetItem *item = new QListWidgetItem(tr("Toolbar spacer"));
+
   item->setIcon(qApp->icons()->fromTheme("view-spacer"));
   item->setData(Qt::UserRole, SPACER_ACTION_NAME);
 
-  if (current_row >= 0) {
-    m_ui->m_listActivatedActions->insertItem(current_row + 1, item);
-  }
-  else {
-    m_ui->m_listActivatedActions->addItem(item);
-  }
-
-  updateActionsAvailability();
+  m_ui->m_listActivatedActions->insertItem(current_row + 1, item);
+  m_ui->m_listActivatedActions->setCurrentRow(current_row + 1);
 }
 
 void ToolBarEditor::insertSeparator() {
   int current_row = m_ui->m_listActivatedActions->currentRow();
-
   QListWidgetItem *item = new QListWidgetItem(tr("Separator"));
+
   item->setData(Qt::UserRole, SEPARATOR_ACTION_NAME);
   item->setToolTip(tr("Separator"));
   item->setIcon(qApp->icons()->fromTheme("view-separator"));
 
-  if (current_row >= 0) {
-    m_ui->m_listActivatedActions->insertItem(current_row + 1, item);
-  }
-  else {
-    m_ui->m_listActivatedActions->addItem(item);
-  }
-
-  updateActionsAvailability();
+  m_ui->m_listActivatedActions->insertItem(current_row + 1, item);
+  m_ui->m_listActivatedActions->setCurrentRow(current_row + 1);
 }
 
 void ToolBarEditor::moveActionDown() {