From 3d6070778674e4c22134af0c48eb3f0bd40a38e1 Mon Sep 17 00:00:00 2001 From: fjs-github Date: Thu, 11 May 2017 12:18:55 -0500 Subject: Summary: The workspace information wasn't getting updated in the workspace-switcher-panel-plugin(wsp) when the workspace was changed via keyboard-shortcut, for example etc. Specifically, the tooltip for the wsp would show the incorrect number for the current workspace. Details: The wsp menu always did indicate the correct workspace number because the user has to click on the wsp to display the menu. The click-action sends a signal which updates the workspace info in the menu. But, the tooltip doesn't necessarily display the correct workspace number unless the user clicks on a workspace in the menu. To reproduce the problem: 1. The current workspace is workspace 1. 2. Change to a different workspace via keyboard-shortcut, for example . 3. Mouse-hover over the wsp and the tooltip displays the previous workspace number which is incorrect. Code Changes: The code changes are small and limited to the two source files in the desktopswitcher subdir. --- .../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp | 12 +++++++++--- .../src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.h | 1 + .../panel-plugins/desktopswitcher/LDesktopSwitcher.cpp | 10 ++++++++-- .../panel-plugins/desktopswitcher/LDesktopSwitcher.h | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp b/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp index c51e4b4a..8e0a9d28 100644 --- a/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp @@ -15,7 +15,7 @@ LDesktopSwitcher::LDesktopSwitcher(QWidget *parent, QString id, bool horizontal) label->setPopupMode(QToolButton::DelayedPopup); label->setAutoRaise(true); label->setToolButtonStyle(Qt::ToolButtonIconOnly); - label->setIcon( LXDG::findIcon("preferences-desktop-display-color", "") ); + label->setIcon( LXDG::findIcon("format-view-carousel", "preferences-desktop-display") ); label->setToolTip(QString("Workspace 1")); connect(label, SIGNAL(clicked()), this, SLOT(openMenu())); menu = new QMenu(this); @@ -29,6 +29,9 @@ LDesktopSwitcher::LDesktopSwitcher(QWidget *parent, QString id, bool horizontal) QTimer::singleShot(500, this, SLOT(createMenu()) ); //needs a delay to make sure it works right the first time QTimer::singleShot(0,this, SLOT(OrientationChange()) ); //adjust icon size + + //Process the signal which is sent when the workspace is changed via keyboard-shortcuts + connect(QApplication::instance(), SIGNAL(WorkspaceChanged()), this, SLOT(updateWorkspaceMenu())); } LDesktopSwitcher::~LDesktopSwitcher(){ @@ -133,10 +136,13 @@ void LDesktopSwitcher::createMenu() { if(i == cur){ name.prepend("*"); name.append("*");} //identify which desktop this is currently menu->addAction(newAction(i, name)); } + label->setToolTip(QString(tr("Workspace %1")).arg(QString::number(cur + 1))); } void LDesktopSwitcher::menuActionTriggered(QAction* act) { LSession::handle()->XCB->SetCurrentWorkspace(act->whatsThis().toInt()); - label->setToolTip(QString(tr("Workspace %1")).arg(act->whatsThis().toInt() +1)); - QTimer::singleShot(500, this, SLOT(createMenu()) ); //make sure the menu gets updated +} + +void LDesktopSwitcher::updateWorkspaceMenu() { + createMenu(); } diff --git a/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.h b/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.h index af9250b7..69fe46da 100644 --- a/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.h +++ b/src-qt5/core/lumina-desktop-unified/src-DE/panel-plugins/desktopswitcher/LDesktopSwitcher.h @@ -49,6 +49,7 @@ private slots: void openMenu(); void createMenu(); void menuActionTriggered(QAction*); + void updateWorkspaceMenu(); public slots: void LocaleChange(){ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp b/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp index a0c42774..8e0a9d28 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp @@ -29,6 +29,9 @@ LDesktopSwitcher::LDesktopSwitcher(QWidget *parent, QString id, bool horizontal) QTimer::singleShot(500, this, SLOT(createMenu()) ); //needs a delay to make sure it works right the first time QTimer::singleShot(0,this, SLOT(OrientationChange()) ); //adjust icon size + + //Process the signal which is sent when the workspace is changed via keyboard-shortcuts + connect(QApplication::instance(), SIGNAL(WorkspaceChanged()), this, SLOT(updateWorkspaceMenu())); } LDesktopSwitcher::~LDesktopSwitcher(){ @@ -133,10 +136,13 @@ void LDesktopSwitcher::createMenu() { if(i == cur){ name.prepend("*"); name.append("*");} //identify which desktop this is currently menu->addAction(newAction(i, name)); } + label->setToolTip(QString(tr("Workspace %1")).arg(QString::number(cur + 1))); } void LDesktopSwitcher::menuActionTriggered(QAction* act) { LSession::handle()->XCB->SetCurrentWorkspace(act->whatsThis().toInt()); - label->setToolTip(QString(tr("Workspace %1")).arg(act->whatsThis().toInt() +1)); - QTimer::singleShot(500, this, SLOT(createMenu()) ); //make sure the menu gets updated +} + +void LDesktopSwitcher::updateWorkspaceMenu() { + createMenu(); } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h b/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h index af9250b7..69fe46da 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h @@ -49,6 +49,7 @@ private slots: void openMenu(); void createMenu(); void menuActionTriggered(QAction*); + void updateWorkspaceMenu(); public slots: void LocaleChange(){ -- cgit From 20a8de05c90fda94f00816980322803e9e9d7327 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Fri, 19 May 2017 14:21:42 -0400 Subject: Update README.md Move TrueOS website link. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 81a8e20c..7803e6a5 100644 --- a/README.md +++ b/README.md @@ -113,8 +113,7 @@ A number of [Sphinx](http://www.sphinx-doc.org/en/stable/) generated reStructure ### TrueOS Handbook -TrueOS documentation is hosted on the [TrueOS website](https://www.trueos.org). -The [TrueOS User Guide](https://www.trueos.org/handbook/trueos.html) is a comprehensive guide to install TrueOS, along with post-installation configuration help, recommendations for useful utilities and applications, and a help and support section containing solutions for common issues and links to community and development chat channels for uncommon issues. There is also a chapter describing the experimental TrueOS Pico project and links to the Lumina and SysAdm documentation. +The [TrueOS User Guide](https://www.trueos.org/handbook/trueos.html) is a comprehensive guide to install TrueOS, along with post-installation configuration help, recommendations for useful utilities and applications, and a help and support section containing solutions for common issues and links to community and development chat channels for uncommon issues. There is also a chapter describing the experimental TrueOS Pico project and links to the Lumina and SysAdm documentation. All TrueOS documentation is hosted on the [TrueOS website](https://www.trueos.org). ### Lumina Handbook -- cgit From d94f36df7d5e57587abd1be851c773316aca5d6b Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Mon, 22 May 2017 10:03:43 +0000 Subject: Translated using Weblate (l_TE@da (generated)) Currently translated at 100.0% (61 of 61 strings) --- src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts index 56ee3f5c..df44c4fd 100644 --- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts +++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_da.ts @@ -45,7 +45,7 @@ Detach Tab - Løsriv faneblad + Løsriv faneblad @@ -122,7 +122,7 @@ Tabs Location - Fanebladsplacering + Fanebladsplacering -- cgit From 6013d58f331c19a2e1eb4e3decc21c24a3e46fa3 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Mon, 22 May 2017 10:04:42 +0000 Subject: Translated using Weblate (lumina_DESKTOP@da (generated)) Currently translated at 99.0% (317 of 320 strings) --- src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index 1c569599..b4905074 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -40,12 +40,12 @@ Launch %1 - Start %1 + Start %1 Open - Åbn + Åbn -- cgit From 96d4f163f8a27650c18627c757c54f52b4fbfb4d Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Mon, 22 May 2017 10:05:00 +0000 Subject: Translated using Weblate (lumina_DESKTOP@da (generated)) Currently translated at 100.0% (320 of 320 strings) --- src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index b4905074..655ee9e7 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -70,17 +70,17 @@ Copy - Kopiér + Kopiér Cut - Klip + Klip Delete - Slet + Slet -- cgit