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

enable global shortcuts for universal settings

Browse Source
This commit is contained in:
Michail Vourlakos 2018-01-27 02:52:31 +02:00
parent d97a819bc1
commit 4212d57ca7
12 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/dockconfigview.cpp
View File

@ -450,15 +450,6 @@ void DockConfigView::hideConfigWindow()
}
}
void DockConfigView::showLatteConfigWindow()
{
auto *dockCorona = qobject_cast<DockCorona *>(m_dockView->corona());
if (dockCorona) {
dockCorona->layoutManager()->showLatteConfigDialog();
}
}
void DockConfigView::updateLaunchersForGroup(int groupInt)
{
Dock::LaunchersGroup group = (Dock::LaunchersGroup)groupInt;

1
app/dockconfigview.h
View File

@ -74,7 +74,6 @@ public slots:
Q_INVOKABLE void hideConfigWindow();
Q_INVOKABLE void setSticker(bool blockFocusLost);
Q_INVOKABLE void setVisibleWindow(bool visible);
Q_INVOKABLE void showLatteConfigWindow();
Q_INVOKABLE void syncGeometry();
Q_INVOKABLE void updateLaunchersForGroup(int groupInt);

2
app/dockview.cpp
View File

@ -2235,7 +2235,7 @@ void DockView::addContainmentActions(QMenu *desktopMenu, QEvent *event)
QAction *editLayoutsAction = new QAction(i18n("Configure..."), layoutsMenu);
connect(editLayoutsAction, &QAction::triggered, this, [this, dockCorona] {
dockCorona->layoutManager()->showLatteConfigDialog();
dockCorona->layoutManager()->showLatteConfigDialog(Dock::LayoutPage);
});
layoutsMenu->addAction(editLayoutsAction);

25
app/globalshortcuts.cpp
View File

@ -171,7 +171,7 @@ void GlobalShortcuts::init()
//show-hide the main dock in the primary screen
QAction *showAction = generalActions->addAction(QStringLiteral("show latte dock"));
showAction->setText(i18n("Show Latte Dock"));
showAction->setText(i18n("Show Dock"));
showAction->setShortcut(QKeySequence(Qt::META + '`'));
KGlobalAccel::setGlobalShortcut(showAction, QKeySequence(Qt::META + '`'));
connect(showAction, &QAction::triggered, this, [this]() {
@ -187,14 +187,22 @@ void GlobalShortcuts::init()
});
//show the layouts editor
QAction *layoutsAction = generalActions->addAction(QStringLiteral("show latte settings"));
layoutsAction->setText(i18n("Show Latte Settings Window"));
layoutsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_E));
KGlobalAccel::setGlobalShortcut(layoutsAction, QKeySequence(Qt::META + Qt::Key_E));
QAction *layoutsAction = generalActions->addAction(QStringLiteral("show layout settings"));
layoutsAction->setText(i18n("Show Layout Settings"));
layoutsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_W));
KGlobalAccel::setGlobalShortcut(layoutsAction, QKeySequence(Qt::META + Qt::Key_W));
connect(layoutsAction, &QAction::triggered, this, [this]() {
showLatteConfigDialog();
m_corona->layoutManager()->showLatteConfigDialog(Dock::LayoutPage);
});
//show the latter universal settings
QAction *universalSettingsAction = generalActions->addAction(QStringLiteral("show latte universal settings"));
universalSettingsAction->setText(i18n("Show Latte Settings"));
universalSettingsAction->setShortcut(QKeySequence(Qt::META + Qt::Key_E));
KGlobalAccel::setGlobalShortcut(universalSettingsAction, QKeySequence(Qt::META + Qt::Key_E));
connect(universalSettingsAction, &QAction::triggered, this, [this]() {
m_corona->layoutManager()->showLatteConfigDialog(Dock::PreferencesPage);
});
KActionCollection *taskbarActions = new KActionCollection(m_corona);
@ -490,11 +498,6 @@ void GlobalShortcuts::showDock()
}
}
void GlobalShortcuts::showLatteConfigDialog()
{
m_corona->layoutManager()->showLatteConfigDialog();
}
bool GlobalShortcuts::dockAtLowerScreenPriority(DockView *test, DockView *base)
{
if (!base || ! test) {

1
app/globalshortcuts.h
View File

@ -52,7 +52,6 @@ private:
void activateTaskManagerEntry(int index, Qt::Key modifier);
void showDock();
void hideDock();
void showLatteConfigDialog();
void showSettings();
bool dockAtLowerEdgePriority(DockView *test, DockView *base);

9
app/latteconfigdialog.cpp
View File

@ -183,6 +183,15 @@ QStringList LatteConfigDialog::availableActivities()
return m_availableActivities;
}
void LatteConfigDialog::setCurrentPage(Dock::LatteConfigPage page)
{
if (page == Dock::LayoutPage) {
ui->tabWidget->setCurrentIndex(0);
} else if (page == Dock::PreferencesPage) {
ui->tabWidget->setCurrentIndex(1);
}
}
void LatteConfigDialog::on_newButton_clicked()
{
qDebug() << Q_FUNC_INFO;

2
app/latteconfigdialog.h
View File

@ -52,6 +52,8 @@ public:
LatteConfigDialog(QWidget *parent, DockCorona *corona);
~LatteConfigDialog();
void setCurrentPage(Dock::LatteConfigPage page);
QStringList activities();
QStringList availableActivities();

4
app/latteconfigdialog.ui
View File

@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="layoutsTab">
<attribute name="title">
@ -102,7 +102,7 @@
<bool>false</bool>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool>

5
app/layoutmanager.cpp
View File

@ -1024,7 +1024,7 @@ bool LayoutManager::layoutIsAssigned(QString layoutName)
return false;
}
void LayoutManager::showLatteConfigDialog()
void LayoutManager::showLatteConfigDialog(int page)
{
if (!m_latteConfigDialog) {
m_latteConfigDialog = new LatteConfigDialog(nullptr, m_corona);
@ -1037,6 +1037,9 @@ void LayoutManager::showLatteConfigDialog()
m_latteConfigDialog->showNormal();
}
Dock::LatteConfigPage configPage = static_cast<Dock::LatteConfigPage>(page);
m_latteConfigDialog->setCurrentPage(configPage);
m_latteConfigDialog->activateWindow();
}

2
app/layoutmanager.h
View File

@ -106,7 +106,7 @@ public:
public slots:
void showAboutDialog();
Q_INVOKABLE void showLatteConfigDialog();
Q_INVOKABLE void showLatteConfigDialog(int page = Latte::Dock::LayoutPage);
//! switch to specified layout, default previousMemoryUsage means that it didnt change
Q_INVOKABLE bool switchToLayout(QString layoutName, int previousMemoryUsage = -1);

6
liblattedock/dock.h
View File

@ -124,6 +124,12 @@ public:
HighSensitivity
};
Q_ENUM(MouseSensitivity)
enum LatteConfigPage {
LayoutPage = 0,
PreferencesPage
};
Q_ENUM(LatteConfigPage)
};
}//end of namespace

3
shell/package/contents/configuration/LatteDockConfiguration.qml
View File

@ -217,7 +217,8 @@ FocusScope {
anchors.fill: parent
hoverEnabled: true
onClicked: dockConfig.showLatteConfigWindow()
readonly property int preferencesPage: Latte.Dock.PreferencesPage
onClicked: layoutManager.showLatteConfigDialog(preferencesPage)
}
}