github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update values in the views model through menus

Browse Source
work/spdx
Michail Vourlakos 4 years ago
parent b29a8fa9b3
commit 4e7d7aba5f
6 changed files with 146 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
app/settings/generic/persistentmenu.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ void PersistentMenu::setVisible (bool visible)
return;
}
QMenu::setVisible (visible);
QMenu::setVisible(visible);
}
int PersistentMenu::masterIndex() const
@ -57,7 +57,7 @@ void PersistentMenu::setMasterIndex(const int &index)
void PersistentMenu::mouseReleaseEvent (QMouseEvent *e)
{
const QAction *action = actionAt (e->pos ());
const QAction *action = actionAt(e->pos());
if (action) {
m_blockHide = true;
}

4
app/settings/generic/persistentmenu.h
Unescape Escape View File

@ -39,8 +39,8 @@ public:
void setMasterIndex(const int &index);
protected:
void setVisible (bool visible) override;
void mouseReleaseEvent (QMouseEvent *e) override;
void setVisible(bool visible) override;
void mouseReleaseEvent(QMouseEvent *e) override;
signals:
void masterIndexChanged(const int &masterRow);

32
app/settings/viewsdialog/delegates/singleoptiondelegate.cpp
Unescape Escape View File

@ -28,6 +28,8 @@
#include <QMenu>
#include <QPushButton>
#define PRESSEDPROPERTY "PRESSED"
namespace Latte {
namespace Settings {
namespace View {
@ -73,10 +75,14 @@ QWidget *SingleOption::createEditor(QWidget *parent, const QStyleOptionViewItem
action->setIcon(QIcon::fromTheme("dialog-yes"));
}
connect(action, &QAction::triggered, this, [this, button, menu, action](bool checked) {
menu->setProperty(PRESSEDPROPERTY, action->data());
button->clearFocus();
});
menu->addAction(action);
}
connect(menu, &QMenu::aboutToHide, button, &QWidget::clearFocus);
return button;
}
@ -87,10 +93,7 @@ void SingleOption::updateEditorGeometry(QWidget *editor, const QStyleOptionViewI
void SingleOption::setEditorData(QWidget *editor, const QModelIndex &index) const
{
QString currentText = index.data(Qt::DisplayRole).toString();
QPushButton *button = static_cast<QPushButton *>(editor);
button->setText(currentText);
updateButton(editor, index.data(Qt::DisplayRole).toString());
}
bool SingleOption::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
@ -102,6 +105,25 @@ bool SingleOption::editorEvent(QEvent *event, QAbstractItemModel *model, const Q
return QStyledItemDelegate::editorEvent(event, model, option, index);
}
void SingleOption::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
{
QPushButton *button = static_cast<QPushButton *>(editor);
QMenu *menu = button->menu();
if (menu->property(PRESSEDPROPERTY).toString().isEmpty()) {
return;
}
model->setData(index, menu->property(PRESSEDPROPERTY), Qt::UserRole);
updateButton(editor, index.data(Qt::DisplayRole).toString());
}
void SingleOption::updateButton(QWidget *editor, const QString &text) const
{
QPushButton *button = static_cast<QPushButton *>(editor);
button->setText(text);
}
}
}
}

5
app/settings/viewsdialog/delegates/singleoptiondelegate.h
Unescape Escape View File

@ -44,11 +44,14 @@ public:
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
// void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
//void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
private:
void updateButton(QWidget *editor, const QString &text) const;
};
}

115
app/settings/viewsdialog/viewsmodel.cpp
Unescape Escape View File

