diff --git a/.github/workflows/program-builder.yml b/.github/workflows/program-builder.yml new file mode 100644 index 0000000000000000000000000000000000000000..047c15840a5557bdbaaa20120c8a2382e8422cef --- /dev/null +++ b/.github/workflows/program-builder.yml @@ -0,0 +1,13 @@ +name: Building Testing +run-name: Building ${{ GITHUB.REPOSITORY }} + +on: + workflow_dispatch: + push: + tags: + - "*" + +jobs: + call: + uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master + secrets: inherit diff --git a/README.md b/README.md index c9af762f817e8b8c89dd900d598a684a7efa7d13..93495698b57cf8227fe51dcdf21c2349c37d284e 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,5 @@ # DDE Dock -DDE Dock is the dock of Deepin Desktop Environment. +DDE Dock is the dock of Deepin Desktop Environment, now it is forked to provide dock for GXDE A tutorial for build dde-dock plugin: [plugins-developer-guide](plugins/plugin-guide/plugins-developer-guide.md) - -## Getting help - -Any usage issues can ask for help via - -* [Gitter](https://gitter.im/orgs/linuxdeepin/rooms) -* [IRC channel](https://webchat.freenode.net/?channels=deepin) -* [Forum](https://bbs.deepin.org) -* [WiKi](https://wiki.deepin.org/) - -## Getting involved - -We encourage you to report issues and contribute changes - -* [Contribution guide for developers](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers-en). (English) -* [开发者代码贡献指南](https://github.com/linuxdeepin/developer-center/wiki/Contribution-Guidelines-for-Developers) (中文) diff --git a/debian/changelog b/debian/changelog index af61c66a945ac6672f3266def8f11c19b3d77bfb..da01bccc6263235606ea3364ca825cb8018ef973 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ -dde-dock (4.10.11gxde3) UNRELEASED; urgency=medium +dde-dock (4.10.17) UNRELEASED; urgency=medium - * Support hide dde dock + * feat: add date in efficient mode + * 修复 dde dock dbus 接口无法访问的问题 - -- gfdgd_xi <3025613752@qq.com> Mon, 05 Aug 2024 12:10:49 +0800 + -- gfdgd_xi <3025613752@qq.com> Sat, 04 Jan 2025 17:42:32 +0800 + +dde-dock (4.10.14gxde3) UNRELEASED; urgency=medium + + * Repair Wine Problem + * config file to GXDE + * add system monitor entry + + -- gfdgd_xi <3025613752@qq.com> Sat, 31 Aug 2024 08:29:57 +0800 dde-dock (4.10.9gxde0) unstable; urgency=low diff --git a/debian/control b/debian/control index 253c2da90b47d5213c81b296bc1976e8d0ead3a9..f266d0574a6eb34c8f63088aaa9c2700503aabb9 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 8.0.0), libqt5svg5-dev, libxcb-icccm4-dev, libxtst-dev, - libdtkwidget-dev, - libdtkcore-dev, + libdtkwidget2-dev, + libdtkcore2-dev, # libdtkcore-bin, qttools5-dev-tools, libxcb-icccm4-dev, @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 8.0.0), cmake, libdde-network-utils-dev (>= 15.11~0.1.4), libdbusmenu-qt5-dev, - libdtkcore5-bin, + libdtkcore-bin, clang [mips64el] Standards-Version: 3.9.8 Homepage: http://www.deepin.org/ @@ -36,15 +36,22 @@ Recommends: dde-disk-mount-plugin, dde-dock-onboard-plugin Conflicts: dde-workspace (<< 2.90.5), dde-dock-applets, - dde-trash-plugin + dde-trash-plugin, + gxde-dock-monitor-plugin, + dde-dock-monitor-plugin Replaces: dde-dock-applets, - dde-trash-plugin + dde-trash-plugin, + gxde-dock-monitor-plugin, + dde-dock-monitor-plugin +Provides: + gxde-dock-monitor-plugin, + dde-dock-monitor-plugin Description: deepin desktop-environment - dock module Deepin desktop environment - dock module. Package: dde-dock-dev -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: deepin desktop-environment - dock module development files Deepin desktop environment - dock module development files. diff --git a/debian/dde-dock.install b/debian/dde-dock.install index 726fd8b12c123b87c7882fb3c151e78f497448e7..c2445f2a31036352979ee60874336c1539ac5825 100644 --- a/debian/dde-dock.install +++ b/debian/dde-dock.install @@ -6,5 +6,7 @@ usr/lib/dde-dock/plugins/libshutdown.so usr/lib/dde-dock/plugins/libtrash.so usr/lib/dde-dock/plugins/libtray.so usr/lib/dde-dock/plugins/liboverlay-warning.so +usr/lib/dde-dock/plugins/libsys_monitor.so usr/lib/dde-dock/plugins/system-trays +usr/lib/gxde-dock/plugins/libsys_monitor.so etc/dde-dock diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 2a6a858dc12be6707a234c04108956da34ac882c..bb614e97000b9fe1aaf7e5df845d876f053eb512 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.7) set(BIN_NAME dde-dock) - +set(TRANS_DIR "${CMAKE_CURRENT_DIR}/translate") configure_file(environments.h.in environments.h @ONLY) # Sources files diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index 472950c00721625612e39a557c20952541b1c787..3eaa11f5ef797b5484e2f8c04a926a5ddc2122bb 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -22,8 +22,6 @@ #include "appsnapshot.h" #include "previewcontainer.h" -#include - #include #include #include @@ -36,14 +34,16 @@ #include #include -struct SHMInfo { +struct SHMInfo +{ long shmid; long width; long height; long bytesPerLine; long format; - struct Rect { + struct Rect + { long x; long y; long width; @@ -142,7 +142,7 @@ void AppSnapshot::fetchSnapshot() if (info) { qDebug() << "get Image from dxcbplugin SHM..."; //qDebug() << info->shmid << info->width << info->height << info->bytesPerLine << info->format << info->rect.x << info->rect.y << info->rect.width << info->rect.height; - image_data = (uchar *)shmat(info->shmid, 0, 0); + image_data = (uchar*)shmat(info->shmid, 0, 0); if ((qint64)image_data != -1) { m_snapshot = QImage(image_data, info->width, info->height, info->bytesPerLine, (QImage::Format)info->format); m_snapshotSrcRect = QRect(info->rect.x, info->rect.y, info->rect.width, info->rect.height); @@ -152,17 +152,19 @@ void AppSnapshot::fetchSnapshot() image_data = nullptr; } - if (!image_data || qimage.isNull()) { + if (!image_data || qimage.isNull()) + { // get window image from XGetImage(a little slow) qDebug() << "get Image from dxcbplugin SHM failed!"; qDebug() << "get Image from Xlib..."; ximage = getImageXlib(); - if (!ximage) { + if (!ximage) + { qDebug() << "get Image from Xlib failed! giving up..."; emit requestCheckWindow(); return; } - qimage = QImage((const uchar *)(ximage->data), ximage->width, ximage->height, ximage->bytes_per_line, QImage::Format_RGB32); + qimage = QImage((const uchar*)(ximage->data), ximage->width, ximage->height, ximage->bytes_per_line, QImage::Format_RGB32); } Q_ASSERT(!qimage.isNull()); @@ -198,7 +200,8 @@ void AppSnapshot::enterEvent(QEvent *e) if (!m_wmHelper->hasComposite()) { m_closeBtn2D->setVisible(true); - } else { + } + else { emit entered(wid()); } @@ -218,7 +221,8 @@ void AppSnapshot::paintEvent(QPaintEvent *e) { QPainter painter(this); - if (!m_wmHelper->hasComposite()) { + if (!m_wmHelper->hasComposite()) + { if (underMouse()) painter.fillRect(rect(), QColor(255, 255, 255, 255 * .2)); return; @@ -230,7 +234,8 @@ void AppSnapshot::paintEvent(QPaintEvent *e) const auto ratio = devicePixelRatioF(); // draw attention background - if (m_windowInfo.attention) { + if (m_windowInfo.attention) + { painter.setBrush(QColor(241, 138, 46, 255 * .8)); painter.setPen(Qt::NoPen); painter.drawRoundedRect(rect(), 5, 5); @@ -239,19 +244,9 @@ void AppSnapshot::paintEvent(QPaintEvent *e) // draw image const QImage &im = m_snapshot; - const qreal offset_x = width() / 2.0 - m_snapshotSrcRect.width() / ratio / 2 - m_snapshotSrcRect.left() / ratio; - const qreal offset_y = height() / 2.0 - m_snapshotSrcRect.height() / ratio / 2 - m_snapshotSrcRect.top() / ratio; - - DStyleHelper dstyle(style()); - const int radius = dstyle.pixelMetric(DStyle::PM_FrameRadius); - - QBrush brush; - brush.setTextureImage(im); - painter.setBrush(brush); - painter.setPen(Qt::NoPen); - painter.scale(1 / ratio, 1 / ratio); - painter.translate(QPoint(offset_x * ratio, offset_y * ratio)); - painter.drawRoundedRect(m_snapshotSrcRect, radius * ratio, radius * ratio); + const qreal offset_x = width() / 2.0 - m_snapshotSrcRect.width() / ratio / 2; + const qreal offset_y = height() / 2.0 - m_snapshotSrcRect.height() / ratio / 2; + painter.drawImage(QPointF(offset_x, offset_y), im, m_snapshotSrcRect); } void AppSnapshot::resizeEvent(QResizeEvent *e) @@ -268,7 +263,7 @@ void AppSnapshot::mousePressEvent(QMouseEvent *e) emit clicked(m_wid); } -SHMInfo *AppSnapshot::getImageDSHM() +SHMInfo * AppSnapshot::getImageDSHM() { const auto display = QX11Info::display(); @@ -284,8 +279,8 @@ SHMInfo *AppSnapshot::getImageDSHM() unsigned char *prop_return_deepin_shm; XGetWindowProperty(display, m_wid, atom_prop, 0, 32 * 9, false, AnyPropertyType, - &actual_type_return_deepin_shm, &actual_format_return_deepin_shm, &nitems_return_deepin_shm, - &bytes_after_return_deepin_shm, &prop_return_deepin_shm); + &actual_type_return_deepin_shm, &actual_format_return_deepin_shm, &nitems_return_deepin_shm, + &bytes_after_return_deepin_shm, &prop_return_deepin_shm); //qDebug() << actual_type_return_deepin_shm << actual_format_return_deepin_shm << nitems_return_deepin_shm << bytes_after_return_deepin_shm << prop_return_deepin_shm; @@ -314,7 +309,8 @@ QRect AppSnapshot::rectRemovedShadow(const QImage &qimage, unsigned char *prop_t const auto r = XGetWindowProperty(display, m_wid, gtk_frame_extents, 0, 4, false, XA_CARDINAL, &actual_type_return_gtk, &actual_format_return_gtk, &n_items_return_gtk, &bytes_after_return_gtk, &prop_to_return_gtk); - if (!r && prop_to_return_gtk && n_items_return_gtk == 4 && actual_format_return_gtk == 32) { + if (!r && prop_to_return_gtk && n_items_return_gtk == 4 && actual_format_return_gtk == 32) + { qDebug() << "remove shadow frame..."; const unsigned long *extents = reinterpret_cast(prop_to_return_gtk); const int left = extents[0]; @@ -329,3 +325,4 @@ QRect AppSnapshot::rectRemovedShadow(const QImage &qimage, unsigned char *prop_t return QRect(0, 0, qimage.width(), qimage.height()); } } + diff --git a/frame/item/components/appsnapshot.h b/frame/item/components/appsnapshot.h index 7d2e5fa3550c9e5e9883d961db355f20c30d3d1b..e40f1b25eb28dab0e46cf2ca50d579cb1d98bbe7 100644 --- a/frame/item/components/appsnapshot.h +++ b/frame/item/components/appsnapshot.h @@ -33,7 +33,7 @@ #include DWIDGET_USE_NAMESPACE -DGUI_USE_NAMESPACE +DTK_USE_NAMESPACE #define SNAP_WIDTH 200 #define SNAP_HEIGHT 130 diff --git a/frame/main.cpp b/frame/main.cpp index 2f52c68d6100791d857aba8d03788a6201c7291e..87ac66ecf98516361879b251327d38781619eecc 100644 --- a/frame/main.cpp +++ b/frame/main.cpp @@ -99,19 +99,18 @@ int main(int argc, char *argv[]) #ifndef QT_DEBUG QDir::setCurrent(QApplication::applicationDirPath()); #endif - MainWindow mw; + if (QFile::exists(QDir::homePath() + "/.config/GXDE/gxde-dock/dock-hide")) { + return app.exec(); + } + DBusDockAdaptors adaptor(&mw); QDBusConnection::sessionBus().registerService("com.deepin.dde.Dock"); QDBusConnection::sessionBus().registerObject("/com/deepin/dde/Dock", "com.deepin.dde.Dock", &mw); - if (!QFile::exists(QDir::homePath() + "/.config/gxde/gxde-dock/dock-hide")) { - QTimer::singleShot(1, &mw, &MainWindow::launch); - } - + QTimer::singleShot(1, &mw, &MainWindow::launch); if (!parser.isSet(disablePlugOption)) { DockItemController::instance()->startLoadPlugins(); } - return app.exec(); } diff --git a/frame/util/dockpopupwindow.h b/frame/util/dockpopupwindow.h index 0ad857658aa9b18e267ef86e4f2fc6fe53386035..d486bbc3d8f5c3f6f4266dd86da9f9acb5e4e903 100644 --- a/frame/util/dockpopupwindow.h +++ b/frame/util/dockpopupwindow.h @@ -27,7 +27,7 @@ #include DWIDGET_USE_NAMESPACE -DGUI_USE_NAMESPACE +DTK_USE_NAMESPACE class DockPopupWindow : public Dtk::Widget::DArrowRectangle { diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index e656d0a7b4f5ec5da493522ca8e8a7c19bc327e2..a8e16d1fcc56d401de9329bb52e57deb33568fb6 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -57,6 +57,7 @@ DockSettings::DockSettings(QWidget *parent) , m_keepShownAct(tr("Keep Shown"), this) , m_keepHiddenAct(tr("Keep Hidden"), this) , m_smartHideAct(tr("Smart Hide"), this) + , m_systemMonitor(tr("System Monitor"), this) , m_displayInter(new DBusDisplay(this)) , m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_itemController(DockItemController::instance(this)) @@ -125,6 +126,10 @@ DockSettings::DockSettings(QWidget *parent) m_settingsMenu.addAction(sizeSubMenuAct); m_settingsMenu.addAction(statusSubMenuAct); m_settingsMenu.addAction(hideSubMenuAct); + // 需要确保安装了系统监视器才可显示 + if (QFile::exists("/usr/bin/deepin-system-monitor") || QFile::exists("/usr/bin/gxde-system-monitor")) { + m_settingsMenu.addAction(&m_systemMonitor); + } m_settingsMenu.setTitle("Settings Menu"); connect(&m_settingsMenu, &WhiteMenu::triggered, this, &DockSettings::menuActionClicked); @@ -144,6 +149,8 @@ DockSettings::DockSettings(QWidget *parent) connect(m_displayInter, &DBusDisplay::ScreenHeightChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DBusDisplay::ScreenWidthChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); + connect(&m_systemMonitor, &QAction::triggered, this, &DockSettings::openSystemMonitor); + DApplication *app = qobject_cast(qApp); if (app) { connect(app, &DApplication::iconThemeChanged, this, &DockSettings::gtkIconThemeChanged); @@ -162,6 +169,17 @@ DockSettings &DockSettings::Instance() return settings; } +void DockSettings::openSystemMonitor() +{ + //QProcess *process = new QProcess(); + if (QFile::exists("/usr/bin/gxde-system-monitor")) { + QProcess::startDetached("gxde-system-monitor"); + } + else { + QProcess::startDetached("deepin-system-monitor"); + } +} + const QRect DockSettings::primaryRect() const { QRect rect = m_primaryRawRect; diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h index f715c49a6cdf084459f3118a0aa2d98713306f36..1e6e899c5a9c5b7254505a2790f5ae592f3bf985 100644 --- a/frame/util/docksettings.h +++ b/frame/util/docksettings.h @@ -121,6 +121,8 @@ private: void calculateWindowConfig(); void gtkIconThemeChanged(); + void openSystemMonitor(); + private: int m_iconSize; bool m_autoHide; @@ -152,6 +154,7 @@ private: QAction m_keepShownAct; QAction m_keepHiddenAct; QAction m_smartHideAct; + QAction m_systemMonitor; DBusDisplay *m_displayInter; DBusDock *m_dockInter; diff --git a/interfaces/constants.h b/interfaces/constants.h index 2302fe40add9bff6d5bce5a655e3c5fd764f12ea..8451d727578eca65650c3ecc141c42bde639eaeb 100644 --- a/interfaces/constants.h +++ b/interfaces/constants.h @@ -27,17 +27,30 @@ namespace Dock { #define DOCK_PLUGIN_MIME "dock/plugin" -#define DOCK_PLUGIN_API_VERSION "1.2.1" #define PLUGIN_BACKGROUND_MIN_SIZE 16 #define PLUGIN_BACKGROUND_MAX_SIZE 1024 +#define DOCK_PLUGIN_API_VERSION "1.2.1" #define PROP_DISPLAY_MODE "DisplayMode" + +//#define PLUGIN_BACKGROUND_MAX_SIZE 40 +//#define PLUGIN_BACKGROUND_MIN_SIZE 20 + +#define PLUGIN_ICON_MAX_SIZE 20 + +// 需求变更成插件图标始终保持20x20,但16x16的资源还在。所以暂时保留此宏 +#define PLUGIN_ICON_MIN_SIZE 20 + +// 插件最小尺寸，图标采用深色 +#define PLUGIN_MIN_ICON_NAME "-dark" + +// dock最大尺寸 +#define DOCK_MAX_SIZE 100 /// /// \brief The DisplayMode enum /// spec dock display mode /// -enum DisplayMode -{ +enum DisplayMode { Fashion = 0, Efficient = 1, // deprecreated @@ -49,8 +62,7 @@ enum DisplayMode /// \brief The HideMode enum /// spec dock hide behavior /// -enum HideMode -{ +enum HideMode { KeepShowing = 0, KeepHidden = 1, SmartHide = 3, @@ -62,8 +74,7 @@ enum HideMode /// spec dock position, dock always placed at primary screen, /// so all position is the primary screen edge. /// -enum Position -{ +enum Position { Top = 0, Right = 1, Bottom = 2, @@ -76,8 +87,7 @@ enum Position /// spec current dock should hide or shown. /// this argument works only HideMode is SmartHide /// -enum HideState -{ +enum HideState { Unknown = 0, Show = 1, Hide = 2, diff --git a/interfaces/pluginsiteminterface.h b/interfaces/pluginsiteminterface.h index ebdfbfbab5023a48e68d25297425228a88008351..f4baba47a9f23a735c2c02a4c20890c7b0ce1f0d 100644 --- a/interfaces/pluginsiteminterface.h +++ b/interfaces/pluginsiteminterface.h @@ -35,6 +35,27 @@ class PluginsItemInterface { public: + /*enum PluginType { + Normal, + Fixed + };*/ + + /** + * @brief Plugin size policy + */ + /*enum PluginSizePolicy { + System = 1 << 0, // Follow the system + Custom = 1 << 1 // The custom + }; + + enum PluginMode { + Deactive = 0, + Active, + Disabled + }; + + virtual PluginSizePolicy pluginSizePolicy() const { return System; }*/ + /// /// \brief ~PluginsItemInterface /// DON'T try to delete m_proxyInter. diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 9f2425df5afe6858c5e2bbed2510fadb77d6a75a..2abfb4f23748c963a4e5e22efb0e943955a888dd 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory("datetime") +add_subdirectory("dde-sys-monitor-plugin") #add_subdirectory("disk-mount") add_subdirectory("network") add_subdirectory("shutdown") diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index c5cb4f5f0ef062868c2caf20f6a84e4a6048a693..19baa69603c8d39f4fd7f9979df66374de1ec70a 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -57,9 +57,10 @@ QSize DatetimeWidget::sizeHint() const QFontMetrics fm(qApp->font()); if (m_24HourFormat) - return fm.boundingRect("88:88").size() + QSize(20, 10); + return fm.boundingRect("2024/10/24").size() + QSize(20, 10); + //return fm.boundingRect("10:24\n2024/10/24").size() + QSize(20, 10); else - return fm.boundingRect("88:88 A.A.").size() + QSize(20, 20); + return fm.boundingRect("10:24 A.A.").size() + QSize(20, 20); } void DatetimeWidget::resizeEvent(QResizeEvent *e) @@ -85,17 +86,20 @@ void DatetimeWidget::paintEvent(QPaintEvent *e) { QString format; if (m_24HourFormat) - format = "hh:mm"; + if (position == Dock::Top || position == Dock::Bottom) + format = "hh:mm\nyyyy/MM/dd"; + else + format = "hh:mm\nyyyy\n/MM/dd"; else { if (position == Dock::Top || position == Dock::Bottom) - format = "hh:mm AP"; + format = "hh:mm AP\nyyyy/MM/dd"; else - format = "hh:mm\nAP"; + format = "hh:mm\nAP\nyyyy/MM/dd"; } painter.setPen(Qt::white); - painter.drawText(rect(), Qt::AlignCenter, current.time().toString(format)); + painter.drawText(rect(), Qt::AlignCenter, current.currentDateTime().toString(format)); return; } diff --git a/plugins/dde-sys-monitor-plugin/.gitignore b/plugins/dde-sys-monitor-plugin/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..567609b1234a9b8806c5a05da6c866e480aa148d --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CMakeSystem.cmake b/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CMakeSystem.cmake new file mode 100644 index 0000000000000000000000000000000000000000..f578c69e9cf21a832dda790a17d1bb40145226c1 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CMakeSystem.cmake @@ -0,0 +1,15 @@ +set(CMAKE_HOST_SYSTEM "Linux-6.9.7+bpo-amd64") +set(CMAKE_HOST_SYSTEM_NAME "Linux") +set(CMAKE_HOST_SYSTEM_VERSION "6.9.7+bpo-amd64") +set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") + + + +set(CMAKE_SYSTEM "Linux-6.9.7+bpo-amd64") +set(CMAKE_SYSTEM_NAME "Linux") +set(CMAKE_SYSTEM_VERSION "6.9.7+bpo-amd64") +set(CMAKE_SYSTEM_PROCESSOR "x86_64") + +set(CMAKE_CROSSCOMPILING "FALSE") + +set(CMAKE_SYSTEM_LOADED 1) diff --git a/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CompilerIdC/CMakeCCompilerId.c b/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CompilerIdC/CMakeCCompilerId.c new file mode 100644 index 0000000000000000000000000000000000000000..508c4cd73fc9a1d6e172e1d13e38a19a6770cbcc --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/CMakeFiles/3.29.6/CompilerIdC/CMakeCCompilerId.c @@ -0,0 +1,895 @@ +#ifdef __cplusplus +# error "A C++ compiler has been selected for C." +#endif + +#if defined(__18CXX) +# define ID_VOID_MAIN +#endif +#if defined(__CLASSIC_C__) +/* cv-qualifiers did not exist in K&R C */ +# define const +# define volatile +#endif + +#if !defined(__has_include) +/* If the compiler does not have __has_include, pretend the answer is + always no. */ +# define __has_include(x) 0 +#endif + + +/* Version number components: V=Version, R=Revision, P=Patch + Version date components: YYYY=Year, MM=Month, DD=Day */ + +#if defined(__INTEL_COMPILER) || defined(__ICC) +# define COMPILER_ID "Intel" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# if defined(__GNUC__) +# define SIMULATE_ID "GNU" +# endif + /* __INTEL_COMPILER = VRP prior to 2021, and then VVVV for 2021 and later, + except that a few beta releases use the old format with V=2021. */ +# if __INTEL_COMPILER < 2021 || __INTEL_COMPILER == 202110 || __INTEL_COMPILER == 202111 +# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) +# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) +# if defined(__INTEL_COMPILER_UPDATE) +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# else +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# endif +# else +# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER) +# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER_UPDATE) + /* The third version component from --version is an update index, + but no macro is provided for it. */ +# define COMPILER_VERSION_PATCH DEC(0) +# endif +# if defined(__INTEL_COMPILER_BUILD_DATE) + /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ +# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) +# endif +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# if defined(__GNUC__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) +# elif defined(__GNUG__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif (defined(__clang__) && defined(__INTEL_CLANG_COMPILER)) || defined(__INTEL_LLVM_COMPILER) +# define COMPILER_ID "IntelLLVM" +#if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +#endif +#if defined(__GNUC__) +# define SIMULATE_ID "GNU" +#endif +/* __INTEL_LLVM_COMPILER = VVVVRP prior to 2021.2.0, VVVVRRPP for 2021.2.0 and + * later. Look for 6 digit vs. 8 digit version number to decide encoding. + * VVVV is no smaller than the current year when a version is released. + */ +#if __INTEL_LLVM_COMPILER < 1000000L +# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/100) +# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 10) +#else +# define COMPILER_VERSION_MAJOR DEC(__INTEL_LLVM_COMPILER/10000) +# define COMPILER_VERSION_MINOR DEC(__INTEL_LLVM_COMPILER/100 % 100) +# define COMPILER_VERSION_PATCH DEC(__INTEL_LLVM_COMPILER % 100) +#endif +#if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +#endif +#if defined(__GNUC__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) +#elif defined(__GNUG__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) +#endif +#if defined(__GNUC_MINOR__) +# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) +#endif +#if defined(__GNUC_PATCHLEVEL__) +# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +#endif + +#elif defined(__PATHCC__) +# define COMPILER_ID "PathScale" +# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) +# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) +# if defined(__PATHCC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) +# endif + +#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__) +# define COMPILER_ID "Embarcadero" +# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF) +# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF) +# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF) + +#elif defined(__BORLANDC__) +# define COMPILER_ID "Borland" + /* __BORLANDC__ = 0xVRR */ +# define COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8) +# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF) + +#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 +# define COMPILER_ID "Watcom" + /* __WATCOMC__ = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__WATCOMC__) +# define COMPILER_ID "OpenWatcom" + /* __WATCOMC__ = VVRP + 1100 */ +# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__SUNPRO_C) +# define COMPILER_ID "SunPro" +# if __SUNPRO_C >= 0x5100 + /* __SUNPRO_C = 0xVRRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>12) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xFF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) +# else + /* __SUNPRO_CC = 0xVRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) +# endif + +#elif defined(__HP_cc) +# define COMPILER_ID "HP" + /* __HP_cc = VVRRPP */ +# define COMPILER_VERSION_MAJOR DEC(__HP_cc/10000) +# define COMPILER_VERSION_MINOR DEC(__HP_cc/100 % 100) +# define COMPILER_VERSION_PATCH DEC(__HP_cc % 100) + +#elif defined(__DECC) +# define COMPILER_ID "Compaq" + /* __DECC_VER = VVRRTPPPP */ +# define COMPILER_VERSION_MAJOR DEC(__DECC_VER/10000000) +# define COMPILER_VERSION_MINOR DEC(__DECC_VER/100000 % 100) +# define COMPILER_VERSION_PATCH DEC(__DECC_VER % 10000) + +#elif defined(__IBMC__) && defined(__COMPILER_VER__) +# define COMPILER_ID "zOS" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__open_xl__) && defined(__clang__) +# define COMPILER_ID "IBMClang" +# define COMPILER_VERSION_MAJOR DEC(__open_xl_version__) +# define COMPILER_VERSION_MINOR DEC(__open_xl_release__) +# define COMPILER_VERSION_PATCH DEC(__open_xl_modification__) +# define COMPILER_VERSION_TWEAK DEC(__open_xl_ptf_fix_level__) + + +#elif defined(__ibmxl__) && defined(__clang__) +# define COMPILER_ID "XLClang" +# define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) +# define COMPILER_VERSION_MINOR DEC(__ibmxl_release__) +# define COMPILER_VERSION_PATCH DEC(__ibmxl_modification__) +# define COMPILER_VERSION_TWEAK DEC(__ibmxl_ptf_fix_level__) + + +#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ >= 800 +# define COMPILER_ID "XL" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ < 800 +# define COMPILER_ID "VisualAge" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__NVCOMPILER) +# define COMPILER_ID "NVHPC" +# define COMPILER_VERSION_MAJOR DEC(__NVCOMPILER_MAJOR__) +# define COMPILER_VERSION_MINOR DEC(__NVCOMPILER_MINOR__) +# if defined(__NVCOMPILER_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__NVCOMPILER_PATCHLEVEL__) +# endif + +#elif defined(__PGI) +# define COMPILER_ID "PGI" +# define COMPILER_VERSION_MAJOR DEC(__PGIC__) +# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__) +# if defined(__PGIC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) +# endif + +#elif defined(__clang__) && defined(__cray__) +# define COMPILER_ID "CrayClang" +# define COMPILER_VERSION_MAJOR DEC(__cray_major__) +# define COMPILER_VERSION_MINOR DEC(__cray_minor__) +# define COMPILER_VERSION_PATCH DEC(__cray_patchlevel__) +# define COMPILER_VERSION_INTERNAL_STR __clang_version__ + + +#elif defined(_CRAYC) +# define COMPILER_ID "Cray" +# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR) +# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR) + +#elif defined(__TI_COMPILER_VERSION__) +# define COMPILER_ID "TI" + /* __TI_COMPILER_VERSION__ = VVVRRRPPP */ +# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000) +# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000) +# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000) + +#elif defined(__CLANG_FUJITSU) +# define COMPILER_ID "FujitsuClang" +# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) +# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) +# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) +# define COMPILER_VERSION_INTERNAL_STR __clang_version__ + + +#elif defined(__FUJITSU) +# define COMPILER_ID "Fujitsu" +# if defined(__FCC_version__) +# define COMPILER_VERSION __FCC_version__ +# elif defined(__FCC_major__) +# define COMPILER_VERSION_MAJOR DEC(__FCC_major__) +# define COMPILER_VERSION_MINOR DEC(__FCC_minor__) +# define COMPILER_VERSION_PATCH DEC(__FCC_patchlevel__) +# endif +# if defined(__fcc_version) +# define COMPILER_VERSION_INTERNAL DEC(__fcc_version) +# elif defined(__FCC_VERSION) +# define COMPILER_VERSION_INTERNAL DEC(__FCC_VERSION) +# endif + + +#elif defined(__ghs__) +# define COMPILER_ID "GHS" +/* __GHS_VERSION_NUMBER = VVVVRP */ +# ifdef __GHS_VERSION_NUMBER +# define COMPILER_VERSION_MAJOR DEC(__GHS_VERSION_NUMBER / 100) +# define COMPILER_VERSION_MINOR DEC(__GHS_VERSION_NUMBER / 10 % 10) +# define COMPILER_VERSION_PATCH DEC(__GHS_VERSION_NUMBER % 10) +# endif + +#elif defined(__TASKING__) +# define COMPILER_ID "Tasking" + # define COMPILER_VERSION_MAJOR DEC(__VERSION__/1000) + # define COMPILER_VERSION_MINOR DEC(__VERSION__ % 100) +# define COMPILER_VERSION_INTERNAL DEC(__VERSION__) + +#elif defined(__ORANGEC__) +# define COMPILER_ID "OrangeC" +# define COMPILER_VERSION_MAJOR DEC(__ORANGEC_MAJOR__) +# define COMPILER_VERSION_MINOR DEC(__ORANGEC_MINOR__) +# define COMPILER_VERSION_PATCH DEC(__ORANGEC_PATCHLEVEL__) + +#elif defined(__TINYC__) +# define COMPILER_ID "TinyCC" + +#elif defined(__BCC__) +# define COMPILER_ID "Bruce" + +#elif defined(__SCO_VERSION__) +# define COMPILER_ID "SCO" + +#elif defined(__ARMCC_VERSION) && !defined(__clang__) +# define COMPILER_ID "ARMCC" +#if __ARMCC_VERSION >= 1000000 + /* __ARMCC_VERSION = VRRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#else + /* __ARMCC_VERSION = VRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#endif + + +#elif defined(__clang__) && defined(__apple_build_version__) +# define COMPILER_ID "AppleClang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# define COMPILER_VERSION_TWEAK DEC(__apple_build_version__) + +#elif defined(__clang__) && defined(__ARMCOMPILER_VERSION) +# define COMPILER_ID "ARMClang" + # define COMPILER_VERSION_MAJOR DEC(__ARMCOMPILER_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCOMPILER_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCOMPILER_VERSION/100 % 100) +# define COMPILER_VERSION_INTERNAL DEC(__ARMCOMPILER_VERSION) + +#elif defined(__clang__) && defined(__ti__) +# define COMPILER_ID "TIClang" + # define COMPILER_VERSION_MAJOR DEC(__ti_major__) + # define COMPILER_VERSION_MINOR DEC(__ti_minor__) + # define COMPILER_VERSION_PATCH DEC(__ti_patchlevel__) +# define COMPILER_VERSION_INTERNAL DEC(__ti_version__) + +#elif defined(__clang__) +# define COMPILER_ID "Clang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif + +#elif defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__)) +# define COMPILER_ID "LCC" +# define COMPILER_VERSION_MAJOR DEC(__LCC__ / 100) +# define COMPILER_VERSION_MINOR DEC(__LCC__ % 100) +# if defined(__LCC_MINOR__) +# define COMPILER_VERSION_PATCH DEC(__LCC_MINOR__) +# endif +# if defined(__GNUC__) && defined(__GNUC_MINOR__) +# define SIMULATE_ID "GNU" +# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) +# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) +# if defined(__GNUC_PATCHLEVEL__) +# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif +# endif + +#elif defined(__GNUC__) +# define COMPILER_ID "GNU" +# define COMPILER_VERSION_MAJOR DEC(__GNUC__) +# if defined(__GNUC_MINOR__) +# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif defined(_MSC_VER) +# define COMPILER_ID "MSVC" + /* _MSC_VER = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100) +# define COMPILER_VERSION_MINOR DEC(_MSC_VER % 100) +# if defined(_MSC_FULL_VER) +# if _MSC_VER >= 1400 + /* _MSC_FULL_VER = VVRRPPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000) +# else + /* _MSC_FULL_VER = VVRRPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000) +# endif +# endif +# if defined(_MSC_BUILD) +# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) +# endif + +#elif defined(_ADI_COMPILER) +# define COMPILER_ID "ADSP" +#if defined(__VERSIONNUM__) + /* __VERSIONNUM__ = 0xVVRRPPTT */ +# define COMPILER_VERSION_MAJOR DEC(__VERSIONNUM__ >> 24 & 0xFF) +# define COMPILER_VERSION_MINOR DEC(__VERSIONNUM__ >> 16 & 0xFF) +# define COMPILER_VERSION_PATCH DEC(__VERSIONNUM__ >> 8 & 0xFF) +# define COMPILER_VERSION_TWEAK DEC(__VERSIONNUM__ & 0xFF) +#endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# define COMPILER_ID "IAR" +# if defined(__VER__) && defined(__ICCARM__) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 1000000) +# define COMPILER_VERSION_MINOR DEC(((__VER__) / 1000) % 1000) +# define COMPILER_VERSION_PATCH DEC((__VER__) % 1000) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__) || defined(__ICCSTM8__)) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 100) +# define COMPILER_VERSION_MINOR DEC((__VER__) - (((__VER__) / 100)*100)) +# define COMPILER_VERSION_PATCH DEC(__SUBVERSION__) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# endif + +#elif defined(__SDCC_VERSION_MAJOR) || defined(SDCC) +# define COMPILER_ID "SDCC" +# if defined(__SDCC_VERSION_MAJOR) +# define COMPILER_VERSION_MAJOR DEC(__SDCC_VERSION_MAJOR) +# define COMPILER_VERSION_MINOR DEC(__SDCC_VERSION_MINOR) +# define COMPILER_VERSION_PATCH DEC(__SDCC_VERSION_PATCH) +# else + /* SDCC = VRP */ +# define COMPILER_VERSION_MAJOR DEC(SDCC/100) +# define COMPILER_VERSION_MINOR DEC(SDCC/10 % 10) +# define COMPILER_VERSION_PATCH DEC(SDCC % 10) +# endif + + +/* These compilers are either not known or too old to define an + identification macro. Try to identify the platform and guess that + it is the native compiler. */ +#elif defined(__hpux) || defined(__hpua) +# define COMPILER_ID "HP" + +#else /* unknown compiler */ +# define COMPILER_ID "" +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; +#ifdef SIMULATE_ID +char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; +#endif + +#ifdef __QNXNTO__ +char const* qnxnto = "INFO" ":" "qnxnto[]"; +#endif + +#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) +char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; +#endif + +#define STRINGIFY_HELPER(X) #X +#define STRINGIFY(X) STRINGIFY_HELPER(X) + +/* Identify known platforms by name. */ +#if defined(__linux) || defined(__linux__) || defined(linux) +# define PLATFORM_ID "Linux" + +#elif defined(__MSYS__) +# define PLATFORM_ID "MSYS" + +#elif defined(__CYGWIN__) +# define PLATFORM_ID "Cygwin" + +#elif defined(__MINGW32__) +# define PLATFORM_ID "MinGW" + +#elif defined(__APPLE__) +# define PLATFORM_ID "Darwin" + +#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +# define PLATFORM_ID "Windows" + +#elif defined(__FreeBSD__) || defined(__FreeBSD) +# define PLATFORM_ID "FreeBSD" + +#elif defined(__NetBSD__) || defined(__NetBSD) +# define PLATFORM_ID "NetBSD" + +#elif defined(__OpenBSD__) || defined(__OPENBSD) +# define PLATFORM_ID "OpenBSD" + +#elif defined(__sun) || defined(sun) +# define PLATFORM_ID "SunOS" + +#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__) +# define PLATFORM_ID "AIX" + +#elif defined(__hpux) || defined(__hpux__) +# define PLATFORM_ID "HP-UX" + +#elif defined(__HAIKU__) +# define PLATFORM_ID "Haiku" + +#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) +# define PLATFORM_ID "BeOS" + +#elif defined(__QNX__) || defined(__QNXNTO__) +# define PLATFORM_ID "QNX" + +#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__) +# define PLATFORM_ID "Tru64" + +#elif defined(__riscos) || defined(__riscos__) +# define PLATFORM_ID "RISCos" + +#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__) +# define PLATFORM_ID "SINIX" + +#elif defined(__UNIX_SV__) +# define PLATFORM_ID "UNIX_SV" + +#elif defined(__bsdos__) +# define PLATFORM_ID "BSDOS" + +#elif defined(_MPRAS) || defined(MPRAS) +# define PLATFORM_ID "MP-RAS" + +#elif defined(__osf) || defined(__osf__) +# define PLATFORM_ID "OSF1" + +#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv) +# define PLATFORM_ID "SCO_SV" + +#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX) +# define PLATFORM_ID "ULTRIX" + +#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX) +# define PLATFORM_ID "Xenix" + +#elif defined(__WATCOMC__) +# if defined(__LINUX__) +# define PLATFORM_ID "Linux" + +# elif defined(__DOS__) +# define PLATFORM_ID "DOS" + +# elif defined(__OS2__) +# define PLATFORM_ID "OS2" + +# elif defined(__WINDOWS__) +# define PLATFORM_ID "Windows3x" + +# elif defined(__VXWORKS__) +# define PLATFORM_ID "VxWorks" + +# else /* unknown platform */ +# define PLATFORM_ID +# endif + +#elif defined(__INTEGRITY) +# if defined(INT_178B) +# define PLATFORM_ID "Integrity178" + +# else /* regular Integrity */ +# define PLATFORM_ID "Integrity" +# endif + +# elif defined(_ADI_COMPILER) +# define PLATFORM_ID "ADSP" + +#else /* unknown platform */ +# define PLATFORM_ID + +#endif + +/* For windows compilers MSVC and Intel we can determine + the architecture of the compiler being used. This is because + the compilers do not have flags that can change the architecture, + but rather depend on which compiler is being used +*/ +#if defined(_WIN32) && defined(_MSC_VER) +# if defined(_M_IA64) +# define ARCHITECTURE_ID "IA64" + +# elif defined(_M_ARM64EC) +# define ARCHITECTURE_ID "ARM64EC" + +# elif defined(_M_X64) || defined(_M_AMD64) +# define ARCHITECTURE_ID "x64" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# elif defined(_M_ARM64) +# define ARCHITECTURE_ID "ARM64" + +# elif defined(_M_ARM) +# if _M_ARM == 4 +# define ARCHITECTURE_ID "ARMV4I" +# elif _M_ARM == 5 +# define ARCHITECTURE_ID "ARMV5I" +# else +# define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM) +# endif + +# elif defined(_M_MIPS) +# define ARCHITECTURE_ID "MIPS" + +# elif defined(_M_SH) +# define ARCHITECTURE_ID "SHx" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__WATCOMC__) +# if defined(_M_I86) +# define ARCHITECTURE_ID "I86" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# if defined(__ICCARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__ICCRX__) +# define ARCHITECTURE_ID "RX" + +# elif defined(__ICCRH850__) +# define ARCHITECTURE_ID "RH850" + +# elif defined(__ICCRL78__) +# define ARCHITECTURE_ID "RL78" + +# elif defined(__ICCRISCV__) +# define ARCHITECTURE_ID "RISCV" + +# elif defined(__ICCAVR__) +# define ARCHITECTURE_ID "AVR" + +# elif defined(__ICC430__) +# define ARCHITECTURE_ID "MSP430" + +# elif defined(__ICCV850__) +# define ARCHITECTURE_ID "V850" + +# elif defined(__ICC8051__) +# define ARCHITECTURE_ID "8051" + +# elif defined(__ICCSTM8__) +# define ARCHITECTURE_ID "STM8" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__ghs__) +# if defined(__PPC64__) +# define ARCHITECTURE_ID "PPC64" + +# elif defined(__ppc__) +# define ARCHITECTURE_ID "PPC" + +# elif defined(__ARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__x86_64__) +# define ARCHITECTURE_ID "x64" + +# elif defined(__i386__) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__clang__) && defined(__ti__) +# if defined(__ARM_ARCH) +# define ARCHITECTURE_ID "Arm" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__TI_COMPILER_VERSION__) +# if defined(__TI_ARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__MSP430__) +# define ARCHITECTURE_ID "MSP430" + +# elif defined(__TMS320C28XX__) +# define ARCHITECTURE_ID "TMS320C28x" + +# elif defined(__TMS320C6X__) || defined(_TMS320C6X) +# define ARCHITECTURE_ID "TMS320C6x" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +# elif defined(__ADSPSHARC__) +# define ARCHITECTURE_ID "SHARC" + +# elif defined(__ADSPBLACKFIN__) +# define ARCHITECTURE_ID "Blackfin" + +#elif defined(__TASKING__) + +# if defined(__CTC__) || defined(__CPTC__) +# define ARCHITECTURE_ID "TriCore" + +# elif defined(__CMCS__) +# define ARCHITECTURE_ID "MCS" + +# elif defined(__CARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__CARC__) +# define ARCHITECTURE_ID "ARC" + +# elif defined(__C51__) +# define ARCHITECTURE_ID "8051" + +# elif defined(__CPCP__) +# define ARCHITECTURE_ID "PCP" + +# else +# define ARCHITECTURE_ID "" +# endif + +#else +# define ARCHITECTURE_ID +#endif + +/* Convert integer to decimal digit literals. */ +#define DEC(n) \ + ('0' + (((n) / 10000000)%10)), \ + ('0' + (((n) / 1000000)%10)), \ + ('0' + (((n) / 100000)%10)), \ + ('0' + (((n) / 10000)%10)), \ + ('0' + (((n) / 1000)%10)), \ + ('0' + (((n) / 100)%10)), \ + ('0' + (((n) / 10)%10)), \ + ('0' + ((n) % 10)) + +/* Convert integer to hex digit literals. */ +#define HEX(n) \ + ('0' + ((n)>>28 & 0xF)), \ + ('0' + ((n)>>24 & 0xF)), \ + ('0' + ((n)>>20 & 0xF)), \ + ('0' + ((n)>>16 & 0xF)), \ + ('0' + ((n)>>12 & 0xF)), \ + ('0' + ((n)>>8 & 0xF)), \ + ('0' + ((n)>>4 & 0xF)), \ + ('0' + ((n) & 0xF)) + +/* Construct a string literal encoding the version number. */ +#ifdef COMPILER_VERSION +char const* info_version = "INFO" ":" "compiler_version[" COMPILER_VERSION "]"; + +/* Construct a string literal encoding the version number components. */ +#elif defined(COMPILER_VERSION_MAJOR) +char const info_version[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','[', + COMPILER_VERSION_MAJOR, +# ifdef COMPILER_VERSION_MINOR + '.', COMPILER_VERSION_MINOR, +# ifdef COMPILER_VERSION_PATCH + '.', COMPILER_VERSION_PATCH, +# ifdef COMPILER_VERSION_TWEAK + '.', COMPILER_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct a string literal encoding the internal version number. */ +#ifdef COMPILER_VERSION_INTERNAL +char const info_version_internal[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','_', + 'i','n','t','e','r','n','a','l','[', + COMPILER_VERSION_INTERNAL,']','\0'}; +#elif defined(COMPILER_VERSION_INTERNAL_STR) +char const* info_version_internal = "INFO" ":" "compiler_version_internal[" COMPILER_VERSION_INTERNAL_STR "]"; +#endif + +/* Construct a string literal encoding the version number components. */ +#ifdef SIMULATE_VERSION_MAJOR +char const info_simulate_version[] = { + 'I', 'N', 'F', 'O', ':', + 's','i','m','u','l','a','t','e','_','v','e','r','s','i','o','n','[', + SIMULATE_VERSION_MAJOR, +# ifdef SIMULATE_VERSION_MINOR + '.', SIMULATE_VERSION_MINOR, +# ifdef SIMULATE_VERSION_PATCH + '.', SIMULATE_VERSION_PATCH, +# ifdef SIMULATE_VERSION_TWEAK + '.', SIMULATE_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]"; +char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]"; + + + +#if !defined(__STDC__) && !defined(__clang__) +# if defined(_MSC_VER) || defined(__ibmxl__) || defined(__IBMC__) +# define C_VERSION "90" +# else +# define C_VERSION +# endif +#elif __STDC_VERSION__ > 201710L +# define C_VERSION "23" +#elif __STDC_VERSION__ >= 201710L +# define C_VERSION "17" +#elif __STDC_VERSION__ >= 201000L +# define C_VERSION "11" +#elif __STDC_VERSION__ >= 199901L +# define C_VERSION "99" +#else +# define C_VERSION "90" +#endif +const char* info_language_standard_default = + "INFO" ":" "standard_default[" C_VERSION "]"; + +const char* info_language_extensions_default = "INFO" ":" "extensions_default[" +#if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) || \ + defined(__TI_COMPILER_VERSION__)) && \ + !defined(__STRICT_ANSI__) + "ON" +#else + "OFF" +#endif +"]"; + +/*--------------------------------------------------------------------------*/ + +#ifdef ID_VOID_MAIN +void main() {} +#else +# if defined(__CLASSIC_C__) +int main(argc, argv) int argc; char *argv[]; +# else +int main(int argc, char* argv[]) +# endif +{ + int require = 0; + require += info_compiler[argc]; + require += info_platform[argc]; + require += info_arch[argc]; +#ifdef COMPILER_VERSION_MAJOR + require += info_version[argc]; +#endif +#ifdef COMPILER_VERSION_INTERNAL + require += info_version_internal[argc]; +#endif +#ifdef SIMULATE_ID + require += info_simulate[argc]; +#endif +#ifdef SIMULATE_VERSION_MAJOR + require += info_simulate_version[argc]; +#endif +#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) + require += info_cray[argc]; +#endif + require += info_language_standard_default[argc]; + require += info_language_extensions_default[argc]; + (void)argv; + return require; +} +#endif diff --git a/plugins/dde-sys-monitor-plugin/CMakeFiles/CMakeConfigureLog.yaml b/plugins/dde-sys-monitor-plugin/CMakeFiles/CMakeConfigureLog.yaml new file mode 100644 index 0000000000000000000000000000000000000000..60509b4b9d55c382ce6980274507a71643024c12 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/CMakeFiles/CMakeConfigureLog.yaml @@ -0,0 +1,10 @@ + +--- +events: + - + kind: "message-v1" + backtrace: + - "/usr/share/cmake-3.29/Modules/CMakeDetermineSystem.cmake:205 (message)" + - "CMakeLists.txt:14 (project)" + message: | + The system is: Linux - 6.9.7+bpo-amd64 - x86_64 diff --git a/plugins/dde-sys-monitor-plugin/CMakeLists.txt b/plugins/dde-sys-monitor-plugin/CMakeLists.txt new file mode 100755 index 0000000000000000000000000000000000000000..d89418e1ae436443304ccb07e241d0ba6403e8ad --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/CMakeLists.txt @@ -0,0 +1,106 @@ +# 学习 cmake 时建议直接从命令列表作为入口，遇到不清楚意思的命令都可以在此处查阅： +# https://cmake.org/cmake/help/latest/manual/cmake-commands.7.html +# 另外下面是完整的文档入口： +# https://cmake.org/cmake/help/latest/ + +# 设置运行该脚本所需的 cmake 最低版本 +cmake_minimum_required(VERSION 3.9) + +# 使用 set 命令设置一个变量 +set(PLUGIN_NAME "sys_monitor") +# set(CMAKE_CXX_COMPILER "/usr/bin/g++") + +# 设置项目名称 +project(${PLUGIN_NAME}) + +# 启用 qt moc 的支持 +set(CMAKE_AUTOMOC ON) +# 启用 qrc 资源文件的支持 +set(CMAKE_AUTORCC ON) +#打开全局uic +set(CMAKE_AUTOUIC ON) + +# generate a compile commands file as complete database for vim-YouCompleteMe or some other similar tools +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +# 指定所有源码文件 +# 使用了 cmake 的 file 命令，递归查找项目目录下所有头文件和源码文件， +# 并将结果放入 SRCS 变量中，SRCS 变量可用于后续使用 +file(GLOB_RECURSE SRCS "*.h" "*.cpp" "*.ui") + +# 指定要用到的库 +# 使用了 cmake 的 find_package 命令，查找库 Qt5Widgets 等， +# REQUIRED 参数表示如果没有找到则报错 +# find_package 命令在找到并加载指定的库之后会设置一些变量， +# 常用的有： +# <库名>_FOUND 是否找到（Qt5Widgets_FOUND） +# <库名>_DIR 在哪个目录下找到的（Qt5Widgets_DIR） +# <库名>_INCLUDE_DIRS 有哪些头文件目录（Qt5Widgets_INCLUDE_DIRS） +# <库名>_LIBRARIES 有哪些库文件（Qt5Widgets_LIBRARIES） +find_package(Qt5Widgets REQUIRED) +find_package(DtkWidget REQUIRED) + +# find_package 命令还可以用来加载 cmake 的功能模块 +# 并不是所有的库都直接支持 cmake 查找的，但大部分都支持了 pkg-config 这个标准， +# 因此 cmake 提供了间接加载库的模块：FindPkgConfig， 下面这行命令表示加载 FindPkgConfig 模块， +# 这个 cmake 模块提供了额外的基于 “pkg-config” 加载库的能力 +# 执行下面的命令后后会设置如下变量，不过一般用不到： +# PKG_CONFIG_FOUND pkg-config 可执行文件是否找到了 +# PKG_CONFIG_EXECUTABLE pkg-config 可执行文件的路径 +# PKG_CONFIG_VERSION_STRING pkg-config 的版本信息 +find_package(PkgConfig REQUIRED) + +# 加载 FindPkgConfig 模块后就可以使用 pkg_check_modules 命令加载需要的库 +# pkg_check_modules 命令是由 FindPkgConfig 模块提供的，因此要使用这个命令必须先加载 FindPkgConfig 模块。 +# 执行 pkg_check_modules 命令加载库也会设置一些类似执行 find_package 加载库后设置的变量： +# DdeDockInterface_FOUND +# DdeDockInterface_INCLUDE_DIRS +# DdeDockInterface_LIBRARIES +# 还有有另外的一些变量以及更灵活的用法，比如一次性查找多个库，这些请自行查找 cmake 文档学习。 +#pkg_check_modules(DdeDockInterface REQUIRED dde-dock) + +# add_definitions 命令用于声明/定义一些编译/预处理参数 +# 根据 cmake 文档描述此命令已经由另外几个功能划分的更为细致的命令所取代，具体请查阅文档 +# 在我们这里的例子应该使用较新的 add_compile_definitions 命令，不过为了保持与 dock 已有插件一致， +# 暂时仍然使用 add_definitions，add_definitions 的语法很简单就是直接写要定义的 flag 并在前面加上 "-D" 即可 +# 括号中的 ${QT_DEFINITIONS} 变量会在执行 cmake 时展开为它的值，这个变量属于历史遗留，应该是在 qt3/qt4 时有用， +# 基于 qt5 或更高版本的新插件不必使用此变量。要查看 qt5 的库定义了哪些变量应该查看变量：${Qt5Widgets_DEFINITIONS} +add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN") + +# 新增一个编译目标 +# 这里使用命令 add_library 来表示本项目要生成一个库文件目标， +# 类似的还有命令 add_executable 添加一个可执行二进制目标，甚至 add_custom_target(使用较少) 添加自定义目标 +# SHARED 表示生成的库应该是动态库， +# 变量 ${PLUGIN_NAME} 和 ${SRCS} 都是前面处理好的， +# 另外 qrc 资源文件也应该追加在后面以编译进目标中。 +add_library(${PLUGIN_NAME} SHARED ${SRCS} sys_monitor.qrc) + +# 设置目标的生成位置，这里表示生成在执行 make 的目录, +# 另外还有很多可用于设置的属性，可查阅 cmake 文档。 +set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ./) +target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces) + +# 设置目标要使用的 include 目录，即头文件目录 +# 变量 ${DtkWidget_INCLUDE_DIRS} 是在前面执行 find_package 命令时引入的 +# 当出现编译失败提示找不到某些库的头文件时应该检查此处是否将所有需要的头文件都包含了 +target_include_directories(${PLUGIN_NAME} PUBLIC + ${Qt5Widgets_INCLUDE_DIRS} + ${DtkWidget_INCLUDE_DIRS} + #${DdeDockInterface_INCLUDE_DIRS} +) + +# 设置目标要使用的链接库 +# 变量 ${DtkWidget_LIBRARIES} 和 ${Qt5Widgets_LIBRARIES} 是在前面执行 find_package 命令时引入的 +# 当出现运行时错误提示某些符号没有定义时应该检查此处是否将所有用的库都写在了这里 +target_link_libraries(${PLUGIN_NAME} PRIVATE + ${Qt5Widgets_LIBRARIES} + ${DtkWidget_LIBRARIES} + #${DdeDockInterface_LIBRARIES} +) + +# 设置安装路径的前缀(默认为"/usr/local") +set(CMAKE_INSTALL_PREFIX "/usr") + +# 设置执行 make install 时哪个目标应该被 install 到哪个位置 +install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins) +install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/gxde-dock/plugins) diff --git a/plugins/dde-sys-monitor-plugin/README.md b/plugins/dde-sys-monitor-plugin/README.md new file mode 100755 index 0000000000000000000000000000000000000000..1fb7ceda519d2d4cfa19bc38cafc7fbc7d8c3fe5 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/README.md @@ -0,0 +1,63 @@ +# gxde-sys-monitor-plugin +# 这是一个fork，为了GXDE. 原地址： https://github.com/q77190858/dde-sys-monitor-plugin +## deepin系统监控dock插件，可监控CPU使用率、内存使用率、swap使用率、上传下载总量和实时网速 +### 参考了https://github.com/sonichy/CMDU_DDE_DOCK +### 感谢大神@sonichy + +![alt](image/高效模式全显示.png) ![alt](image/高效模式只显示CPU内存.jpeg) ![alt](image/高效模式只显示网速.jpeg) + +上三图分别是高效模式下： +1. 全显示 +2. 只显示CPU内存 +3. 只显示网速 + +![alt](image/时尚模式只显示CPU内存.jpeg) ![alt](image/时尚模式只显示网速.jpeg) + +上两图分别是时尚模式下： +1. 只显示CPU内存 +2. 只显示网速 + +![alt](image/高效模式右键菜单.jpeg) ![alt](image/设置显示内容.png) + +右键菜单中有设置选项，可以设置各个模式下的显示内容 + +# 编译好的so [下载](https://github.com/q77190858/dde-sys-monitor-plugin/raw/master/bin/libsys_monitor.so) +deepin15.11测试可用 + +# 直接下载安装： +``` +sudo cp libsys_monitor.so /usr/lib/dde-dock/plugins/ +pkill dde-dock +dde-dock +``` + +# 编译加安装： +`./build.sh` + +编译教程见[官方开发文档](https://github.com/linuxdeepin/dde-dock/blob/master/plugins/plugin-guide/plugins-developer-guide.md +) + +编译另外还需要安装如下依赖（吐槽一下官方的开发文档讲的环境配置不全）： +``` +sudo apt install dde-dock-dev qtchooser libdtkwidget2-dev cmake +``` + +有问题欢迎回帖反馈！开发的心得体会参见我的博客 +[http://blog.mxslly.com/archives/95.html](http://blog.mxslly.com/archives/95.html) + +20190617 22:37更新：修复上传下载一致的bug，下载地址同上 + +20190619 12:07更新：缩减宽度，小气泡文字对齐，编译脚本优化，下载地址同上 + +20190627 16:04更新：修复时尚模式显示不全问题，现在时尚模式只显示网速 + +20190830 03:14更新：缩减1个字符宽度，现在最低单位为KB，不显示B + +20191211 10:09更新：导入项目到qtcreator，添加设置功能，可设置显示内容 + +20200214 21:09更新：针对高分屏dpi优化；可设置显示行距；使用系统函数保存设置，更新后单击小气泡无法弹出，原因不明 + +20200322 16:31更新：添加电池功率显示，正负表示放电和充电状态功率 + +![alt](image/放电状态.png) +![alt](image/充电状态.png) \ No newline at end of file diff --git a/plugins/dde-sys-monitor-plugin/build.sh b/plugins/dde-sys-monitor-plugin/build.sh new file mode 100755 index 0000000000000000000000000000000000000000..564897a2fd283d48d3dca25a7835527e71846726 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +mkdir build +cd build/ || exit +rm -rf * || exit +cmake .. || exit +make || exit +sudo make install || exit +pkill dde-dock +dde-dock diff --git "a/plugins/dde-sys-monitor-plugin/image/\345\205\205\347\224\265\347\212\266\346\200\201.png" "b/plugins/dde-sys-monitor-plugin/image/\345\205\205\347\224\265\347\212\266\346\200\201.png" new file mode 100644 index 0000000000000000000000000000000000000000..5fa67254756cb0d91183c99540bf2ef765e8e195 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\345\205\205\347\224\265\347\212\266\346\200\201.png" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\346\224\276\347\224\265\347\212\266\346\200\201.png" "b/plugins/dde-sys-monitor-plugin/image/\346\224\276\347\224\265\347\212\266\346\200\201.png" new file mode 100644 index 0000000000000000000000000000000000000000..b4c0024351c432b3f9b5ac2231c47d90dbc40434 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\346\224\276\347\224\265\347\212\266\346\200\201.png" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" "b/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..ccabedef91604f17f7478d25f74aac98c4e75b2e Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" "b/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..bdc16fb791cf107e99f2e732a2da3013d50b9a1c Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\346\227\266\345\260\232\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\350\256\276\347\275\256\346\230\276\347\244\272\345\206\205\345\256\271.png" "b/plugins/dde-sys-monitor-plugin/image/\350\256\276\347\275\256\346\230\276\347\244\272\345\206\205\345\256\271.png" new file mode 100644 index 0000000000000000000000000000000000000000..7f390ebc0645239a22ec067a086ceeb012ae81e1 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\350\256\276\347\275\256\346\230\276\347\244\272\345\206\205\345\256\271.png" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\205\250\346\230\276\347\244\272.png" "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\205\250\346\230\276\347\244\272.png" new file mode 100755 index 0000000000000000000000000000000000000000..3d749828ed2799fb47c9bbe36fc27f26d5e90086 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\205\250\346\230\276\347\244\272.png" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..38d805058d965b110b4b22bec9114906ba0dd480 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272CPU\345\206\205\345\255\230.jpeg" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..dde5fe5adc80cd14e7f33359e882b0129d6197e7 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\252\346\230\276\347\244\272\347\275\221\351\200\237.jpeg" differ diff --git "a/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\263\351\224\256\350\217\234\345\215\225.jpeg" "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\263\351\224\256\350\217\234\345\215\225.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..3fda1bb72c7a7447b12ed63fcf5d338526061ea7 Binary files /dev/null and "b/plugins/dde-sys-monitor-plugin/image/\351\253\230\346\225\210\346\250\241\345\274\217\345\217\263\351\224\256\350\217\234\345\215\225.jpeg" differ diff --git a/plugins/dde-sys-monitor-plugin/informationwidget.cpp b/plugins/dde-sys-monitor-plugin/informationwidget.cpp new file mode 100755 index 0000000000000000000000000000000000000000..fab925c5282eabe7538a0efcf3556ff295eefb49 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/informationwidget.cpp @@ -0,0 +1,84 @@ +#include "informationwidget.h" +#include +#include +#include +#include + +InformationWidget::InformationWidget(QWidget *parent) + : QWidget(parent) + , m_infoLabel(new QLabel) +{ + m_infoLabel->setStyleSheet("QLabel {" + "color: white;" + "}"); + //m_infoLabel->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); + font.setFamily("Noto Mono"); + // 获取dpi，一般默认都是96，根据dpi进行字体的缩放，直接设置pointsize无法解决hidpi问题 + int dpi = QApplication::primaryScreen()->logicalDotsPerInch(); + int fontsize = 9; // >10在时尚模式下有些显示不全 + font.setPixelSize((dpi*fontsize)/72); + m_infoLabel->setFont(font); + + QVBoxLayout *centralLayout = new QVBoxLayout; + centralLayout->addWidget(m_infoLabel); + centralLayout->setSpacing(0); + centralLayout->setMargin(0); + + setLayout(centralLayout); +} + +void InformationWidget::UpdateData(const Info& info,Dock::DisplayMode dismode,const Settings& settings) +{ + if(dismode==Dock::Efficient)//高效模式 + { + switch (settings.efficient) { + case DisplayContentSetting::CPUMEM: + m_infoLabel->setText(QString("

