Lubuntu
/
lxqt-panel-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an autoexpansion feature to the spacer plugin.

Browse Source
ubuntu/cosmic
Simon Quigley 6 years ago
parent 82ed4f2785
commit 03ff318661
6 changed files with 497 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
debian/changelog vendored
Unescape View File

@ -2,6 +2,7 @@ lxqt-panel (0.13.0-0ubuntu4) UNRELEASED; urgency=medium
* Change the Uploaders to Ubuntu uploaders.
* Update Standards-version to 4.2.0, no changes needed.
* Add an autoexpansion feature to the spacer plugin.
-- Simon Quigley <tsimonq2@ubuntu.com> Thu, 16 Aug 2018 16:07:44 -0500

105
debian/patches/add-autoexpansion-1.patch vendored
Unescape View File

@ -0,0 +1,105 @@
Description: Allow plugin's "static" configration change
This is patch 1/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:6fbe184
Last-Update: 2018-08-16
--- a/panel/ilxqtpanel.h
+++ b/panel/ilxqtpanel.h
@@ -110,6 +110,16 @@ public:
*
*/
virtual void willShowWindow(QWidget * w) = 0;
+
+ /*!
+ * \brief By calling this function, a plugin notifies the panel about change of it's "static"
+ * configuration
+ *
+ * \param plugin the changed plugin
+ *
+ * \sa ILXQtPanelPlugin::isSeparate(), ILXQtPanelPlugin::isExpandable
+ */
+ virtual void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) = 0;
};
#endif // ILXQTPANEL_H
--- a/panel/ilxqtpanelplugin.h
+++ b/panel/ilxqtpanelplugin.h
@@ -196,6 +196,17 @@ public:
mPanel->willShowWindow(w);
}
+ /*!
+ * \brief By calling this function, a plugin notifies the panel about change of it's "static"
+ * configuration
+ *
+ * \sa isSeparate(), isExpandable
+ */
+ inline void pluginFlagsChanged()
+ {
+ mPanel->pluginFlagsChanged(this);
+ }
+
virtual bool isSeparate() const { return false; }
virtual bool isExpandable() const { return false; }
private:
--- a/panel/lxqtpanel.cpp
+++ b/panel/lxqtpanel.cpp
@@ -1225,6 +1225,14 @@ void LXQtPanel::willShowWindow(QWidget *
/************************************************
************************************************/
+void LXQtPanel::pluginFlagsChanged(const ILXQtPanelPlugin * /*plugin*/)
+{
+ mLayout->rebuild();
+}
+
+/************************************************
+
+ ************************************************/
QString LXQtPanel::qssPosition() const
{
return positionToStr(position());
--- a/panel/lxqtpanel.h
+++ b/panel/lxqtpanel.h
@@ -146,6 +146,7 @@ public:
QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const override;
QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override;
void willShowWindow(QWidget * w) override;
+ void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) override;
// ........ end of ILXQtPanel overrides
/**
--- a/panel/lxqtpanellayout.cpp
+++ b/panel/lxqtpanellayout.cpp
@@ -946,6 +946,16 @@ void LXQtPanelLayout::setLineCount(int v
/************************************************
************************************************/
+void LXQtPanelLayout::rebuild()
+{
+ mLeftGrid->rebuild();
+ mRightGrid->rebuild();
+}
+
+
+/************************************************
+
+ ************************************************/
int LXQtPanelLayout::lineSize() const
{
return mLeftGrid->lineSize();
--- a/panel/lxqtpanellayout.h
+++ b/panel/lxqtpanellayout.h
@@ -73,6 +73,10 @@ public:
ILXQtPanel::Position position() const { return mPosition; }
void setPosition(ILXQtPanel::Position value);
+ /*! \brief Force the layout to re-read items/plugins "static" configuration
+ */
+ void rebuild();
+
static bool itemIsSeparate(QLayoutItem *item);
signals:
void pluginMoved(Plugin * plugin);

35
debian/patches/add-autoexpansion-2.patch vendored
Unescape View File

@ -0,0 +1,35 @@
Description: Add "override" to declarations
This is patch 2/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:764aadd
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -57,18 +57,18 @@ class Spacer : public QObject, public I
public:
Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
- virtual QWidget *widget() { return &mSpacer; }
- virtual QString themeId() const { return "Spacer"; }
+ virtual QWidget *widget() override { return &mSpacer; }
+ virtual QString themeId() const override { return "Spacer"; }
- bool isSeparate() const { return true; }
+ bool isSeparate() const override { return true; }
- virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; }
- QDialog *configureDialog();
+ virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
+ QDialog *configureDialog() override;
- virtual void realign();
+ virtual void realign() override;
private slots:
- virtual void settingsChanged();
+ virtual void settingsChanged() override;
private:
void setSizes();

238
debian/patches/add-autoexpansion-3.patch vendored
Unescape View File

@ -0,0 +1,238 @@
Description: Add auto-expansion feature
This is patch 3/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:b57a178
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
+++ b/plugin-spacer/spacer.cpp
@@ -55,6 +55,7 @@ Spacer::Spacer(const ILXQtPanelPluginSta
QObject()
, ILXQtPanelPlugin(startupInfo)
, mSize(8)
+ , mExpandable(false)
{
settingsChanged();
}
@@ -65,8 +66,12 @@ Spacer::Spacer(const ILXQtPanelPluginSta
void Spacer::settingsChanged()
{
mSize = settings()->value("size", 8).toInt();
+ const bool old_expandable = mExpandable;
+ mExpandable = settings()->value("expandable", false).toBool();
mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
setSizes();
+ if (old_expandable != mExpandable)
+ pluginFlagsChanged();
}
/************************************************
@@ -82,21 +87,30 @@ QDialog *Spacer::configureDialog()
************************************************/
void Spacer::setSizes()
{
- if (panel()->isHorizontal())
+ if (mExpandable)
{
- mSpacer.setOrientation("horizontal");
- mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
- mSpacer.setFixedWidth(mSize);
- mSpacer.setMinimumHeight(0);
- mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
- }
- else
+ mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ mSpacer.setMinimumSize({1, 1});
+ mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
+ mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
+ } else
{
- mSpacer.setOrientation("vertical");
- mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- mSpacer.setFixedHeight(mSize);
- mSpacer.setMinimumWidth(0);
- mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
+ if (panel()->isHorizontal())
+ {
+ mSpacer.setOrientation("horizontal");
+ mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+ mSpacer.setFixedWidth(mSize);
+ mSpacer.setMinimumHeight(0);
+ mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
+ }
+ else
+ {
+ mSpacer.setOrientation("vertical");
+ mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ mSpacer.setFixedHeight(mSize);
+ mSpacer.setMinimumWidth(0);
+ mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
+ }
}
}
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -61,6 +61,7 @@ public:
virtual QString themeId() const override { return "Spacer"; }
bool isSeparate() const override { return true; }
+ bool isExpandable() const override { return mExpandable; }
virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
QDialog *configureDialog() override;
@@ -76,6 +77,7 @@ private:
private:
SpacerWidget mSpacer;
int mSize;
+ int mExpandable;
};
class SpacerPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
--- a/plugin-spacer/spacerconfiguration.cpp
+++ b/plugin-spacer/spacerconfiguration.cpp
@@ -52,6 +52,8 @@ SpacerConfiguration::SpacerConfiguration
connect(ui->sizeSB, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &SpacerConfiguration::sizeChanged);
connect(ui->typeCB, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), this, &SpacerConfiguration::typeChanged);
+ //Note: if there will be more than 2 radio buttons for width/size type, this simple setting logic will break
+ connect(ui->sizeExpandRB, &QAbstractButton::toggled, this, &SpacerConfiguration::widthTypeChanged);
}
SpacerConfiguration::~SpacerConfiguration()
@@ -63,6 +65,10 @@ void SpacerConfiguration::loadSettings()
{
ui->sizeSB->setValue(settings().value("size", 8).toInt());
ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
+ const bool expandable = settings().value("expandable", false).toBool();
+ ui->sizeExpandRB->setChecked(expandable);
+ ui->sizeFixedRB->setChecked(!expandable);
+ ui->sizeSB->setDisabled(expandable);
}
void SpacerConfiguration::sizeChanged(int value)
@@ -74,3 +80,8 @@ void SpacerConfiguration::typeChanged(in
{
settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
}
+
+void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
+{
+ settings().setValue("expandable", expandableChecked);
+}
--- a/plugin-spacer/spacerconfiguration.h
+++ b/plugin-spacer/spacerconfiguration.h
@@ -58,6 +58,7 @@ private slots:
void loadSettings();
void sizeChanged(int value);
void typeChanged(int index);
+ void widthTypeChanged(bool expandableChecked);
};
#endif // SPACERCONFIGURATION_H
--- a/plugin-spacer/spacerconfiguration.ui
+++ b/plugin-spacer/spacerconfiguration.ui
@@ -6,6 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
+ <width>289</width>
+ <height>135</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +21,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="0" column="2">
<widget class="QSpinBox" name="sizeSB">
<property name="minimum">
<number>4</number>
@@ -32,21 +34,14 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="labelType">
<property name="text">
<string>Space type:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="typeCB">
- <property name="editable">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
+ <item row="3" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -56,6 +51,27 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="sizeFixedRB">
+ <property name="text">
+ <string>fixed</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QComboBox" name="typeCB">
+ <property name="editable">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QRadioButton" name="sizeExpandRB">
+ <property name="text">
+ <string>expandable</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
@@ -65,6 +81,32 @@
<signal>clicked(QAbstractButton*)</signal>
<receiver>SpacerConfiguration</receiver>
<slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sizeFixedRB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>sizeSB</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>152</x>
+ <y>21</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>244</x>
+ <y>21</y>
+ </hint>
+ </hints>
</connection>
</connections>
</ui>

