kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-05 17:47:23 +03:00
Code Issues Projects Releases Wiki Activity

add menu/about in Latte Settings window

Browse Source
This commit is contained in:
Michail Vourlakos 2018-01-26 19:46:02 +02:00
parent fb3764e432
commit 1ab273753e
9 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/abstractwindowinterface.h
View File

@ -72,6 +72,7 @@ public:
virtual bool isOnCurrentActivity(WindowId wid) const = 0; virtual bool isOnCurrentActivity(WindowId wid) const = 0;
virtual const std::list<WindowId> &windows() const = 0; virtual const std::list<WindowId> &windows() const = 0;
virtual void setKeepAbove(const QDialog &dialog, bool above = true) const = 0;
virtual void skipTaskBar(const QDialog &dialog) const = 0; virtual void skipTaskBar(const QDialog &dialog) const = 0;
virtual void slideWindow(QWindow &view, Slide location) const = 0; virtual void slideWindow(QWindow &view, Slide location) const = 0;
virtual void enableBlurBehind(QWindow &view) const = 0; virtual void enableBlurBehind(QWindow &view) const = 0;

1
app/dockcorona.cpp
View File

@ -662,6 +662,7 @@ void DockCorona::aboutApplication()
aboutDialog = new KAboutApplicationDialog(KAboutData::applicationData()); aboutDialog = new KAboutApplicationDialog(KAboutData::applicationData());
connect(aboutDialog.data(), &QDialog::finished, aboutDialog.data(), &QObject::deleteLater); connect(aboutDialog.data(), &QDialog::finished, aboutDialog.data(), &QObject::deleteLater);
WindowSystem::self().skipTaskBar(*aboutDialog); WindowSystem::self().skipTaskBar(*aboutDialog);
WindowSystem::self().setKeepAbove(*aboutDialog, true);
aboutDialog->show(); aboutDialog->show();
} }

15
app/latteconfigdialog.cpp
View File

@ -31,6 +31,7 @@
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QHeaderView> #include <QHeaderView>
#include <QMenuBar>
#include <QMessageBox> #include <QMessageBox>
#include <QProcess> #include <QProcess>
#include <QStandardItem> #include <QStandardItem>
@ -118,6 +119,20 @@ LatteConfigDialog::LatteConfigDialog(QWidget *parent, LayoutManager *manager)
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true); ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
}); });
//! About Menu
QMenuBar *menuBar = new QMenuBar(this);
QMenuBar *rightAlignedMenuBar = new QMenuBar(menuBar);
layout()->setMenuBar(menuBar);
menuBar->setCornerWidget(rightAlignedMenuBar);
QMenu *helpMenu = new QMenu(i18n("Help"), rightAlignedMenuBar);
rightAlignedMenuBar->addMenu(helpMenu);
QAction *aboutAction = helpMenu->addAction(i18n("About Latte"));
aboutAction->setIcon(QIcon::fromTheme("latte-dock"));
connect(aboutAction, &QAction::triggered, m_manager, &LayoutManager::showAboutDialog);
} }
LatteConfigDialog::~LatteConfigDialog() LatteConfigDialog::~LatteConfigDialog()

5
app/layoutmanager.cpp
View File

@ -588,6 +588,11 @@ void LayoutManager::loadLatteLayout(QString layoutPath)
} }
} }
void LayoutManager::showAboutDialog()
{
m_corona->aboutApplication();
}
void LayoutManager::importLatteLayout(QString layoutPath) void LayoutManager::importLatteLayout(QString layoutPath)
{ {
//! This might not be needed as it is Layout responsibility //! This might not be needed as it is Layout responsibility

1
app/layoutmanager.h
View File

@ -105,6 +105,7 @@ public:
void importPresets(bool includeDefault = false); void importPresets(bool includeDefault = false);
public slots: public slots:
void showAboutDialog();
Q_INVOKABLE void showLatteConfigDialog(); Q_INVOKABLE void showLatteConfigDialog();
//! switch to specified layout, default previousMemoryUsage means that it didnt change //! switch to specified layout, default previousMemoryUsage means that it didnt change

9
app/waylandinterface.cpp
View File

@ -202,6 +202,15 @@ const std::list<WindowId> &WaylandInterface::windows() const
return m_windows; return m_windows;
} }
void WaylandInterface::setKeepAbove(const QDialog &dialog, bool above) const
{
if (above) {
KWindowSystem::setState(dialog.winId(), NET::KeepAbove);
} else {
KWindowSystem::clearState(dialog.winId(), NET::KeepAbove);
}
}
void WaylandInterface::skipTaskBar(const QDialog &dialog) const void WaylandInterface::skipTaskBar(const QDialog &dialog) const
{ {
KWindowSystem::setState(dialog.winId(), NET::SkipTaskbar); KWindowSystem::setState(dialog.winId(), NET::SkipTaskbar);

1
app/waylandinterface.h
View File

@ -67,6 +67,7 @@ public:
bool isOnCurrentActivity(WindowId wid) const override; bool isOnCurrentActivity(WindowId wid) const override;
const std::list<WindowId> &windows() const override; const std::list<WindowId> &windows() const override;
void setKeepAbove(const QDialog &dialog, bool above = true) const override;
void skipTaskBar(const QDialog &dialog) const override; void skipTaskBar(const QDialog &dialog) const override;
void slideWindow(QWindow &view, Slide location) const override; void slideWindow(QWindow &view, Slide location) const override;
void enableBlurBehind(QWindow &view) const override; void enableBlurBehind(QWindow &view) const override;

9
app/xwindowinterface.cpp
View File

@ -162,6 +162,15 @@ const std::list<WindowId> &XWindowInterface::windows() const
return m_windows; return m_windows;
} }
void XWindowInterface::setKeepAbove(const QDialog &dialog, bool above) const
{
if (above) {
KWindowSystem::setState(dialog.winId(), NET::KeepAbove);
} else {
KWindowSystem::clearState(dialog.winId(), NET::KeepAbove);
}
}
void XWindowInterface::skipTaskBar(const QDialog &dialog) const void XWindowInterface::skipTaskBar(const QDialog &dialog) const
{ {
KWindowSystem::setState(dialog.winId(), NET::SkipTaskbar); KWindowSystem::setState(dialog.winId(), NET::SkipTaskbar);

1
app/xwindowinterface.h
View File

@ -52,6 +52,7 @@ public:
bool isOnCurrentActivity(WindowId wid) const override; bool isOnCurrentActivity(WindowId wid) const override;
const std::list<WindowId> &windows() const override; const std::list<WindowId> &windows() const override;
void setKeepAbove(const QDialog &dialog, bool above = true) const override;
void skipTaskBar(const QDialog &dialog) const override; void skipTaskBar(const QDialog &dialog) const override;
void slideWindow(QWindow &view, Slide location) const override; void slideWindow(QWindow &view, Slide location) const override;
void enableBlurBehind(QWindow &view) const override; void enableBlurBehind(QWindow &view) const override;