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

Adding upstream version 0.9.0+20150830.

Browse Source
This commit is contained in:
Alf Gaida 2015-09-04 20:52:41 +02:00
parent 6fef2414f4
commit bee030dd8b
1059 changed files with 4475 additions and 3285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panel/config/addplugindialog.cpp
View File

@ -53,12 +53,12 @@ AddPluginDialog::AddPluginDialog(QWidget *parent):
desktopFilesDirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel"); desktopFilesDirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel");
desktopFilesDirs << PLUGIN_DESKTOPS_DIR; desktopFilesDirs << PLUGIN_DESKTOPS_DIR;
mPlugins = LxQt::PluginInfo::search(desktopFilesDirs, QStringLiteral("LxQtPanel/Plugin"), QStringLiteral("*")); mPlugins = LXQt::PluginInfo::search(desktopFilesDirs, QStringLiteral("LXQtPanel/Plugin"), QStringLiteral("*"));
std::sort(mPlugins.begin(), mPlugins.end(), [](const LxQt::PluginInfo &p1, const LxQt::PluginInfo &p2) { std::sort(mPlugins.begin(), mPlugins.end(), [](const LXQt::PluginInfo &p1, const LXQt::PluginInfo &p2) {
return p1.name() < p2.name() || (p1.name() == p2.name() && p1.comment() < p2.comment()); return p1.name() < p2.name() || (p1.name() == p2.name() && p1.comment() < p2.comment());
}); });
ui->pluginList->setItemDelegate(new LxQt::HtmlDelegate(QSize(32, 32), ui->pluginList)); ui->pluginList->setItemDelegate(new LXQt::HtmlDelegate(QSize(32, 32), ui->pluginList));
ui->pluginList->setContextMenuPolicy(Qt::CustomContextMenu); ui->pluginList->setContextMenuPolicy(Qt::CustomContextMenu);
filter(); filter();
@ -72,9 +72,9 @@ AddPluginDialog::AddPluginDialog(QWidget *parent):
connect(ui->pluginList, &QListWidget::doubleClicked, this, &AddPluginDialog::emitPluginSelected); connect(ui->pluginList, &QListWidget::doubleClicked, this, &AddPluginDialog::emitPluginSelected);
connect(ui->addButton, &QPushButton::clicked, this, &AddPluginDialog::emitPluginSelected); connect(ui->addButton, &QPushButton::clicked, this, &AddPluginDialog::emitPluginSelected);
connect(dynamic_cast<LxQtPanelApplication *>(qApp), &LxQtPanelApplication::pluginAdded connect(dynamic_cast<LXQtPanelApplication *>(qApp), &LXQtPanelApplication::pluginAdded
, this, &AddPluginDialog::filter); , this, &AddPluginDialog::filter);
connect(dynamic_cast<LxQtPanelApplication *>(qApp), &LxQtPanelApplication::pluginRemoved connect(dynamic_cast<LXQtPanelApplication *>(qApp), &LXQtPanelApplication::pluginRemoved
, this, &AddPluginDialog::filter); , this, &AddPluginDialog::filter);
} }
@ -95,7 +95,7 @@ void AddPluginDialog::filter()
int pluginCount = mPlugins.length(); int pluginCount = mPlugins.length();
for (int i = 0; i < pluginCount; ++i) for (int i = 0; i < pluginCount; ++i)
{ {
const LxQt::PluginInfo &plugin = mPlugins.at(i); const LXQt::PluginInfo &plugin = mPlugins.at(i);
QString s = QStringLiteral("%1 %2 %3 %4").arg(plugin.name(), QString s = QStringLiteral("%1 %2 %3 %4").arg(plugin.name(),
plugin.comment(), plugin.comment(),
@ -106,7 +106,7 @@ void AddPluginDialog::filter()
QListWidgetItem* item = new QListWidgetItem(ui->pluginList); QListWidgetItem* item = new QListWidgetItem(ui->pluginList);
// disable single-instances plugins already in use // disable single-instances plugins already in use
if (dynamic_cast<LxQtPanelApplication const *>(qApp)->isPluginSingletonAndRunnig(plugin.id())) if (dynamic_cast<LXQtPanelApplication const *>(qApp)->isPluginSingletonAndRunnig(plugin.id()))
{ {
item->setFlags(item->flags() & ~Qt::ItemIsEnabled); item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text)); item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text));
@ -127,7 +127,7 @@ void AddPluginDialog::emitPluginSelected()
QListWidget* pluginList = ui->pluginList; QListWidget* pluginList = ui->pluginList;
if (pluginList->currentItem() && pluginList->currentItem()->isSelected()) if (pluginList->currentItem() && pluginList->currentItem()->isSelected())
{ {
LxQt::PluginInfo plugin = mPlugins.at(pluginList->currentItem()->data(INDEX_ROLE).toInt()); LXQt::PluginInfo plugin = mPlugins.at(pluginList->currentItem()->data(INDEX_ROLE).toInt());
emit pluginSelected(plugin); emit pluginSelected(plugin);
} }
} }

4
panel/config/addplugindialog.h
View File

@ -48,11 +48,11 @@ public:
~AddPluginDialog(); ~AddPluginDialog();
signals: signals:
void pluginSelected(const LxQt::PluginInfo &plugin); void pluginSelected(const LXQt::PluginInfo &plugin);
private: private:
Ui::AddPluginDialog *ui; Ui::AddPluginDialog *ui;
LxQt::PluginInfoList mPlugins; LXQt::PluginInfoList mPlugins;
QTimer mSearchTimer; QTimer mSearchTimer;
private slots: private slots:

4
panel/config/configpaneldialog.cpp
View File

@ -27,8 +27,8 @@
#include "configpaneldialog.h" #include "configpaneldialog.h"
ConfigPanelDialog::ConfigPanelDialog(LxQtPanel *panel, QWidget *parent): ConfigPanelDialog::ConfigPanelDialog(LXQtPanel *panel, QWidget *parent):
LxQt::ConfigDialog(tr("Configure Panel"), panel->settings(), parent), LXQt::ConfigDialog(tr("Configure Panel"), panel->settings(), parent),
mPanelPage(nullptr), mPanelPage(nullptr),
mPluginsPage(nullptr) mPluginsPage(nullptr)
{ {

4
panel/config/configpaneldialog.h
View File

@ -34,12 +34,12 @@
#include <LXQt/ConfigDialog> #include <LXQt/ConfigDialog>
class ConfigPanelDialog : public LxQt::ConfigDialog class ConfigPanelDialog : public LXQt::ConfigDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
ConfigPanelDialog(LxQtPanel *panel, QWidget *parent = 0); ConfigPanelDialog(LXQtPanel *panel, QWidget *parent = 0);
void showConfigPanelPage(); void showConfigPanelPage();
void showConfigPluginsPage(); void showConfigPluginsPage();

52
panel/config/configpanelwidget.cpp
View File

@ -39,16 +39,16 @@
#include <QFileDialog> #include <QFileDialog>
#include <QStandardPaths> #include <QStandardPaths>
using namespace LxQt; using namespace LXQt;
struct ScreenPosition struct ScreenPosition
{ {
int screen; int screen;
ILxQtPanel::Position position; ILXQtPanel::Position position;
}; };
Q_DECLARE_METATYPE(ScreenPosition) Q_DECLARE_METATYPE(ScreenPosition)
ConfigPanelWidget::ConfigPanelWidget(LxQtPanel *panel, QWidget *parent) : ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ConfigPanelWidget), ui(new Ui::ConfigPanelWidget),
mPanel(panel) mPanel(panel)
@ -153,10 +153,10 @@ void ConfigPanelWidget::fillComboBox_position()
int screenCount = QApplication::desktop()->screenCount(); int screenCount = QApplication::desktop()->screenCount();
if (screenCount == 1) if (screenCount == 1)
{ {
addPosition(tr("Top of desktop"), 0, LxQtPanel::PositionTop); addPosition(tr("Top of desktop"), 0, LXQtPanel::PositionTop);
addPosition(tr("Left of desktop"), 0, LxQtPanel::PositionLeft); addPosition(tr("Left of desktop"), 0, LXQtPanel::PositionLeft);
addPosition(tr("Right of desktop"), 0, LxQtPanel::PositionRight); addPosition(tr("Right of desktop"), 0, LXQtPanel::PositionRight);
addPosition(tr("Bottom of desktop"), 0, LxQtPanel::PositionBottom); addPosition(tr("Bottom of desktop"), 0, LXQtPanel::PositionBottom);
} }
else else
{ {
@ -165,10 +165,10 @@ void ConfigPanelWidget::fillComboBox_position()
if (screenNum) if (screenNum)
ui->comboBox_position->insertSeparator(9999); ui->comboBox_position->insertSeparator(9999);
addPosition(tr("Top of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionTop); addPosition(tr("Top of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionTop);
addPosition(tr("Left of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionLeft); addPosition(tr("Left of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionLeft);
addPosition(tr("Right of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionRight); addPosition(tr("Right of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionRight);
addPosition(tr("Bottom of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionBottom); addPosition(tr("Bottom of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionBottom);
} }
} }
} }
@ -179,13 +179,13 @@ void ConfigPanelWidget::fillComboBox_position()
************************************************/ ************************************************/
void ConfigPanelWidget::fillComboBox_alignment() void ConfigPanelWidget::fillComboBox_alignment()
{ {
ui->comboBox_alignment->setItemData(0, QVariant(LxQtPanel::AlignmentLeft)); ui->comboBox_alignment->setItemData(0, QVariant(LXQtPanel::AlignmentLeft));
ui->comboBox_alignment->setItemData(1, QVariant(LxQtPanel::AlignmentCenter)); ui->comboBox_alignment->setItemData(1, QVariant(LXQtPanel::AlignmentCenter));
ui->comboBox_alignment->setItemData(2, QVariant(LxQtPanel::AlignmentRight)); ui->comboBox_alignment->setItemData(2, QVariant(LXQtPanel::AlignmentRight));
if (mPosition == ILxQtPanel::PositionTop || if (mPosition == ILXQtPanel::PositionTop ||
mPosition == ILxQtPanel::PositionBottom) mPosition == ILXQtPanel::PositionBottom)
{ {
ui->comboBox_alignment->setItemText(0, tr("Left")); ui->comboBox_alignment->setItemText(0, tr("Left"));
ui->comboBox_alignment->setItemText(1, tr("Center")); ui->comboBox_alignment->setItemText(1, tr("Center"));
@ -203,9 +203,9 @@ void ConfigPanelWidget::fillComboBox_alignment()
/************************************************ /************************************************
* *
************************************************/ ************************************************/
void ConfigPanelWidget::addPosition(const QString& name, int screen, LxQtPanel::Position position) void ConfigPanelWidget::addPosition(const QString& name, int screen, LXQtPanel::Position position)
{ {
if (LxQtPanel::canPlacedOn(screen, position)) if (LXQtPanel::canPlacedOn(screen, position))
ui->comboBox_position->addItem(name, QVariant::fromValue((ScreenPosition){screen, position})); ui->comboBox_position->addItem(name, QVariant::fromValue((ScreenPosition){screen, position}));
} }
@ -213,7 +213,7 @@ void ConfigPanelWidget::addPosition(const QString& name, int screen, LxQtPanel::
/************************************************ /************************************************
* *
************************************************/ ************************************************/
int ConfigPanelWidget::indexForPosition(int screen, ILxQtPanel::Position position) int ConfigPanelWidget::indexForPosition(int screen, ILXQtPanel::Position position)
{ {
for (int i = 0; i < ui->comboBox_position->count(); i++) for (int i = 0; i < ui->comboBox_position->count(); i++)
{ {
@ -247,7 +247,7 @@ void ConfigPanelWidget::editChanged()
ui->comboBox_lenghtType->currentIndex() == 0, ui->comboBox_lenghtType->currentIndex() == 0,
true); true);
LxQtPanel::Alignment align = LxQtPanel::Alignment( LXQtPanel::Alignment align = LXQtPanel::Alignment(
ui->comboBox_alignment->itemData( ui->comboBox_alignment->itemData(
ui->comboBox_alignment->currentIndex() ui->comboBox_alignment->currentIndex()
).toInt()); ).toInt());
@ -304,8 +304,8 @@ int ConfigPanelWidget::getMaxLength()
{ {
QDesktopWidget* dw = QApplication::desktop(); QDesktopWidget* dw = QApplication::desktop();
if (mPosition == ILxQtPanel::PositionTop || if (mPosition == ILXQtPanel::PositionTop ||
mPosition == ILxQtPanel::PositionBottom) mPosition == ILXQtPanel::PositionBottom)
return dw->screenGeometry(mScreenNum).width(); return dw->screenGeometry(mScreenNum).width();
else else
return dw->screenGeometry(mScreenNum).height(); return dw->screenGeometry(mScreenNum).height();
@ -320,10 +320,10 @@ void ConfigPanelWidget::positionChanged()
ScreenPosition sp = ui->comboBox_position->itemData( ScreenPosition sp = ui->comboBox_position->itemData(
ui->comboBox_position->currentIndex()).value<ScreenPosition>(); ui->comboBox_position->currentIndex()).value<ScreenPosition>();
bool updateAlig = (sp.position == ILxQtPanel::PositionTop || bool updateAlig = (sp.position == ILXQtPanel::PositionTop ||
sp.position == ILxQtPanel::PositionBottom) != sp.position == ILXQtPanel::PositionBottom) !=
(mPosition == ILxQtPanel::PositionTop || (mPosition == ILXQtPanel::PositionTop ||
mPosition == ILxQtPanel::PositionBottom); mPosition == ILXQtPanel::PositionBottom);
int oldMax = getMaxLength(); int oldMax = getMaxLength();
mPosition = sp.position; mPosition = sp.position;

18
panel/config/configpanelwidget.h
View File

@ -33,7 +33,7 @@
#include <QTimer> #include <QTimer>
#include <LXQt/ConfigDialog> #include <LXQt/ConfigDialog>
class LxQtPanel; class LXQtPanel;
namespace Ui { namespace Ui {
class ConfigPanelWidget; class ConfigPanelWidget;
@ -44,11 +44,11 @@ class ConfigPanelWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ConfigPanelWidget(LxQtPanel *panel, QWidget *parent = 0); explicit ConfigPanelWidget(LXQtPanel *panel, QWidget *parent = 0);
~ConfigPanelWidget(); ~ConfigPanelWidget();
int screenNum() const { return mScreenNum; } int screenNum() const { return mScreenNum; }
ILxQtPanel::Position position() const { return mPosition; } ILXQtPanel::Position position() const { return mPosition; }
signals: signals:
void changed(); void changed();
@ -66,14 +66,14 @@ private slots:
private: private:
Ui::ConfigPanelWidget *ui; Ui::ConfigPanelWidget *ui;
LxQtPanel *mPanel; LXQtPanel *mPanel;
int mScreenNum; int mScreenNum;
ILxQtPanel::Position mPosition; ILXQtPanel::Position mPosition;
void addPosition(const QString& name, int screen, LxQtPanel::Position position); void addPosition(const QString& name, int screen, LXQtPanel::Position position);
void fillComboBox_position(); void fillComboBox_position();
void fillComboBox_alignment(); void fillComboBox_alignment();
int indexForPosition(int screen, ILxQtPanel::Position position); int indexForPosition(int screen, ILXQtPanel::Position position);
int getMaxLength(); int getMaxLength();
// new values // new values
@ -86,8 +86,8 @@ private:
int mOldLineCount; int mOldLineCount;
int mOldLength; int mOldLength;
bool mOldLengthInPercents; bool mOldLengthInPercents;
LxQtPanel::Alignment mOldAlignment; LXQtPanel::Alignment mOldAlignment;
ILxQtPanel::Position mOldPosition; ILXQtPanel::Position mOldPosition;
bool mOldHidable; bool mOldHidable;
int mOldScreenNum; int mOldScreenNum;
QColor mOldFontColor; QColor mOldFontColor;

6
panel/config/configpluginswidget.cpp
View File

@ -36,7 +36,7 @@
#include <QPushButton> #include <QPushButton>
#include <QItemSelectionModel> #include <QItemSelectionModel>
ConfigPluginsWidget::ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent) : ConfigPluginsWidget::ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ConfigPluginsWidget), ui(new Ui::ConfigPluginsWidget),
mPanel(panel) mPanel(panel)
@ -50,7 +50,7 @@ ConfigPluginsWidget::ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent) :
} }
{ {
QScopedPointer<QAbstractItemDelegate> d(ui->listView_plugins->itemDelegate()); QScopedPointer<QAbstractItemDelegate> d(ui->listView_plugins->itemDelegate());
ui->listView_plugins->setItemDelegate(new LxQt::HtmlDelegate(QSize(16, 16), ui->listView_plugins)); ui->listView_plugins->setItemDelegate(new LXQt::HtmlDelegate(QSize(16, 16), ui->listView_plugins));
} }
resetButtons(); resetButtons();
@ -109,7 +109,7 @@ void ConfigPluginsWidget::resetButtons()
Plugin const * plugin Plugin const * plugin
= ui->listView_plugins->model()->data(selectionModel->currentIndex(), Qt::UserRole).value<Plugin const *>(); = ui->listView_plugins->model()->data(selectionModel->currentIndex(), Qt::UserRole).value<Plugin const *>();
if (nullptr != plugin) if (nullptr != plugin)
hasConfigDialog = plugin->iPlugin()->flags().testFlag(ILxQtPanelPlugin::HaveConfigDialog); hasConfigDialog = plugin->iPlugin()->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog);
} }
ui->pushButton_removePlugin->setEnabled(hasSelection); ui->pushButton_removePlugin->setEnabled(hasSelection);

4
panel/config/configpluginswidget.h
View File

@ -42,7 +42,7 @@ class ConfigPluginsWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent = 0); ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = 0);
~ConfigPluginsWidget(); ~ConfigPluginsWidget();
signals: signals:
@ -58,7 +58,7 @@ private slots:
private: private:
Ui::ConfigPluginsWidget *ui; Ui::ConfigPluginsWidget *ui;
QScopedPointer<AddPluginDialog> mAddPluginDialog; QScopedPointer<AddPluginDialog> mAddPluginDialog;
LxQtPanel *mPanel; LXQtPanel *mPanel;
}; };
#endif #endif

