fix #10,Delete button deletes layout.

pull/19/head
Martijn Vogelaar 5 years ago committed by Michail Vourlakos
parent 5832978fbf
commit 05fd28b2dc

@ -611,14 +611,7 @@ void SettingsDialog::dropEvent(QDropEvent *event)
} }
} }
void SettingsDialog::keyReleaseEvent(QKeyEvent *event)
{
if (event && currentPage() == LayoutPage){
m_tabLayoutsHandler->on_keyReleaseEvent(event);
}
QDialog::keyReleaseEvent(event);
}
void SettingsDialog::updateWindowActivities() void SettingsDialog::updateWindowActivities()
{ {

@ -92,7 +92,6 @@ protected:
void dragLeaveEvent(QDragLeaveEvent *event) override; void dragLeaveEvent(QDragLeaveEvent *event) override;
void dragMoveEvent(QDragMoveEvent *event) override; void dragMoveEvent(QDragMoveEvent *event) override;
void dropEvent(QDropEvent *event) override; void dropEvent(QDropEvent *event) override;
void keyReleaseEvent(QKeyEvent *event) override;
private slots: private slots:
void on_import_fullconfiguration(); void on_import_fullconfiguration();

@ -150,7 +150,7 @@ void TabLayouts::initLayoutMenu()
m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove")); m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove"));
m_removeLayoutAction->setToolTip(i18n("Remove selected layout")); m_removeLayoutAction->setToolTip(i18n("Remove selected layout"));
m_removeLayoutAction->setIcon(QIcon::fromTheme("delete")); m_removeLayoutAction->setIcon(QIcon::fromTheme("delete"));
m_removeLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D)); m_removeLayoutAction->setShortcut(QKeySequence(Qt::Key_Delete));
connectActionWithButton(m_ui->removeButton, m_removeLayoutAction); connectActionWithButton(m_ui->removeButton, m_removeLayoutAction);
connect(m_removeLayoutAction, &QAction::triggered, this, &TabLayouts::on_remove_layout); connect(m_removeLayoutAction, &QAction::triggered, this, &TabLayouts::on_remove_layout);
@ -772,14 +772,6 @@ void TabLayouts::on_dropEvent(QDropEvent *event)
} }
} }
void TabLayouts::on_keyReleaseEvent(QKeyEvent *event)
{
if (event && event->key() == Qt::Key_Delete && m_parentDialog->currentPage() == Dialog::LayoutPage){
//! Disabled because it deletes a layout when the user is editing its layout name and presses Delete
//! there must be a way to block that deletion
//on_remove_layout();
}
}
void TabLayouts::loadConfig() void TabLayouts::loadConfig()
{ {

@ -82,7 +82,6 @@ public slots:
void on_dragLeaveEvent(QDragLeaveEvent *event); void on_dragLeaveEvent(QDragLeaveEvent *event);
void on_dragMoveEvent(QDragMoveEvent *event); void on_dragMoveEvent(QDragMoveEvent *event);
void on_dropEvent(QDropEvent *event); void on_dropEvent(QDropEvent *event);
void on_keyReleaseEvent(QKeyEvent *event);
private slots: private slots:
void initUi(); void initUi();

Loading…
Cancel
Save