@ -104,26 +104,32 @@ void Views::initAlignments()
Latte::Data::GenericBasicTable verticals;
horizontals << Data::Generic(QString::number(Latte::Types::Left), i18nc("left alignment", "Left"));
verticals << Data::Generic(QString::number(Latte::Types::Left), i18nc("top alignment", "Top"));
verticals << Data::Generic(QString::number(Latte::Types::Top), i18nc("top alignment", "Top"));
horizontals << Data::Generic(QString::number(Latte::Types::Center), i18nc("center alignment", "Center"));
verticals << horizontals[1];
horizontals << Data::Generic(QString::number(Latte::Types::Right), i18nc("right alignment", "Right"));
verticals << Data::Generic(QString::number(Latte::Types::Left), i18nc("bottom alignment", "Bottom"));
verticals << Data::Generic(QString::number(Latte::Types::Bottom), i18nc("bottom alignment", "Bottom"));
horizontals << Data::Generic(QString::number(Latte::Types::Right), i18nc("justify alignment", "Justify"));
horizontals << Data::Generic(QString::number(Latte::Types::Justify), i18nc("justify alignment", "Justify"));
verticals << horizontals[3];
s_horizontalAlignments.setValue<Latte::Data::GenericBasicTable>(horizontals);
s_verticalAlignments.setValue<Latte::Data::GenericBasicTable>(verticals);
}
bool Views::isVertical(const Plasma::Types::Location &location) const
{
return (location == Plasma::Types::LeftEdge || location == Plasma::Types::RightEdge);
}
void Views::populateScreens()
{
s_screens.clear();
Data::Screen primary("0", i18nc("primary screen", " - Follow Primary Screen - "));
Data::Screen primary(QString::number(Data::Screen::ONPRIMARYID),
i18nc("primary screen", " - Follow Primary Screen - "));
s_screens << primary;
s_screens << m_corona->screenPool()->screensTable();
@ -215,6 +221,93 @@ Qt::ItemFlags Views::flags(const QModelIndex &index) const
return flags;
}
bool Views::setData(const QModelIndex &index, const QVariant &value, int role)
{
const int row = index.row();
const int column = index.column();
if (!m_viewsTable.rowExists(row) || column<0 || column >= SUBCONTAINMENTSCOLUMN) {
return false;
}
QVector<int> roles;
roles << role;
if (role != Qt::DisplayRole) {
roles << Qt::DisplayRole;
}
//! specific roles to each independent cell
switch (column) {
case SCREENCOLUMN:
if (role == Qt::UserRole) {
int screen = value.toString().toInt();
bool onPrimary = (screen == Latte::Data::Screen::ONPRIMARYID);
if (onPrimary == m_viewsTable[row].onPrimary && screen == m_viewsTable[row].screen) {
return false;
}
if (onPrimary) {
m_viewsTable[row].onPrimary = true;
} else {
m_viewsTable[row].onPrimary = false;
m_viewsTable[row].screen = screen;
}
emit dataChanged(index, index, roles);
}
break;
case EDGECOLUMN:
if (role == Qt::UserRole) {
Plasma::Types::Location edge = static_cast<Plasma::Types::Location>(value.toString().toInt());
if (m_viewsTable[row].edge == edge) {
return false;
}
Plasma::Types::Location previousEdge = m_viewsTable[row].edge;
m_viewsTable[row].edge = edge;
emit dataChanged(index, index, roles);
bool previousFactor = isVertical(previousEdge);
bool currentFactor = isVertical(edge);
if (previousFactor != currentFactor) {
if (m_viewsTable[row].alignment == Latte::Types::Left) {
m_viewsTable[row].alignment = Latte::Types::Top;
} else if (m_viewsTable[row].alignment == Latte::Types::Right) {
m_viewsTable[row].alignment = Latte::Types::Bottom;
} else if (m_viewsTable[row].alignment == Latte::Types::Top) {
m_viewsTable[row].alignment = Latte::Types::Left;
} else if (m_viewsTable[row].alignment == Latte::Types::Bottom) {
m_viewsTable[row].alignment = Latte::Types::Right;
}
emit dataChanged(this->index(row, ALIGNMENTCOLUMN), this->index(row, ALIGNMENTCOLUMN), roles);
}
return true;
}
break;
case ALIGNMENTCOLUMN:
if (role == Qt::UserRole) {
int alignment = value.toString().toInt();
if (m_viewsTable[row].alignment == alignment) {
return false;
}
m_viewsTable[row].alignment = static_cast<Latte::Types::Alignment>(alignment);
emit dataChanged(index, index, roles);
return true;
}
break;
};
return false;
}
QVariant Views::data(const QModelIndex &index, int role) const
{
@ -247,8 +340,7 @@ QVariant Views::data(const QModelIndex &index, int role) const
} else if (column == EDGECOLUMN) {
return s_edges;
} else if (column == ALIGNMENTCOLUMN) {
bool isVertical = (m_viewsTable[row].edge == Plasma::Types::LeftEdge || m_viewsTable[row].edge == Plasma::Types::RightEdge);
return isVertical ? s_verticalAlignments : s_horizontalAlignments;
return isVertical(m_viewsTable[row].edge) ? s_verticalAlignments : s_horizontalAlignments;
}
}
@ -270,7 +362,16 @@ QVariant Views::data(const QModelIndex &index, int role) const
break;
case SCREENCOLUMN:
if (role == Qt::DisplayRole){
return (m_viewsTable[row].onPrimary ? QString("Primary") : QString::number(m_viewsTable[row].screen));
if (m_viewsTable[row].onPrimary) {
return QString("Primary");
} else {
QString scrId = QString::number(m_viewsTable[row].screen);
if (s_screens.containsId(scrId)) {
return s_screens[scrId].name;
} else {
return i18nc("unknown screen", "Unknown : [%0]").arg(scrId);
}
}
} else if (role == Qt::UserRole) {
return m_viewsTable[row].onPrimary ? QString::number(Data::Screen::ONPRIMARYID) : QString::number(m_viewsTable[row].screen);
}

3
app/settings/viewsdialog/viewsmodel.h
Unescape Escape View File

@ -80,6 +80,7 @@ public:
QVariant data(const QModelIndex &index, int role) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
const Latte::Data::ViewsTable &currentViewsData();
const Latte::Data::ViewsTable &originalViewsData();
@ -97,6 +98,8 @@ private slots:
void initAlignments();
void populateScreens();
private:
bool isVertical(const Plasma::Types::Location &location) const;
private:
Latte::Data::ViewsTable m_viewsTable;

Write Preview
Loading…
Cancel
Save