6
panel/ilxqtpanel.h
View File

@ -31,11 +31,11 @@
#include <QRect> #include <QRect>
#include "lxqtpanelglobals.h" #include "lxqtpanelglobals.h"
class ILxQtPanelPlugin; class ILXQtPanelPlugin;
/** /**
**/ **/
class LXQT_PANEL_API ILxQtPanel class LXQT_PANEL_API ILXQtPanel
{ {
public: public:
/** /**
@ -73,7 +73,7 @@ public:
If you need to show some popup window, you can use it, to get global screen position for the new window. If you need to show some popup window, you can use it, to get global screen position for the new window.
**/ **/
virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0; virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0;
virtual QRect calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const = 0; virtual QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const = 0;
}; };
#endif // ILXQTPANEL_H #endif // ILXQTPANEL_H

50
panel/ilxqtpanelplugin.h
View File

@ -37,7 +37,7 @@
#include "lxqtpanelglobals.h" #include "lxqtpanelglobals.h"
/** /**
LxQt panel plugins are standalone sharedlibraries LXQt panel plugins are standalone sharedlibraries
(*.so) located in PLUGIN_DIR (define provided by CMakeLists.txt). (*.so) located in PLUGIN_DIR (define provided by CMakeLists.txt).
Plugin for the panel is a library written on C++. One more necessary thing Plugin for the panel is a library written on C++. One more necessary thing
@ -51,15 +51,15 @@ like translations. Themselves plugins will be installed to
class QDialog; class QDialog;
struct LXQT_PANEL_API ILxQtPanelPluginStartupInfo struct LXQT_PANEL_API ILXQtPanelPluginStartupInfo
{ {
ILxQtPanel *lxqtPanel; ILXQtPanel *lxqtPanel;
QSettings *settings; QSettings *settings;
const LxQt::PluginInfo *desktopFile; const LXQt::PluginInfo *desktopFile;
}; };
/** \brief Base abstract class for LxQt panel widgets/plugins. /** \brief Base abstract class for LXQt panel widgets/plugins.
All plugins *must* be inherited from this one. All plugins *must* be inherited from this one.
This class provides some basic API and inherited/implemented This class provides some basic API and inherited/implemented
@ -69,7 +69,7 @@ See <a href=https://github.com/LXDE-Qt/lxde-qt/wiki/How-to-write-the-panel-plugi
How to write the panel plugin</a> for more information about how to make your plugins. How to write the panel plugin</a> for more information about how to make your plugins.
**/ **/
class LXQT_PANEL_API ILxQtPanelPlugin class LXQT_PANEL_API ILXQtPanelPlugin
{ {
public: public:
/** /**
@ -99,10 +99,10 @@ public:
}; };
/** /**
Constructs a ILxQtPanelPlugin object with the given startupInfo. You do not have to worry Constructs a ILXQtPanelPlugin object with the given startupInfo. You do not have to worry
about the startupInfo parameters, ILxQtPanelPlugin process the parameters yourself. about the startupInfo parameters, ILXQtPanelPlugin process the parameters yourself.
**/ **/
ILxQtPanelPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): ILXQtPanelPlugin(const ILXQtPanelPluginStartupInfo &startupInfo):
mSettings(startupInfo.settings), mSettings(startupInfo.settings),
mPanel(startupInfo.lxqtPanel), mPanel(startupInfo.lxqtPanel),
mDesktopFile(startupInfo.desktopFile) mDesktopFile(startupInfo.desktopFile)
@ -111,7 +111,7 @@ public:
/** /**
Destroys the object. Destroys the object.
**/ **/
virtual ~ILxQtPanelPlugin() {} virtual ~ILXQtPanelPlugin() {}
/** /**
Returns the plugin flags. Returns the plugin flags.
@ -139,7 +139,7 @@ public:
The default implementation returns 0, no dialog; The default implementation returns 0, no dialog;
Note that the flags method has to return HaveConfigDialog flag. Note that the flags method has to return HaveConfigDialog flag.
To save the settings you should use a ready-to-use ILxQtPanelPlugin::settings() object. To save the settings you should use a ready-to-use ILXQtPanelPlugin::settings() object.
**/ **/
virtual QDialog *configureDialog() { return 0; } virtual QDialog *configureDialog() { return 0; }
@ -154,7 +154,7 @@ public:
/** /**
This function is called when the user activates the plugin. reason specifies the reason for activation. This function is called when the user activates the plugin. reason specifies the reason for activation.
ILxQtPanelPlugin::ActivationReason enumerates the various reasons. ILXQtPanelPlugin::ActivationReason enumerates the various reasons.
The default implementation do nothing. The default implementation do nothing.
**/ **/
@ -171,11 +171,11 @@ public:
/** /**
Returns the panel object. Returns the panel object.
**/ **/
ILxQtPanel *panel() const { return mPanel; } ILXQtPanel *panel() const { return mPanel; }
QSettings *settings() const { return mSettings; } QSettings *settings() const { return mSettings; }
const LxQt::PluginInfo *desktopFile() const { return mDesktopFile; } const LXQt::PluginInfo *desktopFile() const { return mDesktopFile; }
/** /**
Helper functions for calculating global screen position of some popup window with windowSize size. Helper functions for calculating global screen position of some popup window with windowSize size.
@ -191,42 +191,42 @@ public:
virtual bool isExpandable() const { return false; } virtual bool isExpandable() const { return false; }
private: private:
QSettings *mSettings; QSettings *mSettings;
ILxQtPanel *mPanel; ILXQtPanel *mPanel;
const LxQt::PluginInfo *mDesktopFile; const LXQt::PluginInfo *mDesktopFile;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(ILxQtPanelPlugin::Flags) Q_DECLARE_OPERATORS_FOR_FLAGS(ILXQtPanelPlugin::Flags)
/** /**
Every plugin must has the loader. You shoul only reimplement instance() method, and return your plugin. Every plugin must has the loader. You shoul only reimplement instance() method, and return your plugin.
Example: Example:
@code @code
class LxQtClockPluginLibrary: public QObject, public ILxQtPanelPluginLibrary class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0")
Q_INTERFACES(ILxQtPanelPluginLibrary) Q_INTERFACES(ILXQtPanelPluginLibrary)
public: public:
ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) { return new LxQtClock(startupInfo);} ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) { return new LXQtClock(startupInfo);}
}; };
@endcode @endcode
**/ **/
class LXQT_PANEL_API ILxQtPanelPluginLibrary class LXQT_PANEL_API ILXQtPanelPluginLibrary
{ {
public: public:
/** /**
Destroys the ILxQtPanelPluginLibrary object. Destroys the ILXQtPanelPluginLibrary object.
**/ **/
virtual ~ILxQtPanelPluginLibrary() {} virtual ~ILXQtPanelPluginLibrary() {}
/** /**
Returns the root component object of the plugin. When the library is finally unloaded, the root component will automatically be deleted. Returns the root component object of the plugin. When the library is finally unloaded, the root component will automatically be deleted.
**/ **/
virtual ILxQtPanelPlugin* instance(const ILxQtPanelPluginStartupInfo &startupInfo) const = 0; virtual ILXQtPanelPlugin* instance(const ILXQtPanelPluginStartupInfo &startupInfo) const = 0;
}; };
Q_DECLARE_INTERFACE(ILxQtPanelPluginLibrary, Q_DECLARE_INTERFACE(ILXQtPanelPluginLibrary,
"lxde-qt.org/Panel/PluginInterface/3.0") "lxde-qt.org/Panel/PluginInterface/3.0")
#endif // ILXQTPANELPLUGIN_H #endif // ILXQTPANELPLUGIN_H

184
panel/lxqtpanel.cpp
View File

@ -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);
} }

46
panel/lxqtpanel.h
View File

@ -40,17 +40,17 @@ class QMenu;
class Plugin; class Plugin;
class QAbstractItemModel; class QAbstractItemModel;
namespace LxQt { namespace LXQt {
class Settings; class Settings;
class PluginInfo; class PluginInfo;
} }
class LxQtPanelLayout; class LXQtPanelLayout;
class ConfigPanelDialog; class ConfigPanelDialog;
class PanelPluginsModel; class PanelPluginsModel;
/*! \brief The LxQtPanel class provides a single lxqt-panel. /*! \brief The LXQtPanel class provides a single lxqt-panel.
*/ */
class LXQT_PANEL_API LxQtPanel : public QFrame, public ILxQtPanel class LXQT_PANEL_API LXQtPanel : public QFrame, public ILXQtPanel
{ {
Q_OBJECT Q_OBJECT
@ -67,8 +67,8 @@ public:
AlignmentRight = 1 AlignmentRight = 1
}; };
LxQtPanel(const QString &configGroup, QWidget *parent = 0); LXQtPanel(const QString &configGroup, QWidget *parent = 0);
virtual ~LxQtPanel(); virtual ~LXQtPanel();
QString name() { return mConfigGroup; } QString name() { return mConfigGroup; }
@ -76,19 +76,19 @@ public:
void showPopupMenu(Plugin *plugin = 0); void showPopupMenu(Plugin *plugin = 0);
// ILxQtPanel ......................... // ILXQtPanel .........................
ILxQtPanel::Position position() const { return mPosition; } ILXQtPanel::Position position() const { return mPosition; }
QRect globalGometry() const; QRect globalGometry() const;
Plugin *findPlugin(const ILxQtPanelPlugin *iPlugin) const; Plugin *findPlugin(const ILXQtPanelPlugin *iPlugin) const;
QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const; QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const;
QRect calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const; QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const;
// For QSS properties .................. // For QSS properties ..................
QString qssPosition() const; QString qssPosition() const;
static bool canPlacedOn(int screenNum, LxQtPanel::Position position); static bool canPlacedOn(int screenNum, LXQtPanel::Position position);
static QString positionToStr(ILxQtPanel::Position position); static QString positionToStr(ILXQtPanel::Position position);
static ILxQtPanel::Position strToPosition(const QString &str, ILxQtPanel::Position defaultValue); static ILXQtPanel::Position strToPosition(const QString &str, ILXQtPanel::Position defaultValue);
// Settings // Settings
int panelSize() const { return mPanelSize; } int panelSize() const { return mPanelSize; }
@ -96,7 +96,7 @@ public:
int lineCount() const { return mLineCount; } int lineCount() const { return mLineCount; }
int length() const { return mLength; } int length() const { return mLength; }
bool lengthInPercents() const { return mLengthInPercents; } bool lengthInPercents() const { return mLengthInPercents; }
LxQtPanel::Alignment alignment() const { return mAlignment; } LXQtPanel::Alignment alignment() const { return mAlignment; }
int screenNum() const { return mScreenNum; } int screenNum() const { return mScreenNum; }
QColor fontColor() const { return mFontColor; }; QColor fontColor() const { return mFontColor; };
QColor backgroundColor() const { return mBackgroundColor; }; QColor backgroundColor() const { return mBackgroundColor; };
@ -104,7 +104,7 @@ public:
int opacity() const { return mOpacity; }; int opacity() const { return mOpacity; };
bool hidable() const { return mHidable; } bool hidable() const { return mHidable; }
LxQt::Settings *settings() const { return mSettings; } LXQt::Settings *settings() const { return mSettings; }
bool isPluginSingletonAndRunnig(QString const & pluginId) const; bool isPluginSingletonAndRunnig(QString const & pluginId) const;
@ -119,8 +119,8 @@ public slots:
void setIconSize(int value, bool save); void setIconSize(int value, bool save);
void setLineCount(int value, bool save); void setLineCount(int value, bool save);
void setLength(int length, bool inPercents, bool save); void setLength(int length, bool inPercents, bool save);
void setPosition(int screen, ILxQtPanel::Position position, bool save); void setPosition(int screen, ILXQtPanel::Position position, bool save);
void setAlignment(LxQtPanel::Alignment value, bool save); void setAlignment(LXQtPanel::Alignment value, bool save);
void setFontColor(QColor color, bool save); void setFontColor(QColor color, bool save);
void setBackgroundColor(QColor color, bool save); void setBackgroundColor(QColor color, bool save);
void setBackgroundImage(QString path, bool save); void setBackgroundImage(QString path, bool save);
@ -132,7 +132,7 @@ public slots:
signals: signals:
void realigned(); void realigned();
void deletedByUser(LxQtPanel *self); void deletedByUser(LXQtPanel *self);
void pluginAdded(); void pluginAdded();
void pluginRemoved(); void pluginRemoved();
@ -149,13 +149,13 @@ private slots:
void userRequestForDeletion(); void userRequestForDeletion();
private: private:
LxQtPanelLayout* mLayout; LXQtPanelLayout* mLayout;
LxQt::Settings *mSettings; LXQt::Settings *mSettings;
QFrame *LxQtPanelWidget; QFrame *LXQtPanelWidget;
QString mConfigGroup; QString mConfigGroup;
QScopedPointer<PanelPluginsModel> mPlugins; QScopedPointer<PanelPluginsModel> mPlugins;
int findAvailableScreen(LxQtPanel::Position position); int findAvailableScreen(LXQtPanel::Position position);
void updateWmStrut(); void updateWmStrut();
void loadPlugins(); void loadPlugins();
@ -172,7 +172,7 @@ private:
Alignment mAlignment; Alignment mAlignment;
ILxQtPanel::Position mPosition; ILXQtPanel::Position mPosition;
int mScreenNum; int mScreenNum;
QTimer mDelaySave; QTimer mDelaySave;
bool mHidable; bool mHidable;