CPU:%2
MEM:%3

") + .arg(settings.lineHeight) + .arg(info.cpu) + .arg(info.mem)); + break; + case DisplayContentSetting::NETSPEED: + m_infoLabel->setText(QString("

↑%2/S
↓%3/S

") + .arg(settings.lineHeight) + .arg(info.netup) + .arg(info.netdwon)); + break; + case DisplayContentSetting::ALL: + m_infoLabel->setText(QString("

CPU:%2↑%3/S
MEM:%4↓%5/S

") + .arg(settings.lineHeight) + .arg(info.cpu).arg(info.netup) + .arg(info.mem).arg(info.netdwon)); + break; + default: + m_infoLabel->setText(QString("

CPU:%2↑%3/S
MEM:%4↓%5/S

") + .arg(settings.lineHeight) + .arg(info.cpu).arg(info.netup) + .arg(info.mem).arg(info.netdwon)); + break; + } + } + else//时尚模式 + { + switch (settings.fashion) { + case DisplayContentSetting::CPUMEM: + m_infoLabel->setText(QString("

CPU:%2
MEM:%3

") + .arg(settings.lineHeight) + .arg(info.cpu) + .arg(info.mem)); + break; + case DisplayContentSetting::NETSPEED: + m_infoLabel->setText(QString("