114
debian/patches/add-autoexpansion-4.patch vendored
Unescape View File

@ -0,0 +1,114 @@
Description: Use QStringLiteral whenever possible
This is patch 4/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:4908fcd
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
+++ b/plugin-spacer/spacer.cpp
@@ -65,10 +65,10 @@ Spacer::Spacer(const ILXQtPanelPluginSta
************************************************/
void Spacer::settingsChanged()
{
- mSize = settings()->value("size", 8).toInt();
+ mSize = settings()->value(QStringLiteral("size"), 8).toInt();
const bool old_expandable = mExpandable;
- mExpandable = settings()->value("expandable", false).toBool();
- mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
+ mExpandable = settings()->value(QStringLiteral("expandable"), false).toBool();
+ mSpacer.setType(settings()->value(QStringLiteral("spaceType"), SpacerConfiguration::msTypes[0]).toString());
setSizes();
if (old_expandable != mExpandable)
pluginFlagsChanged();
@@ -92,12 +92,12 @@ void Spacer::setSizes()
mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
mSpacer.setMinimumSize({1, 1});
mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
- mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
+ mSpacer.setOrientation(panel()->isHorizontal() ? QStringLiteral("horizontal") : QStringLiteral("vertical"));
} else
{
if (panel()->isHorizontal())
{
- mSpacer.setOrientation("horizontal");
+ mSpacer.setOrientation(QStringLiteral("horizontal"));
mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
mSpacer.setFixedWidth(mSize);
mSpacer.setMinimumHeight(0);
@@ -105,7 +105,7 @@ void Spacer::setSizes()
}
else
{
- mSpacer.setOrientation("vertical");
+ mSpacer.setOrientation(QStringLiteral("vertical"));
mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
mSpacer.setFixedHeight(mSize);
mSpacer.setMinimumWidth(0);
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -58,7 +58,7 @@ public:
Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
virtual QWidget *widget() override { return &mSpacer; }
- virtual QString themeId() const override { return "Spacer"; }
+ virtual QString themeId() const override { return QStringLiteral("Spacer"); }
bool isSeparate() const override { return true; }
bool isExpandable() const override { return mExpandable; }
--- a/plugin-spacer/spacerconfiguration.cpp
+++ b/plugin-spacer/spacerconfiguration.cpp
@@ -31,9 +31,9 @@
//Note: strings can't actually be translated here (in static initialization time)
// the QT_TR_NOOP here is just for qt translate tools to get the strings for translation
const QStringList SpacerConfiguration::msTypes = {
- QLatin1String(QT_TR_NOOP("lined"))
- , QLatin1String(QT_TR_NOOP("dotted"))
- , QLatin1String(QT_TR_NOOP("invisible"))
+ QStringLiteral(QT_TR_NOOP("lined"))
+ , QStringLiteral(QT_TR_NOOP("dotted"))
+ , QStringLiteral(QT_TR_NOOP("invisible"))
};
SpacerConfiguration::SpacerConfiguration(PluginSettings *settings, QWidget *parent) :
@@ -41,7 +41,7 @@ SpacerConfiguration::SpacerConfiguration
ui(new Ui::SpacerConfiguration)
{
setAttribute(Qt::WA_DeleteOnClose);
- setObjectName("SpacerConfigurationWindow");
+ setObjectName(QStringLiteral("SpacerConfigurationWindow"));
ui->setupUi(this);
//Note: translation is needed here in runtime (translator is attached already)
@@ -63,9 +63,9 @@ SpacerConfiguration::~SpacerConfiguratio
void SpacerConfiguration::loadSettings()
{
- ui->sizeSB->setValue(settings().value("size", 8).toInt());
- ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
- const bool expandable = settings().value("expandable", false).toBool();
+ ui->sizeSB->setValue(settings().value(QStringLiteral("size"), 8).toInt());
+ ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value(QStringLiteral("spaceType"), msTypes[0]).toString()));
+ const bool expandable = settings().value(QStringLiteral("expandable"), false).toBool();
ui->sizeExpandRB->setChecked(expandable);
ui->sizeFixedRB->setChecked(!expandable);
ui->sizeSB->setDisabled(expandable);
@@ -73,15 +73,15 @@ void SpacerConfiguration::loadSettings()
void SpacerConfiguration::sizeChanged(int value)
{
- settings().setValue("size", value);
+ settings().setValue(QStringLiteral("size"), value);
}
void SpacerConfiguration::typeChanged(int index)
{
- settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
+ settings().setValue(QStringLiteral("spaceType"), ui->typeCB->itemData(index, Qt::UserRole));
}
void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
{
- settings().setValue("expandable", expandableChecked);
+ settings().setValue(QStringLiteral("expandable"), expandableChecked);
}

4
debian/patches/series vendored
Unescape View File

@ -1,2 +1,6 @@
completely-remove-plugin-clock.patch
don't-autounmute-on-volume-change.patch
add-autoexpansion-1.patch
add-autoexpansion-2.patch
add-autoexpansion-3.patch
add-autoexpansion-4.patch

Write Preview
Loading…
Cancel
Save