Description: Definitely remove plugin-clock Author: Palo Kisa Origin: upstream Bug: https://github.com/lxqt/lxqt/issues/1356 Applied-Upstream: commit:3eb1a8b Last-Update: 2018-07-16 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,22 +85,14 @@ message(STATUS "Panel plugins location: # Plugin system # You can enable/disable building of the plugin using cmake options. -# cmake -DCLOCK_PLUGIN=Yes .. # Enable clock plugin -# cmake -DCLOCK_PLUGIN=No .. # Disable clock plugin +# cmake -DWORLDCLOCK_PLUGIN=Yes .. # Enable worldclock plugin +# cmake -DWORLDCLOCK_PLUGIN=No .. # Disable worldclock plugin include("cmake/BuildPlugin.cmake") set(ENABLED_PLUGINS) # list of enabled plugins set(STATIC_PLUGINS) # list of statically linked plugins -setByDefault(CLOCK_PLUGIN Yes) -if(CLOCK_PLUGIN) - list(APPEND STATIC_PLUGINS "clock") - add_definitions(-DWITH_CLOCK_PLUGIN) - list(APPEND ENABLED_PLUGINS "Clock") - add_subdirectory(plugin-clock) -endif() - setByDefault(COLORPICKER_PLUGIN Yes) if(COLORPICKER_PLUGIN) list(APPEND ENABLED_PLUGINS "Color Picker") --- a/panel/plugin.cpp +++ b/panel/plugin.cpp @@ -50,8 +50,6 @@ #include // statically linked built-in plugins -#include "../plugin-clock/lxqtclock.h" // clock -extern void * loadPluginTranslation_clock_helper; #include "../plugin-desktopswitch/desktopswitch.h" // desktopswitch extern void * loadPluginTranslation_desktopswitch_helper; #include "../plugin-mainmenu/lxqtmainmenu.h" // mainmenu @@ -194,9 +192,6 @@ namespace //NOTE2: we need to reference some (dummy) symbol from (autogenerated) LXQtPluginTranslationLoader.cpp // to be not stripped (as unused/unreferenced) in static linking time static plugin_tuple_t const static_plugins[] = { -#if defined(WITH_CLOCK_PLUGIN) - std::make_tuple(QLatin1String("clock"), plugin_ptr_t{new LXQtClockPluginLibrary}, loadPluginTranslation_clock_helper),// clock -#endif #if defined(WITH_DESKTOPSWITCH_PLUGIN) std::make_tuple(QLatin1String("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary}, loadPluginTranslation_desktopswitch_helper),// desktopswitch #endif --- a/plugin-clock/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -set(PLUGIN "clock") - -set(HEADERS - lxqtclock.h - lxqtclockconfiguration.h - calendarpopup.h -) - -set(SOURCES - lxqtclock.cpp - lxqtclockconfiguration.cpp - calendarpopup.cpp -) - -set(UIS - lxqtclockconfiguration.ui -) - -BUILD_LXQT_PLUGIN(${PLUGIN}) --- a/plugin-clock/calendarpopup.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2014 LXQt team - * Authors: - * Paulo Lieuthier - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "calendarpopup.h" -#include -#include - -CalendarPopup::CalendarPopup(QWidget *parent): - QDialog(parent, Qt::Window | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint) -{ - setLayout(new QHBoxLayout(this)); - layout()->setMargin(1); - - cal = new QCalendarWidget(this); - layout()->addWidget(cal); - adjustSize(); -} - -CalendarPopup::~CalendarPopup() -{ -} - -void CalendarPopup::show() -{ - cal->setSelectedDate(QDate::currentDate()); - activateWindow(); - QDialog::show(); -} - -void CalendarPopup::setFirstDayOfWeek(Qt::DayOfWeek wday) -{ - cal->setFirstDayOfWeek(wday); -} --- a/plugin-clock/calendarpopup.h +++ /dev/null @@ -1,49 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2014 LXQt team - * Authors: - * Paulo Lieuthier - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef CALENDARPOPUP_H -#define CALENDARPOPUP_H - -#include -#include - -class CalendarPopup : public QDialog -{ - Q_OBJECT - -public: - CalendarPopup(QWidget *parent = 0); - ~CalendarPopup(); - void setFirstDayOfWeek(Qt::DayOfWeek wday); - - void show(); - -private: - QCalendarWidget *cal; -}; - -#endif // CALENDARPOPUP_H --- a/plugin-clock/lxqtclock.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2010-2013 Razor team - * Authors: - * Christopher "VdoP" Regali - * Alexander Sokoloff - * Maciej Płaza - * Kuzma Shapran - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - - -#include "lxqtclock.h" - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -static void notifyAboutDeprecation(PluginSettings * settings) -{ - // this is called only from LXQtClock c-tor...so just from main thread, no locking needed - // Note: we get/store the "dont_show" in section of particular instance of clock => this is not 100% valid - // for al possible changes of panel configuration, but we can live with this - static bool notification_done = settings->value(QLatin1String("dont_show_deprecation"), false).toBool(); - if (!notification_done) - { - LXQt::Notification * notification = new LXQt::Notification{LXQtClock::tr("Date&Time (clock) plugin is deprecated")}; - notification->setBody(LXQtClock::tr("The clock plugin is deprecated and will be removed in future version of LXQt. Consider" - " replacing it with worldclock.
")); - notification->setActions({LXQtClock::tr("don't show this again")}); - notification->setTimeout(5000); - QObject::connect(notification, &LXQt::Notification::actionActivated, settings, [notification, settings] (int actionNumber) -> void - { - if (actionNumber == 0) - settings->setValue(QLatin1String("dont_show_deprecation"), true); - notification->close(); - }); - QObject::connect(notification, &LXQt::Notification::notificationClosed, notification, &QObject::deleteLater); - notification->update(); - notification_done = true; - } -} - -/** - * @file lxqtclock.cpp - * @brief implements LXQtclock and LXQtclockgui - * @author Christopher "VdoP" Regali - * @author Kuzma Shapran - */ - -class DownscaleFontStyle : public QProxyStyle -{ - using QProxyStyle::QProxyStyle; -public: - - virtual void drawItemText(QPainter * painter, const QRect & rect, int flags - , const QPalette & pal, bool enabled, const QString & text - , QPalette::ColorRole textRole = QPalette::NoRole) const override - { - while (1 < painter->font().pointSize() - && !(rect.size() - painter->fontMetrics().boundingRect(text).size()).isValid()) - { - QFont f{painter->font()}; - f.setPointSize(f.pointSize() - 1); - painter->setFont(f); - } - return QProxyStyle::drawItemText(painter, rect, flags, pal, enabled, text, textRole); - } -}; - -/** - * @brief constructor - */ -LXQtClock::LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo): - QObject(), - ILXQtPanelPlugin(startupInfo), - mAutoRotate(true), - mTextStyle{new DownscaleFontStyle}, - mCurrentCharCount(0) -{ - QTimer::singleShot(0, this, [this] { notifyAboutDeprecation(settings()); }); - - mMainWidget = new QWidget(); - mRotatedWidget = new LXQt::RotatedWidget(*(new QWidget()), mMainWidget); - mContent = mRotatedWidget->content(); - mContent->setStyle(mTextStyle.data()); - mTimeLabel = new QLabel(mContent); - mDateLabel = new QLabel(mContent); - - QVBoxLayout *borderLayout = new QVBoxLayout(mMainWidget); - borderLayout->setContentsMargins(0, 0, 0, 0); - borderLayout->setSpacing(0); - borderLayout->addWidget(mRotatedWidget, 0, Qt::AlignCenter); - - mTimeLabel->setObjectName("TimeLabel"); - mDateLabel->setObjectName("DateLabel"); - - mTimeLabel->setAlignment(Qt::AlignCenter); - mDateLabel->setAlignment(Qt::AlignCenter); - - mContent->setLayout(new QVBoxLayout{mContent}); - mContent->layout()->setContentsMargins(0, 0, 0, 0); - mContent->layout()->setSpacing(0); - mContent->layout()->addWidget(mTimeLabel); - mContent->layout()->addWidget(mDateLabel); - - mClockTimer = new QTimer(this); - mClockTimer->setTimerType(Qt::PreciseTimer); - connect (mClockTimer, SIGNAL(timeout()), SLOT(updateTime())); - - mClockFormat = "hh:mm"; - - mCalendarPopup = new CalendarPopup(mContent); - - mMainWidget->installEventFilter(this); - settingsChanged(); -} - -/** - * @brief destructor - */ -LXQtClock::~LXQtClock() -{ - delete mMainWidget; -} - -QDateTime LXQtClock::currentDateTime() -{ - return QDateTime(mUseUTC ? QDateTime::currentDateTimeUtc() : QDateTime::currentDateTime()); -} - -/** - * @brief updates the time - * Color and font settings can be configured in Qt CSS - */ -void LXQtClock::updateTime() -{ - //XXX: do we need this with PreciseTimer ? - if (currentDateTime().time().msec() > 500) - restartTimer(); - - showTime(); -} - -void LXQtClock::showTime() -{ - QDateTime now{currentDateTime()}; - int new_char_count; - if (mDateOnNewLine) - { - QString new_time = QLocale::system().toString(now, mTimeFormat); - QString new_date = QLocale::system().toString(now, mDateFormat); - new_char_count = qMax(new_time.size(), new_date.size()); - mTimeLabel->setText(new_time); - mDateLabel->setText(new_date); - } - else - { - QString new_time = QLocale::system().toString(now, mClockFormat); - new_char_count = new_time.size(); - mTimeLabel->setText(new_time); - } - - //Note: if transformation (custom rendering) is enabled we need the explicit update - //(update doesn't cause superfluous paint events) - mRotatedWidget->update(); - - if (mCurrentCharCount != new_char_count) - { - mCurrentCharCount = new_char_count; - realign(); - } -} - -void LXQtClock::restartTimer() -{ - if (mClockTimer->isActive()) - mClockTimer->stop(); - int updateInterval = mClockTimer->interval(); - QDateTime now{currentDateTime()}; - int delay = updateInterval - ((now.time().msec() + now.time().second() * 1000) % updateInterval); - QTimer::singleShot(delay, Qt::PreciseTimer, mClockTimer, SLOT(start())); - QTimer::singleShot(delay, Qt::PreciseTimer, this, SLOT(updateTime())); -} - -void LXQtClock::settingsChanged() -{ - mFirstDayOfWeek = settings()->value("firstDayOfWeek", -1).toInt(); - if (-1 == mFirstDayOfWeek) - mCalendarPopup->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); - else - mCalendarPopup->setFirstDayOfWeek(static_cast(mFirstDayOfWeek)); - - mTimeFormat = settings()->value("timeFormat", QLocale::system().timeFormat(QLocale::ShortFormat).toUpper().contains("AP") ? "h:mm AP" : "HH:mm").toString(); - - mUseUTC = settings()->value("UTC", false).toBool(); - if (mUseUTC) - mTimeFormat += "' Z'"; - - mDateFormat = settings()->value("dateFormat", Qt::SystemLocaleShortDate).toString(); - - bool dateBeforeTime = (settings()->value("showDate", "no").toString().toLower() == "before"); - bool dateAfterTime = (settings()->value("showDate", "no").toString().toLower() == "after"); - mDateOnNewLine = (settings()->value("showDate", "no").toString().toLower() == "below"); - - mAutoRotate = settings()->value("autoRotate", true).toBool(); - - if (dateBeforeTime) - mClockFormat = QString("%1 %2").arg(mDateFormat).arg(mTimeFormat); - else if (dateAfterTime) - mClockFormat = QString("%1 %2").arg(mTimeFormat).arg(mDateFormat); - else - mClockFormat = mTimeFormat; - - mDateLabel->setHidden(!mDateOnNewLine); - - // mDateFormat usually does not contain time portion, but since it's possible to use custom date format - it has to be supported. [Kuzma Shapran] - int updateInterval = QString(mTimeFormat + " " + mDateFormat).replace(QRegExp("'[^']*'"),"").contains("s") ? 1000 : 60000; - - QDateTime now = currentDateTime(); - - showTime(); - - if (mClockTimer->interval() != updateInterval) - { - mClockTimer->setInterval(updateInterval); - - restartTimer(); - } -} - -void LXQtClock::realign() -{ - QSize size{QWIDGETSIZE_MAX, QWIDGETSIZE_MAX}; - Qt::Corner origin = Qt::TopLeftCorner; - if (mAutoRotate || panel()->isHorizontal()) - { - switch (panel()->position()) - { - case ILXQtPanel::PositionTop: - case ILXQtPanel::PositionBottom: - origin = Qt::TopLeftCorner; - break; - - case ILXQtPanel::PositionLeft: - origin = Qt::BottomLeftCorner; - break; - - case ILXQtPanel::PositionRight: - origin = Qt::TopRightCorner; - break; - } - - //set minwidth - QFontMetrics metrics{mTimeLabel->font()}; - //Note: using a constant string of reasonably wide characters for computing the width - // (not the current text as width of text can differ for each particular string (based on font)) - size.setWidth(metrics.boundingRect(QString{mCurrentCharCount, 'A'}).width()); - } else if (!panel()->isHorizontal()) - { - size.setWidth(panel()->globalGeometry().width()); - } - - mTimeLabel->setFixedWidth(size.width()); - mDateLabel->setFixedWidth(size.width()); - - int label_height = mTimeLabel->sizeHint().height(); - size.setHeight(mDateOnNewLine ? label_height * 2 : label_height); - - const bool changed = mContent->maximumSize() != size || mRotatedWidget->origin() != origin; - - mContent->setFixedSize(size); - mRotatedWidget->setOrigin(origin); - - if (changed) - { - mRotatedWidget->adjustContentSize(); - mRotatedWidget->update(); - } -} - -void LXQtClock::activated(ActivationReason reason) -{ - if (reason != ILXQtPanelPlugin::Trigger) - return; - - if (!mCalendarPopup->isVisible()) - { - QRect pos = calculatePopupWindowPos(mCalendarPopup->size()); - mCalendarPopup->move(pos.topLeft()); - willShowWindow(mCalendarPopup); - mCalendarPopup->show(); - } - else - { - mCalendarPopup->hide(); - } -} - -QDialog * LXQtClock::configureDialog() -{ - return new LXQtClockConfiguration(settings()); -} - -bool LXQtClock::eventFilter(QObject *watched, QEvent *event) -{ - if (watched == mMainWidget) - { - if (event->type() == QEvent::ToolTip) - mMainWidget->setToolTip(QDateTime::currentDateTime().toString(Qt::DefaultLocaleLongDate)); - - return false; - } - - return false; -} --- a/plugin-clock/lxqtclock.h +++ /dev/null @@ -1,105 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2010-2013 Razor team - * Authors: - * Christopher "VdoP" Regali - * Alexander Sokoloff - * Maciej Płaza - * Kuzma Shapran - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTCLOCK_H -#define LXQTCLOCK_H - -#include "../panel/ilxqtpanelplugin.h" -#include "lxqtclockconfiguration.h" -#include "calendarpopup.h" -#include - -#include - -class QLabel; -class QDialog; -class QTimer; -class QProxyStyle; - -class LXQtClock : public QObject, public ILXQtPanelPlugin -{ - Q_OBJECT -public: - LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtClock(); - - virtual Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } - QString themeId() const { return "Clock"; } - QWidget *widget() { return mMainWidget; } - QDialog *configureDialog(); - void settingsChanged(); - - void activated(ActivationReason reason); - bool isSeparate() const { return true; } - - void realign(); - -public slots: - void updateTime(); - -protected: - bool eventFilter(QObject *watched, QEvent *event); - -private: - QTimer* mClockTimer; - QWidget *mMainWidget; - QWidget *mContent; - LXQt::RotatedWidget* mRotatedWidget; - QLabel* mTimeLabel; - QLabel* mDateLabel; - QString mClockFormat; - QString mToolTipFormat; - CalendarPopup* mCalendarPopup; - QString mTimeFormat; - QString mDateFormat; - bool mDateOnNewLine; - bool mUseUTC; - int mFirstDayOfWeek; - bool mAutoRotate; - QScopedPointer mTextStyle; - int mCurrentCharCount; - - QDateTime currentDateTime(); - void showTime(); - void restartTimer(); -}; - - -class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary -{ - Q_OBJECT - // Q_PLUGIN_METADATA(IID "lxqt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILXQtPanelPluginLibrary) -public: - ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtClock(startupInfo);} -}; - - -#endif --- a/plugin-clock/lxqtclockconfiguration.cpp +++ /dev/null @@ -1,301 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2011 Razor team - * Authors: - * Maciej Płaza - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - - -#include -#include -#include - -#include "lxqtclockconfiguration.h" -#include "ui_lxqtclockconfiguration.h" - -namespace -{ - class FirstDayCombo : public QStandardItemModel - { - public: - FirstDayCombo() - { - QStandardItem* item = 0; - int row = 0; - item = new QStandardItem; - item->setData(-1, Qt::UserRole); - setItem(row, 0, item); - item = new QStandardItem; - item->setData(tr(""), Qt::DisplayRole); - setItem(row, 1, item); - ++row; - for (int wday = Qt::Monday; Qt::Sunday >= wday; ++wday, ++row) - { - item = new QStandardItem; - item->setData(wday, Qt::UserRole); - setItem(row, 0, item); - item = new QStandardItem; - item->setData(QLocale::system().dayName(wday), Qt::DisplayRole); - setItem(row, 1, item); - } - } - - int findIndex(int wday) - { - int i = rowCount() - 1; - for ( ; 0 <= i; --i) - { - if (item(i)->data(Qt::UserRole).toInt() == wday) - break; - } - return i; - } - - }; -} - -LXQtClockConfiguration::LXQtClockConfiguration(PluginSettings *settings, QWidget *parent) : - LXQtPanelPluginConfigDialog(settings, parent), - ui(new Ui::LXQtClockConfiguration), - mOldIndex(1) -{ - setAttribute(Qt::WA_DeleteOnClose); - setObjectName("ClockConfigurationWindow"); - ui->setupUi(this); - - connect(ui->buttons, SIGNAL(clicked(QAbstractButton*)), SLOT(dialogButtonsAction(QAbstractButton*))); - - ui->firstDayOfWeekCB->setModel(new FirstDayCombo); - ui->firstDayOfWeekCB->setModelColumn(1); - - loadSettings(); - /* We use clicked() and activated(int) because these signals aren't emitting after programmaticaly - change of state */ - - connect(ui->dateFormatCOB, SIGNAL(activated(int)), SLOT(dateFormatActivated(int))); - - connect(ui->showSecondsCB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->ampmClockCB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->useUtcCB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->dontShowDateRB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->showDateBeforeTimeRB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->showDateAfterTimeRB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->showDateBelowTimeRB, SIGNAL(clicked()), SLOT(saveSettings())); - - connect(ui->autorotateCB, SIGNAL(clicked()), SLOT(saveSettings())); - connect(ui->firstDayOfWeekCB, SIGNAL(activated(int)), SLOT(saveSettings())); -} - -LXQtClockConfiguration::~LXQtClockConfiguration() -{ - delete ui; -} - -static int currentYear = QDate::currentDate().year(); - -void LXQtClockConfiguration::addDateFormat(const QString &format) -{ - if (ui->dateFormatCOB->findData(QVariant(format)) == -1) - ui->dateFormatCOB->addItem(QDate(currentYear, 1, 1).toString(format), QVariant(format)); -} - -void LXQtClockConfiguration::createDateFormats() -{ - ui->dateFormatCOB->clear(); - - QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper(); - - if (systemDateLocale.indexOf("Y") < systemDateLocale.indexOf("D")) - // Big-endian (year, month, day) -> in some Asia countires like China or Japan - { - addDateFormat("MMM d"); - addDateFormat("MMMM d"); - addDateFormat("MMM d, ddd"); - addDateFormat("MMMM d, dddd"); - addDateFormat("yyyy MMM d"); - addDateFormat("yyyy MMMM d"); - addDateFormat("yyyy MMM d, ddd"); - addDateFormat("yyyy MMMM d, dddd"); - addDateFormat("MMM dd"); - addDateFormat("MMMM dd"); - addDateFormat("MMM dd, ddd"); - addDateFormat("MMMM dd, dddd"); - addDateFormat("yyyy MMM dd"); - addDateFormat("yyyy MMMM dd"); - addDateFormat("yyyy MMM dd, ddd"); - addDateFormat("yyyy MMMM dd, dddd"); - } - else if (systemDateLocale.indexOf("M") < systemDateLocale.indexOf("D")) - // Middle-endian (month, day, year) -> USA - { - addDateFormat("MMM d"); - addDateFormat("MMMM d"); - addDateFormat("ddd, MMM d"); - addDateFormat("dddd, MMMM d"); - addDateFormat("MMM d yyyy"); - addDateFormat("MMMM d yyyy"); - addDateFormat("ddd, MMM d yyyy"); - addDateFormat("dddd, MMMM d yyyy"); - addDateFormat("MMM dd"); - addDateFormat("MMMM dd"); - addDateFormat("ddd, MMM dd"); - addDateFormat("dddd, MMMM dd"); - addDateFormat("MMM dd yyyy"); - addDateFormat("MMMM dd yyyy"); - addDateFormat("ddd, MMM dd yyyy"); - addDateFormat("dddd, MMMM dd yyyy"); - } - else - // Little-endian (day, month, year) -> most of Europe - { - addDateFormat("d MMM"); - addDateFormat("d MMMM"); - addDateFormat("ddd, d MMM"); - addDateFormat("dddd, d MMMM"); - addDateFormat("d MMM yyyy"); - addDateFormat("d MMMM yyyy"); - addDateFormat("ddd, d MMM yyyy"); - addDateFormat("dddd, d MMMM yyyy"); - addDateFormat("dd MMM"); - addDateFormat("dd MMMM"); - addDateFormat("ddd, dd MMM"); - addDateFormat("dddd, dd MMMM"); - addDateFormat("dd MMM yyyy"); - addDateFormat("dd MMMM yyyy"); - addDateFormat("ddd, dd MMM yyyy"); - addDateFormat("dddd, dd MMMM yyyy"); - } - - addDateFormat(QLocale::system().dateFormat(QLocale::ShortFormat)); - addDateFormat(QLocale::system().dateFormat(QLocale::LongFormat)); - - addDateFormat("yyyy-MM-dd"); // ISO - - if (mCustomDateFormat.isEmpty()) - ui->dateFormatCOB->addItem("Custom ...", QVariant(mCustomDateFormat)); - else - ui->dateFormatCOB->addItem(QString("Custom (%1) ...").arg(QDate(currentYear, 1, 1).toString(mCustomDateFormat)), QVariant(mCustomDateFormat)); -} - -void LXQtClockConfiguration::loadSettings() -{ - QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper(); - QString systemTimeLocale = QLocale::system().timeFormat(QLocale::ShortFormat).toUpper(); - - QString timeFormat = settings().value("timeFormat", systemTimeLocale.contains("AP") ? "h:mm AP" : "HH:mm").toString(); - - ui->showSecondsCB->setChecked(timeFormat.indexOf("ss") > -1); - - ui->ampmClockCB->setChecked(timeFormat.toUpper().indexOf("AP") > -1); - - ui->useUtcCB->setChecked(settings().value("UTC", false).toBool()); - - ui->dontShowDateRB->setChecked(true); - ui->showDateBeforeTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "before"); - ui->showDateAfterTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "after"); - ui->showDateBelowTimeRB->setChecked(settings().value("showDate", "no").toString().toLower() == "below"); - - mCustomDateFormat = settings().value("customDateFormat", QString()).toString(); - QString dateFormat = settings().value("dateFormat", QLocale::system().dateFormat(QLocale::ShortFormat)).toString(); - - createDateFormats(); - - if (mCustomDateFormat == dateFormat) - ui->dateFormatCOB->setCurrentIndex(ui->dateFormatCOB->count() - 1); - else - { - ui->dateFormatCOB->setCurrentIndex(ui->dateFormatCOB->findData(dateFormat)); - if (ui->dateFormatCOB->currentIndex() < 0) - ui->dateFormatCOB->setCurrentIndex(1); - } - mOldIndex = ui->dateFormatCOB->currentIndex(); - - ui->autorotateCB->setChecked(settings().value("autoRotate", true).toBool()); - ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast(*(ui->firstDayOfWeekCB->model())).findIndex(settings().value("firstDayOfWeek", -1).toInt())); -} - -void LXQtClockConfiguration::saveSettings() -{ - QString timeFormat(ui->ampmClockCB->isChecked() ? "h:mm AP" : "HH:mm"); - - if (ui->showSecondsCB->isChecked()) - timeFormat.insert(timeFormat.indexOf("mm") + 2, ":ss"); - - settings().setValue("timeFormat", timeFormat); - - settings().setValue("UTC", ui->useUtcCB->isChecked()); - - settings().setValue("showDate", - ui->showDateBeforeTimeRB->isChecked() ? "before" : - (ui->showDateAfterTimeRB->isChecked() ? "after" : - (ui->showDateBelowTimeRB->isChecked() ? "below" : "no" ))); - - settings().setValue("customDateFormat", mCustomDateFormat); - if (ui->dateFormatCOB->currentIndex() == (ui->dateFormatCOB->count() - 1)) - settings().setValue("dateFormat", mCustomDateFormat); - else - settings().setValue("dateFormat", ui->dateFormatCOB->itemData(ui->dateFormatCOB->currentIndex())); - - settings().setValue("autoRotate", ui->autorotateCB->isChecked()); - settings().setValue("firstDayOfWeek", dynamic_cast(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole)); -} - -void LXQtClockConfiguration::dateFormatActivated(int index) -{ - if (index == ui->dateFormatCOB->count() - 1) - { - bool ok; - QString newCustomDateFormat = QInputDialog::getText(this, tr("Input custom date format"), tr( - "Interpreted sequences of date format are:\n" - "\n" - "d\tthe day as number without a leading zero (1 to 31)\n" - "dd\tthe day as number with a leading zero (01 to 31)\n" - "ddd\tthe abbreviated localized day name (e.g. 'Mon' to 'Sun').\n" - "dddd\tthe long localized day name (e.g. 'Monday' to 'Sunday').\n" - "M\tthe month as number without a leading zero (1-12)\n" - "MM\tthe month as number with a leading zero (01-12)\n" - "MMM\tthe abbreviated localized month name (e.g. 'Jan' to 'Dec').\n" - "MMMM\tthe long localized month name (e.g. 'January' to 'December').\n" - "yy\tthe year as two digit number (00-99)\n" - "yyyy\tthe year as four digit number\n" - "\n" - "All other input characters will be treated as text.\n" - "Any sequence of characters that are enclosed in single quotes (')\n" - "will also be treated as text and not be used as an expression.\n" - "\n" - "\n" - "Custom date format:" - ), QLineEdit::Normal, mCustomDateFormat, &ok); - if (ok) - { - mCustomDateFormat = newCustomDateFormat; - mOldIndex = index; - createDateFormats(); - } - ui->dateFormatCOB->setCurrentIndex(mOldIndex); - } - else - mOldIndex = index; - - saveSettings(); -} --- a/plugin-clock/lxqtclockconfiguration.h +++ /dev/null @@ -1,79 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * https://lxqt.org - * - * Copyright: 2011 Razor team - * Authors: - * Maciej Płaza - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - - -#ifndef LXQTCLOCKCONFIGURATION_H -#define LXQTCLOCKCONFIGURATION_H - -#include "../panel/lxqtpanelpluginconfigdialog.h" -#include "../panel/pluginsettings.h" - -#include -#include -#include -#include - -namespace Ui { - class LXQtClockConfiguration; -} - -class LXQtClockConfiguration : public LXQtPanelPluginConfigDialog -{ - Q_OBJECT - -public: - explicit LXQtClockConfiguration(PluginSettings *settings, QWidget *parent = 0); - ~LXQtClockConfiguration(); - -private: - Ui::LXQtClockConfiguration *ui; - - /* - Read settings from conf file and put data into controls. - */ - void loadSettings(); - - /* - Creates a date formats consistent with the region read from locale. - */ - void createDateFormats(); - -private slots: - /* - Saves settings in conf file. - */ - void saveSettings(); - void dateFormatActivated(int); - -private: - int mOldIndex; - QString mCustomDateFormat; - - void addDateFormat(const QString &format); -}; - -#endif // LXQTCLOCKCONFIGURATION_H --- a/plugin-clock/lxqtclockconfiguration.ui +++ /dev/null @@ -1,232 +0,0 @@ - - - LXQtClockConfiguration - - - - 0 - 0 - 330 - 447 - - - - Clock Settings - - - - - - Time - - - - - - &Show seconds - - - - - - - 12 &hour style - - - - - - - &Use UTC - - - - - - - - - - Date - - - - - - false - - - Date &format - - - dateFormatCOB - - - - - - - false - - - - - - - &Do not show date - - - true - - - - - - - Show date &before time - - - - - - - Show date &after time - - - - - - - Show date below time on new &line - - - - - - - First day of week in calendar - - - firstDayOfWeekCB - - - - - - - - - - - - - - Orientation - - - - - - Auto&rotate when the panel is vertical - - - true - - - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Close|QDialogButtonBox::Reset - - - - - - - - - buttons - accepted() - LXQtClockConfiguration - accept() - - - 214 - 350 - - - 157 - 274 - - - - - buttons - rejected() - LXQtClockConfiguration - reject() - - - 214 - 350 - - - 196 - 274 - - - - - dontShowDateRB - toggled(bool) - dateFormatL - setDisabled(bool) - - - 68 - 166 - - - 63 - 267 - - - - - dontShowDateRB - toggled(bool) - dateFormatCOB - setDisabled(bool) - - - 174 - 167 - - - 239 - 275 - - - - - --- a/plugin-clock/resources/clock.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. -Icon=preferences-system-time - -#TRANSLATIONS_DIR=../translations --- a/plugin-clock/translations/clock_ar.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[ar]=التّاريخ والوقت -Comment[ar]=تعرض الوقت الحاليّ. فيها تقويم. --- a/plugin-clock/translations/clock_cs.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs]=Hodiny a kalendář -Name[cs]=Hodiny --- a/plugin-clock/translations/clock_cs_CZ.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[cs_CZ]=Hodiny a kalendář -Name[cs_CZ]=Hodiny --- a/plugin-clock/translations/clock_da.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. -Icon=preferences-system-time - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[da]=Dato og klokkeslæt -Comment[da]=Viser den aktuelle tid. Der følger en kalender med. --- a/plugin-clock/translations/clock_de.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[de]=Uhr und Kalender -Comment[de]=Zeigt die aktuelle Uhrzeit. Ein Kalender ist auch enthalten. --- a/plugin-clock/translations/clock_el.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el]=Ρολόι και ημερολόγιο -Name[el]=Ρολόι --- a/plugin-clock/translations/clock_eo.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[eo]=Horloĝo kaj kalendaro -Name[eo]=Horloĝo --- a/plugin-clock/translations/clock_es.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[es]=Fecha y hora -Comment[es]=Muestra la hora actual. Incluye un calendario. --- a/plugin-clock/translations/clock_es_VE.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[es_VE]=Reloj y calendario -Name[es_VE]=Reloj --- a/plugin-clock/translations/clock_eu.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[eu]=Erlojua eta egutegia -Name[eu]=Erlojua --- a/plugin-clock/translations/clock_fi.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[fi]=Kello ja kalenteri -Name[fi]=Kello --- a/plugin-clock/translations/clock_fr.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -Comment[fr]=Horloge et calendrier -Name[fr]=Horloge --- a/plugin-clock/translations/clock_hu.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[hu]=Óra és naptár -Name[hu]=Óra --- a/plugin-clock/translations/clock_ia.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Clock -Comment=Clock and calendar - -#TRANSLATIONS_DIR=../translations - - -# Translations --- a/plugin-clock/translations/clock_id_ID.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Clock -Comment=Clock and calendar - -#TRANSLATIONS_DIR=../translations - - -# Translations --- a/plugin-clock/translations/clock_it.desktop +++ /dev/null @@ -1,3 +0,0 @@ -Comment[it]=Orologio e calendario -Name[it]=Orologio - --- a/plugin-clock/translations/clock_ja.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ja]=時計とカレンダー -Name[ja]=時計 --- a/plugin-clock/translations/clock_ko.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Clock -Comment=Clock and calendar - -#TRANSLATIONS_DIR=../translations - - -# Translations --- a/plugin-clock/translations/clock_lt.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[lt]=Laikrodis ir kalendorius -Name[lt]=Laikrodis --- a/plugin-clock/translations/clock_nl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[nl]=Klok en kalender -Name[nl]=Klok --- a/plugin-clock/translations/clock_pl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[pl]=Wyświetla obecny czas. Zawiera kalendarz. -Name[pl]=Zegar --- a/plugin-clock/translations/clock_pt.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Relógio -Comment[pt]=Relógio e calendário - --- a/plugin-clock/translations/clock_pt_BR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[pt_BR]=Relógio e calendário -Name[pt_BR]=Relógio --- a/plugin-clock/translations/clock_ro_RO.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ro_RO]=Afișează ora curentă incluzând și un calendar. -Name[ro_RO]=Data și ora --- a/plugin-clock/translations/clock_ru.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[ru]=Отображение текущего времени. Поставляется с календарем. -Name[ru]=Дата и время --- a/plugin-clock/translations/clock_sk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sk]=Hodiny a kalendár -Name[sk]=Hodiny --- a/plugin-clock/translations/clock_sl.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sl]=Ura in koledar -Name[sl]=Ura --- a/plugin-clock/translations/clock_sr.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sr]=Сат и календар -Name[sr]=Сат --- a/plugin-clock/translations/clock_sr@ijekavian.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[sr@ijekavian]=Сат -Comment[sr@ijekavian]=Сат и календар --- a/plugin-clock/translations/clock_sr@ijekavianlatin.desktop +++ /dev/null @@ -1,2 +0,0 @@ -Name[sr@ijekavianlatin]=Sat -Comment[sr@ijekavianlatin]=Sat i kalendar --- a/plugin-clock/translations/clock_sr@latin.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[sr@latin]=Sat i kalendar -Name[sr@latin]=Sat --- a/plugin-clock/translations/clock_th_TH.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[th_TH]=นาฬิกาและปฏิทิน -Name[th_TH]=นาฬิกา --- a/plugin-clock/translations/clock_tr.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[tr]=Saat ve takvim -Name[tr]=Saat --- a/plugin-clock/translations/clock_uk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[uk]=Показує поточний час. Календар -Name[uk]=Дата і час --- a/plugin-clock/translations/clock_zh_CN.GB2312.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Clock -Comment=Clock and calendar - -#TRANSLATIONS_DIR=../translations - - -# Translations --- a/plugin-clock/translations/clock_zh_CN.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[zh_CN]=时钟和日历 -Name[zh_CN]=时钟 --- a/plugin-clock/translations/clock_zh_TW.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LXQtPanel/Plugin -Name=Date & time -Comment=Displays the current time. Comes with a calendar. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[zh_TW]=時鐘與日曆 -Name[zh_TW]=時鐘