Skip to content

Commit

Permalink
Refactor project lists into one combined list
Browse files Browse the repository at this point in the history
  • Loading branch information
@KjellMorgenstern
Kjell Morgenstern authored and KjellMorgenstern committed Dec 12, 2023
1 parent 247d9f9 commit c9420ca
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 36 deletions.
134 changes: 100 additions & 34 deletions src/sketch/welcomeview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,66 @@ QString cleanData(const QString & data) {

////////////////////////////////////////////////////////////////////////////////

CustomListItem::CustomListItem(const QString &leftText, const QIcon &leftIcon, const QString &leftData,
const QString &rightText, const QIcon &rightIcon, const QString &rightData,
int listWidgetWidth, QWidget *parent)
: QWidget(parent), leftData(leftData), rightData(rightData) {
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0); // Remove layout margins
layout->setSpacing(0); // Remove spacing between buttons

leftButton = new QPushButton(leftIcon, "", this);
rightButton = new QPushButton(rightIcon, "", this);

leftButton->setFlat(true);
rightButton->setFlat(true);

QPalette buttonPalette = leftButton->palette();
buttonPalette.setColor(QPalette::ButtonText, Qt::black);
leftButton->setPalette(buttonPalette);
rightButton->setPalette(buttonPalette);

// Calculate button width taking into account the scrollbar width
int scrollbarWidth = this->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
int leftButtonWidth = static_cast<int>((listWidgetWidth - scrollbarWidth) * 0.6);
int rightButtonWidth = static_cast<int>((listWidgetWidth - scrollbarWidth) * 0.4);

// Set fixed width for buttons
leftButton->setFixedWidth(leftButtonWidth);
rightButton->setFixedWidth(rightButtonWidth);

// Use QFontMetrics to elide text
QFontMetrics metrics(leftButton->font());
QString elidedLeftText = metrics.elidedText(leftText, Qt::ElideRight, leftButtonWidth);
QString elidedRightText = metrics.elidedText(rightText, Qt::ElideRight, rightButtonWidth);

// Set the elided text and tooltips
leftButton->setText(elidedLeftText);
leftButton->setToolTip(leftData);
rightButton->setText(elidedRightText);
rightButton->setToolTip(rightData);

// Add buttons to layout
layout->addWidget(leftButton);
layout->addWidget(rightButton);

// Connect button signals to slots
connect(leftButton, &QPushButton::clicked, this, &CustomListItem::onLeftButtonClicked);
connect(rightButton, &QPushButton::clicked, this, &CustomListItem::onRightButtonClicked);

setLayout(layout);
}

void CustomListItem::onLeftButtonClicked() {
emit leftItemClicked(leftData);
}

void CustomListItem::onRightButtonClicked() {
emit rightItemClicked(rightData);
}

////////////////////////////////////////////////////////////////////////////////