↑%2/S
↓%3/S

") + .arg(settings.lineHeight) + .arg(info.netup) + .arg(info.netdwon)); + break; + default: + m_infoLabel->setText(QString("

↑%2/S
↓%3/S

") + .arg(settings.lineHeight) + .arg(info.netup) + .arg(info.netdwon)); + break; + } + } +} diff --git a/plugins/dde-sys-monitor-plugin/informationwidget.h b/plugins/dde-sys-monitor-plugin/informationwidget.h new file mode 100755 index 0000000000000000000000000000000000000000..ac2e2508e53768e94888046bf14b176b86c4b936 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/informationwidget.h @@ -0,0 +1,33 @@ +#ifndef INFORMATIONWIDGET_H +#define INFORMATIONWIDGET_H + +#include +#include +#include +#include +#include "pluginsiteminterface.h" +#include "pluginsettingdialog.h" + +struct Info{ + QString cpu; + QString mem; + QString netup; + QString netdwon; +}; + +class InformationWidget : public QWidget +{ + Q_OBJECT + +public: + explicit InformationWidget(QWidget *parent = nullptr); + void UpdateData(const Info& info,Dock::DisplayMode dismode,const Settings& settings); + +public: + // 真正的数据显示在这个 Label 上 + QLabel *m_infoLabel; + // 字体 + QFont font; +}; + +#endif // INFORMATIONWIDGET_H diff --git a/plugins/dde-sys-monitor-plugin/pluginsettingdialog.cpp b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4f512b3b72ebcbd32518d345fb68dc39cbe86987 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.cpp @@ -0,0 +1,34 @@ +#include "pluginsettingdialog.h" +#include "ui_pluginsettingdialog.h" + +pluginSettingDialog::pluginSettingDialog(Settings *settings,QWidget *parent) : + QDialog(parent), + ui(new Ui::pluginSettingDialog) +{ + ui->setupUi(this); + if(settings->efficient==DisplayContentSetting::CPUMEM)ui->onlyCPUMEMRadioButton->setChecked(true); + else if(settings->efficient==DisplayContentSetting::NETSPEED)ui->onlyNetSpeedRadioButton->setChecked(true); + else ui->showAllRadioButton->setChecked(true); + + if(settings->fashion==DisplayContentSetting::CPUMEM)ui->fashionOnlyCPUMEMRadioButton->setChecked(true); + else ui->fashionOnlyNetSpeedRadioButton->setChecked(true); + + ui->lineHeightSpinBox->setValue(settings->lineHeight); +} + +pluginSettingDialog::~pluginSettingDialog() +{ + delete ui; +} + +void pluginSettingDialog::getDisplayContentSetting(Settings *settings) +{ + if(ui->onlyCPUMEMRadioButton->isChecked())settings->efficient=DisplayContentSetting::CPUMEM; + else if(ui->onlyNetSpeedRadioButton->isChecked())settings->efficient=DisplayContentSetting::NETSPEED; + else settings->efficient=DisplayContentSetting::ALL; + + if(ui->fashionOnlyCPUMEMRadioButton->isChecked())settings->fashion=DisplayContentSetting::CPUMEM; + else settings->fashion=DisplayContentSetting::NETSPEED; + + settings->lineHeight=ui->lineHeightSpinBox->value(); +} diff --git a/plugins/dde-sys-monitor-plugin/pluginsettingdialog.h b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.h new file mode 100644 index 0000000000000000000000000000000000000000..97f51ace1bfe9ee34bf3178113549d29241eca98 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.h @@ -0,0 +1,38 @@ +#ifndef PLUGINSETTINGDIALOG_H +#define PLUGINSETTINGDIALOG_H +#include +#include + +//显示内容设置返回的枚举类型 +enum DisplayContentSetting +{ + CPUMEM=1,//只显示CPU内存 + NETSPEED=2,//只显示网速 + ALL=3//两个都显示 +}; +struct Settings//设置结构体 +{ + DisplayContentSetting efficient; + DisplayContentSetting fashion; + int lineHeight; +}; + +namespace Ui { +class pluginSettingDialog; +} + +class pluginSettingDialog : public QDialog +{ + Q_OBJECT + +public: + explicit pluginSettingDialog(Settings *settings,QWidget *parent = 0); + ~pluginSettingDialog(); + //公有函数获得显示设置 + void getDisplayContentSetting(Settings *settings); + +private: + Ui::pluginSettingDialog *ui; +}; + +#endif // PLUGINSETTINGDIALOG_H diff --git a/plugins/dde-sys-monitor-plugin/pluginsettingdialog.ui b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.ui new file mode 100644 index 0000000000000000000000000000000000000000..f3e3a9c96a01a2290357642671434015121e33eb --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/pluginsettingdialog.ui @@ -0,0 +1,198 @@ + + + pluginSettingDialog + + + Qt::WindowModal + + + + 0 + 0 + 279 + 411 + + + + 系统监控插件设置 + + + + + + + + + 高效模式显示内容设置 + + + + + 31 + 41 + 147 + 86 + + + + + + + 只显示网速 + + + + + + + 只显示CPU、内存 + + + + + + + 显示CP&U、内存和网速 + + + + + + + + + + + 时尚模式显示内容设置 + + + + + 32 + 57 + 123 + 56 + + + + + + + 只显示CPU、内存 + + + + + + + 只显示网速 + + + + + + + + + + + QLayout::SetMinimumSize + + + + + 行高： + + + + + + + QAbstractSpinBox::UpDownArrows + + + % + + + 50 + + + 200 + + + 10 + + + 100 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + fashionDisplayContentSettingGroupBox + displayContentSettingGroupBox + buttonBox + lineHeightSpinBox + label + horizontalSpacer + + + + + buttonBox + accepted() + pluginSettingDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + pluginSettingDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/plugins/dde-sys-monitor-plugin/sys_monitor.json b/plugins/dde-sys-monitor-plugin/sys_monitor.json new file mode 100755 index 0000000000000000000000000000000000000000..c93d131fd407377b265d31138106a10601529859 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/sys_monitor.json @@ -0,0 +1,4 @@ +{ + "api": "1.2", +"depends-daemon-dbus-service": "com.deepin.daemon.Network" +} diff --git a/plugins/dde-sys-monitor-plugin/sys_monitor.qrc b/plugins/dde-sys-monitor-plugin/sys_monitor.qrc new file mode 100755 index 0000000000000000000000000000000000000000..5244ae05b7b5355a07c275b062be4a6833c6ac54 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/sys_monitor.qrc @@ -0,0 +1,5 @@ + + + + + diff --git a/plugins/dde-sys-monitor-plugin/sysmonitorplugin.cpp b/plugins/dde-sys-monitor-plugin/sysmonitorplugin.cpp new file mode 100755 index 0000000000000000000000000000000000000000..c926852266fa0c1141e4c29703dae7620490ae69 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/sysmonitorplugin.cpp @@ -0,0 +1,300 @@ +#include "sysmonitorplugin.h" + +SysMonitorPlugin::SysMonitorPlugin(QObject *parent) + : QObject(parent) + ,m_refreshTimer(new QTimer(this)) +{ + oldrbytes=oldsbytes=0; + // 设置 Timer 超时为 1s，即每 1s 更新一次控件上的数据，并启动这个定时器 + m_refreshTimer->start(1000); + + // 连接 Timer 超时的信号到更新数据的槽上 + connect(m_refreshTimer, &QTimer::timeout, this, &SysMonitorPlugin::refreshInfo); +} + +void SysMonitorPlugin::refreshInfo() +{ + //获得cpu信息 + fp = fopen("/proc/stat", "r"); + if (fp == NULL) {perror("Could not open stat file");return;} + user = 0, nice = 0, system = 0, idle = 0; + iowait = 0, irq = 0, softirq = 0, steal = 0, guest = 0, guestnice = 0; + char* ret = fgets(buffer, sizeof(buffer) - 1, fp); + if (ret == NULL) {perror("Could not read stat file");fclose(fp);return;} + fclose(fp); + sscanf(buffer,"cpu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu",&user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, &guestnice); + worktime = user + nice + system; + totaltime = user + nice + system + idle + iowait + irq + softirq + steal; + // 得到百分比 + cpuPercent = qRound((worktime-oldworktime)*100.0/(totaltime-oldtotaltime)); + oldtotaltime=totaltime; + oldworktime=worktime; + if(cpuPercent<=9)info.cpu=QString(" %1\%").arg(cpuPercent); + else info.cpu=QString("%1\%").arg(cpuPercent); + + //获得内存信息 + fp=fopen("/proc/meminfo","r"); + if (fp == NULL) {perror("Could not open meminfo file");return;} + do + { + ret = fgets(buffer, sizeof(buffer) - 1, fp); + if (ret == NULL) {perror("Could not read meminfo file");fclose(fp);return;} + sscanf(buffer,"%s %lu kB",devname,&tmp); + if(!strcmp(devname,"MemTotal:"))totalmem=tmp; + else if(!strcmp(devname,"MemAvailable:"))availablemem=tmp; + else if(!strcmp(devname,"SwapTotal:"))totalswap=tmp; + else if(!strcmp(devname,"SwapFree:"))freeswap=tmp; + }while(strcmp(devname,"SwapFree:")); + fclose(fp); + memPercent = qRound((totalmem - availablemem) * 100.0 / totalmem); + if(memPercent<=9)info.mem=QString(" %1\%").arg(memPercent); + else info.mem=QString("%1\%").arg(memPercent); + + swapPercent = qRound((totalswap - freeswap) * 100.0 / totalswap); + if(swapPercent<=9)strswap=QString(" %1\%").arg(swapPercent); + else strswap=QString("%1\%").arg(swapPercent); + + //获得net信息 + fp=fopen("/proc/net/dev","r"); + if (fp == NULL) {perror("Could not open netdev file");return;} + ret = fgets(buffer, sizeof(buffer) - 1, fp); + ret = fgets(buffer, sizeof(buffer) - 1, fp); + if (ret == NULL) {perror("Could not read netdev file");fclose(fp);return;} + tmpr=tmps=rbytes=sbytes=0; + while(true) + { + ret = fgets(buffer, sizeof(buffer) - 1, fp); + if (ret == NULL) break; + sscanf(buffer,"%s %lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %lu",devname,&tmpr,&tmps); + if(strcmp(devname,"lo:")==0)continue; + rbytes+=tmpr; + sbytes+=tmps; + } + fclose(fp); + tmpr=(oldrbytes==0?0:rbytes-oldrbytes); + tmps=(oldsbytes==0?0:sbytes-oldsbytes); + oldrbytes=rbytes; + oldsbytes=sbytes; + + info.netup=toHumanRead(tmps,"B",0); + info.netdwon=toHumanRead(tmpr,"B",0); + + //获得电池信息 + fp=NULL; + //使用popen执行shell命令并返回一个流来读取电池信息 + fp=popen("upower -i $(upower -e | grep 'BAT') | grep -E 'energy-rate|state'","r"); + if(fp==NULL){perror("popen");return;} + battery_watts=0; + fscanf(fp," state: %s",buffer); + fscanf(fp," energy-rate: %f W",&battery_watts); + if(strcmp("discharging",buffer)==0){battery_watts=0-battery_watts;} + pclose(fp); + + // 更新内容 + m_pluginWidget->UpdateData(info,dismode,settings); + if(m_tipsWidget->isVisible())m_tipsWidget_update(); + //qDebug()<<"m_tipsWidget->isVisible():"<isVisible()); +} + +const QString SysMonitorPlugin::toHumanRead(unsigned long l,const char *unit,int digit) +{ + int count; + QString str; + double f=(double)l; + if(!strcmp(unit,"B"))count=0; + else if(!strcmp(unit,"KB"))count=1; + while(f>999.0) + { + f=f/1024.0; + count++; + } + + if(count==0){count++;f=f/1024;} + + if(f<0.1)str="  0"; + else if(f<=9)str=QString::number(f,'f',1); + else if(f<=99)str=" "+QString::number(f,'f',0); + else str=QString::number(f,'f',0); + + if(count==0)str+="B"; + else if(count==1)str+="K"; + else if(count==2)str+="M"; + else if(count==3)str+="G"; + else if(count==4)str+="T"; + else if(count==4)str+="P"; + return str; +} +//使用系统配置函数读配置信息 +void SysMonitorPlugin::readConfig(Settings *settings) +{ + settings->efficient=DisplayContentSetting(m_proxyInter-> + getValue(this,"efficient",DisplayContentSetting::ALL).toInt()); + settings->fashion=DisplayContentSetting(m_proxyInter-> + getValue(this,"fashion",DisplayContentSetting::NETSPEED).toInt()); + settings->lineHeight=m_proxyInter->getValue(this,"lineHeight",100).toInt(); +} +//写配置信息 +void SysMonitorPlugin::writeConfig(Settings *settings) +{ + m_proxyInter->saveValue(this,"efficient",settings->efficient); + m_proxyInter->saveValue(this,"fashion",settings->fashion); + m_proxyInter->saveValue(this,"lineHeight",settings->lineHeight); +} + +const QString SysMonitorPlugin::pluginDisplayName() const +{ + return QString("监视器"); +} + +const QString SysMonitorPlugin::pluginName() const +{ + return QStringLiteral("sys_monitor"); +} + +void SysMonitorPlugin::init(PluginProxyInterface *proxyInter) +{ + m_proxyInter = proxyInter; + + m_pluginWidget = new InformationWidget; + m_tipsWidget = new QLabel; + m_appletWidget = new QLabel; + font.setFamily("Noto Mono"); + m_tipsWidget->setFont(font); + m_appletWidget->setFont(font); + dismode=displayMode(); + //读取显示配置 + readConfig(&settings); + + // 如果插件没有被禁用则在初始化插件时才添加主控件到面板上 + if (!pluginIsDisable()) { + m_proxyInter->itemAdded(this, pluginName()); + } +} + +QWidget *SysMonitorPlugin::itemWidget(const QString &itemKey) +{ + Q_UNUSED(itemKey); + + return m_pluginWidget; +} + +void SysMonitorPlugin::m_tipsWidget_update() +{ + // 设置/刷新 tips 中的信息 + m_tipsWidget->setText(QString("

