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

update Actitivies Delegate to new ButtonMenu ui

Browse Source
pull/5/head
Michail Vourlakos 6 years ago
parent 715e8b58c1
commit 25a29111e7
4 changed files with 82 additions and 75 deletions
Show Stats Download Patch File Download Diff File

2
app/settings/delegates/CMakeLists.txt
Unescape Escape View File

@ -1,6 +1,6 @@
set(lattedock-app_SRCS
${lattedock-app_SRCS}
${CMAKE_CURRENT_SOURCE_DIR}/activitycmbboxdelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/activitiesdelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/checkboxdelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxdelegate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxitemdelegate.cpp

119
app/settings/delegates/activitycmbboxdelegate.cpp → app/settings/delegates/activitiesdelegate.cpp
Unescape Escape View File

@ -17,25 +17,27 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "activitycmbboxdelegate.h"
#include "activitiesdelegate.h"
// local
#include "persistentmenu.h"
#include "../settingsdialog.h"
// Qt
#include <QApplication>
#include <QComboBox>
#include <QDebug>
#include <QWidget>
#include <QMenu>
#include <QModelIndex>
#include <QPainter>
#include <QPushButton>
#include <QString>
#include <QTextDocument>
// KDE
#include <KActivities/Info>
ActivityCmbBoxDelegate::ActivityCmbBoxDelegate(QObject *parent)
ActivitiesDelegate::ActivitiesDelegate(QObject *parent)
: QItemDelegate(parent)
{
auto *settingsDialog = qobject_cast<Latte::SettingsDialog *>(parent);
@ -45,14 +47,12 @@ ActivityCmbBoxDelegate::ActivityCmbBoxDelegate(QObject *parent)
}
}
QWidget *ActivityCmbBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
QWidget *ActivitiesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
QComboBox *editor = new QComboBox(parent);
//! use focusPolicy as flag in order to update activities only when the user is clicking in the popup
//! it was the only way I found to communicate between the activated (const) signal and the
//! setEditorData (const) function
editor->setFocusPolicy(Qt::StrongFocus);
QPushButton *button = new QPushButton(parent);
PersistentMenu *menu = new PersistentMenu(button);
button->setMenu(menu);
menu->setMinimumWidth(option.rect.width());
QStringList assignedActivities = index.model()->data(index, Qt::UserRole).toStringList();
QStringList availableActivities = m_settingsDialog->availableActivities();
@ -67,70 +67,56 @@ QWidget *ActivityCmbBoxDelegate::createEditor(QWidget *parent, const QStyleOptio
}
for (unsigned int i = 0; i < shownActivities.count(); ++i) {
KActivities::Info info(shownActivities[i]);
QString indicator = " ";
if (info.state() != KActivities::Info::Invalid) {
QAction *action = new QAction(info.name());
action->setData(shownActivities[i]);
action->setCheckable(true);
action->setChecked(assignedActivities.contains(shownActivities[i]));
if (assignedActivities.contains(shownActivities[i])) {
indicator = QString::fromUtf8("\u2714") + " ";
if ((info.state() == KActivities::Info::Running) || (info.state() == KActivities::Info::Starting)) {
QFont font = action->font();
font.setBold(true);
action->setFont(font);
}
if (info.state() != KActivities::Info::Invalid) {
editor->addItem(QIcon::fromTheme(info.icon()), QString(indicator + info.name()), QVariant(shownActivities[i]));
}
}
menu->addAction(action);
connect(editor, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated), [ = ](int index) {
editor->setFocusPolicy(Qt::ClickFocus);
editor->clearFocus();
connect(action, &QAction::toggled, this, [this, button]() {
updateButton(button);
});
return editor;
}
void ActivityCmbBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
{
QComboBox *comboBox = static_cast<QComboBox *>(editor);
QStringList assignedActivities = index.model()->data(index, Qt::UserRole).toStringList();
int pos = -1;
if (assignedActivities.count() > 0) {
pos = comboBox->findData(QVariant(assignedActivities[0]));
}
comboBox->setCurrentIndex(pos);
return button;
}
void ActivityCmbBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
void ActivitiesDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
{
QComboBox *comboBox = static_cast<QComboBox *>(editor);
if (editor->focusPolicy() != Qt::ClickFocus) {
return;
updateButton(editor);
}
editor->setFocusPolicy(Qt::StrongFocus);
QStringList assignedActivities = index.model()->data(index, Qt::UserRole).toStringList();
QString selectedActivity = comboBox->currentData().toString();
void ActivitiesDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
{
QPushButton *button = static_cast<QPushButton *>(editor);
if (assignedActivities.contains(selectedActivity)) {
assignedActivities.removeAll(selectedActivity);
} else {
assignedActivities.append(selectedActivity);
QStringList assignedActivities;
foreach (QAction *action, button->menu()->actions()) {
if (action->isChecked()) {
assignedActivities << action->data().toString();
}
}
model->setData(index, assignedActivities, Qt::UserRole);
}
void ActivityCmbBoxDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
void ActivitiesDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
editor->setGeometry(option.rect);
}
void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
void ActivitiesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
QStyleOptionViewItem myOptions = option;
//! Remove the focus dotted lines
@ -142,7 +128,7 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
QStringList assignedActivities = index.model()->data(index, Qt::UserRole).toStringList();
if (assignedActivities.count() > 0) {
myOptions.text = assignedActivitiesText(index);
myOptions.text = joinedActivities(assignedActivities);
QTextDocument doc;
QString css;
@ -220,31 +206,48 @@ void ActivityCmbBoxDelegate::paint(QPainter *painter, const QStyleOptionViewItem
}
}
QString ActivityCmbBoxDelegate::assignedActivitiesText(const QModelIndex &index) const
QString ActivitiesDelegate::joinedActivities(const QStringList &activities, bool boldForActive) const
{
QStringList assignedActivities = index.model()->data(index, Qt::UserRole).toStringList();
QString finalText;
if (assignedActivities.count() > 0) {
for (int i = 0; i < assignedActivities.count(); ++i) {
KActivities::Info info(assignedActivities[i]);
int i = 0;
for (const auto &activityId : activities) {
KActivities::Info info(activityId);
if (info.state() != KActivities::Info::Invalid) {
if (i > 0) {
finalText += ", ";
}
i++;
bool isActive{false};
if ((info.state() == KActivities::Info::Running) || (info.state() == KActivities::Info::Starting)) {
if (boldForActive && (info.state() == KActivities::Info::Running) || (info.state() == KActivities::Info::Starting)) {
isActive = true;
}
finalText += isActive ? "<b>" + info.name() + "</b>" : info.name();
}
}
}
return finalText;
}
void ActivitiesDelegate::updateButton(QWidget *editor) const
{
if (!editor) {
return;
}
QPushButton *button = static_cast<QPushButton *>(editor);
QStringList assignedActivities;
foreach (QAction *action, button->menu()->actions()) {
if (action->isChecked()) {
assignedActivities << action->data().toString();
}
}
button->setText(joinedActivities(assignedActivities,false));
}

14
app/settings/delegates/activitycmbboxdelegate.h → app/settings/delegates/activitiesdelegate.h
Unescape Escape View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTIVITYCMBBOXDELEGATE_H
#define ACTIVITYCMBBOXDELEGATE_H
#ifndef ACTIVITIESDELEGATE_H
#define ACTIVITIESDELEGATE_H
// Qt
#include <QItemDelegate>
@ -32,11 +32,11 @@ class LayoutManager;
class SettingsDialog;
}
class ActivityCmbBoxDelegate : public QItemDelegate
class ActivitiesDelegate : public QItemDelegate
{
Q_OBJECT
public:
ActivityCmbBoxDelegate(QObject *parent);
ActivitiesDelegate(QObject *parent);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setEditorData(QWidget *editor, const QModelIndex &index) const;
@ -45,9 +45,13 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
private:
QString assignedActivitiesText(const QModelIndex &index) const;
void updateButton(QWidget *editor) const;
QString joinedActivities(const QStringList &activities, bool boldForActive = true) const;
private:
Latte::SettingsDialog *m_settingsDialog{nullptr};
};
#endif

4
app/settings/settingsdialog.cpp
Unescape Escape View File

@ -31,9 +31,9 @@
#include "../layout/centrallayout.h"
#include "../liblatte2/types.h"
#include "../plasma/extended/theme.h"
#include "delegates/activitiesdelegate.h"
#include "delegates/checkboxdelegate.h"
#include "delegates/colorcmbboxdelegate.h"
#include "delegates/activitycmbboxdelegate.h"
#include "delegates/layoutnamedelegate.h"
#include "delegates/shareddelegate.h"
@ -121,7 +121,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona)
ui->layoutsView->setItemDelegateForColumn(COLORCOLUMN, new ColorCmbBoxDelegate(this, iconsPath, colors));
ui->layoutsView->setItemDelegateForColumn(MENUCOLUMN, new CheckBoxDelegate(this));
ui->layoutsView->setItemDelegateForColumn(BORDERSCOLUMN, new CheckBoxDelegate(this));
ui->layoutsView->setItemDelegateForColumn(ACTIVITYCOLUMN, new ActivityCmbBoxDelegate(this));
ui->layoutsView->setItemDelegateForColumn(ACTIVITYCOLUMN, new ActivitiesDelegate(this));
ui->layoutsView->setItemDelegateForColumn(SHAREDCOLUMN, new SharedDelegate(this));
m_inMemoryButtons = new QButtonGroup(this);

Write Preview
Loading…
Cancel
Save