pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some fixing of toolbar.

Browse source
This commit is contained in:
Martin Rotter 2015-05-06 09:45:59 +02:00
parent f5675aeb38
commit 2977e1142c
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gui/toolbareditor.cpp
View file

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