Skip to content

Commit

Permalink
Minor GUI cleanup for Fancy Menu
Browse files Browse the repository at this point in the history
 1. Tooltips of categories are removed because they were the same as displayed names and only disruptive.
 2. The icon of config center button is corrected (its text was already corrected by @@stefonarch in ed50e7a).
 3. About button is added.
  • Loading branch information
tsujan committed Jan 23, 2024
1 parent bec44a5 commit bec10e1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
1 change: 0 additions & 1 deletion plugin-fancymenu/lxqtfancymenucategoriesmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ QVariant LXQtFancyMenuCategoriesModel::data(const QModelIndex &idx, int role) co
switch (role)
{
case Qt::DisplayRole:
case Qt::ToolTipRole:
return item.menuTitle;
case Qt::EditRole:
return item.menuName;
Expand Down
15 changes: 14 additions & 1 deletion plugin-fancymenu/lxqtfancymenuwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent)
connect(mSearchEdit, &QLineEdit::returnPressed, this, &LXQtFancyMenuWindow::activateCurrentApp);

mSettingsButton = new QToolButton;
mSettingsButton->setIcon(XdgIcon::fromTheme(QStringLiteral("preferences-desktop"))); //TODO: preferences-system?
mSettingsButton->setIcon(XdgIcon::fromTheme(QStringLiteral("preferences-system")));
mSettingsButton->setText(tr("LXQt Configuration Center"));
mSettingsButton->setToolTip(mSettingsButton->text());
connect(mSettingsButton, &QToolButton::clicked, this, &LXQtFancyMenuWindow::runSystemConfigDialog);
Expand All @@ -166,6 +166,12 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent)
mPowerButton->setToolTip(mPowerButton->text());
connect(mPowerButton, &QToolButton::clicked, this, &LXQtFancyMenuWindow::runPowerDialog);

mAboutButton = new QToolButton;
mAboutButton->setIcon(XdgIcon::fromTheme(QStringLiteral("lxqt-about")));
mAboutButton->setText(tr("About LXQt"));
mAboutButton->setToolTip(mAboutButton->text());
connect(mAboutButton, &QToolButton::clicked, this, &LXQtFancyMenuWindow::runAboutgDialog);

mAppView = new QListView;
mAppView->setObjectName(QStringLiteral("AppView"));
mAppView->setSelectionMode(QListView::SingleSelection);
Expand Down Expand Up @@ -207,6 +213,7 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent)
mMainLayout->addLayout(mViewLayout);

mButtonsLayout = new QHBoxLayout;
mButtonsLayout->addWidget(mAboutButton);
mButtonsLayout->addStretch();
mButtonsLayout->addWidget(mSettingsButton);
mButtonsLayout->addWidget(mPowerButton);
Expand Down Expand Up @@ -295,6 +302,11 @@ void LXQtFancyMenuWindow::runSystemConfigDialog()
runCommandHelper(QLatin1String("lxqt-config"));
}

void LXQtFancyMenuWindow::runAboutgDialog()
{
runCommandHelper(QLatin1String("lxqt-about"));
}

void LXQtFancyMenuWindow::onAppViewCustomMenu(const QPoint& p)
{
QModelIndex idx = mAppView->indexAt(p);
Expand Down Expand Up @@ -602,6 +614,7 @@ void LXQtFancyMenuWindow::updateButtonIconSize()
const QSize iconSize(sz, sz);
mSettingsButton->setIconSize(iconSize);
mPowerButton->setIconSize(iconSize);
mAboutButton->setIconSize(iconSize);
}

void LXQtFancyMenuWindow::setSearchEditFocus()
Expand Down
2 changes: 2 additions & 0 deletions plugin-fancymenu/lxqtfancymenuwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ private slots:

void runPowerDialog();
void runSystemConfigDialog();
void runAboutgDialog();

void onAppViewCustomMenu(const QPoint &p);

Expand All @@ -133,6 +134,7 @@ private slots:

QToolButton *mSettingsButton;
QToolButton *mPowerButton;
QToolButton *mAboutButton;
QLineEdit *mSearchEdit;
QListView *mAppView;
QListView *mCategoryView;
Expand Down

0 comments on commit bec10e1

Please sign in to comment.