kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-28 09:57:29 +03:00
Code Issues Projects Releases Wiki Activity

fix #980,support lock icon in layouts editor

Browse Source 
-- when a layout is read-only then a lock icon
appears in its layout record.
This commit is contained in:
Michail Vourlakos 2018-04-15 15:15:53 +03:00
parent 403117e044
commit 675bfe284d
5 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(lattedock-app_SRCS
layoutsDelegates/colorcmbboxdelegate.cpp
layoutsDelegates/colorcmbboxitemdelegate.cpp
layoutsDelegates/activitycmbboxdelegate.cpp
layoutsDelegates/layoutnamedelegate.cpp
dock/dockmenumanager.cpp
dock/dockview.cpp
dock/dockconfigview.cpp

34
app/layoutsDelegates/layoutnamedelegate.cpp Normal file
View File

@ -0,0 +1,34 @@
#include "layoutnamedelegate.h"
#include <QApplication>
#include <QDebug>
#include <QEvent>
#include <QKeyEvent>
#include <QMouseEvent>
#include <QPainter>
LayoutNameDelegate::LayoutNameDelegate(QObject *parent)
: QStyledItemDelegate(parent)
{
}
void LayoutNameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
QStyleOptionViewItem myOption = option;
bool isLocked = index.data(Qt::UserRole).toBool();
if (isLocked) {
int thick = option.rect.height();
myOption.rect.setWidth(option.rect.width() - thick);
QStyledItemDelegate::paint(painter, myOption, index);
QIcon lockIcon = QIcon::fromTheme("object-locked");
QRect destination(option.rect.x() + option.rect.width() - thick, option.rect.y(), thick, thick);
painter->drawPixmap(destination, lockIcon.pixmap(thick, thick));
} else {
QStyledItemDelegate::paint(painter, option, index);
}
}

8
app/layoutsDelegates/layoutnamedelegate.h Normal file
View File

@ -0,0 +1,8 @@
#include <QStyledItemDelegate>
class LayoutNameDelegate : public QStyledItemDelegate {
public:
LayoutNameDelegate(QObject *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
};

16
app/settingsdialog.cpp
View File

@ -31,6 +31,7 @@
#include "layoutsDelegates/checkboxdelegate.h"
#include "layoutsDelegates/colorcmbboxdelegate.h"
#include "layoutsDelegates/activitycmbboxdelegate.h"
#include "layoutsDelegates/layoutnamedelegate.h"
#include <QButtonGroup>
#include <QColorDialog>
@ -106,6 +107,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, DockCorona *corona)
colors.append(color);
}
ui->layoutsView->setItemDelegateForColumn(NAMECOLUMN, new LayoutNameDelegate(this));
ui->layoutsView->setItemDelegateForColumn(COLORCOLUMN, new ColorCmbBoxDelegate(this, iconsPath, colors));
ui->layoutsView->setItemDelegateForColumn(MENUCOLUMN, new CheckBoxDelegate(this));
ui->layoutsView->setItemDelegateForColumn(ACTIVITYCOLUMN, new ActivityCmbBoxDelegate(this));
@ -317,7 +319,7 @@ void SettingsDialog::on_copyButton_clicked()
Layout *settings = new Layout(this, copiedId);
m_layouts[copiedId] = settings;
insertLayoutInfoAtRow(row + 1, copiedId, color, textColor, layoutName, menu, QStringList());
insertLayoutInfoAtRow(row + 1, copiedId, color, textColor, layoutName, menu, QStringList(), false);
ui->layoutsView->selectRow(row + 1);
}
@ -736,15 +738,16 @@ void SettingsDialog::addLayoutForFile(QString file, QString layoutName, bool new
QString textColor = settings->textColor();
QString background = settings->background();
bool menu = settings->showInMenu();
bool locked = !settings->isWritable();
layoutName = uniqueLayoutName(layoutName);
int row = ascendingRowFor(layoutName);
if (background.isEmpty()) {
insertLayoutInfoAtRow(row, copiedId, color, QString(), layoutName, menu, QStringList());
insertLayoutInfoAtRow(row, copiedId, color, QString(), layoutName, menu, QStringList(), locked);
} else {
insertLayoutInfoAtRow(row, copiedId, background, textColor, layoutName, menu, QStringList());
insertLayoutInfoAtRow(row, copiedId, background, textColor, layoutName, menu, QStringList(), locked);
}
ui->layoutsView->selectRow(row);
@ -780,10 +783,10 @@ void SettingsDialog::loadSettings()
if (background.isEmpty()) {
insertLayoutInfoAtRow(i, layoutPath, layoutSets->color(), QString(), layoutSets->name(),
layoutSets->showInMenu(), layoutSets->activities());
layoutSets->showInMenu(), layoutSets->activities(), !layoutSets->isWritable());
} else {
insertLayoutInfoAtRow(i, layoutPath, background, layoutSets->textColor(), layoutSets->name(),
layoutSets->showInMenu(), layoutSets->activities());
layoutSets->showInMenu(), layoutSets->activities(), !layoutSets->isWritable());
}
qDebug() << "counter:" << i << " total:" << m_model->rowCount();
@ -894,7 +897,7 @@ QStringList SettingsDialog::currentLayoutsSettings()
}
void SettingsDialog::insertLayoutInfoAtRow(int row, QString path, QString color, QString textColor, QString name, bool menu, QStringList activities)
void SettingsDialog::insertLayoutInfoAtRow(int row, QString path, QString color, QString textColor, QString name, bool menu, QStringList activities, bool locked)
{
QStandardItem *pathItem = new QStandardItem(path);
@ -951,6 +954,7 @@ void SettingsDialog::insertLayoutInfoAtRow(int row, QString path, QString color,
m_model->setData(m_model->index(row, NAMECOLUMN), QVariant(name), Qt::DisplayRole);
m_model->setData(m_model->index(row, NAMECOLUMN), font, Qt::FontRole);
m_model->setData(m_model->index(row, NAMECOLUMN), QVariant(locked), Qt::UserRole);
m_model->setData(m_model->index(row, ACTIVITYCOLUMN), activities, Qt::UserRole);
}

2
app/settingsdialog.h
View File

@ -88,7 +88,7 @@ private:
void blockDeleteOnActivityStopped();
void loadSettings();
void recalculateAvailableActivities();
void insertLayoutInfoAtRow(int row, QString path, QString color, QString textColor, QString name, bool menu, QStringList activities);
void insertLayoutInfoAtRow(int row, QString path, QString color, QString textColor, QString name, bool menu, QStringList activities, bool locked = false);
void updateApplyButtonsState();
bool dataAreAccepted();