MEM: %1/%2=%3
SWAP:%4/%5=%6
UP:  %7 %8/S
DOWN:%9 %10/S
BATTERY:%11W

") +.arg(toHumanRead(totalmem-availablemem,"KB",1)).arg(toHumanRead(totalmem,"KB",1)).arg(info.mem) +.arg(toHumanRead(totalswap-freeswap,"KB",1)).arg(toHumanRead(totalswap,"KB",1)).arg(strswap) +.arg(toHumanRead(oldsbytes,"B",1)).arg(toHumanRead(tmps,"B",1)) +.arg(toHumanRead(oldrbytes,"B",1)).arg(toHumanRead(tmpr,"B",1)) +.arg(QString::number((double)battery_watts,'f',2)) +); +} + +QWidget *SysMonitorPlugin::itemTipsWidget(const QString &itemKey) +{ + Q_UNUSED(itemKey); + //更新气泡数据 + m_tipsWidget_update(); + return m_tipsWidget; +} + +QWidget *SysMonitorPlugin::itemPopupApplet(const QString &itemKey) +{ + Q_UNUSED(itemKey); + + m_appletWidget->setText(QString("

MEM: %1/%2=%3
SWAP:%4/%5=%6
UP:  %7 %8/S
DOWN:%9 %10/S