BlogListWidget::BlogListWidget(QWidget * parent) : QListWidget(parent)
{
connect(this, SIGNAL(itemEntered(QListWidgetItem *)), this, SLOT(itemEnteredSlot(QListWidgetItem *)));
Expand Down Expand Up @@ -384,20 +444,13 @@ QWidget * WelcomeView::initRecent() {
frameLayout->addWidget(titleFrame);

m_recentListWidget = new QListWidget();
m_recentLinksListWidget = new QListWidget();
m_recentListWidget->setObjectName("recentList");
m_recentLinksListWidget->setObjectName("recentList");
m_recentListWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_recentLinksListWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
connect(m_recentListWidget, SIGNAL(itemClicked (QListWidgetItem *)), this, SLOT(recentItemClicked(QListWidgetItem *)));
connect(m_recentLinksListWidget, SIGNAL(itemClicked (QListWidgetItem *)), this, SLOT(blogItemClicked(QListWidgetItem *)));


auto * listsFrame = new QFrame;
auto * listsFrameLayout = new QHBoxLayout;
zeroMargin(listsFrameLayout);
listsFrameLayout->addWidget(m_recentListWidget);
listsFrameLayout->addWidget(m_recentLinksListWidget);
listsFrame ->setLayout(listsFrameLayout);
frameLayout->addWidget(listsFrame);

Expand Down Expand Up @@ -670,58 +723,67 @@ void WelcomeView::showEvent(QShowEvent * event) {

void WelcomeView::updateRecent() {
if (!m_recentListWidget) return;
if (!m_recentLinksListWidget) return;

QSettings settings;
auto files = settings.value("recentFileList").toStringList();
m_recentListWidget->clear();
m_recentLinksListWidget->clear();
int listWidgetWidth = m_recentListWidget->width();

auto gotOne = false;

QIcon icon(":/resources/images/icons/WS-fzz-icon.png");
QIcon defaultIcon(":/resources/images/icons/WS-fzz-icon.png");
QIcon aislerIcon(":/resources/images/icons/aisler_donut-cloud_logo_icon.png");

for (int i = 0; i < files.size(); ++i) {
QFileInfo finfo(files[i]);
if (!finfo.exists()) continue;

gotOne = true;
auto *item = new QListWidgetItem(icon, finfo.fileName());
QListWidgetItem * itemLinks = nullptr;
item->setData(Qt::UserRole, finfo.absoluteFilePath());
item->setToolTip(finfo.absoluteFilePath());
QString leftText = finfo.fileName();
QString leftData = finfo.absoluteFilePath();

settings.beginGroup("sketches");
QVariant settingValue = settings.value(finfo.absoluteFilePath());
settings.endGroup();

QString rightText;
QIcon rightIcon;
QString rightData;

if (settingValue.isValid() && !settingValue.isNull()) {
auto [fabName, link] = settingValue.value<UploadPair>();
if (link.endsWith(QChar('/'))) {
link.chop(1); // Remove the last character
}

QFontMetrics fm(m_recentLinksListWidget->font());
int textHeight = fm.height();
auto pixmap = SqliteReferenceModel().retrieveIcon(fabName);
QPixmap scaledPixmap = pixmap.scaledToHeight(textHeight, Qt::SmoothTransformation);
QIcon fabIcon(scaledPixmap);
itemLinks = new QListWidgetItem(fabIcon, QString("%1 Project").arg(fabName));
itemLinks->setData(RefRole, link);
itemLinks->setToolTip(link);
} else {
itemLinks = new QListWidgetItem(QString(""));
rightText = QString("%1 Project").arg(fabName);
rightData = link; // Data for the right button click
QPixmap pixmap = SqliteReferenceModel().retrieveIcon(fabName);
if (!pixmap.isNull()) {
rightIcon = QIcon(pixmap);
} else {
if (fabName.compare("Aisler", Qt::CaseInsensitive) == 0) {
rightIcon = aislerIcon;
}
}
}

m_recentListWidget->addItem(item);
m_recentLinksListWidget->addItem(itemLinks);
CustomListItem *customItem = new CustomListItem(leftText, defaultIcon, leftData,
rightText, rightIcon, rightData, listWidgetWidth);
connect(customItem, &CustomListItem::leftItemClicked, this, &WelcomeView::recentSketchClicked);
connect(customItem, &CustomListItem::rightItemClicked, this, &WelcomeView::uploadLinkClicked);

QListWidgetItem *item = new QListWidgetItem(m_recentListWidget);
item->setSizeHint(customItem->sizeHint());
m_recentListWidget->setItemWidget(item, customItem);
}

if (!gotOne) {
// put in a placeholder if there are no recent files
auto *item = new QListWidgetItem(icon, tr("No recent sketches found"));
item->setData(Qt::UserRole, "");
m_recentListWidget->addItem(item);
CustomListItem *emptyItem = new CustomListItem(tr("No recent sketches found"), defaultIcon, QString(),
QString(), QIcon(), QString(), listWidgetWidth);
QListWidgetItem *item = new QListWidgetItem(m_recentListWidget);
item->setSizeHint(emptyItem->sizeHint());
m_recentListWidget->setItemWidget(item, emptyItem);
}
}

Expand Down Expand Up @@ -1033,13 +1095,17 @@ void WelcomeView::nextTip() {
m_tip->setText(QString("<a href='tip' style='text-decoration:none; color:#2e94af;'>%1</a>").arg(TipsAndTricks::randomTip()));
}

void WelcomeView::recentItemClicked(QListWidgetItem * item) {
QString data = item->data(Qt::UserRole).toString();
if (data.isEmpty()) return;

void WelcomeView::recentSketchClicked(const QString &data) {
if (!data.isEmpty()) {
Q_EMIT recentSketch(data, data);
}
}

void WelcomeView::uploadLinkClicked(const QString &data) {
if (!data.isEmpty()) {
QDesktopServices::openUrl(QUrl(data));
}
}

void WelcomeView::blogItemClicked(QListWidgetItem * item) {
QString url = item->data(RefRole).toString();
Expand Down
29 changes: 27 additions & 2 deletions src/sketch/welcomeview.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,31 @@ along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
#include <QListWidget>
#include <QPainter>
#include <QAbstractItemDelegate>
#include <QPushButton>
#include <QHBoxLayout>

class CustomListItem : public QWidget {
Q_OBJECT

public:
explicit CustomListItem(const QString &leftText, const QIcon &leftIcon, const QString &leftData,
const QString &rightText, const QIcon &rightIcon, const QString &rightData,
int listWidgetWidth, QWidget *parent = nullptr);

signals:
void leftItemClicked(const QString &data);
void rightItemClicked(const QString &data);

private slots:
void onLeftButtonClicked();
void onRightButtonClicked();

private:
QPushButton *leftButton;
QPushButton *rightButton;
QString leftData;
QString rightData;
};

class BlogListWidget : public QListWidget
{
Expand Down Expand Up @@ -142,7 +167,8 @@ protected Q_SLOTS:
void gotBlogSnippet(QNetworkReply *);
void gotBlogImage(QNetworkReply *);
void clickBlog(const QString &);
void recentItemClicked(QListWidgetItem *);
void recentSketchClicked(const QString &data);
void uploadLinkClicked(const QString &data);
void blogItemClicked(QListWidgetItem *);
void nextTip();

Expand All @@ -153,7 +179,6 @@ protected Q_SLOTS:
QWidget * m_projectsUberFrame = nullptr;
QLabel * m_tip = nullptr;
QListWidget * m_recentListWidget = nullptr;
QListWidget * m_recentLinksListWidget = nullptr;
QWidget * m_fabUberFrame = nullptr;
QWidget * m_shopUberFrame = nullptr;
QLabel * m_projectsLabel = nullptr;
Expand Down

0 comments on commit c9420ca

Please sign in to comment.