56
panel/lxqtpanelapplication.cpp
View File

@ -36,8 +36,8 @@
#include <QWindow> #include <QWindow>
#include <QCommandLineParser> #include <QCommandLineParser>
LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv) LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv)
: LxQt::Application(argc, argv, true) : LXQt::Application(argc, argv, true)
{ {
QCoreApplication::setApplicationName(QStringLiteral("lxqt-panel")); QCoreApplication::setApplicationName(QStringLiteral("lxqt-panel"));
QCoreApplication::setApplicationVersion(LXQT_VERSION); QCoreApplication::setApplicationVersion(LXQT_VERSION);
@ -58,17 +58,17 @@ LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv)
const QString configFile = parser.value(configFileOption); const QString configFile = parser.value(configFileOption);
if (configFile.isEmpty()) if (configFile.isEmpty())
mSettings = new LxQt::Settings(QStringLiteral("panel"), this); mSettings = new LXQt::Settings(QStringLiteral("panel"), this);
else else
mSettings = new LxQt::Settings(configFile, QSettings::IniFormat, this); mSettings = new LXQt::Settings(configFile, QSettings::IniFormat, this);
// This is a workaround for Qt 5 bug #40681. // This is a workaround for Qt 5 bug #40681.
Q_FOREACH(QScreen* screen, screens()) Q_FOREACH(QScreen* screen, screens())
{ {
connect(screen, &QScreen::destroyed, this, &LxQtPanelApplication::screenDestroyed); connect(screen, &QScreen::destroyed, this, &LXQtPanelApplication::screenDestroyed);
} }
connect(this, &QGuiApplication::screenAdded, this, &LxQtPanelApplication::handleScreenAdded); connect(this, &QGuiApplication::screenAdded, this, &LXQtPanelApplication::handleScreenAdded);
connect(this, &QCoreApplication::aboutToQuit, this, &LxQtPanelApplication::cleanup); connect(this, &QCoreApplication::aboutToQuit, this, &LXQtPanelApplication::cleanup);
QStringList panels = mSettings->value("panels").toStringList(); QStringList panels = mSettings->value("panels").toStringList();
@ -84,19 +84,19 @@ LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv)
} }
} }
LxQtPanelApplication::~LxQtPanelApplication() LXQtPanelApplication::~LXQtPanelApplication()
{ {
} }
void LxQtPanelApplication::cleanup() void LXQtPanelApplication::cleanup()
{ {
qDeleteAll(mPanels); qDeleteAll(mPanels);
} }
void LxQtPanelApplication::addNewPanel() void LXQtPanelApplication::addNewPanel()
{ {
QString name("panel_" + QUuid::createUuid().toString()); QString name("panel_" + QUuid::createUuid().toString());
LxQtPanel *p = addPanel(name); LXQtPanel *p = addPanel(name);
QStringList panels = mSettings->value("panels").toStringList(); QStringList panels = mSettings->value("panels").toStringList();
panels << name; panels << name;
mSettings->setValue("panels", panels); mSettings->setValue("panels", panels);
@ -105,37 +105,37 @@ void LxQtPanelApplication::addNewPanel()
p->showConfigDialog(); p->showConfigDialog();
} }
LxQtPanel* LxQtPanelApplication::addPanel(const QString& name) LXQtPanel* LXQtPanelApplication::addPanel(const QString& name)
{ {
LxQtPanel *panel = new LxQtPanel(name); LXQtPanel *panel = new LXQtPanel(name);
mPanels << panel; mPanels << panel;
connect(panel, SIGNAL(deletedByUser(LxQtPanel*)), connect(panel, SIGNAL(deletedByUser(LXQtPanel*)),
this, SLOT(removePanel(LxQtPanel*))); this, SLOT(removePanel(LXQtPanel*)));
//reemit signals //reemit signals
connect(panel, &LxQtPanel::pluginAdded, this, &LxQtPanelApplication::pluginAdded); connect(panel, &LXQtPanel::pluginAdded, this, &LXQtPanelApplication::pluginAdded);
connect(panel, &LxQtPanel::pluginRemoved, this, &LxQtPanelApplication::pluginRemoved); connect(panel, &LXQtPanel::pluginRemoved, this, &LXQtPanelApplication::pluginRemoved);
return panel; return panel;
} }
void LxQtPanelApplication::handleScreenAdded(QScreen* newScreen) void LXQtPanelApplication::handleScreenAdded(QScreen* newScreen)
{ {
// qDebug() << "LxQtPanelApplication::handleScreenAdded" << newScreen; // qDebug() << "LXQtPanelApplication::handleScreenAdded" << newScreen;
connect(newScreen, &QScreen::destroyed, this, &LxQtPanelApplication::screenDestroyed); connect(newScreen, &QScreen::destroyed, this, &LXQtPanelApplication::screenDestroyed);
} }
void LxQtPanelApplication::reloadPanelsAsNeeded() void LXQtPanelApplication::reloadPanelsAsNeeded()
{ {
// NOTE by PCMan: This is a workaround for Qt 5 bug #40681. // NOTE by PCMan: This is a workaround for Qt 5 bug #40681.
// Here we try to re-create the missing panels which are deleted in // Here we try to re-create the missing panels which are deleted in
// LxQtPanelApplication::screenDestroyed(). // LXQtPanelApplication::screenDestroyed().
// qDebug() << "LxQtPanelApplication::reloadPanelsAsNeeded()"; // qDebug() << "LXQtPanelApplication::reloadPanelsAsNeeded()";
QStringList names = mSettings->value("panels").toStringList(); QStringList names = mSettings->value("panels").toStringList();
Q_FOREACH(const QString& name, names) Q_FOREACH(const QString& name, names)
{ {
bool found = false; bool found = false;
Q_FOREACH(LxQtPanel* panel, mPanels) Q_FOREACH(LXQtPanel* panel, mPanels)
{ {
if(panel->name() == name) if(panel->name() == name)
{ {
@ -153,7 +153,7 @@ void LxQtPanelApplication::reloadPanelsAsNeeded()
qApp->setQuitOnLastWindowClosed(true); qApp->setQuitOnLastWindowClosed(true);
} }
void LxQtPanelApplication::screenDestroyed(QObject* screenObj) void LXQtPanelApplication::screenDestroyed(QObject* screenObj)
{ {
// NOTE by PCMan: This is a workaround for Qt 5 bug #40681. // NOTE by PCMan: This is a workaround for Qt 5 bug #40681.
// With this very dirty workaround, we can fix lxde/lxde-qt bug #204, #205, and #206. // With this very dirty workaround, we can fix lxde/lxde-qt bug #204, #205, and #206.
@ -182,7 +182,7 @@ void LxQtPanelApplication::screenDestroyed(QObject* screenObj)
QScreen* screen = static_cast<QScreen*>(screenObj); QScreen* screen = static_cast<QScreen*>(screenObj);
bool reloadNeeded = false; bool reloadNeeded = false;
qApp->setQuitOnLastWindowClosed(false); qApp->setQuitOnLastWindowClosed(false);
Q_FOREACH(LxQtPanel* panel, mPanels) Q_FOREACH(LXQtPanel* panel, mPanels)
{ {
QWindow* panelWindow = panel->windowHandle(); QWindow* panelWindow = panel->windowHandle();
if(panelWindow && panelWindow->screen() == screen) if(panelWindow && panelWindow->screen() == screen)
@ -203,7 +203,7 @@ void LxQtPanelApplication::screenDestroyed(QObject* screenObj)
qApp->setQuitOnLastWindowClosed(true); qApp->setQuitOnLastWindowClosed(true);
} }
void LxQtPanelApplication::removePanel(LxQtPanel* panel) void LXQtPanelApplication::removePanel(LXQtPanel* panel)
{ {
Q_ASSERT(mPanels.contains(panel)); Q_ASSERT(mPanels.contains(panel));
@ -216,7 +216,7 @@ void LxQtPanelApplication::removePanel(LxQtPanel* panel)
panel->deleteLater(); panel->deleteLater();
} }
bool LxQtPanelApplication::isPluginSingletonAndRunnig(QString const & pluginId) const bool LXQtPanelApplication::isPluginSingletonAndRunnig(QString const & pluginId) const
{ {
for (auto const & panel : mPanels) for (auto const & panel : mPanels)
if (panel->isPluginSingletonAndRunnig(pluginId)) if (panel->isPluginSingletonAndRunnig(pluginId))

20
panel/lxqtpanelapplication.h
View File

@ -34,20 +34,20 @@
class QScreen; class QScreen;
class LxQtPanel; class LXQtPanel;
namespace LxQt { namespace LXQt {
class Settings; class Settings;
} }
class LxQtPanelApplication : public LxQt::Application class LXQtPanelApplication : public LXQt::Application
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LxQtPanelApplication(int& argc, char** argv); explicit LXQtPanelApplication(int& argc, char** argv);
~LxQtPanelApplication(); ~LXQtPanelApplication();
int count() { return mPanels.count(); } int count() { return mPanels.count(); }
LxQt::Settings *settings() { return mSettings; } LXQt::Settings *settings() { return mSettings; }
bool isPluginSingletonAndRunnig(QString const & pluginId) const; bool isPluginSingletonAndRunnig(QString const & pluginId) const;
public slots: public slots:
@ -58,12 +58,12 @@ signals:
void pluginRemoved(); void pluginRemoved();
private: private:
QList<LxQtPanel*> mPanels; QList<LXQtPanel*> mPanels;
LxQtPanel* addPanel(const QString &name); LXQtPanel* addPanel(const QString &name);
private slots: private slots:
void removePanel(LxQtPanel* panel); void removePanel(LXQtPanel* panel);
void handleScreenAdded(QScreen* newScreen); void handleScreenAdded(QScreen* newScreen);
void screenDestroyed(QObject* screenObj); void screenDestroyed(QObject* screenObj);
@ -71,7 +71,7 @@ private slots:
void cleanup(); void cleanup();
private: private:
LxQt::Settings *mSettings; LXQt::Settings *mSettings;
}; };

64
panel/lxqtpanellayout.cpp
View File

@ -409,11 +409,11 @@ void LayoutItemGrid::setHoriz(bool value)
/************************************************ /************************************************
************************************************/ ************************************************/
LxQtPanelLayout::LxQtPanelLayout(QWidget *parent) : LXQtPanelLayout::LXQtPanelLayout(QWidget *parent) :
QLayout(parent), QLayout(parent),
mLeftGrid(new LayoutItemGrid()), mLeftGrid(new LayoutItemGrid()),
mRightGrid(new LayoutItemGrid()), mRightGrid(new LayoutItemGrid()),
mPosition(ILxQtPanel::PositionBottom), mPosition(ILXQtPanel::PositionBottom),
mAnimate(false) mAnimate(false)
{ {
setMargin(0); setMargin(0);
@ -423,7 +423,7 @@ LxQtPanelLayout::LxQtPanelLayout(QWidget *parent) :
/************************************************ /************************************************
************************************************/ ************************************************/
LxQtPanelLayout::~LxQtPanelLayout() LXQtPanelLayout::~LXQtPanelLayout()
{ {
delete mLeftGrid; delete mLeftGrid;
delete mRightGrid; delete mRightGrid;
@ -433,7 +433,7 @@ LxQtPanelLayout::~LxQtPanelLayout()
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::addItem(QLayoutItem *item) void LXQtPanelLayout::addItem(QLayoutItem *item)
{ {
LayoutItemGrid *grid = mRightGrid; LayoutItemGrid *grid = mRightGrid;
@ -448,7 +448,7 @@ void LxQtPanelLayout::addItem(QLayoutItem *item)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) void LXQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex)
{ {
if (index < mLeftGrid->count()) if (index < mLeftGrid->count())
{ {
@ -464,7 +464,7 @@ void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) const void LXQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) const
{ {
if (index < mLeftGrid->count()) if (index < mLeftGrid->count())
{ {
@ -481,7 +481,7 @@ void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *
/************************************************ /************************************************
************************************************/ ************************************************/
QLayoutItem *LxQtPanelLayout::itemAt(int index) const QLayoutItem *LXQtPanelLayout::itemAt(int index) const
{ {
if (index < 0 || index >= count()) if (index < 0 || index >= count())
return 0; return 0;
@ -497,7 +497,7 @@ QLayoutItem *LxQtPanelLayout::itemAt(int index) const
/************************************************ /************************************************
************************************************/ ************************************************/
QLayoutItem *LxQtPanelLayout::takeAt(int index) QLayoutItem *LXQtPanelLayout::takeAt(int index)
{ {
if (index < 0 || index >= count()) if (index < 0 || index >= count())
return 0; return 0;
@ -513,7 +513,7 @@ QLayoutItem *LxQtPanelLayout::takeAt(int index)
/************************************************ /************************************************
************************************************/ ************************************************/
int LxQtPanelLayout::count() const int LXQtPanelLayout::count() const
{ {
return mLeftGrid->count() + mRightGrid->count(); return mLeftGrid->count() + mRightGrid->count();
} }
@ -522,7 +522,7 @@ int LxQtPanelLayout::count() const
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::moveItem(int from, int to, bool withAnimation) void LXQtPanelLayout::moveItem(int from, int to, bool withAnimation)
{ {
if (from != to) if (from != to)
{ {
@ -558,7 +558,7 @@ void LxQtPanelLayout::moveItem(int from, int to, bool withAnimation)
/************************************************ /************************************************
************************************************/ ************************************************/
QSize LxQtPanelLayout::sizeHint() const QSize LXQtPanelLayout::sizeHint() const
{ {
if (!mLeftGrid->isValid()) if (!mLeftGrid->isValid())
mLeftGrid->update(); mLeftGrid->update();
@ -585,7 +585,7 @@ QSize LxQtPanelLayout::sizeHint() const
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setGeometry(const QRect &geometry) void LXQtPanelLayout::setGeometry(const QRect &geometry)
{ {
if (!mLeftGrid->isValid()) if (!mLeftGrid->isValid())
mLeftGrid->update(); mLeftGrid->update();
@ -611,7 +611,7 @@ void LxQtPanelLayout::setGeometry(const QRect &geometry)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation) void LXQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation)
{ {
Plugin *plugin = qobject_cast<Plugin*>(item->widget()); Plugin *plugin = qobject_cast<Plugin*>(item->widget());
if (withAnimation && plugin) if (withAnimation && plugin)
@ -631,7 +631,7 @@ void LxQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry,
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry) void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry)
{ {
// Calc expFactor for expandable plugins like TaskBar. // Calc expFactor for expandable plugins like TaskBar.
double expFactor; double expFactor;
@ -654,7 +654,7 @@ void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry)
} }
#if 0 #if 0
qDebug() << "** LxQtPanelLayout::setGeometryHoriz **************"; qDebug() << "** LXQtPanelLayout::setGeometryHoriz **************";
qDebug() << "geometry: " << geometry; qDebug() << "geometry: " << geometry;
qDebug() << "Left grid"; qDebug() << "Left grid";
@ -747,7 +747,7 @@ void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setGeometryVert(const QRect &geometry) void LXQtPanelLayout::setGeometryVert(const QRect &geometry)
{ {
// Calc expFactor for expandable plugins like TaskBar. // Calc expFactor for expandable plugins like TaskBar.
double expFactor; double expFactor;
@ -770,7 +770,7 @@ void LxQtPanelLayout::setGeometryVert(const QRect &geometry)
} }
#if 0 #if 0
qDebug() << "** LxQtPanelLayout::setGeometryVert **************"; qDebug() << "** LXQtPanelLayout::setGeometryVert **************";
qDebug() << "geometry: " << geometry; qDebug() << "geometry: " << geometry;
qDebug() << "Left grid"; qDebug() << "Left grid";
@ -862,7 +862,7 @@ void LxQtPanelLayout::setGeometryVert(const QRect &geometry)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::invalidate() void LXQtPanelLayout::invalidate()
{ {
mLeftGrid->invalidate(); mLeftGrid->invalidate();
mRightGrid->invalidate(); mRightGrid->invalidate();
@ -874,7 +874,7 @@ void LxQtPanelLayout::invalidate()
/************************************************ /************************************************
************************************************/ ************************************************/
int LxQtPanelLayout::lineCount() const int LXQtPanelLayout::lineCount() const
{ {
return mLeftGrid->colCount(); return mLeftGrid->colCount();
} }
@ -883,7 +883,7 @@ int LxQtPanelLayout::lineCount() const
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setLineCount(int value) void LXQtPanelLayout::setLineCount(int value)
{ {
mLeftGrid->setColCount(value); mLeftGrid->setColCount(value);
mRightGrid->setColCount(value); mRightGrid->setColCount(value);
@ -894,7 +894,7 @@ void LxQtPanelLayout::setLineCount(int value)
/************************************************ /************************************************
************************************************/ ************************************************/
int LxQtPanelLayout::lineSize() const int LXQtPanelLayout::lineSize() const
{ {
return mLeftGrid->lineSize(); return mLeftGrid->lineSize();
} }
@ -903,7 +903,7 @@ int LxQtPanelLayout::lineSize() const
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setLineSize(int value) void LXQtPanelLayout::setLineSize(int value)
{ {
mLeftGrid->setLineSize(value); mLeftGrid->setLineSize(value);
mRightGrid->setLineSize(value); mRightGrid->setLineSize(value);
@ -914,7 +914,7 @@ void LxQtPanelLayout::setLineSize(int value)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::setPosition(ILxQtPanel::Position value) void LXQtPanelLayout::setPosition(ILXQtPanel::Position value)
{ {
mPosition = value; mPosition = value;
mLeftGrid->setHoriz(isHorizontal()); mLeftGrid->setHoriz(isHorizontal());
@ -925,17 +925,17 @@ void LxQtPanelLayout::setPosition(ILxQtPanel::Position value)
/************************************************ /************************************************
************************************************/ ************************************************/
bool LxQtPanelLayout::isHorizontal() const bool LXQtPanelLayout::isHorizontal() const
{ {
return mPosition == ILxQtPanel::PositionTop || return mPosition == ILXQtPanel::PositionTop ||
mPosition == ILxQtPanel::PositionBottom; mPosition == ILXQtPanel::PositionBottom;
} }
/************************************************ /************************************************
************************************************/ ************************************************/
bool LxQtPanelLayout::itemIsSeparate(QLayoutItem *item) bool LXQtPanelLayout::itemIsSeparate(QLayoutItem *item)
{ {
if (!item) if (!item)
return true; return true;
@ -951,7 +951,7 @@ bool LxQtPanelLayout::itemIsSeparate(QLayoutItem *item)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::startMovePlugin() void LXQtPanelLayout::startMovePlugin()
{ {
Plugin *plugin = qobject_cast<Plugin*>(sender()); Plugin *plugin = qobject_cast<Plugin*>(sender());
if (plugin) if (plugin)
@ -968,7 +968,7 @@ void LxQtPanelLayout::startMovePlugin()
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::finishMovePlugin() void LXQtPanelLayout::finishMovePlugin()
{ {
PluginMoveProcessor *moveProcessor = qobject_cast<PluginMoveProcessor*>(sender()); PluginMoveProcessor *moveProcessor = qobject_cast<PluginMoveProcessor*>(sender());
if (moveProcessor) if (moveProcessor)
@ -983,7 +983,7 @@ void LxQtPanelLayout::finishMovePlugin()
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::moveUpPlugin(Plugin * plugin) void LXQtPanelLayout::moveUpPlugin(Plugin * plugin)
{ {
const int i = indexOf(plugin); const int i = indexOf(plugin);
if (0 < i) if (0 < i)
@ -993,9 +993,9 @@ void LxQtPanelLayout::moveUpPlugin(Plugin * plugin)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelLayout::addPlugin(Plugin * plugin) void LXQtPanelLayout::addPlugin(Plugin * plugin)
{ {
connect(plugin, &Plugin::startMove, this, &LxQtPanelLayout::startMovePlugin); connect(plugin, &Plugin::startMove, this, &LXQtPanelLayout::startMovePlugin);
const int prev_count = count(); const int prev_count = count();
addWidget(plugin); addWidget(plugin);

12
panel/lxqtpanellayout.h
View File

@ -43,12 +43,12 @@ class QEvent;
class Plugin; class Plugin;
class LayoutItemGrid; class LayoutItemGrid;
class LXQT_PANEL_API LxQtPanelLayout : public QLayout class LXQT_PANEL_API LXQtPanelLayout : public QLayout
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LxQtPanelLayout(QWidget *parent); explicit LXQtPanelLayout(QWidget *parent);
~LxQtPanelLayout(); ~LXQtPanelLayout();
void addItem(QLayoutItem *item); void addItem(QLayoutItem *item);
QLayoutItem *itemAt(int index) const; QLayoutItem *itemAt(int index) const;
@ -70,8 +70,8 @@ public:
int lineSize() const; int lineSize() const;
void setLineSize(int value); void setLineSize(int value);
ILxQtPanel::Position position() const { return mPosition; } ILXQtPanel::Position position() const { return mPosition; }
void setPosition(ILxQtPanel::Position value); void setPosition(ILXQtPanel::Position value);
static bool itemIsSeparate(QLayoutItem *item); static bool itemIsSeparate(QLayoutItem *item);
signals: signals:
@ -87,7 +87,7 @@ private:
mutable QSize mMinPluginSize; mutable QSize mMinPluginSize;
LayoutItemGrid *mLeftGrid; LayoutItemGrid *mLeftGrid;
LayoutItemGrid *mRightGrid; LayoutItemGrid *mRightGrid;
ILxQtPanel::Position mPosition; ILXQtPanel::Position mPosition;
bool mAnimate; bool mAnimate;

10
panel/lxqtpanelpluginconfigdialog.cpp
View File

@ -36,7 +36,7 @@
/************************************************ /************************************************
************************************************/ ************************************************/
LxQtPanelPluginConfigDialog::LxQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent) : LXQtPanelPluginConfigDialog::LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent) :
QDialog(parent), QDialog(parent),
mSettings(settings), mSettings(settings),
mOldSettings(settings) mOldSettings(settings)
@ -47,7 +47,7 @@ LxQtPanelPluginConfigDialog::LxQtPanelPluginConfigDialog(QSettings &settings, QW
/************************************************ /************************************************
************************************************/ ************************************************/
LxQtPanelPluginConfigDialog::~LxQtPanelPluginConfigDialog() LXQtPanelPluginConfigDialog::~LXQtPanelPluginConfigDialog()
{ {
} }
@ -55,7 +55,7 @@ LxQtPanelPluginConfigDialog::~LxQtPanelPluginConfigDialog()
/************************************************ /************************************************
************************************************/ ************************************************/
QSettings& LxQtPanelPluginConfigDialog::settings() const QSettings& LXQtPanelPluginConfigDialog::settings() const
{ {
return mSettings; return mSettings;
} }
@ -65,7 +65,7 @@ QSettings& LxQtPanelPluginConfigDialog::settings() const
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn) void LXQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn)
{ {
QDialogButtonBox *box = qobject_cast<QDialogButtonBox*>(btn->parent()); QDialogButtonBox *box = qobject_cast<QDialogButtonBox*>(btn->parent());
@ -84,7 +84,7 @@ void LxQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn)
/************************************************ /************************************************
************************************************/ ************************************************/
void LxQtPanelPluginConfigDialog::setComboboxIndexByData(QComboBox *comboBox, const QVariant &data, int defaultIndex) const void LXQtPanelPluginConfigDialog::setComboboxIndexByData(QComboBox *comboBox, const QVariant &data, int defaultIndex) const
{ {
int index = comboBox ->findData(data); int index = comboBox ->findData(data);
if (index < 0) if (index < 0)

8
panel/lxqtpanelpluginconfigdialog.h
View File

@ -36,12 +36,12 @@
class QComboBox; class QComboBox;
class LXQT_PANEL_API LxQtPanelPluginConfigDialog : public QDialog class LXQT_PANEL_API LXQtPanelPluginConfigDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LxQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent = 0); explicit LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent = 0);
virtual ~LxQtPanelPluginConfigDialog(); virtual ~LXQtPanelPluginConfigDialog();
QSettings& settings() const; QSettings& settings() const;
@ -57,7 +57,7 @@ protected:
private: private:
QSettings &mSettings; QSettings &mSettings;
LxQt::SettingsCache mOldSettings; LXQt::SettingsCache mOldSettings;
}; };

2
panel/main.cpp
View File

@ -36,7 +36,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
LxQtPanelApplication app(argc, argv); LXQtPanelApplication app(argc, argv);
return app.exec(); return app.exec();
} }

14
panel/panelpluginsmodel.cpp
View File

@ -34,7 +34,7 @@
#include <QDebug> #include <QDebug>
PanelPluginsModel::PanelPluginsModel(LxQtPanel * panel, PanelPluginsModel::PanelPluginsModel(LXQtPanel * panel,
QString const & namesKey, QString const & namesKey,
QStringList const & desktopDirs, QStringList const & desktopDirs,
QObject * parent/* = nullptr*/) QObject * parent/* = nullptr*/)
@ -127,9 +127,9 @@ Plugin const * PanelPluginsModel::pluginByID(QString id) const
return nullptr; return nullptr;
} }
void PanelPluginsModel::addPlugin(const LxQt::PluginInfo &desktopFile) void PanelPluginsModel::addPlugin(const LXQt::PluginInfo &desktopFile)
{ {
if (dynamic_cast<LxQtPanelApplication const *>(qApp)->isPluginSingletonAndRunnig(desktopFile.id())) if (dynamic_cast<LXQtPanelApplication const *>(qApp)->isPluginSingletonAndRunnig(desktopFile.id()))
return; return;
QString name = findNewPluginSettingsGroup(desktopFile.id()); QString name = findNewPluginSettingsGroup(desktopFile.id());
@ -211,7 +211,7 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs)
continue; continue;
} }
LxQt::PluginInfoList list = LxQt::PluginInfo::search(desktopDirs, "LxQtPanel/Plugin", QString("%1.desktop").arg(type)); LXQt::PluginInfoList list = LXQt::PluginInfo::search(desktopDirs, "LXQtPanel/Plugin", QString("%1.desktop").arg(type));
if( !list.count()) if( !list.count())
{ {
qWarning() << QString("Plugin \"%1\" not found.").arg(type); qWarning() << QString("Plugin \"%1\" not found.").arg(type);
@ -226,12 +226,12 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs)
} }
} }
QPointer<Plugin> PanelPluginsModel::loadPlugin(LxQt::PluginInfo const & desktopFile, QString const & settingsGroup) QPointer<Plugin> PanelPluginsModel::loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup)
{ {
std::unique_ptr<Plugin> plugin(new Plugin(desktopFile, mPanel->settings()->fileName(), settingsGroup, mPanel)); std::unique_ptr<Plugin> plugin(new Plugin(desktopFile, mPanel->settings()->fileName(), settingsGroup, mPanel));
if (plugin->isLoaded()) if (plugin->isLoaded())
{ {
connect(mPanel, &LxQtPanel::realigned, plugin.get(), &Plugin::realign); connect(mPanel, &LXQtPanel::realigned, plugin.get(), &Plugin::realign);
connect(plugin.get(), &Plugin::remove, connect(plugin.get(), &Plugin::remove,
this, static_cast<void (PanelPluginsModel::*)()>(&PanelPluginsModel::removePlugin)); this, static_cast<void (PanelPluginsModel::*)()>(&PanelPluginsModel::removePlugin));
return plugin.release(); return plugin.release();
@ -314,7 +314,7 @@ void PanelPluginsModel::onConfigurePlugin()
return; return;
Plugin * const plugin = mPlugins[mActive.row()].second.data(); Plugin * const plugin = mPlugins[mActive.row()].second.data();
if (nullptr != plugin && (ILxQtPanelPlugin::HaveConfigDialog & plugin->iPlugin()->flags())) if (nullptr != plugin && (ILXQtPanelPlugin::HaveConfigDialog & plugin->iPlugin()->flags()))
plugin->showConfigureDialog(); plugin->showConfigureDialog();
} }

12
panel/panelpluginsmodel.h
View File

@ -29,20 +29,20 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <memory> #include <memory>
namespace LxQt namespace LXQt
{ {
class PluginInfo; class PluginInfo;
struct PluginData; struct PluginData;
} }
class LxQtPanel; class LXQtPanel;
class Plugin; class Plugin;
class PanelPluginsModel : public QAbstractListModel class PanelPluginsModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
PanelPluginsModel(LxQtPanel * panel, PanelPluginsModel(LXQtPanel * panel,
QString const & namesKey, QString const & namesKey,
QStringList const & desktopDirs, QStringList const & desktopDirs,
QObject * parent = nullptr); QObject * parent = nullptr);
@ -73,7 +73,7 @@ signals:
void pluginMovedUp(Plugin * plugin); void pluginMovedUp(Plugin * plugin);
public slots: public slots:
void addPlugin(const LxQt::PluginInfo &desktopFile); void addPlugin(const LXQt::PluginInfo &desktopFile);
void removePlugin(); void removePlugin();
// slots for configuration dialog // slots for configuration dialog
@ -88,14 +88,14 @@ private:
private: private:
void loadPlugins(QStringList const & desktopDirs); void loadPlugins(QStringList const & desktopDirs);
QPointer<Plugin> loadPlugin(LxQt::PluginInfo const & desktopFile, QString const & settingsGroup); QPointer<Plugin> loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup);
QString findNewPluginSettingsGroup(const QString &pluginType) const; QString findNewPluginSettingsGroup(const QString &pluginType) const;
bool isActiveIndexValid() const; bool isActiveIndexValid() const;
void removePlugin(pluginslist_t::iterator plugin); void removePlugin(pluginslist_t::iterator plugin);
const QString mNamesKey; const QString mNamesKey;
pluginslist_t mPlugins; pluginslist_t mPlugins;
LxQtPanel * mPanel; LXQtPanel * mPanel;
QPersistentModelIndex mActive; QPersistentModelIndex mActive;
}; };

46
panel/plugin.cpp
View File

@ -65,7 +65,7 @@ QColor Plugin::mMoveMarkerColor= QColor(255, 0, 0, 255);
/************************************************ /************************************************
************************************************/ ************************************************/
Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LxQtPanel *panel) : Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel) :
QFrame(panel), QFrame(panel),
mDesktopFile(desktopFile), mDesktopFile(desktopFile),
mPluginLoader(0), mPluginLoader(0),
@ -76,7 +76,7 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile,
mPanel(panel) mPanel(panel)
{ {
mSettings = new LxQt::Settings(settingsFile, QSettings::IniFormat, this); mSettings = new LXQt::Settings(settingsFile, QSettings::IniFormat, this);
connect(mSettings, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); connect(mSettings, SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
mSettings->beginGroup(settingsGroup); mSettings->beginGroup(settingsGroup);
@ -90,7 +90,7 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile,
dirs << PLUGIN_DIR; dirs << PLUGIN_DIR;
bool found = false; bool found = false;
if(ILxQtPanelPluginLibrary const * pluginLib = findStaticPlugin(desktopFile.id())) if(ILXQtPanelPluginLibrary const * pluginLib = findStaticPlugin(desktopFile.id()))
{ {
// this is a static plugin // this is a static plugin
found = true; found = true;
@ -120,19 +120,19 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile,
} }
// Load plugin translations // Load plugin translations
LxQt::Translator::translatePlugin(desktopFile.id(), QLatin1String("lxqt-panel")); LXQt::Translator::translatePlugin(desktopFile.id(), QLatin1String("lxqt-panel"));
setObjectName(mPlugin->themeId() + "Plugin"); setObjectName(mPlugin->themeId() + "Plugin");
// plugin handle for easy context menu // plugin handle for easy context menu
setProperty("NeedsHandle", mPlugin->flags().testFlag(ILxQtPanelPlugin::NeedsHandle)); setProperty("NeedsHandle", mPlugin->flags().testFlag(ILXQtPanelPlugin::NeedsHandle));
QString s = mSettings->value("alignment").toString(); QString s = mSettings->value("alignment").toString();
// Retrun default value // Retrun default value
if (s.isEmpty()) if (s.isEmpty())
{ {
mAlignment = (mPlugin->flags().testFlag(ILxQtPanelPlugin::PreferRightAlignment)) ? mAlignment = (mPlugin->flags().testFlag(ILXQtPanelPlugin::PreferRightAlignment)) ?
Plugin::AlignRight : Plugin::AlignRight :
Plugin::AlignLeft; Plugin::AlignLeft;
} }
@ -184,22 +184,22 @@ void Plugin::setAlignment(Plugin::Alignment alignment)
namespace namespace
{ {
//helper types for static plugins storage & binary search //helper types for static plugins storage & binary search
typedef std::unique_ptr<ILxQtPanelPluginLibrary> plugin_ptr_t; typedef std::unique_ptr<ILXQtPanelPluginLibrary> plugin_ptr_t;
typedef std::pair<QString, plugin_ptr_t > plugin_pair_t; typedef std::pair<QString, plugin_ptr_t > plugin_pair_t;
//NOTE: Please keep the plugins sorted by name while adding new plugins. //NOTE: Please keep the plugins sorted by name while adding new plugins.
static plugin_pair_t const static_plugins[] = { static plugin_pair_t const static_plugins[] = {
#if defined(WITH_CLOCK_PLUGIN) #if defined(WITH_CLOCK_PLUGIN)
{ QStringLiteral("clock"), plugin_ptr_t{new LxQtClockPluginLibrary} },// clock { QStringLiteral("clock"), plugin_ptr_t{new LXQtClockPluginLibrary} },// clock
#endif #endif
#if defined(WITH_DESKTOPSWITCH_PLUGIN) #if defined(WITH_DESKTOPSWITCH_PLUGIN)
{ QStringLiteral("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary} },// desktopswitch { QStringLiteral("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary} },// desktopswitch
#endif #endif
#if defined(WITH_MAINMENU_PLUGIN) #if defined(WITH_MAINMENU_PLUGIN)
{ QStringLiteral("mainmenu"), plugin_ptr_t{new LxQtMainMenuPluginLibrary} },// mainmenu { QStringLiteral("mainmenu"), plugin_ptr_t{new LXQtMainMenuPluginLibrary} },// mainmenu
#endif #endif
#if defined(WITH_QUICKLAUNCH_PLUGIN) #if defined(WITH_QUICKLAUNCH_PLUGIN)
{ QStringLiteral("quicklaunch"), plugin_ptr_t{new LxQtQuickLaunchPluginLibrary} },// quicklaunch { QStringLiteral("quicklaunch"), plugin_ptr_t{new LXQtQuickLaunchPluginLibrary} },// quicklaunch
#endif #endif
#if defined(WITH_SHOWDESKTOP_PLUGIN) #if defined(WITH_SHOWDESKTOP_PLUGIN)
{ QStringLiteral("showdesktop"), plugin_ptr_t{new ShowDesktopLibrary} },// showdesktop { QStringLiteral("showdesktop"), plugin_ptr_t{new ShowDesktopLibrary} },// showdesktop
@ -211,13 +211,13 @@ namespace
{ QStringLiteral("statusnotifier"), plugin_ptr_t{new StatusNotifierLibrary} },// statusnotifier { QStringLiteral("statusnotifier"), plugin_ptr_t{new StatusNotifierLibrary} },// statusnotifier
#endif #endif
#if defined(WITH_TASKBAR_PLUGIN) #if defined(WITH_TASKBAR_PLUGIN)
{ QStringLiteral("taskbar"), plugin_ptr_t{new LxQtTaskBarPluginLibrary} },// taskbar { QStringLiteral("taskbar"), plugin_ptr_t{new LXQtTaskBarPluginLibrary} },// taskbar
#endif #endif
#if defined(WITH_TRAY_PLUGIN) #if defined(WITH_TRAY_PLUGIN)
{ QStringLiteral("tray"), plugin_ptr_t{new LxQtTrayPluginLibrary} },// tray { QStringLiteral("tray"), plugin_ptr_t{new LXQtTrayPluginLibrary} },// tray
#endif #endif
#if defined(WITH_WORLDCLOCK_PLUGIN) #if defined(WITH_WORLDCLOCK_PLUGIN)
{ QStringLiteral("worldclock"), plugin_ptr_t{new LxQtWorldClockLibrary} },// worldclock { QStringLiteral("worldclock"), plugin_ptr_t{new LXQtWorldClockLibrary} },// worldclock
#endif #endif
}; };
static constexpr plugin_pair_t const * const plugins_begin = static_plugins; static constexpr plugin_pair_t const * const plugins_begin = static_plugins;
@ -234,7 +234,7 @@ namespace
static assert_helper h; static assert_helper h;
} }
ILxQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryName) ILXQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryName)
{ {
// find a static plugin library by name -> binary search // find a static plugin library by name -> binary search
plugin_pair_t const * plugin = std::lower_bound(plugins_begin, plugins_end, libraryName plugin_pair_t const * plugin = std::lower_bound(plugins_begin, plugins_end, libraryName
@ -245,9 +245,9 @@ ILxQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryN
} }
// load a plugin from a library // load a plugin from a library
bool Plugin::loadLib(ILxQtPanelPluginLibrary const * pluginLib) bool Plugin::loadLib(ILXQtPanelPluginLibrary const * pluginLib)
{ {
ILxQtPanelPluginStartupInfo startupInfo; ILXQtPanelPluginStartupInfo startupInfo;
startupInfo.settings = mSettings; startupInfo.settings = mSettings;
startupInfo.desktopFile = &mDesktopFile; startupInfo.desktopFile = &mDesktopFile;
startupInfo.lxqtPanel = mPanel; startupInfo.lxqtPanel = mPanel;
@ -255,7 +255,7 @@ bool Plugin::loadLib(ILxQtPanelPluginLibrary const * pluginLib)
mPlugin = pluginLib->instance(startupInfo); mPlugin = pluginLib->instance(startupInfo);
if (!mPlugin) if (!mPlugin)
{ {
qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILxQtPanelPlugin.").arg(mPluginLoader->fileName()); qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mPluginLoader->fileName());
return false; return false;
} }
@ -286,10 +286,10 @@ bool Plugin::loadModule(const QString &libraryName)
return false; return false;
} }
ILxQtPanelPluginLibrary* pluginLib= qobject_cast<ILxQtPanelPluginLibrary*>(obj); ILXQtPanelPluginLibrary* pluginLib= qobject_cast<ILXQtPanelPluginLibrary*>(obj);
if (!pluginLib) if (!pluginLib)
{ {
qWarning() << QString("Can't load plugin \"%1\". Plugin is not a ILxQtPanelPluginLibrary.").arg(mPluginLoader->fileName()); qWarning() << QString("Can't load plugin \"%1\". Plugin is not a ILXQtPanelPluginLibrary.").arg(mPluginLoader->fileName());
delete obj; delete obj;
return false; return false;
} }
@ -356,11 +356,11 @@ void Plugin::mousePressEvent(QMouseEvent *event)
switch (event->button()) switch (event->button())
{ {
case Qt::LeftButton: case Qt::LeftButton:
mPlugin->activated(ILxQtPanelPlugin::Trigger); mPlugin->activated(ILXQtPanelPlugin::Trigger);
break; break;
case Qt::MidButton: case Qt::MidButton:
mPlugin->activated(ILxQtPanelPlugin::MiddleClick); mPlugin->activated(ILXQtPanelPlugin::MiddleClick);
break; break;
default: default:
@ -374,7 +374,7 @@ void Plugin::mousePressEvent(QMouseEvent *event)
************************************************/ ************************************************/
void Plugin::mouseDoubleClickEvent(QMouseEvent*) void Plugin::mouseDoubleClickEvent(QMouseEvent*)
{ {
mPlugin->activated(ILxQtPanelPlugin::DoubleClick); mPlugin->activated(ILXQtPanelPlugin::DoubleClick);
} }
@ -396,7 +396,7 @@ QMenu *Plugin::popupMenu() const
QString name = this->name().replace("&", "&&"); QString name = this->name().replace("&", "&&");
QMenu* menu = new QMenu(windowTitle()); QMenu* menu = new QMenu(windowTitle());
if (mPlugin->flags().testFlag(ILxQtPanelPlugin::HaveConfigDialog)) if (mPlugin->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog))
{ {
QAction* configAction = new QAction( QAction* configAction = new QAction(
XdgIcon::fromTheme(QStringLiteral("preferences-other")), XdgIcon::fromTheme(QStringLiteral("preferences-other")),

22
panel/plugin.h
View File

@ -37,9 +37,9 @@
class QPluginLoader; class QPluginLoader;
class QSettings; class QSettings;
class ILxQtPanelPlugin; class ILXQtPanelPlugin;
class ILxQtPanelPluginLibrary; class ILXQtPanelPluginLibrary;
class LxQtPanel; class LXQtPanel;
class QMenu; class QMenu;
@ -55,7 +55,7 @@ public:
}; };
explicit Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LxQtPanel *panel); explicit Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel);
~Plugin(); ~Plugin();
bool isLoaded() const { return mPlugin != 0; } bool isLoaded() const { return mPlugin != 0; }
@ -67,9 +67,9 @@ public:
void saveSettings(); void saveSettings();
QMenu* popupMenu() const; QMenu* popupMenu() const;
const ILxQtPanelPlugin * iPlugin() const { return mPlugin; } const ILXQtPanelPlugin * iPlugin() const { return mPlugin; }
const LxQt::PluginInfo desktopFile() const { return mDesktopFile; } const LXQt::PluginInfo desktopFile() const { return mDesktopFile; }
bool isSeparate() const; bool isSeparate() const;
bool isExpandable() const; bool isExpandable() const;
@ -98,19 +98,19 @@ protected:
void showEvent(QShowEvent *event); void showEvent(QShowEvent *event);
private: private:
bool loadLib(ILxQtPanelPluginLibrary const * pluginLib); bool loadLib(ILXQtPanelPluginLibrary const * pluginLib);
bool loadModule(const QString &libraryName); bool loadModule(const QString &libraryName);
ILxQtPanelPluginLibrary const * findStaticPlugin(const QString &libraryName); ILXQtPanelPluginLibrary const * findStaticPlugin(const QString &libraryName);
const LxQt::PluginInfo mDesktopFile; const LXQt::PluginInfo mDesktopFile;
QByteArray calcSettingsHash(); QByteArray calcSettingsHash();
QPluginLoader *mPluginLoader; QPluginLoader *mPluginLoader;
ILxQtPanelPlugin *mPlugin; ILXQtPanelPlugin *mPlugin;
QWidget *mPluginWidget; QWidget *mPluginWidget;
Alignment mAlignment; Alignment mAlignment;
QSettings *mSettings; QSettings *mSettings;
QString mSettingsGroup; QString mSettingsGroup;
LxQtPanel *mPanel; LXQtPanel *mPanel;
QByteArray mSettingsHash; QByteArray mSettingsHash;
static QColor mMoveMarkerColor; static QColor mMoveMarkerColor;
QString mName; QString mName;

10
panel/pluginmoveprocessor.cpp
View File

@ -35,7 +35,7 @@
/************************************************ /************************************************
************************************************/ ************************************************/
PluginMoveProcessor::PluginMoveProcessor(LxQtPanelLayout *layout, Plugin *plugin): PluginMoveProcessor::PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin):
QWidget(plugin), QWidget(plugin),
mLayout(layout), mLayout(layout),
mPlugin(plugin) mPlugin(plugin)
@ -108,8 +108,8 @@ void PluginMoveProcessor::mouseMoveEvent(QMouseEvent *event)
} }
bool plugSep = mPlugin->isSeparate(); bool plugSep = mPlugin->isSeparate();
bool prevSep = LxQtPanelLayout::itemIsSeparate(prevItem); bool prevSep = LXQtPanelLayout::itemIsSeparate(prevItem);
bool nextSep = LxQtPanelLayout::itemIsSeparate(nextItem); bool nextSep = LXQtPanelLayout::itemIsSeparate(nextItem);
if (!nextItem) if (!nextItem)
{ {
@ -178,13 +178,13 @@ PluginMoveProcessor::MousePosInfo PluginMoveProcessor::itemByMousePos(const QPoi
ret.item = item; ret.item = item;
if (mLayout->isHorizontal()) if (mLayout->isHorizontal())
{ {
ret.after = LxQtPanelLayout::itemIsSeparate(item) ? ret.after = LXQtPanelLayout::itemIsSeparate(item) ?
mouse.x() > itemRect.center().x() : mouse.x() > itemRect.center().x() :
mouse.y() > itemRect.center().y() ; mouse.y() > itemRect.center().y() ;
} }
else else
{ {
ret.after = LxQtPanelLayout::itemIsSeparate(item) ? ret.after = LXQtPanelLayout::itemIsSeparate(item) ?
mouse.y() > itemRect.center().y() : mouse.y() > itemRect.center().y() :
mouse.x() > itemRect.center().x() ; mouse.x() > itemRect.center().x() ;
} }

6
panel/pluginmoveprocessor.h
View File

@ -35,7 +35,7 @@
#include "plugin.h" #include "plugin.h"
#include "lxqtpanelglobals.h" #include "lxqtpanelglobals.h"
class LxQtPanelLayout; class LXQtPanelLayout;
class QLayoutItem; class QLayoutItem;
@ -43,7 +43,7 @@ class LXQT_PANEL_API PluginMoveProcessor : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PluginMoveProcessor(LxQtPanelLayout *layout, Plugin *plugin); explicit PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin);
~PluginMoveProcessor(); ~PluginMoveProcessor();
Plugin *plugin() const { return mPlugin; } Plugin *plugin() const { return mPlugin; }
@ -80,7 +80,7 @@ private:
bool after; bool after;
}; };
LxQtPanelLayout *mLayout; LXQtPanelLayout *mLayout;
Plugin *mPlugin; Plugin *mPlugin;
int mDestIndex; int mDestIndex;

2
panel/translations/lxqt-panel.ts
View File

@ -284,7 +284,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="912"/> <location filename="../lxqtpanel.cpp" line="912"/>
<location filename="../lxqtpanel.cpp" line="931"/> <location filename="../lxqtpanel.cpp" line="931"/>

6
panel/translations/lxqt-panel_ar.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">تهيئة</translation> <translation type="vanished">تهيئة</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">تهيئة اللوحة</translation> <translation type="vanished">تهيئة اللوحة</translation>

6
panel/translations/lxqt-panel_cs.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Nastavit</translation> <translation type="vanished">Nastavit</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Nastavit panel</translation> <translation type="vanished">Nastavit panel</translation>

6
panel/translations/lxqt-panel_cs_CZ.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Nastavit</translation> <translation type="vanished">Nastavit</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Nastavit panel</translation> <translation type="vanished">Nastavit panel</translation>

6
panel/translations/lxqt-panel_da.ts
View File

@ -238,7 +238,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -272,7 +272,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPluginPrivate</name> <name>LXQtPanelPluginPrivate</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Indstil</translation> <translation type="vanished">Indstil</translation>
@ -287,7 +287,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Panel</source> <source>Panel</source>
<translation type="vanished">Panel</translation> <translation type="vanished">Panel</translation>

6
panel/translations/lxqt-panel_da_DK.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Indstil</translation> <translation type="vanished">Indstil</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Indstil panel</translation> <translation type="vanished">Indstil panel</translation>

2
panel/translations/lxqt-panel_de.ts
View File

@ -284,7 +284,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="912"/> <location filename="../lxqtpanel.cpp" line="912"/>
<location filename="../lxqtpanel.cpp" line="931"/> <location filename="../lxqtpanel.cpp" line="931"/>

106
panel/translations/lxqt-panel_el_GR.ts → panel/translations/lxqt-panel_el.ts
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="el_GR"> <TS version="2.1" language="el">
<context> <context>
<name>ConfigPanelDialog</name> <name>ConfigPanelDialog</name>
<message> <message>
@ -91,7 +91,7 @@
<location filename="../config/configpaneldialog.cpp" line="80"/> <location filename="../config/configpaneldialog.cpp" line="80"/>
<location filename="../config/configpaneldialog.cpp" line="86"/> <location filename="../config/configpaneldialog.cpp" line="86"/>
<source>Configure Panel</source> <source>Configure Panel</source>
<translation type="unfinished"></translation> <translation>Διαμόρφωση του πίνακα</translation>
</message> </message>
</context> </context>
<context> <context>
@ -99,186 +99,186 @@
<message> <message>
<location filename="../config/configpaneldialog.ui" line="20"/> <location filename="../config/configpaneldialog.ui" line="20"/>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="unfinished">Διαμόρφωση πίνακα</translation> <translation>Διαμόρφωση του πίνακα</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="32"/> <location filename="../config/configpaneldialog.ui" line="32"/>
<source>Size</source> <source>Size</source>
<translation type="unfinished"></translation> <translation>Μέγεθος</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="41"/> <location filename="../config/configpaneldialog.ui" line="41"/>
<source>Size:</source> <source>Size:</source>
<translation type="unfinished">Μέγεθος:</translation> <translation>Μέγεθος:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="48"/> <location filename="../config/configpaneldialog.ui" line="48"/>
<location filename="../config/configpaneldialog.ui" line="82"/> <location filename="../config/configpaneldialog.ui" line="82"/>
<source> px</source> <source> px</source>
<translation type="unfinished"></translation> <translation> εικ</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="58"/> <location filename="../config/configpaneldialog.ui" line="58"/>
<source>Icon size:</source> <source>Icon size:</source>
<translation type="unfinished"></translation> <translation>Μέγεθος εικονιδίων:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="65"/> <location filename="../config/configpaneldialog.ui" line="65"/>
<source>Length:</source> <source>Length:</source>
<translation type="unfinished">Μήκος:</translation> <translation>Μήκος:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="110"/> <location filename="../config/configpaneldialog.ui" line="110"/>
<source>&lt;p&gt;Negative pixel value sets the panel length to that many pixels less than available screen space.&lt;/p&gt;&lt;p/&gt;&lt;p&gt;&lt;i&gt;E.g. &quot;Length&quot; set to -100px, screen size is 1000px, then real panel length will be 900 px.&lt;/i&gt;&lt;/p&gt;</source> <source>&lt;p&gt;Negative pixel value sets the panel length to that many pixels less than available screen space.&lt;/p&gt;&lt;p/&gt;&lt;p&gt;&lt;i&gt;E.g. &quot;Length&quot; set to -100px, screen size is 1000px, then real panel length will be 900 px.&lt;/i&gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;p&gt;Μια αρνητική τιμή εικονοστοιχείων θέτει το μήκος του πίνακα σε τόσα εικονοστοιχεία λιγότερο από τον διαθέσιμο χώρο της οθόνης.&lt;/p&gt;&lt;p/&gt;&lt;p&gt;&lt;i&gt;Π.χ. θέτοντας το «Μήκος» σε -100εικ, και με μέγεθος οθόνης 1000εικ, τότε το πραγματικό μήκος του πίνακα θα είναι 900 εικ.&lt;/i&gt;&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="124"/> <location filename="../config/configpaneldialog.ui" line="124"/>
<source>%</source> <source>%</source>
<translation type="unfinished">%</translation> <translation>%</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="129"/> <location filename="../config/configpaneldialog.ui" line="129"/>
<source>px</source> <source>px</source>
<translation type="unfinished">px</translation> <translation>εικ</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="140"/> <location filename="../config/configpaneldialog.ui" line="140"/>
<source>Rows count:</source> <source>Rows count:</source>
<translation type="unfinished"></translation> <translation>Πλήθος γραμμών:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="172"/> <location filename="../config/configpaneldialog.ui" line="172"/>
<source>Alignment &amp;&amp; position</source> <source>Alignment &amp;&amp; position</source>
<translation type="unfinished"></translation> <translation>Στοίχιση &amp;&amp; θέση</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="182"/> <location filename="../config/configpaneldialog.ui" line="182"/>
<location filename="../config/configpaneldialog.cpp" line="234"/> <location filename="../config/configpaneldialog.cpp" line="234"/>
<source>Left</source> <source>Left</source>
<translation type="unfinished">Αριστερά</translation> <translation>Αριστερά</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="187"/> <location filename="../config/configpaneldialog.ui" line="187"/>
<location filename="../config/configpaneldialog.cpp" line="235"/> <location filename="../config/configpaneldialog.cpp" line="235"/>
<location filename="../config/configpaneldialog.cpp" line="241"/> <location filename="../config/configpaneldialog.cpp" line="241"/>
<source>Center</source> <source>Center</source>
<translation type="unfinished">Κέντρο</translation> <translation>Κέντρο</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="192"/> <location filename="../config/configpaneldialog.ui" line="192"/>
<location filename="../config/configpaneldialog.cpp" line="236"/> <location filename="../config/configpaneldialog.cpp" line="236"/>
<source>Right</source> <source>Right</source>
<translation type="unfinished">Δεξιά</translation> <translation>Δεξιά</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="200"/> <location filename="../config/configpaneldialog.ui" line="200"/>
<source>Alignment:</source> <source>Alignment:</source>
<translation type="unfinished">Στοίχιση:</translation> <translation>Στοίχιση:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="210"/> <location filename="../config/configpaneldialog.ui" line="210"/>
<source>Position:</source> <source>Position:</source>
<translation type="unfinished">Θέση:</translation> <translation>Θέση:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="217"/> <location filename="../config/configpaneldialog.ui" line="217"/>
<source>Auto-hide</source> <source>Auto-hide</source>
<translation type="unfinished"></translation> <translation>Αυτόματη απόκρυψη</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="233"/> <location filename="../config/configpaneldialog.ui" line="233"/>
<source>Styling</source> <source>Styling</source>
<translation type="unfinished"></translation> <translation>Ύφος</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="239"/> <location filename="../config/configpaneldialog.ui" line="239"/>
<source>Custom font color:</source> <source>Custom font color:</source>
<translation type="unfinished"></translation> <translation>Προσαρμοσμένο χρώμα γραμματοσειράς:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="246"/> <location filename="../config/configpaneldialog.ui" line="246"/>
<source>Custom background image:</source> <source>Custom background image:</source>
<translation type="unfinished"></translation> <translation>Προσαρμοσμένη εικόνα ταπετσαρίας:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="260"/> <location filename="../config/configpaneldialog.ui" line="260"/>
<source>Custom background color:</source> <source>Custom background color:</source>
<translation type="unfinished"></translation> <translation>Προσαρμοσμένο χρώμα ταπετσαρίας:</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.ui" line="351"/> <location filename="../config/configpaneldialog.ui" line="351"/>
<source>Opacity</source> <source>Opacity</source>
<translation type="unfinished"></translation> <translation>Αδιαφάνεια</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="200"/> <location filename="../config/configpaneldialog.cpp" line="200"/>
<source>Top of desktop</source> <source>Top of desktop</source>
<translation type="unfinished">Επάνω στην επιφάνεια εργασίας</translation> <translation>Στην κορυφή της επιφάνεια εργασίας</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="201"/> <location filename="../config/configpaneldialog.cpp" line="201"/>
<source>Left of desktop</source> <source>Left of desktop</source>
<translation type="unfinished">Αριστερά στην επιφάνεια εργασίας</translation> <translation>Στα αριστερά της επιφάνειας εργασίας</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="202"/> <location filename="../config/configpaneldialog.cpp" line="202"/>
<source>Right of desktop</source> <source>Right of desktop</source>
<translation type="unfinished">Δεξιά στην επιφάνεια εργασίας</translation> <translation>Στα δεξιά της επιφάνειας εργασίας</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="203"/> <location filename="../config/configpaneldialog.cpp" line="203"/>
<source>Bottom of desktop</source> <source>Bottom of desktop</source>
<translation type="unfinished">Κάτω στην επιφάνεια εργασίας</translation> <translation>Στη βάση της επιφάνειας εργασίας</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="212"/> <location filename="../config/configpaneldialog.cpp" line="212"/>
<source>Top of desktop %1</source> <source>Top of desktop %1</source>
<translation type="unfinished">Επάνω στην επιφάνεια εργασίας %1</translation> <translation>Στην κορυφή της επιφάνειας εργασίας %1</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="213"/> <location filename="../config/configpaneldialog.cpp" line="213"/>
<source>Left of desktop %1</source> <source>Left of desktop %1</source>
<translation type="unfinished">Αριστερά στην επιφάνεια εργασίας %1</translation> <translation>Στα αριστερά της επιφάνειας εργασίας %1</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="214"/> <location filename="../config/configpaneldialog.cpp" line="214"/>
<source>Right of desktop %1</source> <source>Right of desktop %1</source>
<translation type="unfinished">Δεξιά στην επιφάνεια εργασίας %1</translation> <translation>Στα δεξιά της επιφάνειας εργασίας %1</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="215"/> <location filename="../config/configpaneldialog.cpp" line="215"/>
<source>Bottom of desktop %1</source> <source>Bottom of desktop %1</source>
<translation type="unfinished">Κάτω στην επιφάνεια εργασίας %1</translation> <translation>Στη βάση της επιφάνειας εργασίας %1</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="240"/> <location filename="../config/configpaneldialog.cpp" line="240"/>
<source>Top</source> <source>Top</source>
<translation type="unfinished"></translation> <translation>Κορυφή</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="242"/> <location filename="../config/configpaneldialog.cpp" line="242"/>
<source>Bottom</source> <source>Bottom</source>
<translation type="unfinished"></translation> <translation>Βάση</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="397"/> <location filename="../config/configpaneldialog.cpp" line="397"/>
<location filename="../config/configpaneldialog.cpp" line="411"/> <location filename="../config/configpaneldialog.cpp" line="411"/>
<source>Pick color</source> <source>Pick color</source>
<translation type="unfinished"></translation> <translation>Επιλέξτε το χρώμα</translation>
</message> </message>
<message> <message>
<location filename="../config/configpaneldialog.cpp" line="431"/> <location filename="../config/configpaneldialog.cpp" line="431"/>
<source>Images (*.png *.gif *.jpg)</source> <source>Images (*.png *.gif *.jpg)</source>
<translation type="unfinished"></translation> <translation>Εικόνες (*.png *.gif *.jpg)</translation>
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
<translation type="unfinished"></translation> <translation>Προσθήκη γραφικών συστατικών στον πίνακα</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="951"/> <location filename="../lxqtpanel.cpp" line="951"/>
@ -289,52 +289,52 @@
<message> <message>
<location filename="../lxqtpanel.cpp" line="973"/> <location filename="../lxqtpanel.cpp" line="973"/>
<source>Configure Panel...</source> <source>Configure Panel...</source>
<translation type="unfinished"></translation> <translation>Διαμόρφωση του πίνακα...</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="978"/> <location filename="../lxqtpanel.cpp" line="978"/>
<source>Add Panel Widgets...</source> <source>Add Panel Widgets...</source>
<translation type="unfinished"></translation> <translation>Προσθήκη γραφικών συστατικών στον πίνακα...</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="984"/> <location filename="../lxqtpanel.cpp" line="984"/>
<source>Add Panel</source> <source>Add Panel</source>
<translation type="unfinished"></translation> <translation>Προσθήκη πίνακα</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="991"/> <location filename="../lxqtpanel.cpp" line="991"/>
<source>Remove Panel</source> <source>Remove Panel</source>
<translation type="unfinished"></translation> <translation>Αφαίρεση πίνακα</translation>
</message> </message>
<message> <message>
<source>Configure panel...</source> <source>Configure panel...</source>
<translation type="vanished">Διαμόρφωση πίνακα...</translation> <translation>Διαμόρφωση του πίνακα...</translation>
</message> </message>
<message> <message>
<source>Add plugins ...</source> <source>Add plugins ...</source>
<translation type="vanished">Προσθήκη επεκτάσεων...</translation> <translation>Προσθήκη πρόσθετων...</translation>
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Διαμόρφωση</translation> <translation>Διαμόρφωση</translation>
</message> </message>
<message> <message>
<source>Move</source> <source>Move</source>
<translation type="vanished">Μετακίνηση</translation> <translation>Μετακίνηση</translation>
</message> </message>
<message> <message>
<source>Remove</source> <source>Remove</source>
<translation type="vanished">Αφαίρεση</translation> <translation>Αφαίρεση</translation>
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Διαμόρφωση πίνακα</translation> <translation>Διαμόρφωση του πίνακα</translation>
</message> </message>
</context> </context>
<context> <context>
@ -342,17 +342,17 @@
<message> <message>
<location filename="../plugin.cpp" line="395"/> <location filename="../plugin.cpp" line="395"/>
<source>Configure &quot;%1&quot;</source> <source>Configure &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>Διαμόρφωση του «%1»</translation>
</message> </message>
<message> <message>
<location filename="../plugin.cpp" line="400"/> <location filename="../plugin.cpp" line="400"/>
<source>Move &quot;%1&quot;</source> <source>Move &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>Μετακίνηση του «%1»</translation>
</message> </message>
<message> <message>
<location filename="../plugin.cpp" line="408"/> <location filename="../plugin.cpp" line="408"/>
<source>Remove &quot;%1&quot;</source> <source>Remove &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>Αφαίρεση του «%1»</translation>
</message> </message>
</context> </context>
</TS> </TS>

8
panel/translations/lxqt-panel_eo.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -284,7 +284,7 @@
<location filename="../lxqtpanel.cpp" line="951"/> <location filename="../lxqtpanel.cpp" line="951"/>
<location filename="../lxqtpanel.cpp" line="970"/> <location filename="../lxqtpanel.cpp" line="970"/>
<source>Panel</source> <source>Panel</source>
<translation>Agordoj de muso por LxQto</translation> <translation>Agordoj de muso por LXQto</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="973"/> <location filename="../lxqtpanel.cpp" line="973"/>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Agordi</translation> <translation type="vanished">Agordi</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Agordi panelon</translation> <translation type="vanished">Agordi panelon</translation>

6
panel/translations/lxqt-panel_es.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurar</translation> <translation type="vanished">Configurar</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurar panel</translation> <translation type="vanished">Configurar panel</translation>

4
panel/translations/lxqt-panel_es_UY.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -224,7 +224,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Panel</source> <source>Panel</source>
<translation type="vanished">Panel</translation> <translation type="vanished">Panel</translation>

6
panel/translations/lxqt-panel_es_VE.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurar</translation> <translation type="vanished">Configurar</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurar panel</translation> <translation type="vanished">Configurar panel</translation>

6
panel/translations/lxqt-panel_eu.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Konfiguratu</translation> <translation type="vanished">Konfiguratu</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Konfiguratu panela</translation> <translation type="vanished">Konfiguratu panela</translation>

6
panel/translations/lxqt-panel_fi.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Muokkaa</translation> <translation type="vanished">Muokkaa</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Muokkaa paneelia</translation> <translation type="vanished">Muokkaa paneelia</translation>

6
panel/translations/lxqt-panel_fr_FR.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurer</translation> <translation type="vanished">Configurer</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurer le tableau de bord</translation> <translation type="vanished">Configurer le tableau de bord</translation>

2
panel/translations/lxqt-panel_hu.ts
View File

@ -222,7 +222,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

2
panel/translations/lxqt-panel_hu_HU.ts
View File

@ -222,7 +222,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

2
panel/translations/lxqt-panel_ia.ts
View File

@ -198,7 +198,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

2
panel/translations/lxqt-panel_id_ID.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

6
panel/translations/lxqt-panel_it.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -317,7 +317,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configura</translation> <translation type="vanished">Configura</translation>
@ -332,7 +332,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configura pannello</translation> <translation type="vanished">Configura pannello</translation>

6
panel/translations/lxqt-panel_it_IT.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -317,7 +317,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configura</translation> <translation type="vanished">Configura</translation>
@ -332,7 +332,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configura pannello</translation> <translation type="vanished">Configura pannello</translation>

2
panel/translations/lxqt-panel_ja.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

2
panel/translations/lxqt-panel_ko.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

6
panel/translations/lxqt-panel_lt.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Konfigūruoti</translation> <translation type="vanished">Konfigūruoti</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Skydelio konfigūravimas</translation> <translation type="vanished">Skydelio konfigūravimas</translation>

6
panel/translations/lxqt-panel_nl.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Instellen</translation> <translation type="vanished">Instellen</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Paneel instellingen</translation> <translation type="vanished">Paneel instellingen</translation>

2
panel/translations/lxqt-panel_pl.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

6
panel/translations/lxqt-panel_pl_PL.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Konfiguruj</translation> <translation type="vanished">Konfiguruj</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Konfiguruj panel</translation> <translation type="vanished">Konfiguruj panel</translation>

6
panel/translations/lxqt-panel_pt.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurar</translation> <translation type="vanished">Configurar</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurar painel</translation> <translation type="vanished">Configurar painel</translation>

6
panel/translations/lxqt-panel_pt_BR.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurar</translation> <translation type="vanished">Configurar</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurar painel</translation> <translation type="vanished">Configurar painel</translation>

6
panel/translations/lxqt-panel_ro_RO.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Configurează</translation> <translation type="vanished">Configurează</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Configurează panoul</translation> <translation type="vanished">Configurează panoul</translation>

2
panel/translations/lxqt-panel_ru.ts
View File

@ -284,7 +284,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="912"/> <location filename="../lxqtpanel.cpp" line="912"/>
<location filename="../lxqtpanel.cpp" line="931"/> <location filename="../lxqtpanel.cpp" line="931"/>

2
panel/translations/lxqt-panel_ru_RU.ts
View File

@ -284,7 +284,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="912"/> <location filename="../lxqtpanel.cpp" line="912"/>
<location filename="../lxqtpanel.cpp" line="931"/> <location filename="../lxqtpanel.cpp" line="931"/>

4
panel/translations/lxqt-panel_sk_SK.ts
View File

@ -246,7 +246,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -284,7 +284,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Nastaviť panel</translation> <translation type="vanished">Nastaviť panel</translation>

6
panel/translations/lxqt-panel_sl.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Nastavitev</translation> <translation type="vanished">Nastavitev</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Nastavitev pulta</translation> <translation type="vanished">Nastavitev pulta</translation>

2
panel/translations/lxqt-panel_sr@latin.ts
View File

@ -190,7 +190,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>

6
panel/translations/lxqt-panel_sr_BA.ts
View File

@ -238,7 +238,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -272,7 +272,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPluginPrivate</name> <name>LXQtPanelPluginPrivate</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Подеси</translation> <translation type="vanished">Подеси</translation>
@ -287,7 +287,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Panel</source> <source>Panel</source>
<translation type="vanished">Панел</translation> <translation type="vanished">Панел</translation>

6
panel/translations/lxqt-panel_sr_RS.ts
View File

@ -262,7 +262,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -300,7 +300,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Подеси</translation> <translation type="vanished">Подеси</translation>
@ -311,7 +311,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Подеси панел</translation> <translation type="vanished">Подеси панел</translation>

6
panel/translations/lxqt-panel_th_TH.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">ปรับแต่ง</translation> <translation type="vanished">ปรับแต่ง</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">ปรับแต่งพาเนล</translation> <translation type="vanished">ปรับแต่งพาเนล</translation>

6
panel/translations/lxqt-panel_tr.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Yapılandır</translation> <translation type="vanished">Yapılandır</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Paneli yapılandır</translation> <translation type="vanished">Paneli yapılandır</translation>

6
panel/translations/lxqt-panel_uk.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">Налаштувати</translation> <translation type="vanished">Налаштувати</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">Налаштувати панель</translation> <translation type="vanished">Налаштувати панель</translation>

6
panel/translations/lxqt-panel_zh_CN.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">配置</translation> <translation type="vanished">配置</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">配置面板</translation> <translation type="vanished">配置面板</translation>

8
panel/translations/lxqt-panel_zh_TW.ts
View File

@ -274,7 +274,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanel</name> <name>LXQtPanel</name>
<message> <message>
<location filename="../lxqtpanel.cpp" line="623"/> <location filename="../lxqtpanel.cpp" line="623"/>
<source>Add Panel Widgets</source> <source>Add Panel Widgets</source>
@ -284,7 +284,7 @@
<location filename="../lxqtpanel.cpp" line="951"/> <location filename="../lxqtpanel.cpp" line="951"/>
<location filename="../lxqtpanel.cpp" line="970"/> <location filename="../lxqtpanel.cpp" line="970"/>
<source>Panel</source> <source>Panel</source>
<translation>LxQt滑鼠設定</translation> <translation>LXQt滑鼠設定</translation>
</message> </message>
<message> <message>
<location filename="../lxqtpanel.cpp" line="973"/> <location filename="../lxqtpanel.cpp" line="973"/>
@ -316,7 +316,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPlugin</name> <name>LXQtPanelPlugin</name>
<message> <message>
<source>Configure</source> <source>Configure</source>
<translation type="vanished">設定</translation> <translation type="vanished">設定</translation>
@ -331,7 +331,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPanelPrivate</name> <name>LXQtPanelPrivate</name>
<message> <message>
<source>Configure panel</source> <source>Configure panel</source>
<translation type="vanished">設定面板</translation> <translation type="vanished">設定面板</translation>

40
plugin-clock/lxqtclock.cpp
View File

@ -47,7 +47,7 @@
/** /**
* @file lxqtclock.cpp * @file lxqtclock.cpp
* @brief implements LxQtclock and LxQtclockgui * @brief implements LXQtclock and LXQtclockgui
* @author Christopher "VdoP" Regali * @author Christopher "VdoP" Regali
* @author Kuzma Shapran * @author Kuzma Shapran
*/ */
@ -75,15 +75,15 @@ public:
/** /**
* @brief constructor * @brief constructor
*/ */
LxQtClock::LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo): LXQtClock::LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo):
QObject(), QObject(),
ILxQtPanelPlugin(startupInfo), ILXQtPanelPlugin(startupInfo),
mAutoRotate(true), mAutoRotate(true),
mTextStyle{new DownscaleFontStyle}, mTextStyle{new DownscaleFontStyle},
mCurrentCharCount(0) mCurrentCharCount(0)
{ {
mMainWidget = new QWidget(); mMainWidget = new QWidget();
mRotatedWidget = new LxQt::RotatedWidget(*(new QWidget()), mMainWidget); mRotatedWidget = new LXQt::RotatedWidget(*(new QWidget()), mMainWidget);
mContent = mRotatedWidget->content(); mContent = mRotatedWidget->content();
mContent->setStyle(mTextStyle.data()); mContent->setStyle(mTextStyle.data());
mTimeLabel = new QLabel(mContent); mTimeLabel = new QLabel(mContent);
@ -121,12 +121,12 @@ LxQtClock::LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo):
/** /**
* @brief destructor * @brief destructor
*/ */
LxQtClock::~LxQtClock() LXQtClock::~LXQtClock()
{ {
delete mMainWidget; delete mMainWidget;
} }
QDateTime LxQtClock::currentDateTime() QDateTime LXQtClock::currentDateTime()
{ {
return QDateTime(mUseUTC ? QDateTime::currentDateTimeUtc() : QDateTime::currentDateTime()); return QDateTime(mUseUTC ? QDateTime::currentDateTimeUtc() : QDateTime::currentDateTime());
} }
@ -135,7 +135,7 @@ QDateTime LxQtClock::currentDateTime()
* @brief updates the time * @brief updates the time
* Color and font settings can be configured in Qt CSS * Color and font settings can be configured in Qt CSS
*/ */
void LxQtClock::updateTime() void LXQtClock::updateTime()
{ {
//XXX: do we need this with PreciseTimer ? //XXX: do we need this with PreciseTimer ?
if (currentDateTime().time().msec() > 500) if (currentDateTime().time().msec() > 500)
@ -144,7 +144,7 @@ void LxQtClock::updateTime()
showTime(); showTime();
} }
void LxQtClock::showTime() void LXQtClock::showTime()
{ {
QDateTime now{currentDateTime()}; QDateTime now{currentDateTime()};
int new_char_count; int new_char_count;
@ -170,7 +170,7 @@ void LxQtClock::showTime()
} }
} }
void LxQtClock::restartTimer() void LXQtClock::restartTimer()
{ {
if (mClockTimer->isActive()) if (mClockTimer->isActive())
mClockTimer->stop(); mClockTimer->stop();
@ -181,7 +181,7 @@ void LxQtClock::restartTimer()
QTimer::singleShot(delay, Qt::PreciseTimer, this, SLOT(updateTime())); QTimer::singleShot(delay, Qt::PreciseTimer, this, SLOT(updateTime()));
} }
void LxQtClock::settingsChanged() void LXQtClock::settingsChanged()
{ {
mFirstDayOfWeek = settings()->value("firstDayOfWeek", -1).toInt(); mFirstDayOfWeek = settings()->value("firstDayOfWeek", -1).toInt();
if (-1 == mFirstDayOfWeek) if (-1 == mFirstDayOfWeek)
@ -227,7 +227,7 @@ void LxQtClock::settingsChanged()
} }
} }
void LxQtClock::realign() void LXQtClock::realign()
{ {
QSize size{QWIDGETSIZE_MAX, QWIDGETSIZE_MAX}; QSize size{QWIDGETSIZE_MAX, QWIDGETSIZE_MAX};
Qt::Corner origin = Qt::TopLeftCorner; Qt::Corner origin = Qt::TopLeftCorner;
@ -235,16 +235,16 @@ void LxQtClock::realign()
{ {
switch (panel()->position()) switch (panel()->position())
{ {
case ILxQtPanel::PositionTop: case ILXQtPanel::PositionTop:
case ILxQtPanel::PositionBottom: case ILXQtPanel::PositionBottom:
origin = Qt::TopLeftCorner; origin = Qt::TopLeftCorner;
break; break;
case ILxQtPanel::PositionLeft: case ILXQtPanel::PositionLeft:
origin = Qt::BottomLeftCorner; origin = Qt::BottomLeftCorner;
break; break;
case ILxQtPanel::PositionRight: case ILXQtPanel::PositionRight:
origin = Qt::TopRightCorner; origin = Qt::TopRightCorner;
break; break;
} }
@ -277,9 +277,9 @@ void LxQtClock::realign()
} }
} }
void LxQtClock::activated(ActivationReason reason) void LXQtClock::activated(ActivationReason reason)
{ {
if (reason != ILxQtPanelPlugin::Trigger) if (reason != ILXQtPanelPlugin::Trigger)
return; return;
if (!mCalendarPopup->isVisible()) if (!mCalendarPopup->isVisible())
@ -294,12 +294,12 @@ void LxQtClock::activated(ActivationReason reason)
} }
} }
QDialog * LxQtClock::configureDialog() QDialog * LXQtClock::configureDialog()
{ {
return new LxQtClockConfiguration(*settings()); return new LXQtClockConfiguration(*settings());
} }
bool LxQtClock::eventFilter(QObject *watched, QEvent *event) bool LXQtClock::eventFilter(QObject *watched, QEvent *event)
{ {
if (watched == mMainWidget) if (watched == mMainWidget)
{ {

14
plugin-clock/lxqtclock.h
View File

@ -43,12 +43,12 @@ class QDialog;
class QTimer; class QTimer;
class QProxyStyle; class QProxyStyle;
class LxQtClock : public QObject, public ILxQtPanelPlugin class LXQtClock : public QObject, public ILXQtPanelPlugin
{ {
Q_OBJECT Q_OBJECT
public: public:
LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo); LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo);
~LxQtClock(); ~LXQtClock();
virtual Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } virtual Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; }
QString themeId() const { return "Clock"; } QString themeId() const { return "Clock"; }
@ -71,7 +71,7 @@ private:
QTimer* mClockTimer; QTimer* mClockTimer;
QWidget *mMainWidget; QWidget *mMainWidget;
QWidget *mContent; QWidget *mContent;
LxQt::RotatedWidget* mRotatedWidget; LXQt::RotatedWidget* mRotatedWidget;
QLabel* mTimeLabel; QLabel* mTimeLabel;
QLabel* mDateLabel; QLabel* mDateLabel;
QString mClockFormat; QString mClockFormat;
@ -92,13 +92,13 @@ private:
}; };
class LxQtClockPluginLibrary: public QObject, public ILxQtPanelPluginLibrary class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
{ {
Q_OBJECT Q_OBJECT
// Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0")
Q_INTERFACES(ILxQtPanelPluginLibrary) Q_INTERFACES(ILXQtPanelPluginLibrary)
public: public:
ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new LxQtClock(startupInfo);} ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtClock(startupInfo);}
}; };

18
plugin-clock/lxqtclockconfiguration.cpp
View File

@ -75,9 +75,9 @@ namespace
}; };
} }
LxQtClockConfiguration::LxQtClockConfiguration(QSettings &settings, QWidget *parent) : LXQtClockConfiguration::LXQtClockConfiguration(QSettings &settings, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::LxQtClockConfiguration), ui(new Ui::LXQtClockConfiguration),
mSettings(settings), mSettings(settings),
oldSettings(settings), oldSettings(settings),
mOldIndex(1) mOldIndex(1)
@ -109,20 +109,20 @@ LxQtClockConfiguration::LxQtClockConfiguration(QSettings &settings, QWidget *par
connect(ui->firstDayOfWeekCB, SIGNAL(activated(int)), SLOT(saveSettings())); connect(ui->firstDayOfWeekCB, SIGNAL(activated(int)), SLOT(saveSettings()));
} }
LxQtClockConfiguration::~LxQtClockConfiguration() LXQtClockConfiguration::~LXQtClockConfiguration()
{ {
delete ui; delete ui;
} }
static int currentYear = QDate::currentDate().year(); static int currentYear = QDate::currentDate().year();
void LxQtClockConfiguration::addDateFormat(const QString &format) void LXQtClockConfiguration::addDateFormat(const QString &format)
{ {
if (ui->dateFormatCOB->findData(QVariant(format)) == -1) if (ui->dateFormatCOB->findData(QVariant(format)) == -1)
ui->dateFormatCOB->addItem(QDate(currentYear, 1, 1).toString(format), QVariant(format)); ui->dateFormatCOB->addItem(QDate(currentYear, 1, 1).toString(format), QVariant(format));
} }
void LxQtClockConfiguration::createDateFormats() void LXQtClockConfiguration::createDateFormats()
{ {
ui->dateFormatCOB->clear(); ui->dateFormatCOB->clear();
@ -200,7 +200,7 @@ void LxQtClockConfiguration::createDateFormats()
ui->dateFormatCOB->addItem(QString("Custom (%1) ...").arg(QDate(currentYear, 1, 1).toString(mCustomDateFormat)), QVariant(mCustomDateFormat)); ui->dateFormatCOB->addItem(QString("Custom (%1) ...").arg(QDate(currentYear, 1, 1).toString(mCustomDateFormat)), QVariant(mCustomDateFormat));
} }
void LxQtClockConfiguration::loadSettings() void LXQtClockConfiguration::loadSettings()
{ {
QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper(); QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper();
QString systemTimeLocale = QLocale::system().timeFormat(QLocale::ShortFormat).toUpper(); QString systemTimeLocale = QLocale::system().timeFormat(QLocale::ShortFormat).toUpper();
@ -237,7 +237,7 @@ void LxQtClockConfiguration::loadSettings()
ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast<FirstDayCombo&>(*(ui->firstDayOfWeekCB->model())).findIndex(mSettings.value("firstDayOfWeek", -1).toInt())); ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast<FirstDayCombo&>(*(ui->firstDayOfWeekCB->model())).findIndex(mSettings.value("firstDayOfWeek", -1).toInt()));
} }
void LxQtClockConfiguration::saveSettings() void LXQtClockConfiguration::saveSettings()
{ {
QString timeFormat(ui->ampmClockCB->isChecked() ? "h:mm AP" : "HH:mm"); QString timeFormat(ui->ampmClockCB->isChecked() ? "h:mm AP" : "HH:mm");
@ -263,7 +263,7 @@ void LxQtClockConfiguration::saveSettings()
mSettings.setValue("firstDayOfWeek", dynamic_cast<QStandardItemModel&>(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole)); mSettings.setValue("firstDayOfWeek", dynamic_cast<QStandardItemModel&>(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole));
} }
void LxQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn) void LXQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn)
{ {
if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole)
{ {
@ -276,7 +276,7 @@ void LxQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn)
} }
} }
void LxQtClockConfiguration::dateFormatActivated(int index) void LXQtClockConfiguration::dateFormatActivated(int index)
{ {
if (index == ui->dateFormatCOB->count() - 1) if (index == ui->dateFormatCOB->count() - 1)
{ {

12
plugin-clock/lxqtclockconfiguration.h
View File

@ -38,21 +38,21 @@
#include <LXQt/Settings> #include <LXQt/Settings>
namespace Ui { namespace Ui {
class LxQtClockConfiguration; class LXQtClockConfiguration;
} }
class LxQtClockConfiguration : public QDialog class LXQtClockConfiguration : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LxQtClockConfiguration(QSettings &settings, QWidget *parent = 0); explicit LXQtClockConfiguration(QSettings &settings, QWidget *parent = 0);
~LxQtClockConfiguration(); ~LXQtClockConfiguration();
private: private:
Ui::LxQtClockConfiguration *ui; Ui::LXQtClockConfiguration *ui;
QSettings &mSettings; QSettings &mSettings;
LxQt::SettingsCache oldSettings; LXQt::SettingsCache oldSettings;
/* /*
Read settings from conf file and put data into controls. Read settings from conf file and put data into controls.

8
plugin-clock/lxqtclockconfiguration.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>LxQtClockConfiguration</class> <class>LXQtClockConfiguration</class>
<widget class="QDialog" name="LxQtClockConfiguration"> <widget class="QDialog" name="LXQtClockConfiguration">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -167,7 +167,7 @@
<connection> <connection>
<sender>buttons</sender> <sender>buttons</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>LxQtClockConfiguration</receiver> <receiver>LXQtClockConfiguration</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@ -183,7 +183,7 @@
<connection> <connection>
<sender>buttons</sender> <sender>buttons</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>LxQtClockConfiguration</receiver> <receiver>LXQtClockConfiguration</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

2
plugin-clock/resources/clock.desktop.in
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.
Icon=preferences-system-time Icon=preferences-system-time

2
plugin-clock/translations/clock.ts
View File

@ -10,7 +10,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>
<source>Clock Settings</source> <source>Clock Settings</source>

2
plugin-clock/translations/clock_ar.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

4
plugin-clock/translations/clock_ar.ts
View File

@ -10,9 +10,9 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">إعدادات ساعة ريزر</translation> <translation type="vanished">إعدادات ساعة ريزر</translation>
</message> </message>
<message> <message>

2
plugin-clock/translations/clock_cs.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

4
plugin-clock/translations/clock_cs.ts
View File

@ -10,9 +10,9 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Nastavení hodin</translation> <translation type="vanished">Nastavení hodin</translation>
</message> </message>
<message> <message>

2
plugin-clock/translations/clock_cs_CZ.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

4
plugin-clock/translations/clock_cs_CZ.ts
View File

@ -10,9 +10,9 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Nastavení hodin</translation> <translation type="vanished">Nastavení hodin</translation>
</message> </message>
<message> <message>

2
plugin-clock/translations/clock_da.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

4
plugin-clock/translations/clock_da.ts
View File

@ -10,9 +10,9 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">LXQt Ur-Indstillinger</translation> <translation type="vanished">LXQt Ur-Indstillinger</translation>
</message> </message>
<message> <message>

2
plugin-clock/translations/clock_da_DK.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_da_DK.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">LxQt Urindstillinger</translation> <translation type="vanished">LXQt Urindstillinger</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_de.ts
View File

@ -10,7 +10,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>
<source>Clock Settings</source> <source>Clock Settings</source>

6
plugin-clock/translations/clock_el_GR.desktop → plugin-clock/translations/clock_el.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.
@ -8,5 +8,5 @@ Comment=Displays the current time. Comes with a calendar.
# Translations # Translations
Comment[el_GR]=Ρολόι και ημερολόγιο Comment[el]=Ρολόι και ημερολόγιο
Name[el_GR]=Ρολόι Name[el]=Ρολόι

52
plugin-clock/translations/clock_el_GR.ts → plugin-clock/translations/clock_el.ts
View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="el_GR"> <TS version="2.1" language="el">
<context> <context>
<name>FirstDayCombo</name> <name>FirstDayCombo</name>
<message> <message>
<location filename="../lxqtclockconfiguration.cpp" line="50"/> <location filename="../lxqtclockconfiguration.cpp" line="50"/>
<source>&lt;locale based&gt;</source> <source>&lt;locale based&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;locale based&gt;</translation>
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Ρυθμίσεις ρολογιού LxQt</translation> <translation type="vanished">Ρυθμίσεις ρολογιού LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>
<source>Clock Settings</source> <source>Clock Settings</source>
<translation type="unfinished"></translation> <translation>Ρυθμίσεις του ρολογιού</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="20"/> <location filename="../lxqtclockconfiguration.ui" line="20"/>
@ -38,47 +38,47 @@
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="40"/> <location filename="../lxqtclockconfiguration.ui" line="40"/>
<source>&amp;Use UTC</source> <source>&amp;Use UTC</source>
<translation type="unfinished"></translation> <translation>&amp;Χρήση της UTC</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="59"/> <location filename="../lxqtclockconfiguration.ui" line="59"/>
<source>Date &amp;format</source> <source>Date &amp;format</source>
<translation type="unfinished"></translation> <translation>Μορφή &amp;ημερομηνίας</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="76"/> <location filename="../lxqtclockconfiguration.ui" line="76"/>
<source>&amp;Do not show date</source> <source>&amp;Do not show date</source>
<translation type="unfinished"></translation> <translation>&amp;Να μην εμφανίζεται η ημερομηνία</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="86"/> <location filename="../lxqtclockconfiguration.ui" line="86"/>
<source>Show date &amp;before time</source> <source>Show date &amp;before time</source>
<translation type="unfinished"></translation> <translation>Εμφάνιση της ημερομηνίας &amp;πριν την ώρα</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="93"/> <location filename="../lxqtclockconfiguration.ui" line="93"/>
<source>Show date &amp;after time</source> <source>Show date &amp;after time</source>
<translation type="unfinished"></translation> <translation>Εμφάνιση της ημερομηνίας &amp;μετά την ώρα</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="100"/> <location filename="../lxqtclockconfiguration.ui" line="100"/>
<source>Show date below time on new &amp;line</source> <source>Show date below time on new &amp;line</source>
<translation type="unfinished"></translation> <translation>Εμφάνιση της ημερομηνίας κάτω από την ώρα σε νέα &amp;γραμμή</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="107"/> <location filename="../lxqtclockconfiguration.ui" line="107"/>
<source>First day of week in calendar</source> <source>First day of week in calendar</source>
<translation type="unfinished"></translation> <translation>Η πρώτη ημέρα της εβδομάδας στο ημερολόγιο</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="124"/> <location filename="../lxqtclockconfiguration.ui" line="124"/>
<source>Orientation</source> <source>Orientation</source>
<translation type="unfinished"></translation> <translation>Προσανατολισμός</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="130"/> <location filename="../lxqtclockconfiguration.ui" line="130"/>
<source>Auto&amp;rotate when the panel is vertical</source> <source>Auto&amp;rotate when the panel is vertical</source>
<translation type="unfinished"></translation> <translation>Αυτόματη περιστρο&amp;φή όταν ο πίνακας είναι τοποθετημένος κατακόρυφα</translation>
</message> </message>
<message> <message>
<source>&amp;Font</source> <source>&amp;Font</source>
@ -152,7 +152,7 @@
<message> <message>
<location filename="../lxqtclockconfiguration.cpp" line="284"/> <location filename="../lxqtclockconfiguration.cpp" line="284"/>
<source>Input custom date format</source> <source>Input custom date format</source>
<translation type="unfinished"></translation> <translation>Εισαγωγή προσαρμοσμένης μορφής ημερομηνίας</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.cpp" line="284"/> <location filename="../lxqtclockconfiguration.cpp" line="284"/>
@ -175,7 +175,25 @@ will also be treated as text and not be used as an expression.
Custom date format:</source> Custom date format:</source>
<translation type="unfinished"></translation> <translation>Οι ερμηνευόμενες ακολουθίες της μορφής της ημερομηνίας είναι:
d η ημέρα ως αριθμός δίχως το αρχικό μηδενικό (1 ως 31)
dd η ημέρα ως αριθμός με το αρχικό μηδενικό (01 ως 31)
ddd η συντομογραφημένη τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευ» ως «Κυρ»).
dddd η μακριά τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευτέρα» ως «Κυριακή»).
M ο μήνας ως αριθμός δίχως το αρχικό μηδενικό (1-12)
MM ο μήνας ως αριθμός με το αρχικό μηδενικό (01-12)
MMM η συντομογραφημένη τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιαν» ως «Δεκ»).
MMMM η μακριά τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιανουάριος» ως «Δεκέμβριος»).
yy το έτος ως διψήφιος αριθμός (00-99)
yyyy το έτος ως τετραψήφιος αριθμός
Όλοι οι λοιποί χαρακτήρες εισόδου θα διαχειριστούν ως κείμενο.
Οποιαδήποτε ακολουθία χαρακτήρων που εγκλείονται σε μονά εισαγωγικά (&apos;)
θα διαχειρίζονται επίσης ως κείμενο και δεν θα χρησιμοποιούνται ως έκφραση.
Προσαρμοσμένη μορφή ημερομηνίας:</translation>
</message> </message>
</context> </context>
</TS> </TS>

2
plugin-clock/translations/clock_eo.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_eo.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Agordoj de horloĝo de LxQt</translation> <translation type="vanished">Agordoj de horloĝo de LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_es.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_es.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Configuración del reloj de LxQt</translation> <translation type="vanished">Configuración del reloj de LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

6
plugin-clock/translations/clock_es_UY.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Configuración de Reloj LxQt</translation> <translation type="vanished">Configuración de Reloj LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_es_VE.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_es_VE.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Configuración de Reloj LxQt</translation> <translation type="vanished">Configuración de Reloj LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_eu.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_eu.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">LxQt erlojuaren ezarpenak</translation> <translation type="vanished">LXQt erlojuaren ezarpenak</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_fi.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_fi.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">LxQtin kellon asetukset</translation> <translation type="vanished">LXQtin kellon asetukset</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

2
plugin-clock/translations/clock_fr_FR.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
ServiceTypes=LxQtPanel/Plugin ServiceTypes=LXQtPanel/Plugin
Name=Date & time Name=Date & time
Comment=Displays the current time. Comes with a calendar. Comment=Displays the current time. Comes with a calendar.

6
plugin-clock/translations/clock_fr_FR.ts
View File

@ -10,10 +10,10 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtClockConfiguration</name> <name>LXQtClockConfiguration</name>
<message> <message>
<source>LxQt Clock Settings</source> <source>LXQt Clock Settings</source>
<translation type="vanished">Paramètres de l&apos;horloge de LxQt</translation> <translation type="vanished">Paramètres de l&apos;horloge de LXQt</translation>
</message> </message>
<message> <message>
<location filename="../lxqtclockconfiguration.ui" line="14"/> <location filename="../lxqtclockconfiguration.ui" line="14"/>

Some files were not shown because too many files have changed in this diff Show More