") + .arg(toHumanRead(totalmem-availablemem,"KB",1)).arg(toHumanRead(totalmem,"KB",1)).arg(info.mem) + .arg(toHumanRead(totalswap-freeswap,"KB",1)).arg(toHumanRead(totalswap,"KB",1)).arg(strswap) + .arg(toHumanRead(oldsbytes,"B",1)).arg(toHumanRead(tmps,"B",1)) + .arg(toHumanRead(oldrbytes,"B",1)).arg(toHumanRead(tmpr,"B",1)) + ); + return m_appletWidget; +} + +bool SysMonitorPlugin::pluginIsAllowDisable() +{ + // 告诉 dde-dock 本插件允许禁用 + return true; +} + +bool SysMonitorPlugin::pluginIsDisable() +{ + // 第二个参数 “disabled” 表示存储这个值的键（所有配置都是以键值对的方式存储的） + // 第三个参数表示默认值，即默认不禁用 + return m_proxyInter->getValue(this, "disabled", false).toBool(); +} + +void SysMonitorPlugin::pluginStateSwitched() +{ + // 获取当前禁用状态的反值作为新的状态值 + const bool disabledNew = !pluginIsDisable(); + // 存储新的状态值 + m_proxyInter->saveValue(this, "disabled", disabledNew); + + // 根据新的禁用状态值处理主控件的加载和卸载 + if (disabledNew) { + m_proxyInter->itemRemoved(this, pluginName()); + } else { + m_proxyInter->itemAdded(this, pluginName()); + } +} + +const QString SysMonitorPlugin::itemContextMenu(const QString &itemKey) +{ + Q_UNUSED(itemKey); + + QList items; + items.reserve(2); + + QMap refresh; + refresh["itemId"] = "refresh"; + refresh["itemText"] = "刷新"; + refresh["isActive"] = true; + items.push_back(refresh); + + QMap open; + open["itemId"] = "open"; + open["itemText"] = "打开系统监视器"; + open["isActive"] = true; + items.push_back(open); + + QMap setting; + setting["itemId"] = "setting"; + setting["itemText"] = "设置"; + setting["isActive"] = true; + items.push_back(setting); + + QMap menu; + menu["items"] = items; + menu["checkableMenu"] = false; + menu["singleCheck"] = false; + + // 返回 JSON 格式的菜单数据 + return QJsonDocument::fromVariant(menu).toJson(); +} + +void SysMonitorPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) +{ + Q_UNUSED(itemKey); + + // 根据上面接口设置的 id 执行不同的操作 + if (menuId == "refresh") { + + } else if (menuId == "open") { + QProcess::startDetached("deepin-system-monitor"); + } + else if(menuId == "setting") { + pluginSettingDialog setting(&settings); + if(setting.exec()==QDialog::Accepted) + { + setting.getDisplayContentSetting(&settings); + writeConfig(&settings); + } + } +} + +void SysMonitorPlugin::displayModeChanged(const Dock::DisplayMode displayMode) +{ + Q_UNUSED(displayMode); + dismode=displayMode; +} diff --git a/plugins/dde-sys-monitor-plugin/sysmonitorplugin.h b/plugins/dde-sys-monitor-plugin/sysmonitorplugin.h new file mode 100755 index 0000000000000000000000000000000000000000..6b694fc15188f077d1d341dca97c7d85b9b00550 --- /dev/null +++ b/plugins/dde-sys-monitor-plugin/sysmonitorplugin.h @@ -0,0 +1,87 @@ +#ifndef HOMEMONITORPLUGIN_H +#define HOMEMONITORPLUGIN_H + +#include "informationwidget.h" +#include +#include +#include +#include +#include "pluginproxyinterface.h" +#include "pluginsettingdialog.h" +#include + +class SysMonitorPlugin : public QObject, PluginsItemInterface +{ + Q_OBJECT + Q_INTERFACES(PluginsItemInterface) + Q_PLUGIN_METADATA(IID "com.deepin.dock.PluginsItemInterface" FILE "sys_monitor.json") + +public: + explicit SysMonitorPlugin(QObject *parent = nullptr); + + const QString pluginDisplayName() const override; + const QString pluginName() const override; + void init(PluginProxyInterface *proxyInter) override; + + QWidget *itemWidget(const QString &itemKey) override; + QWidget *itemTipsWidget(const QString &itemKey) override; + QWidget *itemPopupApplet(const QString &itemKey) override; + + bool pluginIsAllowDisable() override; + bool pluginIsDisable() override; + void pluginStateSwitched() override; + + const QString itemContextMenu(const QString &itemKey) override; + void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; + void displayModeChanged(const Dock::DisplayMode displayMode) override; + + const QString toHumanRead(unsigned long l,const char *unit,int digit); + + //自定义读写配置函数 + void readConfig(Settings *settings); + void writeConfig(Settings *settings); +private slots: + // 用于更新数据的槽函数 + void refreshInfo(); + //更新tipsWidget气泡数据的函数 + void m_tipsWidget_update(); +private: + //CPU工作时间除以总时间,内存百分比,交换区百分比 + int cpuPercent,memPercent,swapPercent; + QString strswap; + // 获取cpu总时间,获取cpu工作时间 + unsigned long long totaltime,worktime; + //保存上一次结果 + unsigned long long oldtotaltime,oldworktime; + //cpu的各种时间变量 + unsigned long long user, nice, system, idle; + unsigned long long iowait, irq, softirq, steal, guest, guestnice; + //字符数组保存文件内容 + char buffer[1024]; + //文件描述符 + FILE* fp; + //总内存，可用内存 + unsigned long totalmem,availablemem,tmp,totalswap,freeswap; + //接收字节数，发送字节数 + unsigned long rbytes,sbytes,oldrbytes,oldsbytes,tmpr,tmps; + char devname[1024]; + //电池功率瓦特，根据电池充放电状态设置正负 + float battery_watts; + // 字体 + QFont font; + //显示模式 + Dock::DisplayMode dismode; + //设置结构体 + Settings settings; + //传递给widget的信息结构体 + Info info; + +private: + // 处理时间间隔的计时器 + QTimer *m_refreshTimer; + InformationWidget *m_pluginWidget; + QLabel *m_tipsWidget; + QLabel *m_appletWidget; +}; + +#endif // HOMEMONITORPLUGIN_H diff --git a/plugins/trash/popupcontrolwidget.cpp b/plugins/trash/popupcontrolwidget.cpp index 41668cbbfbefab0db8b13d0305a87d81bd275630..d5be5b2e37f9cf196b26356c278f9b09498c405c 100644 --- a/plugins/trash/popupcontrolwidget.cpp +++ b/plugins/trash/popupcontrolwidget.cpp @@ -123,12 +123,13 @@ void PopupControlWidget::clearTrashFloder() return; } - /*if (DTrashManager::instance()->cleanTrash()) { - DDesktopServices::playSystemSoundEffect(DDesktopServices::SSE_EmptyTrash); + if (DTrashManager::instance()->cleanTrash()) { + //DDesktopServices::playSystemSoundEffect(DDesktopServices::SSE_EmptyTrash); } else { qWarning() << "Clear trash failed"; - }*/ -// DFMGlobal::instance()->clearTrash(); + } + DDesktopServices::playSystemSoundEffect(DDesktopServices::SSE_EmptyTrash); + //DFMGlobal::instance()->clearTrash(); } int PopupControlWidget::trashItemCount() const diff --git a/plugins/tray/xembedtraywidget.cpp b/plugins/tray/xembedtraywidget.cpp index db226c92b49711a58c99b93a2ca394fc3b6876cd..c78cff75ee83c3e91b2fcd01d13db34388572358 100644 --- a/plugins/tray/xembedtraywidget.cpp +++ b/plugins/tray/xembedtraywidget.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -43,7 +44,8 @@ #define WINE_WINDOW_PROP_NAME "__wine_prefix" #define IS_WINE_WINDOW_BY_WM_CLASS "explorer.exe" -static const qreal iconSize = 16; +//static const qreal iconSize = 16; +static const qreal iconDefaultSize = 16; // this static var hold all suffix of tray widget keys. // that is in order to fix can not show multiple trays provide by one application, @@ -182,12 +184,13 @@ void XEmbedTrayWidget::wrapWindow() auto c = QX11Info::connection(); auto cookie = xcb_get_geometry(c, m_windowId); - QScopedPointer clientGeom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR)); + QScopedPointer clientGeom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR)); if (clientGeom.isNull()) return; //create a container window const auto ratio = devicePixelRatioF(); + uint16_t iconSize = iconDefaultSize * ratio; auto screen = xcb_setup_roots_iterator (xcb_get_setup (c)).data; m_containerWid = xcb_generate_id(c); uint32_t values[2]; @@ -199,7 +202,8 @@ void XEmbedTrayWidget::wrapWindow() m_containerWid, /* window Id */ screen->root, /* parent window */ 0, 0, /* x, y */ - iconSize * ratio, iconSize * ratio, /* width, height */ + //iconSize * ratio, iconSize * ratio, /* width, height */ + iconSize, iconSize, /* width, height */ 0, /* border_width */ XCB_WINDOW_CLASS_INPUT_OUTPUT,/* class */ screen->root_visual, /* visual */ @@ -246,31 +250,58 @@ void XEmbedTrayWidget::wrapWindow() // xembed_message_send(m_windowId, XEMBED_EMBEDDED_NOTIFY, m_containerWid, 0, 0); //move window we're embedding - /* + const uint32_t windowMoveConfigVals[2] = { 0, 0 }; xcb_configure_window(c, m_windowId, - XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, - windowMoveCentially quitting the application. Returns onfigVals); - */ + XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, windowMoveConfigVals); + //if the window is a clearly stupid size resize to be something sensible //this is needed as chormium and such when resized just fill the icon with transparent space and only draw in the middle //however spotify does need this as by default the window size is 900px wide. //use an artbitrary heuristic to make sure icons are always sensible -// if (clientGeom->width > iconSize || clientGeom->height > iconSize ) + /*if (clientGeom->width > iconSize || clientGeom->height > iconSize ) { const uint32_t windowMoveConfigVals[2] = { uint32_t(iconSize * ratio), uint32_t(iconSize * ratio) }; xcb_configure_window(c, m_windowId, - XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, + XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, //XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, windowMoveConfigVals); + }*/ + // 判断托盘的大小是否超出iconSize + QSize clientWindowSize; + if (clientGeom) { + clientWindowSize = QSize(clientGeom->width, clientGeom->height); + } + + if (clientWindowSize.isEmpty() || clientWindowSize.width() > iconSize || clientWindowSize.height() > iconSize ) { + + uint16_t widthNormalized = std::min(clientGeom->width, iconSize); + uint16_t heighNormalized = std::min(clientGeom->height, iconSize); + + const uint32_t windowSizeConfigVals[2] = {widthNormalized, heighNormalized}; + xcb_configure_window(c, m_windowId, XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, windowSizeConfigVals); + + xcb_flush(c); + clientWindowSize = QSize(iconSize, iconSize); } //show the embedded window otherwise nothing happens xcb_map_window(c, m_windowId); + xcb_clear_area(c, 0, m_windowId, 0, 0, clientWindowSize.width(), clientWindowSize.height()); + // xcb_clear_area(c, 0, m_windowId, 0, 0, qMin(clientGeom->width, iconSize), qMin(clientGeom->height, iconSize)); xcb_flush(c); + + // 通过xcb获取window属性，判断该window是否处理button press事件 + // 当window不关注button press等事件时，使用xtest extension + auto windowAttributesCookie = xcb_get_window_attributes(c, m_windowId); + QScopedPointer windowAttributes(xcb_get_window_attributes_reply(c, windowAttributesCookie, nullptr)); + if (windowAttributes && !(windowAttributes->all_event_masks & XCB_EVENT_MASK_BUTTON_PRESS)) { + m_injectMode = XTest; + } + // setWindowOnTop(false); setWindowOnTop(true); setX11PassMouseEvent(true); @@ -289,6 +320,30 @@ void XEmbedTrayWidget::sendHoverEvent() setWindowOnTop(true); XTestFakeMotionEvent(QX11Info::display(), 0, p.x(), p.y(), CurrentTime); XFlush(QX11Info::display()); + Display *display = QX11Info::display(); + if (display) { + if (m_injectMode == XTest) { + // fake enter event + XTestFakeMotionEvent(display, 0, p.x(), p.y(), CurrentTime); + XFlush(display); + } else { + // 发送 montion notify event到client，实现hover事件 + auto c = QX11Info::connection(); + xcb_motion_notify_event_t* event = new xcb_motion_notify_event_t; + memset(event, 0x00, sizeof(xcb_button_press_event_t)); + event->response_type = XCB_MOTION_NOTIFY; + event->event = m_windowId; + event->same_screen = 1; + event->root = QX11Info::appRootWindow(); + event->time = 0; + event->root_x = p.x(); + event->root_y = p.y(); + event->child = 0; + event->state = 0; + xcb_send_event(c, false, m_windowId, XCB_EVENT_MASK_POINTER_MOTION, (char*)event); + delete event; + } + } QTimer::singleShot(100, this, [=] { setX11PassMouseEvent(true); }); } @@ -322,10 +377,60 @@ void XEmbedTrayWidget::sendClick(uint8_t mouseButton, int x, int y) m_sendHoverEvent->stop(); + auto c = QX11Info::connection(); + if (!c) { + qWarning() << "QX11Info::connection() is " << c; + return; + } + const QPoint p(rawXPosition(QPoint(x, y))); configContainerPosition(); setX11PassMouseEvent(false); setWindowOnTop(true); + + Display *display = QX11Info::display(); + + if (m_injectMode == XTest) { + XTestFakeMotionEvent(display, 0, p.x(), p.y(), CurrentTime); + XFlush(display); + XTestFakeButtonEvent(display, mouseButton, true, CurrentTime); + XFlush(display); + XTestFakeButtonEvent(display, mouseButton, false, CurrentTime); + XFlush(display); + } else { + // press event + xcb_button_press_event_t *pressEvent = new xcb_button_press_event_t; + memset(pressEvent, 0x00, sizeof(xcb_button_press_event_t)); + pressEvent->response_type = XCB_BUTTON_PRESS; + pressEvent->event = m_windowId; + pressEvent->same_screen = 1; + pressEvent->root = QX11Info::appRootWindow(); + pressEvent->time = 0; + pressEvent->root_x = x; + pressEvent->root_y = y; + pressEvent->child = 0; + pressEvent->state = 0; + pressEvent->detail = mouseButton; + xcb_send_event(c, false, m_windowId, XCB_EVENT_MASK_BUTTON_PRESS, (char*)pressEvent); + delete pressEvent; + + // release event + xcb_button_release_event_t *releaseEvent = new xcb_button_release_event_t; + memset(releaseEvent, 0x00, sizeof(xcb_button_release_event_t)); + releaseEvent->response_type = XCB_BUTTON_RELEASE; + releaseEvent->event = m_windowId; + releaseEvent->same_screen = 1; + releaseEvent->root = QX11Info::appRootWindow(); + releaseEvent->time = QX11Info::getTimestamp(); + releaseEvent->root_x = x; + releaseEvent->root_y = y; + releaseEvent->child = 0; + releaseEvent->state = 0; + releaseEvent->detail = mouseButton; + xcb_send_event(c, false, m_windowId, XCB_EVENT_MASK_BUTTON_RELEASE, (char*)releaseEvent); + delete releaseEvent; + } + XTestFakeMotionEvent(QX11Info::display(), 0, p.x(), p.y(), CurrentTime); XFlush(QX11Info::display()); XTestFakeButtonEvent(QX11Info::display(), mouseButton, true, CurrentTime); @@ -398,8 +503,8 @@ void XEmbedTrayWidget::refershIconImage() expose.window = m_containerWid; expose.x = 0; expose.y = 0; - expose.width = iconSize * ratio; - expose.height = iconSize * ratio; + expose.width = iconDefaultSize * ratio; + expose.height = iconDefaultSize * ratio; xcb_send_event_checked(c, false, m_containerWid, XCB_EVENT_MASK_VISIBILITY_CHANGE, reinterpret_cast(&expose)); xcb_flush(c); @@ -411,7 +516,8 @@ void XEmbedTrayWidget::refershIconImage() if (qimage.isNull()) return; - m_image = qimage.scaled(16 * ratio, 16 * ratio, Qt::KeepAspectRatio, Qt::SmoothTransformation); + //m_image = qimage.scaled(16 * ratio, 16 * ratio, Qt::KeepAspectRatio, Qt::SmoothTransformation); + m_image = qimage.scaled(iconDefaultSize * ratio, iconDefaultSize * ratio, Qt::KeepAspectRatio, Qt::SmoothTransformation); m_image.setDevicePixelRatio(ratio); update(); diff --git a/plugins/tray/xembedtraywidget.h b/plugins/tray/xembedtraywidget.h index d669569764747e6ccdc27257db0816da22462609..a77166540d331849037c5a4a2342d257138740fc 100644 --- a/plugins/tray/xembedtraywidget.h +++ b/plugins/tray/xembedtraywidget.h @@ -66,6 +66,13 @@ private slots: bool isBadWindow(); private: + // Direct client关注xevent，使用xevent来处理button事件等 + // XTest client不关注xevent，使用xtest extension处理 + enum InjectMode { + Direct, + XTest, + }; + bool m_active = false; WId m_windowId; WId m_containerWid; @@ -74,6 +81,7 @@ private: QTimer *m_updateTimer; QTimer *m_sendHoverEvent; + InjectMode m_injectMode; }; #endif // XEMBEDTRAYWIDGET_H diff --git a/translate_generation.sh b/translate_generation.sh index c9080923b835cbcfb23e24c5f5f8f5ef15282619..68d949fda18a49b676ac878623174f05fba2f755 100755 --- a/translate_generation.sh +++ b/translate_generation.sh @@ -1,11 +1,12 @@ #!/bin/bash # this file is used to auto-generate .qm file from .ts file. # author: shibowen at linuxdeepin.com - +lupdate -recursive . -ts translations/dde-dock_*.ts ts_list=(`ls translations/*.ts`) for ts in "${ts_list[@]}" do printf "\nprocess ${ts}\n" + lupdate "${ts}" lrelease "${ts}" done diff --git a/translations/dde-dock_af.ts b/translations/dde-dock_af.ts index def4c460bfddbfeeedef0d18eb0f10d8b92a610c..6f0f9c48265352bb5cf8dd015be2d207e6f09e6d 100644 --- a/translations/dde-dock_af.ts +++ b/translations/dde-dock_af.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,18 +72,18 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + @@ -96,26 +98,26 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -127,27 +129,27 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -155,7 +157,7 @@ Location - + Size @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,11 +194,11 @@ OnboardPlugin Onboard - + Settings - + @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,23 +252,23 @@ Hibernate - + Lock - + Log out - + Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -325,14 +331,14 @@ Empty - + TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_am_ET.ts b/translations/dde-dock_am_ET.ts index e392813192607a39d9a6bbced5d7a0b194a7419e..5c29bf752f07019780a70db1ad55d586a3036111 100644 --- a/translations/dde-dock_am_ET.ts +++ b/translations/dde-dock_am_ET.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins ተሰኪዎች + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ ሽቦ አልባ ኔትዎርክ: %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ar.ts b/translations/dde-dock_ar.ts index 6bb4bce838f0f42b544e85046a147b6cf27b739d..ecaf0c26bc0e6f4b52ee0af00050e529de786c26 100644 --- a/translations/dde-dock_ar.ts +++ b/translations/dde-dock_ar.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins الإضافات + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ الشبكة اللاسلكية : %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_az.ts b/translations/dde-dock_az.ts index b91798c70585eda4d541b34ed10a10337c6fd34b..dd311c5b622697e7b778cb46885e4ecc3c394152 100644 --- a/translations/dde-dock_az.ts +++ b/translations/dde-dock_az.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,18 +72,18 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + @@ -96,18 +98,18 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top @@ -127,31 +129,31 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location @@ -163,12 +165,16 @@ Status - + Plugins Qoşmalar + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -199,38 +205,38 @@ PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -246,23 +252,23 @@ Hibernate - + Lock - + Log out - + Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -325,14 +331,14 @@ Empty - + TrayPlugin System Tray - + @@ -343,29 +349,64 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_bg.ts b/translations/dde-dock_bg.ts index 27e0e65504f5350a344cc5c0b03955f776e4b3b5..e135b83ec172a6ac58f5387443e300891ed3dbdf 100644 --- a/translations/dde-dock_bg.ts +++ b/translations/dde-dock_bg.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Добавки + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Безжична връзка %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_bn.ts b/translations/dde-dock_bn.ts index 2a687d7a0b84fbdeb90aeadc5aca2a45f7f41afa..e4706c4c8de77d726cb3c6de9e73c388f0f64a73 100644 --- a/translations/dde-dock_bn.ts +++ b/translations/dde-dock_bn.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins প্লাগইন সমূহ + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ ওয়্যারলেস নেটওয়ার্ক %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ca.ts b/translations/dde-dock_ca.ts index e69c2433e6f106a8b789e7174707f950799a0c17..dab1cb483f367385e5b76397d8aa7cd2f6ce1a7d 100644 --- a/translations/dde-dock_ca.ts +++ b/translations/dde-dock_ca.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Connectors + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Xarxa sense fil: %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_cs.ts b/translations/dde-dock_cs.ts index 9cee2200a30688923f3f523071e40f3904e6fea5..06b30a3da8d39a1d49e438e587b37628e12dfb9c 100644 --- a/translations/dde-dock_cs.ts +++ b/translations/dde-dock_cs.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Přídavné moduly + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Bezdrátová síť %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_da.ts b/translations/dde-dock_da.ts index a411122988464d95ec2abee490e2db8608f4bea4..aadabe1b64e9aeb3f98597d56b518a0fa8e7a901 100644 --- a/translations/dde-dock_da.ts +++ b/translations/dde-dock_da.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Plugins + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Trådløst netværk %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_de.ts b/translations/dde-dock_de.ts index 8c8caca93280e4e4f319aaf0bf5ab0a47d2b0d19..94a880f14630b9b7df0489f173f0729820c1d6d4 100644 --- a/translations/dde-dock_de.ts +++ b/translations/dde-dock_de.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Plugins + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Drahtlosnetzwerk %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_el.ts b/translations/dde-dock_el.ts index fd453e00970c76303af97ad537f31cdd5e8b37d8..3296cacb2f534128ee2121376d1b63aa64e2a88b 100644 --- a/translations/dde-dock_el.ts +++ b/translations/dde-dock_el.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Πρόσθετα + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Ασύρματο Δίκτυο %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_en_AU.ts b/translations/dde-dock_en_AU.ts index 71a03b9dd81f515beb2f661176b76791478162df..fef11804e75e3677503711b254c1c239d794c4b9 100644 --- a/translations/dde-dock_en_AU.ts +++ b/translations/dde-dock_en_AU.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,18 +72,18 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + @@ -96,26 +98,26 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -127,27 +129,27 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -155,7 +157,7 @@ Location - + Size @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -325,14 +331,14 @@ Empty - + TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_en_GB.ts b/translations/dde-dock_en_GB.ts index 6a53532f3d57e15016464bd6713c78244c7fc299..51db1a2dd6a267689e971bccc2330f9990a819bc 100644 --- a/translations/dde-dock_en_GB.ts +++ b/translations/dde-dock_en_GB.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,33 +72,33 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + @@ -111,126 +113,130 @@ Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -238,134 +244,169 @@ Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_eo.ts b/translations/dde-dock_eo.ts index 7a4d64b21f108570605558872374c444da80110b..02807bc5a95781d4ef1be981886c742db0b1dbb2 100644 --- a/translations/dde-dock_eo.ts +++ b/translations/dde-dock_eo.ts @@ -1,16 +1,18 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + @@ -24,15 +26,15 @@ DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings @@ -43,22 +45,22 @@ DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -77,11 +79,11 @@ DiskControlItem Unknown device - + Unknown volume - + @@ -92,30 +94,30 @@ Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -139,15 +141,15 @@ Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,18 +316,18 @@ Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty @@ -332,7 +338,7 @@ TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_es.ts b/translations/dde-dock_es.ts index cc6bec1278eec818ef8e8023b9ca949f073ca555..2bb84d409655a898ce156592f4636a199c7e9a66 100644 --- a/translations/dde-dock_es.ts +++ b/translations/dde-dock_es.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Complementos + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Red inalámbrica %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_es_419.ts b/translations/dde-dock_es_419.ts index fab67cfbdbf7d6ed6f5166e3ccf23bcfc155d264..eb595f31811114764fb4978927027f867af42d95 100644 --- a/translations/dde-dock_es_419.ts +++ b/translations/dde-dock_es_419.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Complementos + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Red inalámbrica %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_et.ts b/translations/dde-dock_et.ts index 4164694a35fecab79c93420ef663d82115a67523..4340fae94059178400d41515500187912ac81d34 100644 --- a/translations/dde-dock_et.ts +++ b/translations/dde-dock_et.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -66,171 +68,175 @@ Delete - + This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -238,134 +244,169 @@ Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_fa.ts b/translations/dde-dock_fa.ts index 339aff4347e125dfee23ad95e8fe37ffdb38694e..d11106cc06711a5ca7b5ce619bb690966b6f5710 100644 --- a/translations/dde-dock_fa.ts +++ b/translations/dde-dock_fa.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -77,11 +79,11 @@ DiskControlItem Unknown device - + Unknown volume - + @@ -96,26 +98,26 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -127,27 +129,27 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -155,7 +157,7 @@ Location - + Size @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -332,7 +338,7 @@ TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_fi.ts b/translations/dde-dock_fi.ts index 9bf57f4871fa5cee06d6f41be6e87bfc2a06fd01..3ddcc8ce4382589b68b2fc261740854c82a16ae3 100644 --- a/translations/dde-dock_fi.ts +++ b/translations/dde-dock_fi.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Lisäosat + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Langaton verkko: %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_fi_FI.ts b/translations/dde-dock_fi_FI.ts index e1f34c34ac4a68733356a0e9a5e85f714eec2279..3350d532788235be1a13eea4f67541193aec132b 100644 --- a/translations/dde-dock_fi_FI.ts +++ b/translations/dde-dock_fi_FI.ts @@ -1,4 +1,14 @@ - + + + + + AbstractPluginsController + + + The plugin %1 is not compatible with the system. + + + ContainerItem @@ -12,28 +22,28 @@ Add keyboard layout - + DatetimePlugin - + Datetime Aika - + 12 Hour Time 12H aika - + 24 Hour Time 24H aika - + Time Settings Aika asetukset @@ -59,9 +69,13 @@ DialogManager - Are you sure to empty %1 items? - Oletko varma poistaessasi %1 tiedostoa? + Oletko varma poistaessasi %1 tiedostoa? + + + + Are you sure you want to empty %1 items? + @@ -110,98 +124,95 @@ Irrottaa kaikki - - DockPluginsController - - - The plugin %1 is not compatible with the system. - - - DockSettings - + Fashion Mode Keskitetty - + Efficient Mode Levitetty - + Top Ylös - + Bottom Alas - + Left Vasen - + Right Oikea - + Large Suuri - + Medium Keskikoko - + Small Pieni - + Keep Shown Pidä näkyvänä - + Keep Hidden Pidä piilotettuna - + Smart Hide Älykäs piilotus - + + System Monitor + + + + Mode Tila - + Location Sijainti - + Size Koko - + Status Status - + Plugins Liitännäiset @@ -231,7 +242,7 @@ Koneella - + Settings Asetukset @@ -244,22 +255,40 @@ Virta - + + Capacity %1, %2 min remaining + + + + + Capacity %1, %2 hr %3 min remaining + + + + + Charging %1, %2 min until full + + + + + Charging %1, %2 hr %3 min until full + + + Remaining Capacity %1 - Kapasiteettia jäljellä %1 + Kapasiteettia jäljellä %1 - + Charged %1 Ladattu %1 - Charging %1 - Lataa %1 + Lataa %1 - + Power settings Virran asetukset @@ -267,50 +296,54 @@ ShutdownPlugin - + Shut down Sammuta - + Restart Uudelleenkäynnistys - + Hibernate Lepotila - + Lock Lukitse - + Log out Kirjaudu ulos - + Suspend Valmiustila - + + + Power + Virta + + + Switch account Vaihda tiliä - + Power settings Virran asetukset - - Shutdown - Sammuta tietokone + Sammuta tietokone @@ -362,7 +395,7 @@ Trash - + @@ -378,12 +411,12 @@ TrashWidget - + Open Avaa - + Empty Tyhjä @@ -391,7 +424,7 @@ TrayPlugin - + System Tray Paneeli @@ -425,14 +458,59 @@ WirelessList - + Wireless Network Langaton verkko - + Wireless Network %1 Langaton verkko %1 - \ No newline at end of file + + pluginSettingDialog + + + 系统监控插件设置 + + + + + 高效模式显示内容设置 + + + + + + 只显示网速 + + + + + + 只显示CPU、内存 + + + + + 显示CP&U、内存和网速 + + + + + 时尚模式显示内容设置 + + + + + 行高： + + + + + % + + + + diff --git a/translations/dde-dock_fr.ts b/translations/dde-dock_fr.ts index 740e9af0b8f679352b6d4c2476331c3ae972217d..156041d7e4c12a1e77a881608d7885b6c38c5c05 100644 --- a/translations/dde-dock_fr.ts +++ b/translations/dde-dock_fr.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Extensions + + System Monitor + + LauncherItem @@ -343,7 +349,7 @@ Wired connection: %1 - Connexion filaire : %1 + Connexion filaire : %1 @@ -354,7 +360,7 @@ Wireless Connection: %1 - Connexion sans fil : %1 + Connexion sans fil : %1 @@ -368,4 +374,39 @@ Réseau sans fil %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_gl.ts b/translations/dde-dock_gl.ts index 35b61f316d702d9dd38c23e634678e6803d685a0..186e5528900c4e5c60b77956130e78aed175fa53 100644 --- a/translations/dde-dock_gl.ts +++ b/translations/dde-dock_gl.ts @@ -1,51 +1,92 @@ - + + + + + AbstractPluginsController + + + The plugin %1 is not compatible with the system. + + + ContainerItem Click to display hidden icon - + + + + + DBusAdaptors + + + Add keyboard layout + DatetimePlugin - + Datetime - + - + 12 Hour Time - + - + 24 Hour Time - + - + Time Settings - + DeviceItem - + Enable network - + - + Disable network - + - + Network settings - + + + + + DialogManager + + + Are you sure you want to empty %1 items? + + + + + Cancel + + + + + Delete + + + + + This action cannot be restored + @@ -53,12 +94,12 @@ Unknown device - + Unknown volume - + @@ -66,350 +107,394 @@ Disk - + Open - + Unmount all - + DockSettings - + Fashion Mode - + - + Efficient Mode - + - + Top - + - + Bottom - + - + Left - + - + Right - + - + Large - + - + Medium - + - + Small - + - + Keep Shown - + - + Keep Hidden - + - + Smart Hide - + + + + + System Monitor + - + Mode - + - + Location - + - + Size - + - + Status - + - + Plugins - + LauncherItem - + Launcher - + NetworkPlugin - + Network - + - PopupControlWidget + OnboardPlugin - - Cancel - + + + Onboard + - - Empty - + + Settings + + + + PowerPlugin - - This action cannot be restored - + + Power + - - Are you sure to empty 1 item ? - + + Power settings + - - Are you sure to empty %1 items ? - + + Capacity %1, %2 min remaining + - - - ShutdownPlugin - - - Shut down - + + Capacity %1, %2 hr %3 min remaining + - - Remaining Capacity %1 - + + Charged %1 + - - Charged %1 - + + Charging %1, %2 min until full + - - Charging %1 - + + Charging %1, %2 hr %3 min until full + + + + + ShutdownPlugin + + + Shut down + - + Restart - + - + Lock - + - + Log out - + - + Suspend - + - + + Power - + - + + Hibernate + + + + Switch account - + - + Power settings - + SoundApplet - + Device - + - + Application - + SoundItem - + Unmute - + - + Mute - + - + Audio Settings - + - + Current Volume %1 - + SoundPlugin - + Sound - + - SystemTrayPlugin + TrashPlugin - - System Tray - + + Trash + - - - TrashPlugin - + Trash - %1 file - + - + Trash - %1 files - + TrashWidget - + Open - + - + Empty - + + + + + TrayPlugin + + + System Tray + WiredItem - + Unknown Descoñecido - - No Network - - - - + Wired connection: %1 - + WirelessItem - + No Network - + - + Wireless Connection: %1 - + WirelessList - - Auto-connect - + + Wireless Network + + + + + Wireless Network %1 + + + + pluginSettingDialog - - Connect - + + 系统监控插件设置 + - - Cancel - + + 高效模式显示内容设置 + - - Wireless Network - + + + 只显示网速 + - - Wireless Network %1 - + + + 只显示CPU、内存 + + + + + 显示CP&U、内存和网速 + + + + + 时尚模式显示内容设置 + + + + + 行高： + - - Password required to connect to <font color="#faca57">%1</font> - + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_gl_ES.ts b/translations/dde-dock_gl_ES.ts index dcf5e322610d3f2b4a125b363aab2d373dd567fb..ba86621288e18f8c4f3c601528ba7428bbe622e5 100644 --- a/translations/dde-dock_gl_ES.ts +++ b/translations/dde-dock_gl_ES.ts @@ -1,30 +1,32 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Complementos + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ Rede sen fíos %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_he.ts b/translations/dde-dock_he.ts index 266804a9bec1a03fa7bb5170768695bab929253c..8d4b418579fb90048b80bf0e980c221cac9cf7d5 100644 --- a/translations/dde-dock_he.ts +++ b/translations/dde-dock_he.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -77,11 +79,11 @@ DiskControlItem Unknown device - + Unknown volume - + @@ -96,18 +98,18 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top @@ -127,27 +129,27 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -163,12 +165,16 @@ Status - + Plugins פלאגינים + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -332,7 +338,7 @@ TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_hi_IN.ts b/translations/dde-dock_hi_IN.ts index 3a63e52d77207d444e92aac7d36c01c8d9f7ad5b..dfe2e5e285ffb4f25d064e0afc2d75f8eb39c959 100644 --- a/translations/dde-dock_hi_IN.ts +++ b/translations/dde-dock_hi_IN.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins प्लगिन + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ बेतार नेटवर्क %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_hr.ts b/translations/dde-dock_hr.ts index b18610469e43b45ad56d098c256f4690abb1076f..d7fe088f138dbb29b64b3902cea6790cc3e89bda 100644 --- a/translations/dde-dock_hr.ts +++ b/translations/dde-dock_hr.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Priključci + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ Bežična mreža %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_hu.ts b/translations/dde-dock_hu.ts index 35a2f42230733d3da970670f299b2c742f40719e..72aeb602f55d22daa054eeda4efb0d3ca5d3b4d5 100644 --- a/translations/dde-dock_hu.ts +++ b/translations/dde-dock_hu.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Bővítmények + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Vezeték nélküli Hálózat %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_hy.ts b/translations/dde-dock_hy.ts index 86faf0d237205bd7e19c5776158dc7f0b5e1c965..4b7307540f41a920a7f43a2ec0cf9e25ccd04ce7 100644 --- a/translations/dde-dock_hy.ts +++ b/translations/dde-dock_hy.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,52 +72,52 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -127,31 +129,31 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -181,14 +187,14 @@ NetworkPlugin Network - + OnboardPlugin Onboard - + Settings @@ -199,38 +205,38 @@ PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,29 +264,29 @@ Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute @@ -288,18 +294,18 @@ Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + @@ -310,29 +316,29 @@ Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + @@ -343,29 +349,64 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_id.ts b/translations/dde-dock_id.ts index a90dee1d5c0c624d4e4cd3e424eeec384464712b..cd95780788846c7cd75fd28fa06953f528581f4f 100644 --- a/translations/dde-dock_id.ts +++ b/translations/dde-dock_id.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Plugin + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Jaringan Nirkabel %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_it.ts b/translations/dde-dock_it.ts index b0d82dfd5c631c40d908119e7a84ddd9c137efc0..dd3949737e6e344eefc6388c31ff772e9e5861fa 100644 --- a/translations/dde-dock_it.ts +++ b/translations/dde-dock_it.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Plugin + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Rete wireless %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ja.ts b/translations/dde-dock_ja.ts index 1b7d02d274d3c84f7993a81d838695824161104b..dd72074e24a97dceb0c5ed2eae4e78b0c85844ea 100644 --- a/translations/dde-dock_ja.ts +++ b/translations/dde-dock_ja.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins プラグイン + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ 無線接続 %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_kn_IN.ts b/translations/dde-dock_kn_IN.ts index adc2f985c81844423396520abbb3e37607482e5b..4b2cb098c0a0332b62ae7d8044ab05b4eab929ac 100644 --- a/translations/dde-dock_kn_IN.ts +++ b/translations/dde-dock_kn_IN.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -17,7 +19,7 @@ DBusAdaptors Add keyboard layout - + @@ -58,19 +60,19 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel - + Delete - + This action cannot be restored - + @@ -96,7 +98,7 @@ Unmount all - + @@ -111,210 +113,214 @@ Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down - + Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + @@ -325,47 +331,82 @@ Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_ko.ts b/translations/dde-dock_ko.ts index 07c09b2d937ea1d815d34a8a193ba7e6cf2358d1..955c51fc1dfbf25b0a632c6b3a9365e401d858c0 100644 --- a/translations/dde-dock_ko.ts +++ b/translations/dde-dock_ko.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins 플러그인 + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ 무선 네트워크 %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ku_IQ.ts b/translations/dde-dock_ku_IQ.ts index ee162a38130081dc8ff4e41f42868ab80db09db4..de40916d91277ddfd1ddfd24c38cb9ffa8a27e13 100644 --- a/translations/dde-dock_ku_IQ.ts +++ b/translations/dde-dock_ku_IQ.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,125 +72,129 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings @@ -199,88 +205,88 @@ PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down - + Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -306,66 +312,101 @@ TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_lo.ts b/translations/dde-dock_lo.ts index 862ec9b9f6b41e9a34714607e5a391e5de29bcd1..33e5c21b556a326503ebee0036af801b6d3634e9 100644 --- a/translations/dde-dock_lo.ts +++ b/translations/dde-dock_lo.ts @@ -1,16 +1,18 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + @@ -24,41 +26,41 @@ DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -66,29 +68,29 @@ Delete - + This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open @@ -96,141 +98,145 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -238,7 +244,7 @@ Restart - + Suspend @@ -258,63 +264,63 @@ Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + @@ -325,47 +331,82 @@ Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_lt.ts b/translations/dde-dock_lt.ts index 1395b79b66db748f377c11231d12cbd6bafd600b..95ed2e479a1d33abb12ad9348edd6fd889ea08e9 100644 --- a/translations/dde-dock_lt.ts +++ b/translations/dde-dock_lt.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Įskiepiai + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Belaidis tinklas %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ml.ts b/translations/dde-dock_ml.ts index 56478e7fbb265a807c4b0c81e0d8b72a68d52db2..04669ed47b041af9ace4c0edd4d953d278f15476 100644 --- a/translations/dde-dock_ml.ts +++ b/translations/dde-dock_ml.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -92,11 +94,11 @@ Open - + Unmount all - + @@ -167,7 +169,11 @@ Plugins - + + + + System Monitor + @@ -181,56 +187,56 @@ NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -238,31 +244,31 @@ Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + @@ -280,26 +286,26 @@ SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + @@ -310,18 +316,18 @@ Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty @@ -332,40 +338,75 @@ TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_mn.ts b/translations/dde-dock_mn.ts index 30f806cbbd9779b9d00c4db012120fe519881135..4f03ce2d746383157010f71d88ff5706ace528a5 100644 --- a/translations/dde-dock_mn.ts +++ b/translations/dde-dock_mn.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Нэмэлтүүд + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Утасгүй сүлжээ %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ms.ts b/translations/dde-dock_ms.ts index fd0915d96edae5784308ab999b89c4138d66d3ee..4da1ffbc37c42853fbac9d57836231b40ba04934 100644 --- a/translations/dde-dock_ms.ts +++ b/translations/dde-dock_ms.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Pemalam + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Sambungan Tanpa Wayar %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_nb.ts b/translations/dde-dock_nb.ts index 3c5566fea33667272486d16350e09f5896290e91..d1ad9db8b7bde31f6394647ca2b01e48f821862b 100644 --- a/translations/dde-dock_nb.ts +++ b/translations/dde-dock_nb.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Utvidelser + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Trådløst Nettverk: %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ne.ts b/translations/dde-dock_ne.ts index 6a5d40d688dfbf913d7cfed2d82a1708b57a2b5c..3606f70b2861c45538fbb9a235b60c2c2ff25727 100644 --- a/translations/dde-dock_ne.ts +++ b/translations/dde-dock_ne.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -17,7 +19,7 @@ DBusAdaptors Add keyboard layout - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins प्लगइनहरू + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -306,7 +312,7 @@ TrashPlugin Trash - + Trash - %1 file @@ -368,4 +374,39 @@ वायरलेस नेटवर्क% 1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_nl.ts b/translations/dde-dock_nl.ts index 42e2803c248282fa42295d7ce25943a08a80e01a..815497428f79014c597af8f68ec801add541bc31 100644 --- a/translations/dde-dock_nl.ts +++ b/translations/dde-dock_nl.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Invoegtoepassingen + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Draadloos Netwerk %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_pa.ts b/translations/dde-dock_pa.ts index a9afa8be3580f745331db199a43f6aa2577c497f..9c0e360070e0c50a2695616531ed7f887d662b55 100644 --- a/translations/dde-dock_pa.ts +++ b/translations/dde-dock_pa.ts @@ -1,23 +1,25 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,18 +72,18 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + @@ -96,62 +98,62 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -207,23 +213,23 @@ Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -280,11 +286,11 @@ SoundItem Unmute - + Mute - + Audio Settings @@ -292,40 +298,40 @@ Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + ਖੋਲ੍ਹੋ Empty - + @@ -339,7 +345,7 @@ WiredItem Unknown - + Wired connection: %1 @@ -368,4 +374,39 @@ ਬੇਤਾਰ ਨੈੱਟਵਰਕ: %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_pl.ts b/translations/dde-dock_pl.ts index 37258e1080b6973194dcc10dfd6232f661ebb791..560ce3707072e6c023724bd8a9a89d7bbee78dc1 100644 --- a/translations/dde-dock_pl.ts +++ b/translations/dde-dock_pl.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Wtyczki + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Sieć bezprzewodowa %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_pt.ts b/translations/dde-dock_pt.ts index 24365102e0b54a9eb472c7c3881284db75e4c908..91f5aa41f11c46148e0c3743d6858877326a3ff8 100644 --- a/translations/dde-dock_pt.ts +++ b/translations/dde-dock_pt.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Plugins + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Rede Sem Fios %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_pt_BR.ts b/translations/dde-dock_pt_BR.ts index 004df66ad69647ed80e56065c0684652d47babfa..320f65812691e88df45b630ca1b1bb548adcefcb 100644 --- a/translations/dde-dock_pt_BR.ts +++ b/translations/dde-dock_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Plugins + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Rede Wireless %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ro.ts b/translations/dde-dock_ro.ts index b80ac6d5cf3593f16b0cef6ad9080dc825139c31..4f5489d1781d4e22c02b0b9751e4b6db90461642 100644 --- a/translations/dde-dock_ro.ts +++ b/translations/dde-dock_ro.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Extensii + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Rețea fără fir %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ru.ts b/translations/dde-dock_ru.ts index 461dee14ffcb681f89701bf284bb099da2fc583f..73b3cc32f3685e6c3044ff97480ef5a7dd97bc92 100644 --- a/translations/dde-dock_ru.ts +++ b/translations/dde-dock_ru.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Плагины + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Беспроводная Сеть %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_si.ts b/translations/dde-dock_si.ts index 47f0d0cf757ee884b115a6c5aa3932535c91edce..79035762321f6937192c1d8cdaba7b1a0193574b 100644 --- a/translations/dde-dock_si.ts +++ b/translations/dde-dock_si.ts @@ -1,173 +1,179 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel - + Delete - + This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + @@ -181,56 +187,56 @@ NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -246,60 +252,60 @@ Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + @@ -310,29 +316,29 @@ Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + @@ -343,29 +349,64 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_sk.ts b/translations/dde-dock_sk.ts index cbe15e2b7f03d6f0868ba2a299e2ba7a4ccf9a93..3f03412b437c9ec1d8c372f5457352fdbefde44b 100644 --- a/translations/dde-dock_sk.ts +++ b/translations/dde-dock_sk.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Pluginy + + System Monitor + + LauncherItem @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Bezdrôtová sieť %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_sl.ts b/translations/dde-dock_sl.ts index 7bdbf9a4815678f547283b314165ef2f901abad8..2f1edbc0cdf5a45db87fdbbc90db6fdedb285af2 100644 --- a/translations/dde-dock_sl.ts +++ b/translations/dde-dock_sl.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Vtičniki + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ Brezžično omrežje %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_sq.ts b/translations/dde-dock_sq.ts index 3a99d43dc6938c509c3b0f72bdddeec31a979a5b..1e17e2c8552cdeffe9fb979e033d13b479896efe 100644 --- a/translations/dde-dock_sq.ts +++ b/translations/dde-dock_sq.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -66,306 +68,345 @@ Delete - + This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down - + Restart - + Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_sr.ts b/translations/dde-dock_sr.ts index bf4c7114241a844b0b4089cb75ec7f897275edee..cd44841f18d959836f04cd62e7f6b1d0b78363d5 100644 --- a/translations/dde-dock_sr.ts +++ b/translations/dde-dock_sr.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Додаци + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Бежична мрежа %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_sv.ts b/translations/dde-dock_sv.ts index 5b697e409bb8f7b085d4ed5f1a0bb56c6220bfc7..904ee4491c68c8f531be85412b95a7aaa006d749 100644 --- a/translations/dde-dock_sv.ts +++ b/translations/dde-dock_sv.ts @@ -1,16 +1,18 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + @@ -24,7 +26,7 @@ DatetimePlugin Datetime - + 12 Hour Time @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Plugin + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ Trådlöst nätverk %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_sw.ts b/translations/dde-dock_sw.ts index 4fc0dd17b4b40aef8e2e9880cae84836dc21c078..baea064f08068c0cd7ba3a79024a36c99b202933 100644 --- a/translations/dde-dock_sw.ts +++ b/translations/dde-dock_sw.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -28,11 +30,11 @@ 12 Hour Time - + 24 Hour Time - + Time Settings @@ -70,7 +72,7 @@ This action cannot be restored - + @@ -169,6 +171,10 @@ Plugins Kijenzi ya maziada + + System Monitor + + LauncherItem @@ -207,23 +213,23 @@ Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -368,4 +374,39 @@ Mtandao wa muunganisho bila kabo %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ta.ts b/translations/dde-dock_ta.ts index d0f6f8e384839d29d19c903d881b9001d42dc039..5a52071111c669f918e74cfddfc168d22b9f0d28 100644 --- a/translations/dde-dock_ta.ts +++ b/translations/dde-dock_ta.ts @@ -1,16 +1,18 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + @@ -24,41 +26,41 @@ DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,18 +72,18 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + @@ -96,26 +98,26 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left @@ -127,27 +129,27 @@ Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -155,7 +157,7 @@ Location - + Size @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -325,14 +331,14 @@ Empty - + TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_tr.ts b/translations/dde-dock_tr.ts index 04a063b1043c0ac994d3a46a4afd385ace93af40..26f9ad5336d16cb0e2beca9743a55cc60d56da75 100644 --- a/translations/dde-dock_tr.ts +++ b/translations/dde-dock_tr.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Eklentiler + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Kablosuz Ağ %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ug.ts b/translations/dde-dock_ug.ts index e776875b7d4122f2bfbabd03d0fd6e9a66078a7e..2432b143707859313d162fe44488f49f368898c2 100644 --- a/translations/dde-dock_ug.ts +++ b/translations/dde-dock_ug.ts @@ -1,16 +1,18 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + @@ -24,15 +26,15 @@ DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings @@ -43,22 +45,22 @@ DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -70,25 +72,25 @@ This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open @@ -96,38 +98,38 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium @@ -135,19 +137,19 @@ Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode @@ -155,7 +157,7 @@ Location - + Size @@ -163,11 +165,15 @@ Status - + Plugins - + + + + System Monitor + @@ -188,49 +194,49 @@ OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,41 +264,41 @@ Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + @@ -306,15 +312,15 @@ TrashPlugin Trash - + Trash - %1 file - + Trash - %1 files - + @@ -325,14 +331,14 @@ Empty - + TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_uk.ts b/translations/dde-dock_uk.ts index 9d4f39b6d01783f176e062f49c6ccdc4c845d888..e283352a13175b50780a7d5910c75c29ce38e013 100644 --- a/translations/dde-dock_uk.ts +++ b/translations/dde-dock_uk.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins Плагіни + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ Бездротова мережа %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_ur.ts b/translations/dde-dock_ur.ts index 09ec323ef656c5835a4c7a3bed29acf3b7eeb393..5635a3577cbe36f39b26b14928c6b557f0fde76b 100644 --- a/translations/dde-dock_ur.ts +++ b/translations/dde-dock_ur.ts @@ -1,236 +1,242 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel - + Delete - + This action cannot be restored - + DiskControlItem Unknown device - + Unknown volume - + DiskMountPlugin Disk - + Open - + Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top - + Bottom - + Left - + Right - + Large - + Medium - + Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location - + Size - + Status - + Plugins - + + + + System Monitor + LauncherItem Launcher - + NetworkPlugin Network - + OnboardPlugin Onboard - + Settings - + PowerPlugin Power - + Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + ShutdownPlugin Power - + Shut down @@ -242,64 +248,64 @@ Suspend - + Hibernate - + Lock - + Log out - + Switch account - + Power settings - + SoundApplet Device - + Application - + SoundItem Unmute - + Mute - + Audio Settings - + Current Volume %1 - + SoundPlugin Sound - + @@ -310,62 +316,97 @@ Trash - %1 file - + Trash - %1 files - + TrashWidget Open - + Empty - + TrayPlugin System Tray - + WiredItem Unknown - + Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + WirelessList Wireless Network - + Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_vi.ts b/translations/dde-dock_vi.ts index a9ac19e43c645130866d8bb4c66e2cdafcbbfa63..97db332b97b58cb9427a15c28ae119cc5fe4fce4 100644 --- a/translations/dde-dock_vi.ts +++ b/translations/dde-dock_vi.ts @@ -1,9 +1,11 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + @@ -17,7 +19,7 @@ DBusAdaptors Add keyboard layout - + @@ -58,7 +60,7 @@ DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -169,6 +171,10 @@ Plugins Các phần bổ sung + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -211,19 +217,19 @@ Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -368,4 +374,39 @@ Mạng Không dây %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_zh_CN.ts b/translations/dde-dock_zh_CN.ts index b897bddf9eb15b504c6122d5bd2161c622ca6c67..d829791bc3c6a940fa857e694859d68812659548 100644 --- a/translations/dde-dock_zh_CN.ts +++ b/translations/dde-dock_zh_CN.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins 插件 + + System Monitor + 系统监视器 + LauncherItem @@ -368,4 +374,39 @@ 无线网络%1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + + diff --git a/translations/dde-dock_zh_HK.ts b/translations/dde-dock_zh_HK.ts index 898474816581b3b12b60257b8b843f9270eb9f8e..481eff30893dcb19fffa93fdff23249c92e3e03a 100644 --- a/translations/dde-dock_zh_HK.ts +++ b/translations/dde-dock_zh_HK.ts @@ -1,64 +1,66 @@ - + + + AbstractPluginsController The plugin %1 is not compatible with the system. - + ContainerItem Click to display hidden icon - + DBusAdaptors Add keyboard layout - + DatetimePlugin Datetime - + 12 Hour Time - + 24 Hour Time - + Time Settings - + DeviceItem Enable network - + Disable network - + Network settings - + DialogManager Are you sure you want to empty %1 items? - + Cancel @@ -77,11 +79,11 @@ DiskControlItem Unknown device - + Unknown volume - + @@ -96,18 +98,18 @@ Unmount all - + DockSettings Fashion Mode - + Efficient Mode - + Top @@ -127,7 +129,7 @@ Large - + Medium @@ -135,23 +137,23 @@ Small - + Keep Shown - + Keep Hidden - + Smart Hide - + Mode - + Location @@ -163,12 +165,16 @@ Status - + Plugins 外掛 + + System Monitor + + LauncherItem @@ -188,7 +194,7 @@ OnboardPlugin Onboard - + Settings @@ -203,27 +209,27 @@ Power settings - + Charged %1 - + Capacity %1, %2 min remaining - + Capacity %1, %2 hr %3 min remaining - + Charging %1, %2 min until full - + Charging %1, %2 hr %3 min until full - + @@ -246,7 +252,7 @@ Hibernate - + Lock @@ -258,11 +264,11 @@ Switch account - + Power settings - + @@ -273,14 +279,14 @@ Application - + SoundItem Unmute - + Mute @@ -288,11 +294,11 @@ Audio Settings - + Current Volume %1 - + @@ -310,11 +316,11 @@ Trash - %1 file - + Trash - %1 files - + @@ -332,7 +338,7 @@ TrayPlugin System Tray - + @@ -343,18 +349,18 @@ Wired connection: %1 - + WirelessItem No Network - + Wireless Connection: %1 - + @@ -365,7 +371,42 @@ Wireless Network %1 - + + + + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + - \ No newline at end of file + diff --git a/translations/dde-dock_zh_TW.ts b/translations/dde-dock_zh_TW.ts index e462100e12959a446ebf983c0de07ebaf5a35835..29f289cce30bfd621bcc201a1c7f2883ac8f742e 100644 --- a/translations/dde-dock_zh_TW.ts +++ b/translations/dde-dock_zh_TW.ts @@ -1,4 +1,6 @@ - + + + AbstractPluginsController @@ -169,6 +171,10 @@ Plugins 附加元件 + + System Monitor + + LauncherItem @@ -368,4 +374,39 @@ 無線網路 %1 - \ No newline at end of file + + pluginSettingDialog + + 系统监控插件设置 + + + + 高效模式显示内容设置 + + + + 只显示网速 + + + + 只显示CPU、内存 + + + + 显示CP&U、内存和网速 + + + + 时尚模式显示内容设置 + + + + 行高： + + + + % + + + +