|
|
|
@ -78,12 +78,12 @@
|
|
|
|
String is one of "Top", "Left", "Bottom", "Right", string is not case sensitive.
|
|
|
|
String is one of "Top", "Left", "Bottom", "Right", string is not case sensitive.
|
|
|
|
If the string is not correct, returns defaultValue.
|
|
|
|
If the string is not correct, returns defaultValue.
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
ILxQtPanel::Position LxQtPanel::strToPosition(const QString& str, ILxQtPanel::Position defaultValue)
|
|
|
|
ILXQtPanel::Position LXQtPanel::strToPosition(const QString& str, ILXQtPanel::Position defaultValue)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (str.toUpper() == "TOP") return LxQtPanel::PositionTop;
|
|
|
|
if (str.toUpper() == "TOP") return LXQtPanel::PositionTop;
|
|
|
|
if (str.toUpper() == "LEFT") return LxQtPanel::PositionLeft;
|
|
|
|
if (str.toUpper() == "LEFT") return LXQtPanel::PositionLeft;
|
|
|
|
if (str.toUpper() == "RIGHT") return LxQtPanel::PositionRight;
|
|
|
|
if (str.toUpper() == "RIGHT") return LXQtPanel::PositionRight;
|
|
|
|
if (str.toUpper() == "BOTTOM") return LxQtPanel::PositionBottom;
|
|
|
|
if (str.toUpper() == "BOTTOM") return LXQtPanel::PositionBottom;
|
|
|
|
return defaultValue;
|
|
|
|
return defaultValue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -91,17 +91,17 @@ ILxQtPanel::Position LxQtPanel::strToPosition(const QString& str, ILxQtPanel::Po
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
Return string representation of the position
|
|
|
|
Return string representation of the position
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
QString LxQtPanel::positionToStr(ILxQtPanel::Position position)
|
|
|
|
QString LXQtPanel::positionToStr(ILXQtPanel::Position position)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
switch (position)
|
|
|
|
switch (position)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case LxQtPanel::PositionTop:
|
|
|
|
case LXQtPanel::PositionTop:
|
|
|
|
return QString("Top");
|
|
|
|
return QString("Top");
|
|
|
|
case LxQtPanel::PositionLeft:
|
|
|
|
case LXQtPanel::PositionLeft:
|
|
|
|
return QString("Left");
|
|
|
|
return QString("Left");
|
|
|
|
case LxQtPanel::PositionRight:
|
|
|
|
case LXQtPanel::PositionRight:
|
|
|
|
return QString("Right");
|
|
|
|
return QString("Right");
|
|
|
|
case LxQtPanel::PositionBottom:
|
|
|
|
case LXQtPanel::PositionBottom:
|
|
|
|
return QString("Bottom");
|
|
|
|
return QString("Bottom");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -112,7 +112,7 @@ QString LxQtPanel::positionToStr(ILxQtPanel::Position position)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
LXQtPanel::LXQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
QFrame(parent),
|
|
|
|
QFrame(parent),
|
|
|
|
mConfigGroup(configGroup),
|
|
|
|
mConfigGroup(configGroup),
|
|
|
|
mPlugins{nullptr},
|
|
|
|
mPlugins{nullptr},
|
|
|
|
@ -121,7 +121,7 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
mLineCount(0),
|
|
|
|
mLineCount(0),
|
|
|
|
mLength(0),
|
|
|
|
mLength(0),
|
|
|
|
mAlignment(AlignmentLeft),
|
|
|
|
mAlignment(AlignmentLeft),
|
|
|
|
mPosition(ILxQtPanel::PositionBottom),
|
|
|
|
mPosition(ILXQtPanel::PositionBottom),
|
|
|
|
mScreenNum(0), //whatever (avoid conditional on uninitialized value)
|
|
|
|
mScreenNum(0), //whatever (avoid conditional on uninitialized value)
|
|
|
|
mHidable(false),
|
|
|
|
mHidable(false),
|
|
|
|
mHidden(false)
|
|
|
|
mHidden(false)
|
|
|
|
@ -146,19 +146,19 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
setAttribute(Qt::WA_TranslucentBackground);
|
|
|
|
setAttribute(Qt::WA_TranslucentBackground);
|
|
|
|
setAttribute(Qt::WA_AcceptDrops);
|
|
|
|
setAttribute(Qt::WA_AcceptDrops);
|
|
|
|
|
|
|
|
|
|
|
|
setWindowTitle("LxQt Panel");
|
|
|
|
setWindowTitle("LXQt Panel");
|
|
|
|
setObjectName(QString("LxQtPanel %1").arg(configGroup));
|
|
|
|
setObjectName(QString("LXQtPanel %1").arg(configGroup));
|
|
|
|
|
|
|
|
|
|
|
|
LxQtPanelWidget = new QFrame(this);
|
|
|
|
LXQtPanelWidget = new QFrame(this);
|
|
|
|
LxQtPanelWidget->setObjectName("BackgroundWidget");
|
|
|
|
LXQtPanelWidget->setObjectName("BackgroundWidget");
|
|
|
|
QGridLayout* lav = new QGridLayout();
|
|
|
|
QGridLayout* lav = new QGridLayout();
|
|
|
|
lav->setMargin(0);
|
|
|
|
lav->setMargin(0);
|
|
|
|
setLayout(lav);
|
|
|
|
setLayout(lav);
|
|
|
|
this->layout()->addWidget(LxQtPanelWidget);
|
|
|
|
this->layout()->addWidget(LXQtPanelWidget);
|
|
|
|
|
|
|
|
|
|
|
|
mLayout = new LxQtPanelLayout(LxQtPanelWidget);
|
|
|
|
mLayout = new LXQtPanelLayout(LXQtPanelWidget);
|
|
|
|
connect(mLayout, &LxQtPanelLayout::pluginMoved, this, &LxQtPanel::pluginMoved);
|
|
|
|
connect(mLayout, &LXQtPanelLayout::pluginMoved, this, &LXQtPanel::pluginMoved);
|
|
|
|
LxQtPanelWidget->setLayout(mLayout);
|
|
|
|
LXQtPanelWidget->setLayout(mLayout);
|
|
|
|
mLayout->setLineCount(mLineCount);
|
|
|
|
mLayout->setLineCount(mLineCount);
|
|
|
|
|
|
|
|
|
|
|
|
mDelaySave.setSingleShot(true);
|
|
|
|
mDelaySave.setSingleShot(true);
|
|
|
|
@ -171,10 +171,10 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
|
|
|
|
|
|
|
|
connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(realign()));
|
|
|
|
connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(realign()));
|
|
|
|
connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(ensureVisible()));
|
|
|
|
connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(ensureVisible()));
|
|
|
|
connect(LxQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update()));
|
|
|
|
connect(LXQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update()));
|
|
|
|
connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign()));
|
|
|
|
connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign()));
|
|
|
|
|
|
|
|
|
|
|
|
LxQtPanelApplication *app = reinterpret_cast<LxQtPanelApplication*>(qApp);
|
|
|
|
LXQtPanelApplication *app = reinterpret_cast<LXQtPanelApplication*>(qApp);
|
|
|
|
mSettings = app->settings();
|
|
|
|
mSettings = app->settings();
|
|
|
|
readSettings();
|
|
|
|
readSettings();
|
|
|
|
// the old position might be on a visible screen
|
|
|
|
// the old position might be on a visible screen
|
|
|
|
@ -194,7 +194,7 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) :
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::readSettings()
|
|
|
|
void LXQtPanel::readSettings()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Read settings ......................................
|
|
|
|
// Read settings ......................................
|
|
|
|
mSettings->beginGroup(mConfigGroup);
|
|
|
|
mSettings->beginGroup(mConfigGroup);
|
|
|
|
@ -239,7 +239,7 @@ void LxQtPanel::readSettings()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::saveSettings(bool later)
|
|
|
|
void LXQtPanel::saveSettings(bool later)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mDelaySave.stop();
|
|
|
|
mDelaySave.stop();
|
|
|
|
if (later)
|
|
|
|
if (later)
|
|
|
|
@ -279,7 +279,7 @@ void LxQtPanel::saveSettings(bool later)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::ensureVisible()
|
|
|
|
void LXQtPanel::ensureVisible()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!canPlacedOn(mScreenNum, mPosition))
|
|
|
|
if (!canPlacedOn(mScreenNum, mPosition))
|
|
|
|
setPosition(findAvailableScreen(mPosition), mPosition, true);
|
|
|
|
setPosition(findAvailableScreen(mPosition), mPosition, true);
|
|
|
|
@ -292,7 +292,7 @@ void LxQtPanel::ensureVisible()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
LxQtPanel::~LxQtPanel()
|
|
|
|
LXQtPanel::~LXQtPanel()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mLayout->setEnabled(false);
|
|
|
|
mLayout->setEnabled(false);
|
|
|
|
// do not save settings because of "user deleted panel" functionality saveSettings();
|
|
|
|
// do not save settings because of "user deleted panel" functionality saveSettings();
|
|
|
|
@ -302,7 +302,7 @@ LxQtPanel::~LxQtPanel()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::show()
|
|
|
|
void LXQtPanel::show()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QWidget::show();
|
|
|
|
QWidget::show();
|
|
|
|
KWindowSystem::setOnDesktop(effectiveWinId(), NET::OnAllDesktops);
|
|
|
|
KWindowSystem::setOnDesktop(effectiveWinId(), NET::OnAllDesktops);
|
|
|
|
@ -325,18 +325,18 @@ QStringList pluginDesktopDirs()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::loadPlugins()
|
|
|
|
void LXQtPanel::loadPlugins()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QString names_key(mConfigGroup);
|
|
|
|
QString names_key(mConfigGroup);
|
|
|
|
names_key += '/';
|
|
|
|
names_key += '/';
|
|
|
|
names_key += QLatin1String(CFG_KEY_PLUGINS);
|
|
|
|
names_key += QLatin1String(CFG_KEY_PLUGINS);
|
|
|
|
mPlugins.reset(new PanelPluginsModel(this, names_key, pluginDesktopDirs()));
|
|
|
|
mPlugins.reset(new PanelPluginsModel(this, names_key, pluginDesktopDirs()));
|
|
|
|
|
|
|
|
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, mLayout, &LxQtPanelLayout::addPlugin);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, mLayout, &LXQtPanelLayout::addPlugin);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginMovedUp, mLayout, &LxQtPanelLayout::moveUpPlugin);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginMovedUp, mLayout, &LXQtPanelLayout::moveUpPlugin);
|
|
|
|
//reemit signals
|
|
|
|
//reemit signals
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, this, &LxQtPanel::pluginAdded);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, this, &LXQtPanel::pluginAdded);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginRemoved, this, &LxQtPanel::pluginRemoved);
|
|
|
|
connect(mPlugins.data(), &PanelPluginsModel::pluginRemoved, this, &LXQtPanel::pluginRemoved);
|
|
|
|
|
|
|
|
|
|
|
|
for (auto const & plugin : mPlugins->plugins())
|
|
|
|
for (auto const & plugin : mPlugins->plugins())
|
|
|
|
mLayout->addPlugin(plugin);
|
|
|
|
mLayout->addPlugin(plugin);
|
|
|
|
@ -345,12 +345,12 @@ void LxQtPanel::loadPlugins()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
int LxQtPanel::getReserveDimension()
|
|
|
|
int LXQtPanel::getReserveDimension()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return mHidable ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize);
|
|
|
|
return mHidable ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::setPanelGeometry()
|
|
|
|
void LXQtPanel::setPanelGeometry()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const QRect currentScreen = QApplication::desktop()->screenGeometry(mScreenNum);
|
|
|
|
const QRect currentScreen = QApplication::desktop()->screenGeometry(mScreenNum);
|
|
|
|
QRect rect;
|
|
|
|
QRect rect;
|
|
|
|
@ -374,21 +374,21 @@ void LxQtPanel::setPanelGeometry()
|
|
|
|
// Horiz ......................
|
|
|
|
// Horiz ......................
|
|
|
|
switch (mAlignment)
|
|
|
|
switch (mAlignment)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case LxQtPanel::AlignmentLeft:
|
|
|
|
case LXQtPanel::AlignmentLeft:
|
|
|
|
rect.moveLeft(currentScreen.left());
|
|
|
|
rect.moveLeft(currentScreen.left());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::AlignmentCenter:
|
|
|
|
case LXQtPanel::AlignmentCenter:
|
|
|
|
rect.moveCenter(currentScreen.center());
|
|
|
|
rect.moveCenter(currentScreen.center());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::AlignmentRight:
|
|
|
|
case LXQtPanel::AlignmentRight:
|
|
|
|
rect.moveRight(currentScreen.right());
|
|
|
|
rect.moveRight(currentScreen.right());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Vert .......................
|
|
|
|
// Vert .......................
|
|
|
|
if (mPosition == ILxQtPanel::PositionTop)
|
|
|
|
if (mPosition == ILXQtPanel::PositionTop)
|
|
|
|
rect.moveTop(currentScreen.top());
|
|
|
|
rect.moveTop(currentScreen.top());
|
|
|
|
else
|
|
|
|
else
|
|
|
|
rect.moveBottom(currentScreen.bottom());
|
|
|
|
rect.moveBottom(currentScreen.bottom());
|
|
|
|
@ -412,21 +412,21 @@ void LxQtPanel::setPanelGeometry()
|
|
|
|
// Vert .......................
|
|
|
|
// Vert .......................
|
|
|
|
switch (mAlignment)
|
|
|
|
switch (mAlignment)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case LxQtPanel::AlignmentLeft:
|
|
|
|
case LXQtPanel::AlignmentLeft:
|
|
|
|
rect.moveTop(currentScreen.top());
|
|
|
|
rect.moveTop(currentScreen.top());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::AlignmentCenter:
|
|
|
|
case LXQtPanel::AlignmentCenter:
|
|
|
|
rect.moveCenter(currentScreen.center());
|
|
|
|
rect.moveCenter(currentScreen.center());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::AlignmentRight:
|
|
|
|
case LXQtPanel::AlignmentRight:
|
|
|
|
rect.moveBottom(currentScreen.bottom());
|
|
|
|
rect.moveBottom(currentScreen.bottom());
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Horiz ......................
|
|
|
|
// Horiz ......................
|
|
|
|
if (mPosition == ILxQtPanel::PositionLeft)
|
|
|
|
if (mPosition == ILXQtPanel::PositionLeft)
|
|
|
|
rect.moveLeft(currentScreen.left());
|
|
|
|
rect.moveLeft(currentScreen.left());
|
|
|
|
else
|
|
|
|
else
|
|
|
|
rect.moveRight(currentScreen.right());
|
|
|
|
rect.moveRight(currentScreen.right());
|
|
|
|
@ -439,7 +439,7 @@ void LxQtPanel::setPanelGeometry()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::realign()
|
|
|
|
void LXQtPanel::realign()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!isVisible())
|
|
|
|
if (!isVisible())
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -464,7 +464,7 @@ void LxQtPanel::realign()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Update the _NET_WM_PARTIAL_STRUT and _NET_WM_STRUT properties for the window
|
|
|
|
// Update the _NET_WM_PARTIAL_STRUT and _NET_WM_STRUT properties for the window
|
|
|
|
void LxQtPanel::updateWmStrut()
|
|
|
|
void LXQtPanel::updateWmStrut()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
WId wid = effectiveWinId();
|
|
|
|
WId wid = effectiveWinId();
|
|
|
|
if(wid == 0 || !isVisible())
|
|
|
|
if(wid == 0 || !isVisible())
|
|
|
|
@ -478,7 +478,7 @@ void LxQtPanel::updateWmStrut()
|
|
|
|
// At least openbox is implemented like this.
|
|
|
|
// At least openbox is implemented like this.
|
|
|
|
switch (mPosition)
|
|
|
|
switch (mPosition)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case LxQtPanel::PositionTop:
|
|
|
|
case LXQtPanel::PositionTop:
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
@ -487,7 +487,7 @@ void LxQtPanel::updateWmStrut()
|
|
|
|
);
|
|
|
|
);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionBottom:
|
|
|
|
case LXQtPanel::PositionBottom:
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
@ -496,7 +496,7 @@ void LxQtPanel::updateWmStrut()
|
|
|
|
);
|
|
|
|
);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionLeft:
|
|
|
|
case LXQtPanel::PositionLeft:
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
/* Left */ getReserveDimension(), rect.top(), rect.bottom(),
|
|
|
|
/* Left */ getReserveDimension(), rect.top(), rect.bottom(),
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
/* Right */ 0, 0, 0,
|
|
|
|
@ -506,7 +506,7 @@ void LxQtPanel::updateWmStrut()
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionRight:
|
|
|
|
case LXQtPanel::PositionRight:
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
KWindowSystem::setExtendedStrut(wid,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Left */ 0, 0, 0,
|
|
|
|
/* Right */ getReserveDimension(), rect.top(), rect.bottom(),
|
|
|
|
/* Right */ getReserveDimension(), rect.top(), rect.bottom(),
|
|
|
|
@ -523,31 +523,31 @@ void LxQtPanel::updateWmStrut()
|
|
|
|
This function checks, is the panel can be placed on the display
|
|
|
|
This function checks, is the panel can be placed on the display
|
|
|
|
@displayNum on @position.
|
|
|
|
@displayNum on @position.
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
bool LxQtPanel::canPlacedOn(int screenNum, LxQtPanel::Position position)
|
|
|
|
bool LXQtPanel::canPlacedOn(int screenNum, LXQtPanel::Position position)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QDesktopWidget* dw = QApplication::desktop();
|
|
|
|
QDesktopWidget* dw = QApplication::desktop();
|
|
|
|
|
|
|
|
|
|
|
|
switch (position)
|
|
|
|
switch (position)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case LxQtPanel::PositionTop:
|
|
|
|
case LXQtPanel::PositionTop:
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
if (dw->screenGeometry(i).bottom() < dw->screenGeometry(screenNum).top())
|
|
|
|
if (dw->screenGeometry(i).bottom() < dw->screenGeometry(screenNum).top())
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionBottom:
|
|
|
|
case LXQtPanel::PositionBottom:
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
if (dw->screenGeometry(i).top() > dw->screenGeometry(screenNum).bottom())
|
|
|
|
if (dw->screenGeometry(i).top() > dw->screenGeometry(screenNum).bottom())
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionLeft:
|
|
|
|
case LXQtPanel::PositionLeft:
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
if (dw->screenGeometry(i).right() < dw->screenGeometry(screenNum).left())
|
|
|
|
if (dw->screenGeometry(i).right() < dw->screenGeometry(screenNum).left())
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
case LxQtPanel::PositionRight:
|
|
|
|
case LXQtPanel::PositionRight:
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
for (int i = 0; i < dw->screenCount(); ++i)
|
|
|
|
if (dw->screenGeometry(i).left() > dw->screenGeometry(screenNum).right())
|
|
|
|
if (dw->screenGeometry(i).left() > dw->screenGeometry(screenNum).right())
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
@ -561,7 +561,7 @@ bool LxQtPanel::canPlacedOn(int screenNum, LxQtPanel::Position position)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
int LxQtPanel::findAvailableScreen(LxQtPanel::Position position)
|
|
|
|
int LXQtPanel::findAvailableScreen(LXQtPanel::Position position)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int current = mScreenNum;
|
|
|
|
int current = mScreenNum;
|
|
|
|
|
|
|
|
|
|
|
|
@ -580,7 +580,7 @@ int LxQtPanel::findAvailableScreen(LxQtPanel::Position position)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::showConfigDialog()
|
|
|
|
void LXQtPanel::showConfigDialog()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mConfigDialog.isNull())
|
|
|
|
if (mConfigDialog.isNull())
|
|
|
|
mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
|
|
|
|
mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
|
|
|
|
@ -599,7 +599,7 @@ void LxQtPanel::showConfigDialog()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::showAddPluginDialog()
|
|
|
|
void LXQtPanel::showAddPluginDialog()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mConfigDialog.isNull())
|
|
|
|
if (mConfigDialog.isNull())
|
|
|
|
mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
|
|
|
|
mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
|
|
|
|
@ -618,16 +618,16 @@ void LxQtPanel::showAddPluginDialog()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::updateStyleSheet()
|
|
|
|
void LXQtPanel::updateStyleSheet()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QStringList sheet;
|
|
|
|
QStringList sheet;
|
|
|
|
sheet << QString("Plugin > QAbstractButton, LxQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize);
|
|
|
|
sheet << QString("Plugin > QAbstractButton, LXQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize);
|
|
|
|
sheet << QString("Plugin > * > QAbstractButton, TrayIcon { qproperty-iconSize: %1px %1px; }").arg(mIconSize);
|
|
|
|
sheet << QString("Plugin > * > QAbstractButton, TrayIcon { qproperty-iconSize: %1px %1px; }").arg(mIconSize);
|
|
|
|
|
|
|
|
|
|
|
|
if (mFontColor.isValid())
|
|
|
|
if (mFontColor.isValid())
|
|
|
|
sheet << QString("Plugin * { color: " + mFontColor.name() + "; }");
|
|
|
|
sheet << QString("Plugin * { color: " + mFontColor.name() + "; }");
|
|
|
|
|
|
|
|
|
|
|
|
QString object = LxQtPanelWidget->objectName();
|
|
|
|
QString object = LXQtPanelWidget->objectName();
|
|
|
|
|
|
|
|
|
|
|
|
if (mBackgroundColor.isValid())
|
|
|
|
if (mBackgroundColor.isValid())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -636,11 +636,11 @@ void LxQtPanel::updateStyleSheet()
|
|
|
|
.arg(mBackgroundColor.green())
|
|
|
|
.arg(mBackgroundColor.green())
|
|
|
|
.arg(mBackgroundColor.blue())
|
|
|
|
.arg(mBackgroundColor.blue())
|
|
|
|
.arg((float) mOpacity / 100);
|
|
|
|
.arg((float) mOpacity / 100);
|
|
|
|
sheet << QString("LxQtPanel #BackgroundWidget { background-color: rgba(" + color + "); }");
|
|
|
|
sheet << QString("LXQtPanel #BackgroundWidget { background-color: rgba(" + color + "); }");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (QFileInfo(mBackgroundImage).exists())
|
|
|
|
if (QFileInfo(mBackgroundImage).exists())
|
|
|
|
sheet << QString("LxQtPanel #BackgroundWidget { background-image: url('" + mBackgroundImage + "');}");
|
|
|
|
sheet << QString("LXQtPanel #BackgroundWidget { background-image: url('" + mBackgroundImage + "');}");
|
|
|
|
|
|
|
|
|
|
|
|
setStyleSheet(sheet.join("\n"));
|
|
|
|
setStyleSheet(sheet.join("\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -650,7 +650,7 @@ void LxQtPanel::updateStyleSheet()
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setPanelSize(int value, bool save)
|
|
|
|
void LXQtPanel::setPanelSize(int value, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mPanelSize != value)
|
|
|
|
if (mPanelSize != value)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -667,7 +667,7 @@ void LxQtPanel::setPanelSize(int value, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setIconSize(int value, bool save)
|
|
|
|
void LXQtPanel::setIconSize(int value, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mIconSize != value)
|
|
|
|
if (mIconSize != value)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -686,7 +686,7 @@ void LxQtPanel::setIconSize(int value, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setLineCount(int value, bool save)
|
|
|
|
void LXQtPanel::setLineCount(int value, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mLineCount != value)
|
|
|
|
if (mLineCount != value)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -706,7 +706,7 @@ void LxQtPanel::setLineCount(int value, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setLength(int length, bool inPercents, bool save)
|
|
|
|
void LXQtPanel::setLength(int length, bool inPercents, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mLength == length &&
|
|
|
|
if (mLength == length &&
|
|
|
|
mLengthInPercents == inPercents)
|
|
|
|
mLengthInPercents == inPercents)
|
|
|
|
@ -725,7 +725,7 @@ void LxQtPanel::setLength(int length, bool inPercents, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setPosition(int screen, ILxQtPanel::Position position, bool save)
|
|
|
|
void LXQtPanel::setPosition(int screen, ILXQtPanel::Position position, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mScreenNum == screen &&
|
|
|
|
if (mScreenNum == screen &&
|
|
|
|
mPosition == position)
|
|
|
|
mPosition == position)
|
|
|
|
@ -766,7 +766,7 @@ void LxQtPanel::setPosition(int screen, ILxQtPanel::Position position, bool save
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
*
|
|
|
|
*
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setAlignment(Alignment value, bool save)
|
|
|
|
void LXQtPanel::setAlignment(Alignment value, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mAlignment == value)
|
|
|
|
if (mAlignment == value)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -782,7 +782,7 @@ void LxQtPanel::setAlignment(Alignment value, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
*
|
|
|
|
*
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setFontColor(QColor color, bool save)
|
|
|
|
void LXQtPanel::setFontColor(QColor color, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mFontColor = color;
|
|
|
|
mFontColor = color;
|
|
|
|
updateStyleSheet();
|
|
|
|
updateStyleSheet();
|
|
|
|
@ -794,7 +794,7 @@ void LxQtPanel::setFontColor(QColor color, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setBackgroundColor(QColor color, bool save)
|
|
|
|
void LXQtPanel::setBackgroundColor(QColor color, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mBackgroundColor = color;
|
|
|
|
mBackgroundColor = color;
|
|
|
|
updateStyleSheet();
|
|
|
|
updateStyleSheet();
|
|
|
|
@ -806,7 +806,7 @@ void LxQtPanel::setBackgroundColor(QColor color, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setBackgroundImage(QString path, bool save)
|
|
|
|
void LXQtPanel::setBackgroundImage(QString path, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mBackgroundImage = path;
|
|
|
|
mBackgroundImage = path;
|
|
|
|
updateStyleSheet();
|
|
|
|
updateStyleSheet();
|
|
|
|
@ -819,7 +819,7 @@ void LxQtPanel::setBackgroundImage(QString path, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
*
|
|
|
|
*
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::setOpacity(int opacity, bool save)
|
|
|
|
void LXQtPanel::setOpacity(int opacity, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mOpacity = opacity;
|
|
|
|
mOpacity = opacity;
|
|
|
|
updateStyleSheet();
|
|
|
|
updateStyleSheet();
|
|
|
|
@ -832,7 +832,7 @@ void LxQtPanel::setOpacity(int opacity, bool save)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
QRect LxQtPanel::globalGometry() const
|
|
|
|
QRect LXQtPanel::globalGometry() const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return QRect(mapToGlobal(QPoint(0, 0)), this->size());
|
|
|
|
return QRect(mapToGlobal(QPoint(0, 0)), this->size());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -841,7 +841,7 @@ QRect LxQtPanel::globalGometry() const
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
bool LxQtPanel::event(QEvent *event)
|
|
|
|
bool LXQtPanel::event(QEvent *event)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
switch (event->type())
|
|
|
|
switch (event->type())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -896,7 +896,7 @@ bool LxQtPanel::event(QEvent *event)
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::showEvent(QShowEvent *event)
|
|
|
|
void LXQtPanel::showEvent(QShowEvent *event)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QFrame::showEvent(event);
|
|
|
|
QFrame::showEvent(event);
|
|
|
|
realign();
|
|
|
|
realign();
|
|
|
|
@ -906,7 +906,7 @@ void LxQtPanel::showEvent(QShowEvent *event)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::showPopupMenu(Plugin *plugin)
|
|
|
|
void LXQtPanel::showPopupMenu(Plugin *plugin)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
PopupMenu * menu = new PopupMenu(tr("Panel"), this);
|
|
|
|
PopupMenu * menu = new PopupMenu(tr("Panel"), this);
|
|
|
|
menu->setAttribute(Qt::WA_DeleteOnClose);
|
|
|
|
menu->setAttribute(Qt::WA_DeleteOnClose);
|
|
|
|
@ -940,7 +940,7 @@ void LxQtPanel::showPopupMenu(Plugin *plugin)
|
|
|
|
this, SLOT(showAddPluginDialog())
|
|
|
|
this, SLOT(showAddPluginDialog())
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
LxQtPanelApplication *a = reinterpret_cast<LxQtPanelApplication*>(qApp);
|
|
|
|
LXQtPanelApplication *a = reinterpret_cast<LXQtPanelApplication*>(qApp);
|
|
|
|
menu->addAction(XdgIcon::fromTheme(QLatin1String("list-add")),
|
|
|
|
menu->addAction(XdgIcon::fromTheme(QLatin1String("list-add")),
|
|
|
|
tr("Add Panel"),
|
|
|
|
tr("Add Panel"),
|
|
|
|
a, SLOT(addNewPanel())
|
|
|
|
a, SLOT(addNewPanel())
|
|
|
|
@ -967,7 +967,7 @@ void LxQtPanel::showPopupMenu(Plugin *plugin)
|
|
|
|
menu->show();
|
|
|
|
menu->show();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Plugin* LxQtPanel::findPlugin(const ILxQtPanelPlugin* iPlugin) const
|
|
|
|
Plugin* LXQtPanel::findPlugin(const ILXQtPanelPlugin* iPlugin) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Plugin *plugin = nullptr;
|
|
|
|
Plugin *plugin = nullptr;
|
|
|
|
for (Plugin *plug : mPlugins->plugins())
|
|
|
|
for (Plugin *plug : mPlugins->plugins())
|
|
|
|
@ -979,25 +979,25 @@ Plugin* LxQtPanel::findPlugin(const ILxQtPanelPlugin* iPlugin) const
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
QRect LxQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const
|
|
|
|
QRect LXQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int x = absolutePos.x(), y = absolutePos.y();
|
|
|
|
int x = absolutePos.x(), y = absolutePos.y();
|
|
|
|
|
|
|
|
|
|
|
|
switch (position())
|
|
|
|
switch (position())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case ILxQtPanel::PositionTop:
|
|
|
|
case ILXQtPanel::PositionTop:
|
|
|
|
y = globalGometry().bottom();
|
|
|
|
y = globalGometry().bottom();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ILxQtPanel::PositionBottom:
|
|
|
|
case ILXQtPanel::PositionBottom:
|
|
|
|
y = globalGometry().top() - windowSize.height();
|
|
|
|
y = globalGometry().top() - windowSize.height();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ILxQtPanel::PositionLeft:
|
|
|
|
case ILXQtPanel::PositionLeft:
|
|
|
|
x = globalGometry().right();
|
|
|
|
x = globalGometry().right();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ILxQtPanel::PositionRight:
|
|
|
|
case ILXQtPanel::PositionRight:
|
|
|
|
x = globalGometry().left() - windowSize.width();
|
|
|
|
x = globalGometry().left() - windowSize.width();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1027,7 +1027,7 @@ QRect LxQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
QRect LxQtPanel::calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const
|
|
|
|
QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Plugin *panel_plugin = findPlugin(plugin);
|
|
|
|
Plugin *panel_plugin = findPlugin(plugin);
|
|
|
|
if (nullptr == panel_plugin)
|
|
|
|
if (nullptr == panel_plugin)
|
|
|
|
@ -1040,7 +1040,7 @@ QRect LxQtPanel::calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const Q
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
QString LxQtPanel::qssPosition() const
|
|
|
|
QString LXQtPanel::qssPosition() const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return positionToStr(position());
|
|
|
|
return positionToStr(position());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1048,7 +1048,7 @@ QString LxQtPanel::qssPosition() const
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::pluginMoved(Plugin * plug)
|
|
|
|
void LXQtPanel::pluginMoved(Plugin * plug)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//get new position of the moved plugin
|
|
|
|
//get new position of the moved plugin
|
|
|
|
bool found{false};
|
|
|
|
bool found{false};
|
|
|
|
@ -1074,7 +1074,7 @@ void LxQtPanel::pluginMoved(Plugin * plug)
|
|
|
|
/************************************************
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
************************************************/
|
|
|
|
void LxQtPanel::userRequestForDeletion()
|
|
|
|
void LXQtPanel::userRequestForDeletion()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mSettings->beginGroup(mConfigGroup);
|
|
|
|
mSettings->beginGroup(mConfigGroup);
|
|
|
|
QStringList plugins = mSettings->value("plugins").toStringList();
|
|
|
|
QStringList plugins = mSettings->value("plugins").toStringList();
|
|
|
|
@ -1089,7 +1089,7 @@ void LxQtPanel::userRequestForDeletion()
|
|
|
|
emit deletedByUser(this);
|
|
|
|
emit deletedByUser(this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::showPanel()
|
|
|
|
void LXQtPanel::showPanel()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mHidable)
|
|
|
|
if (mHidable)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1102,13 +1102,13 @@ void LxQtPanel::showPanel()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::hidePanel()
|
|
|
|
void LXQtPanel::hidePanel()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mHidable && !mHidden)
|
|
|
|
if (mHidable && !mHidden)
|
|
|
|
mHideTimer.start();
|
|
|
|
mHideTimer.start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::hidePanelWork()
|
|
|
|
void LXQtPanel::hidePanelWork()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mHidable && !mHidden && !geometry().contains(QCursor::pos()))
|
|
|
|
if (mHidable && !mHidden && !geometry().contains(QCursor::pos()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1120,7 +1120,7 @@ void LxQtPanel::hidePanelWork()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LxQtPanel::setHidable(bool hidable, bool save)
|
|
|
|
void LXQtPanel::setHidable(bool hidable, bool save)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (mHidable == hidable)
|
|
|
|
if (mHidable == hidable)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -1133,11 +1133,11 @@ void LxQtPanel::setHidable(bool hidable, bool save)
|
|
|
|
realign();
|
|
|
|
realign();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool LxQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const
|
|
|
|
bool LXQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Plugin const * plugin = mPlugins->pluginByID(pluginId);
|
|
|
|
Plugin const * plugin = mPlugins->pluginByID(pluginId);
|
|
|
|
if (nullptr == plugin)
|
|
|
|
if (nullptr == plugin)
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return plugin->iPlugin()->flags().testFlag(ILxQtPanelPlugin::SingleInstance);
|
|
|
|
return plugin->iPlugin()->flags().testFlag(ILXQtPanelPlugin::SingleInstance);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Alf Gaida
9 years ago