From aee665f1defcba6f78bc63af7437f3c70d364e6c Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Fri, 4 Sep 2015 20:54:52 +0200 Subject: [PATCH] Cherry-picking upstream version 0.9.0+20150830. --- debian/changelog | 5 +- panel/config/addplugindialog.cpp | 16 +- panel/config/addplugindialog.h | 4 +- panel/config/configpaneldialog.cpp | 4 +- panel/config/configpaneldialog.h | 4 +- panel/config/configpanelwidget.cpp | 52 +-- panel/config/configpanelwidget.h | 18 +- panel/config/configpluginswidget.cpp | 6 +- panel/config/configpluginswidget.h | 4 +- panel/ilxqtpanel.h | 6 +- panel/ilxqtpanelplugin.h | 50 +-- panel/lxqtpanel.cpp | 184 ++++----- panel/lxqtpanel.h | 46 +-- panel/lxqtpanelapplication.cpp | 56 +-- panel/lxqtpanelapplication.h | 20 +- panel/lxqtpanellayout.cpp | 64 +-- panel/lxqtpanellayout.h | 12 +- panel/lxqtpanelpluginconfigdialog.cpp | 10 +- panel/lxqtpanelpluginconfigdialog.h | 8 +- panel/main.cpp | 2 +- panel/panelpluginsmodel.cpp | 14 +- panel/panelpluginsmodel.h | 12 +- panel/plugin.cpp | 46 +-- panel/plugin.h | 22 +- panel/pluginmoveprocessor.cpp | 10 +- panel/pluginmoveprocessor.h | 6 +- panel/translations/lxqt-panel.ts | 2 +- panel/translations/lxqt-panel_ar.ts | 6 +- panel/translations/lxqt-panel_cs.ts | 6 +- panel/translations/lxqt-panel_cs_CZ.ts | 6 +- panel/translations/lxqt-panel_da.ts | 6 +- panel/translations/lxqt-panel_da_DK.ts | 6 +- panel/translations/lxqt-panel_de.ts | 2 +- .../{lxqt-panel_el_GR.ts => lxqt-panel_el.ts} | 106 ++--- panel/translations/lxqt-panel_eo.ts | 8 +- panel/translations/lxqt-panel_es.ts | 6 +- panel/translations/lxqt-panel_es_UY.ts | 4 +- panel/translations/lxqt-panel_es_VE.ts | 6 +- panel/translations/lxqt-panel_eu.ts | 6 +- panel/translations/lxqt-panel_fi.ts | 6 +- panel/translations/lxqt-panel_fr_FR.ts | 6 +- panel/translations/lxqt-panel_hu.ts | 2 +- panel/translations/lxqt-panel_hu_HU.ts | 2 +- panel/translations/lxqt-panel_ia.ts | 2 +- panel/translations/lxqt-panel_id_ID.ts | 2 +- panel/translations/lxqt-panel_it.ts | 6 +- panel/translations/lxqt-panel_it_IT.ts | 6 +- panel/translations/lxqt-panel_ja.ts | 2 +- panel/translations/lxqt-panel_ko.ts | 2 +- panel/translations/lxqt-panel_lt.ts | 6 +- panel/translations/lxqt-panel_nl.ts | 6 +- panel/translations/lxqt-panel_pl.ts | 2 +- panel/translations/lxqt-panel_pl_PL.ts | 6 +- panel/translations/lxqt-panel_pt.ts | 6 +- panel/translations/lxqt-panel_pt_BR.ts | 6 +- panel/translations/lxqt-panel_ro_RO.ts | 6 +- panel/translations/lxqt-panel_ru.ts | 2 +- panel/translations/lxqt-panel_ru_RU.ts | 2 +- panel/translations/lxqt-panel_sk_SK.ts | 4 +- panel/translations/lxqt-panel_sl.ts | 6 +- panel/translations/lxqt-panel_sr@latin.ts | 2 +- panel/translations/lxqt-panel_sr_BA.ts | 6 +- panel/translations/lxqt-panel_sr_RS.ts | 6 +- panel/translations/lxqt-panel_th_TH.ts | 6 +- panel/translations/lxqt-panel_tr.ts | 6 +- panel/translations/lxqt-panel_uk.ts | 6 +- panel/translations/lxqt-panel_zh_CN.ts | 6 +- panel/translations/lxqt-panel_zh_TW.ts | 8 +- plugin-clock/lxqtclock.cpp | 40 +- plugin-clock/lxqtclock.h | 14 +- plugin-clock/lxqtclockconfiguration.cpp | 18 +- plugin-clock/lxqtclockconfiguration.h | 12 +- plugin-clock/lxqtclockconfiguration.ui | 8 +- plugin-clock/resources/clock.desktop.in | 2 +- plugin-clock/translations/clock.ts | 2 +- plugin-clock/translations/clock_ar.desktop | 2 +- plugin-clock/translations/clock_ar.ts | 4 +- plugin-clock/translations/clock_cs.desktop | 2 +- plugin-clock/translations/clock_cs.ts | 4 +- plugin-clock/translations/clock_cs_CZ.desktop | 2 +- plugin-clock/translations/clock_cs_CZ.ts | 4 +- plugin-clock/translations/clock_da.desktop | 2 +- plugin-clock/translations/clock_da.ts | 4 +- plugin-clock/translations/clock_da_DK.desktop | 2 +- plugin-clock/translations/clock_da_DK.ts | 6 +- plugin-clock/translations/clock_de.ts | 2 +- .../{clock_el_GR.desktop => clock_el.desktop} | 6 +- .../{clock_el_GR.ts => clock_el.ts} | 52 ++- plugin-clock/translations/clock_eo.desktop | 2 +- plugin-clock/translations/clock_eo.ts | 6 +- plugin-clock/translations/clock_es.desktop | 2 +- plugin-clock/translations/clock_es.ts | 6 +- plugin-clock/translations/clock_es_UY.ts | 6 +- plugin-clock/translations/clock_es_VE.desktop | 2 +- plugin-clock/translations/clock_es_VE.ts | 6 +- plugin-clock/translations/clock_eu.desktop | 2 +- plugin-clock/translations/clock_eu.ts | 6 +- plugin-clock/translations/clock_fi.desktop | 2 +- plugin-clock/translations/clock_fi.ts | 6 +- plugin-clock/translations/clock_fr_FR.desktop | 2 +- plugin-clock/translations/clock_fr_FR.ts | 6 +- plugin-clock/translations/clock_hu.desktop | 2 +- plugin-clock/translations/clock_hu.ts | 2 +- plugin-clock/translations/clock_hu_HU.ts | 2 +- plugin-clock/translations/clock_ia.desktop | 2 +- plugin-clock/translations/clock_ia.ts | 2 +- plugin-clock/translations/clock_id_ID.desktop | 2 +- plugin-clock/translations/clock_id_ID.ts | 6 +- plugin-clock/translations/clock_it_IT.desktop | 2 +- plugin-clock/translations/clock_it_IT.ts | 6 +- plugin-clock/translations/clock_ja.desktop | 2 +- plugin-clock/translations/clock_ja.ts | 2 +- plugin-clock/translations/clock_ko.desktop | 2 +- plugin-clock/translations/clock_ko.ts | 2 +- plugin-clock/translations/clock_lt.desktop | 2 +- plugin-clock/translations/clock_lt.ts | 6 +- plugin-clock/translations/clock_nl.desktop | 2 +- plugin-clock/translations/clock_nl.ts | 6 +- plugin-clock/translations/clock_pl.desktop | 2 +- plugin-clock/translations/clock_pl_PL.desktop | 2 +- plugin-clock/translations/clock_pl_PL.ts | 6 +- plugin-clock/translations/clock_pt.desktop | 2 +- plugin-clock/translations/clock_pt.ts | 6 +- plugin-clock/translations/clock_pt_BR.desktop | 2 +- plugin-clock/translations/clock_pt_BR.ts | 6 +- plugin-clock/translations/clock_ro_RO.desktop | 2 +- plugin-clock/translations/clock_ro_RO.ts | 6 +- plugin-clock/translations/clock_ru.desktop | 2 +- plugin-clock/translations/clock_ru.ts | 2 +- plugin-clock/translations/clock_ru_RU.desktop | 2 +- plugin-clock/translations/clock_ru_RU.ts | 2 +- plugin-clock/translations/clock_sk.desktop | 2 +- plugin-clock/translations/clock_sk_SK.ts | 6 +- plugin-clock/translations/clock_sl.desktop | 2 +- plugin-clock/translations/clock_sl.ts | 6 +- plugin-clock/translations/clock_sr.desktop | 2 +- .../translations/clock_sr@latin.desktop | 2 +- plugin-clock/translations/clock_sr@latin.ts | 2 +- plugin-clock/translations/clock_sr_BA.ts | 4 +- plugin-clock/translations/clock_sr_RS.ts | 4 +- plugin-clock/translations/clock_th_TH.desktop | 2 +- plugin-clock/translations/clock_th_TH.ts | 6 +- plugin-clock/translations/clock_tr.desktop | 2 +- plugin-clock/translations/clock_tr.ts | 6 +- plugin-clock/translations/clock_uk.desktop | 2 +- plugin-clock/translations/clock_uk.ts | 6 +- .../translations/clock_zh_CN.GB2312.desktop | 2 +- plugin-clock/translations/clock_zh_CN.desktop | 2 +- plugin-clock/translations/clock_zh_CN.ts | 6 +- plugin-clock/translations/clock_zh_TW.desktop | 2 +- plugin-clock/translations/clock_zh_TW.ts | 6 +- plugin-colorpicker/colorpicker.cpp | 4 +- plugin-colorpicker/colorpicker.h | 10 +- .../resources/colorpicker.desktop.in | 2 +- .../translations/colorpicker_cs.desktop | 2 +- .../translations/colorpicker_cs_CZ.desktop | 2 +- .../translations/colorpicker_da.desktop | 2 +- .../translations/colorpicker_da_DK.desktop | 2 +- .../translations/colorpicker_el.desktop | 10 + .../translations/colorpicker_el_GR.desktop | 10 - .../translations/colorpicker_es.desktop | 2 +- .../translations/colorpicker_es_VE.desktop | 2 +- .../translations/colorpicker_eu.desktop | 2 +- .../translations/colorpicker_fi.desktop | 2 +- .../translations/colorpicker_hu.desktop | 2 +- .../translations/colorpicker_it_IT.desktop | 2 +- .../translations/colorpicker_ja.desktop | 2 +- .../translations/colorpicker_pl_PL.desktop | 2 +- .../translations/colorpicker_pt.desktop | 2 +- .../translations/colorpicker_pt_BR.desktop | 2 +- .../translations/colorpicker_ro_RO.desktop | 2 +- .../translations/colorpicker_ru.desktop | 2 +- .../translations/colorpicker_ru_RU.desktop | 2 +- .../translations/colorpicker_th_TH.desktop | 2 +- .../translations/colorpicker_uk.desktop | 2 +- .../translations/colorpicker_zh_CN.desktop | 2 +- .../translations/colorpicker_zh_TW.desktop | 2 +- plugin-cpuload/lxqtcpuload.cpp | 18 +- plugin-cpuload/lxqtcpuload.h | 10 +- plugin-cpuload/lxqtcpuloadconfiguration.cpp | 20 +- plugin-cpuload/lxqtcpuloadconfiguration.h | 12 +- plugin-cpuload/lxqtcpuloadconfiguration.ui | 4 +- plugin-cpuload/lxqtcpuloadplugin.cpp | 16 +- plugin-cpuload/lxqtcpuloadplugin.h | 20 +- plugin-cpuload/resources/cpuload.desktop.in | 2 +- plugin-cpuload/translations/cpuload.ts | 4 +- .../translations/cpuload_ar.desktop | 2 +- plugin-cpuload/translations/cpuload_ar.ts | 4 +- .../translations/cpuload_cs.desktop | 2 +- plugin-cpuload/translations/cpuload_cs.ts | 8 +- .../translations/cpuload_cs_CZ.desktop | 2 +- plugin-cpuload/translations/cpuload_cs_CZ.ts | 8 +- .../translations/cpuload_da.desktop | 2 +- .../translations/cpuload_da_DK.desktop | 2 +- plugin-cpuload/translations/cpuload_da_DK.ts | 8 +- plugin-cpuload/translations/cpuload_de.ts | 4 +- .../translations/cpuload_el.desktop | 14 + .../{cpuload_el_GR.ts => cpuload_el.ts} | 18 +- .../translations/cpuload_el_GR.desktop | 13 - .../translations/cpuload_eo.desktop | 2 +- plugin-cpuload/translations/cpuload_eo.ts | 4 +- .../translations/cpuload_es.desktop | 2 +- plugin-cpuload/translations/cpuload_es.ts | 8 +- .../translations/cpuload_es_VE.desktop | 2 +- plugin-cpuload/translations/cpuload_es_VE.ts | 8 +- .../translations/cpuload_eu.desktop | 2 +- plugin-cpuload/translations/cpuload_eu.ts | 8 +- .../translations/cpuload_fi.desktop | 2 +- plugin-cpuload/translations/cpuload_fi.ts | 8 +- plugin-cpuload/translations/cpuload_fr_FR.ts | 4 +- plugin-cpuload/translations/cpuload_hr.ts | 4 +- .../translations/cpuload_hu.desktop | 2 +- plugin-cpuload/translations/cpuload_hu.ts | 4 +- plugin-cpuload/translations/cpuload_hu_HU.ts | 4 +- .../translations/cpuload_it_IT.desktop | 2 +- plugin-cpuload/translations/cpuload_it_IT.ts | 8 +- .../translations/cpuload_ja.desktop | 2 +- plugin-cpuload/translations/cpuload_ja.ts | 4 +- .../translations/cpuload_lt.desktop | 2 +- plugin-cpuload/translations/cpuload_lt.ts | 4 +- .../translations/cpuload_nl.desktop | 2 +- plugin-cpuload/translations/cpuload_nl.ts | 8 +- .../translations/cpuload_pl_PL.desktop | 2 +- plugin-cpuload/translations/cpuload_pl_PL.ts | 8 +- .../translations/cpuload_pt.desktop | 2 +- plugin-cpuload/translations/cpuload_pt.ts | 6 +- .../translations/cpuload_pt_BR.desktop | 2 +- plugin-cpuload/translations/cpuload_pt_BR.ts | 6 +- .../translations/cpuload_ro_RO.desktop | 2 +- plugin-cpuload/translations/cpuload_ro_RO.ts | 8 +- .../translations/cpuload_ru.desktop | 2 +- plugin-cpuload/translations/cpuload_ru.ts | 4 +- .../translations/cpuload_ru_RU.desktop | 2 +- plugin-cpuload/translations/cpuload_ru_RU.ts | 4 +- .../translations/cpuload_sl.desktop | 2 +- plugin-cpuload/translations/cpuload_sl.ts | 6 +- .../translations/cpuload_th_TH.desktop | 2 +- plugin-cpuload/translations/cpuload_th_TH.ts | 8 +- .../translations/cpuload_tr.desktop | 2 +- plugin-cpuload/translations/cpuload_tr.ts | 8 +- .../translations/cpuload_uk.desktop | 2 +- plugin-cpuload/translations/cpuload_uk.ts | 8 +- .../translations/cpuload_zh_CN.desktop | 2 +- plugin-cpuload/translations/cpuload_zh_CN.ts | 8 +- .../translations/cpuload_zh_TW.desktop | 2 +- plugin-cpuload/translations/cpuload_zh_TW.ts | 8 +- plugin-desktopswitch/desktopswitch.cpp | 6 +- plugin-desktopswitch/desktopswitch.h | 16 +- .../desktopswitchconfiguration.cpp | 2 +- .../desktopswitchconfiguration.h | 4 +- .../resources/desktopswitch.desktop.in | 2 +- .../translations/desktopswitch_ar.desktop | 2 +- .../translations/desktopswitch_cs.desktop | 2 +- .../translations/desktopswitch_cs_CZ.desktop | 2 +- .../translations/desktopswitch_da.desktop | 2 +- .../translations/desktopswitch_da_DK.desktop | 2 +- .../translations/desktopswitch_el.desktop | 12 + ...topswitch_el_GR.ts => desktopswitch_el.ts} | 14 +- .../translations/desktopswitch_el_GR.desktop | 12 - .../translations/desktopswitch_eo.desktop | 2 +- .../translations/desktopswitch_es.desktop | 2 +- .../translations/desktopswitch_es_VE.desktop | 2 +- .../translations/desktopswitch_eu.desktop | 2 +- .../translations/desktopswitch_fi.desktop | 2 +- .../translations/desktopswitch_fr_FR.desktop | 2 +- .../translations/desktopswitch_hu.desktop | 2 +- .../translations/desktopswitch_ia.desktop | 2 +- .../translations/desktopswitch_id_ID.desktop | 2 +- .../translations/desktopswitch_it_IT.desktop | 2 +- .../translations/desktopswitch_ja.desktop | 2 +- .../translations/desktopswitch_ko.desktop | 2 +- .../translations/desktopswitch_lt.desktop | 2 +- .../translations/desktopswitch_nl.desktop | 2 +- .../translations/desktopswitch_pl.desktop | 2 +- .../translations/desktopswitch_pl_PL.desktop | 2 +- .../translations/desktopswitch_pt.desktop | 2 +- .../translations/desktopswitch_pt_BR.desktop | 2 +- .../translations/desktopswitch_ro_RO.desktop | 2 +- .../translations/desktopswitch_ru.desktop | 2 +- .../translations/desktopswitch_ru_RU.desktop | 2 +- .../translations/desktopswitch_sk.desktop | 2 +- .../translations/desktopswitch_sl.desktop | 2 +- .../translations/desktopswitch_sr.desktop | 2 +- .../desktopswitch_sr@latin.desktop | 2 +- .../translations/desktopswitch_th_TH.desktop | 2 +- .../translations/desktopswitch_tr.desktop | 2 +- .../translations/desktopswitch_uk.desktop | 2 +- .../desktopswitch_zh_CN.GB2312.desktop | 2 +- .../translations/desktopswitch_zh_CN.desktop | 2 +- .../translations/desktopswitch_zh_TW.desktop | 2 +- plugin-directorymenu/directorymenu.cpp | 12 +- plugin-directorymenu/directorymenu.h | 12 +- .../directorymenuconfiguration.h | 2 +- .../resources/directorymenu.desktop.in | 2 +- .../translations/directorymenu_el.desktop | 2 + .../translations/directorymenu_el.ts | 65 +++ .../translations/directorymenu_hu.desktop | 2 +- plugin-dom/domplugin.cpp | 4 +- plugin-dom/domplugin.h | 12 +- plugin-dom/resources/dom.desktop.in | 2 +- plugin-dom/translations/dom_el.desktop | 2 + plugin-dom/translations/dom_el.ts | 38 ++ plugin-dom/translations/dom_hu.desktop | 2 +- plugin-dom/translations/dom_ja.desktop | 2 +- plugin-dom/translations/dom_pt.desktop | 2 +- plugin-dom/translations/dom_ru.desktop | 2 +- plugin-dom/translations/dom_ru_RU.desktop | 2 +- plugin-kbindicator/CMakeLists.txt | 1 - plugin-kbindicator/kbindicator-plugin.cpp | 34 +- .../resources/kbindicator.desktop.in | 2 +- plugin-kbindicator/src/content.cpp | 28 +- plugin-kbindicator/src/content.h | 26 ++ plugin-kbindicator/src/controls.h | 26 ++ plugin-kbindicator/src/kbdinfo.h | 26 ++ plugin-kbindicator/src/kbdkeeper.cpp | 26 ++ plugin-kbindicator/src/kbdkeeper.h | 26 ++ plugin-kbindicator/src/kbdlayout.h | 26 ++ plugin-kbindicator/src/kbdstate.cpp | 30 +- plugin-kbindicator/src/kbdstate.h | 32 +- plugin-kbindicator/src/kbdstateconfig.cpp | 38 +- plugin-kbindicator/src/kbdstateconfig.h | 26 ++ plugin-kbindicator/src/kbdstateconfig.ui | 95 +---- plugin-kbindicator/src/kbdwatcher.cpp | 26 ++ plugin-kbindicator/src/kbdwatcher.h | 26 ++ plugin-kbindicator/src/settings.cpp | 36 +- plugin-kbindicator/src/settings.h | 31 +- plugin-kbindicator/src/x11/kbdlayout.cpp | 28 ++ plugin-kbindicator/src/x11/kbdlayout.h | 26 ++ .../translations/kbindicator_el.desktop | 2 + .../translations/kbindicator_el.ts | 80 ++++ plugin-mainmenu/lxqtmainmenu.cpp | 41 +- plugin-mainmenu/lxqtmainmenu.h | 19 +- plugin-mainmenu/lxqtmainmenuconfiguration.cpp | 26 +- plugin-mainmenu/lxqtmainmenuconfiguration.h | 12 +- plugin-mainmenu/lxqtmainmenuconfiguration.ui | 4 +- plugin-mainmenu/resources/mainmenu.desktop.in | 2 +- plugin-mainmenu/translations/mainmenu.ts | 4 +- .../translations/mainmenu_ar.desktop | 2 +- plugin-mainmenu/translations/mainmenu_ar.ts | 6 +- .../translations/mainmenu_cs.desktop | 2 +- plugin-mainmenu/translations/mainmenu_cs.ts | 6 +- .../translations/mainmenu_cs_CZ.desktop | 2 +- .../translations/mainmenu_cs_CZ.ts | 6 +- .../translations/mainmenu_da.desktop | 2 +- plugin-mainmenu/translations/mainmenu_da.ts | 6 +- .../translations/mainmenu_da_DK.desktop | 2 +- .../translations/mainmenu_da_DK.ts | 8 +- plugin-mainmenu/translations/mainmenu_de.ts | 4 +- .../translations/mainmenu_el.desktop | 2 + .../{mainmenu_el_GR.ts => mainmenu_el.ts} | 28 +- .../translations/mainmenu_el_GR.desktop | 12 - .../translations/mainmenu_eo.desktop | 2 +- plugin-mainmenu/translations/mainmenu_eo.ts | 8 +- .../translations/mainmenu_es.desktop | 2 +- plugin-mainmenu/translations/mainmenu_es.ts | 8 +- .../translations/mainmenu_es_UY.ts | 8 +- .../translations/mainmenu_es_VE.desktop | 2 +- .../translations/mainmenu_es_VE.ts | 8 +- .../translations/mainmenu_eu.desktop | 2 +- plugin-mainmenu/translations/mainmenu_eu.ts | 8 +- .../translations/mainmenu_fi.desktop | 2 +- plugin-mainmenu/translations/mainmenu_fi.ts | 8 +- .../translations/mainmenu_fr_FR.desktop | 2 +- .../translations/mainmenu_fr_FR.ts | 8 +- plugin-mainmenu/translations/mainmenu_hr.ts | 4 +- .../translations/mainmenu_hu.desktop | 2 +- plugin-mainmenu/translations/mainmenu_hu.ts | 8 +- .../translations/mainmenu_hu_HU.ts | 8 +- .../translations/mainmenu_ia.desktop | 2 +- plugin-mainmenu/translations/mainmenu_ia.ts | 4 +- .../translations/mainmenu_id_ID.desktop | 2 +- .../translations/mainmenu_id_ID.ts | 4 +- .../translations/mainmenu_it_IT.desktop | 2 +- .../translations/mainmenu_it_IT.ts | 8 +- .../translations/mainmenu_ja.desktop | 2 +- plugin-mainmenu/translations/mainmenu_ja.ts | 4 +- .../translations/mainmenu_ko.desktop | 2 +- plugin-mainmenu/translations/mainmenu_ko.ts | 4 +- .../translations/mainmenu_lt.desktop | 2 +- plugin-mainmenu/translations/mainmenu_lt.ts | 8 +- .../translations/mainmenu_nl.desktop | 2 +- plugin-mainmenu/translations/mainmenu_nl.ts | 8 +- .../translations/mainmenu_pl.desktop | 2 +- .../translations/mainmenu_pl_PL.desktop | 2 +- .../translations/mainmenu_pl_PL.ts | 8 +- .../translations/mainmenu_pt.desktop | 2 +- plugin-mainmenu/translations/mainmenu_pt.ts | 8 +- .../translations/mainmenu_pt_BR.desktop | 2 +- .../translations/mainmenu_pt_BR.ts | 8 +- .../translations/mainmenu_ro_RO.desktop | 2 +- .../translations/mainmenu_ro_RO.ts | 8 +- .../translations/mainmenu_ru.desktop | 2 +- plugin-mainmenu/translations/mainmenu_ru.ts | 4 +- .../translations/mainmenu_ru_RU.desktop | 2 +- .../translations/mainmenu_ru_RU.ts | 4 +- .../translations/mainmenu_sk.desktop | 2 +- .../translations/mainmenu_sk_SK.ts | 8 +- .../translations/mainmenu_sl.desktop | 2 +- plugin-mainmenu/translations/mainmenu_sl.ts | 6 +- .../translations/mainmenu_sr.desktop | 2 +- .../translations/mainmenu_sr@latin.desktop | 2 +- .../translations/mainmenu_sr@latin.ts | 4 +- .../translations/mainmenu_sr_BA.ts | 6 +- .../translations/mainmenu_sr_RS.ts | 6 +- .../translations/mainmenu_th_TH.desktop | 2 +- .../translations/mainmenu_th_TH.ts | 8 +- .../translations/mainmenu_tr.desktop | 2 +- plugin-mainmenu/translations/mainmenu_tr.ts | 8 +- .../translations/mainmenu_uk.desktop | 2 +- plugin-mainmenu/translations/mainmenu_uk.ts | 8 +- .../mainmenu_zh_CN.GB2312.desktop | 2 +- .../translations/mainmenu_zh_CN.desktop | 2 +- .../translations/mainmenu_zh_CN.ts | 8 +- .../translations/mainmenu_zh_TW.desktop | 2 +- .../translations/mainmenu_zh_TW.ts | 8 +- plugin-mount/actions/deviceaction.cpp | 20 +- plugin-mount/actions/deviceaction.h | 24 +- plugin-mount/actions/deviceaction_info.cpp | 20 +- plugin-mount/actions/deviceaction_info.h | 18 +- plugin-mount/actions/deviceaction_menu.cpp | 18 +- plugin-mount/actions/deviceaction_menu.h | 18 +- plugin-mount/actions/deviceaction_nothing.cpp | 18 +- plugin-mount/actions/deviceaction_nothing.h | 18 +- plugin-mount/configuration.cpp | 2 +- plugin-mount/configuration.h | 2 +- plugin-mount/lxqtmountplugin.cpp | 12 +- plugin-mount/lxqtmountplugin.h | 18 +- plugin-mount/menudiskitem.cpp | 4 +- plugin-mount/popup.cpp | 4 +- plugin-mount/popup.h | 6 +- plugin-mount/resources/mount.desktop.in | 2 +- plugin-mount/translations/mount_ar.desktop | 2 +- plugin-mount/translations/mount_ar.ts | 4 +- plugin-mount/translations/mount_cs.desktop | 2 +- plugin-mount/translations/mount_cs.ts | 4 +- plugin-mount/translations/mount_cs_CZ.desktop | 2 +- plugin-mount/translations/mount_cs_CZ.ts | 4 +- plugin-mount/translations/mount_da.desktop | 2 +- plugin-mount/translations/mount_da.ts | 4 +- plugin-mount/translations/mount_da_DK.desktop | 2 +- plugin-mount/translations/mount_da_DK.ts | 4 +- plugin-mount/translations/mount_el.desktop | 2 + .../{mount_el_GR.ts => mount_el.ts} | 24 +- plugin-mount/translations/mount_el_GR.desktop | 12 - plugin-mount/translations/mount_eo.desktop | 2 +- plugin-mount/translations/mount_eo.ts | 6 +- plugin-mount/translations/mount_es.desktop | 2 +- plugin-mount/translations/mount_es.ts | 6 +- plugin-mount/translations/mount_es_UY.ts | 6 +- plugin-mount/translations/mount_es_VE.desktop | 2 +- plugin-mount/translations/mount_es_VE.ts | 6 +- plugin-mount/translations/mount_eu.desktop | 2 +- plugin-mount/translations/mount_eu.ts | 6 +- plugin-mount/translations/mount_fi.desktop | 2 +- plugin-mount/translations/mount_fi.ts | 6 +- plugin-mount/translations/mount_fr_FR.desktop | 2 +- plugin-mount/translations/mount_fr_FR.ts | 4 +- plugin-mount/translations/mount_hu.desktop | 2 +- plugin-mount/translations/mount_hu.ts | 6 +- plugin-mount/translations/mount_hu_HU.ts | 6 +- plugin-mount/translations/mount_ia.desktop | 2 +- plugin-mount/translations/mount_ia.ts | 2 +- plugin-mount/translations/mount_id_ID.desktop | 2 +- plugin-mount/translations/mount_id_ID.ts | 2 +- plugin-mount/translations/mount_it_IT.desktop | 2 +- plugin-mount/translations/mount_it_IT.ts | 6 +- plugin-mount/translations/mount_ja.desktop | 2 +- plugin-mount/translations/mount_ja.ts | 2 +- plugin-mount/translations/mount_ko.desktop | 2 +- plugin-mount/translations/mount_ko.ts | 2 +- plugin-mount/translations/mount_lt.desktop | 2 +- plugin-mount/translations/mount_lt.ts | 6 +- plugin-mount/translations/mount_nl.desktop | 2 +- plugin-mount/translations/mount_nl.ts | 6 +- plugin-mount/translations/mount_pl.desktop | 2 +- plugin-mount/translations/mount_pl_PL.desktop | 2 +- plugin-mount/translations/mount_pl_PL.ts | 4 +- plugin-mount/translations/mount_pt.desktop | 2 +- plugin-mount/translations/mount_pt.ts | 6 +- plugin-mount/translations/mount_pt_BR.desktop | 2 +- plugin-mount/translations/mount_pt_BR.ts | 6 +- plugin-mount/translations/mount_ro_RO.desktop | 2 +- plugin-mount/translations/mount_ro_RO.ts | 4 +- plugin-mount/translations/mount_ru.desktop | 2 +- plugin-mount/translations/mount_ru.ts | 2 +- plugin-mount/translations/mount_ru_RU.desktop | 2 +- plugin-mount/translations/mount_ru_RU.ts | 2 +- plugin-mount/translations/mount_sk.desktop | 2 +- plugin-mount/translations/mount_sk_SK.ts | 6 +- plugin-mount/translations/mount_sl.desktop | 2 +- plugin-mount/translations/mount_sl.ts | 4 +- plugin-mount/translations/mount_sr.desktop | 2 +- .../translations/mount_sr@latin.desktop | 2 +- plugin-mount/translations/mount_sr@latin.ts | 2 +- plugin-mount/translations/mount_sr_BA.ts | 4 +- plugin-mount/translations/mount_sr_RS.ts | 4 +- plugin-mount/translations/mount_th_TH.desktop | 2 +- plugin-mount/translations/mount_th_TH.ts | 6 +- plugin-mount/translations/mount_tr.desktop | 2 +- plugin-mount/translations/mount_tr.ts | 6 +- plugin-mount/translations/mount_uk.desktop | 2 +- plugin-mount/translations/mount_uk.ts | 6 +- .../translations/mount_zh_CN.GB2312.desktop | 2 +- plugin-mount/translations/mount_zh_CN.desktop | 2 +- plugin-mount/translations/mount_zh_CN.ts | 6 +- plugin-mount/translations/mount_zh_TW.desktop | 2 +- plugin-mount/translations/mount_zh_TW.ts | 6 +- plugin-networkmonitor/lxqtnetworkmonitor.cpp | 24 +- plugin-networkmonitor/lxqtnetworkmonitor.h | 10 +- .../lxqtnetworkmonitorconfiguration.cpp | 12 +- .../lxqtnetworkmonitorconfiguration.h | 12 +- .../lxqtnetworkmonitorconfiguration.ui | 4 +- .../lxqtnetworkmonitorplugin.cpp | 16 +- .../lxqtnetworkmonitorplugin.h | 20 +- .../resources/networkmonitor.desktop.in | 2 +- .../translations/networkmonitor.ts | 4 +- .../translations/networkmonitor_cs.desktop | 2 +- .../translations/networkmonitor_cs.ts | 6 +- .../translations/networkmonitor_da.desktop | 2 +- .../translations/networkmonitor_da.ts | 8 +- .../translations/networkmonitor_de.ts | 4 +- .../translations/networkmonitor_el.desktop | 15 +- .../translations/networkmonitor_el.ts | 12 +- .../translations/networkmonitor_eo.desktop | 2 +- .../translations/networkmonitor_eo.ts | 4 +- .../translations/networkmonitor_es.desktop | 2 +- .../translations/networkmonitor_es.ts | 8 +- .../translations/networkmonitor_eu.desktop | 2 +- .../translations/networkmonitor_eu.ts | 8 +- .../translations/networkmonitor_fi.desktop | 2 +- .../translations/networkmonitor_fi.ts | 8 +- .../translations/networkmonitor_fr.ts | 4 +- .../translations/networkmonitor_hr.ts | 4 +- .../translations/networkmonitor_hu.desktop | 2 +- .../translations/networkmonitor_hu.ts | 4 +- .../translations/networkmonitor_it.desktop | 2 +- .../translations/networkmonitor_it.ts | 8 +- .../translations/networkmonitor_ja.desktop | 2 +- .../translations/networkmonitor_ja.ts | 4 +- .../translations/networkmonitor_nl.desktop | 2 +- .../translations/networkmonitor_nl.ts | 8 +- .../translations/networkmonitor_pl.ts | 8 +- .../translations/networkmonitor_pt.desktop | 2 +- .../translations/networkmonitor_pt.ts | 8 +- .../translations/networkmonitor_pt_BR.desktop | 2 +- .../translations/networkmonitor_pt_BR.ts | 6 +- .../translations/networkmonitor_ro_RO.desktop | 2 +- .../translations/networkmonitor_ro_RO.ts | 8 +- .../translations/networkmonitor_ru.desktop | 2 +- .../translations/networkmonitor_ru.ts | 4 +- .../networkmonitor_sr@latin.desktop | 2 +- .../translations/networkmonitor_th_TH.desktop | 2 +- .../translations/networkmonitor_th_TH.ts | 8 +- .../translations/networkmonitor_tr.desktop | 2 +- .../translations/networkmonitor_tr.ts | 8 +- .../translations/networkmonitor_uk.desktop | 2 +- .../translations/networkmonitor_uk.ts | 8 +- .../translations/networkmonitor_zh_CN.desktop | 2 +- .../translations/networkmonitor_zh_CN.ts | 8 +- .../translations/networkmonitor_zh_TW.desktop | 2 +- .../translations/networkmonitor_zh_TW.ts | 8 +- plugin-quicklaunch/lxqtquicklaunch.cpp | 32 +- plugin-quicklaunch/lxqtquicklaunch.h | 12 +- plugin-quicklaunch/lxqtquicklaunchplugin.cpp | 12 +- plugin-quicklaunch/lxqtquicklaunchplugin.h | 18 +- plugin-quicklaunch/quicklaunchaction.h | 2 +- plugin-quicklaunch/quicklaunchbutton.cpp | 2 +- .../resources/quicklaunch.desktop.in | 2 +- .../translations/quicklaunch.ts | 2 +- .../translations/quicklaunch_ar.desktop | 2 +- .../translations/quicklaunch_ar.ts | 2 +- .../translations/quicklaunch_cs.desktop | 2 +- .../translations/quicklaunch_cs.ts | 2 +- .../translations/quicklaunch_cs_CZ.desktop | 2 +- .../translations/quicklaunch_cs_CZ.ts | 2 +- .../translations/quicklaunch_da.desktop | 2 +- .../translations/quicklaunch_da.ts | 2 +- .../translations/quicklaunch_da_DK.desktop | 2 +- .../translations/quicklaunch_da_DK.ts | 2 +- .../translations/quicklaunch_de.ts | 2 +- .../translations/quicklaunch_el.desktop | 2 + ...quicklaunch_el_GR.ts => quicklaunch_el.ts} | 7 +- .../translations/quicklaunch_el_GR.desktop | 12 - .../translations/quicklaunch_eo.desktop | 2 +- .../translations/quicklaunch_eo.ts | 2 +- .../translations/quicklaunch_es.desktop | 2 +- .../translations/quicklaunch_es.ts | 2 +- .../translations/quicklaunch_es_VE.desktop | 2 +- .../translations/quicklaunch_es_VE.ts | 2 +- .../translations/quicklaunch_eu.desktop | 2 +- .../translations/quicklaunch_eu.ts | 2 +- .../translations/quicklaunch_fi.desktop | 2 +- .../translations/quicklaunch_fi.ts | 2 +- .../translations/quicklaunch_fr_FR.desktop | 2 +- .../translations/quicklaunch_fr_FR.ts | 2 +- .../translations/quicklaunch_hu.desktop | 2 +- .../translations/quicklaunch_hu.ts | 2 +- .../translations/quicklaunch_hu_HU.ts | 2 +- .../translations/quicklaunch_ia.desktop | 2 +- .../translations/quicklaunch_ia.ts | 2 +- .../translations/quicklaunch_id_ID.desktop | 2 +- .../translations/quicklaunch_id_ID.ts | 2 +- .../translations/quicklaunch_it_IT.desktop | 2 +- .../translations/quicklaunch_it_IT.ts | 2 +- .../translations/quicklaunch_ja.desktop | 2 +- .../translations/quicklaunch_ja.ts | 2 +- .../translations/quicklaunch_ko.desktop | 2 +- .../translations/quicklaunch_ko.ts | 2 +- .../translations/quicklaunch_lt.desktop | 2 +- .../translations/quicklaunch_lt.ts | 2 +- .../translations/quicklaunch_nl.desktop | 2 +- .../translations/quicklaunch_nl.ts | 2 +- .../translations/quicklaunch_pl.desktop | 2 +- .../translations/quicklaunch_pl.ts | 2 +- .../translations/quicklaunch_pl_PL.desktop | 2 +- .../translations/quicklaunch_pl_PL.ts | 2 +- .../translations/quicklaunch_pt.desktop | 2 +- .../translations/quicklaunch_pt.ts | 2 +- .../translations/quicklaunch_pt_BR.desktop | 2 +- .../translations/quicklaunch_pt_BR.ts | 2 +- .../translations/quicklaunch_ro_RO.desktop | 2 +- .../translations/quicklaunch_ro_RO.ts | 2 +- .../translations/quicklaunch_ru.desktop | 2 +- .../translations/quicklaunch_ru.ts | 2 +- .../translations/quicklaunch_ru_RU.desktop | 2 +- .../translations/quicklaunch_ru_RU.ts | 2 +- .../translations/quicklaunch_sk.desktop | 2 +- .../translations/quicklaunch_sk_SK.ts | 2 +- .../translations/quicklaunch_sl.desktop | 2 +- .../translations/quicklaunch_sl.ts | 2 +- .../translations/quicklaunch_sr.desktop | 2 +- .../translations/quicklaunch_sr@latin.desktop | 2 +- .../translations/quicklaunch_sr@latin.ts | 2 +- .../translations/quicklaunch_sr_BA.ts | 2 +- .../translations/quicklaunch_sr_RS.ts | 2 +- .../translations/quicklaunch_th_TH.desktop | 2 +- .../translations/quicklaunch_th_TH.ts | 2 +- .../translations/quicklaunch_tr.desktop | 2 +- .../translations/quicklaunch_tr.ts | 2 +- .../translations/quicklaunch_uk.desktop | 2 +- .../translations/quicklaunch_uk.ts | 2 +- .../quicklaunch_zh_CN.GB2312.desktop | 2 +- .../translations/quicklaunch_zh_CN.desktop | 2 +- .../translations/quicklaunch_zh_CN.ts | 2 +- .../translations/quicklaunch_zh_TW.desktop | 2 +- .../translations/quicklaunch_zh_TW.ts | 2 +- plugin-screensaver/panelscreensaver.cpp | 8 +- plugin-screensaver/panelscreensaver.h | 14 +- .../resources/screensaver.desktop.in | 2 +- .../translations/screensaver_ar.desktop | 2 +- .../translations/screensaver_cs.desktop | 2 +- .../translations/screensaver_cs_CZ.desktop | 2 +- .../translations/screensaver_da.desktop | 2 +- .../translations/screensaver_da_DK.desktop | 2 +- .../translations/screensaver_el.desktop | 2 + ...screensaver_el_GR.ts => screensaver_el.ts} | 6 +- .../translations/screensaver_el_GR.desktop | 12 - .../translations/screensaver_eo.desktop | 2 +- .../translations/screensaver_es.desktop | 2 +- .../translations/screensaver_es_VE.desktop | 2 +- .../translations/screensaver_eu.desktop | 2 +- .../translations/screensaver_fi.desktop | 2 +- .../translations/screensaver_fr_FR.desktop | 2 +- .../translations/screensaver_hu.desktop | 2 +- .../translations/screensaver_ia.desktop | 2 +- .../translations/screensaver_id_ID.desktop | 2 +- .../translations/screensaver_it_IT.desktop | 2 +- .../translations/screensaver_ja.desktop | 2 +- .../translations/screensaver_ko.desktop | 2 +- .../translations/screensaver_lt.desktop | 2 +- .../translations/screensaver_nl.desktop | 2 +- .../translations/screensaver_pl.desktop | 2 +- .../translations/screensaver_pl_PL.desktop | 2 +- .../translations/screensaver_pt.desktop | 2 +- .../translations/screensaver_pt_BR.desktop | 2 +- .../translations/screensaver_ro_RO.desktop | 2 +- .../translations/screensaver_ru.desktop | 2 +- .../translations/screensaver_ru_RU.desktop | 2 +- .../translations/screensaver_sk.desktop | 2 +- .../translations/screensaver_sl.desktop | 2 +- .../translations/screensaver_sr.desktop | 2 +- .../translations/screensaver_sr@latin.desktop | 2 +- .../translations/screensaver_th_TH.desktop | 2 +- .../translations/screensaver_tr.desktop | 2 +- .../translations/screensaver_uk.desktop | 2 +- .../screensaver_zh_CN.GB2312.desktop | 2 +- .../translations/screensaver_zh_CN.desktop | 2 +- .../translations/screensaver_zh_TW.desktop | 2 +- plugin-sensors/lxqtsensors.cpp | 22 +- plugin-sensors/lxqtsensors.h | 10 +- plugin-sensors/lxqtsensorsconfiguration.cpp | 18 +- plugin-sensors/lxqtsensorsconfiguration.h | 12 +- plugin-sensors/lxqtsensorsconfiguration.ui | 8 +- plugin-sensors/lxqtsensorsplugin.cpp | 18 +- plugin-sensors/lxqtsensorsplugin.h | 20 +- plugin-sensors/resources/sensors.desktop.in | 2 +- plugin-sensors/translations/sensors.ts | 2 +- .../translations/sensors_ar.desktop | 2 +- .../translations/sensors_ca.desktop | 2 +- plugin-sensors/translations/sensors_ca.ts | 2 +- .../translations/sensors_cs.desktop | 2 +- plugin-sensors/translations/sensors_cs.ts | 4 +- .../translations/sensors_cs_CZ.desktop | 2 +- plugin-sensors/translations/sensors_cs_CZ.ts | 4 +- .../translations/sensors_da.desktop | 2 +- .../translations/sensors_da_DK.desktop | 2 +- plugin-sensors/translations/sensors_da_DK.ts | 6 +- plugin-sensors/translations/sensors_de.ts | 2 +- .../translations/sensors_el.desktop | 2 + .../{sensors_el_GR.ts => sensors_el.ts} | 14 +- .../translations/sensors_el_GR.desktop | 10 - .../translations/sensors_eo.desktop | 2 +- .../translations/sensors_es.desktop | 2 +- plugin-sensors/translations/sensors_es.ts | 6 +- .../translations/sensors_es_VE.desktop | 2 +- plugin-sensors/translations/sensors_es_VE.ts | 6 +- .../translations/sensors_eu.desktop | 2 +- plugin-sensors/translations/sensors_eu.ts | 6 +- .../translations/sensors_fi.desktop | 2 +- plugin-sensors/translations/sensors_fi.ts | 2 +- .../translations/sensors_fr_FR.desktop | 2 +- plugin-sensors/translations/sensors_fr_FR.ts | 2 +- .../translations/sensors_hu.desktop | 2 +- plugin-sensors/translations/sensors_hu.ts | 2 +- plugin-sensors/translations/sensors_hu_HU.ts | 2 +- .../translations/sensors_it_IT.desktop | 2 +- plugin-sensors/translations/sensors_it_IT.ts | 6 +- .../translations/sensors_ja.desktop | 2 +- plugin-sensors/translations/sensors_ja.ts | 2 +- .../translations/sensors_lt.desktop | 2 +- .../translations/sensors_nl.desktop | 2 +- .../translations/sensors_pl_PL.desktop | 2 +- plugin-sensors/translations/sensors_pl_PL.ts | 6 +- .../translations/sensors_pt.desktop | 2 +- plugin-sensors/translations/sensors_pt.ts | 6 +- .../translations/sensors_pt_BR.desktop | 2 +- plugin-sensors/translations/sensors_pt_BR.ts | 4 +- .../translations/sensors_ro_RO.desktop | 2 +- plugin-sensors/translations/sensors_ro_RO.ts | 2 +- .../translations/sensors_ru.desktop | 2 +- plugin-sensors/translations/sensors_ru.ts | 2 +- .../translations/sensors_ru_RU.desktop | 2 +- plugin-sensors/translations/sensors_ru_RU.ts | 2 +- .../translations/sensors_sl.desktop | 2 +- .../translations/sensors_th_TH.desktop | 2 +- plugin-sensors/translations/sensors_th_TH.ts | 6 +- .../translations/sensors_tr.desktop | 2 +- .../translations/sensors_uk.desktop | 2 +- plugin-sensors/translations/sensors_uk.ts | 6 +- .../translations/sensors_zh_CN.desktop | 2 +- plugin-sensors/translations/sensors_zh_CN.ts | 6 +- .../translations/sensors_zh_TW.desktop | 2 +- plugin-sensors/translations/sensors_zh_TW.ts | 6 +- .../resources/showdesktop.desktop.in | 2 +- plugin-showdesktop/showdesktop.cpp | 6 +- plugin-showdesktop/showdesktop.h | 10 +- .../translations/showdesktop_ar.desktop | 2 +- .../translations/showdesktop_cs.desktop | 2 +- .../translations/showdesktop_cs_CZ.desktop | 2 +- .../translations/showdesktop_da.desktop | 2 +- .../translations/showdesktop_da_DK.desktop | 2 +- .../translations/showdesktop_el.desktop | 2 + ...showdesktop_el_GR.ts => showdesktop_el.ts} | 4 +- .../translations/showdesktop_el_GR.desktop | 12 - .../translations/showdesktop_eo.desktop | 2 +- .../translations/showdesktop_es.desktop | 2 +- .../translations/showdesktop_es_VE.desktop | 2 +- .../translations/showdesktop_eu.desktop | 2 +- .../translations/showdesktop_fi.desktop | 2 +- .../translations/showdesktop_fr_FR.desktop | 2 +- .../translations/showdesktop_hu.desktop | 2 +- .../translations/showdesktop_ia.desktop | 2 +- .../translations/showdesktop_id_ID.desktop | 2 +- .../translations/showdesktop_it_IT.desktop | 2 +- .../translations/showdesktop_ja.desktop | 2 +- .../translations/showdesktop_ko.desktop | 2 +- .../translations/showdesktop_lt.desktop | 2 +- .../translations/showdesktop_nl.desktop | 2 +- .../translations/showdesktop_pl.desktop | 2 +- .../translations/showdesktop_pl_PL.desktop | 2 +- .../translations/showdesktop_pt.desktop | 2 +- .../translations/showdesktop_pt_BR.desktop | 2 +- .../translations/showdesktop_ro_RO.desktop | 2 +- .../translations/showdesktop_ru.desktop | 2 +- .../translations/showdesktop_ru_RU.desktop | 2 +- .../translations/showdesktop_sk.desktop | 2 +- .../translations/showdesktop_sl.desktop | 2 +- .../translations/showdesktop_sr.desktop | 2 +- .../translations/showdesktop_sr@latin.desktop | 2 +- .../translations/showdesktop_th_TH.desktop | 2 +- .../translations/showdesktop_tr.desktop | 2 +- .../translations/showdesktop_uk.desktop | 2 +- .../showdesktop_zh_CN.GB2312.desktop | 2 +- .../translations/showdesktop_zh_CN.desktop | 2 +- .../translations/showdesktop_zh_TW.desktop | 2 +- plugin-spacer/resources/spacer.desktop.in | 2 +- plugin-spacer/spacer.cpp | 6 +- plugin-spacer/spacer.h | 14 +- plugin-spacer/spacerconfiguration.cpp | 2 +- plugin-spacer/spacerconfiguration.h | 2 +- plugin-spacer/translations/spacer_el.desktop | 2 + plugin-spacer/translations/spacer_el.ts | 37 ++ plugin-statusnotifier/dbustypes.cpp | 2 +- plugin-statusnotifier/dbustypes.h | 2 +- .../resources/statusnotifier.desktop.in | 2 +- plugin-statusnotifier/statusnotifier.cpp | 6 +- plugin-statusnotifier/statusnotifier.h | 12 +- .../statusnotifierbutton.cpp | 6 +- plugin-statusnotifier/statusnotifierbutton.h | 8 +- .../statusnotifieriteminterface.cpp | 2 +- .../statusnotifieriteminterface.h | 2 +- .../statusnotifierwatcher.cpp | 2 +- plugin-statusnotifier/statusnotifierwatcher.h | 2 +- .../statusnotifierwidget.cpp | 10 +- plugin-statusnotifier/statusnotifierwidget.h | 6 +- .../translations/statusnotifier_el.desktop | 3 + plugin-sysstat/lxqtsysstat.cpp | 70 ++-- plugin-sysstat/lxqtsysstat.h | 40 +- plugin-sysstat/lxqtsysstatcolours.cpp | 24 +- plugin-sysstat/lxqtsysstatcolours.h | 10 +- plugin-sysstat/lxqtsysstatcolours.ui | 4 +- plugin-sysstat/lxqtsysstatconfiguration.cpp | 100 ++--- plugin-sysstat/lxqtsysstatconfiguration.h | 16 +- plugin-sysstat/lxqtsysstatconfiguration.ui | 8 +- plugin-sysstat/resources/sysstat.desktop.in | 2 +- plugin-sysstat/translations/sysstat.ts | 4 +- plugin-sysstat/translations/sysstat_de.ts | 4 +- .../translations/sysstat_el.desktop | 2 + plugin-sysstat/translations/sysstat_el.ts | 237 +++++++++++ plugin-sysstat/translations/sysstat_hu.ts | 4 +- plugin-sysstat/translations/sysstat_hu_HU.ts | 4 +- .../translations/sysstat_ja.desktop | 2 +- plugin-sysstat/translations/sysstat_ja.ts | 4 +- plugin-sysstat/translations/sysstat_pt.ts | 8 +- .../translations/sysstat_ru.desktop | 2 +- plugin-sysstat/translations/sysstat_ru.ts | 4 +- .../translations/sysstat_ru_RU.desktop | 2 +- plugin-sysstat/translations/sysstat_ru_RU.ts | 4 +- plugin-taskbar/lxqtgrouppopup.cpp | 30 +- plugin-taskbar/lxqtgrouppopup.h | 12 +- plugin-taskbar/lxqttaskbar.cpp | 94 ++--- plugin-taskbar/lxqttaskbar.h | 20 +- plugin-taskbar/lxqttaskbarconfiguration.cpp | 12 +- plugin-taskbar/lxqttaskbarconfiguration.h | 12 +- plugin-taskbar/lxqttaskbarconfiguration.ui | 8 +- plugin-taskbar/lxqttaskbarplugin.cpp | 14 +- plugin-taskbar/lxqttaskbarplugin.h | 16 +- plugin-taskbar/lxqttaskbutton.cpp | 78 ++-- plugin-taskbar/lxqttaskbutton.h | 24 +- plugin-taskbar/lxqttaskgroup.cpp | 124 +++--- plugin-taskbar/lxqttaskgroup.h | 26 +- plugin-taskbar/resources/taskbar.desktop.in | 2 +- plugin-taskbar/translations/taskbar.ts | 6 +- .../translations/taskbar_ar.desktop | 2 +- plugin-taskbar/translations/taskbar_ar.ts | 8 +- .../translations/taskbar_cs.desktop | 2 +- plugin-taskbar/translations/taskbar_cs.ts | 8 +- .../translations/taskbar_cs_CZ.desktop | 2 +- plugin-taskbar/translations/taskbar_cs_CZ.ts | 8 +- .../translations/taskbar_da.desktop | 2 +- plugin-taskbar/translations/taskbar_da.ts | 8 +- .../translations/taskbar_da_DK.desktop | 2 +- plugin-taskbar/translations/taskbar_da_DK.ts | 10 +- plugin-taskbar/translations/taskbar_de.ts | 6 +- .../translations/taskbar_el.desktop | 2 + .../{taskbar_el_GR.ts => taskbar_el.ts} | 50 +-- .../translations/taskbar_el_GR.desktop | 12 - .../translations/taskbar_eo.desktop | 2 +- plugin-taskbar/translations/taskbar_eo.ts | 10 +- .../translations/taskbar_es.desktop | 2 +- plugin-taskbar/translations/taskbar_es.ts | 10 +- .../translations/taskbar_es_VE.desktop | 2 +- plugin-taskbar/translations/taskbar_es_VE.ts | 10 +- .../translations/taskbar_eu.desktop | 2 +- plugin-taskbar/translations/taskbar_eu.ts | 10 +- .../translations/taskbar_fi.desktop | 2 +- plugin-taskbar/translations/taskbar_fi.ts | 10 +- .../translations/taskbar_fr_FR.desktop | 2 +- plugin-taskbar/translations/taskbar_fr_FR.ts | 10 +- .../translations/taskbar_hu.desktop | 2 +- plugin-taskbar/translations/taskbar_hu.ts | 10 +- plugin-taskbar/translations/taskbar_hu_HU.ts | 10 +- .../translations/taskbar_ia.desktop | 2 +- plugin-taskbar/translations/taskbar_ia.ts | 6 +- .../translations/taskbar_id_ID.desktop | 2 +- plugin-taskbar/translations/taskbar_id_ID.ts | 6 +- .../translations/taskbar_it_IT.desktop | 2 +- plugin-taskbar/translations/taskbar_it_IT.ts | 8 +- .../translations/taskbar_ja.desktop | 2 +- plugin-taskbar/translations/taskbar_ja.ts | 6 +- .../translations/taskbar_ko.desktop | 2 +- plugin-taskbar/translations/taskbar_ko.ts | 6 +- .../translations/taskbar_lt.desktop | 2 +- plugin-taskbar/translations/taskbar_lt.ts | 10 +- .../translations/taskbar_nl.desktop | 2 +- plugin-taskbar/translations/taskbar_nl.ts | 10 +- .../translations/taskbar_pl.desktop | 2 +- .../translations/taskbar_pl_PL.desktop | 2 +- plugin-taskbar/translations/taskbar_pl_PL.ts | 10 +- .../translations/taskbar_pt.desktop | 2 +- plugin-taskbar/translations/taskbar_pt.ts | 10 +- .../translations/taskbar_pt_BR.desktop | 2 +- plugin-taskbar/translations/taskbar_pt_BR.ts | 10 +- .../translations/taskbar_ro_RO.desktop | 2 +- plugin-taskbar/translations/taskbar_ro_RO.ts | 6 +- .../translations/taskbar_ru.desktop | 2 +- plugin-taskbar/translations/taskbar_ru.ts | 6 +- .../translations/taskbar_ru_RU.desktop | 2 +- plugin-taskbar/translations/taskbar_ru_RU.ts | 6 +- .../translations/taskbar_sk.desktop | 2 +- plugin-taskbar/translations/taskbar_sk_SK.ts | 10 +- .../translations/taskbar_sl.desktop | 2 +- plugin-taskbar/translations/taskbar_sl.ts | 10 +- .../translations/taskbar_sr.desktop | 2 +- .../translations/taskbar_sr@latin.desktop | 2 +- .../translations/taskbar_sr@latin.ts | 6 +- plugin-taskbar/translations/taskbar_sr_BA.ts | 8 +- plugin-taskbar/translations/taskbar_sr_RS.ts | 8 +- .../translations/taskbar_th_TH.desktop | 2 +- plugin-taskbar/translations/taskbar_th_TH.ts | 10 +- .../translations/taskbar_tr.desktop | 2 +- plugin-taskbar/translations/taskbar_tr.ts | 10 +- .../translations/taskbar_uk.desktop | 2 +- plugin-taskbar/translations/taskbar_uk.ts | 8 +- .../translations/taskbar_zh_CN.GB2312.desktop | 2 +- .../translations/taskbar_zh_CN.desktop | 2 +- plugin-taskbar/translations/taskbar_zh_CN.ts | 10 +- .../translations/taskbar_zh_TW.desktop | 2 +- plugin-taskbar/translations/taskbar_zh_TW.ts | 10 +- plugin-tray/lxqttray.cpp | 26 +- plugin-tray/lxqttray.h | 14 +- plugin-tray/lxqttrayplugin.cpp | 12 +- plugin-tray/lxqttrayplugin.h | 18 +- plugin-tray/resources/tray.desktop.in | 2 +- plugin-tray/translations/tray_ar.desktop | 2 +- plugin-tray/translations/tray_cs.desktop | 2 +- plugin-tray/translations/tray_cs_CZ.desktop | 2 +- plugin-tray/translations/tray_da.desktop | 2 +- plugin-tray/translations/tray_da_DK.desktop | 2 +- plugin-tray/translations/tray_el.desktop | 2 + plugin-tray/translations/tray_el_GR.desktop | 12 - plugin-tray/translations/tray_eo.desktop | 2 +- plugin-tray/translations/tray_es.desktop | 2 +- plugin-tray/translations/tray_es_VE.desktop | 2 +- plugin-tray/translations/tray_eu.desktop | 2 +- plugin-tray/translations/tray_fi.desktop | 2 +- plugin-tray/translations/tray_fr_FR.desktop | 2 +- plugin-tray/translations/tray_hu.desktop | 2 +- plugin-tray/translations/tray_ia.desktop | 2 +- plugin-tray/translations/tray_id_ID.desktop | 2 +- plugin-tray/translations/tray_it_IT.desktop | 2 +- plugin-tray/translations/tray_ja.desktop | 2 +- plugin-tray/translations/tray_ko.desktop | 2 +- plugin-tray/translations/tray_lt.desktop | 2 +- plugin-tray/translations/tray_nl.desktop | 2 +- plugin-tray/translations/tray_pl.desktop | 2 +- plugin-tray/translations/tray_pl_PL.desktop | 2 +- plugin-tray/translations/tray_pt.desktop | 2 +- plugin-tray/translations/tray_pt_BR.desktop | 2 +- plugin-tray/translations/tray_ro_RO.desktop | 2 +- plugin-tray/translations/tray_ru.desktop | 2 +- plugin-tray/translations/tray_ru_RU.desktop | 2 +- plugin-tray/translations/tray_sk.desktop | 2 +- plugin-tray/translations/tray_sl.desktop | 2 +- plugin-tray/translations/tray_sr.desktop | 2 +- .../translations/tray_sr@latin.desktop | 2 +- plugin-tray/translations/tray_th_TH.desktop | 2 +- plugin-tray/translations/tray_tr.desktop | 2 +- plugin-tray/translations/tray_uk.desktop | 2 +- .../translations/tray_zh_CN.GB2312.desktop | 2 +- plugin-tray/translations/tray_zh_CN.desktop | 2 +- plugin-tray/translations/tray_zh_TW.desktop | 2 +- plugin-tray/trayicon.h | 2 +- plugin-volume/lxqtvolume.cpp | 44 +-- plugin-volume/lxqtvolume.h | 24 +- plugin-volume/lxqtvolumeconfiguration.cpp | 26 +- plugin-volume/lxqtvolumeconfiguration.h | 10 +- plugin-volume/lxqtvolumeconfiguration.ui | 8 +- plugin-volume/pulseaudioengine.cpp | 2 +- plugin-volume/resources/volume.desktop.in | 2 +- plugin-volume/translations/volume.ts | 4 +- plugin-volume/translations/volume_ar.ts | 4 +- plugin-volume/translations/volume_cs.desktop | 2 +- plugin-volume/translations/volume_cs.ts | 6 +- .../translations/volume_cs_CZ.desktop | 2 +- plugin-volume/translations/volume_cs_CZ.ts | 6 +- plugin-volume/translations/volume_da.desktop | 2 +- .../translations/volume_da_DK.desktop | 2 +- plugin-volume/translations/volume_da_DK.ts | 8 +- plugin-volume/translations/volume_de.ts | 4 +- plugin-volume/translations/volume_el.desktop | 2 + .../{volume_el_GR.ts => volume_el.ts} | 28 +- .../translations/volume_el_GR.desktop | 12 - plugin-volume/translations/volume_eo.ts | 4 +- plugin-volume/translations/volume_es.desktop | 2 +- plugin-volume/translations/volume_es.ts | 8 +- .../translations/volume_es_VE.desktop | 2 +- plugin-volume/translations/volume_es_VE.ts | 8 +- plugin-volume/translations/volume_eu.desktop | 2 +- plugin-volume/translations/volume_eu.ts | 8 +- plugin-volume/translations/volume_fi.desktop | 2 +- plugin-volume/translations/volume_fi.ts | 8 +- plugin-volume/translations/volume_fr_FR.ts | 4 +- plugin-volume/translations/volume_hu.desktop | 2 +- plugin-volume/translations/volume_hu.ts | 4 +- plugin-volume/translations/volume_hu_HU.ts | 4 +- .../translations/volume_it_IT.desktop | 2 +- plugin-volume/translations/volume_it_IT.ts | 8 +- plugin-volume/translations/volume_ja.desktop | 2 +- plugin-volume/translations/volume_ja.ts | 4 +- plugin-volume/translations/volume_lt.ts | 4 +- plugin-volume/translations/volume_nl.ts | 8 +- .../translations/volume_pl_PL.desktop | 2 +- plugin-volume/translations/volume_pl_PL.ts | 8 +- plugin-volume/translations/volume_pt.desktop | 2 +- plugin-volume/translations/volume_pt.ts | 8 +- .../translations/volume_pt_BR.desktop | 2 +- plugin-volume/translations/volume_pt_BR.ts | 6 +- .../translations/volume_ro_RO.desktop | 2 +- plugin-volume/translations/volume_ro_RO.ts | 8 +- plugin-volume/translations/volume_ru.desktop | 2 +- plugin-volume/translations/volume_ru.ts | 4 +- .../translations/volume_ru_RU.desktop | 2 +- plugin-volume/translations/volume_ru_RU.ts | 4 +- plugin-volume/translations/volume_sl.ts | 6 +- .../translations/volume_th_TH.desktop | 2 +- plugin-volume/translations/volume_th_TH.ts | 8 +- plugin-volume/translations/volume_uk.desktop | 2 +- plugin-volume/translations/volume_uk.ts | 8 +- .../translations/volume_zh_CN.desktop | 2 +- plugin-volume/translations/volume_zh_CN.ts | 8 +- .../translations/volume_zh_TW.desktop | 2 +- plugin-volume/translations/volume_zh_TW.ts | 8 +- plugin-volume/volumebutton.cpp | 2 +- plugin-volume/volumebutton.h | 12 +- plugin-worldclock/lxqtworldclock.cpp | 56 +-- plugin-worldclock/lxqtworldclock.h | 26 +- .../lxqtworldclockconfiguration.cpp | 50 +-- .../lxqtworldclockconfiguration.h | 20 +- .../lxqtworldclockconfiguration.ui | 8 +- ...xqtworldclockconfigurationmanualformat.cpp | 10 +- .../lxqtworldclockconfigurationmanualformat.h | 10 +- ...lxqtworldclockconfigurationmanualformat.ui | 8 +- .../lxqtworldclockconfigurationtimezones.cpp | 16 +- .../lxqtworldclockconfigurationtimezones.h | 10 +- .../lxqtworldclockconfigurationtimezones.ui | 8 +- .../resources/worldclock.desktop.in | 2 +- plugin-worldclock/translations/worldclock.ts | 8 +- .../translations/worldclock_de.ts | 8 +- .../translations/worldclock_el.desktop | 2 + .../translations/worldclock_el.ts | 370 ++++++++++++++++++ .../translations/worldclock_hu.ts | 8 +- .../translations/worldclock_hu_HU.ts | 8 +- .../translations/worldclock_ja.desktop | 2 +- .../translations/worldclock_ja.ts | 8 +- .../translations/worldclock_pt.ts | 8 +- .../translations/worldclock_ru.desktop | 2 +- .../translations/worldclock_ru.ts | 8 +- .../translations/worldclock_ru_RU.desktop | 2 +- .../translations/worldclock_ru_RU.ts | 8 +- 1060 files changed, 4478 insertions(+), 3287 deletions(-) rename panel/translations/{lxqt-panel_el_GR.ts => lxqt-panel_el.ts} (72%) rename plugin-clock/translations/{clock_el_GR.desktop => clock_el.desktop} (59%) rename plugin-clock/translations/{clock_el_GR.ts => clock_el.ts} (67%) create mode 100644 plugin-colorpicker/translations/colorpicker_el.desktop delete mode 100644 plugin-colorpicker/translations/colorpicker_el_GR.desktop create mode 100644 plugin-cpuload/translations/cpuload_el.desktop rename plugin-cpuload/translations/{cpuload_el_GR.ts => cpuload_el.ts} (82%) delete mode 100644 plugin-cpuload/translations/cpuload_el_GR.desktop create mode 100644 plugin-desktopswitch/translations/desktopswitch_el.desktop rename plugin-desktopswitch/translations/{desktopswitch_el_GR.ts => desktopswitch_el.ts} (72%) delete mode 100644 plugin-desktopswitch/translations/desktopswitch_el_GR.desktop create mode 100644 plugin-directorymenu/translations/directorymenu_el.desktop create mode 100644 plugin-directorymenu/translations/directorymenu_el.ts create mode 100644 plugin-dom/translations/dom_el.desktop create mode 100644 plugin-dom/translations/dom_el.ts create mode 100644 plugin-kbindicator/translations/kbindicator_el.desktop create mode 100644 plugin-kbindicator/translations/kbindicator_el.ts create mode 100644 plugin-mainmenu/translations/mainmenu_el.desktop rename plugin-mainmenu/translations/{mainmenu_el_GR.ts => mainmenu_el.ts} (78%) delete mode 100644 plugin-mainmenu/translations/mainmenu_el_GR.desktop create mode 100644 plugin-mount/translations/mount_el.desktop rename plugin-mount/translations/{mount_el_GR.ts => mount_el.ts} (78%) delete mode 100644 plugin-mount/translations/mount_el_GR.desktop create mode 100644 plugin-quicklaunch/translations/quicklaunch_el.desktop rename plugin-quicklaunch/translations/{quicklaunch_el_GR.ts => quicklaunch_el.ts} (90%) delete mode 100644 plugin-quicklaunch/translations/quicklaunch_el_GR.desktop create mode 100644 plugin-screensaver/translations/screensaver_el.desktop rename plugin-screensaver/translations/{screensaver_el_GR.ts => screensaver_el.ts} (72%) delete mode 100644 plugin-screensaver/translations/screensaver_el_GR.desktop create mode 100644 plugin-sensors/translations/sensors_el.desktop rename plugin-sensors/translations/{sensors_el_GR.ts => sensors_el.ts} (90%) delete mode 100644 plugin-sensors/translations/sensors_el_GR.desktop create mode 100644 plugin-showdesktop/translations/showdesktop_el.desktop rename plugin-showdesktop/translations/{showdesktop_el_GR.ts => showdesktop_el.ts} (87%) delete mode 100644 plugin-showdesktop/translations/showdesktop_el_GR.desktop create mode 100644 plugin-spacer/translations/spacer_el.desktop create mode 100644 plugin-spacer/translations/spacer_el.ts create mode 100644 plugin-statusnotifier/translations/statusnotifier_el.desktop create mode 100644 plugin-sysstat/translations/sysstat_el.desktop create mode 100644 plugin-sysstat/translations/sysstat_el.ts create mode 100644 plugin-taskbar/translations/taskbar_el.desktop rename plugin-taskbar/translations/{taskbar_el_GR.ts => taskbar_el.ts} (76%) delete mode 100644 plugin-taskbar/translations/taskbar_el_GR.desktop create mode 100644 plugin-tray/translations/tray_el.desktop delete mode 100644 plugin-tray/translations/tray_el_GR.desktop create mode 100644 plugin-volume/translations/volume_el.desktop rename plugin-volume/translations/{volume_el_GR.ts => volume_el.ts} (78%) delete mode 100644 plugin-volume/translations/volume_el_GR.desktop create mode 100644 plugin-worldclock/translations/worldclock_el.desktop create mode 100644 plugin-worldclock/translations/worldclock_el.ts diff --git a/debian/changelog b/debian/changelog index dcc8293..5d23fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -lxqt-panel (0.9.0+20150830-1) UNRELEASED; urgency=medium +lxqt-panel (0.9.0+20150830-1) unstable; urgency=medium + * Cherry-picked upstream version 0.9.0+20150830. * Added upstream signing key and use it in watch file - -- Alf Gaida Fri, 04 Sep 2015 20:49:49 +0200 + -- Alf Gaida Fri, 04 Sep 2015 20:54:16 +0200 lxqt-panel (0.9.0+20150815-1) unstable; urgency=medium diff --git a/panel/config/addplugindialog.cpp b/panel/config/addplugindialog.cpp index a604601..08573cf 100644 --- a/panel/config/addplugindialog.cpp +++ b/panel/config/addplugindialog.cpp @@ -53,12 +53,12 @@ AddPluginDialog::AddPluginDialog(QWidget *parent): desktopFilesDirs << QString("%1/%2").arg(XdgDirs::dataHome(), "/lxqt/lxqt-panel"); desktopFilesDirs << PLUGIN_DESKTOPS_DIR; - mPlugins = LxQt::PluginInfo::search(desktopFilesDirs, QStringLiteral("LxQtPanel/Plugin"), QStringLiteral("*")); - std::sort(mPlugins.begin(), mPlugins.end(), [](const LxQt::PluginInfo &p1, const LxQt::PluginInfo &p2) { + mPlugins = LXQt::PluginInfo::search(desktopFilesDirs, QStringLiteral("LXQtPanel/Plugin"), QStringLiteral("*")); + std::sort(mPlugins.begin(), mPlugins.end(), [](const LXQt::PluginInfo &p1, const LXQt::PluginInfo &p2) { return p1.name() < p2.name() || (p1.name() == p2.name() && p1.comment() < p2.comment()); }); - ui->pluginList->setItemDelegate(new LxQt::HtmlDelegate(QSize(32, 32), ui->pluginList)); + ui->pluginList->setItemDelegate(new LXQt::HtmlDelegate(QSize(32, 32), ui->pluginList)); ui->pluginList->setContextMenuPolicy(Qt::CustomContextMenu); filter(); @@ -72,9 +72,9 @@ AddPluginDialog::AddPluginDialog(QWidget *parent): connect(ui->pluginList, &QListWidget::doubleClicked, this, &AddPluginDialog::emitPluginSelected); connect(ui->addButton, &QPushButton::clicked, this, &AddPluginDialog::emitPluginSelected); - connect(dynamic_cast(qApp), &LxQtPanelApplication::pluginAdded + connect(dynamic_cast(qApp), &LXQtPanelApplication::pluginAdded , this, &AddPluginDialog::filter); - connect(dynamic_cast(qApp), &LxQtPanelApplication::pluginRemoved + connect(dynamic_cast(qApp), &LXQtPanelApplication::pluginRemoved , this, &AddPluginDialog::filter); } @@ -95,7 +95,7 @@ void AddPluginDialog::filter() int pluginCount = mPlugins.length(); for (int i = 0; i < pluginCount; ++i) { - const LxQt::PluginInfo &plugin = mPlugins.at(i); + const LXQt::PluginInfo &plugin = mPlugins.at(i); QString s = QStringLiteral("%1 %2 %3 %4").arg(plugin.name(), plugin.comment(), @@ -106,7 +106,7 @@ void AddPluginDialog::filter() QListWidgetItem* item = new QListWidgetItem(ui->pluginList); // disable single-instances plugins already in use - if (dynamic_cast(qApp)->isPluginSingletonAndRunnig(plugin.id())) + if (dynamic_cast(qApp)->isPluginSingletonAndRunnig(plugin.id())) { item->setFlags(item->flags() & ~Qt::ItemIsEnabled); item->setBackground(palette().brush(QPalette::Disabled, QPalette::Text)); @@ -127,7 +127,7 @@ void AddPluginDialog::emitPluginSelected() QListWidget* pluginList = ui->pluginList; if (pluginList->currentItem() && pluginList->currentItem()->isSelected()) { - LxQt::PluginInfo plugin = mPlugins.at(pluginList->currentItem()->data(INDEX_ROLE).toInt()); + LXQt::PluginInfo plugin = mPlugins.at(pluginList->currentItem()->data(INDEX_ROLE).toInt()); emit pluginSelected(plugin); } } diff --git a/panel/config/addplugindialog.h b/panel/config/addplugindialog.h index 16f2ba2..7c1b2bb 100644 --- a/panel/config/addplugindialog.h +++ b/panel/config/addplugindialog.h @@ -48,11 +48,11 @@ public: ~AddPluginDialog(); signals: - void pluginSelected(const LxQt::PluginInfo &plugin); + void pluginSelected(const LXQt::PluginInfo &plugin); private: Ui::AddPluginDialog *ui; - LxQt::PluginInfoList mPlugins; + LXQt::PluginInfoList mPlugins; QTimer mSearchTimer; private slots: diff --git a/panel/config/configpaneldialog.cpp b/panel/config/configpaneldialog.cpp index 32556b2..36439db 100644 --- a/panel/config/configpaneldialog.cpp +++ b/panel/config/configpaneldialog.cpp @@ -27,8 +27,8 @@ #include "configpaneldialog.h" -ConfigPanelDialog::ConfigPanelDialog(LxQtPanel *panel, QWidget *parent): - LxQt::ConfigDialog(tr("Configure Panel"), panel->settings(), parent), +ConfigPanelDialog::ConfigPanelDialog(LXQtPanel *panel, QWidget *parent): + LXQt::ConfigDialog(tr("Configure Panel"), panel->settings(), parent), mPanelPage(nullptr), mPluginsPage(nullptr) { diff --git a/panel/config/configpaneldialog.h b/panel/config/configpaneldialog.h index 52b51a6..579a39d 100644 --- a/panel/config/configpaneldialog.h +++ b/panel/config/configpaneldialog.h @@ -34,12 +34,12 @@ #include -class ConfigPanelDialog : public LxQt::ConfigDialog +class ConfigPanelDialog : public LXQt::ConfigDialog { Q_OBJECT public: - ConfigPanelDialog(LxQtPanel *panel, QWidget *parent = 0); + ConfigPanelDialog(LXQtPanel *panel, QWidget *parent = 0); void showConfigPanelPage(); void showConfigPluginsPage(); diff --git a/panel/config/configpanelwidget.cpp b/panel/config/configpanelwidget.cpp index e3797e7..3b2a0fe 100644 --- a/panel/config/configpanelwidget.cpp +++ b/panel/config/configpanelwidget.cpp @@ -39,16 +39,16 @@ #include #include -using namespace LxQt; +using namespace LXQt; struct ScreenPosition { int screen; - ILxQtPanel::Position position; + ILXQtPanel::Position position; }; Q_DECLARE_METATYPE(ScreenPosition) -ConfigPanelWidget::ConfigPanelWidget(LxQtPanel *panel, QWidget *parent) : +ConfigPanelWidget::ConfigPanelWidget(LXQtPanel *panel, QWidget *parent) : QWidget(parent), ui(new Ui::ConfigPanelWidget), mPanel(panel) @@ -153,10 +153,10 @@ void ConfigPanelWidget::fillComboBox_position() int screenCount = QApplication::desktop()->screenCount(); if (screenCount == 1) { - addPosition(tr("Top of desktop"), 0, LxQtPanel::PositionTop); - addPosition(tr("Left of desktop"), 0, LxQtPanel::PositionLeft); - addPosition(tr("Right of desktop"), 0, LxQtPanel::PositionRight); - addPosition(tr("Bottom of desktop"), 0, LxQtPanel::PositionBottom); + addPosition(tr("Top of desktop"), 0, LXQtPanel::PositionTop); + addPosition(tr("Left of desktop"), 0, LXQtPanel::PositionLeft); + addPosition(tr("Right of desktop"), 0, LXQtPanel::PositionRight); + addPosition(tr("Bottom of desktop"), 0, LXQtPanel::PositionBottom); } else { @@ -165,10 +165,10 @@ void ConfigPanelWidget::fillComboBox_position() if (screenNum) ui->comboBox_position->insertSeparator(9999); - addPosition(tr("Top of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionTop); - addPosition(tr("Left of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionLeft); - addPosition(tr("Right of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionRight); - addPosition(tr("Bottom of desktop %1").arg(screenNum +1), screenNum, LxQtPanel::PositionBottom); + addPosition(tr("Top of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionTop); + addPosition(tr("Left of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionLeft); + addPosition(tr("Right of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionRight); + addPosition(tr("Bottom of desktop %1").arg(screenNum +1), screenNum, LXQtPanel::PositionBottom); } } } @@ -179,13 +179,13 @@ void ConfigPanelWidget::fillComboBox_position() ************************************************/ void ConfigPanelWidget::fillComboBox_alignment() { - ui->comboBox_alignment->setItemData(0, QVariant(LxQtPanel::AlignmentLeft)); - ui->comboBox_alignment->setItemData(1, QVariant(LxQtPanel::AlignmentCenter)); - ui->comboBox_alignment->setItemData(2, QVariant(LxQtPanel::AlignmentRight)); + ui->comboBox_alignment->setItemData(0, QVariant(LXQtPanel::AlignmentLeft)); + ui->comboBox_alignment->setItemData(1, QVariant(LXQtPanel::AlignmentCenter)); + ui->comboBox_alignment->setItemData(2, QVariant(LXQtPanel::AlignmentRight)); - if (mPosition == ILxQtPanel::PositionTop || - mPosition == ILxQtPanel::PositionBottom) + if (mPosition == ILXQtPanel::PositionTop || + mPosition == ILXQtPanel::PositionBottom) { ui->comboBox_alignment->setItemText(0, tr("Left")); ui->comboBox_alignment->setItemText(1, tr("Center")); @@ -203,9 +203,9 @@ void ConfigPanelWidget::fillComboBox_alignment() /************************************************ * ************************************************/ -void ConfigPanelWidget::addPosition(const QString& name, int screen, LxQtPanel::Position position) +void ConfigPanelWidget::addPosition(const QString& name, int screen, LXQtPanel::Position position) { - if (LxQtPanel::canPlacedOn(screen, position)) + if (LXQtPanel::canPlacedOn(screen, position)) ui->comboBox_position->addItem(name, QVariant::fromValue((ScreenPosition){screen, position})); } @@ -213,7 +213,7 @@ void ConfigPanelWidget::addPosition(const QString& name, int screen, LxQtPanel:: /************************************************ * ************************************************/ -int ConfigPanelWidget::indexForPosition(int screen, ILxQtPanel::Position position) +int ConfigPanelWidget::indexForPosition(int screen, ILXQtPanel::Position position) { for (int i = 0; i < ui->comboBox_position->count(); i++) { @@ -247,7 +247,7 @@ void ConfigPanelWidget::editChanged() ui->comboBox_lenghtType->currentIndex() == 0, true); - LxQtPanel::Alignment align = LxQtPanel::Alignment( + LXQtPanel::Alignment align = LXQtPanel::Alignment( ui->comboBox_alignment->itemData( ui->comboBox_alignment->currentIndex() ).toInt()); @@ -304,8 +304,8 @@ int ConfigPanelWidget::getMaxLength() { QDesktopWidget* dw = QApplication::desktop(); - if (mPosition == ILxQtPanel::PositionTop || - mPosition == ILxQtPanel::PositionBottom) + if (mPosition == ILXQtPanel::PositionTop || + mPosition == ILXQtPanel::PositionBottom) return dw->screenGeometry(mScreenNum).width(); else return dw->screenGeometry(mScreenNum).height(); @@ -320,10 +320,10 @@ void ConfigPanelWidget::positionChanged() ScreenPosition sp = ui->comboBox_position->itemData( ui->comboBox_position->currentIndex()).value(); - bool updateAlig = (sp.position == ILxQtPanel::PositionTop || - sp.position == ILxQtPanel::PositionBottom) != - (mPosition == ILxQtPanel::PositionTop || - mPosition == ILxQtPanel::PositionBottom); + bool updateAlig = (sp.position == ILXQtPanel::PositionTop || + sp.position == ILXQtPanel::PositionBottom) != + (mPosition == ILXQtPanel::PositionTop || + mPosition == ILXQtPanel::PositionBottom); int oldMax = getMaxLength(); mPosition = sp.position; diff --git a/panel/config/configpanelwidget.h b/panel/config/configpanelwidget.h index 3849a86..4f1986f 100644 --- a/panel/config/configpanelwidget.h +++ b/panel/config/configpanelwidget.h @@ -33,7 +33,7 @@ #include #include -class LxQtPanel; +class LXQtPanel; namespace Ui { class ConfigPanelWidget; @@ -44,11 +44,11 @@ class ConfigPanelWidget : public QWidget Q_OBJECT public: - explicit ConfigPanelWidget(LxQtPanel *panel, QWidget *parent = 0); + explicit ConfigPanelWidget(LXQtPanel *panel, QWidget *parent = 0); ~ConfigPanelWidget(); int screenNum() const { return mScreenNum; } - ILxQtPanel::Position position() const { return mPosition; } + ILXQtPanel::Position position() const { return mPosition; } signals: void changed(); @@ -66,14 +66,14 @@ private slots: private: Ui::ConfigPanelWidget *ui; - LxQtPanel *mPanel; + LXQtPanel *mPanel; int mScreenNum; - ILxQtPanel::Position mPosition; + ILXQtPanel::Position mPosition; - void addPosition(const QString& name, int screen, LxQtPanel::Position position); + void addPosition(const QString& name, int screen, LXQtPanel::Position position); void fillComboBox_position(); void fillComboBox_alignment(); - int indexForPosition(int screen, ILxQtPanel::Position position); + int indexForPosition(int screen, ILXQtPanel::Position position); int getMaxLength(); // new values @@ -86,8 +86,8 @@ private: int mOldLineCount; int mOldLength; bool mOldLengthInPercents; - LxQtPanel::Alignment mOldAlignment; - ILxQtPanel::Position mOldPosition; + LXQtPanel::Alignment mOldAlignment; + ILXQtPanel::Position mOldPosition; bool mOldHidable; int mOldScreenNum; QColor mOldFontColor; diff --git a/panel/config/configpluginswidget.cpp b/panel/config/configpluginswidget.cpp index cdae414..c1c3c4a 100644 --- a/panel/config/configpluginswidget.cpp +++ b/panel/config/configpluginswidget.cpp @@ -36,7 +36,7 @@ #include #include -ConfigPluginsWidget::ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent) : +ConfigPluginsWidget::ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent) : QWidget(parent), ui(new Ui::ConfigPluginsWidget), mPanel(panel) @@ -50,7 +50,7 @@ ConfigPluginsWidget::ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent) : } { QScopedPointer d(ui->listView_plugins->itemDelegate()); - ui->listView_plugins->setItemDelegate(new LxQt::HtmlDelegate(QSize(16, 16), ui->listView_plugins)); + ui->listView_plugins->setItemDelegate(new LXQt::HtmlDelegate(QSize(16, 16), ui->listView_plugins)); } resetButtons(); @@ -109,7 +109,7 @@ void ConfigPluginsWidget::resetButtons() Plugin const * plugin = ui->listView_plugins->model()->data(selectionModel->currentIndex(), Qt::UserRole).value(); if (nullptr != plugin) - hasConfigDialog = plugin->iPlugin()->flags().testFlag(ILxQtPanelPlugin::HaveConfigDialog); + hasConfigDialog = plugin->iPlugin()->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog); } ui->pushButton_removePlugin->setEnabled(hasSelection); diff --git a/panel/config/configpluginswidget.h b/panel/config/configpluginswidget.h index 344169f..b4670ef 100644 --- a/panel/config/configpluginswidget.h +++ b/panel/config/configpluginswidget.h @@ -42,7 +42,7 @@ class ConfigPluginsWidget : public QWidget Q_OBJECT public: - ConfigPluginsWidget(LxQtPanel *panel, QWidget* parent = 0); + ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = 0); ~ConfigPluginsWidget(); signals: @@ -58,7 +58,7 @@ private slots: private: Ui::ConfigPluginsWidget *ui; QScopedPointer mAddPluginDialog; - LxQtPanel *mPanel; + LXQtPanel *mPanel; }; #endif diff --git a/panel/ilxqtpanel.h b/panel/ilxqtpanel.h index a64cb69..e7b2844 100644 --- a/panel/ilxqtpanel.h +++ b/panel/ilxqtpanel.h @@ -31,11 +31,11 @@ #include #include "lxqtpanelglobals.h" -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; /** **/ -class LXQT_PANEL_API ILxQtPanel +class LXQT_PANEL_API ILXQtPanel { public: /** @@ -73,7 +73,7 @@ public: If you need to show some popup window, you can use it, to get global screen position for the new window. **/ virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0; - virtual QRect calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const = 0; + virtual QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const = 0; }; #endif // ILXQTPANEL_H diff --git a/panel/ilxqtpanelplugin.h b/panel/ilxqtpanelplugin.h index cefcf53..1503923 100644 --- a/panel/ilxqtpanelplugin.h +++ b/panel/ilxqtpanelplugin.h @@ -37,7 +37,7 @@ #include "lxqtpanelglobals.h" /** -LxQt panel plugins are standalone sharedlibraries +LXQt panel plugins are standalone sharedlibraries (*.so) located in PLUGIN_DIR (define provided by CMakeLists.txt). Plugin for the panel is a library written on C++. One more necessary thing @@ -51,15 +51,15 @@ like translations. Themselves plugins will be installed to class QDialog; -struct LXQT_PANEL_API ILxQtPanelPluginStartupInfo +struct LXQT_PANEL_API ILXQtPanelPluginStartupInfo { - ILxQtPanel *lxqtPanel; + ILXQtPanel *lxqtPanel; QSettings *settings; - const LxQt::PluginInfo *desktopFile; + const LXQt::PluginInfo *desktopFile; }; -/** \brief Base abstract class for LxQt panel widgets/plugins. +/** \brief Base abstract class for LXQt panel widgets/plugins. All plugins *must* be inherited from this one. This class provides some basic API and inherited/implemented @@ -69,7 +69,7 @@ See for more information about how to make your plugins. **/ -class LXQT_PANEL_API ILxQtPanelPlugin +class LXQT_PANEL_API ILXQtPanelPlugin { public: /** @@ -99,10 +99,10 @@ public: }; /** - Constructs a ILxQtPanelPlugin object with the given startupInfo. You do not have to worry - about the startupInfo parameters, ILxQtPanelPlugin process the parameters yourself. + Constructs a ILXQtPanelPlugin object with the given startupInfo. You do not have to worry + about the startupInfo parameters, ILXQtPanelPlugin process the parameters yourself. **/ - ILxQtPanelPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): + ILXQtPanelPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): mSettings(startupInfo.settings), mPanel(startupInfo.lxqtPanel), mDesktopFile(startupInfo.desktopFile) @@ -111,7 +111,7 @@ public: /** Destroys the object. **/ - virtual ~ILxQtPanelPlugin() {} + virtual ~ILXQtPanelPlugin() {} /** Returns the plugin flags. @@ -139,7 +139,7 @@ public: The default implementation returns 0, no dialog; Note that the flags method has to return HaveConfigDialog flag. - To save the settings you should use a ready-to-use ILxQtPanelPlugin::settings() object. + To save the settings you should use a ready-to-use ILXQtPanelPlugin::settings() object. **/ virtual QDialog *configureDialog() { return 0; } @@ -154,7 +154,7 @@ public: /** This function is called when the user activates the plugin. reason specifies the reason for activation. - ILxQtPanelPlugin::ActivationReason enumerates the various reasons. + ILXQtPanelPlugin::ActivationReason enumerates the various reasons. The default implementation do nothing. **/ @@ -171,11 +171,11 @@ public: /** Returns the panel object. **/ - ILxQtPanel *panel() const { return mPanel; } + ILXQtPanel *panel() const { return mPanel; } QSettings *settings() const { return mSettings; } - const LxQt::PluginInfo *desktopFile() const { return mDesktopFile; } + const LXQt::PluginInfo *desktopFile() const { return mDesktopFile; } /** Helper functions for calculating global screen position of some popup window with windowSize size. @@ -191,42 +191,42 @@ public: virtual bool isExpandable() const { return false; } private: QSettings *mSettings; - ILxQtPanel *mPanel; - const LxQt::PluginInfo *mDesktopFile; + ILXQtPanel *mPanel; + const LXQt::PluginInfo *mDesktopFile; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(ILxQtPanelPlugin::Flags) +Q_DECLARE_OPERATORS_FOR_FLAGS(ILXQtPanelPlugin::Flags) /** Every plugin must has the loader. You shoul only reimplement instance() method, and return your plugin. Example: @code -class LxQtClockPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) { return new LxQtClock(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) { return new LXQtClock(startupInfo);} }; @endcode **/ -class LXQT_PANEL_API ILxQtPanelPluginLibrary +class LXQT_PANEL_API ILXQtPanelPluginLibrary { public: /** - Destroys the ILxQtPanelPluginLibrary object. + Destroys the ILXQtPanelPluginLibrary object. **/ - virtual ~ILxQtPanelPluginLibrary() {} + virtual ~ILXQtPanelPluginLibrary() {} /** Returns the root component object of the plugin. When the library is finally unloaded, the root component will automatically be deleted. **/ - virtual ILxQtPanelPlugin* instance(const ILxQtPanelPluginStartupInfo &startupInfo) const = 0; + virtual ILXQtPanelPlugin* instance(const ILXQtPanelPluginStartupInfo &startupInfo) const = 0; }; -Q_DECLARE_INTERFACE(ILxQtPanelPluginLibrary, +Q_DECLARE_INTERFACE(ILXQtPanelPluginLibrary, "lxde-qt.org/Panel/PluginInterface/3.0") #endif // ILXQTPANELPLUGIN_H diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp index 9b66994..950243e 100644 --- a/panel/lxqtpanel.cpp +++ b/panel/lxqtpanel.cpp @@ -78,12 +78,12 @@ String is one of "Top", "Left", "Bottom", "Right", string is not case sensitive. If the string is not correct, returns defaultValue. ************************************************/ -ILxQtPanel::Position LxQtPanel::strToPosition(const QString& str, ILxQtPanel::Position defaultValue) +ILXQtPanel::Position LXQtPanel::strToPosition(const QString& str, ILXQtPanel::Position defaultValue) { - if (str.toUpper() == "TOP") return LxQtPanel::PositionTop; - if (str.toUpper() == "LEFT") return LxQtPanel::PositionLeft; - if (str.toUpper() == "RIGHT") return LxQtPanel::PositionRight; - if (str.toUpper() == "BOTTOM") return LxQtPanel::PositionBottom; + if (str.toUpper() == "TOP") return LXQtPanel::PositionTop; + if (str.toUpper() == "LEFT") return LXQtPanel::PositionLeft; + if (str.toUpper() == "RIGHT") return LXQtPanel::PositionRight; + if (str.toUpper() == "BOTTOM") return LXQtPanel::PositionBottom; return defaultValue; } @@ -91,17 +91,17 @@ ILxQtPanel::Position LxQtPanel::strToPosition(const QString& str, ILxQtPanel::Po /************************************************ Return string representation of the position ************************************************/ -QString LxQtPanel::positionToStr(ILxQtPanel::Position position) +QString LXQtPanel::positionToStr(ILXQtPanel::Position position) { switch (position) { - case LxQtPanel::PositionTop: + case LXQtPanel::PositionTop: return QString("Top"); - case LxQtPanel::PositionLeft: + case LXQtPanel::PositionLeft: return QString("Left"); - case LxQtPanel::PositionRight: + case LXQtPanel::PositionRight: return QString("Right"); - case LxQtPanel::PositionBottom: + case LXQtPanel::PositionBottom: return QString("Bottom"); } @@ -112,7 +112,7 @@ QString LxQtPanel::positionToStr(ILxQtPanel::Position position) /************************************************ ************************************************/ -LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) : +LXQtPanel::LXQtPanel(const QString &configGroup, QWidget *parent) : QFrame(parent), mConfigGroup(configGroup), mPlugins{nullptr}, @@ -121,7 +121,7 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) : mLineCount(0), mLength(0), mAlignment(AlignmentLeft), - mPosition(ILxQtPanel::PositionBottom), + mPosition(ILXQtPanel::PositionBottom), mScreenNum(0), //whatever (avoid conditional on uninitialized value) mHidable(false), mHidden(false) @@ -146,19 +146,19 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) : setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_AcceptDrops); - setWindowTitle("LxQt Panel"); - setObjectName(QString("LxQtPanel %1").arg(configGroup)); + setWindowTitle("LXQt Panel"); + setObjectName(QString("LXQtPanel %1").arg(configGroup)); - LxQtPanelWidget = new QFrame(this); - LxQtPanelWidget->setObjectName("BackgroundWidget"); + LXQtPanelWidget = new QFrame(this); + LXQtPanelWidget->setObjectName("BackgroundWidget"); QGridLayout* lav = new QGridLayout(); lav->setMargin(0); setLayout(lav); - this->layout()->addWidget(LxQtPanelWidget); + this->layout()->addWidget(LXQtPanelWidget); - mLayout = new LxQtPanelLayout(LxQtPanelWidget); - connect(mLayout, &LxQtPanelLayout::pluginMoved, this, &LxQtPanel::pluginMoved); - LxQtPanelWidget->setLayout(mLayout); + mLayout = new LXQtPanelLayout(LXQtPanelWidget); + connect(mLayout, &LXQtPanelLayout::pluginMoved, this, &LXQtPanel::pluginMoved); + LXQtPanelWidget->setLayout(mLayout); mLayout->setLineCount(mLineCount); mDelaySave.setSingleShot(true); @@ -171,10 +171,10 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) : connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(realign())); connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(ensureVisible())); - connect(LxQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update())); + connect(LXQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update())); connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign())); - LxQtPanelApplication *app = reinterpret_cast(qApp); + LXQtPanelApplication *app = reinterpret_cast(qApp); mSettings = app->settings(); readSettings(); // the old position might be on a visible screen @@ -194,7 +194,7 @@ LxQtPanel::LxQtPanel(const QString &configGroup, QWidget *parent) : /************************************************ ************************************************/ -void LxQtPanel::readSettings() +void LXQtPanel::readSettings() { // Read settings ...................................... mSettings->beginGroup(mConfigGroup); @@ -239,7 +239,7 @@ void LxQtPanel::readSettings() /************************************************ ************************************************/ -void LxQtPanel::saveSettings(bool later) +void LXQtPanel::saveSettings(bool later) { mDelaySave.stop(); if (later) @@ -279,7 +279,7 @@ void LxQtPanel::saveSettings(bool later) /************************************************ ************************************************/ -void LxQtPanel::ensureVisible() +void LXQtPanel::ensureVisible() { if (!canPlacedOn(mScreenNum, mPosition)) setPosition(findAvailableScreen(mPosition), mPosition, true); @@ -292,7 +292,7 @@ void LxQtPanel::ensureVisible() /************************************************ ************************************************/ -LxQtPanel::~LxQtPanel() +LXQtPanel::~LXQtPanel() { mLayout->setEnabled(false); // do not save settings because of "user deleted panel" functionality saveSettings(); @@ -302,7 +302,7 @@ LxQtPanel::~LxQtPanel() /************************************************ ************************************************/ -void LxQtPanel::show() +void LXQtPanel::show() { QWidget::show(); KWindowSystem::setOnDesktop(effectiveWinId(), NET::OnAllDesktops); @@ -325,18 +325,18 @@ QStringList pluginDesktopDirs() /************************************************ ************************************************/ -void LxQtPanel::loadPlugins() +void LXQtPanel::loadPlugins() { QString names_key(mConfigGroup); names_key += '/'; names_key += QLatin1String(CFG_KEY_PLUGINS); mPlugins.reset(new PanelPluginsModel(this, names_key, pluginDesktopDirs())); - connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, mLayout, &LxQtPanelLayout::addPlugin); - connect(mPlugins.data(), &PanelPluginsModel::pluginMovedUp, mLayout, &LxQtPanelLayout::moveUpPlugin); + connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, mLayout, &LXQtPanelLayout::addPlugin); + connect(mPlugins.data(), &PanelPluginsModel::pluginMovedUp, mLayout, &LXQtPanelLayout::moveUpPlugin); //reemit signals - connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, this, &LxQtPanel::pluginAdded); - connect(mPlugins.data(), &PanelPluginsModel::pluginRemoved, this, &LxQtPanel::pluginRemoved); + connect(mPlugins.data(), &PanelPluginsModel::pluginAdded, this, &LXQtPanel::pluginAdded); + connect(mPlugins.data(), &PanelPluginsModel::pluginRemoved, this, &LXQtPanel::pluginRemoved); for (auto const & plugin : mPlugins->plugins()) mLayout->addPlugin(plugin); @@ -345,12 +345,12 @@ void LxQtPanel::loadPlugins() /************************************************ ************************************************/ -int LxQtPanel::getReserveDimension() +int LXQtPanel::getReserveDimension() { return mHidable ? PANEL_HIDE_SIZE : qMax(PANEL_MINIMUM_SIZE, mPanelSize); } -void LxQtPanel::setPanelGeometry() +void LXQtPanel::setPanelGeometry() { const QRect currentScreen = QApplication::desktop()->screenGeometry(mScreenNum); QRect rect; @@ -374,21 +374,21 @@ void LxQtPanel::setPanelGeometry() // Horiz ...................... switch (mAlignment) { - case LxQtPanel::AlignmentLeft: + case LXQtPanel::AlignmentLeft: rect.moveLeft(currentScreen.left()); break; - case LxQtPanel::AlignmentCenter: + case LXQtPanel::AlignmentCenter: rect.moveCenter(currentScreen.center()); break; - case LxQtPanel::AlignmentRight: + case LXQtPanel::AlignmentRight: rect.moveRight(currentScreen.right()); break; } // Vert ....................... - if (mPosition == ILxQtPanel::PositionTop) + if (mPosition == ILXQtPanel::PositionTop) rect.moveTop(currentScreen.top()); else rect.moveBottom(currentScreen.bottom()); @@ -412,21 +412,21 @@ void LxQtPanel::setPanelGeometry() // Vert ....................... switch (mAlignment) { - case LxQtPanel::AlignmentLeft: + case LXQtPanel::AlignmentLeft: rect.moveTop(currentScreen.top()); break; - case LxQtPanel::AlignmentCenter: + case LXQtPanel::AlignmentCenter: rect.moveCenter(currentScreen.center()); break; - case LxQtPanel::AlignmentRight: + case LXQtPanel::AlignmentRight: rect.moveBottom(currentScreen.bottom()); break; } // Horiz ...................... - if (mPosition == ILxQtPanel::PositionLeft) + if (mPosition == ILXQtPanel::PositionLeft) rect.moveLeft(currentScreen.left()); else rect.moveRight(currentScreen.right()); @@ -439,7 +439,7 @@ void LxQtPanel::setPanelGeometry() } } -void LxQtPanel::realign() +void LXQtPanel::realign() { if (!isVisible()) return; @@ -464,7 +464,7 @@ void LxQtPanel::realign() // Update the _NET_WM_PARTIAL_STRUT and _NET_WM_STRUT properties for the window -void LxQtPanel::updateWmStrut() +void LXQtPanel::updateWmStrut() { WId wid = effectiveWinId(); if(wid == 0 || !isVisible()) @@ -478,7 +478,7 @@ void LxQtPanel::updateWmStrut() // At least openbox is implemented like this. switch (mPosition) { - case LxQtPanel::PositionTop: + case LXQtPanel::PositionTop: KWindowSystem::setExtendedStrut(wid, /* Left */ 0, 0, 0, /* Right */ 0, 0, 0, @@ -487,7 +487,7 @@ void LxQtPanel::updateWmStrut() ); break; - case LxQtPanel::PositionBottom: + case LXQtPanel::PositionBottom: KWindowSystem::setExtendedStrut(wid, /* Left */ 0, 0, 0, /* Right */ 0, 0, 0, @@ -496,7 +496,7 @@ void LxQtPanel::updateWmStrut() ); break; - case LxQtPanel::PositionLeft: + case LXQtPanel::PositionLeft: KWindowSystem::setExtendedStrut(wid, /* Left */ getReserveDimension(), rect.top(), rect.bottom(), /* Right */ 0, 0, 0, @@ -506,7 +506,7 @@ void LxQtPanel::updateWmStrut() break; - case LxQtPanel::PositionRight: + case LXQtPanel::PositionRight: KWindowSystem::setExtendedStrut(wid, /* Left */ 0, 0, 0, /* Right */ getReserveDimension(), rect.top(), rect.bottom(), @@ -523,31 +523,31 @@ void LxQtPanel::updateWmStrut() This function checks, is the panel can be placed on the display @displayNum on @position. ************************************************/ -bool LxQtPanel::canPlacedOn(int screenNum, LxQtPanel::Position position) +bool LXQtPanel::canPlacedOn(int screenNum, LXQtPanel::Position position) { QDesktopWidget* dw = QApplication::desktop(); switch (position) { - case LxQtPanel::PositionTop: + case LXQtPanel::PositionTop: for (int i = 0; i < dw->screenCount(); ++i) if (dw->screenGeometry(i).bottom() < dw->screenGeometry(screenNum).top()) return false; return true; - case LxQtPanel::PositionBottom: + case LXQtPanel::PositionBottom: for (int i = 0; i < dw->screenCount(); ++i) if (dw->screenGeometry(i).top() > dw->screenGeometry(screenNum).bottom()) return false; return true; - case LxQtPanel::PositionLeft: + case LXQtPanel::PositionLeft: for (int i = 0; i < dw->screenCount(); ++i) if (dw->screenGeometry(i).right() < dw->screenGeometry(screenNum).left()) return false; return true; - case LxQtPanel::PositionRight: + case LXQtPanel::PositionRight: for (int i = 0; i < dw->screenCount(); ++i) if (dw->screenGeometry(i).left() > dw->screenGeometry(screenNum).right()) return false; @@ -561,7 +561,7 @@ bool LxQtPanel::canPlacedOn(int screenNum, LxQtPanel::Position position) /************************************************ ************************************************/ -int LxQtPanel::findAvailableScreen(LxQtPanel::Position position) +int LXQtPanel::findAvailableScreen(LXQtPanel::Position position) { int current = mScreenNum; @@ -580,7 +580,7 @@ int LxQtPanel::findAvailableScreen(LxQtPanel::Position position) /************************************************ ************************************************/ -void LxQtPanel::showConfigDialog() +void LXQtPanel::showConfigDialog() { if (mConfigDialog.isNull()) mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/); @@ -599,7 +599,7 @@ void LxQtPanel::showConfigDialog() /************************************************ ************************************************/ -void LxQtPanel::showAddPluginDialog() +void LXQtPanel::showAddPluginDialog() { if (mConfigDialog.isNull()) mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/); @@ -618,16 +618,16 @@ void LxQtPanel::showAddPluginDialog() /************************************************ ************************************************/ -void LxQtPanel::updateStyleSheet() +void LXQtPanel::updateStyleSheet() { QStringList sheet; - sheet << QString("Plugin > QAbstractButton, LxQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize); + sheet << QString("Plugin > QAbstractButton, LXQtTray { qproperty-iconSize: %1px %1px; }").arg(mIconSize); sheet << QString("Plugin > * > QAbstractButton, TrayIcon { qproperty-iconSize: %1px %1px; }").arg(mIconSize); if (mFontColor.isValid()) sheet << QString("Plugin * { color: " + mFontColor.name() + "; }"); - QString object = LxQtPanelWidget->objectName(); + QString object = LXQtPanelWidget->objectName(); if (mBackgroundColor.isValid()) { @@ -636,11 +636,11 @@ void LxQtPanel::updateStyleSheet() .arg(mBackgroundColor.green()) .arg(mBackgroundColor.blue()) .arg((float) mOpacity / 100); - sheet << QString("LxQtPanel #BackgroundWidget { background-color: rgba(" + color + "); }"); + sheet << QString("LXQtPanel #BackgroundWidget { background-color: rgba(" + color + "); }"); } if (QFileInfo(mBackgroundImage).exists()) - sheet << QString("LxQtPanel #BackgroundWidget { background-image: url('" + mBackgroundImage + "');}"); + sheet << QString("LXQtPanel #BackgroundWidget { background-image: url('" + mBackgroundImage + "');}"); setStyleSheet(sheet.join("\n")); } @@ -650,7 +650,7 @@ void LxQtPanel::updateStyleSheet() /************************************************ ************************************************/ -void LxQtPanel::setPanelSize(int value, bool save) +void LXQtPanel::setPanelSize(int value, bool save) { if (mPanelSize != value) { @@ -667,7 +667,7 @@ void LxQtPanel::setPanelSize(int value, bool save) /************************************************ ************************************************/ -void LxQtPanel::setIconSize(int value, bool save) +void LXQtPanel::setIconSize(int value, bool save) { if (mIconSize != value) { @@ -686,7 +686,7 @@ void LxQtPanel::setIconSize(int value, bool save) /************************************************ ************************************************/ -void LxQtPanel::setLineCount(int value, bool save) +void LXQtPanel::setLineCount(int value, bool save) { if (mLineCount != value) { @@ -706,7 +706,7 @@ void LxQtPanel::setLineCount(int value, bool save) /************************************************ ************************************************/ -void LxQtPanel::setLength(int length, bool inPercents, bool save) +void LXQtPanel::setLength(int length, bool inPercents, bool save) { if (mLength == length && mLengthInPercents == inPercents) @@ -725,7 +725,7 @@ void LxQtPanel::setLength(int length, bool inPercents, bool save) /************************************************ ************************************************/ -void LxQtPanel::setPosition(int screen, ILxQtPanel::Position position, bool save) +void LXQtPanel::setPosition(int screen, ILXQtPanel::Position position, bool save) { if (mScreenNum == screen && mPosition == position) @@ -766,7 +766,7 @@ void LxQtPanel::setPosition(int screen, ILxQtPanel::Position position, bool save /************************************************ * ************************************************/ -void LxQtPanel::setAlignment(Alignment value, bool save) +void LXQtPanel::setAlignment(Alignment value, bool save) { if (mAlignment == value) return; @@ -782,7 +782,7 @@ void LxQtPanel::setAlignment(Alignment value, bool save) /************************************************ * ************************************************/ -void LxQtPanel::setFontColor(QColor color, bool save) +void LXQtPanel::setFontColor(QColor color, bool save) { mFontColor = color; updateStyleSheet(); @@ -794,7 +794,7 @@ void LxQtPanel::setFontColor(QColor color, bool save) /************************************************ ************************************************/ -void LxQtPanel::setBackgroundColor(QColor color, bool save) +void LXQtPanel::setBackgroundColor(QColor color, bool save) { mBackgroundColor = color; updateStyleSheet(); @@ -806,7 +806,7 @@ void LxQtPanel::setBackgroundColor(QColor color, bool save) /************************************************ ************************************************/ -void LxQtPanel::setBackgroundImage(QString path, bool save) +void LXQtPanel::setBackgroundImage(QString path, bool save) { mBackgroundImage = path; updateStyleSheet(); @@ -819,7 +819,7 @@ void LxQtPanel::setBackgroundImage(QString path, bool save) /************************************************ * ************************************************/ -void LxQtPanel::setOpacity(int opacity, bool save) +void LXQtPanel::setOpacity(int opacity, bool save) { mOpacity = opacity; updateStyleSheet(); @@ -832,7 +832,7 @@ void LxQtPanel::setOpacity(int opacity, bool save) /************************************************ ************************************************/ -QRect LxQtPanel::globalGometry() const +QRect LXQtPanel::globalGometry() const { return QRect(mapToGlobal(QPoint(0, 0)), this->size()); } @@ -841,7 +841,7 @@ QRect LxQtPanel::globalGometry() const /************************************************ ************************************************/ -bool LxQtPanel::event(QEvent *event) +bool LXQtPanel::event(QEvent *event) { switch (event->type()) { @@ -896,7 +896,7 @@ bool LxQtPanel::event(QEvent *event) ************************************************/ -void LxQtPanel::showEvent(QShowEvent *event) +void LXQtPanel::showEvent(QShowEvent *event) { QFrame::showEvent(event); realign(); @@ -906,7 +906,7 @@ void LxQtPanel::showEvent(QShowEvent *event) /************************************************ ************************************************/ -void LxQtPanel::showPopupMenu(Plugin *plugin) +void LXQtPanel::showPopupMenu(Plugin *plugin) { PopupMenu * menu = new PopupMenu(tr("Panel"), this); menu->setAttribute(Qt::WA_DeleteOnClose); @@ -940,7 +940,7 @@ void LxQtPanel::showPopupMenu(Plugin *plugin) this, SLOT(showAddPluginDialog()) ); - LxQtPanelApplication *a = reinterpret_cast(qApp); + LXQtPanelApplication *a = reinterpret_cast(qApp); menu->addAction(XdgIcon::fromTheme(QLatin1String("list-add")), tr("Add Panel"), a, SLOT(addNewPanel()) @@ -967,7 +967,7 @@ void LxQtPanel::showPopupMenu(Plugin *plugin) menu->show(); } -Plugin* LxQtPanel::findPlugin(const ILxQtPanelPlugin* iPlugin) const +Plugin* LXQtPanel::findPlugin(const ILXQtPanelPlugin* iPlugin) const { Plugin *plugin = nullptr; for (Plugin *plug : mPlugins->plugins()) @@ -979,25 +979,25 @@ Plugin* LxQtPanel::findPlugin(const ILxQtPanelPlugin* iPlugin) const /************************************************ ************************************************/ -QRect LxQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const +QRect LXQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const { int x = absolutePos.x(), y = absolutePos.y(); switch (position()) { - case ILxQtPanel::PositionTop: + case ILXQtPanel::PositionTop: y = globalGometry().bottom(); break; - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionBottom: y = globalGometry().top() - windowSize.height(); break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: x = globalGometry().right(); break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: x = globalGometry().left() - windowSize.width(); break; } @@ -1027,7 +1027,7 @@ QRect LxQtPanel::calculatePopupWindowPos(QPoint const & absolutePos, QSize const /************************************************ ************************************************/ -QRect LxQtPanel::calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const +QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const { Plugin *panel_plugin = findPlugin(plugin); if (nullptr == panel_plugin) @@ -1040,7 +1040,7 @@ QRect LxQtPanel::calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const Q /************************************************ ************************************************/ -QString LxQtPanel::qssPosition() const +QString LXQtPanel::qssPosition() const { return positionToStr(position()); } @@ -1048,7 +1048,7 @@ QString LxQtPanel::qssPosition() const /************************************************ ************************************************/ -void LxQtPanel::pluginMoved(Plugin * plug) +void LXQtPanel::pluginMoved(Plugin * plug) { //get new position of the moved plugin bool found{false}; @@ -1074,7 +1074,7 @@ void LxQtPanel::pluginMoved(Plugin * plug) /************************************************ ************************************************/ -void LxQtPanel::userRequestForDeletion() +void LXQtPanel::userRequestForDeletion() { mSettings->beginGroup(mConfigGroup); QStringList plugins = mSettings->value("plugins").toStringList(); @@ -1089,7 +1089,7 @@ void LxQtPanel::userRequestForDeletion() emit deletedByUser(this); } -void LxQtPanel::showPanel() +void LXQtPanel::showPanel() { if (mHidable) { @@ -1102,13 +1102,13 @@ void LxQtPanel::showPanel() } } -void LxQtPanel::hidePanel() +void LXQtPanel::hidePanel() { if (mHidable && !mHidden) mHideTimer.start(); } -void LxQtPanel::hidePanelWork() +void LXQtPanel::hidePanelWork() { if (mHidable && !mHidden && !geometry().contains(QCursor::pos())) { @@ -1120,7 +1120,7 @@ void LxQtPanel::hidePanelWork() } } -void LxQtPanel::setHidable(bool hidable, bool save) +void LXQtPanel::setHidable(bool hidable, bool save) { if (mHidable == hidable) return; @@ -1133,11 +1133,11 @@ void LxQtPanel::setHidable(bool hidable, bool save) realign(); } -bool LxQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const +bool LXQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const { Plugin const * plugin = mPlugins->pluginByID(pluginId); if (nullptr == plugin) return false; else - return plugin->iPlugin()->flags().testFlag(ILxQtPanelPlugin::SingleInstance); + return plugin->iPlugin()->flags().testFlag(ILXQtPanelPlugin::SingleInstance); } diff --git a/panel/lxqtpanel.h b/panel/lxqtpanel.h index 06aa608..b939dfc 100644 --- a/panel/lxqtpanel.h +++ b/panel/lxqtpanel.h @@ -40,17 +40,17 @@ class QMenu; class Plugin; class QAbstractItemModel; -namespace LxQt { +namespace LXQt { class Settings; class PluginInfo; } -class LxQtPanelLayout; +class LXQtPanelLayout; class ConfigPanelDialog; class PanelPluginsModel; -/*! \brief The LxQtPanel class provides a single lxqt-panel. +/*! \brief The LXQtPanel class provides a single lxqt-panel. */ -class LXQT_PANEL_API LxQtPanel : public QFrame, public ILxQtPanel +class LXQT_PANEL_API LXQtPanel : public QFrame, public ILXQtPanel { Q_OBJECT @@ -67,8 +67,8 @@ public: AlignmentRight = 1 }; - LxQtPanel(const QString &configGroup, QWidget *parent = 0); - virtual ~LxQtPanel(); + LXQtPanel(const QString &configGroup, QWidget *parent = 0); + virtual ~LXQtPanel(); QString name() { return mConfigGroup; } @@ -76,19 +76,19 @@ public: void showPopupMenu(Plugin *plugin = 0); - // ILxQtPanel ......................... - ILxQtPanel::Position position() const { return mPosition; } + // ILXQtPanel ......................... + ILXQtPanel::Position position() const { return mPosition; } QRect globalGometry() const; - Plugin *findPlugin(const ILxQtPanelPlugin *iPlugin) const; + Plugin *findPlugin(const ILXQtPanelPlugin *iPlugin) const; QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const; - QRect calculatePopupWindowPos(const ILxQtPanelPlugin *plugin, const QSize &windowSize) const; + QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const; // For QSS properties .................. QString qssPosition() const; - static bool canPlacedOn(int screenNum, LxQtPanel::Position position); - static QString positionToStr(ILxQtPanel::Position position); - static ILxQtPanel::Position strToPosition(const QString &str, ILxQtPanel::Position defaultValue); + static bool canPlacedOn(int screenNum, LXQtPanel::Position position); + static QString positionToStr(ILXQtPanel::Position position); + static ILXQtPanel::Position strToPosition(const QString &str, ILXQtPanel::Position defaultValue); // Settings int panelSize() const { return mPanelSize; } @@ -96,7 +96,7 @@ public: int lineCount() const { return mLineCount; } int length() const { return mLength; } bool lengthInPercents() const { return mLengthInPercents; } - LxQtPanel::Alignment alignment() const { return mAlignment; } + LXQtPanel::Alignment alignment() const { return mAlignment; } int screenNum() const { return mScreenNum; } QColor fontColor() const { return mFontColor; }; QColor backgroundColor() const { return mBackgroundColor; }; @@ -104,7 +104,7 @@ public: int opacity() const { return mOpacity; }; bool hidable() const { return mHidable; } - LxQt::Settings *settings() const { return mSettings; } + LXQt::Settings *settings() const { return mSettings; } bool isPluginSingletonAndRunnig(QString const & pluginId) const; @@ -119,8 +119,8 @@ public slots: void setIconSize(int value, bool save); void setLineCount(int value, bool save); void setLength(int length, bool inPercents, bool save); - void setPosition(int screen, ILxQtPanel::Position position, bool save); - void setAlignment(LxQtPanel::Alignment value, bool save); + void setPosition(int screen, ILXQtPanel::Position position, bool save); + void setAlignment(LXQtPanel::Alignment value, bool save); void setFontColor(QColor color, bool save); void setBackgroundColor(QColor color, bool save); void setBackgroundImage(QString path, bool save); @@ -132,7 +132,7 @@ public slots: signals: void realigned(); - void deletedByUser(LxQtPanel *self); + void deletedByUser(LXQtPanel *self); void pluginAdded(); void pluginRemoved(); @@ -149,13 +149,13 @@ private slots: void userRequestForDeletion(); private: - LxQtPanelLayout* mLayout; - LxQt::Settings *mSettings; - QFrame *LxQtPanelWidget; + LXQtPanelLayout* mLayout; + LXQt::Settings *mSettings; + QFrame *LXQtPanelWidget; QString mConfigGroup; QScopedPointer mPlugins; - int findAvailableScreen(LxQtPanel::Position position); + int findAvailableScreen(LXQtPanel::Position position); void updateWmStrut(); void loadPlugins(); @@ -172,7 +172,7 @@ private: Alignment mAlignment; - ILxQtPanel::Position mPosition; + ILXQtPanel::Position mPosition; int mScreenNum; QTimer mDelaySave; bool mHidable; diff --git a/panel/lxqtpanelapplication.cpp b/panel/lxqtpanelapplication.cpp index d5c140a..261670f 100644 --- a/panel/lxqtpanelapplication.cpp +++ b/panel/lxqtpanelapplication.cpp @@ -36,8 +36,8 @@ #include #include -LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv) - : LxQt::Application(argc, argv, true) +LXQtPanelApplication::LXQtPanelApplication(int& argc, char** argv) + : LXQt::Application(argc, argv, true) { QCoreApplication::setApplicationName(QStringLiteral("lxqt-panel")); QCoreApplication::setApplicationVersion(LXQT_VERSION); @@ -58,17 +58,17 @@ LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv) const QString configFile = parser.value(configFileOption); if (configFile.isEmpty()) - mSettings = new LxQt::Settings(QStringLiteral("panel"), this); + mSettings = new LXQt::Settings(QStringLiteral("panel"), this); else - mSettings = new LxQt::Settings(configFile, QSettings::IniFormat, this); + mSettings = new LXQt::Settings(configFile, QSettings::IniFormat, this); // This is a workaround for Qt 5 bug #40681. Q_FOREACH(QScreen* screen, screens()) { - connect(screen, &QScreen::destroyed, this, &LxQtPanelApplication::screenDestroyed); + connect(screen, &QScreen::destroyed, this, &LXQtPanelApplication::screenDestroyed); } - connect(this, &QGuiApplication::screenAdded, this, &LxQtPanelApplication::handleScreenAdded); - connect(this, &QCoreApplication::aboutToQuit, this, &LxQtPanelApplication::cleanup); + connect(this, &QGuiApplication::screenAdded, this, &LXQtPanelApplication::handleScreenAdded); + connect(this, &QCoreApplication::aboutToQuit, this, &LXQtPanelApplication::cleanup); QStringList panels = mSettings->value("panels").toStringList(); @@ -84,19 +84,19 @@ LxQtPanelApplication::LxQtPanelApplication(int& argc, char** argv) } } -LxQtPanelApplication::~LxQtPanelApplication() +LXQtPanelApplication::~LXQtPanelApplication() { } -void LxQtPanelApplication::cleanup() +void LXQtPanelApplication::cleanup() { qDeleteAll(mPanels); } -void LxQtPanelApplication::addNewPanel() +void LXQtPanelApplication::addNewPanel() { QString name("panel_" + QUuid::createUuid().toString()); - LxQtPanel *p = addPanel(name); + LXQtPanel *p = addPanel(name); QStringList panels = mSettings->value("panels").toStringList(); panels << name; mSettings->setValue("panels", panels); @@ -105,37 +105,37 @@ void LxQtPanelApplication::addNewPanel() p->showConfigDialog(); } -LxQtPanel* LxQtPanelApplication::addPanel(const QString& name) +LXQtPanel* LXQtPanelApplication::addPanel(const QString& name) { - LxQtPanel *panel = new LxQtPanel(name); + LXQtPanel *panel = new LXQtPanel(name); mPanels << panel; - connect(panel, SIGNAL(deletedByUser(LxQtPanel*)), - this, SLOT(removePanel(LxQtPanel*))); + connect(panel, SIGNAL(deletedByUser(LXQtPanel*)), + this, SLOT(removePanel(LXQtPanel*))); //reemit signals - connect(panel, &LxQtPanel::pluginAdded, this, &LxQtPanelApplication::pluginAdded); - connect(panel, &LxQtPanel::pluginRemoved, this, &LxQtPanelApplication::pluginRemoved); + connect(panel, &LXQtPanel::pluginAdded, this, &LXQtPanelApplication::pluginAdded); + connect(panel, &LXQtPanel::pluginRemoved, this, &LXQtPanelApplication::pluginRemoved); return panel; } -void LxQtPanelApplication::handleScreenAdded(QScreen* newScreen) +void LXQtPanelApplication::handleScreenAdded(QScreen* newScreen) { - // qDebug() << "LxQtPanelApplication::handleScreenAdded" << newScreen; - connect(newScreen, &QScreen::destroyed, this, &LxQtPanelApplication::screenDestroyed); + // qDebug() << "LXQtPanelApplication::handleScreenAdded" << newScreen; + connect(newScreen, &QScreen::destroyed, this, &LXQtPanelApplication::screenDestroyed); } -void LxQtPanelApplication::reloadPanelsAsNeeded() +void LXQtPanelApplication::reloadPanelsAsNeeded() { // NOTE by PCMan: This is a workaround for Qt 5 bug #40681. // Here we try to re-create the missing panels which are deleted in - // LxQtPanelApplication::screenDestroyed(). + // LXQtPanelApplication::screenDestroyed(). - // qDebug() << "LxQtPanelApplication::reloadPanelsAsNeeded()"; + // qDebug() << "LXQtPanelApplication::reloadPanelsAsNeeded()"; QStringList names = mSettings->value("panels").toStringList(); Q_FOREACH(const QString& name, names) { bool found = false; - Q_FOREACH(LxQtPanel* panel, mPanels) + Q_FOREACH(LXQtPanel* panel, mPanels) { if(panel->name() == name) { @@ -153,7 +153,7 @@ void LxQtPanelApplication::reloadPanelsAsNeeded() qApp->setQuitOnLastWindowClosed(true); } -void LxQtPanelApplication::screenDestroyed(QObject* screenObj) +void LXQtPanelApplication::screenDestroyed(QObject* screenObj) { // NOTE by PCMan: This is a workaround for Qt 5 bug #40681. // With this very dirty workaround, we can fix lxde/lxde-qt bug #204, #205, and #206. @@ -182,7 +182,7 @@ void LxQtPanelApplication::screenDestroyed(QObject* screenObj) QScreen* screen = static_cast(screenObj); bool reloadNeeded = false; qApp->setQuitOnLastWindowClosed(false); - Q_FOREACH(LxQtPanel* panel, mPanels) + Q_FOREACH(LXQtPanel* panel, mPanels) { QWindow* panelWindow = panel->windowHandle(); if(panelWindow && panelWindow->screen() == screen) @@ -203,7 +203,7 @@ void LxQtPanelApplication::screenDestroyed(QObject* screenObj) qApp->setQuitOnLastWindowClosed(true); } -void LxQtPanelApplication::removePanel(LxQtPanel* panel) +void LXQtPanelApplication::removePanel(LXQtPanel* panel) { Q_ASSERT(mPanels.contains(panel)); @@ -216,7 +216,7 @@ void LxQtPanelApplication::removePanel(LxQtPanel* panel) panel->deleteLater(); } -bool LxQtPanelApplication::isPluginSingletonAndRunnig(QString const & pluginId) const +bool LXQtPanelApplication::isPluginSingletonAndRunnig(QString const & pluginId) const { for (auto const & panel : mPanels) if (panel->isPluginSingletonAndRunnig(pluginId)) diff --git a/panel/lxqtpanelapplication.h b/panel/lxqtpanelapplication.h index 55d13ca..62b1eae 100644 --- a/panel/lxqtpanelapplication.h +++ b/panel/lxqtpanelapplication.h @@ -34,20 +34,20 @@ class QScreen; -class LxQtPanel; -namespace LxQt { +class LXQtPanel; +namespace LXQt { class Settings; } -class LxQtPanelApplication : public LxQt::Application +class LXQtPanelApplication : public LXQt::Application { Q_OBJECT public: - explicit LxQtPanelApplication(int& argc, char** argv); - ~LxQtPanelApplication(); + explicit LXQtPanelApplication(int& argc, char** argv); + ~LXQtPanelApplication(); int count() { return mPanels.count(); } - LxQt::Settings *settings() { return mSettings; } + LXQt::Settings *settings() { return mSettings; } bool isPluginSingletonAndRunnig(QString const & pluginId) const; public slots: @@ -58,12 +58,12 @@ signals: void pluginRemoved(); private: - QList mPanels; + QList mPanels; - LxQtPanel* addPanel(const QString &name); + LXQtPanel* addPanel(const QString &name); private slots: - void removePanel(LxQtPanel* panel); + void removePanel(LXQtPanel* panel); void handleScreenAdded(QScreen* newScreen); void screenDestroyed(QObject* screenObj); @@ -71,7 +71,7 @@ private slots: void cleanup(); private: - LxQt::Settings *mSettings; + LXQt::Settings *mSettings; }; diff --git a/panel/lxqtpanellayout.cpp b/panel/lxqtpanellayout.cpp index 6416bca..b59b537 100644 --- a/panel/lxqtpanellayout.cpp +++ b/panel/lxqtpanellayout.cpp @@ -409,11 +409,11 @@ void LayoutItemGrid::setHoriz(bool value) /************************************************ ************************************************/ -LxQtPanelLayout::LxQtPanelLayout(QWidget *parent) : +LXQtPanelLayout::LXQtPanelLayout(QWidget *parent) : QLayout(parent), mLeftGrid(new LayoutItemGrid()), mRightGrid(new LayoutItemGrid()), - mPosition(ILxQtPanel::PositionBottom), + mPosition(ILXQtPanel::PositionBottom), mAnimate(false) { setMargin(0); @@ -423,7 +423,7 @@ LxQtPanelLayout::LxQtPanelLayout(QWidget *parent) : /************************************************ ************************************************/ -LxQtPanelLayout::~LxQtPanelLayout() +LXQtPanelLayout::~LXQtPanelLayout() { delete mLeftGrid; delete mRightGrid; @@ -433,7 +433,7 @@ LxQtPanelLayout::~LxQtPanelLayout() /************************************************ ************************************************/ -void LxQtPanelLayout::addItem(QLayoutItem *item) +void LXQtPanelLayout::addItem(QLayoutItem *item) { LayoutItemGrid *grid = mRightGrid; @@ -448,7 +448,7 @@ void LxQtPanelLayout::addItem(QLayoutItem *item) /************************************************ ************************************************/ -void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) +void LXQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) { if (index < mLeftGrid->count()) { @@ -464,7 +464,7 @@ void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int * /************************************************ ************************************************/ -void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) const +void LXQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int *gridIndex) const { if (index < mLeftGrid->count()) { @@ -481,7 +481,7 @@ void LxQtPanelLayout::globalIndexToLocal(int index, LayoutItemGrid **grid, int * /************************************************ ************************************************/ -QLayoutItem *LxQtPanelLayout::itemAt(int index) const +QLayoutItem *LXQtPanelLayout::itemAt(int index) const { if (index < 0 || index >= count()) return 0; @@ -497,7 +497,7 @@ QLayoutItem *LxQtPanelLayout::itemAt(int index) const /************************************************ ************************************************/ -QLayoutItem *LxQtPanelLayout::takeAt(int index) +QLayoutItem *LXQtPanelLayout::takeAt(int index) { if (index < 0 || index >= count()) return 0; @@ -513,7 +513,7 @@ QLayoutItem *LxQtPanelLayout::takeAt(int index) /************************************************ ************************************************/ -int LxQtPanelLayout::count() const +int LXQtPanelLayout::count() const { return mLeftGrid->count() + mRightGrid->count(); } @@ -522,7 +522,7 @@ int LxQtPanelLayout::count() const /************************************************ ************************************************/ -void LxQtPanelLayout::moveItem(int from, int to, bool withAnimation) +void LXQtPanelLayout::moveItem(int from, int to, bool withAnimation) { if (from != to) { @@ -558,7 +558,7 @@ void LxQtPanelLayout::moveItem(int from, int to, bool withAnimation) /************************************************ ************************************************/ -QSize LxQtPanelLayout::sizeHint() const +QSize LXQtPanelLayout::sizeHint() const { if (!mLeftGrid->isValid()) mLeftGrid->update(); @@ -585,7 +585,7 @@ QSize LxQtPanelLayout::sizeHint() const /************************************************ ************************************************/ -void LxQtPanelLayout::setGeometry(const QRect &geometry) +void LXQtPanelLayout::setGeometry(const QRect &geometry) { if (!mLeftGrid->isValid()) mLeftGrid->update(); @@ -611,7 +611,7 @@ void LxQtPanelLayout::setGeometry(const QRect &geometry) /************************************************ ************************************************/ -void LxQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation) +void LXQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation) { Plugin *plugin = qobject_cast(item->widget()); if (withAnimation && plugin) @@ -631,7 +631,7 @@ void LxQtPanelLayout::setItemGeometry(QLayoutItem *item, const QRect &geometry, /************************************************ ************************************************/ -void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry) +void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) { // Calc expFactor for expandable plugins like TaskBar. double expFactor; @@ -654,7 +654,7 @@ void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry) } #if 0 - qDebug() << "** LxQtPanelLayout::setGeometryHoriz **************"; + qDebug() << "** LXQtPanelLayout::setGeometryHoriz **************"; qDebug() << "geometry: " << geometry; qDebug() << "Left grid"; @@ -747,7 +747,7 @@ void LxQtPanelLayout::setGeometryHoriz(const QRect &geometry) /************************************************ ************************************************/ -void LxQtPanelLayout::setGeometryVert(const QRect &geometry) +void LXQtPanelLayout::setGeometryVert(const QRect &geometry) { // Calc expFactor for expandable plugins like TaskBar. double expFactor; @@ -770,7 +770,7 @@ void LxQtPanelLayout::setGeometryVert(const QRect &geometry) } #if 0 - qDebug() << "** LxQtPanelLayout::setGeometryVert **************"; + qDebug() << "** LXQtPanelLayout::setGeometryVert **************"; qDebug() << "geometry: " << geometry; qDebug() << "Left grid"; @@ -862,7 +862,7 @@ void LxQtPanelLayout::setGeometryVert(const QRect &geometry) /************************************************ ************************************************/ -void LxQtPanelLayout::invalidate() +void LXQtPanelLayout::invalidate() { mLeftGrid->invalidate(); mRightGrid->invalidate(); @@ -874,7 +874,7 @@ void LxQtPanelLayout::invalidate() /************************************************ ************************************************/ -int LxQtPanelLayout::lineCount() const +int LXQtPanelLayout::lineCount() const { return mLeftGrid->colCount(); } @@ -883,7 +883,7 @@ int LxQtPanelLayout::lineCount() const /************************************************ ************************************************/ -void LxQtPanelLayout::setLineCount(int value) +void LXQtPanelLayout::setLineCount(int value) { mLeftGrid->setColCount(value); mRightGrid->setColCount(value); @@ -894,7 +894,7 @@ void LxQtPanelLayout::setLineCount(int value) /************************************************ ************************************************/ -int LxQtPanelLayout::lineSize() const +int LXQtPanelLayout::lineSize() const { return mLeftGrid->lineSize(); } @@ -903,7 +903,7 @@ int LxQtPanelLayout::lineSize() const /************************************************ ************************************************/ -void LxQtPanelLayout::setLineSize(int value) +void LXQtPanelLayout::setLineSize(int value) { mLeftGrid->setLineSize(value); mRightGrid->setLineSize(value); @@ -914,7 +914,7 @@ void LxQtPanelLayout::setLineSize(int value) /************************************************ ************************************************/ -void LxQtPanelLayout::setPosition(ILxQtPanel::Position value) +void LXQtPanelLayout::setPosition(ILXQtPanel::Position value) { mPosition = value; mLeftGrid->setHoriz(isHorizontal()); @@ -925,17 +925,17 @@ void LxQtPanelLayout::setPosition(ILxQtPanel::Position value) /************************************************ ************************************************/ -bool LxQtPanelLayout::isHorizontal() const +bool LXQtPanelLayout::isHorizontal() const { - return mPosition == ILxQtPanel::PositionTop || - mPosition == ILxQtPanel::PositionBottom; + return mPosition == ILXQtPanel::PositionTop || + mPosition == ILXQtPanel::PositionBottom; } /************************************************ ************************************************/ -bool LxQtPanelLayout::itemIsSeparate(QLayoutItem *item) +bool LXQtPanelLayout::itemIsSeparate(QLayoutItem *item) { if (!item) return true; @@ -951,7 +951,7 @@ bool LxQtPanelLayout::itemIsSeparate(QLayoutItem *item) /************************************************ ************************************************/ -void LxQtPanelLayout::startMovePlugin() +void LXQtPanelLayout::startMovePlugin() { Plugin *plugin = qobject_cast(sender()); if (plugin) @@ -968,7 +968,7 @@ void LxQtPanelLayout::startMovePlugin() /************************************************ ************************************************/ -void LxQtPanelLayout::finishMovePlugin() +void LXQtPanelLayout::finishMovePlugin() { PluginMoveProcessor *moveProcessor = qobject_cast(sender()); if (moveProcessor) @@ -983,7 +983,7 @@ void LxQtPanelLayout::finishMovePlugin() /************************************************ ************************************************/ -void LxQtPanelLayout::moveUpPlugin(Plugin * plugin) +void LXQtPanelLayout::moveUpPlugin(Plugin * plugin) { const int i = indexOf(plugin); if (0 < i) @@ -993,9 +993,9 @@ void LxQtPanelLayout::moveUpPlugin(Plugin * plugin) /************************************************ ************************************************/ -void LxQtPanelLayout::addPlugin(Plugin * plugin) +void LXQtPanelLayout::addPlugin(Plugin * plugin) { - connect(plugin, &Plugin::startMove, this, &LxQtPanelLayout::startMovePlugin); + connect(plugin, &Plugin::startMove, this, &LXQtPanelLayout::startMovePlugin); const int prev_count = count(); addWidget(plugin); diff --git a/panel/lxqtpanellayout.h b/panel/lxqtpanellayout.h index c833647..91ad572 100644 --- a/panel/lxqtpanellayout.h +++ b/panel/lxqtpanellayout.h @@ -43,12 +43,12 @@ class QEvent; class Plugin; class LayoutItemGrid; -class LXQT_PANEL_API LxQtPanelLayout : public QLayout +class LXQT_PANEL_API LXQtPanelLayout : public QLayout { Q_OBJECT public: - explicit LxQtPanelLayout(QWidget *parent); - ~LxQtPanelLayout(); + explicit LXQtPanelLayout(QWidget *parent); + ~LXQtPanelLayout(); void addItem(QLayoutItem *item); QLayoutItem *itemAt(int index) const; @@ -70,8 +70,8 @@ public: int lineSize() const; void setLineSize(int value); - ILxQtPanel::Position position() const { return mPosition; } - void setPosition(ILxQtPanel::Position value); + ILXQtPanel::Position position() const { return mPosition; } + void setPosition(ILXQtPanel::Position value); static bool itemIsSeparate(QLayoutItem *item); signals: @@ -87,7 +87,7 @@ private: mutable QSize mMinPluginSize; LayoutItemGrid *mLeftGrid; LayoutItemGrid *mRightGrid; - ILxQtPanel::Position mPosition; + ILXQtPanel::Position mPosition; bool mAnimate; diff --git a/panel/lxqtpanelpluginconfigdialog.cpp b/panel/lxqtpanelpluginconfigdialog.cpp index 57bedaf..6d9e53d 100644 --- a/panel/lxqtpanelpluginconfigdialog.cpp +++ b/panel/lxqtpanelpluginconfigdialog.cpp @@ -36,7 +36,7 @@ /************************************************ ************************************************/ -LxQtPanelPluginConfigDialog::LxQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent) : +LXQtPanelPluginConfigDialog::LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent) : QDialog(parent), mSettings(settings), mOldSettings(settings) @@ -47,7 +47,7 @@ LxQtPanelPluginConfigDialog::LxQtPanelPluginConfigDialog(QSettings &settings, QW /************************************************ ************************************************/ -LxQtPanelPluginConfigDialog::~LxQtPanelPluginConfigDialog() +LXQtPanelPluginConfigDialog::~LXQtPanelPluginConfigDialog() { } @@ -55,7 +55,7 @@ LxQtPanelPluginConfigDialog::~LxQtPanelPluginConfigDialog() /************************************************ ************************************************/ -QSettings& LxQtPanelPluginConfigDialog::settings() const +QSettings& LXQtPanelPluginConfigDialog::settings() const { return mSettings; } @@ -65,7 +65,7 @@ QSettings& LxQtPanelPluginConfigDialog::settings() const /************************************************ ************************************************/ -void LxQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn) +void LXQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn) { QDialogButtonBox *box = qobject_cast(btn->parent()); @@ -84,7 +84,7 @@ void LxQtPanelPluginConfigDialog::dialogButtonsAction(QAbstractButton *btn) /************************************************ ************************************************/ -void LxQtPanelPluginConfigDialog::setComboboxIndexByData(QComboBox *comboBox, const QVariant &data, int defaultIndex) const +void LXQtPanelPluginConfigDialog::setComboboxIndexByData(QComboBox *comboBox, const QVariant &data, int defaultIndex) const { int index = comboBox ->findData(data); if (index < 0) diff --git a/panel/lxqtpanelpluginconfigdialog.h b/panel/lxqtpanelpluginconfigdialog.h index 690e383..23025b6 100644 --- a/panel/lxqtpanelpluginconfigdialog.h +++ b/panel/lxqtpanelpluginconfigdialog.h @@ -36,12 +36,12 @@ class QComboBox; -class LXQT_PANEL_API LxQtPanelPluginConfigDialog : public QDialog +class LXQT_PANEL_API LXQtPanelPluginConfigDialog : public QDialog { Q_OBJECT public: - explicit LxQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent = 0); - virtual ~LxQtPanelPluginConfigDialog(); + explicit LXQtPanelPluginConfigDialog(QSettings &settings, QWidget *parent = 0); + virtual ~LXQtPanelPluginConfigDialog(); QSettings& settings() const; @@ -57,7 +57,7 @@ protected: private: QSettings &mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; }; diff --git a/panel/main.cpp b/panel/main.cpp index 53d6921..ba6d047 100644 --- a/panel/main.cpp +++ b/panel/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { - LxQtPanelApplication app(argc, argv); + LXQtPanelApplication app(argc, argv); return app.exec(); } diff --git a/panel/panelpluginsmodel.cpp b/panel/panelpluginsmodel.cpp index 9e87f34..3d78dd7 100644 --- a/panel/panelpluginsmodel.cpp +++ b/panel/panelpluginsmodel.cpp @@ -34,7 +34,7 @@ #include -PanelPluginsModel::PanelPluginsModel(LxQtPanel * panel, +PanelPluginsModel::PanelPluginsModel(LXQtPanel * panel, QString const & namesKey, QStringList const & desktopDirs, QObject * parent/* = nullptr*/) @@ -127,9 +127,9 @@ Plugin const * PanelPluginsModel::pluginByID(QString id) const return nullptr; } -void PanelPluginsModel::addPlugin(const LxQt::PluginInfo &desktopFile) +void PanelPluginsModel::addPlugin(const LXQt::PluginInfo &desktopFile) { - if (dynamic_cast(qApp)->isPluginSingletonAndRunnig(desktopFile.id())) + if (dynamic_cast(qApp)->isPluginSingletonAndRunnig(desktopFile.id())) return; QString name = findNewPluginSettingsGroup(desktopFile.id()); @@ -211,7 +211,7 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs) continue; } - LxQt::PluginInfoList list = LxQt::PluginInfo::search(desktopDirs, "LxQtPanel/Plugin", QString("%1.desktop").arg(type)); + LXQt::PluginInfoList list = LXQt::PluginInfo::search(desktopDirs, "LXQtPanel/Plugin", QString("%1.desktop").arg(type)); if( !list.count()) { qWarning() << QString("Plugin \"%1\" not found.").arg(type); @@ -226,12 +226,12 @@ void PanelPluginsModel::loadPlugins(QStringList const & desktopDirs) } } -QPointer PanelPluginsModel::loadPlugin(LxQt::PluginInfo const & desktopFile, QString const & settingsGroup) +QPointer PanelPluginsModel::loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup) { std::unique_ptr plugin(new Plugin(desktopFile, mPanel->settings()->fileName(), settingsGroup, mPanel)); if (plugin->isLoaded()) { - connect(mPanel, &LxQtPanel::realigned, plugin.get(), &Plugin::realign); + connect(mPanel, &LXQtPanel::realigned, plugin.get(), &Plugin::realign); connect(plugin.get(), &Plugin::remove, this, static_cast(&PanelPluginsModel::removePlugin)); return plugin.release(); @@ -314,7 +314,7 @@ void PanelPluginsModel::onConfigurePlugin() return; Plugin * const plugin = mPlugins[mActive.row()].second.data(); - if (nullptr != plugin && (ILxQtPanelPlugin::HaveConfigDialog & plugin->iPlugin()->flags())) + if (nullptr != plugin && (ILXQtPanelPlugin::HaveConfigDialog & plugin->iPlugin()->flags())) plugin->showConfigureDialog(); } diff --git a/panel/panelpluginsmodel.h b/panel/panelpluginsmodel.h index ed9a8a3..7a090c8 100644 --- a/panel/panelpluginsmodel.h +++ b/panel/panelpluginsmodel.h @@ -29,20 +29,20 @@ #include #include -namespace LxQt +namespace LXQt { class PluginInfo; struct PluginData; } -class LxQtPanel; +class LXQtPanel; class Plugin; class PanelPluginsModel : public QAbstractListModel { Q_OBJECT public: - PanelPluginsModel(LxQtPanel * panel, + PanelPluginsModel(LXQtPanel * panel, QString const & namesKey, QStringList const & desktopDirs, QObject * parent = nullptr); @@ -73,7 +73,7 @@ signals: void pluginMovedUp(Plugin * plugin); public slots: - void addPlugin(const LxQt::PluginInfo &desktopFile); + void addPlugin(const LXQt::PluginInfo &desktopFile); void removePlugin(); // slots for configuration dialog @@ -88,14 +88,14 @@ private: private: void loadPlugins(QStringList const & desktopDirs); - QPointer loadPlugin(LxQt::PluginInfo const & desktopFile, QString const & settingsGroup); + QPointer loadPlugin(LXQt::PluginInfo const & desktopFile, QString const & settingsGroup); QString findNewPluginSettingsGroup(const QString &pluginType) const; bool isActiveIndexValid() const; void removePlugin(pluginslist_t::iterator plugin); const QString mNamesKey; pluginslist_t mPlugins; - LxQtPanel * mPanel; + LXQtPanel * mPanel; QPersistentModelIndex mActive; }; diff --git a/panel/plugin.cpp b/panel/plugin.cpp index b6f930b..51eccd2 100644 --- a/panel/plugin.cpp +++ b/panel/plugin.cpp @@ -65,7 +65,7 @@ QColor Plugin::mMoveMarkerColor= QColor(255, 0, 0, 255); /************************************************ ************************************************/ -Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LxQtPanel *panel) : +Plugin::Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel) : QFrame(panel), mDesktopFile(desktopFile), mPluginLoader(0), @@ -76,7 +76,7 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, mPanel(panel) { - mSettings = new LxQt::Settings(settingsFile, QSettings::IniFormat, this); + mSettings = new LXQt::Settings(settingsFile, QSettings::IniFormat, this); connect(mSettings, SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); mSettings->beginGroup(settingsGroup); @@ -90,7 +90,7 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, dirs << PLUGIN_DIR; bool found = false; - if(ILxQtPanelPluginLibrary const * pluginLib = findStaticPlugin(desktopFile.id())) + if(ILXQtPanelPluginLibrary const * pluginLib = findStaticPlugin(desktopFile.id())) { // this is a static plugin found = true; @@ -120,19 +120,19 @@ Plugin::Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, } // Load plugin translations - LxQt::Translator::translatePlugin(desktopFile.id(), QLatin1String("lxqt-panel")); + LXQt::Translator::translatePlugin(desktopFile.id(), QLatin1String("lxqt-panel")); setObjectName(mPlugin->themeId() + "Plugin"); // plugin handle for easy context menu - setProperty("NeedsHandle", mPlugin->flags().testFlag(ILxQtPanelPlugin::NeedsHandle)); + setProperty("NeedsHandle", mPlugin->flags().testFlag(ILXQtPanelPlugin::NeedsHandle)); QString s = mSettings->value("alignment").toString(); // Retrun default value if (s.isEmpty()) { - mAlignment = (mPlugin->flags().testFlag(ILxQtPanelPlugin::PreferRightAlignment)) ? + mAlignment = (mPlugin->flags().testFlag(ILXQtPanelPlugin::PreferRightAlignment)) ? Plugin::AlignRight : Plugin::AlignLeft; } @@ -184,22 +184,22 @@ void Plugin::setAlignment(Plugin::Alignment alignment) namespace { //helper types for static plugins storage & binary search - typedef std::unique_ptr plugin_ptr_t; + typedef std::unique_ptr plugin_ptr_t; typedef std::pair plugin_pair_t; //NOTE: Please keep the plugins sorted by name while adding new plugins. static plugin_pair_t const static_plugins[] = { #if defined(WITH_CLOCK_PLUGIN) - { QStringLiteral("clock"), plugin_ptr_t{new LxQtClockPluginLibrary} },// clock + { QStringLiteral("clock"), plugin_ptr_t{new LXQtClockPluginLibrary} },// clock #endif #if defined(WITH_DESKTOPSWITCH_PLUGIN) { QStringLiteral("desktopswitch"), plugin_ptr_t{new DesktopSwitchPluginLibrary} },// desktopswitch #endif #if defined(WITH_MAINMENU_PLUGIN) - { QStringLiteral("mainmenu"), plugin_ptr_t{new LxQtMainMenuPluginLibrary} },// mainmenu + { QStringLiteral("mainmenu"), plugin_ptr_t{new LXQtMainMenuPluginLibrary} },// mainmenu #endif #if defined(WITH_QUICKLAUNCH_PLUGIN) - { QStringLiteral("quicklaunch"), plugin_ptr_t{new LxQtQuickLaunchPluginLibrary} },// quicklaunch + { QStringLiteral("quicklaunch"), plugin_ptr_t{new LXQtQuickLaunchPluginLibrary} },// quicklaunch #endif #if defined(WITH_SHOWDESKTOP_PLUGIN) { QStringLiteral("showdesktop"), plugin_ptr_t{new ShowDesktopLibrary} },// showdesktop @@ -211,13 +211,13 @@ namespace { QStringLiteral("statusnotifier"), plugin_ptr_t{new StatusNotifierLibrary} },// statusnotifier #endif #if defined(WITH_TASKBAR_PLUGIN) - { QStringLiteral("taskbar"), plugin_ptr_t{new LxQtTaskBarPluginLibrary} },// taskbar + { QStringLiteral("taskbar"), plugin_ptr_t{new LXQtTaskBarPluginLibrary} },// taskbar #endif #if defined(WITH_TRAY_PLUGIN) - { QStringLiteral("tray"), plugin_ptr_t{new LxQtTrayPluginLibrary} },// tray + { QStringLiteral("tray"), plugin_ptr_t{new LXQtTrayPluginLibrary} },// tray #endif #if defined(WITH_WORLDCLOCK_PLUGIN) - { QStringLiteral("worldclock"), plugin_ptr_t{new LxQtWorldClockLibrary} },// worldclock + { QStringLiteral("worldclock"), plugin_ptr_t{new LXQtWorldClockLibrary} },// worldclock #endif }; static constexpr plugin_pair_t const * const plugins_begin = static_plugins; @@ -234,7 +234,7 @@ namespace static assert_helper h; } -ILxQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryName) +ILXQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryName) { // find a static plugin library by name -> binary search plugin_pair_t const * plugin = std::lower_bound(plugins_begin, plugins_end, libraryName @@ -245,9 +245,9 @@ ILxQtPanelPluginLibrary const * Plugin::findStaticPlugin(const QString &libraryN } // load a plugin from a library -bool Plugin::loadLib(ILxQtPanelPluginLibrary const * pluginLib) +bool Plugin::loadLib(ILXQtPanelPluginLibrary const * pluginLib) { - ILxQtPanelPluginStartupInfo startupInfo; + ILXQtPanelPluginStartupInfo startupInfo; startupInfo.settings = mSettings; startupInfo.desktopFile = &mDesktopFile; startupInfo.lxqtPanel = mPanel; @@ -255,7 +255,7 @@ bool Plugin::loadLib(ILxQtPanelPluginLibrary const * pluginLib) mPlugin = pluginLib->instance(startupInfo); if (!mPlugin) { - qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILxQtPanelPlugin.").arg(mPluginLoader->fileName()); + qWarning() << QString("Can't load plugin \"%1\". Plugin can't build ILXQtPanelPlugin.").arg(mPluginLoader->fileName()); return false; } @@ -286,10 +286,10 @@ bool Plugin::loadModule(const QString &libraryName) return false; } - ILxQtPanelPluginLibrary* pluginLib= qobject_cast(obj); + ILXQtPanelPluginLibrary* pluginLib= qobject_cast(obj); if (!pluginLib) { - qWarning() << QString("Can't load plugin \"%1\". Plugin is not a ILxQtPanelPluginLibrary.").arg(mPluginLoader->fileName()); + qWarning() << QString("Can't load plugin \"%1\". Plugin is not a ILXQtPanelPluginLibrary.").arg(mPluginLoader->fileName()); delete obj; return false; } @@ -356,11 +356,11 @@ void Plugin::mousePressEvent(QMouseEvent *event) switch (event->button()) { case Qt::LeftButton: - mPlugin->activated(ILxQtPanelPlugin::Trigger); + mPlugin->activated(ILXQtPanelPlugin::Trigger); break; case Qt::MidButton: - mPlugin->activated(ILxQtPanelPlugin::MiddleClick); + mPlugin->activated(ILXQtPanelPlugin::MiddleClick); break; default: @@ -374,7 +374,7 @@ void Plugin::mousePressEvent(QMouseEvent *event) ************************************************/ void Plugin::mouseDoubleClickEvent(QMouseEvent*) { - mPlugin->activated(ILxQtPanelPlugin::DoubleClick); + mPlugin->activated(ILXQtPanelPlugin::DoubleClick); } @@ -396,7 +396,7 @@ QMenu *Plugin::popupMenu() const QString name = this->name().replace("&", "&&"); QMenu* menu = new QMenu(windowTitle()); - if (mPlugin->flags().testFlag(ILxQtPanelPlugin::HaveConfigDialog)) + if (mPlugin->flags().testFlag(ILXQtPanelPlugin::HaveConfigDialog)) { QAction* configAction = new QAction( XdgIcon::fromTheme(QStringLiteral("preferences-other")), diff --git a/panel/plugin.h b/panel/plugin.h index d8eff78..e4de2d8 100644 --- a/panel/plugin.h +++ b/panel/plugin.h @@ -37,9 +37,9 @@ class QPluginLoader; class QSettings; -class ILxQtPanelPlugin; -class ILxQtPanelPluginLibrary; -class LxQtPanel; +class ILXQtPanelPlugin; +class ILXQtPanelPluginLibrary; +class LXQtPanel; class QMenu; @@ -55,7 +55,7 @@ public: }; - explicit Plugin(const LxQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LxQtPanel *panel); + explicit Plugin(const LXQt::PluginInfo &desktopFile, const QString &settingsFile, const QString &settingsGroup, LXQtPanel *panel); ~Plugin(); bool isLoaded() const { return mPlugin != 0; } @@ -67,9 +67,9 @@ public: void saveSettings(); QMenu* popupMenu() const; - const ILxQtPanelPlugin * iPlugin() const { return mPlugin; } + const ILXQtPanelPlugin * iPlugin() const { return mPlugin; } - const LxQt::PluginInfo desktopFile() const { return mDesktopFile; } + const LXQt::PluginInfo desktopFile() const { return mDesktopFile; } bool isSeparate() const; bool isExpandable() const; @@ -98,19 +98,19 @@ protected: void showEvent(QShowEvent *event); private: - bool loadLib(ILxQtPanelPluginLibrary const * pluginLib); + bool loadLib(ILXQtPanelPluginLibrary const * pluginLib); bool loadModule(const QString &libraryName); - ILxQtPanelPluginLibrary const * findStaticPlugin(const QString &libraryName); + ILXQtPanelPluginLibrary const * findStaticPlugin(const QString &libraryName); - const LxQt::PluginInfo mDesktopFile; + const LXQt::PluginInfo mDesktopFile; QByteArray calcSettingsHash(); QPluginLoader *mPluginLoader; - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; QWidget *mPluginWidget; Alignment mAlignment; QSettings *mSettings; QString mSettingsGroup; - LxQtPanel *mPanel; + LXQtPanel *mPanel; QByteArray mSettingsHash; static QColor mMoveMarkerColor; QString mName; diff --git a/panel/pluginmoveprocessor.cpp b/panel/pluginmoveprocessor.cpp index 4b7ddb0..67c159a 100644 --- a/panel/pluginmoveprocessor.cpp +++ b/panel/pluginmoveprocessor.cpp @@ -35,7 +35,7 @@ /************************************************ ************************************************/ -PluginMoveProcessor::PluginMoveProcessor(LxQtPanelLayout *layout, Plugin *plugin): +PluginMoveProcessor::PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin): QWidget(plugin), mLayout(layout), mPlugin(plugin) @@ -108,8 +108,8 @@ void PluginMoveProcessor::mouseMoveEvent(QMouseEvent *event) } bool plugSep = mPlugin->isSeparate(); - bool prevSep = LxQtPanelLayout::itemIsSeparate(prevItem); - bool nextSep = LxQtPanelLayout::itemIsSeparate(nextItem); + bool prevSep = LXQtPanelLayout::itemIsSeparate(prevItem); + bool nextSep = LXQtPanelLayout::itemIsSeparate(nextItem); if (!nextItem) { @@ -178,13 +178,13 @@ PluginMoveProcessor::MousePosInfo PluginMoveProcessor::itemByMousePos(const QPoi ret.item = item; if (mLayout->isHorizontal()) { - ret.after = LxQtPanelLayout::itemIsSeparate(item) ? + ret.after = LXQtPanelLayout::itemIsSeparate(item) ? mouse.x() > itemRect.center().x() : mouse.y() > itemRect.center().y() ; } else { - ret.after = LxQtPanelLayout::itemIsSeparate(item) ? + ret.after = LXQtPanelLayout::itemIsSeparate(item) ? mouse.y() > itemRect.center().y() : mouse.x() > itemRect.center().x() ; } diff --git a/panel/pluginmoveprocessor.h b/panel/pluginmoveprocessor.h index 9a25ebb..2ff8bf5 100644 --- a/panel/pluginmoveprocessor.h +++ b/panel/pluginmoveprocessor.h @@ -35,7 +35,7 @@ #include "plugin.h" #include "lxqtpanelglobals.h" -class LxQtPanelLayout; +class LXQtPanelLayout; class QLayoutItem; @@ -43,7 +43,7 @@ class LXQT_PANEL_API PluginMoveProcessor : public QWidget { Q_OBJECT public: - explicit PluginMoveProcessor(LxQtPanelLayout *layout, Plugin *plugin); + explicit PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin); ~PluginMoveProcessor(); Plugin *plugin() const { return mPlugin; } @@ -80,7 +80,7 @@ private: bool after; }; - LxQtPanelLayout *mLayout; + LXQtPanelLayout *mLayout; Plugin *mPlugin; int mDestIndex; diff --git a/panel/translations/lxqt-panel.ts b/panel/translations/lxqt-panel.ts index 29a35b1..fd5c8bb 100644 --- a/panel/translations/lxqt-panel.ts +++ b/panel/translations/lxqt-panel.ts @@ -284,7 +284,7 @@ - LxQtPanel + LXQtPanel diff --git a/panel/translations/lxqt-panel_ar.ts b/panel/translations/lxqt-panel_ar.ts index 69084ec..f9370e3 100644 --- a/panel/translations/lxqt-panel_ar.ts +++ b/panel/translations/lxqt-panel_ar.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure تهيئة @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel تهيئة اللوحة diff --git a/panel/translations/lxqt-panel_cs.ts b/panel/translations/lxqt-panel_cs.ts index 81fe3e7..68a7ddc 100644 --- a/panel/translations/lxqt-panel_cs.ts +++ b/panel/translations/lxqt-panel_cs.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Nastavit @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Nastavit panel diff --git a/panel/translations/lxqt-panel_cs_CZ.ts b/panel/translations/lxqt-panel_cs_CZ.ts index c3dc66e..794d5d2 100644 --- a/panel/translations/lxqt-panel_cs_CZ.ts +++ b/panel/translations/lxqt-panel_cs_CZ.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Nastavit @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Nastavit panel diff --git a/panel/translations/lxqt-panel_da.ts b/panel/translations/lxqt-panel_da.ts index 38d7997..f78ebf8 100644 --- a/panel/translations/lxqt-panel_da.ts +++ b/panel/translations/lxqt-panel_da.ts @@ -238,7 +238,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -272,7 +272,7 @@ - LxQtPanelPluginPrivate + LXQtPanelPluginPrivate Configure Indstil @@ -287,7 +287,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Panel Panel diff --git a/panel/translations/lxqt-panel_da_DK.ts b/panel/translations/lxqt-panel_da_DK.ts index f4d72d3..add9570 100644 --- a/panel/translations/lxqt-panel_da_DK.ts +++ b/panel/translations/lxqt-panel_da_DK.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Indstil @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Indstil panel diff --git a/panel/translations/lxqt-panel_de.ts b/panel/translations/lxqt-panel_de.ts index 9d73207..db3147b 100644 --- a/panel/translations/lxqt-panel_de.ts +++ b/panel/translations/lxqt-panel_de.ts @@ -284,7 +284,7 @@ - LxQtPanel + LXQtPanel diff --git a/panel/translations/lxqt-panel_el_GR.ts b/panel/translations/lxqt-panel_el.ts similarity index 72% rename from panel/translations/lxqt-panel_el_GR.ts rename to panel/translations/lxqt-panel_el.ts index b0a3b99..9e2bf17 100644 --- a/panel/translations/lxqt-panel_el_GR.ts +++ b/panel/translations/lxqt-panel_el.ts @@ -1,6 +1,6 @@ - + ConfigPanelDialog @@ -91,7 +91,7 @@ Configure Panel - + Διαμόρφωση του πίνακα @@ -99,186 +99,186 @@ Configure panel - Διαμόρφωση πίνακα + Διαμόρφωση του πίνακα Size - + Μέγεθος Size: - Μέγεθος: + Μέγεθος: px - + εικ Icon size: - + Μέγεθος εικονιδίων: Length: - Μήκος: + Μήκος: <p>Negative pixel value sets the panel length to that many pixels less than available screen space.</p><p/><p><i>E.g. "Length" set to -100px, screen size is 1000px, then real panel length will be 900 px.</i></p> - + <p>Μια αρνητική τιμή εικονοστοιχείων θέτει το μήκος του πίνακα σε τόσα εικονοστοιχεία λιγότερο από τον διαθέσιμο χώρο της οθόνης.</p><p/><p><i>Π.χ. θέτοντας το «Μήκος» σε -100εικ, και με μέγεθος οθόνης 1000εικ, τότε το πραγματικό μήκος του πίνακα θα είναι 900 εικ.</i></p> % - % + % px - px + εικ Rows count: - + Πλήθος γραμμών: Alignment && position - + Στοίχιση && θέση Left - Αριστερά + Αριστερά Center - Κέντρο + Κέντρο Right - Δεξιά + Δεξιά Alignment: - Στοίχιση: + Στοίχιση: Position: - Θέση: + Θέση: Auto-hide - + Αυτόματη απόκρυψη Styling - + Ύφος Custom font color: - + Προσαρμοσμένο χρώμα γραμματοσειράς: Custom background image: - + Προσαρμοσμένη εικόνα ταπετσαρίας: Custom background color: - + Προσαρμοσμένο χρώμα ταπετσαρίας: Opacity - + Αδιαφάνεια Top of desktop - Επάνω στην επιφάνεια εργασίας + Στην κορυφή της επιφάνεια εργασίας Left of desktop - Αριστερά στην επιφάνεια εργασίας + Στα αριστερά της επιφάνειας εργασίας Right of desktop - Δεξιά στην επιφάνεια εργασίας + Στα δεξιά της επιφάνειας εργασίας Bottom of desktop - Κάτω στην επιφάνεια εργασίας + Στη βάση της επιφάνειας εργασίας Top of desktop %1 - Επάνω στην επιφάνεια εργασίας %1 + Στην κορυφή της επιφάνειας εργασίας %1 Left of desktop %1 - Αριστερά στην επιφάνεια εργασίας %1 + Στα αριστερά της επιφάνειας εργασίας %1 Right of desktop %1 - Δεξιά στην επιφάνεια εργασίας %1 + Στα δεξιά της επιφάνειας εργασίας %1 Bottom of desktop %1 - Κάτω στην επιφάνεια εργασίας %1 + Στη βάση της επιφάνειας εργασίας %1 Top - + Κορυφή Bottom - + Βάση Pick color - + Επιλέξτε το χρώμα Images (*.png *.gif *.jpg) - + Εικόνες (*.png *.gif *.jpg) - LxQtPanel + LXQtPanel Add Panel Widgets - + Προσθήκη γραφικών συστατικών στον πίνακα @@ -289,52 +289,52 @@ Configure Panel... - + Διαμόρφωση του πίνακα... Add Panel Widgets... - + Προσθήκη γραφικών συστατικών στον πίνακα... Add Panel - + Προσθήκη πίνακα Remove Panel - + Αφαίρεση πίνακα Configure panel... - Διαμόρφωση πίνακα... + Διαμόρφωση του πίνακα... Add plugins ... - Προσθήκη επεκτάσεων... + Προσθήκη πρόσθετων... - LxQtPanelPlugin + LXQtPanelPlugin Configure - Διαμόρφωση + Διαμόρφωση Move - Μετακίνηση + Μετακίνηση Remove - Αφαίρεση + Αφαίρεση - LxQtPanelPrivate + LXQtPanelPrivate Configure panel - Διαμόρφωση πίνακα + Διαμόρφωση του πίνακα @@ -342,17 +342,17 @@ Configure "%1" - + Διαμόρφωση του «%1» Move "%1" - + Μετακίνηση του «%1» Remove "%1" - + Αφαίρεση του «%1» diff --git a/panel/translations/lxqt-panel_eo.ts b/panel/translations/lxqt-panel_eo.ts index 4cb2801..8826d82 100644 --- a/panel/translations/lxqt-panel_eo.ts +++ b/panel/translations/lxqt-panel_eo.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -284,7 +284,7 @@ Panel - Agordoj de muso por LxQto + Agordoj de muso por LXQto @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Agordi @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Agordi panelon diff --git a/panel/translations/lxqt-panel_es.ts b/panel/translations/lxqt-panel_es.ts index 23fd321..10d9dc5 100644 --- a/panel/translations/lxqt-panel_es.ts +++ b/panel/translations/lxqt-panel_es.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurar @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurar panel diff --git a/panel/translations/lxqt-panel_es_UY.ts b/panel/translations/lxqt-panel_es_UY.ts index bb6c46e..ec3c2ce 100644 --- a/panel/translations/lxqt-panel_es_UY.ts +++ b/panel/translations/lxqt-panel_es_UY.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -224,7 +224,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Panel Panel diff --git a/panel/translations/lxqt-panel_es_VE.ts b/panel/translations/lxqt-panel_es_VE.ts index 999c321..5ae0a76 100644 --- a/panel/translations/lxqt-panel_es_VE.ts +++ b/panel/translations/lxqt-panel_es_VE.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurar @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurar panel diff --git a/panel/translations/lxqt-panel_eu.ts b/panel/translations/lxqt-panel_eu.ts index 6c1ef09..c4e62aa 100644 --- a/panel/translations/lxqt-panel_eu.ts +++ b/panel/translations/lxqt-panel_eu.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Konfiguratu @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Konfiguratu panela diff --git a/panel/translations/lxqt-panel_fi.ts b/panel/translations/lxqt-panel_fi.ts index 615991e..1d767ef 100644 --- a/panel/translations/lxqt-panel_fi.ts +++ b/panel/translations/lxqt-panel_fi.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Muokkaa @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Muokkaa paneelia diff --git a/panel/translations/lxqt-panel_fr_FR.ts b/panel/translations/lxqt-panel_fr_FR.ts index 18f34f9..28416e5 100644 --- a/panel/translations/lxqt-panel_fr_FR.ts +++ b/panel/translations/lxqt-panel_fr_FR.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurer @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurer le tableau de bord diff --git a/panel/translations/lxqt-panel_hu.ts b/panel/translations/lxqt-panel_hu.ts index 2927d16..73e1cee 100644 --- a/panel/translations/lxqt-panel_hu.ts +++ b/panel/translations/lxqt-panel_hu.ts @@ -222,7 +222,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_hu_HU.ts b/panel/translations/lxqt-panel_hu_HU.ts index 36e03e1..ace76b2 100644 --- a/panel/translations/lxqt-panel_hu_HU.ts +++ b/panel/translations/lxqt-panel_hu_HU.ts @@ -222,7 +222,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_ia.ts b/panel/translations/lxqt-panel_ia.ts index d6eee7d..30a1f16 100644 --- a/panel/translations/lxqt-panel_ia.ts +++ b/panel/translations/lxqt-panel_ia.ts @@ -198,7 +198,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_id_ID.ts b/panel/translations/lxqt-panel_id_ID.ts index 9798e2f..455133e 100644 --- a/panel/translations/lxqt-panel_id_ID.ts +++ b/panel/translations/lxqt-panel_id_ID.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_it.ts b/panel/translations/lxqt-panel_it.ts index 8af869e..433cedb 100644 --- a/panel/translations/lxqt-panel_it.ts +++ b/panel/translations/lxqt-panel_it.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -317,7 +317,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configura @@ -332,7 +332,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configura pannello diff --git a/panel/translations/lxqt-panel_it_IT.ts b/panel/translations/lxqt-panel_it_IT.ts index c5e4236..0a0789f 100644 --- a/panel/translations/lxqt-panel_it_IT.ts +++ b/panel/translations/lxqt-panel_it_IT.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -317,7 +317,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configura @@ -332,7 +332,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configura pannello diff --git a/panel/translations/lxqt-panel_ja.ts b/panel/translations/lxqt-panel_ja.ts index 8cd0fbd..58d4210 100644 --- a/panel/translations/lxqt-panel_ja.ts +++ b/panel/translations/lxqt-panel_ja.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_ko.ts b/panel/translations/lxqt-panel_ko.ts index 50f62a4..a42277e 100644 --- a/panel/translations/lxqt-panel_ko.ts +++ b/panel/translations/lxqt-panel_ko.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_lt.ts b/panel/translations/lxqt-panel_lt.ts index 5798d13..78da977 100644 --- a/panel/translations/lxqt-panel_lt.ts +++ b/panel/translations/lxqt-panel_lt.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Konfigūruoti @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Skydelio konfigūravimas diff --git a/panel/translations/lxqt-panel_nl.ts b/panel/translations/lxqt-panel_nl.ts index cc219c0..47b7e8d 100644 --- a/panel/translations/lxqt-panel_nl.ts +++ b/panel/translations/lxqt-panel_nl.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Instellen @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Paneel instellingen diff --git a/panel/translations/lxqt-panel_pl.ts b/panel/translations/lxqt-panel_pl.ts index 5663502..eae2dd9 100644 --- a/panel/translations/lxqt-panel_pl.ts +++ b/panel/translations/lxqt-panel_pl.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_pl_PL.ts b/panel/translations/lxqt-panel_pl_PL.ts index a7b9e3c..1fc643f 100644 --- a/panel/translations/lxqt-panel_pl_PL.ts +++ b/panel/translations/lxqt-panel_pl_PL.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Konfiguruj @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Konfiguruj panel diff --git a/panel/translations/lxqt-panel_pt.ts b/panel/translations/lxqt-panel_pt.ts index fa48398..9ec44ea 100644 --- a/panel/translations/lxqt-panel_pt.ts +++ b/panel/translations/lxqt-panel_pt.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurar @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurar painel diff --git a/panel/translations/lxqt-panel_pt_BR.ts b/panel/translations/lxqt-panel_pt_BR.ts index b39ddf3..e1ef0a4 100644 --- a/panel/translations/lxqt-panel_pt_BR.ts +++ b/panel/translations/lxqt-panel_pt_BR.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurar @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurar painel diff --git a/panel/translations/lxqt-panel_ro_RO.ts b/panel/translations/lxqt-panel_ro_RO.ts index a23cd5d..ab2e869 100644 --- a/panel/translations/lxqt-panel_ro_RO.ts +++ b/panel/translations/lxqt-panel_ro_RO.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Configurează @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Configurează panoul diff --git a/panel/translations/lxqt-panel_ru.ts b/panel/translations/lxqt-panel_ru.ts index e5b72a8..b47f448 100644 --- a/panel/translations/lxqt-panel_ru.ts +++ b/panel/translations/lxqt-panel_ru.ts @@ -284,7 +284,7 @@ - LxQtPanel + LXQtPanel diff --git a/panel/translations/lxqt-panel_ru_RU.ts b/panel/translations/lxqt-panel_ru_RU.ts index a5ad7a3..884902d 100644 --- a/panel/translations/lxqt-panel_ru_RU.ts +++ b/panel/translations/lxqt-panel_ru_RU.ts @@ -284,7 +284,7 @@ - LxQtPanel + LXQtPanel diff --git a/panel/translations/lxqt-panel_sk_SK.ts b/panel/translations/lxqt-panel_sk_SK.ts index f60ceb5..45b35b8 100644 --- a/panel/translations/lxqt-panel_sk_SK.ts +++ b/panel/translations/lxqt-panel_sk_SK.ts @@ -246,7 +246,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -284,7 +284,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Nastaviť panel diff --git a/panel/translations/lxqt-panel_sl.ts b/panel/translations/lxqt-panel_sl.ts index c8c880a..64fca4f 100644 --- a/panel/translations/lxqt-panel_sl.ts +++ b/panel/translations/lxqt-panel_sl.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Nastavitev @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Nastavitev pulta diff --git a/panel/translations/lxqt-panel_sr@latin.ts b/panel/translations/lxqt-panel_sr@latin.ts index ec6115e..ee079a5 100644 --- a/panel/translations/lxqt-panel_sr@latin.ts +++ b/panel/translations/lxqt-panel_sr@latin.ts @@ -190,7 +190,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets diff --git a/panel/translations/lxqt-panel_sr_BA.ts b/panel/translations/lxqt-panel_sr_BA.ts index d2f3456..79451e8 100644 --- a/panel/translations/lxqt-panel_sr_BA.ts +++ b/panel/translations/lxqt-panel_sr_BA.ts @@ -238,7 +238,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -272,7 +272,7 @@ - LxQtPanelPluginPrivate + LXQtPanelPluginPrivate Configure Подеси @@ -287,7 +287,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Panel Панел diff --git a/panel/translations/lxqt-panel_sr_RS.ts b/panel/translations/lxqt-panel_sr_RS.ts index f44a87f..7fbd082 100644 --- a/panel/translations/lxqt-panel_sr_RS.ts +++ b/panel/translations/lxqt-panel_sr_RS.ts @@ -262,7 +262,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -300,7 +300,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Подеси @@ -311,7 +311,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Подеси панел diff --git a/panel/translations/lxqt-panel_th_TH.ts b/panel/translations/lxqt-panel_th_TH.ts index fcd59a2..2675a84 100644 --- a/panel/translations/lxqt-panel_th_TH.ts +++ b/panel/translations/lxqt-panel_th_TH.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure ปรับแต่ง @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel ปรับแต่งพาเนล diff --git a/panel/translations/lxqt-panel_tr.ts b/panel/translations/lxqt-panel_tr.ts index fe15170..2884500 100644 --- a/panel/translations/lxqt-panel_tr.ts +++ b/panel/translations/lxqt-panel_tr.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Yapılandır @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Paneli yapılandır diff --git a/panel/translations/lxqt-panel_uk.ts b/panel/translations/lxqt-panel_uk.ts index 30af3eb..4f99955 100644 --- a/panel/translations/lxqt-panel_uk.ts +++ b/panel/translations/lxqt-panel_uk.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure Налаштувати @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel Налаштувати панель diff --git a/panel/translations/lxqt-panel_zh_CN.ts b/panel/translations/lxqt-panel_zh_CN.ts index 8aa41d3..1432da6 100644 --- a/panel/translations/lxqt-panel_zh_CN.ts +++ b/panel/translations/lxqt-panel_zh_CN.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure 配置 @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel 配置面板 diff --git a/panel/translations/lxqt-panel_zh_TW.ts b/panel/translations/lxqt-panel_zh_TW.ts index 9c329bb..b88971e 100644 --- a/panel/translations/lxqt-panel_zh_TW.ts +++ b/panel/translations/lxqt-panel_zh_TW.ts @@ -274,7 +274,7 @@ - LxQtPanel + LXQtPanel Add Panel Widgets @@ -284,7 +284,7 @@ Panel - LxQt滑鼠設定 + LXQt滑鼠設定 @@ -316,7 +316,7 @@ - LxQtPanelPlugin + LXQtPanelPlugin Configure 設定 @@ -331,7 +331,7 @@ - LxQtPanelPrivate + LXQtPanelPrivate Configure panel 設定面板 diff --git a/plugin-clock/lxqtclock.cpp b/plugin-clock/lxqtclock.cpp index 47bc42f..79c2c17 100644 --- a/plugin-clock/lxqtclock.cpp +++ b/plugin-clock/lxqtclock.cpp @@ -47,7 +47,7 @@ /** * @file lxqtclock.cpp - * @brief implements LxQtclock and LxQtclockgui + * @brief implements LXQtclock and LXQtclockgui * @author Christopher "VdoP" Regali * @author Kuzma Shapran */ @@ -75,15 +75,15 @@ public: /** * @brief constructor */ -LxQtClock::LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtClock::LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mAutoRotate(true), mTextStyle{new DownscaleFontStyle}, mCurrentCharCount(0) { mMainWidget = new QWidget(); - mRotatedWidget = new LxQt::RotatedWidget(*(new QWidget()), mMainWidget); + mRotatedWidget = new LXQt::RotatedWidget(*(new QWidget()), mMainWidget); mContent = mRotatedWidget->content(); mContent->setStyle(mTextStyle.data()); mTimeLabel = new QLabel(mContent); @@ -121,12 +121,12 @@ LxQtClock::LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo): /** * @brief destructor */ -LxQtClock::~LxQtClock() +LXQtClock::~LXQtClock() { delete mMainWidget; } -QDateTime LxQtClock::currentDateTime() +QDateTime LXQtClock::currentDateTime() { return QDateTime(mUseUTC ? QDateTime::currentDateTimeUtc() : QDateTime::currentDateTime()); } @@ -135,7 +135,7 @@ QDateTime LxQtClock::currentDateTime() * @brief updates the time * Color and font settings can be configured in Qt CSS */ -void LxQtClock::updateTime() +void LXQtClock::updateTime() { //XXX: do we need this with PreciseTimer ? if (currentDateTime().time().msec() > 500) @@ -144,7 +144,7 @@ void LxQtClock::updateTime() showTime(); } -void LxQtClock::showTime() +void LXQtClock::showTime() { QDateTime now{currentDateTime()}; int new_char_count; @@ -170,7 +170,7 @@ void LxQtClock::showTime() } } -void LxQtClock::restartTimer() +void LXQtClock::restartTimer() { if (mClockTimer->isActive()) mClockTimer->stop(); @@ -181,7 +181,7 @@ void LxQtClock::restartTimer() QTimer::singleShot(delay, Qt::PreciseTimer, this, SLOT(updateTime())); } -void LxQtClock::settingsChanged() +void LXQtClock::settingsChanged() { mFirstDayOfWeek = settings()->value("firstDayOfWeek", -1).toInt(); if (-1 == mFirstDayOfWeek) @@ -227,7 +227,7 @@ void LxQtClock::settingsChanged() } } -void LxQtClock::realign() +void LXQtClock::realign() { QSize size{QWIDGETSIZE_MAX, QWIDGETSIZE_MAX}; Qt::Corner origin = Qt::TopLeftCorner; @@ -235,16 +235,16 @@ void LxQtClock::realign() { switch (panel()->position()) { - case ILxQtPanel::PositionTop: - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionTop: + case ILXQtPanel::PositionBottom: origin = Qt::TopLeftCorner; break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: origin = Qt::BottomLeftCorner; break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: origin = Qt::TopRightCorner; break; } @@ -277,9 +277,9 @@ void LxQtClock::realign() } } -void LxQtClock::activated(ActivationReason reason) +void LXQtClock::activated(ActivationReason reason) { - if (reason != ILxQtPanelPlugin::Trigger) + if (reason != ILXQtPanelPlugin::Trigger) return; if (!mCalendarPopup->isVisible()) @@ -294,12 +294,12 @@ void LxQtClock::activated(ActivationReason reason) } } -QDialog * LxQtClock::configureDialog() +QDialog * LXQtClock::configureDialog() { - return new LxQtClockConfiguration(*settings()); + return new LXQtClockConfiguration(*settings()); } -bool LxQtClock::eventFilter(QObject *watched, QEvent *event) +bool LXQtClock::eventFilter(QObject *watched, QEvent *event) { if (watched == mMainWidget) { diff --git a/plugin-clock/lxqtclock.h b/plugin-clock/lxqtclock.h index b3ac0b7..c5e16bf 100644 --- a/plugin-clock/lxqtclock.h +++ b/plugin-clock/lxqtclock.h @@ -43,12 +43,12 @@ class QDialog; class QTimer; class QProxyStyle; -class LxQtClock : public QObject, public ILxQtPanelPlugin +class LXQtClock : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtClock(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtClock(); + LXQtClock(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtClock(); virtual Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } QString themeId() const { return "Clock"; } @@ -71,7 +71,7 @@ private: QTimer* mClockTimer; QWidget *mMainWidget; QWidget *mContent; - LxQt::RotatedWidget* mRotatedWidget; + LXQt::RotatedWidget* mRotatedWidget; QLabel* mTimeLabel; QLabel* mDateLabel; QString mClockFormat; @@ -92,13 +92,13 @@ private: }; -class LxQtClockPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtClockPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new LxQtClock(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtClock(startupInfo);} }; diff --git a/plugin-clock/lxqtclockconfiguration.cpp b/plugin-clock/lxqtclockconfiguration.cpp index ef401a3..4090104 100644 --- a/plugin-clock/lxqtclockconfiguration.cpp +++ b/plugin-clock/lxqtclockconfiguration.cpp @@ -75,9 +75,9 @@ namespace }; } -LxQtClockConfiguration::LxQtClockConfiguration(QSettings &settings, QWidget *parent) : +LXQtClockConfiguration::LXQtClockConfiguration(QSettings &settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtClockConfiguration), + ui(new Ui::LXQtClockConfiguration), mSettings(settings), oldSettings(settings), mOldIndex(1) @@ -109,20 +109,20 @@ LxQtClockConfiguration::LxQtClockConfiguration(QSettings &settings, QWidget *par connect(ui->firstDayOfWeekCB, SIGNAL(activated(int)), SLOT(saveSettings())); } -LxQtClockConfiguration::~LxQtClockConfiguration() +LXQtClockConfiguration::~LXQtClockConfiguration() { delete ui; } static int currentYear = QDate::currentDate().year(); -void LxQtClockConfiguration::addDateFormat(const QString &format) +void LXQtClockConfiguration::addDateFormat(const QString &format) { if (ui->dateFormatCOB->findData(QVariant(format)) == -1) ui->dateFormatCOB->addItem(QDate(currentYear, 1, 1).toString(format), QVariant(format)); } -void LxQtClockConfiguration::createDateFormats() +void LXQtClockConfiguration::createDateFormats() { ui->dateFormatCOB->clear(); @@ -200,7 +200,7 @@ void LxQtClockConfiguration::createDateFormats() ui->dateFormatCOB->addItem(QString("Custom (%1) ...").arg(QDate(currentYear, 1, 1).toString(mCustomDateFormat)), QVariant(mCustomDateFormat)); } -void LxQtClockConfiguration::loadSettings() +void LXQtClockConfiguration::loadSettings() { QString systemDateLocale = QLocale::system().dateFormat(QLocale::ShortFormat).toUpper(); QString systemTimeLocale = QLocale::system().timeFormat(QLocale::ShortFormat).toUpper(); @@ -237,7 +237,7 @@ void LxQtClockConfiguration::loadSettings() ui->firstDayOfWeekCB->setCurrentIndex(dynamic_cast(*(ui->firstDayOfWeekCB->model())).findIndex(mSettings.value("firstDayOfWeek", -1).toInt())); } -void LxQtClockConfiguration::saveSettings() +void LXQtClockConfiguration::saveSettings() { QString timeFormat(ui->ampmClockCB->isChecked() ? "h:mm AP" : "HH:mm"); @@ -263,7 +263,7 @@ void LxQtClockConfiguration::saveSettings() mSettings.setValue("firstDayOfWeek", dynamic_cast(*ui->firstDayOfWeekCB->model()).item(ui->firstDayOfWeekCB->currentIndex(), 0)->data(Qt::UserRole)); } -void LxQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { @@ -276,7 +276,7 @@ void LxQtClockConfiguration::dialogButtonsAction(QAbstractButton *btn) } } -void LxQtClockConfiguration::dateFormatActivated(int index) +void LXQtClockConfiguration::dateFormatActivated(int index) { if (index == ui->dateFormatCOB->count() - 1) { diff --git a/plugin-clock/lxqtclockconfiguration.h b/plugin-clock/lxqtclockconfiguration.h index 96e508d..88d0d6b 100644 --- a/plugin-clock/lxqtclockconfiguration.h +++ b/plugin-clock/lxqtclockconfiguration.h @@ -38,21 +38,21 @@ #include namespace Ui { - class LxQtClockConfiguration; + class LXQtClockConfiguration; } -class LxQtClockConfiguration : public QDialog +class LXQtClockConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtClockConfiguration(QSettings &settings, QWidget *parent = 0); - ~LxQtClockConfiguration(); + explicit LXQtClockConfiguration(QSettings &settings, QWidget *parent = 0); + ~LXQtClockConfiguration(); private: - Ui::LxQtClockConfiguration *ui; + Ui::LXQtClockConfiguration *ui; QSettings &mSettings; - LxQt::SettingsCache oldSettings; + LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. diff --git a/plugin-clock/lxqtclockconfiguration.ui b/plugin-clock/lxqtclockconfiguration.ui index 2eb731e..2912ef3 100644 --- a/plugin-clock/lxqtclockconfiguration.ui +++ b/plugin-clock/lxqtclockconfiguration.ui @@ -1,7 +1,7 @@ - LxQtClockConfiguration - + LXQtClockConfiguration + 0 @@ -167,7 +167,7 @@ buttons accepted() - LxQtClockConfiguration + LXQtClockConfiguration accept() @@ -183,7 +183,7 @@ buttons rejected() - LxQtClockConfiguration + LXQtClockConfiguration reject() diff --git a/plugin-clock/resources/clock.desktop.in b/plugin-clock/resources/clock.desktop.in index 6c9cb32..e6e9901 100644 --- a/plugin-clock/resources/clock.desktop.in +++ b/plugin-clock/resources/clock.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. Icon=preferences-system-time diff --git a/plugin-clock/translations/clock.ts b/plugin-clock/translations/clock.ts index 7914ecd..e50b115 100644 --- a/plugin-clock/translations/clock.ts +++ b/plugin-clock/translations/clock.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_ar.desktop b/plugin-clock/translations/clock_ar.desktop index 92f15ce..9602b9a 100644 --- a/plugin-clock/translations/clock_ar.desktop +++ b/plugin-clock/translations/clock_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_ar.ts b/plugin-clock/translations/clock_ar.ts index 1086869..1dee3d3 100644 --- a/plugin-clock/translations/clock_ar.ts +++ b/plugin-clock/translations/clock_ar.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings إعدادات ساعة ريزر diff --git a/plugin-clock/translations/clock_cs.desktop b/plugin-clock/translations/clock_cs.desktop index 47cf14a..20f6239 100644 --- a/plugin-clock/translations/clock_cs.desktop +++ b/plugin-clock/translations/clock_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_cs.ts b/plugin-clock/translations/clock_cs.ts index 4841169..e905954 100644 --- a/plugin-clock/translations/clock_cs.ts +++ b/plugin-clock/translations/clock_cs.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings Nastavení hodin diff --git a/plugin-clock/translations/clock_cs_CZ.desktop b/plugin-clock/translations/clock_cs_CZ.desktop index 186125e..c99c1f0 100644 --- a/plugin-clock/translations/clock_cs_CZ.desktop +++ b/plugin-clock/translations/clock_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_cs_CZ.ts b/plugin-clock/translations/clock_cs_CZ.ts index 42c09e5..8e868bc 100644 --- a/plugin-clock/translations/clock_cs_CZ.ts +++ b/plugin-clock/translations/clock_cs_CZ.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings Nastavení hodin diff --git a/plugin-clock/translations/clock_da.desktop b/plugin-clock/translations/clock_da.desktop index 297c3d5..79b90c0 100644 --- a/plugin-clock/translations/clock_da.desktop +++ b/plugin-clock/translations/clock_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_da.ts b/plugin-clock/translations/clock_da.ts index 3a5030c..be74b57 100644 --- a/plugin-clock/translations/clock_da.ts +++ b/plugin-clock/translations/clock_da.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings LXQt Ur-Indstillinger diff --git a/plugin-clock/translations/clock_da_DK.desktop b/plugin-clock/translations/clock_da_DK.desktop index b9b678a..a19c078 100644 --- a/plugin-clock/translations/clock_da_DK.desktop +++ b/plugin-clock/translations/clock_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_da_DK.ts b/plugin-clock/translations/clock_da_DK.ts index 3c6ef0e..d03562c 100644 --- a/plugin-clock/translations/clock_da_DK.ts +++ b/plugin-clock/translations/clock_da_DK.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt Urindstillinger + LXQt Clock Settings + LXQt Urindstillinger diff --git a/plugin-clock/translations/clock_de.ts b/plugin-clock/translations/clock_de.ts index af939b0..ddc14e7 100644 --- a/plugin-clock/translations/clock_de.ts +++ b/plugin-clock/translations/clock_de.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_el_GR.desktop b/plugin-clock/translations/clock_el.desktop similarity index 59% rename from plugin-clock/translations/clock_el_GR.desktop rename to plugin-clock/translations/clock_el.desktop index 6d41201..05f41b1 100644 --- a/plugin-clock/translations/clock_el_GR.desktop +++ b/plugin-clock/translations/clock_el.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. @@ -8,5 +8,5 @@ Comment=Displays the current time. Comes with a calendar. # Translations -Comment[el_GR]=Ρολόι και ημερολόγιο -Name[el_GR]=Ρολόι +Comment[el]=Ρολόι και ημερολόγιο +Name[el]=Ρολόι diff --git a/plugin-clock/translations/clock_el_GR.ts b/plugin-clock/translations/clock_el.ts similarity index 67% rename from plugin-clock/translations/clock_el_GR.ts rename to plugin-clock/translations/clock_el.ts index c549c03..e365636 100644 --- a/plugin-clock/translations/clock_el_GR.ts +++ b/plugin-clock/translations/clock_el.ts @@ -1,24 +1,24 @@ - + FirstDayCombo <locale based> - + <locale based> - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Ρυθμίσεις ρολογιού LxQt + LXQt Clock Settings + Ρυθμίσεις ρολογιού LXQt Clock Settings - + Ρυθμίσεις του ρολογιού @@ -38,47 +38,47 @@ &Use UTC - + &Χρήση της UTC Date &format - + Μορφή &ημερομηνίας &Do not show date - + &Να μην εμφανίζεται η ημερομηνία Show date &before time - + Εμφάνιση της ημερομηνίας &πριν την ώρα Show date &after time - + Εμφάνιση της ημερομηνίας &μετά την ώρα Show date below time on new &line - + Εμφάνιση της ημερομηνίας κάτω από την ώρα σε νέα &γραμμή First day of week in calendar - + Η πρώτη ημέρα της εβδομάδας στο ημερολόγιο Orientation - + Προσανατολισμός Auto&rotate when the panel is vertical - + Αυτόματη περιστρο&φή όταν ο πίνακας είναι τοποθετημένος κατακόρυφα &Font @@ -152,7 +152,7 @@ Input custom date format - + Εισαγωγή προσαρμοσμένης μορφής ημερομηνίας @@ -175,7 +175,25 @@ will also be treated as text and not be used as an expression. Custom date format: - + Οι ερμηνευόμενες ακολουθίες της μορφής της ημερομηνίας είναι: + +d η ημέρα ως αριθμός δίχως το αρχικό μηδενικό (1 ως 31) +dd η ημέρα ως αριθμός με το αρχικό μηδενικό (01 ως 31) +ddd η συντομογραφημένη τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευ» ως «Κυρ»). +dddd η μακριά τοπικοποιημένη ονομασία της ημέρας (π.χ. «Δευτέρα» ως «Κυριακή»). +M ο μήνας ως αριθμός δίχως το αρχικό μηδενικό (1-12) +MM ο μήνας ως αριθμός με το αρχικό μηδενικό (01-12) +MMM η συντομογραφημένη τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιαν» ως «Δεκ»). +MMMM η μακριά τοπικοποιημένη ονομασία του μήνα (π.χ. «Ιανουάριος» ως «Δεκέμβριος»). +yy το έτος ως διψήφιος αριθμός (00-99) +yyyy το έτος ως τετραψήφιος αριθμός + +Όλοι οι λοιποί χαρακτήρες εισόδου θα διαχειριστούν ως κείμενο. +Οποιαδήποτε ακολουθία χαρακτήρων που εγκλείονται σε μονά εισαγωγικά (') +θα διαχειρίζονται επίσης ως κείμενο και δεν θα χρησιμοποιούνται ως έκφραση. + + +Προσαρμοσμένη μορφή ημερομηνίας: diff --git a/plugin-clock/translations/clock_eo.desktop b/plugin-clock/translations/clock_eo.desktop index 829eca2..1042ea5 100644 --- a/plugin-clock/translations/clock_eo.desktop +++ b/plugin-clock/translations/clock_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_eo.ts b/plugin-clock/translations/clock_eo.ts index e6ed7ae..e68e1f7 100644 --- a/plugin-clock/translations/clock_eo.ts +++ b/plugin-clock/translations/clock_eo.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Agordoj de horloĝo de LxQt + LXQt Clock Settings + Agordoj de horloĝo de LXQt diff --git a/plugin-clock/translations/clock_es.desktop b/plugin-clock/translations/clock_es.desktop index 4532966..bb26d1f 100644 --- a/plugin-clock/translations/clock_es.desktop +++ b/plugin-clock/translations/clock_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_es.ts b/plugin-clock/translations/clock_es.ts index bbfa100..ef9efd8 100644 --- a/plugin-clock/translations/clock_es.ts +++ b/plugin-clock/translations/clock_es.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Configuración del reloj de LxQt + LXQt Clock Settings + Configuración del reloj de LXQt diff --git a/plugin-clock/translations/clock_es_UY.ts b/plugin-clock/translations/clock_es_UY.ts index ed6fe8d..e68599e 100644 --- a/plugin-clock/translations/clock_es_UY.ts +++ b/plugin-clock/translations/clock_es_UY.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Configuración de Reloj LxQt + LXQt Clock Settings + Configuración de Reloj LXQt diff --git a/plugin-clock/translations/clock_es_VE.desktop b/plugin-clock/translations/clock_es_VE.desktop index 57a9390..2621c2b 100644 --- a/plugin-clock/translations/clock_es_VE.desktop +++ b/plugin-clock/translations/clock_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_es_VE.ts b/plugin-clock/translations/clock_es_VE.ts index 7e34690..078baf9 100644 --- a/plugin-clock/translations/clock_es_VE.ts +++ b/plugin-clock/translations/clock_es_VE.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Configuración de Reloj LxQt + LXQt Clock Settings + Configuración de Reloj LXQt diff --git a/plugin-clock/translations/clock_eu.desktop b/plugin-clock/translations/clock_eu.desktop index 50de260..6edd446 100644 --- a/plugin-clock/translations/clock_eu.desktop +++ b/plugin-clock/translations/clock_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_eu.ts b/plugin-clock/translations/clock_eu.ts index eed3552..ea721e4 100644 --- a/plugin-clock/translations/clock_eu.ts +++ b/plugin-clock/translations/clock_eu.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt erlojuaren ezarpenak + LXQt Clock Settings + LXQt erlojuaren ezarpenak diff --git a/plugin-clock/translations/clock_fi.desktop b/plugin-clock/translations/clock_fi.desktop index 1607eed..0035c6a 100644 --- a/plugin-clock/translations/clock_fi.desktop +++ b/plugin-clock/translations/clock_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_fi.ts b/plugin-clock/translations/clock_fi.ts index 8c1281a..497f346 100644 --- a/plugin-clock/translations/clock_fi.ts +++ b/plugin-clock/translations/clock_fi.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQtin kellon asetukset + LXQt Clock Settings + LXQtin kellon asetukset diff --git a/plugin-clock/translations/clock_fr_FR.desktop b/plugin-clock/translations/clock_fr_FR.desktop index 0c70162..7b81418 100644 --- a/plugin-clock/translations/clock_fr_FR.desktop +++ b/plugin-clock/translations/clock_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_fr_FR.ts b/plugin-clock/translations/clock_fr_FR.ts index 8ed0b11..300a1e3 100644 --- a/plugin-clock/translations/clock_fr_FR.ts +++ b/plugin-clock/translations/clock_fr_FR.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Paramètres de l'horloge de LxQt + LXQt Clock Settings + Paramètres de l'horloge de LXQt diff --git a/plugin-clock/translations/clock_hu.desktop b/plugin-clock/translations/clock_hu.desktop index 89658b5..be55b7c 100644 --- a/plugin-clock/translations/clock_hu.desktop +++ b/plugin-clock/translations/clock_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_hu.ts b/plugin-clock/translations/clock_hu.ts index 1a4cd0e..f067c9a 100644 --- a/plugin-clock/translations/clock_hu.ts +++ b/plugin-clock/translations/clock_hu.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_hu_HU.ts b/plugin-clock/translations/clock_hu_HU.ts index cd65f86..d75fbca 100644 --- a/plugin-clock/translations/clock_hu_HU.ts +++ b/plugin-clock/translations/clock_hu_HU.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_ia.desktop b/plugin-clock/translations/clock_ia.desktop index 525a89d..9c7df24 100644 --- a/plugin-clock/translations/clock_ia.desktop +++ b/plugin-clock/translations/clock_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Clock Comment=Clock and calendar diff --git a/plugin-clock/translations/clock_ia.ts b/plugin-clock/translations/clock_ia.ts index e75a468..18a7634 100644 --- a/plugin-clock/translations/clock_ia.ts +++ b/plugin-clock/translations/clock_ia.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_id_ID.desktop b/plugin-clock/translations/clock_id_ID.desktop index 525a89d..9c7df24 100644 --- a/plugin-clock/translations/clock_id_ID.desktop +++ b/plugin-clock/translations/clock_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Clock Comment=Clock and calendar diff --git a/plugin-clock/translations/clock_id_ID.ts b/plugin-clock/translations/clock_id_ID.ts index 3c7ecab..2b1de00 100644 --- a/plugin-clock/translations/clock_id_ID.ts +++ b/plugin-clock/translations/clock_id_ID.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Setting Waktu LxQt + LXQt Clock Settings + Setting Waktu LXQt diff --git a/plugin-clock/translations/clock_it_IT.desktop b/plugin-clock/translations/clock_it_IT.desktop index 599acac..43e26e2 100644 --- a/plugin-clock/translations/clock_it_IT.desktop +++ b/plugin-clock/translations/clock_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_it_IT.ts b/plugin-clock/translations/clock_it_IT.ts index e9585d5..d815250 100644 --- a/plugin-clock/translations/clock_it_IT.ts +++ b/plugin-clock/translations/clock_it_IT.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Impostazioni dell'orologio di LxQt + LXQt Clock Settings + Impostazioni dell'orologio di LXQt diff --git a/plugin-clock/translations/clock_ja.desktop b/plugin-clock/translations/clock_ja.desktop index e931829..67e702a 100644 --- a/plugin-clock/translations/clock_ja.desktop +++ b/plugin-clock/translations/clock_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_ja.ts b/plugin-clock/translations/clock_ja.ts index 11b263b..a574093 100644 --- a/plugin-clock/translations/clock_ja.ts +++ b/plugin-clock/translations/clock_ja.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_ko.desktop b/plugin-clock/translations/clock_ko.desktop index 525a89d..9c7df24 100644 --- a/plugin-clock/translations/clock_ko.desktop +++ b/plugin-clock/translations/clock_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Clock Comment=Clock and calendar diff --git a/plugin-clock/translations/clock_ko.ts b/plugin-clock/translations/clock_ko.ts index cd7fe2f..46a068b 100644 --- a/plugin-clock/translations/clock_ko.ts +++ b/plugin-clock/translations/clock_ko.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_lt.desktop b/plugin-clock/translations/clock_lt.desktop index d19d0b4..6ccf8b1 100644 --- a/plugin-clock/translations/clock_lt.desktop +++ b/plugin-clock/translations/clock_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_lt.ts b/plugin-clock/translations/clock_lt.ts index 5fc25b6..ad9068e 100644 --- a/plugin-clock/translations/clock_lt.ts +++ b/plugin-clock/translations/clock_lt.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt laikrodžio nuostatos + LXQt Clock Settings + LXQt laikrodžio nuostatos diff --git a/plugin-clock/translations/clock_nl.desktop b/plugin-clock/translations/clock_nl.desktop index e188043..b041bc1 100644 --- a/plugin-clock/translations/clock_nl.desktop +++ b/plugin-clock/translations/clock_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_nl.ts b/plugin-clock/translations/clock_nl.ts index 809e602..964fbaf 100644 --- a/plugin-clock/translations/clock_nl.ts +++ b/plugin-clock/translations/clock_nl.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Instellingen van LxQt Klok + LXQt Clock Settings + Instellingen van LXQt Klok diff --git a/plugin-clock/translations/clock_pl.desktop b/plugin-clock/translations/clock_pl.desktop index bbfd0ef..baefee7 100644 --- a/plugin-clock/translations/clock_pl.desktop +++ b/plugin-clock/translations/clock_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_pl_PL.desktop b/plugin-clock/translations/clock_pl_PL.desktop index 7abe53d..37b3bd9 100644 --- a/plugin-clock/translations/clock_pl_PL.desktop +++ b/plugin-clock/translations/clock_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_pl_PL.ts b/plugin-clock/translations/clock_pl_PL.ts index 13d814a..402dfe6 100644 --- a/plugin-clock/translations/clock_pl_PL.ts +++ b/plugin-clock/translations/clock_pl_PL.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Ustawienia zegara LxQt + LXQt Clock Settings + Ustawienia zegara LXQt diff --git a/plugin-clock/translations/clock_pt.desktop b/plugin-clock/translations/clock_pt.desktop index 059951e..e4a511f 100644 --- a/plugin-clock/translations/clock_pt.desktop +++ b/plugin-clock/translations/clock_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_pt.ts b/plugin-clock/translations/clock_pt.ts index d542707..9584f1b 100644 --- a/plugin-clock/translations/clock_pt.ts +++ b/plugin-clock/translations/clock_pt.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Definições do relógio LxQt + LXQt Clock Settings + Definições do relógio LXQt diff --git a/plugin-clock/translations/clock_pt_BR.desktop b/plugin-clock/translations/clock_pt_BR.desktop index e36ef5f..42aab78 100644 --- a/plugin-clock/translations/clock_pt_BR.desktop +++ b/plugin-clock/translations/clock_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_pt_BR.ts b/plugin-clock/translations/clock_pt_BR.ts index 8b11d95..78fe9dc 100644 --- a/plugin-clock/translations/clock_pt_BR.ts +++ b/plugin-clock/translations/clock_pt_BR.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Configurações do relógio do LxQt + LXQt Clock Settings + Configurações do relógio do LXQt diff --git a/plugin-clock/translations/clock_ro_RO.desktop b/plugin-clock/translations/clock_ro_RO.desktop index 8962abd..d4ca3e1 100644 --- a/plugin-clock/translations/clock_ro_RO.desktop +++ b/plugin-clock/translations/clock_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_ro_RO.ts b/plugin-clock/translations/clock_ro_RO.ts index 02d159a..56fc32e 100644 --- a/plugin-clock/translations/clock_ro_RO.ts +++ b/plugin-clock/translations/clock_ro_RO.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Setări ceas LxQt + LXQt Clock Settings + Setări ceas LXQt diff --git a/plugin-clock/translations/clock_ru.desktop b/plugin-clock/translations/clock_ru.desktop index 4645ab6..c2f060c 100644 --- a/plugin-clock/translations/clock_ru.desktop +++ b/plugin-clock/translations/clock_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_ru.ts b/plugin-clock/translations/clock_ru.ts index a42c171..9f0a591 100644 --- a/plugin-clock/translations/clock_ru.ts +++ b/plugin-clock/translations/clock_ru.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_ru_RU.desktop b/plugin-clock/translations/clock_ru_RU.desktop index 2203144..f277a45 100644 --- a/plugin-clock/translations/clock_ru_RU.desktop +++ b/plugin-clock/translations/clock_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_ru_RU.ts b/plugin-clock/translations/clock_ru_RU.ts index 3a7d645..091b489 100644 --- a/plugin-clock/translations/clock_ru_RU.ts +++ b/plugin-clock/translations/clock_ru_RU.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_sk.desktop b/plugin-clock/translations/clock_sk.desktop index 3dd7569..9730f26 100644 --- a/plugin-clock/translations/clock_sk.desktop +++ b/plugin-clock/translations/clock_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_sk_SK.ts b/plugin-clock/translations/clock_sk_SK.ts index 7b18d0f..a753997 100644 --- a/plugin-clock/translations/clock_sk_SK.ts +++ b/plugin-clock/translations/clock_sk_SK.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Nastavenia hodín prostredia LxQt + LXQt Clock Settings + Nastavenia hodín prostredia LXQt diff --git a/plugin-clock/translations/clock_sl.desktop b/plugin-clock/translations/clock_sl.desktop index 746a765..f056c30 100644 --- a/plugin-clock/translations/clock_sl.desktop +++ b/plugin-clock/translations/clock_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_sl.ts b/plugin-clock/translations/clock_sl.ts index 8d4578e..4e6c3f7 100644 --- a/plugin-clock/translations/clock_sl.ts +++ b/plugin-clock/translations/clock_sl.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Nastavitve ure za LxQt + LXQt Clock Settings + Nastavitve ure za LXQt diff --git a/plugin-clock/translations/clock_sr.desktop b/plugin-clock/translations/clock_sr.desktop index 5d8c28d..363f64e 100644 --- a/plugin-clock/translations/clock_sr.desktop +++ b/plugin-clock/translations/clock_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_sr@latin.desktop b/plugin-clock/translations/clock_sr@latin.desktop index 6a2d68d..e1fbd72 100644 --- a/plugin-clock/translations/clock_sr@latin.desktop +++ b/plugin-clock/translations/clock_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_sr@latin.ts b/plugin-clock/translations/clock_sr@latin.ts index e5388d4..e26bd76 100644 --- a/plugin-clock/translations/clock_sr@latin.ts +++ b/plugin-clock/translations/clock_sr@latin.ts @@ -10,7 +10,7 @@ - LxQtClockConfiguration + LXQtClockConfiguration Clock Settings diff --git a/plugin-clock/translations/clock_sr_BA.ts b/plugin-clock/translations/clock_sr_BA.ts index 47959f0..0dc39d7 100644 --- a/plugin-clock/translations/clock_sr_BA.ts +++ b/plugin-clock/translations/clock_sr_BA.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings Подешавање Рејзоровог сата diff --git a/plugin-clock/translations/clock_sr_RS.ts b/plugin-clock/translations/clock_sr_RS.ts index 0bd4928..3e3482e 100644 --- a/plugin-clock/translations/clock_sr_RS.ts +++ b/plugin-clock/translations/clock_sr_RS.ts @@ -10,9 +10,9 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings + LXQt Clock Settings Подешавање Рејзоровог сата diff --git a/plugin-clock/translations/clock_th_TH.desktop b/plugin-clock/translations/clock_th_TH.desktop index 77446b0..4ec4565 100644 --- a/plugin-clock/translations/clock_th_TH.desktop +++ b/plugin-clock/translations/clock_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_th_TH.ts b/plugin-clock/translations/clock_th_TH.ts index 82b7b13..476d56f 100644 --- a/plugin-clock/translations/clock_th_TH.ts +++ b/plugin-clock/translations/clock_th_TH.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - ค่าตั้งนาฬิกา LxQt + LXQt Clock Settings + ค่าตั้งนาฬิกา LXQt diff --git a/plugin-clock/translations/clock_tr.desktop b/plugin-clock/translations/clock_tr.desktop index 5069f2a..b17ccc5 100644 --- a/plugin-clock/translations/clock_tr.desktop +++ b/plugin-clock/translations/clock_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_tr.ts b/plugin-clock/translations/clock_tr.ts index 5d767f1..cb9fe0f 100644 --- a/plugin-clock/translations/clock_tr.ts +++ b/plugin-clock/translations/clock_tr.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt Saat Ayarları + LXQt Clock Settings + LXQt Saat Ayarları diff --git a/plugin-clock/translations/clock_uk.desktop b/plugin-clock/translations/clock_uk.desktop index 72a0e17..a76879c 100644 --- a/plugin-clock/translations/clock_uk.desktop +++ b/plugin-clock/translations/clock_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_uk.ts b/plugin-clock/translations/clock_uk.ts index c209093..2b4d2e3 100644 --- a/plugin-clock/translations/clock_uk.ts +++ b/plugin-clock/translations/clock_uk.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - Налаштування годинника LxQt + LXQt Clock Settings + Налаштування годинника LXQt diff --git a/plugin-clock/translations/clock_zh_CN.GB2312.desktop b/plugin-clock/translations/clock_zh_CN.GB2312.desktop index 525a89d..9c7df24 100644 --- a/plugin-clock/translations/clock_zh_CN.GB2312.desktop +++ b/plugin-clock/translations/clock_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Clock Comment=Clock and calendar diff --git a/plugin-clock/translations/clock_zh_CN.desktop b/plugin-clock/translations/clock_zh_CN.desktop index ed6f3ae..f875ee0 100644 --- a/plugin-clock/translations/clock_zh_CN.desktop +++ b/plugin-clock/translations/clock_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_zh_CN.ts b/plugin-clock/translations/clock_zh_CN.ts index 93a07c5..0bc763b 100644 --- a/plugin-clock/translations/clock_zh_CN.ts +++ b/plugin-clock/translations/clock_zh_CN.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt时钟设置 + LXQt Clock Settings + LXQt时钟设置 diff --git a/plugin-clock/translations/clock_zh_TW.desktop b/plugin-clock/translations/clock_zh_TW.desktop index fb8312c..12bbe25 100644 --- a/plugin-clock/translations/clock_zh_TW.desktop +++ b/plugin-clock/translations/clock_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Date & time Comment=Displays the current time. Comes with a calendar. diff --git a/plugin-clock/translations/clock_zh_TW.ts b/plugin-clock/translations/clock_zh_TW.ts index bc16a59..cb48389 100644 --- a/plugin-clock/translations/clock_zh_TW.ts +++ b/plugin-clock/translations/clock_zh_TW.ts @@ -10,10 +10,10 @@ - LxQtClockConfiguration + LXQtClockConfiguration - LxQt Clock Settings - LxQt時鐘設定 + LXQt Clock Settings + LXQt時鐘設定 diff --git a/plugin-colorpicker/colorpicker.cpp b/plugin-colorpicker/colorpicker.cpp index e5da880..0654ae1 100644 --- a/plugin-colorpicker/colorpicker.cpp +++ b/plugin-colorpicker/colorpicker.cpp @@ -30,9 +30,9 @@ #include -ColorPicker::ColorPicker(const ILxQtPanelPluginStartupInfo &startupInfo) : +ColorPicker::ColorPicker(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { realign(); } diff --git a/plugin-colorpicker/colorpicker.h b/plugin-colorpicker/colorpicker.h index de63a48..5815680 100644 --- a/plugin-colorpicker/colorpicker.h +++ b/plugin-colorpicker/colorpicker.h @@ -62,11 +62,11 @@ private: }; -class ColorPicker : public QObject, public ILxQtPanelPlugin +class ColorPicker : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - ColorPicker(const ILxQtPanelPluginStartupInfo &startupInfo); + ColorPicker(const ILXQtPanelPluginStartupInfo &startupInfo); ~ColorPicker(); virtual QWidget *widget() { return &mWidget; } @@ -80,13 +80,13 @@ private: ColorPickerWidget mWidget; }; -class ColorPickerLibrary: public QObject, public ILxQtPanelPluginLibrary +class ColorPickerLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new ColorPicker(startupInfo); } diff --git a/plugin-colorpicker/resources/colorpicker.desktop.in b/plugin-colorpicker/resources/colorpicker.desktop.in index b34ac80..81e7b6e 100644 --- a/plugin-colorpicker/resources/colorpicker.desktop.in +++ b/plugin-colorpicker/resources/colorpicker.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. Icon=color-picker diff --git a/plugin-colorpicker/translations/colorpicker_cs.desktop b/plugin-colorpicker/translations/colorpicker_cs.desktop index b36929e..26590ac 100644 --- a/plugin-colorpicker/translations/colorpicker_cs.desktop +++ b/plugin-colorpicker/translations/colorpicker_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_cs_CZ.desktop b/plugin-colorpicker/translations/colorpicker_cs_CZ.desktop index 09c6dfb..5d09cb0 100644 --- a/plugin-colorpicker/translations/colorpicker_cs_CZ.desktop +++ b/plugin-colorpicker/translations/colorpicker_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_da.desktop b/plugin-colorpicker/translations/colorpicker_da.desktop index c3b07fe..6519984 100644 --- a/plugin-colorpicker/translations/colorpicker_da.desktop +++ b/plugin-colorpicker/translations/colorpicker_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_da_DK.desktop b/plugin-colorpicker/translations/colorpicker_da_DK.desktop index 58858be..dc9efbb 100644 --- a/plugin-colorpicker/translations/colorpicker_da_DK.desktop +++ b/plugin-colorpicker/translations/colorpicker_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_el.desktop b/plugin-colorpicker/translations/colorpicker_el.desktop new file mode 100644 index 0000000..abaa4a5 --- /dev/null +++ b/plugin-colorpicker/translations/colorpicker_el.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LxQtPanel/Plugin +Name=Color picker +Comment=Get the color under the cursor. For web developers. + + +# Translations +Name[el]=Επιλογέας χρωμάτων +Comment[el]=Λήψη του χρώματος κάτω από τον δρομέα. Για προγραμματιστές ιστοσελίδων. diff --git a/plugin-colorpicker/translations/colorpicker_el_GR.desktop b/plugin-colorpicker/translations/colorpicker_el_GR.desktop deleted file mode 100644 index f2ae6b5..0000000 --- a/plugin-colorpicker/translations/colorpicker_el_GR.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Color picker -Comment=Get the color under the cursor. For web developers. - - -# Translations -Comment[el_GR]=Λήψη του χρώματος κάτω από τον δείκτη. Για σχεδιαστές ιστοσελίδων. -Name[el_GR]=Επιλογέας χρωμάτων diff --git a/plugin-colorpicker/translations/colorpicker_es.desktop b/plugin-colorpicker/translations/colorpicker_es.desktop index cbfa2ab..0758b57 100644 --- a/plugin-colorpicker/translations/colorpicker_es.desktop +++ b/plugin-colorpicker/translations/colorpicker_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_es_VE.desktop b/plugin-colorpicker/translations/colorpicker_es_VE.desktop index 9a9ed72..7e1a0a9 100644 --- a/plugin-colorpicker/translations/colorpicker_es_VE.desktop +++ b/plugin-colorpicker/translations/colorpicker_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_eu.desktop b/plugin-colorpicker/translations/colorpicker_eu.desktop index 75de838..f96a790 100644 --- a/plugin-colorpicker/translations/colorpicker_eu.desktop +++ b/plugin-colorpicker/translations/colorpicker_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_fi.desktop b/plugin-colorpicker/translations/colorpicker_fi.desktop index 9ecf4a5..1bbc9fe 100644 --- a/plugin-colorpicker/translations/colorpicker_fi.desktop +++ b/plugin-colorpicker/translations/colorpicker_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_hu.desktop b/plugin-colorpicker/translations/colorpicker_hu.desktop index 4ac60b7..161f6a2 100644 --- a/plugin-colorpicker/translations/colorpicker_hu.desktop +++ b/plugin-colorpicker/translations/colorpicker_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_it_IT.desktop b/plugin-colorpicker/translations/colorpicker_it_IT.desktop index 2e47e9c..9b8c8e7 100644 --- a/plugin-colorpicker/translations/colorpicker_it_IT.desktop +++ b/plugin-colorpicker/translations/colorpicker_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_ja.desktop b/plugin-colorpicker/translations/colorpicker_ja.desktop index 28d5645..479f63d 100644 --- a/plugin-colorpicker/translations/colorpicker_ja.desktop +++ b/plugin-colorpicker/translations/colorpicker_ja.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=カラーピッカー Comment=カーソルの下の色を取得します。ウェブ制作者向け diff --git a/plugin-colorpicker/translations/colorpicker_pl_PL.desktop b/plugin-colorpicker/translations/colorpicker_pl_PL.desktop index 54f8b77..5859c2d 100644 --- a/plugin-colorpicker/translations/colorpicker_pl_PL.desktop +++ b/plugin-colorpicker/translations/colorpicker_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_pt.desktop b/plugin-colorpicker/translations/colorpicker_pt.desktop index 883aee7..71c9dda 100644 --- a/plugin-colorpicker/translations/colorpicker_pt.desktop +++ b/plugin-colorpicker/translations/colorpicker_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_pt_BR.desktop b/plugin-colorpicker/translations/colorpicker_pt_BR.desktop index c11923a..b3b4041 100644 --- a/plugin-colorpicker/translations/colorpicker_pt_BR.desktop +++ b/plugin-colorpicker/translations/colorpicker_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_ro_RO.desktop b/plugin-colorpicker/translations/colorpicker_ro_RO.desktop index 39f7cdf..5ac3e64 100644 --- a/plugin-colorpicker/translations/colorpicker_ro_RO.desktop +++ b/plugin-colorpicker/translations/colorpicker_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_ru.desktop b/plugin-colorpicker/translations/colorpicker_ru.desktop index c6f49bc..d20ecb6 100644 --- a/plugin-colorpicker/translations/colorpicker_ru.desktop +++ b/plugin-colorpicker/translations/colorpicker_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_ru_RU.desktop b/plugin-colorpicker/translations/colorpicker_ru_RU.desktop index 84caabe..9c3de34 100644 --- a/plugin-colorpicker/translations/colorpicker_ru_RU.desktop +++ b/plugin-colorpicker/translations/colorpicker_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_th_TH.desktop b/plugin-colorpicker/translations/colorpicker_th_TH.desktop index f00ba2d..d25b733 100644 --- a/plugin-colorpicker/translations/colorpicker_th_TH.desktop +++ b/plugin-colorpicker/translations/colorpicker_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_uk.desktop b/plugin-colorpicker/translations/colorpicker_uk.desktop index 807d3e2..62e8dc7 100644 --- a/plugin-colorpicker/translations/colorpicker_uk.desktop +++ b/plugin-colorpicker/translations/colorpicker_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_zh_CN.desktop b/plugin-colorpicker/translations/colorpicker_zh_CN.desktop index 6017e30..3818ab5 100644 --- a/plugin-colorpicker/translations/colorpicker_zh_CN.desktop +++ b/plugin-colorpicker/translations/colorpicker_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-colorpicker/translations/colorpicker_zh_TW.desktop b/plugin-colorpicker/translations/colorpicker_zh_TW.desktop index 0438cb1..eabf497 100644 --- a/plugin-colorpicker/translations/colorpicker_zh_TW.desktop +++ b/plugin-colorpicker/translations/colorpicker_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Color picker Comment=Get the color under the cursor. For web developers. diff --git a/plugin-cpuload/lxqtcpuload.cpp b/plugin-cpuload/lxqtcpuload.cpp index 1e08ac3..f712672 100644 --- a/plugin-cpuload/lxqtcpuload.cpp +++ b/plugin-cpuload/lxqtcpuload.cpp @@ -47,7 +47,7 @@ extern "C" { #define BAR_ORIENT_RIGHTLEFT "rightLeft" -LxQtCpuLoad::LxQtCpuLoad(ILxQtPanelPlugin* plugin, QWidget* parent): +LXQtCpuLoad::LXQtCpuLoad(ILXQtPanelPlugin* plugin, QWidget* parent): QFrame(parent), mPlugin(plugin), m_showText(false), @@ -55,7 +55,7 @@ LxQtCpuLoad::LxQtCpuLoad(ILxQtPanelPlugin* plugin, QWidget* parent): m_barOrientation(TopDownBar), m_timerID(-1) { - setObjectName("LxQtCpuLoad"); + setObjectName("LXQtCpuLoad"); QHBoxLayout *layout = new QHBoxLayout(this); layout->setSpacing(0); @@ -79,11 +79,11 @@ LxQtCpuLoad::LxQtCpuLoad(ILxQtPanelPlugin* plugin, QWidget* parent): settingsChanged(); } -LxQtCpuLoad::~LxQtCpuLoad() +LXQtCpuLoad::~LXQtCpuLoad() { } -void LxQtCpuLoad::setSizes() +void LXQtCpuLoad::setSizes() { if (m_barOrientation == RightToLeftBar || m_barOrientation == LeftToRightBar) { @@ -97,14 +97,14 @@ void LxQtCpuLoad::setSizes() } } -void LxQtCpuLoad::resizeEvent(QResizeEvent *) +void LXQtCpuLoad::resizeEvent(QResizeEvent *) { setSizes(); update(); } -double LxQtCpuLoad::getLoadCpu() const +double LXQtCpuLoad::getLoadCpu() const { #ifdef STATGRAB_NEWER_THAN_0_90 size_t count; @@ -115,7 +115,7 @@ double LxQtCpuLoad::getLoadCpu() const return (cur->user + cur->kernel + cur->nice); } -void LxQtCpuLoad::timerEvent(QTimerEvent *event) +void LXQtCpuLoad::timerEvent(QTimerEvent *event) { double avg = getLoadCpu(); if ( qAbs(m_avg-avg)>1 ) @@ -126,7 +126,7 @@ void LxQtCpuLoad::timerEvent(QTimerEvent *event) } } -void LxQtCpuLoad::paintEvent ( QPaintEvent * ) +void LXQtCpuLoad::paintEvent ( QPaintEvent * ) { QPainter p(this); QPen pen; @@ -185,7 +185,7 @@ void LxQtCpuLoad::paintEvent ( QPaintEvent * ) } -void LxQtCpuLoad::settingsChanged() +void LXQtCpuLoad::settingsChanged() { if (m_timerID != -1) killTimer(m_timerID); diff --git a/plugin-cpuload/lxqtcpuload.h b/plugin-cpuload/lxqtcpuload.h index ca35e1d..7f65da3 100644 --- a/plugin-cpuload/lxqtcpuload.h +++ b/plugin-cpuload/lxqtcpuload.h @@ -29,9 +29,9 @@ #define LXQTCPULOAD_H #include -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; -class LxQtCpuLoad: public QFrame +class LXQtCpuLoad: public QFrame { Q_OBJECT @@ -48,8 +48,8 @@ public: LeftToRightBar //! Bar begins at left edge and grows to the right }; - LxQtCpuLoad(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - ~LxQtCpuLoad(); + LXQtCpuLoad(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + ~LXQtCpuLoad(); void settingsChanged(); @@ -66,7 +66,7 @@ private: double getLoadCpu() const; void setSizes(); - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; QWidget m_stuff; //! average load diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.cpp b/plugin-cpuload/lxqtcpuloadconfiguration.cpp index c52e1a2..d4d400f 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.cpp +++ b/plugin-cpuload/lxqtcpuloadconfiguration.cpp @@ -33,9 +33,9 @@ #define BAR_ORIENT_LEFTRIGHT "leftRight" #define BAR_ORIENT_RIGHTLEFT "rightLeft" -LxQtCpuLoadConfiguration::LxQtCpuLoadConfiguration(QSettings *settings, QWidget *parent) : +LXQtCpuLoadConfiguration::LXQtCpuLoadConfiguration(QSettings *settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtCpuLoadConfiguration), + ui(new Ui::LXQtCpuLoadConfiguration), mSettings(settings), mOldSettings(settings) { @@ -60,12 +60,12 @@ LxQtCpuLoadConfiguration::LxQtCpuLoadConfiguration(QSettings *settings, QWidget this, SLOT(barOrientationChanged(int))); } -LxQtCpuLoadConfiguration::~LxQtCpuLoadConfiguration() +LXQtCpuLoadConfiguration::~LXQtCpuLoadConfiguration() { delete ui; } -void LxQtCpuLoadConfiguration::fillBarOrientations() +void LXQtCpuLoadConfiguration::fillBarOrientations() { ui->barOrientationCOB->addItem(trUtf8("Bottom up"), BAR_ORIENT_BOTTOMUP); ui->barOrientationCOB->addItem(trUtf8("Top down"), BAR_ORIENT_TOPDOWN); @@ -73,7 +73,7 @@ void LxQtCpuLoadConfiguration::fillBarOrientations() ui->barOrientationCOB->addItem(trUtf8("Right to left"), BAR_ORIENT_RIGHTLEFT); } -void LxQtCpuLoadConfiguration::loadSettings() +void LXQtCpuLoadConfiguration::loadSettings() { ui->showTextCB->setChecked(mSettings->value("showText", false).toBool()); ui->barWidthSB->setValue(mSettings->value("barWidth", 20).toInt()); @@ -93,27 +93,27 @@ void LxQtCpuLoadConfiguration::loadSettings() // ui->shortcutEd->setKeySequence(mSettings->value("shortcut", "Alt+F1").toString()); } -void LxQtCpuLoadConfiguration::showTextChanged(bool value) +void LXQtCpuLoadConfiguration::showTextChanged(bool value) { mSettings->setValue("showText", value); } -void LxQtCpuLoadConfiguration::barWidthChanged(int value) +void LXQtCpuLoadConfiguration::barWidthChanged(int value) { mSettings->setValue("barWidth", value); } -void LxQtCpuLoadConfiguration::updateIntervalChanged(double value) +void LXQtCpuLoadConfiguration::updateIntervalChanged(double value) { mSettings->setValue("updateInterval", value*1000); } -void LxQtCpuLoadConfiguration::barOrientationChanged(int index) +void LXQtCpuLoadConfiguration::barOrientationChanged(int index) { mSettings->setValue("barOrientation", ui->barOrientationCOB->itemData(index).toString()); } -void LxQtCpuLoadConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtCpuLoadConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.h b/plugin-cpuload/lxqtcpuloadconfiguration.h index c1a4336..2c3c41d 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.h +++ b/plugin-cpuload/lxqtcpuloadconfiguration.h @@ -37,21 +37,21 @@ class QSettings; class QAbstractButton; namespace Ui { - class LxQtCpuLoadConfiguration; + class LXQtCpuLoadConfiguration; } -class LxQtCpuLoadConfiguration : public QDialog +class LXQtCpuLoadConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtCpuLoadConfiguration(QSettings *settings, QWidget *parent = 0); - ~LxQtCpuLoadConfiguration(); + explicit LXQtCpuLoadConfiguration(QSettings *settings, QWidget *parent = 0); + ~LXQtCpuLoadConfiguration(); private: - Ui::LxQtCpuLoadConfiguration *ui; + Ui::LXQtCpuLoadConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; /* Fills Bar orientation combobox diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.ui b/plugin-cpuload/lxqtcpuloadconfiguration.ui index b578503..0c9037d 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.ui +++ b/plugin-cpuload/lxqtcpuloadconfiguration.ui @@ -1,7 +1,7 @@ - LxQtCpuLoadConfiguration - + LXQtCpuLoadConfiguration + 0 diff --git a/plugin-cpuload/lxqtcpuloadplugin.cpp b/plugin-cpuload/lxqtcpuloadplugin.cpp index 24c16ef..5777637 100644 --- a/plugin-cpuload/lxqtcpuloadplugin.cpp +++ b/plugin-cpuload/lxqtcpuloadplugin.cpp @@ -32,12 +32,12 @@ #include -LxQtCpuLoadPlugin::LxQtCpuLoadPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtCpuLoadPlugin::LXQtCpuLoadPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { mWidget = new QWidget(); - mContent = new LxQtCpuLoad(this, mWidget); + mContent = new LXQtCpuLoad(this, mWidget); QVBoxLayout *layout = new QVBoxLayout(mWidget); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); @@ -45,22 +45,22 @@ LxQtCpuLoadPlugin::LxQtCpuLoadPlugin(const ILxQtPanelPluginStartupInfo &startupI layout->setStretchFactor(mContent, 1); } -LxQtCpuLoadPlugin::~LxQtCpuLoadPlugin() +LXQtCpuLoadPlugin::~LXQtCpuLoadPlugin() { delete mWidget; } -QWidget *LxQtCpuLoadPlugin::widget() +QWidget *LXQtCpuLoadPlugin::widget() { return mWidget; } -QDialog *LxQtCpuLoadPlugin::configureDialog() +QDialog *LXQtCpuLoadPlugin::configureDialog() { - return new LxQtCpuLoadConfiguration(settings()); + return new LXQtCpuLoadConfiguration(settings()); } -void LxQtCpuLoadPlugin::settingsChanged() +void LXQtCpuLoadPlugin::settingsChanged() { mContent->settingsChanged(); } diff --git a/plugin-cpuload/lxqtcpuloadplugin.h b/plugin-cpuload/lxqtcpuloadplugin.h index 9f60712..66c03cd 100644 --- a/plugin-cpuload/lxqtcpuloadplugin.h +++ b/plugin-cpuload/lxqtcpuloadplugin.h @@ -32,16 +32,16 @@ #include "../panel/ilxqtpanelplugin.h" #include -class LxQtCpuLoad; +class LXQtCpuLoad; -class LxQtCpuLoadPlugin: public QObject, public ILxQtPanelPlugin +class LXQtCpuLoadPlugin: public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - explicit LxQtCpuLoadPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtCpuLoadPlugin(); + explicit LXQtCpuLoadPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtCpuLoadPlugin(); - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); virtual QString themeId() const { return "CpuLoad"; } @@ -53,19 +53,19 @@ protected: private: QWidget *mWidget; - LxQtCpuLoad *mContent; + LXQtCpuLoad *mContent; }; -class LxQtCpuLoadPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtCpuLoadPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtCpuLoadPlugin(startupInfo); + return new LXQtCpuLoadPlugin(startupInfo); } }; diff --git a/plugin-cpuload/resources/cpuload.desktop.in b/plugin-cpuload/resources/cpuload.desktop.in index fe52e0d..4f385d0 100644 --- a/plugin-cpuload/resources/cpuload.desktop.in +++ b/plugin-cpuload/resources/cpuload.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=CPU monitor Comment=Displays the current CPU load. Icon=cpu diff --git a/plugin-cpuload/translations/cpuload.ts b/plugin-cpuload/translations/cpuload.ts index 24f94e7..47c7e27 100644 --- a/plugin-cpuload/translations/cpuload.ts +++ b/plugin-cpuload/translations/cpuload.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_ar.desktop b/plugin-cpuload/translations/cpuload_ar.desktop index 1d22bc6..5e1bed3 100644 --- a/plugin-cpuload/translations/cpuload_ar.desktop +++ b/plugin-cpuload/translations/cpuload_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_ar.ts b/plugin-cpuload/translations/cpuload_ar.ts index 21c7afa..dac07e6 100644 --- a/plugin-cpuload/translations/cpuload_ar.ts +++ b/plugin-cpuload/translations/cpuload_ar.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_cs.desktop b/plugin-cpuload/translations/cpuload_cs.desktop index 58b2e3e..0fa73c4 100644 --- a/plugin-cpuload/translations/cpuload_cs.desktop +++ b/plugin-cpuload/translations/cpuload_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_cs.ts b/plugin-cpuload/translations/cpuload_cs.ts index f2a68b6..88697ba 100644 --- a/plugin-cpuload/translations/cpuload_cs.ts +++ b/plugin-cpuload/translations/cpuload_cs.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Vytížení procesoru %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Nastavení vytížení procesoru v LxQtu + LXQt Cpu Load settings + Nastavení vytížení procesoru v LXQtu diff --git a/plugin-cpuload/translations/cpuload_cs_CZ.desktop b/plugin-cpuload/translations/cpuload_cs_CZ.desktop index c33207b..e071ccc 100644 --- a/plugin-cpuload/translations/cpuload_cs_CZ.desktop +++ b/plugin-cpuload/translations/cpuload_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_cs_CZ.ts b/plugin-cpuload/translations/cpuload_cs_CZ.ts index 4353ca8..89de34b 100644 --- a/plugin-cpuload/translations/cpuload_cs_CZ.ts +++ b/plugin-cpuload/translations/cpuload_cs_CZ.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Vytížení procesoru %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Nastavení vytížení procesoru v LxQtu + LXQt Cpu Load settings + Nastavení vytížení procesoru v LXQtu diff --git a/plugin-cpuload/translations/cpuload_da.desktop b/plugin-cpuload/translations/cpuload_da.desktop index 2258043..6ed5159 100644 --- a/plugin-cpuload/translations/cpuload_da.desktop +++ b/plugin-cpuload/translations/cpuload_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_da_DK.desktop b/plugin-cpuload/translations/cpuload_da_DK.desktop index 81e2292..7e5645e 100644 --- a/plugin-cpuload/translations/cpuload_da_DK.desktop +++ b/plugin-cpuload/translations/cpuload_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_da_DK.ts b/plugin-cpuload/translations/cpuload_da_DK.ts index 85f499f..f1715ea 100644 --- a/plugin-cpuload/translations/cpuload_da_DK.ts +++ b/plugin-cpuload/translations/cpuload_da_DK.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% CPU belastning %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQt CPU-belastning indstillinger + LXQt Cpu Load settings + LXQt CPU-belastning indstillinger diff --git a/plugin-cpuload/translations/cpuload_de.ts b/plugin-cpuload/translations/cpuload_de.ts index f1dc15b..2716f0c 100644 --- a/plugin-cpuload/translations/cpuload_de.ts +++ b/plugin-cpuload/translations/cpuload_de.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_el.desktop b/plugin-cpuload/translations/cpuload_el.desktop new file mode 100644 index 0000000..3173b2f --- /dev/null +++ b/plugin-cpuload/translations/cpuload_el.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin + +Name=Cpu monitor +Comment=Displays the current CPU load. + + + + +# Translations +Name[el]=Επόπτης του επεξεργαστή +Comment[el]=Εμφανίζει το φορτίο του επεξεργαστή. + diff --git a/plugin-cpuload/translations/cpuload_el_GR.ts b/plugin-cpuload/translations/cpuload_el.ts similarity index 82% rename from plugin-cpuload/translations/cpuload_el_GR.ts rename to plugin-cpuload/translations/cpuload_el.ts index f0f61cd..d5c7333 100644 --- a/plugin-cpuload/translations/cpuload_el_GR.ts +++ b/plugin-cpuload/translations/cpuload_el.ts @@ -1,28 +1,28 @@ - + - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% - Φορτίο ΚΜΕ %1% + Φορτίο επεξεργαστή %1% CPU load %1% - + Φορτίο επεξεργαστή %1% - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings + LXQt Cpu Load settings Ρυθμίσεις φορτίου ΚΜΕ CPU Load Settings - + Ρυθμίσεις του Φορτίου επεξεργαστή @@ -47,12 +47,12 @@ Bar orientation: - Προσανατολισμός γραμμής: + Προσανατολισμός ράβδου: Bar width: - + Πλάτος ράβδου: diff --git a/plugin-cpuload/translations/cpuload_el_GR.desktop b/plugin-cpuload/translations/cpuload_el_GR.desktop deleted file mode 100644 index 55dd675..0000000 --- a/plugin-cpuload/translations/cpuload_el_GR.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin - -Name=Cpu monitor -Comment=Displays the current CPU load. - - - - -# Translations -Comment[el_GR]=Εμφανίζει την τρέχουσα χρήση ΚΜΕ. -Name[el_GR]=Επόπτης ΚΜΕ diff --git a/plugin-cpuload/translations/cpuload_eo.desktop b/plugin-cpuload/translations/cpuload_eo.desktop index c9f168c..d06038b 100644 --- a/plugin-cpuload/translations/cpuload_eo.desktop +++ b/plugin-cpuload/translations/cpuload_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_eo.ts b/plugin-cpuload/translations/cpuload_eo.ts index 9ae1913..5c58150 100644 --- a/plugin-cpuload/translations/cpuload_eo.ts +++ b/plugin-cpuload/translations/cpuload_eo.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_es.desktop b/plugin-cpuload/translations/cpuload_es.desktop index 467dd1c..231a3dc 100644 --- a/plugin-cpuload/translations/cpuload_es.desktop +++ b/plugin-cpuload/translations/cpuload_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_es.ts b/plugin-cpuload/translations/cpuload_es.ts index e005744..ebdee3b 100644 --- a/plugin-cpuload/translations/cpuload_es.ts +++ b/plugin-cpuload/translations/cpuload_es.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Carga de CPU %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Opciones de Carga de CPU LxQt + LXQt Cpu Load settings + Opciones de Carga de CPU LXQt diff --git a/plugin-cpuload/translations/cpuload_es_VE.desktop b/plugin-cpuload/translations/cpuload_es_VE.desktop index 53509af..7e39924 100644 --- a/plugin-cpuload/translations/cpuload_es_VE.desktop +++ b/plugin-cpuload/translations/cpuload_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_es_VE.ts b/plugin-cpuload/translations/cpuload_es_VE.ts index 16bdb99..e3b7e25 100644 --- a/plugin-cpuload/translations/cpuload_es_VE.ts +++ b/plugin-cpuload/translations/cpuload_es_VE.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Cpu al %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Configuracion de Monitor de Cpu LxQt + LXQt Cpu Load settings + Configuracion de Monitor de Cpu LXQt diff --git a/plugin-cpuload/translations/cpuload_eu.desktop b/plugin-cpuload/translations/cpuload_eu.desktop index 0368098..f919877 100644 --- a/plugin-cpuload/translations/cpuload_eu.desktop +++ b/plugin-cpuload/translations/cpuload_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_eu.ts b/plugin-cpuload/translations/cpuload_eu.ts index 5450df6..b8528c9 100644 --- a/plugin-cpuload/translations/cpuload_eu.ts +++ b/plugin-cpuload/translations/cpuload_eu.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% PUZaren karga %%1 @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQt PUZaren kargaren ezarpenak + LXQt Cpu Load settings + LXQt PUZaren kargaren ezarpenak diff --git a/plugin-cpuload/translations/cpuload_fi.desktop b/plugin-cpuload/translations/cpuload_fi.desktop index 8d76e41..7229d2c 100644 --- a/plugin-cpuload/translations/cpuload_fi.desktop +++ b/plugin-cpuload/translations/cpuload_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_fi.ts b/plugin-cpuload/translations/cpuload_fi.ts index bb69382..1bd2c8c 100644 --- a/plugin-cpuload/translations/cpuload_fi.ts +++ b/plugin-cpuload/translations/cpuload_fi.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Suoritinkuorma %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQtin suoritinkuorman asetukset + LXQt Cpu Load settings + LXQtin suoritinkuorman asetukset diff --git a/plugin-cpuload/translations/cpuload_fr_FR.ts b/plugin-cpuload/translations/cpuload_fr_FR.ts index 5d8199f..600b9cb 100644 --- a/plugin-cpuload/translations/cpuload_fr_FR.ts +++ b/plugin-cpuload/translations/cpuload_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_hr.ts b/plugin-cpuload/translations/cpuload_hr.ts index 12ae080..0a3e354 100644 --- a/plugin-cpuload/translations/cpuload_hr.ts +++ b/plugin-cpuload/translations/cpuload_hr.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_hu.desktop b/plugin-cpuload/translations/cpuload_hu.desktop index efabda5..f6238a8 100644 --- a/plugin-cpuload/translations/cpuload_hu.desktop +++ b/plugin-cpuload/translations/cpuload_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_hu.ts b/plugin-cpuload/translations/cpuload_hu.ts index e7f92b8..5318ecc 100644 --- a/plugin-cpuload/translations/cpuload_hu.ts +++ b/plugin-cpuload/translations/cpuload_hu.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_hu_HU.ts b/plugin-cpuload/translations/cpuload_hu_HU.ts index 62ec026..810f55b 100644 --- a/plugin-cpuload/translations/cpuload_hu_HU.ts +++ b/plugin-cpuload/translations/cpuload_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_it_IT.desktop b/plugin-cpuload/translations/cpuload_it_IT.desktop index 76de5a9..66790b3 100644 --- a/plugin-cpuload/translations/cpuload_it_IT.desktop +++ b/plugin-cpuload/translations/cpuload_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_it_IT.ts b/plugin-cpuload/translations/cpuload_it_IT.ts index 5d46003..9dd3b75 100644 --- a/plugin-cpuload/translations/cpuload_it_IT.ts +++ b/plugin-cpuload/translations/cpuload_it_IT.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Carico del processore %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Impostazioni del carico del processore di LxQt + LXQt Cpu Load settings + Impostazioni del carico del processore di LXQt diff --git a/plugin-cpuload/translations/cpuload_ja.desktop b/plugin-cpuload/translations/cpuload_ja.desktop index fd254cb..8020cb1 100644 --- a/plugin-cpuload/translations/cpuload_ja.desktop +++ b/plugin-cpuload/translations/cpuload_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=CPU monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_ja.ts b/plugin-cpuload/translations/cpuload_ja.ts index b86f71b..8948f15 100644 --- a/plugin-cpuload/translations/cpuload_ja.ts +++ b/plugin-cpuload/translations/cpuload_ja.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_lt.desktop b/plugin-cpuload/translations/cpuload_lt.desktop index cf6a18a..e52b80c 100644 --- a/plugin-cpuload/translations/cpuload_lt.desktop +++ b/plugin-cpuload/translations/cpuload_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_lt.ts b/plugin-cpuload/translations/cpuload_lt.ts index ffd5557..0ae6c3e 100644 --- a/plugin-cpuload/translations/cpuload_lt.ts +++ b/plugin-cpuload/translations/cpuload_lt.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_nl.desktop b/plugin-cpuload/translations/cpuload_nl.desktop index 04271be..37626e7 100644 --- a/plugin-cpuload/translations/cpuload_nl.desktop +++ b/plugin-cpuload/translations/cpuload_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_nl.ts b/plugin-cpuload/translations/cpuload_nl.ts index b7bc8eb..427f0ad 100644 --- a/plugin-cpuload/translations/cpuload_nl.ts +++ b/plugin-cpuload/translations/cpuload_nl.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Cpu-belasting %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Instellingen voor CPU-belasting van LxQt + LXQt Cpu Load settings + Instellingen voor CPU-belasting van LXQt diff --git a/plugin-cpuload/translations/cpuload_pl_PL.desktop b/plugin-cpuload/translations/cpuload_pl_PL.desktop index 1d2f883..690b7e0 100644 --- a/plugin-cpuload/translations/cpuload_pl_PL.desktop +++ b/plugin-cpuload/translations/cpuload_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_pl_PL.ts b/plugin-cpuload/translations/cpuload_pl_PL.ts index 9ebbfab..5e7458e 100644 --- a/plugin-cpuload/translations/cpuload_pl_PL.ts +++ b/plugin-cpuload/translations/cpuload_pl_PL.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Obciążenie CPU %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Ustawienia LxQt CPU Load + LXQt Cpu Load settings + Ustawienia LXQt CPU Load diff --git a/plugin-cpuload/translations/cpuload_pt.desktop b/plugin-cpuload/translations/cpuload_pt.desktop index cabb08a..f8feafa 100644 --- a/plugin-cpuload/translations/cpuload_pt.desktop +++ b/plugin-cpuload/translations/cpuload_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_pt.ts b/plugin-cpuload/translations/cpuload_pt.ts index 1061704..0472770 100644 --- a/plugin-cpuload/translations/cpuload_pt.ts +++ b/plugin-cpuload/translations/cpuload_pt.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Carga do cpu %1% @@ -14,9 +14,9 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings + LXQt Cpu Load settings Definições da Carga do cpu diff --git a/plugin-cpuload/translations/cpuload_pt_BR.desktop b/plugin-cpuload/translations/cpuload_pt_BR.desktop index 5be6c9a..66eeb28 100644 --- a/plugin-cpuload/translations/cpuload_pt_BR.desktop +++ b/plugin-cpuload/translations/cpuload_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_pt_BR.ts b/plugin-cpuload/translations/cpuload_pt_BR.ts index c3b67e7..cac3264 100644 --- a/plugin-cpuload/translations/cpuload_pt_BR.ts +++ b/plugin-cpuload/translations/cpuload_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Carga da Cpu %1% @@ -14,9 +14,9 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings + LXQt Cpu Load settings Configurações da Carga Da Cpu diff --git a/plugin-cpuload/translations/cpuload_ro_RO.desktop b/plugin-cpuload/translations/cpuload_ro_RO.desktop index d0cdb2d..c8f69b9 100644 --- a/plugin-cpuload/translations/cpuload_ro_RO.desktop +++ b/plugin-cpuload/translations/cpuload_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_ro_RO.ts b/plugin-cpuload/translations/cpuload_ro_RO.ts index 2709dad..1fc8ae2 100644 --- a/plugin-cpuload/translations/cpuload_ro_RO.ts +++ b/plugin-cpuload/translations/cpuload_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Încărcare procesor %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Setări încărcare procesor LxQt + LXQt Cpu Load settings + Setări încărcare procesor LXQt diff --git a/plugin-cpuload/translations/cpuload_ru.desktop b/plugin-cpuload/translations/cpuload_ru.desktop index 6a10460..c4b2e65 100644 --- a/plugin-cpuload/translations/cpuload_ru.desktop +++ b/plugin-cpuload/translations/cpuload_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_ru.ts b/plugin-cpuload/translations/cpuload_ru.ts index 31ab786..a2d9c31 100644 --- a/plugin-cpuload/translations/cpuload_ru.ts +++ b/plugin-cpuload/translations/cpuload_ru.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_ru_RU.desktop b/plugin-cpuload/translations/cpuload_ru_RU.desktop index a750ca5..5024212 100644 --- a/plugin-cpuload/translations/cpuload_ru_RU.desktop +++ b/plugin-cpuload/translations/cpuload_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_ru_RU.ts b/plugin-cpuload/translations/cpuload_ru_RU.ts index b40c0ff..06363a3 100644 --- a/plugin-cpuload/translations/cpuload_ru_RU.ts +++ b/plugin-cpuload/translations/cpuload_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad CPU load %1% @@ -10,7 +10,7 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration CPU Load Settings diff --git a/plugin-cpuload/translations/cpuload_sl.desktop b/plugin-cpuload/translations/cpuload_sl.desktop index 16f7101..15da826 100644 --- a/plugin-cpuload/translations/cpuload_sl.desktop +++ b/plugin-cpuload/translations/cpuload_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_sl.ts b/plugin-cpuload/translations/cpuload_sl.ts index 99a7356..22655c0 100644 --- a/plugin-cpuload/translations/cpuload_sl.ts +++ b/plugin-cpuload/translations/cpuload_sl.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Uporaba CPE: %1 % @@ -14,9 +14,9 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings + LXQt Cpu Load settings Nastavitve prikaza uporabe CPE za LXQt diff --git a/plugin-cpuload/translations/cpuload_th_TH.desktop b/plugin-cpuload/translations/cpuload_th_TH.desktop index 1a089c9..1d17711 100644 --- a/plugin-cpuload/translations/cpuload_th_TH.desktop +++ b/plugin-cpuload/translations/cpuload_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_th_TH.ts b/plugin-cpuload/translations/cpuload_th_TH.ts index 0345d68..c18a23d 100644 --- a/plugin-cpuload/translations/cpuload_th_TH.ts +++ b/plugin-cpuload/translations/cpuload_th_TH.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Cpu โหลด %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - ค่าตั้ง Cpu โหลด LxQt + LXQt Cpu Load settings + ค่าตั้ง Cpu โหลด LXQt diff --git a/plugin-cpuload/translations/cpuload_tr.desktop b/plugin-cpuload/translations/cpuload_tr.desktop index 5abb7c9..202a3e9 100644 --- a/plugin-cpuload/translations/cpuload_tr.desktop +++ b/plugin-cpuload/translations/cpuload_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_tr.ts b/plugin-cpuload/translations/cpuload_tr.ts index 602b644..b98f5e9 100644 --- a/plugin-cpuload/translations/cpuload_tr.ts +++ b/plugin-cpuload/translations/cpuload_tr.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% İşlemci yükü %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQt İşlemci Yükü ayarları + LXQt Cpu Load settings + LXQt İşlemci Yükü ayarları diff --git a/plugin-cpuload/translations/cpuload_uk.desktop b/plugin-cpuload/translations/cpuload_uk.desktop index d5ef8d8..9ee5a7a 100644 --- a/plugin-cpuload/translations/cpuload_uk.desktop +++ b/plugin-cpuload/translations/cpuload_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_uk.ts b/plugin-cpuload/translations/cpuload_uk.ts index 2145c8e..1ed37e6 100644 --- a/plugin-cpuload/translations/cpuload_uk.ts +++ b/plugin-cpuload/translations/cpuload_uk.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Завантаження Cpu %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - Налаштування завантаження ЦП LxQt + LXQt Cpu Load settings + Налаштування завантаження ЦП LXQt diff --git a/plugin-cpuload/translations/cpuload_zh_CN.desktop b/plugin-cpuload/translations/cpuload_zh_CN.desktop index 5cd9ddd..568090d 100644 --- a/plugin-cpuload/translations/cpuload_zh_CN.desktop +++ b/plugin-cpuload/translations/cpuload_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_zh_CN.ts b/plugin-cpuload/translations/cpuload_zh_CN.ts index 149c8f8..83565d7 100644 --- a/plugin-cpuload/translations/cpuload_zh_CN.ts +++ b/plugin-cpuload/translations/cpuload_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% Cpu 负载 %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQt Cpu 负载设置 + LXQt Cpu Load settings + LXQt Cpu 负载设置 diff --git a/plugin-cpuload/translations/cpuload_zh_TW.desktop b/plugin-cpuload/translations/cpuload_zh_TW.desktop index 481a589..5f3af52 100644 --- a/plugin-cpuload/translations/cpuload_zh_TW.desktop +++ b/plugin-cpuload/translations/cpuload_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Cpu monitor Comment=Displays the current CPU load. diff --git a/plugin-cpuload/translations/cpuload_zh_TW.ts b/plugin-cpuload/translations/cpuload_zh_TW.ts index b3893db..5cbd7b9 100644 --- a/plugin-cpuload/translations/cpuload_zh_TW.ts +++ b/plugin-cpuload/translations/cpuload_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtCpuLoad + LXQtCpuLoad Cpu load %1% CPU使用率 %1% @@ -14,10 +14,10 @@ - LxQtCpuLoadConfiguration + LXQtCpuLoadConfiguration - LxQt Cpu Load settings - LxQtCPU使用率提示設定 + LXQt Cpu Load settings + LXQtCPU使用率提示設定 diff --git a/plugin-desktopswitch/desktopswitch.cpp b/plugin-desktopswitch/desktopswitch.cpp index 26c9434..992dde5 100644 --- a/plugin-desktopswitch/desktopswitch.cpp +++ b/plugin-desktopswitch/desktopswitch.cpp @@ -43,9 +43,9 @@ #define DEFAULT_SHORTCUT_TEMPLATE QStringLiteral("Control+F%1") -DesktopSwitch::DesktopSwitch(const ILxQtPanelPluginStartupInfo &startupInfo) : +DesktopSwitch::DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), m_pSignalMapper(new QSignalMapper(this)), m_desktopCount(KWindowSystem::numberOfDesktops()), mRows(-1), @@ -55,7 +55,7 @@ DesktopSwitch::DesktopSwitch(const ILxQtPanelPluginStartupInfo &startupInfo) : m_buttons = new QButtonGroup(this); connect (m_pSignalMapper, SIGNAL(mapped(int)), this, SLOT(setDesktop(int))); - mLayout = new LxQt::GridLayout(&mWidget); + mLayout = new LXQt::GridLayout(&mWidget); mWidget.setLayout(mLayout); settingsChanged(); diff --git a/plugin-desktopswitch/desktopswitch.h b/plugin-desktopswitch/desktopswitch.h index 23ea20a..9d9947b 100644 --- a/plugin-desktopswitch/desktopswitch.h +++ b/plugin-desktopswitch/desktopswitch.h @@ -39,7 +39,7 @@ class QSignalMapper; class QButtonGroup; class NETRootInfo; -namespace LxQt { +namespace LXQt { class GridLayout; } @@ -59,11 +59,11 @@ protected: /** * @brief Desktop switcher. A very simple one... */ -class DesktopSwitch : public QObject, public ILxQtPanelPlugin +class DesktopSwitch : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - DesktopSwitch(const ILxQtPanelPluginStartupInfo &startupInfo); + DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo); ~DesktopSwitch(); QString themeId() const { return "DesktopSwitch"; } @@ -71,7 +71,7 @@ public: bool isSeparate() const { return true; } void realign(); - virtual ILxQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } QDialog *configureDialog(); private: @@ -80,7 +80,7 @@ private: QSignalMapper* m_pSignalMapper; int m_desktopCount; DesktopSwitchWidget mWidget; - LxQt::GridLayout *mLayout; + LXQt::GridLayout *mLayout; int mRows; QScopedPointer mDesktops; DesktopSwitchButton::LabelType mLabelType; @@ -98,13 +98,13 @@ private slots: void onWindowChanged(WId id, NET::Properties properties, NET::Properties2 properties2); }; -class DesktopSwitchPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class DesktopSwitchPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new DesktopSwitch(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new DesktopSwitch(startupInfo);} }; #endif diff --git a/plugin-desktopswitch/desktopswitchconfiguration.cpp b/plugin-desktopswitch/desktopswitchconfiguration.cpp index 62457b6..4ad16b9 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.cpp +++ b/plugin-desktopswitch/desktopswitchconfiguration.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it diff --git a/plugin-desktopswitch/desktopswitchconfiguration.h b/plugin-desktopswitch/desktopswitchconfiguration.h index a2338c8..fb6ad3d 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.h +++ b/plugin-desktopswitch/desktopswitchconfiguration.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it @@ -52,7 +52,7 @@ public: private: Ui::DesktopSwitchConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; private slots: /* diff --git a/plugin-desktopswitch/resources/desktopswitch.desktop.in b/plugin-desktopswitch/resources/desktopswitch.desktop.in index 36e8714..8e11770 100644 --- a/plugin-desktopswitch/resources/desktopswitch.desktop.in +++ b/plugin-desktopswitch/resources/desktopswitch.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. Icon=user-desktop diff --git a/plugin-desktopswitch/translations/desktopswitch_ar.desktop b/plugin-desktopswitch/translations/desktopswitch_ar.desktop index 3336011..d64872a 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ar.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_cs.desktop b/plugin-desktopswitch/translations/desktopswitch_cs.desktop index 6ca2359..dae3285 100644 --- a/plugin-desktopswitch/translations/desktopswitch_cs.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_cs_CZ.desktop b/plugin-desktopswitch/translations/desktopswitch_cs_CZ.desktop index a9000a5..e5e8b37 100644 --- a/plugin-desktopswitch/translations/desktopswitch_cs_CZ.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_da.desktop b/plugin-desktopswitch/translations/desktopswitch_da.desktop index c06691c..120f6c1 100644 --- a/plugin-desktopswitch/translations/desktopswitch_da.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop b/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop index af439a1..0f4e7f0 100644 --- a/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_el.desktop b/plugin-desktopswitch/translations/desktopswitch_el.desktop new file mode 100644 index 0000000..c3973af --- /dev/null +++ b/plugin-desktopswitch/translations/desktopswitch_el.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LXQtPanel/Plugin +Name=Desktop switcher +Comment=Allows easy switching between virtual desktops. + +#TRANSLATIONS_DIR=../translations + + +# Translations +Name[el]=Εναλλαγή επιφάνειας εργασίας +Comment[el]=Επιτρέπει την εναλλαγή των εικονικών επιφανειών εργασίας. diff --git a/plugin-desktopswitch/translations/desktopswitch_el_GR.ts b/plugin-desktopswitch/translations/desktopswitch_el.ts similarity index 72% rename from plugin-desktopswitch/translations/desktopswitch_el_GR.ts rename to plugin-desktopswitch/translations/desktopswitch_el.ts index 5324f55..0431445 100644 --- a/plugin-desktopswitch/translations/desktopswitch_el_GR.ts +++ b/plugin-desktopswitch/translations/desktopswitch_el.ts @@ -1,12 +1,12 @@ - + DesktopSwitch Switch to desktop %1 - + Εναλλαγή στην επιφάνεια εργασίας %1 @@ -20,27 +20,27 @@ DesktopSwitch settings - + Ρυθμίσεις εναλλαγής επιφάνειας εργασίας Number of rows: - + Αριθμός γραμμών: Desktop labels: - + Ετικέτες επιφανειών: Numbers - + Αριθμοί Names - + Ονόματα diff --git a/plugin-desktopswitch/translations/desktopswitch_el_GR.desktop b/plugin-desktopswitch/translations/desktopswitch_el_GR.desktop deleted file mode 100644 index f13027f..0000000 --- a/plugin-desktopswitch/translations/desktopswitch_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Desktop switcher -Comment=Allows easy switching between virtual desktops. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Να επιτρέπεται η εναλλαγή εικονικών επιφανειών εργασίας -Name[el_GR]=Εναλλαγή επιφάνειας εργασίας diff --git a/plugin-desktopswitch/translations/desktopswitch_eo.desktop b/plugin-desktopswitch/translations/desktopswitch_eo.desktop index dfe90f3..d8108f5 100644 --- a/plugin-desktopswitch/translations/desktopswitch_eo.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_es.desktop b/plugin-desktopswitch/translations/desktopswitch_es.desktop index 8866056..700e9db 100644 --- a/plugin-desktopswitch/translations/desktopswitch_es.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_es_VE.desktop b/plugin-desktopswitch/translations/desktopswitch_es_VE.desktop index 067654d..329245c 100644 --- a/plugin-desktopswitch/translations/desktopswitch_es_VE.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_eu.desktop b/plugin-desktopswitch/translations/desktopswitch_eu.desktop index 594692e..8265173 100644 --- a/plugin-desktopswitch/translations/desktopswitch_eu.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_fi.desktop b/plugin-desktopswitch/translations/desktopswitch_fi.desktop index 0bb615b..a3b0d6f 100644 --- a/plugin-desktopswitch/translations/desktopswitch_fi.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop b/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop index 2458f8c..87d1a71 100644 --- a/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_hu.desktop b/plugin-desktopswitch/translations/desktopswitch_hu.desktop index 2ed4c79..2791311 100644 --- a/plugin-desktopswitch/translations/desktopswitch_hu.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ia.desktop b/plugin-desktopswitch/translations/desktopswitch_ia.desktop index 5f9296f..5e1ad5e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ia.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktopswitch Comment=Allow to switch virtual desktops diff --git a/plugin-desktopswitch/translations/desktopswitch_id_ID.desktop b/plugin-desktopswitch/translations/desktopswitch_id_ID.desktop index 5f9296f..5e1ad5e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_id_ID.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktopswitch Comment=Allow to switch virtual desktops diff --git a/plugin-desktopswitch/translations/desktopswitch_it_IT.desktop b/plugin-desktopswitch/translations/desktopswitch_it_IT.desktop index f74f898..157858f 100644 --- a/plugin-desktopswitch/translations/desktopswitch_it_IT.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ja.desktop b/plugin-desktopswitch/translations/desktopswitch_ja.desktop index b187b22..312b9de 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ja.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ko.desktop b/plugin-desktopswitch/translations/desktopswitch_ko.desktop index 5f9296f..5e1ad5e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ko.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktopswitch Comment=Allow to switch virtual desktops diff --git a/plugin-desktopswitch/translations/desktopswitch_lt.desktop b/plugin-desktopswitch/translations/desktopswitch_lt.desktop index 5e83044..b40fb0b 100644 --- a/plugin-desktopswitch/translations/desktopswitch_lt.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_nl.desktop b/plugin-desktopswitch/translations/desktopswitch_nl.desktop index 21e27ca..bc059d2 100644 --- a/plugin-desktopswitch/translations/desktopswitch_nl.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_pl.desktop b/plugin-desktopswitch/translations/desktopswitch_pl.desktop index 254ffc4..5817287 100644 --- a/plugin-desktopswitch/translations/desktopswitch_pl.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_pl_PL.desktop b/plugin-desktopswitch/translations/desktopswitch_pl_PL.desktop index 2745b17..28c49c5 100644 --- a/plugin-desktopswitch/translations/desktopswitch_pl_PL.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_pt.desktop b/plugin-desktopswitch/translations/desktopswitch_pt.desktop index f570b8e..04796f5 100644 --- a/plugin-desktopswitch/translations/desktopswitch_pt.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_pt_BR.desktop b/plugin-desktopswitch/translations/desktopswitch_pt_BR.desktop index f46fa51..a7201f1 100644 --- a/plugin-desktopswitch/translations/desktopswitch_pt_BR.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ro_RO.desktop b/plugin-desktopswitch/translations/desktopswitch_ro_RO.desktop index 75f90d8..24b39d6 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ro_RO.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ru.desktop b/plugin-desktopswitch/translations/desktopswitch_ru.desktop index 73b960e..c095d3e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ru.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop b/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop index 8096b0b..1ff18e9 100644 --- a/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_sk.desktop b/plugin-desktopswitch/translations/desktopswitch_sk.desktop index 01cd625..95bc8ff 100644 --- a/plugin-desktopswitch/translations/desktopswitch_sk.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_sl.desktop b/plugin-desktopswitch/translations/desktopswitch_sl.desktop index 44456a8..669b1b8 100644 --- a/plugin-desktopswitch/translations/desktopswitch_sl.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_sr.desktop b/plugin-desktopswitch/translations/desktopswitch_sr.desktop index e6223e3..8b82d42 100644 --- a/plugin-desktopswitch/translations/desktopswitch_sr.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_sr@latin.desktop b/plugin-desktopswitch/translations/desktopswitch_sr@latin.desktop index 3730920..f06dc00 100644 --- a/plugin-desktopswitch/translations/desktopswitch_sr@latin.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_th_TH.desktop b/plugin-desktopswitch/translations/desktopswitch_th_TH.desktop index 4ad3f83..d632d0e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_th_TH.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_tr.desktop b/plugin-desktopswitch/translations/desktopswitch_tr.desktop index 9ea5b88..483cc28 100644 --- a/plugin-desktopswitch/translations/desktopswitch_tr.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_uk.desktop b/plugin-desktopswitch/translations/desktopswitch_uk.desktop index 196c656..732d396 100644 --- a/plugin-desktopswitch/translations/desktopswitch_uk.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_zh_CN.GB2312.desktop b/plugin-desktopswitch/translations/desktopswitch_zh_CN.GB2312.desktop index 5f9296f..5e1ad5e 100644 --- a/plugin-desktopswitch/translations/desktopswitch_zh_CN.GB2312.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktopswitch Comment=Allow to switch virtual desktops diff --git a/plugin-desktopswitch/translations/desktopswitch_zh_CN.desktop b/plugin-desktopswitch/translations/desktopswitch_zh_CN.desktop index 6b6087d..6354d4d 100644 --- a/plugin-desktopswitch/translations/desktopswitch_zh_CN.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-desktopswitch/translations/desktopswitch_zh_TW.desktop b/plugin-desktopswitch/translations/desktopswitch_zh_TW.desktop index 969102a..a8b6d9c 100644 --- a/plugin-desktopswitch/translations/desktopswitch_zh_TW.desktop +++ b/plugin-desktopswitch/translations/desktopswitch_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Desktop switcher Comment=Allows easy switching between virtual desktops. diff --git a/plugin-directorymenu/directorymenu.cpp b/plugin-directorymenu/directorymenu.cpp index 4ffee7f..8c5ec28 100644 --- a/plugin-directorymenu/directorymenu.cpp +++ b/plugin-directorymenu/directorymenu.cpp @@ -37,9 +37,9 @@ #include -DirectoryMenu::DirectoryMenu(const ILxQtPanelPluginStartupInfo &startupInfo) : +DirectoryMenu::DirectoryMenu(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mMenu(0), mDefaultIcon(XdgIcon::fromTheme("folder")) { @@ -81,22 +81,22 @@ void DirectoryMenu::showMenu() switch (panel()->position()) { - case ILxQtPanel::PositionTop: + case ILXQtPanel::PositionTop: x = mButton.mapToGlobal(QPoint(0, 0)).x(); y = panel()->globalGometry().bottom(); break; - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionBottom: x = mButton.mapToGlobal(QPoint(0, 0)).x(); y = panel()->globalGometry().top() - mMenu->sizeHint().height(); break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: x = panel()->globalGometry().right(); y = mButton.mapToGlobal(QPoint(0, 0)).y(); break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: x = panel()->globalGometry().left() - mMenu->sizeHint().width(); y = mButton.mapToGlobal(QPoint(0, 0)).y(); break; diff --git a/plugin-directorymenu/directorymenu.h b/plugin-directorymenu/directorymenu.h index a3825da..7e4a18f 100644 --- a/plugin-directorymenu/directorymenu.h +++ b/plugin-directorymenu/directorymenu.h @@ -42,17 +42,17 @@ #include #include -class DirectoryMenu : public QObject, public ILxQtPanelPlugin +class DirectoryMenu : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - DirectoryMenu(const ILxQtPanelPluginStartupInfo &startupInfo); + DirectoryMenu(const ILXQtPanelPluginStartupInfo &startupInfo); ~DirectoryMenu(); virtual QWidget *widget() { return &mButton; } virtual QString themeId() const { return "DirectoryMenu"; } - virtual ILxQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } QDialog *configureDialog(); void settingsChanged(); @@ -77,13 +77,13 @@ private: std::vector mPathStrings; }; -class DirectoryMenuLibrary: public QObject, public ILxQtPanelPluginLibrary +class DirectoryMenuLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new DirectoryMenu(startupInfo); } diff --git a/plugin-directorymenu/directorymenuconfiguration.h b/plugin-directorymenu/directorymenuconfiguration.h index 9bdcca4..a7c6995 100644 --- a/plugin-directorymenu/directorymenuconfiguration.h +++ b/plugin-directorymenu/directorymenuconfiguration.h @@ -54,7 +54,7 @@ public: private: Ui::DirectoryMenuConfiguration *ui; QSettings &mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; QDir mBaseDirectory; QString mIcon; QIcon mDefaultIcon; diff --git a/plugin-directorymenu/resources/directorymenu.desktop.in b/plugin-directorymenu/resources/directorymenu.desktop.in index c86b448..704c623 100644 --- a/plugin-directorymenu/resources/directorymenu.desktop.in +++ b/plugin-directorymenu/resources/directorymenu.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Directory Menu Comment=Displays a menu showing the contents of a directory Icon=folder diff --git a/plugin-directorymenu/translations/directorymenu_el.desktop b/plugin-directorymenu/translations/directorymenu_el.desktop new file mode 100644 index 0000000..9899fc6 --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Μενού καταλόγου +Comment[el]=Εμφανίζει ένα μενού με τα περιεχόμενα ενός καταλόγου diff --git a/plugin-directorymenu/translations/directorymenu_el.ts b/plugin-directorymenu/translations/directorymenu_el.ts new file mode 100644 index 0000000..79d6521 --- /dev/null +++ b/plugin-directorymenu/translations/directorymenu_el.ts @@ -0,0 +1,65 @@ + + + + + DirectoryMenu + + + Open + Άνοιγμα + + + + DirectoryMenuConfiguration + + + Directory Menu Settings + Ρυθμίσεις μενού καταλόγου + + + + Appearance + Εμφάνιση + + + + Base directory: + Βασικός κατάλογος: + + + + BaseDirectoryName + Όνομα βασικού καταλόγου + + + + Icon: + Εικονίδιο: + + + + Choose Base Directory + Επιλέξτε τον βασικό κατάλογο + + + + Choose Icon + Επιλέξτε το εικονίδιο + + + + Icons (*.png *.xpm *.jpg) + Εικονίδια (*.png *.xpm *.jpg) + + + + Directory Menu + Μενού καταλόγου + + + + An error occurred while loading the icon. + Παρουσιάστηκε ένα σφάλμα κατά την φόρτωση του εικονιδίου. + + + diff --git a/plugin-directorymenu/translations/directorymenu_hu.desktop b/plugin-directorymenu/translations/directorymenu_hu.desktop index edc6c3b..9dd6666 100644 --- a/plugin-directorymenu/translations/directorymenu_hu.desktop +++ b/plugin-directorymenu/translations/directorymenu_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Directory Menu Comment=Displays a menu showing the contents of a directory diff --git a/plugin-dom/domplugin.cpp b/plugin-dom/domplugin.cpp index e7b5551..ffd05c6 100644 --- a/plugin-dom/domplugin.cpp +++ b/plugin-dom/domplugin.cpp @@ -31,9 +31,9 @@ #include -DomPlugin::DomPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +DomPlugin::DomPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); mButton.setIcon(XdgIcon::fromTheme("preferences-plugin")); diff --git a/plugin-dom/domplugin.h b/plugin-dom/domplugin.h index 20c3e7b..3418d67 100644 --- a/plugin-dom/domplugin.h +++ b/plugin-dom/domplugin.h @@ -33,15 +33,15 @@ #include -class DomPlugin: public QObject, public ILxQtPanelPlugin +class DomPlugin: public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - DomPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); + DomPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mButton; } virtual QString themeId() const { return "Dom"; } - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment; } private slots: void showDialog(); @@ -51,13 +51,13 @@ private: }; -class DomPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class DomPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new DomPlugin(startupInfo); } diff --git a/plugin-dom/resources/dom.desktop.in b/plugin-dom/resources/dom.desktop.in index 2146b3b..006159a 100644 --- a/plugin-dom/resources/dom.desktop.in +++ b/plugin-dom/resources/dom.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Panel DOM tree Comment=Show a DOM tree of the LXQt panel. Icon=view-web-browser-dom-tree diff --git a/plugin-dom/translations/dom_el.desktop b/plugin-dom/translations/dom_el.desktop new file mode 100644 index 0000000..9ba3477 --- /dev/null +++ b/plugin-dom/translations/dom_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Δέντρο πίνακα DOM +Comment[el]=Εμφάνιση ενός δέντρου DOM του πίνακα LXQt. diff --git a/plugin-dom/translations/dom_el.ts b/plugin-dom/translations/dom_el.ts new file mode 100644 index 0000000..bb7c4b6 --- /dev/null +++ b/plugin-dom/translations/dom_el.ts @@ -0,0 +1,38 @@ + + + + + TreeWindow + + + Panel DOM tree + Δέντρο πίνακα DOM + + + + + Property + Ιδιότητα + + + + Value + Τιμή + + + + All properties + Όλες οι ιδιότητες + + + + Type + Τύπος + + + + String value + Τιμή συμβολοσειράς + + + diff --git a/plugin-dom/translations/dom_hu.desktop b/plugin-dom/translations/dom_hu.desktop index 83f6021..a199de9 100644 --- a/plugin-dom/translations/dom_hu.desktop +++ b/plugin-dom/translations/dom_hu.desktop @@ -1,3 +1,3 @@ # Translations Name[hu]=Panel DOM fa -Comment[hu]=DOM faszerkezet az LxQt panelen +Comment[hu]=DOM faszerkezet az LXQt panelen diff --git a/plugin-dom/translations/dom_ja.desktop b/plugin-dom/translations/dom_ja.desktop index a207142..08478c6 100644 --- a/plugin-dom/translations/dom_ja.desktop +++ b/plugin-dom/translations/dom_ja.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ja]=パネルのDOMツリー Comment[ja]=LXQtパネルのDOMツリーを表示する diff --git a/plugin-dom/translations/dom_pt.desktop b/plugin-dom/translations/dom_pt.desktop index 87430f9..2e21519 100644 --- a/plugin-dom/translations/dom_pt.desktop +++ b/plugin-dom/translations/dom_pt.desktop @@ -1,3 +1,3 @@ # Translations Name[pt]=Árvore do painel DOM -Comment[pt]=Mostra a árvore DOM do painel do LxQt. +Comment[pt]=Mostra a árvore DOM do painel do LXQt. diff --git a/plugin-dom/translations/dom_ru.desktop b/plugin-dom/translations/dom_ru.desktop index f97ba11..5e3a56d 100644 --- a/plugin-dom/translations/dom_ru.desktop +++ b/plugin-dom/translations/dom_ru.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru]=Дерево DOM панели. Comment[ru]=Показать дерево DOM панели LXQt. diff --git a/plugin-dom/translations/dom_ru_RU.desktop b/plugin-dom/translations/dom_ru_RU.desktop index ddf0c19..5509973 100644 --- a/plugin-dom/translations/dom_ru_RU.desktop +++ b/plugin-dom/translations/dom_ru_RU.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru_RU]=Дерево DOM панели. Comment[ru_RU]=Показать дерево DOM панели LXQt. diff --git a/plugin-kbindicator/CMakeLists.txt b/plugin-kbindicator/CMakeLists.txt index e235b51..501d6b8 100644 --- a/plugin-kbindicator/CMakeLists.txt +++ b/plugin-kbindicator/CMakeLists.txt @@ -61,4 +61,3 @@ else() endif() BUILD_LXQT_PLUGIN(${PLUGIN}) - diff --git a/plugin-kbindicator/kbindicator-plugin.cpp b/plugin-kbindicator/kbindicator-plugin.cpp index c81ba00..f70b56f 100644 --- a/plugin-kbindicator/kbindicator-plugin.cpp +++ b/plugin-kbindicator/kbindicator-plugin.cpp @@ -1,17 +1,43 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * 2007 Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include "src/kbdstate.h" #include "../panel/ilxqtpanelplugin.h" -class LxQtKbIndicatorPlugin: public QObject, public ILxQtPanelPluginLibrary +class LXQtKbIndicatorPlugin: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - virtual ~LxQtKbIndicatorPlugin() + virtual ~LXQtKbIndicatorPlugin() {} - virtual ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + virtual ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new KbdState(startupInfo); } }; diff --git a/plugin-kbindicator/resources/kbindicator.desktop.in b/plugin-kbindicator/resources/kbindicator.desktop.in index 1fa16db..2e3682d 100644 --- a/plugin-kbindicator/resources/kbindicator.desktop.in +++ b/plugin-kbindicator/resources/kbindicator.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Keyboard state indicator Comment=Keyboard state indicator and switcher plugin. Icon=input-keyboard diff --git a/plugin-kbindicator/src/content.cpp b/plugin-kbindicator/src/content.cpp index 3313a86..dfaaf88 100644 --- a/plugin-kbindicator/src/content.cpp +++ b/plugin-kbindicator/src/content.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include #include @@ -37,6 +63,7 @@ Content::Content(bool layoutEnabled): m_layout->setAlignment(Qt::AlignCenter); m_layout->installEventFilter(this); layout()->addWidget(m_layout); + m_layout->setEnabled(false); } Content::~Content() @@ -111,4 +138,3 @@ void Content::showVertical() { qobject_cast(layout())->setDirection(QBoxLayout::TopToBottom); } - diff --git a/plugin-kbindicator/src/content.h b/plugin-kbindicator/src/content.h index 5395d53..37aee23 100644 --- a/plugin-kbindicator/src/content.h +++ b/plugin-kbindicator/src/content.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _CONTENT_H_ #define _CONTENT_H_ diff --git a/plugin-kbindicator/src/controls.h b/plugin-kbindicator/src/controls.h index b751619..3732661 100644 --- a/plugin-kbindicator/src/controls.h +++ b/plugin-kbindicator/src/controls.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _CONTROLS_H_ #define _CONTROLS_H_ diff --git a/plugin-kbindicator/src/kbdinfo.h b/plugin-kbindicator/src/kbdinfo.h index 24d4e71..4465b59 100644 --- a/plugin-kbindicator/src/kbdinfo.h +++ b/plugin-kbindicator/src/kbdinfo.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KBDINFO_H_ #define _KBDINFO_H_ diff --git a/plugin-kbindicator/src/kbdkeeper.cpp b/plugin-kbindicator/src/kbdkeeper.cpp index 251b552..1a30cc1 100644 --- a/plugin-kbindicator/src/kbdkeeper.cpp +++ b/plugin-kbindicator/src/kbdkeeper.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include #include diff --git a/plugin-kbindicator/src/kbdkeeper.h b/plugin-kbindicator/src/kbdkeeper.h index 3b41630..0cadce0 100644 --- a/plugin-kbindicator/src/kbdkeeper.h +++ b/plugin-kbindicator/src/kbdkeeper.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KBDKEEPER_H_ #define _KBDKEEPER_H_ diff --git a/plugin-kbindicator/src/kbdlayout.h b/plugin-kbindicator/src/kbdlayout.h index cf95f61..1b9ef24 100644 --- a/plugin-kbindicator/src/kbdlayout.h +++ b/plugin-kbindicator/src/kbdlayout.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KBDLAYOUT_H_ #define _KBDLAYOUT_H_ diff --git a/plugin-kbindicator/src/kbdstate.cpp b/plugin-kbindicator/src/kbdstate.cpp index 157958b..b72a0e7 100644 --- a/plugin-kbindicator/src/kbdstate.cpp +++ b/plugin-kbindicator/src/kbdstate.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include @@ -6,9 +32,9 @@ #include "kbdstateconfig.h" #include -KbdState::KbdState(const ILxQtPanelPluginStartupInfo &startupInfo): +KbdState::KbdState(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), m_content(m_watcher.isLayoutEnabled()) { Settings::instance().init(settings()); diff --git a/plugin-kbindicator/src/kbdstate.h b/plugin-kbindicator/src/kbdstate.h index f958eed..e2a5375 100644 --- a/plugin-kbindicator/src/kbdstate.h +++ b/plugin-kbindicator/src/kbdstate.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KDBSTATE_H_ #define _KDBSTATE_H_ @@ -8,17 +34,17 @@ class QLabel; -class KbdState : public QObject, public ILxQtPanelPlugin +class KbdState : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - KbdState(const ILxQtPanelPluginStartupInfo &startupInfo); + KbdState(const ILXQtPanelPluginStartupInfo &startupInfo); virtual ~KbdState(); virtual QString themeId() const { return "KbIndicator"; } - virtual ILxQtPanelPlugin::Flags flags() const + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual bool isSeparate() const diff --git a/plugin-kbindicator/src/kbdstateconfig.cpp b/plugin-kbindicator/src/kbdstateconfig.cpp index 5a08447..343ac8a 100644 --- a/plugin-kbindicator/src/kbdstateconfig.cpp +++ b/plugin-kbindicator/src/kbdstateconfig.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include #include "kbdstateconfig.h" @@ -14,7 +40,7 @@ KbdStateConfig::KbdStateConfig(QWidget *parent) : connect(m_ui->showCaps, &QCheckBox::clicked, this, &KbdStateConfig::save); connect(m_ui->showNum, &QCheckBox::clicked, this, &KbdStateConfig::save); connect(m_ui->showScroll, &QCheckBox::clicked, this, &KbdStateConfig::save); - connect(m_ui->showLayout, &QCheckBox::clicked, this, &KbdStateConfig::save); + connect(m_ui->showLayout, &QGroupBox::clicked, this, &KbdStateConfig::save); connect(m_ui->modes, static_cast(&QButtonGroup::buttonClicked), [this](int){ @@ -22,11 +48,11 @@ KbdStateConfig::KbdStateConfig(QWidget *parent) : } ); - connect(m_ui->showLayout, &QCheckBox::stateChanged, [this](int checked){ - //m_ui->showFlags->setEnabled(checked); //TODO: Country flags support - m_ui->switchGlobal->setEnabled(checked); - m_ui->switchWindow->setEnabled(checked); - m_ui->switchApplication->setEnabled(checked); + connect(m_ui->btns, &QDialogButtonBox::clicked, [this](QAbstractButton *btn){ + if (m_ui->btns->buttonRole(btn) == QDialogButtonBox::ResetRole){ + Settings::instance().restore(); + load(); + } }); connect(m_ui->configureLayouts, &QPushButton::clicked, this, &KbdStateConfig::configureLayouts); diff --git a/plugin-kbindicator/src/kbdstateconfig.h b/plugin-kbindicator/src/kbdstateconfig.h index b01972d..3f63ac9 100644 --- a/plugin-kbindicator/src/kbdstateconfig.h +++ b/plugin-kbindicator/src/kbdstateconfig.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KBDSTATECONFIG_H_ #define _KBDSTATECONFIG_H_ diff --git a/plugin-kbindicator/src/kbdstateconfig.ui b/plugin-kbindicator/src/kbdstateconfig.ui index 932933c..b3ff636 100644 --- a/plugin-kbindicator/src/kbdstateconfig.ui +++ b/plugin-kbindicator/src/kbdstateconfig.ui @@ -7,17 +7,17 @@ 0 0 249 - 390 + 354 - Dialog + Keyboard state settings - Leds + Lock Indicators @@ -45,73 +45,26 @@ - + - + Keyboard Layout Indicator + + + true + + + false - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - Show keyboard layout - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - false - + - Show flags instead labels - - - - - - - Layout mode: + Switching policy - - false - Global @@ -122,9 +75,6 @@ - - false - Window @@ -135,9 +85,6 @@ - - false - Application @@ -146,16 +93,16 @@ - - - - Configure layouts - - - + + + + Configure layouts + + + @@ -175,7 +122,7 @@ Qt::Horizontal - QDialogButtonBox::Close + QDialogButtonBox::Close|QDialogButtonBox::Reset diff --git a/plugin-kbindicator/src/kbdwatcher.cpp b/plugin-kbindicator/src/kbdwatcher.cpp index 539f31d..2400c97 100644 --- a/plugin-kbindicator/src/kbdwatcher.cpp +++ b/plugin-kbindicator/src/kbdwatcher.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include "kbdwatcher.h" diff --git a/plugin-kbindicator/src/kbdwatcher.h b/plugin-kbindicator/src/kbdwatcher.h index 17f580b..f8252bd 100644 --- a/plugin-kbindicator/src/kbdwatcher.h +++ b/plugin-kbindicator/src/kbdwatcher.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _KBDWATCHER_H_ #define _KBDWATCHER_H_ diff --git a/plugin-kbindicator/src/settings.cpp b/plugin-kbindicator/src/settings.cpp index 49fab1c..8e9eb7b 100644 --- a/plugin-kbindicator/src/settings.cpp +++ b/plugin-kbindicator/src/settings.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include "settings.h" @@ -11,7 +37,10 @@ Settings & Settings::instance() } void Settings::init(QSettings *settings) -{ m_settings = settings; } +{ + m_settings = settings; + m_oldSettings.reset(new LXQt::SettingsCache(settings)); +} bool Settings::showCapLock() const { return m_settings->value("show_caps_lock", true).toBool(); } @@ -39,7 +68,7 @@ void Settings::setShowLayout(bool show) KeeperType Settings::keeperType() const { - QString type = m_settings->value("keeper_type", "application").toString(); + QString type = m_settings->value("keeper_type", "global").toString(); if(type == "global") return KeeperType::Global; if(type == "window") @@ -63,3 +92,6 @@ void Settings::setKeeperType(KeeperType type) const break; } } + +void Settings::restore() +{ m_oldSettings->loadToSettings(); } diff --git a/plugin-kbindicator/src/settings.h b/plugin-kbindicator/src/settings.h index 49e6a56..906fb14 100644 --- a/plugin-kbindicator/src/settings.h +++ b/plugin-kbindicator/src/settings.h @@ -1,6 +1,33 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _SETTINGS_H_ #define _SETTINGS_H_ +#include class QSettings; enum class KeeperType @@ -24,6 +51,7 @@ public: bool showScrollLock() const; bool showLayout() const; KeeperType keeperType() const; + void restore(); public: void setShowCapLock(bool show); void setShowNumLock(bool show); @@ -31,7 +59,8 @@ public: void setShowLayout(bool show); void setKeeperType(KeeperType type) const; private: - QSettings *m_settings = 0; + QSettings *m_settings = 0; + QScopedPointer m_oldSettings; }; #endif diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp index 0ddccbb..c4aa4e2 100644 --- a/plugin-kbindicator/src/x11/kbdlayout.cpp +++ b/plugin-kbindicator/src/x11/kbdlayout.cpp @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #include #include #include @@ -85,6 +111,7 @@ public: if(sevent->changed & XCB_XKB_STATE_PART_GROUP_STATE){ emit m_pub->layoutChanged(sevent->group); + return true; } if(sevent->changed & XCB_XKB_STATE_PART_MODIFIER_LOCK){ @@ -105,6 +132,7 @@ public: } emit m_pub->checkState(); + return false; } diff --git a/plugin-kbindicator/src/x11/kbdlayout.h b/plugin-kbindicator/src/x11/kbdlayout.h index 2e11b73..aa92e0c 100644 --- a/plugin-kbindicator/src/x11/kbdlayout.h +++ b/plugin-kbindicator/src/x11/kbdlayout.h @@ -1,3 +1,29 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Dmitriy Zhukov + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef _X11KBD_H_ #define _X11KBD_H_ diff --git a/plugin-kbindicator/translations/kbindicator_el.desktop b/plugin-kbindicator/translations/kbindicator_el.desktop new file mode 100644 index 0000000..3b46b26 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Ένδειξη κατάστασης πληκτρολογίου +Comment[el]=Πρόσθετο ένδειξης της κατάστασης του πληκτρολογίου και εναλλαγής. diff --git a/plugin-kbindicator/translations/kbindicator_el.ts b/plugin-kbindicator/translations/kbindicator_el.ts new file mode 100644 index 0000000..c7886d5 --- /dev/null +++ b/plugin-kbindicator/translations/kbindicator_el.ts @@ -0,0 +1,80 @@ + + + + + Content + + + Layout + Διάταξη + + + + Variant + Παραλλαγή + + + + KbdStateConfig + + + Dialog + Διάλογος + + + + Leds + Φωτεινοί δίοδοι + + + + Show Caps Lock + Εμφάνιση του κλειδώματος κεφαλαίων + + + + Show Num Lock + Εμφάνιση του κλειδώματος του αριθμητικού πληκτρολογίου + + + + Show Scroll Lock + Εμφάνιση του κλειδώματος της κύλισης + + + + Show keyboard layout + Εμφάνιση της διάταξης του πληκτρολογίου + + + + Show flags instead labels + Εμφάνιση της σημαίας αντί της ετικέτας + + + + Layout mode: + Λειτουργία διάταξης: + + + + Global + Καθολικό + + + + Window + Παράθυρο + + + + Application + Εφαρμογή + + + + Configure layouts + Διαμόρφωση των διατάξεων + + + diff --git a/plugin-mainmenu/lxqtmainmenu.cpp b/plugin-mainmenu/lxqtmainmenu.cpp index a14d5d2..045bd39 100644 --- a/plugin-mainmenu/lxqtmainmenu.cpp +++ b/plugin-mainmenu/lxqtmainmenu.cpp @@ -59,9 +59,9 @@ #define DEFAULT_SHORTCUT "Alt+F1" -LxQtMainMenu::LxQtMainMenu(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtMainMenu::LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mMenu(0), mShortcut(0), mLockCascadeChanges(false) @@ -73,14 +73,14 @@ LxQtMainMenu::LxQtMainMenu(const ILxQtPanelPluginStartupInfo &startupInfo): mDelayedPopup.setSingleShot(true); mDelayedPopup.setInterval(250); - connect(&mDelayedPopup, &QTimer::timeout, this, &LxQtMainMenu::showHideMenu); + connect(&mDelayedPopup, &QTimer::timeout, this, &LXQtMainMenu::showHideMenu); mHideTimer.setSingleShot(true); mHideTimer.setInterval(250); mButton.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); mButton.installEventFilter(this); - connect(&mButton, &QToolButton::clicked, this, &LxQtMainMenu::showHideMenu); + connect(&mButton, &QToolButton::clicked, this, &LXQtMainMenu::showHideMenu); settingsChanged(); @@ -92,7 +92,7 @@ LxQtMainMenu::LxQtMainMenu(const ILxQtPanelPluginStartupInfo &startupInfo): /************************************************ ************************************************/ -LxQtMainMenu::~LxQtMainMenu() +LXQtMainMenu::~LXQtMainMenu() { mButton.removeEventFilter(this); #ifdef HAVE_MENU_CACHE @@ -108,7 +108,7 @@ LxQtMainMenu::~LxQtMainMenu() /************************************************ ************************************************/ -void LxQtMainMenu::showHideMenu() +void LXQtMainMenu::showHideMenu() { if (mMenu && (mMenu->isVisible() || mHideTimer.isActive())) @@ -120,7 +120,7 @@ void LxQtMainMenu::showHideMenu() /************************************************ ************************************************/ -void LxQtMainMenu::shortcutChanged(const QString &/*oldShortcut*/, const QString &newShortcut) +void LXQtMainMenu::shortcutChanged(const QString &/*oldShortcut*/, const QString &newShortcut) { if (!newShortcut.isEmpty()) { @@ -138,7 +138,7 @@ void LxQtMainMenu::shortcutChanged(const QString &/*oldShortcut*/, const QString /************************************************ ************************************************/ -void LxQtMainMenu::showMenu() +void LXQtMainMenu::showMenu() { if (!mMenu) return; @@ -150,16 +150,16 @@ void LxQtMainMenu::showMenu() #ifdef HAVE_MENU_CACHE // static -void LxQtMainMenu::menuCacheReloadNotify(MenuCache* cache, gpointer user_data) +void LXQtMainMenu::menuCacheReloadNotify(MenuCache* cache, gpointer user_data) { - reinterpret_cast(user_data)->buildMenu(); + reinterpret_cast(user_data)->buildMenu(); } #endif /************************************************ ************************************************/ -void LxQtMainMenu::settingsChanged() +void LXQtMainMenu::settingsChanged() { if (mLockCascadeChanges) return; @@ -196,7 +196,7 @@ void LxQtMainMenu::settingsChanged() buildMenu(); mMenuCacheNotify = menu_cache_add_reload_notify(mMenuCache, (MenuCacheReloadNotify)menuCacheReloadNotify, this); #else - mXdgMenu.setEnvironments(QStringList() << "X-LXQT" << "LxQt"); + mXdgMenu.setEnvironments(QStringList() << "X-LXQT" << "LXQt"); mXdgMenu.setLogDir(mLogDir); bool res = mXdgMenu.read(mMenuFile); @@ -234,7 +234,7 @@ void LxQtMainMenu::settingsChanged() /************************************************ ************************************************/ -void LxQtMainMenu::buildMenu() +void LXQtMainMenu::buildMenu() { #ifdef HAVE_MENU_CACHE XdgCachedMenu* menu = new XdgCachedMenu(mMenuCache, &mButton); @@ -256,7 +256,7 @@ void LxQtMainMenu::buildMenu() connect(menu, &QMenu::aboutToHide, &mHideTimer, static_cast(&QTimer::start)); connect(menu, &QMenu::aboutToShow, &mHideTimer, &QTimer::stop); // panel notification (needed in case of auto-hide) - connect(menu, &QMenu::aboutToHide, dynamic_cast(panel()), &LxQtPanel::hidePanel); + connect(menu, &QMenu::aboutToHide, dynamic_cast(panel()), &LXQtPanel::hidePanel); QMenu *oldMenu = mMenu; mMenu = menu; @@ -269,7 +269,7 @@ void LxQtMainMenu::buildMenu() /************************************************ ************************************************/ -void LxQtMainMenu::setMenuFontSize() +void LXQtMainMenu::setMenuFontSize() { if (!mMenu) return; @@ -290,15 +290,18 @@ void LxQtMainMenu::setMenuFontSize() subMenu->setFont(menuFont); } } + + //icon size the same as the font height + mTopMenuStyle.setIconSize(QFontMetrics(menuFont).height()); } /************************************************ ************************************************/ -QDialog *LxQtMainMenu::configureDialog() +QDialog *LXQtMainMenu::configureDialog() { - return new LxQtMainMenuConfiguration(*settings(), DEFAULT_SHORTCUT); + return new LXQtMainMenuConfiguration(*settings(), DEFAULT_SHORTCUT); } /************************************************ @@ -312,7 +315,7 @@ struct MatchAction QString key_; }; -bool LxQtMainMenu::eventFilter(QObject *obj, QEvent *event) +bool LXQtMainMenu::eventFilter(QObject *obj, QEvent *event) { if(obj == &mButton) { @@ -321,7 +324,7 @@ bool LxQtMainMenu::eventFilter(QObject *obj, QEvent *event) { // reset proxy style for the menus so they can apply the new styles mTopMenuStyle.setBaseStyle(NULL); - mMenuStyle.setBaseStyle(NULL); + setMenuFontSize(); } } else if(QMenu* menu = qobject_cast(obj)) diff --git a/plugin-mainmenu/lxqtmainmenu.h b/plugin-mainmenu/lxqtmainmenu.h index 9653809..5253407 100644 --- a/plugin-mainmenu/lxqtmainmenu.h +++ b/plugin-mainmenu/lxqtmainmenu.h @@ -47,9 +47,9 @@ class QMenu; -class LxQtBar; +class LXQtBar; -namespace LxQt { +namespace LXQt { class PowerManager; class ScreenSaver; } @@ -59,15 +59,15 @@ namespace GlobalKeyShortcut class Action; } -class LxQtMainMenu : public QObject, public ILxQtPanelPlugin +class LXQtMainMenu : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtMainMenu(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtMainMenu(); + LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtMainMenu(); QString themeId() const { return "MainMenu"; } - virtual ILxQtPanelPlugin::Flags flags() const { return HaveConfigDialog ; } + virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog ; } QWidget *widget() { return &mButton; } QDialog *configureDialog(); @@ -86,7 +86,6 @@ private: QMenu* mMenu; GlobalKeyShortcut::Action *mShortcut; MenuStyle mTopMenuStyle; - MenuStyle mMenuStyle; #ifdef HAVE_MENU_CACHE MenuCache* mMenuCache; @@ -113,13 +112,13 @@ private slots: void shortcutChanged(const QString &oldShortcut, const QString &newShortcut); }; -class LxQtMainMenuPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtMainMenuPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new LxQtMainMenu(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtMainMenu(startupInfo);} }; #endif diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp index 2c78cb5..332c523 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp @@ -33,9 +33,9 @@ #include -LxQtMainMenuConfiguration::LxQtMainMenuConfiguration(QSettings &settings, const QString &defaultShortcut, QWidget *parent) : +LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(QSettings &settings, const QString &defaultShortcut, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtMainMenuConfiguration), + ui(new Ui::LXQtMainMenuConfiguration), mSettings(settings), mOldSettings(settings), mDefaultShortcut(defaultShortcut) @@ -65,12 +65,12 @@ LxQtMainMenuConfiguration::LxQtMainMenuConfiguration(QSettings &settings, const connect(ui->customFontSizeSB, SIGNAL(valueChanged(int)), this, SLOT(customFontSizeChanged(int))); } -LxQtMainMenuConfiguration::~LxQtMainMenuConfiguration() +LXQtMainMenuConfiguration::~LXQtMainMenuConfiguration() { delete ui; } -void LxQtMainMenuConfiguration::loadSettings() +void LXQtMainMenuConfiguration::loadSettings() { ui->showTextCB->setChecked(mSettings.value("showText", false).toBool()); ui->textLE->setText(mSettings.value("text", "").toString()); @@ -84,7 +84,7 @@ void LxQtMainMenuConfiguration::loadSettings() ui->shortcutEd->setText(mSettings.value("shortcut", "Alt+F1").toString()); ui->customFontCB->setChecked(mSettings.value("customFont", false).toBool()); - LxQt::Settings lxqtSettings("lxqt"); //load system font size as init value + LXQt::Settings lxqtSettings("lxqt"); //load system font size as init value QFont systemFont; lxqtSettings.beginGroup(QLatin1String("Qt")); systemFont.fromString(lxqtSettings.value("font", this->font()).toString()); @@ -92,17 +92,17 @@ void LxQtMainMenuConfiguration::loadSettings() ui->customFontSizeSB->setValue(mSettings.value("customFontSize", systemFont.pointSize()).toInt()); } -void LxQtMainMenuConfiguration::textButtonChanged(const QString &value) +void LXQtMainMenuConfiguration::textButtonChanged(const QString &value) { mSettings.setValue("text", value); } -void LxQtMainMenuConfiguration::showTextChanged(bool value) +void LXQtMainMenuConfiguration::showTextChanged(bool value) { mSettings.setValue("showText", value); } -void LxQtMainMenuConfiguration::chooseMenuFile() +void LXQtMainMenuConfiguration::chooseMenuFile() { QFileDialog *d = new QFileDialog(this, tr("Choose menu file"), @@ -116,18 +116,18 @@ void LxQtMainMenuConfiguration::chooseMenuFile() d->show(); } -void LxQtMainMenuConfiguration::shortcutChanged(const QString &value) +void LXQtMainMenuConfiguration::shortcutChanged(const QString &value) { ui->shortcutEd->setText(value); mSettings.setValue("shortcut", value); } -void LxQtMainMenuConfiguration::shortcutReset() +void LXQtMainMenuConfiguration::shortcutReset() { shortcutChanged(mDefaultShortcut); } -void LxQtMainMenuConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtMainMenuConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { @@ -140,12 +140,12 @@ void LxQtMainMenuConfiguration::dialogButtonsAction(QAbstractButton *btn) } } -void LxQtMainMenuConfiguration::customFontChanged(bool value) +void LXQtMainMenuConfiguration::customFontChanged(bool value) { mSettings.setValue("customFont", value); } -void LxQtMainMenuConfiguration::customFontSizeChanged(int value) +void LXQtMainMenuConfiguration::customFontSizeChanged(int value) { mSettings.setValue("customFontSize", value); } diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.h b/plugin-mainmenu/lxqtmainmenuconfiguration.h index 496bdbc..874b02a 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.h +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.h @@ -37,21 +37,21 @@ class QSettings; class QAbstractButton; namespace Ui { - class LxQtMainMenuConfiguration; + class LXQtMainMenuConfiguration; } -class LxQtMainMenuConfiguration : public QDialog +class LXQtMainMenuConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtMainMenuConfiguration(QSettings &settings, const QString &defaultShortcut, QWidget *parent = 0); - ~LxQtMainMenuConfiguration(); + explicit LXQtMainMenuConfiguration(QSettings &settings, const QString &defaultShortcut, QWidget *parent = 0); + ~LXQtMainMenuConfiguration(); private: - Ui::LxQtMainMenuConfiguration *ui; + Ui::LXQtMainMenuConfiguration *ui; QSettings &mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; QString mDefaultShortcut; private slots: diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.ui b/plugin-mainmenu/lxqtmainmenuconfiguration.ui index 7ba4d93..02a726a 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.ui +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.ui @@ -1,7 +1,7 @@ - LxQtMainMenuConfiguration - + LXQtMainMenuConfiguration + 0 diff --git a/plugin-mainmenu/resources/mainmenu.desktop.in b/plugin-mainmenu/resources/mainmenu.desktop.in index 6cecd44..4b92573 100644 --- a/plugin-mainmenu/resources/mainmenu.desktop.in +++ b/plugin-mainmenu/resources/mainmenu.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. Icon=start-here-lxqt diff --git a/plugin-mainmenu/translations/mainmenu.ts b/plugin-mainmenu/translations/mainmenu.ts index 73d2fc8..381933a 100644 --- a/plugin-mainmenu/translations/mainmenu.ts +++ b/plugin-mainmenu/translations/mainmenu.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_ar.desktop b/plugin-mainmenu/translations/mainmenu_ar.desktop index b10541f..cb88bc8 100644 --- a/plugin-mainmenu/translations/mainmenu_ar.desktop +++ b/plugin-mainmenu/translations/mainmenu_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_ar.ts b/plugin-mainmenu/translations/mainmenu_ar.ts index 0577531..0beadac 100644 --- a/plugin-mainmenu/translations/mainmenu_ar.ts +++ b/plugin-mainmenu/translations/mainmenu_ar.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings إعدادات قائمة ريزر الرئيسيَّة diff --git a/plugin-mainmenu/translations/mainmenu_cs.desktop b/plugin-mainmenu/translations/mainmenu_cs.desktop index 4392af2..e43bdbf 100644 --- a/plugin-mainmenu/translations/mainmenu_cs.desktop +++ b/plugin-mainmenu/translations/mainmenu_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_cs.ts b/plugin-mainmenu/translations/mainmenu_cs.ts index cf03517..343a631 100644 --- a/plugin-mainmenu/translations/mainmenu_cs.ts +++ b/plugin-mainmenu/translations/mainmenu_cs.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings Nastavení hlavní nabídky diff --git a/plugin-mainmenu/translations/mainmenu_cs_CZ.desktop b/plugin-mainmenu/translations/mainmenu_cs_CZ.desktop index c0a6c5b..ece8099 100644 --- a/plugin-mainmenu/translations/mainmenu_cs_CZ.desktop +++ b/plugin-mainmenu/translations/mainmenu_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_cs_CZ.ts b/plugin-mainmenu/translations/mainmenu_cs_CZ.ts index 97ac808..d517311 100644 --- a/plugin-mainmenu/translations/mainmenu_cs_CZ.ts +++ b/plugin-mainmenu/translations/mainmenu_cs_CZ.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings Nastavení hlavní nabídky diff --git a/plugin-mainmenu/translations/mainmenu_da.desktop b/plugin-mainmenu/translations/mainmenu_da.desktop index cbbdaa5..8c99bb5 100644 --- a/plugin-mainmenu/translations/mainmenu_da.desktop +++ b/plugin-mainmenu/translations/mainmenu_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_da.ts b/plugin-mainmenu/translations/mainmenu_da.ts index 60e01a5..603d3af 100644 --- a/plugin-mainmenu/translations/mainmenu_da.ts +++ b/plugin-mainmenu/translations/mainmenu_da.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings LXQt Hovedmenu Indstillinger diff --git a/plugin-mainmenu/translations/mainmenu_da_DK.desktop b/plugin-mainmenu/translations/mainmenu_da_DK.desktop index 4c429bc..462ef43 100644 --- a/plugin-mainmenu/translations/mainmenu_da_DK.desktop +++ b/plugin-mainmenu/translations/mainmenu_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_da_DK.ts b/plugin-mainmenu/translations/mainmenu_da_DK.ts index b1cacce..42fe954 100644 --- a/plugin-mainmenu/translations/mainmenu_da_DK.ts +++ b/plugin-mainmenu/translations/mainmenu_da_DK.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt Hoved Menu Indstillinger + LXQt Main Menu settings + LXQt Hoved Menu Indstillinger diff --git a/plugin-mainmenu/translations/mainmenu_de.ts b/plugin-mainmenu/translations/mainmenu_de.ts index 94cb85d..acfab0c 100644 --- a/plugin-mainmenu/translations/mainmenu_de.ts +++ b/plugin-mainmenu/translations/mainmenu_de.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration Main Menu settings diff --git a/plugin-mainmenu/translations/mainmenu_el.desktop b/plugin-mainmenu/translations/mainmenu_el.desktop new file mode 100644 index 0000000..0bce6e8 --- /dev/null +++ b/plugin-mainmenu/translations/mainmenu_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Μενού εφαρμογών +Comment[el]=Ένα μενού για όλες σας τις εφαρμογές. diff --git a/plugin-mainmenu/translations/mainmenu_el_GR.ts b/plugin-mainmenu/translations/mainmenu_el.ts similarity index 78% rename from plugin-mainmenu/translations/mainmenu_el_GR.ts rename to plugin-mainmenu/translations/mainmenu_el.ts index 9ff8f32..97fd218 100644 --- a/plugin-mainmenu/translations/mainmenu_el_GR.ts +++ b/plugin-mainmenu/translations/mainmenu_el.ts @@ -1,23 +1,23 @@ - + - LxQtMainMenu + LXQtMainMenu Show/hide main menu - + Εμφάνιση/απόκρυψη του κύριου μενού Leave - Έξοδος + Έξοδος - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Ρυθμίσεις κυρίως μενού LxQt + LXQt Main Menu settings + Ρυθμίσεις κυρίως μενού LXQt @@ -30,27 +30,27 @@ Button text - Κείμενου πλήκτρου + Κείμενο κουμπιού Main Menu settings - + Ρυθμίσεις του κύριου μενού Button text: - + Κείμενο κουμπιού: Custom font size: - + Προσαρμοσμένο μέγεθος γραμματοσειράς: pt - + pt @@ -60,7 +60,7 @@ Menu file: - + Αρχείο μενού: @@ -80,7 +80,7 @@ Reset - + Επαναφορά diff --git a/plugin-mainmenu/translations/mainmenu_el_GR.desktop b/plugin-mainmenu/translations/mainmenu_el_GR.desktop deleted file mode 100644 index fde6090..0000000 --- a/plugin-mainmenu/translations/mainmenu_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Application menu -Comment=A menu of all your applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Μενού εκκίνησης εφαρμογών -Name[el_GR]=Μενού εφαρμογών diff --git a/plugin-mainmenu/translations/mainmenu_eo.desktop b/plugin-mainmenu/translations/mainmenu_eo.desktop index 616b575..5fbf826 100644 --- a/plugin-mainmenu/translations/mainmenu_eo.desktop +++ b/plugin-mainmenu/translations/mainmenu_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_eo.ts b/plugin-mainmenu/translations/mainmenu_eo.ts index 400c5ac..76dccc5 100644 --- a/plugin-mainmenu/translations/mainmenu_eo.ts +++ b/plugin-mainmenu/translations/mainmenu_eo.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Agordoj de ĉefa menuo de LxQt + LXQt Main Menu settings + Agordoj de ĉefa menuo de LXQt diff --git a/plugin-mainmenu/translations/mainmenu_es.desktop b/plugin-mainmenu/translations/mainmenu_es.desktop index 85625cf..bc143cd 100644 --- a/plugin-mainmenu/translations/mainmenu_es.desktop +++ b/plugin-mainmenu/translations/mainmenu_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_es.ts b/plugin-mainmenu/translations/mainmenu_es.ts index 25f31f2..74c1f4a 100644 --- a/plugin-mainmenu/translations/mainmenu_es.ts +++ b/plugin-mainmenu/translations/mainmenu_es.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Configuración del menú principal de LxQt + LXQt Main Menu settings + Configuración del menú principal de LXQt diff --git a/plugin-mainmenu/translations/mainmenu_es_UY.ts b/plugin-mainmenu/translations/mainmenu_es_UY.ts index e4c69eb..07938bc 100644 --- a/plugin-mainmenu/translations/mainmenu_es_UY.ts +++ b/plugin-mainmenu/translations/mainmenu_es_UY.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Configuración del Menú Principal LxQt + LXQt Main Menu settings + Configuración del Menú Principal LXQt diff --git a/plugin-mainmenu/translations/mainmenu_es_VE.desktop b/plugin-mainmenu/translations/mainmenu_es_VE.desktop index cb25745..12fe635 100644 --- a/plugin-mainmenu/translations/mainmenu_es_VE.desktop +++ b/plugin-mainmenu/translations/mainmenu_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_es_VE.ts b/plugin-mainmenu/translations/mainmenu_es_VE.ts index 9c1628f..8abf6b6 100644 --- a/plugin-mainmenu/translations/mainmenu_es_VE.ts +++ b/plugin-mainmenu/translations/mainmenu_es_VE.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Configuración del Menú Principal LxQt + LXQt Main Menu settings + Configuración del Menú Principal LXQt diff --git a/plugin-mainmenu/translations/mainmenu_eu.desktop b/plugin-mainmenu/translations/mainmenu_eu.desktop index e73f5c7..8baa72e 100644 --- a/plugin-mainmenu/translations/mainmenu_eu.desktop +++ b/plugin-mainmenu/translations/mainmenu_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_eu.ts b/plugin-mainmenu/translations/mainmenu_eu.ts index 0fe6784..a04c6f3 100644 --- a/plugin-mainmenu/translations/mainmenu_eu.ts +++ b/plugin-mainmenu/translations/mainmenu_eu.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt menu nagusiaren ezarpenak + LXQt Main Menu settings + LXQt menu nagusiaren ezarpenak diff --git a/plugin-mainmenu/translations/mainmenu_fi.desktop b/plugin-mainmenu/translations/mainmenu_fi.desktop index 334eeb5..1bf40d5 100644 --- a/plugin-mainmenu/translations/mainmenu_fi.desktop +++ b/plugin-mainmenu/translations/mainmenu_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_fi.ts b/plugin-mainmenu/translations/mainmenu_fi.ts index 4d556a2..00724f7 100644 --- a/plugin-mainmenu/translations/mainmenu_fi.ts +++ b/plugin-mainmenu/translations/mainmenu_fi.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQtin päävalikon asetukset + LXQt Main Menu settings + LXQtin päävalikon asetukset diff --git a/plugin-mainmenu/translations/mainmenu_fr_FR.desktop b/plugin-mainmenu/translations/mainmenu_fr_FR.desktop index 00992de..530d473 100644 --- a/plugin-mainmenu/translations/mainmenu_fr_FR.desktop +++ b/plugin-mainmenu/translations/mainmenu_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_fr_FR.ts b/plugin-mainmenu/translations/mainmenu_fr_FR.ts index f127304..f3a9766 100644 --- a/plugin-mainmenu/translations/mainmenu_fr_FR.ts +++ b/plugin-mainmenu/translations/mainmenu_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Menu principal des paramètres de LxQt + LXQt Main Menu settings + Menu principal des paramètres de LXQt diff --git a/plugin-mainmenu/translations/mainmenu_hr.ts b/plugin-mainmenu/translations/mainmenu_hr.ts index e82b93c..fb4e08e 100644 --- a/plugin-mainmenu/translations/mainmenu_hr.ts +++ b/plugin-mainmenu/translations/mainmenu_hr.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_hu.desktop b/plugin-mainmenu/translations/mainmenu_hu.desktop index b862473..fe0daea 100644 --- a/plugin-mainmenu/translations/mainmenu_hu.desktop +++ b/plugin-mainmenu/translations/mainmenu_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_hu.ts b/plugin-mainmenu/translations/mainmenu_hu.ts index 0958db1..e6bc78b 100644 --- a/plugin-mainmenu/translations/mainmenu_hu.ts +++ b/plugin-mainmenu/translations/mainmenu_hu.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt főmenü beállítás + LXQt Main Menu settings + LXQt főmenü beállítás diff --git a/plugin-mainmenu/translations/mainmenu_hu_HU.ts b/plugin-mainmenu/translations/mainmenu_hu_HU.ts index 4514508..a2e723e 100644 --- a/plugin-mainmenu/translations/mainmenu_hu_HU.ts +++ b/plugin-mainmenu/translations/mainmenu_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt főmenü beállítás + LXQt Main Menu settings + LXQt főmenü beállítás diff --git a/plugin-mainmenu/translations/mainmenu_ia.desktop b/plugin-mainmenu/translations/mainmenu_ia.desktop index 6c4d961..5421ebe 100644 --- a/plugin-mainmenu/translations/mainmenu_ia.desktop +++ b/plugin-mainmenu/translations/mainmenu_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=Menu based application launcher diff --git a/plugin-mainmenu/translations/mainmenu_ia.ts b/plugin-mainmenu/translations/mainmenu_ia.ts index 7cc16c2..ba1201c 100644 --- a/plugin-mainmenu/translations/mainmenu_ia.ts +++ b/plugin-mainmenu/translations/mainmenu_ia.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_id_ID.desktop b/plugin-mainmenu/translations/mainmenu_id_ID.desktop index 3f5234a..758bb75 100644 --- a/plugin-mainmenu/translations/mainmenu_id_ID.desktop +++ b/plugin-mainmenu/translations/mainmenu_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_id_ID.ts b/plugin-mainmenu/translations/mainmenu_id_ID.ts index 095b42b..6ee90de 100644 --- a/plugin-mainmenu/translations/mainmenu_id_ID.ts +++ b/plugin-mainmenu/translations/mainmenu_id_ID.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_it_IT.desktop b/plugin-mainmenu/translations/mainmenu_it_IT.desktop index d87003f..3a38f5a 100644 --- a/plugin-mainmenu/translations/mainmenu_it_IT.desktop +++ b/plugin-mainmenu/translations/mainmenu_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_it_IT.ts b/plugin-mainmenu/translations/mainmenu_it_IT.ts index b3a286a..f2aad93 100644 --- a/plugin-mainmenu/translations/mainmenu_it_IT.ts +++ b/plugin-mainmenu/translations/mainmenu_it_IT.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Impostazioni del menu principale di LxQt + LXQt Main Menu settings + Impostazioni del menu principale di LXQt diff --git a/plugin-mainmenu/translations/mainmenu_ja.desktop b/plugin-mainmenu/translations/mainmenu_ja.desktop index dc18ca1..4fe7bfc 100644 --- a/plugin-mainmenu/translations/mainmenu_ja.desktop +++ b/plugin-mainmenu/translations/mainmenu_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_ja.ts b/plugin-mainmenu/translations/mainmenu_ja.ts index 5f3b0d3..f8da9ce 100644 --- a/plugin-mainmenu/translations/mainmenu_ja.ts +++ b/plugin-mainmenu/translations/mainmenu_ja.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,7 +14,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_ko.desktop b/plugin-mainmenu/translations/mainmenu_ko.desktop index 6c4d961..5421ebe 100644 --- a/plugin-mainmenu/translations/mainmenu_ko.desktop +++ b/plugin-mainmenu/translations/mainmenu_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=Menu based application launcher diff --git a/plugin-mainmenu/translations/mainmenu_ko.ts b/plugin-mainmenu/translations/mainmenu_ko.ts index d1a91b9..1e8bc9a 100644 --- a/plugin-mainmenu/translations/mainmenu_ko.ts +++ b/plugin-mainmenu/translations/mainmenu_ko.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_lt.desktop b/plugin-mainmenu/translations/mainmenu_lt.desktop index 54decc5..e670d7d 100644 --- a/plugin-mainmenu/translations/mainmenu_lt.desktop +++ b/plugin-mainmenu/translations/mainmenu_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_lt.ts b/plugin-mainmenu/translations/mainmenu_lt.ts index 7f03949..0464355 100644 --- a/plugin-mainmenu/translations/mainmenu_lt.ts +++ b/plugin-mainmenu/translations/mainmenu_lt.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt pagrindinio meniu nuostatos + LXQt Main Menu settings + LXQt pagrindinio meniu nuostatos diff --git a/plugin-mainmenu/translations/mainmenu_nl.desktop b/plugin-mainmenu/translations/mainmenu_nl.desktop index b133bad..8cddce9 100644 --- a/plugin-mainmenu/translations/mainmenu_nl.desktop +++ b/plugin-mainmenu/translations/mainmenu_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_nl.ts b/plugin-mainmenu/translations/mainmenu_nl.ts index 9724c07..6fcea30 100644 --- a/plugin-mainmenu/translations/mainmenu_nl.ts +++ b/plugin-mainmenu/translations/mainmenu_nl.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Instellingen van hoofdmenu van LxQt + LXQt Main Menu settings + Instellingen van hoofdmenu van LXQt diff --git a/plugin-mainmenu/translations/mainmenu_pl.desktop b/plugin-mainmenu/translations/mainmenu_pl.desktop index 0ac249d..a6491d3 100644 --- a/plugin-mainmenu/translations/mainmenu_pl.desktop +++ b/plugin-mainmenu/translations/mainmenu_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_pl_PL.desktop b/plugin-mainmenu/translations/mainmenu_pl_PL.desktop index 837de4c..af61999 100644 --- a/plugin-mainmenu/translations/mainmenu_pl_PL.desktop +++ b/plugin-mainmenu/translations/mainmenu_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_pl_PL.ts b/plugin-mainmenu/translations/mainmenu_pl_PL.ts index 7ff8b07..9615c66 100644 --- a/plugin-mainmenu/translations/mainmenu_pl_PL.ts +++ b/plugin-mainmenu/translations/mainmenu_pl_PL.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Ustawienia menu LxQt + LXQt Main Menu settings + Ustawienia menu LXQt diff --git a/plugin-mainmenu/translations/mainmenu_pt.desktop b/plugin-mainmenu/translations/mainmenu_pt.desktop index a1ec648..12b1fd7 100644 --- a/plugin-mainmenu/translations/mainmenu_pt.desktop +++ b/plugin-mainmenu/translations/mainmenu_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_pt.ts b/plugin-mainmenu/translations/mainmenu_pt.ts index f59075d..2cf8c07 100644 --- a/plugin-mainmenu/translations/mainmenu_pt.ts +++ b/plugin-mainmenu/translations/mainmenu_pt.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Definições do menu principal do LxQt + LXQt Main Menu settings + Definições do menu principal do LXQt diff --git a/plugin-mainmenu/translations/mainmenu_pt_BR.desktop b/plugin-mainmenu/translations/mainmenu_pt_BR.desktop index df9b5f6..e24fa9e 100644 --- a/plugin-mainmenu/translations/mainmenu_pt_BR.desktop +++ b/plugin-mainmenu/translations/mainmenu_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_pt_BR.ts b/plugin-mainmenu/translations/mainmenu_pt_BR.ts index 90a5fd0..39ee211 100644 --- a/plugin-mainmenu/translations/mainmenu_pt_BR.ts +++ b/plugin-mainmenu/translations/mainmenu_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Configurações do menu principal do LxQt + LXQt Main Menu settings + Configurações do menu principal do LXQt diff --git a/plugin-mainmenu/translations/mainmenu_ro_RO.desktop b/plugin-mainmenu/translations/mainmenu_ro_RO.desktop index 3bb9334..6a118ad 100644 --- a/plugin-mainmenu/translations/mainmenu_ro_RO.desktop +++ b/plugin-mainmenu/translations/mainmenu_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_ro_RO.ts b/plugin-mainmenu/translations/mainmenu_ro_RO.ts index 20c0fa4..3dbc0b7 100644 --- a/plugin-mainmenu/translations/mainmenu_ro_RO.ts +++ b/plugin-mainmenu/translations/mainmenu_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Setări meniu principal LxQt + LXQt Main Menu settings + Setări meniu principal LXQt diff --git a/plugin-mainmenu/translations/mainmenu_ru.desktop b/plugin-mainmenu/translations/mainmenu_ru.desktop index 25de0e2..c37e322 100644 --- a/plugin-mainmenu/translations/mainmenu_ru.desktop +++ b/plugin-mainmenu/translations/mainmenu_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_ru.ts b/plugin-mainmenu/translations/mainmenu_ru.ts index d9cf260..69d1c00 100644 --- a/plugin-mainmenu/translations/mainmenu_ru.ts +++ b/plugin-mainmenu/translations/mainmenu_ru.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration Main Menu settings diff --git a/plugin-mainmenu/translations/mainmenu_ru_RU.desktop b/plugin-mainmenu/translations/mainmenu_ru_RU.desktop index abeb28e..439b1d7 100644 --- a/plugin-mainmenu/translations/mainmenu_ru_RU.desktop +++ b/plugin-mainmenu/translations/mainmenu_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_ru_RU.ts b/plugin-mainmenu/translations/mainmenu_ru_RU.ts index b4a25ce..5a53ad4 100644 --- a/plugin-mainmenu/translations/mainmenu_ru_RU.ts +++ b/plugin-mainmenu/translations/mainmenu_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration Main Menu settings diff --git a/plugin-mainmenu/translations/mainmenu_sk.desktop b/plugin-mainmenu/translations/mainmenu_sk.desktop index 2d17def..2d87f61 100644 --- a/plugin-mainmenu/translations/mainmenu_sk.desktop +++ b/plugin-mainmenu/translations/mainmenu_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_sk_SK.ts b/plugin-mainmenu/translations/mainmenu_sk_SK.ts index 872a01b..6314e20 100644 --- a/plugin-mainmenu/translations/mainmenu_sk_SK.ts +++ b/plugin-mainmenu/translations/mainmenu_sk_SK.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Nastavenia Hlavného menu prostredia LxQt + LXQt Main Menu settings + Nastavenia Hlavného menu prostredia LXQt diff --git a/plugin-mainmenu/translations/mainmenu_sl.desktop b/plugin-mainmenu/translations/mainmenu_sl.desktop index 0480879..ef5229f 100644 --- a/plugin-mainmenu/translations/mainmenu_sl.desktop +++ b/plugin-mainmenu/translations/mainmenu_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_sl.ts b/plugin-mainmenu/translations/mainmenu_sl.ts index 2d3f242..d9b4aa8 100644 --- a/plugin-mainmenu/translations/mainmenu_sl.ts +++ b/plugin-mainmenu/translations/mainmenu_sl.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings Nastavitve glavnega menija diff --git a/plugin-mainmenu/translations/mainmenu_sr.desktop b/plugin-mainmenu/translations/mainmenu_sr.desktop index 487db48..175a234 100644 --- a/plugin-mainmenu/translations/mainmenu_sr.desktop +++ b/plugin-mainmenu/translations/mainmenu_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_sr@latin.desktop b/plugin-mainmenu/translations/mainmenu_sr@latin.desktop index 6e7b8ea..78d7553 100644 --- a/plugin-mainmenu/translations/mainmenu_sr@latin.desktop +++ b/plugin-mainmenu/translations/mainmenu_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_sr@latin.ts b/plugin-mainmenu/translations/mainmenu_sr@latin.ts index d1449a7..4ff956d 100644 --- a/plugin-mainmenu/translations/mainmenu_sr@latin.ts +++ b/plugin-mainmenu/translations/mainmenu_sr@latin.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -10,7 +10,7 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration General diff --git a/plugin-mainmenu/translations/mainmenu_sr_BA.ts b/plugin-mainmenu/translations/mainmenu_sr_BA.ts index 9582e30..33f838c 100644 --- a/plugin-mainmenu/translations/mainmenu_sr_BA.ts +++ b/plugin-mainmenu/translations/mainmenu_sr_BA.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings Подешавања главног менија diff --git a/plugin-mainmenu/translations/mainmenu_sr_RS.ts b/plugin-mainmenu/translations/mainmenu_sr_RS.ts index 91a5d24..179ed68 100644 --- a/plugin-mainmenu/translations/mainmenu_sr_RS.ts +++ b/plugin-mainmenu/translations/mainmenu_sr_RS.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,9 +14,9 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings + LXQt Main Menu settings Подешавања главног менија diff --git a/plugin-mainmenu/translations/mainmenu_th_TH.desktop b/plugin-mainmenu/translations/mainmenu_th_TH.desktop index b5f327b..3a8876c 100644 --- a/plugin-mainmenu/translations/mainmenu_th_TH.desktop +++ b/plugin-mainmenu/translations/mainmenu_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_th_TH.ts b/plugin-mainmenu/translations/mainmenu_th_TH.ts index cf050cc..5782c9b 100644 --- a/plugin-mainmenu/translations/mainmenu_th_TH.ts +++ b/plugin-mainmenu/translations/mainmenu_th_TH.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - ค่าตั้งเมนูหลัก LxQt + LXQt Main Menu settings + ค่าตั้งเมนูหลัก LXQt diff --git a/plugin-mainmenu/translations/mainmenu_tr.desktop b/plugin-mainmenu/translations/mainmenu_tr.desktop index 7156143..7ec5611 100644 --- a/plugin-mainmenu/translations/mainmenu_tr.desktop +++ b/plugin-mainmenu/translations/mainmenu_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_tr.ts b/plugin-mainmenu/translations/mainmenu_tr.ts index 88516fc..f41bd26 100644 --- a/plugin-mainmenu/translations/mainmenu_tr.ts +++ b/plugin-mainmenu/translations/mainmenu_tr.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt Ana Menü ayarları + LXQt Main Menu settings + LXQt Ana Menü ayarları diff --git a/plugin-mainmenu/translations/mainmenu_uk.desktop b/plugin-mainmenu/translations/mainmenu_uk.desktop index 2a70645..06d54ab 100644 --- a/plugin-mainmenu/translations/mainmenu_uk.desktop +++ b/plugin-mainmenu/translations/mainmenu_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_uk.ts b/plugin-mainmenu/translations/mainmenu_uk.ts index 1e21f47..00dcd8c 100644 --- a/plugin-mainmenu/translations/mainmenu_uk.ts +++ b/plugin-mainmenu/translations/mainmenu_uk.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - Налаштування головного меню LxQt + LXQt Main Menu settings + Налаштування головного меню LXQt diff --git a/plugin-mainmenu/translations/mainmenu_zh_CN.GB2312.desktop b/plugin-mainmenu/translations/mainmenu_zh_CN.GB2312.desktop index 6c4d961..5421ebe 100644 --- a/plugin-mainmenu/translations/mainmenu_zh_CN.GB2312.desktop +++ b/plugin-mainmenu/translations/mainmenu_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=Menu based application launcher diff --git a/plugin-mainmenu/translations/mainmenu_zh_CN.desktop b/plugin-mainmenu/translations/mainmenu_zh_CN.desktop index d8b020c..16fba31 100644 --- a/plugin-mainmenu/translations/mainmenu_zh_CN.desktop +++ b/plugin-mainmenu/translations/mainmenu_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_zh_CN.ts b/plugin-mainmenu/translations/mainmenu_zh_CN.ts index f9ddeee..136b17c 100644 --- a/plugin-mainmenu/translations/mainmenu_zh_CN.ts +++ b/plugin-mainmenu/translations/mainmenu_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt主菜单设置 + LXQt Main Menu settings + LXQt主菜单设置 diff --git a/plugin-mainmenu/translations/mainmenu_zh_TW.desktop b/plugin-mainmenu/translations/mainmenu_zh_TW.desktop index aacebcb..f654597 100644 --- a/plugin-mainmenu/translations/mainmenu_zh_TW.desktop +++ b/plugin-mainmenu/translations/mainmenu_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Application menu Comment=A menu of all your applications. diff --git a/plugin-mainmenu/translations/mainmenu_zh_TW.ts b/plugin-mainmenu/translations/mainmenu_zh_TW.ts index 5bc02fb..d6cb878 100644 --- a/plugin-mainmenu/translations/mainmenu_zh_TW.ts +++ b/plugin-mainmenu/translations/mainmenu_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtMainMenu + LXQtMainMenu Show/hide main menu @@ -14,10 +14,10 @@ - LxQtMainMenuConfiguration + LXQtMainMenuConfiguration - LxQt Main Menu settings - LxQt主選單設定 + LXQt Main Menu settings + LXQt主選單設定 diff --git a/plugin-mount/actions/deviceaction.cpp b/plugin-mount/actions/deviceaction.cpp index 1165d8c..8843347 100644 --- a/plugin-mount/actions/deviceaction.cpp +++ b/plugin-mount/actions/deviceaction.cpp @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -42,7 +42,7 @@ #define ACT_INFO_UPPER QString(ACT_INFO).toUpper() #define ACT_MENU_UPPER QString(ACT_MENU).toUpper() -DeviceAction::DeviceAction(LxQtMountPlugin *plugin, QObject *parent): +DeviceAction::DeviceAction(LXQtMountPlugin *plugin, QObject *parent): mPlugin(plugin) { } @@ -51,7 +51,7 @@ DeviceAction::~DeviceAction() { } -DeviceAction *DeviceAction::create(ActionId id, LxQtMountPlugin *plugin, QObject *parent) +DeviceAction *DeviceAction::create(ActionId id, LXQtMountPlugin *plugin, QObject *parent) { switch (id) { diff --git a/plugin-mount/actions/deviceaction.h b/plugin-mount/actions/deviceaction.h index 58ecc27..8b46f37 100644 --- a/plugin-mount/actions/deviceaction.h +++ b/plugin-mount/actions/deviceaction.h @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -32,7 +32,7 @@ #include #include -class LxQtMountPlugin; +class LXQtMountPlugin; class DeviceAction: public QObject { @@ -49,7 +49,7 @@ public: virtual ~DeviceAction(); virtual ActionId Type() const throw () = 0; - static DeviceAction *create(ActionId id, LxQtMountPlugin *plugin, QObject *parent = 0); + static DeviceAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = 0); static ActionId stringToActionId(const QString &string, ActionId defaultValue); static QString actionIdToString(ActionId id); @@ -58,11 +58,11 @@ public slots: void onDeviceRemoved(QString const & udi); protected: - explicit DeviceAction(LxQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceAction(LXQtMountPlugin *plugin, QObject *parent = 0); virtual void doDeviceAdded(Solid::Device device) = 0; virtual void doDeviceRemoved(Solid::Device device) = 0; - LxQtMountPlugin *mPlugin; + LXQtMountPlugin *mPlugin; }; #endif // DEVICEACTION_H diff --git a/plugin-mount/actions/deviceaction_info.cpp b/plugin-mount/actions/deviceaction_info.cpp index 5a5b4c7..d8040dd 100644 --- a/plugin-mount/actions/deviceaction_info.cpp +++ b/plugin-mount/actions/deviceaction_info.cpp @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -30,7 +30,7 @@ #include -DeviceActionInfo::DeviceActionInfo(LxQtMountPlugin *plugin, QObject *parent): +DeviceActionInfo::DeviceActionInfo(LXQtMountPlugin *plugin, QObject *parent): DeviceAction(plugin, parent) { } @@ -47,5 +47,5 @@ void DeviceActionInfo::doDeviceRemoved(Solid::Device device) void DeviceActionInfo::showMessage(const QString &text) { - LxQt::Notification::notify(tr("Removable media/devices manager"), text, mPlugin->icon().name()); + LXQt::Notification::notify(tr("Removable media/devices manager"), text, mPlugin->icon().name()); } diff --git a/plugin-mount/actions/deviceaction_info.h b/plugin-mount/actions/deviceaction_info.h index 99e8733..0e500a9 100644 --- a/plugin-mount/actions/deviceaction_info.h +++ b/plugin-mount/actions/deviceaction_info.h @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -39,7 +39,7 @@ class DeviceActionInfo : public DeviceAction { Q_OBJECT public: - explicit DeviceActionInfo(LxQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionInfo(LXQtMountPlugin *plugin, QObject *parent = 0); virtual ActionId Type() const throw () { return ActionInfo; } protected: diff --git a/plugin-mount/actions/deviceaction_menu.cpp b/plugin-mount/actions/deviceaction_menu.cpp index 982834a..1357d56 100644 --- a/plugin-mount/actions/deviceaction_menu.cpp +++ b/plugin-mount/actions/deviceaction_menu.cpp @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -29,7 +29,7 @@ #include "../lxqtmountplugin.h" #include "../popup.h" -DeviceActionMenu::DeviceActionMenu(LxQtMountPlugin *plugin, QObject *parent): +DeviceActionMenu::DeviceActionMenu(LXQtMountPlugin *plugin, QObject *parent): DeviceAction(plugin, parent) { mPopup = plugin->popup(); diff --git a/plugin-mount/actions/deviceaction_menu.h b/plugin-mount/actions/deviceaction_menu.h index 66a0244..86ea7dd 100644 --- a/plugin-mount/actions/deviceaction_menu.h +++ b/plugin-mount/actions/deviceaction_menu.h @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -39,7 +39,7 @@ class DeviceActionMenu : public DeviceAction { Q_OBJECT public: - explicit DeviceActionMenu(LxQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionMenu(LXQtMountPlugin *plugin, QObject *parent = 0); virtual ActionId Type() const throw () { return ActionMenu; } protected: diff --git a/plugin-mount/actions/deviceaction_nothing.cpp b/plugin-mount/actions/deviceaction_nothing.cpp index 3e4bd9b..3c47625 100644 --- a/plugin-mount/actions/deviceaction_nothing.cpp +++ b/plugin-mount/actions/deviceaction_nothing.cpp @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -27,7 +27,7 @@ #include "deviceaction_nothing.h" -DeviceActionNothing::DeviceActionNothing(LxQtMountPlugin *plugin, QObject *parent): +DeviceActionNothing::DeviceActionNothing(LXQtMountPlugin *plugin, QObject *parent): DeviceAction(plugin, parent) { } diff --git a/plugin-mount/actions/deviceaction_nothing.h b/plugin-mount/actions/deviceaction_nothing.h index 105bf97..37aee1a 100644 --- a/plugin-mount/actions/deviceaction_nothing.h +++ b/plugin-mount/actions/deviceaction_nothing.h @@ -8,16 +8,16 @@ * Authors: * Alexander Sokoloff * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -37,7 +37,7 @@ class DeviceActionNothing : public DeviceAction Q_OBJECT public: - explicit DeviceActionNothing(LxQtMountPlugin *plugin, QObject *parent = 0); + explicit DeviceActionNothing(LXQtMountPlugin *plugin, QObject *parent = 0); virtual ActionId Type() const throw () { return ActionNothing; }; protected: diff --git a/plugin-mount/configuration.cpp b/plugin-mount/configuration.cpp index c7a92ac..b24e3c4 100644 --- a/plugin-mount/configuration.cpp +++ b/plugin-mount/configuration.cpp @@ -33,7 +33,7 @@ #include Configuration::Configuration(QSettings &settings, QWidget *parent) : - LxQtPanelPluginConfigDialog(settings, parent), + LXQtPanelPluginConfigDialog(settings, parent), ui(new Ui::Configuration) { ui->setupUi(this); diff --git a/plugin-mount/configuration.h b/plugin-mount/configuration.h index aadd967..7fcd872 100644 --- a/plugin-mount/configuration.h +++ b/plugin-mount/configuration.h @@ -39,7 +39,7 @@ namespace Ui { class Configuration; } -class Configuration : public LxQtPanelPluginConfigDialog +class Configuration : public LXQtPanelPluginConfigDialog { Q_OBJECT diff --git a/plugin-mount/lxqtmountplugin.cpp b/plugin-mount/lxqtmountplugin.cpp index 263a15d..e106d7d 100644 --- a/plugin-mount/lxqtmountplugin.cpp +++ b/plugin-mount/lxqtmountplugin.cpp @@ -30,9 +30,9 @@ #include -LxQtMountPlugin::LxQtMountPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtMountPlugin::LXQtMountPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mPopup(nullptr), mDeviceAction(nullptr) { @@ -43,13 +43,13 @@ LxQtMountPlugin::LxQtMountPlugin(const ILxQtPanelPluginStartupInfo &startupInfo) connect(mPopup, &Popup::visibilityChanged, mButton, &QToolButton::setDown); } -LxQtMountPlugin::~LxQtMountPlugin() +LXQtMountPlugin::~LXQtMountPlugin() { delete mButton; delete mPopup; } -QDialog *LxQtMountPlugin::configureDialog() +QDialog *LXQtMountPlugin::configureDialog() { if (mPopup) mPopup->hide(); @@ -59,12 +59,12 @@ QDialog *LxQtMountPlugin::configureDialog() return configWindow; } -void LxQtMountPlugin::realign() +void LXQtMountPlugin::realign() { //nothing to do } -void LxQtMountPlugin::settingsChanged() +void LXQtMountPlugin::settingsChanged() { QString s = settings()->value(QStringLiteral(CFG_KEY_ACTION)).toString(); DeviceAction::ActionId actionId = DeviceAction::stringToActionId(s, DeviceAction::ActionMenu); diff --git a/plugin-mount/lxqtmountplugin.h b/plugin-mount/lxqtmountplugin.h index 66d8e1c..4f30104 100644 --- a/plugin-mount/lxqtmountplugin.h +++ b/plugin-mount/lxqtmountplugin.h @@ -40,17 +40,17 @@ \author Petr Vanek */ -class LxQtMountPlugin : public QObject, public ILxQtPanelPlugin +class LXQtMountPlugin : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtMountPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtMountPlugin(); + LXQtMountPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtMountPlugin(); virtual QWidget *widget() { return mButton; } - virtual QString themeId() const { return QStringLiteral("LxQtMount"); } - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + virtual QString themeId() const { return QStringLiteral("LXQtMount"); } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } Popup *popup() { return mPopup; } QIcon icon() { return mButton->icon(); }; @@ -68,16 +68,16 @@ private: DeviceAction *mDeviceAction; }; -class LxQtMountPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtMountPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtMountPlugin(startupInfo); + return new LXQtMountPlugin(startupInfo); } }; diff --git a/plugin-mount/menudiskitem.cpp b/plugin-mount/menudiskitem.cpp index 3f70618..d5381fb 100644 --- a/plugin-mount/menudiskitem.cpp +++ b/plugin-mount/menudiskitem.cpp @@ -152,7 +152,7 @@ void MenuDiskItem::onMounted(Solid::ErrorType error, QVariant resultData, const { QString errorMsg = tr("Mounting of \"%1\" failed: %2"); errorMsg = errorMsg.arg(mDevice.description()).arg(resultData.toString()); - LxQt::Notification::notify(tr("Removable media/devices manager"), errorMsg, mDevice.icon()); + LXQt::Notification::notify(tr("Removable media/devices manager"), errorMsg, mDevice.icon()); } } } @@ -173,7 +173,7 @@ void MenuDiskItem::onUnmounted(Solid::ErrorType error, QVariant resultData, cons { QString errorMsg = tr("Unmounting of \"%1\" failed: %2"); errorMsg = errorMsg.arg(mDevice.description()).arg(resultData.toString()); - LxQt::Notification::notify(tr("Removable media/devices manager"), errorMsg, mDevice.icon()); + LXQt::Notification::notify(tr("Removable media/devices manager"), errorMsg, mDevice.icon()); } } } diff --git a/plugin-mount/popup.cpp b/plugin-mount/popup.cpp index 6a6b76e..7f498e9 100644 --- a/plugin-mount/popup.cpp +++ b/plugin-mount/popup.cpp @@ -52,13 +52,13 @@ static bool hasRemovableParent(Solid::Device device) return false; } -Popup::Popup(ILxQtPanelPlugin * plugin, QWidget* parent): +Popup::Popup(ILXQtPanelPlugin * plugin, QWidget* parent): QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint), mPlugin(plugin), mPlaceholder(nullptr), mDisplayCount(0) { - setObjectName("LxQtMountPopup"); + setObjectName("LXQtMountPopup"); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setLayout(new QVBoxLayout(this)); layout()->setMargin(0); diff --git a/plugin-mount/popup.h b/plugin-mount/popup.h index 63dd098..d00b9db 100644 --- a/plugin-mount/popup.h +++ b/plugin-mount/popup.h @@ -35,14 +35,14 @@ #include #include -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; class Popup: public QDialog { Q_OBJECT public: - explicit Popup(ILxQtPanelPlugin * plugin, QWidget* parent = 0); + explicit Popup(ILXQtPanelPlugin * plugin, QWidget* parent = 0); void realign(); public slots: @@ -60,7 +60,7 @@ protected: void hideEvent(QHideEvent *event); private: - ILxQtPanelPlugin * mPlugin; + ILXQtPanelPlugin * mPlugin; QLabel *mPlaceholder; int mDisplayCount; diff --git a/plugin-mount/resources/mount.desktop.in b/plugin-mount/resources/mount.desktop.in index 4a64eea..ec49ace 100644 --- a/plugin-mount/resources/mount.desktop.in +++ b/plugin-mount/resources/mount.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. Icon=drive-removable-media diff --git a/plugin-mount/translations/mount_ar.desktop b/plugin-mount/translations/mount_ar.desktop index 641c83e..2785bca 100644 --- a/plugin-mount/translations/mount_ar.desktop +++ b/plugin-mount/translations/mount_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_ar.ts b/plugin-mount/translations/mount_ar.ts index bcb7bf3..ecbfe22 100644 --- a/plugin-mount/translations/mount_ar.ts +++ b/plugin-mount/translations/mount_ar.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings إعدادات مدير ريزر للوسائط القابلة للفصل diff --git a/plugin-mount/translations/mount_cs.desktop b/plugin-mount/translations/mount_cs.desktop index c8cd61e..add3eb8 100644 --- a/plugin-mount/translations/mount_cs.desktop +++ b/plugin-mount/translations/mount_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_cs.ts b/plugin-mount/translations/mount_cs.ts index 2fed6e0..26cc06e 100644 --- a/plugin-mount/translations/mount_cs.ts +++ b/plugin-mount/translations/mount_cs.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Nastavení správce odstranitelných zařízení diff --git a/plugin-mount/translations/mount_cs_CZ.desktop b/plugin-mount/translations/mount_cs_CZ.desktop index 1ecdf70..ac24ad9 100644 --- a/plugin-mount/translations/mount_cs_CZ.desktop +++ b/plugin-mount/translations/mount_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_cs_CZ.ts b/plugin-mount/translations/mount_cs_CZ.ts index 95a721b..94e697c 100644 --- a/plugin-mount/translations/mount_cs_CZ.ts +++ b/plugin-mount/translations/mount_cs_CZ.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Nastavení správce odstranitelných zařízení diff --git a/plugin-mount/translations/mount_da.desktop b/plugin-mount/translations/mount_da.desktop index 327c68d..d08b8b3 100644 --- a/plugin-mount/translations/mount_da.desktop +++ b/plugin-mount/translations/mount_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_da.ts b/plugin-mount/translations/mount_da.ts index f0a9538..7b17792 100644 --- a/plugin-mount/translations/mount_da.ts +++ b/plugin-mount/translations/mount_da.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings LXQt Indstillinger for flytbare medier diff --git a/plugin-mount/translations/mount_da_DK.desktop b/plugin-mount/translations/mount_da_DK.desktop index f2f2ccc..843ffbd 100644 --- a/plugin-mount/translations/mount_da_DK.desktop +++ b/plugin-mount/translations/mount_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_da_DK.ts b/plugin-mount/translations/mount_da_DK.ts index 0c71bcf..20594f9 100644 --- a/plugin-mount/translations/mount_da_DK.ts +++ b/plugin-mount/translations/mount_da_DK.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Indstillinger til håndtering af flytbare enheder diff --git a/plugin-mount/translations/mount_el.desktop b/plugin-mount/translations/mount_el.desktop new file mode 100644 index 0000000..62e5c53 --- /dev/null +++ b/plugin-mount/translations/mount_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Αφαιρούμενα μέσα +Comment[el]=Εύκολη προσάρτηση και αποπροσάρτηση USB και οπτικών δίσκων. diff --git a/plugin-mount/translations/mount_el_GR.ts b/plugin-mount/translations/mount_el.ts similarity index 78% rename from plugin-mount/translations/mount_el_GR.ts rename to plugin-mount/translations/mount_el.ts index ffdc669..335d366 100644 --- a/plugin-mount/translations/mount_el_GR.ts +++ b/plugin-mount/translations/mount_el.ts @@ -1,34 +1,34 @@ - + DeviceActionInfo The device <b><nobr>"%1"</nobr></b> is connected. - Συνδέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. + Συνδέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. The device <b><nobr>"%1"</nobr></b> is removed. - Αφαιρέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. + Αφαιρέθηκε η συσκευή <b><nobr>"%1"</nobr></b>. Removable media/devices manager - Διαχειριστής αφαιρούμενων μέσων/συσκευών + Διαχειριστής αφαιρούμενων μέσων/συσκευών - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Ρυθμίσεις διαχειριστή αφαιρούμενων μέσων LxQt + LXQt Removable media manager settings + Ρυθμίσεις διαχειριστή αφαιρούμενων μέσων LXQt Removable Media Settings - + Ρυθμίσεις αφαιρούμενων μέσων @@ -70,17 +70,17 @@ Removable media/devices manager - Διαχειριστής αφαιρούμενων μέσων/συσκευών + Διαχειριστής αφαιρούμενων μέσων/συσκευών Mounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - + Η προσάρτηση του <strong><nobr>"%1"</nobr></strong> απέτυχε: %2 Unmounting of <strong><nobr>"%1"</nobr></strong> failed: %2 - + Η αποπροσάρτηση του <strong><nobr>"%1"</nobr></strong> απέτυχε: %2 @@ -108,7 +108,7 @@ No devices are available - + Καμία διαθέσιμη συσκευή diff --git a/plugin-mount/translations/mount_el_GR.desktop b/plugin-mount/translations/mount_el_GR.desktop deleted file mode 100644 index 163cca5..0000000 --- a/plugin-mount/translations/mount_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Removable media -Comment=Easy mounting and unmounting of USB and optical drives. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Διαχείριση αφαιρούμενων μέσων (USB, CD, DVD, ...) -Name[el_GR]=Αφαιρούμενα μέσα diff --git a/plugin-mount/translations/mount_eo.desktop b/plugin-mount/translations/mount_eo.desktop index b04760d..66673da 100644 --- a/plugin-mount/translations/mount_eo.desktop +++ b/plugin-mount/translations/mount_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_eo.ts b/plugin-mount/translations/mount_eo.ts index df1448d..64b27fc 100644 --- a/plugin-mount/translations/mount_eo.ts +++ b/plugin-mount/translations/mount_eo.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Agordoj de la mastrumilo de dementeblaj aparatoj de LxQt + LXQt Removable media manager settings + Agordoj de la mastrumilo de dementeblaj aparatoj de LXQt diff --git a/plugin-mount/translations/mount_es.desktop b/plugin-mount/translations/mount_es.desktop index e1aafaa..7e5eb0e 100644 --- a/plugin-mount/translations/mount_es.desktop +++ b/plugin-mount/translations/mount_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_es.ts b/plugin-mount/translations/mount_es.ts index f934515..39e3482 100644 --- a/plugin-mount/translations/mount_es.ts +++ b/plugin-mount/translations/mount_es.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Configuración del gestor de medios extraíbles de LxQt + LXQt Removable media manager settings + Configuración del gestor de medios extraíbles de LXQt diff --git a/plugin-mount/translations/mount_es_UY.ts b/plugin-mount/translations/mount_es_UY.ts index 9adc366..53cbb84 100644 --- a/plugin-mount/translations/mount_es_UY.ts +++ b/plugin-mount/translations/mount_es_UY.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Configuración de dispositivos desmontables LxQt + LXQt Removable media manager settings + Configuración de dispositivos desmontables LXQt diff --git a/plugin-mount/translations/mount_es_VE.desktop b/plugin-mount/translations/mount_es_VE.desktop index bc62fb2..b949a81 100644 --- a/plugin-mount/translations/mount_es_VE.desktop +++ b/plugin-mount/translations/mount_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_es_VE.ts b/plugin-mount/translations/mount_es_VE.ts index cce1821..dd1c201 100644 --- a/plugin-mount/translations/mount_es_VE.ts +++ b/plugin-mount/translations/mount_es_VE.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Configuración de manejador de dispositivos LxQt + LXQt Removable media manager settings + Configuración de manejador de dispositivos LXQt diff --git a/plugin-mount/translations/mount_eu.desktop b/plugin-mount/translations/mount_eu.desktop index 8c1bc79..bbee4d4 100644 --- a/plugin-mount/translations/mount_eu.desktop +++ b/plugin-mount/translations/mount_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_eu.ts b/plugin-mount/translations/mount_eu.ts index 7f5d9bc..744af05 100644 --- a/plugin-mount/translations/mount_eu.ts +++ b/plugin-mount/translations/mount_eu.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQt gailu aldagarrien kudeatzailearen ezarpenak + LXQt Removable media manager settings + LXQt gailu aldagarrien kudeatzailearen ezarpenak diff --git a/plugin-mount/translations/mount_fi.desktop b/plugin-mount/translations/mount_fi.desktop index 6b253df..1910620 100644 --- a/plugin-mount/translations/mount_fi.desktop +++ b/plugin-mount/translations/mount_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_fi.ts b/plugin-mount/translations/mount_fi.ts index d5c7403..db4067d 100644 --- a/plugin-mount/translations/mount_fi.ts +++ b/plugin-mount/translations/mount_fi.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQtin irrotettavien laitteiden asetukset + LXQt Removable media manager settings + LXQtin irrotettavien laitteiden asetukset diff --git a/plugin-mount/translations/mount_fr_FR.desktop b/plugin-mount/translations/mount_fr_FR.desktop index f2de564..59d245e 100644 --- a/plugin-mount/translations/mount_fr_FR.desktop +++ b/plugin-mount/translations/mount_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_fr_FR.ts b/plugin-mount/translations/mount_fr_FR.ts index 9e34d71..aa30818 100644 --- a/plugin-mount/translations/mount_fr_FR.ts +++ b/plugin-mount/translations/mount_fr_FR.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Paramètres du gestionnaire de médias amovibles diff --git a/plugin-mount/translations/mount_hu.desktop b/plugin-mount/translations/mount_hu.desktop index 877d885..faade54 100644 --- a/plugin-mount/translations/mount_hu.desktop +++ b/plugin-mount/translations/mount_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_hu.ts b/plugin-mount/translations/mount_hu.ts index 6915125..c59ba91 100644 --- a/plugin-mount/translations/mount_hu.ts +++ b/plugin-mount/translations/mount_hu.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - A LxQt cserélhetőeszköz-kezelő beállításai + LXQt Removable media manager settings + A LXQt cserélhetőeszköz-kezelő beállításai diff --git a/plugin-mount/translations/mount_hu_HU.ts b/plugin-mount/translations/mount_hu_HU.ts index 1c1eb09..2a51ca7 100644 --- a/plugin-mount/translations/mount_hu_HU.ts +++ b/plugin-mount/translations/mount_hu_HU.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - A LxQt cserélhetőeszköz-kezelő beállításai + LXQt Removable media manager settings + A LXQt cserélhetőeszköz-kezelő beállításai diff --git a/plugin-mount/translations/mount_ia.desktop b/plugin-mount/translations/mount_ia.desktop index 15f0263..ccdf022 100644 --- a/plugin-mount/translations/mount_ia.desktop +++ b/plugin-mount/translations/mount_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Removable media handler (USB, CD, DVD, ...) diff --git a/plugin-mount/translations/mount_ia.ts b/plugin-mount/translations/mount_ia.ts index 110a061..4a2b30f 100644 --- a/plugin-mount/translations/mount_ia.ts +++ b/plugin-mount/translations/mount_ia.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_id_ID.desktop b/plugin-mount/translations/mount_id_ID.desktop index 15f0263..ccdf022 100644 --- a/plugin-mount/translations/mount_id_ID.desktop +++ b/plugin-mount/translations/mount_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Removable media handler (USB, CD, DVD, ...) diff --git a/plugin-mount/translations/mount_id_ID.ts b/plugin-mount/translations/mount_id_ID.ts index 943bfd6..66b153e 100644 --- a/plugin-mount/translations/mount_id_ID.ts +++ b/plugin-mount/translations/mount_id_ID.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_it_IT.desktop b/plugin-mount/translations/mount_it_IT.desktop index 5b1a514..c70c902 100644 --- a/plugin-mount/translations/mount_it_IT.desktop +++ b/plugin-mount/translations/mount_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_it_IT.ts b/plugin-mount/translations/mount_it_IT.ts index 88d590f..8a74e6f 100644 --- a/plugin-mount/translations/mount_it_IT.ts +++ b/plugin-mount/translations/mount_it_IT.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Impostazioni del gestore dei dispositivi rimovibili di LxQt + LXQt Removable media manager settings + Impostazioni del gestore dei dispositivi rimovibili di LXQt diff --git a/plugin-mount/translations/mount_ja.desktop b/plugin-mount/translations/mount_ja.desktop index 213cd62..9338558 100644 --- a/plugin-mount/translations/mount_ja.desktop +++ b/plugin-mount/translations/mount_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_ja.ts b/plugin-mount/translations/mount_ja.ts index f62b4dc..c42caa9 100644 --- a/plugin-mount/translations/mount_ja.ts +++ b/plugin-mount/translations/mount_ja.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_ko.desktop b/plugin-mount/translations/mount_ko.desktop index 15f0263..ccdf022 100644 --- a/plugin-mount/translations/mount_ko.desktop +++ b/plugin-mount/translations/mount_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Removable media handler (USB, CD, DVD, ...) diff --git a/plugin-mount/translations/mount_ko.ts b/plugin-mount/translations/mount_ko.ts index 7f8db3b..dac33c6 100644 --- a/plugin-mount/translations/mount_ko.ts +++ b/plugin-mount/translations/mount_ko.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_lt.desktop b/plugin-mount/translations/mount_lt.desktop index 03fbaf8..f4d2058 100644 --- a/plugin-mount/translations/mount_lt.desktop +++ b/plugin-mount/translations/mount_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_lt.ts b/plugin-mount/translations/mount_lt.ts index 6855c3e..744e537 100644 --- a/plugin-mount/translations/mount_lt.ts +++ b/plugin-mount/translations/mount_lt.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQt pašalinamų įrenginių tvarkytuvės nuostatos + LXQt Removable media manager settings + LXQt pašalinamų įrenginių tvarkytuvės nuostatos diff --git a/plugin-mount/translations/mount_nl.desktop b/plugin-mount/translations/mount_nl.desktop index 8bc1779..596ee07 100644 --- a/plugin-mount/translations/mount_nl.desktop +++ b/plugin-mount/translations/mount_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_nl.ts b/plugin-mount/translations/mount_nl.ts index 5f2db72..c737c36 100644 --- a/plugin-mount/translations/mount_nl.ts +++ b/plugin-mount/translations/mount_nl.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Instellingen voor beheerder van verwijderbare media in LxQt + LXQt Removable media manager settings + Instellingen voor beheerder van verwijderbare media in LXQt diff --git a/plugin-mount/translations/mount_pl.desktop b/plugin-mount/translations/mount_pl.desktop index 4b55fab..edf188b 100644 --- a/plugin-mount/translations/mount_pl.desktop +++ b/plugin-mount/translations/mount_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_pl_PL.desktop b/plugin-mount/translations/mount_pl_PL.desktop index a2f14a9..68eef0c 100644 --- a/plugin-mount/translations/mount_pl_PL.desktop +++ b/plugin-mount/translations/mount_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_pl_PL.ts b/plugin-mount/translations/mount_pl_PL.ts index 5154fbc..90b00f9 100644 --- a/plugin-mount/translations/mount_pl_PL.ts +++ b/plugin-mount/translations/mount_pl_PL.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Ustawienia menedżera nośników wymiennych diff --git a/plugin-mount/translations/mount_pt.desktop b/plugin-mount/translations/mount_pt.desktop index a6ba0de..87c8c17 100644 --- a/plugin-mount/translations/mount_pt.desktop +++ b/plugin-mount/translations/mount_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_pt.ts b/plugin-mount/translations/mount_pt.ts index 9e96135..0f08900 100644 --- a/plugin-mount/translations/mount_pt.ts +++ b/plugin-mount/translations/mount_pt.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Definições do gestor de unidades e discos amovíveis do LxQt + LXQt Removable media manager settings + Definições do gestor de unidades e discos amovíveis do LXQt diff --git a/plugin-mount/translations/mount_pt_BR.desktop b/plugin-mount/translations/mount_pt_BR.desktop index cfb8564..3d5a7e4 100644 --- a/plugin-mount/translations/mount_pt_BR.desktop +++ b/plugin-mount/translations/mount_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_pt_BR.ts b/plugin-mount/translations/mount_pt_BR.ts index d886a6d..aebe424 100644 --- a/plugin-mount/translations/mount_pt_BR.ts +++ b/plugin-mount/translations/mount_pt_BR.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Configurações do gerenciador de mídia removível do LxQt + LXQt Removable media manager settings + Configurações do gerenciador de mídia removível do LXQt diff --git a/plugin-mount/translations/mount_ro_RO.desktop b/plugin-mount/translations/mount_ro_RO.desktop index 73da7c6..8ded4ad 100644 --- a/plugin-mount/translations/mount_ro_RO.desktop +++ b/plugin-mount/translations/mount_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_ro_RO.ts b/plugin-mount/translations/mount_ro_RO.ts index b7fcad5..b700eb6 100644 --- a/plugin-mount/translations/mount_ro_RO.ts +++ b/plugin-mount/translations/mount_ro_RO.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Configurație Administrator medii detașabile diff --git a/plugin-mount/translations/mount_ru.desktop b/plugin-mount/translations/mount_ru.desktop index 562dbb3..5137520 100644 --- a/plugin-mount/translations/mount_ru.desktop +++ b/plugin-mount/translations/mount_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_ru.ts b/plugin-mount/translations/mount_ru.ts index 836576d..3755931 100644 --- a/plugin-mount/translations/mount_ru.ts +++ b/plugin-mount/translations/mount_ru.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_ru_RU.desktop b/plugin-mount/translations/mount_ru_RU.desktop index 562dbb3..5137520 100644 --- a/plugin-mount/translations/mount_ru_RU.desktop +++ b/plugin-mount/translations/mount_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_ru_RU.ts b/plugin-mount/translations/mount_ru_RU.ts index f6e59b4..85927c9 100644 --- a/plugin-mount/translations/mount_ru_RU.ts +++ b/plugin-mount/translations/mount_ru_RU.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_sk.desktop b/plugin-mount/translations/mount_sk.desktop index f01d1de..41e68cb 100644 --- a/plugin-mount/translations/mount_sk.desktop +++ b/plugin-mount/translations/mount_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_sk_SK.ts b/plugin-mount/translations/mount_sk_SK.ts index 742c1e6..1c21639 100644 --- a/plugin-mount/translations/mount_sk_SK.ts +++ b/plugin-mount/translations/mount_sk_SK.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Nastavenia správcu prenosných médií prostredia LxQt + LXQt Removable media manager settings + Nastavenia správcu prenosných médií prostredia LXQt diff --git a/plugin-mount/translations/mount_sl.desktop b/plugin-mount/translations/mount_sl.desktop index 1f8f23c..cc0e64b 100644 --- a/plugin-mount/translations/mount_sl.desktop +++ b/plugin-mount/translations/mount_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_sl.ts b/plugin-mount/translations/mount_sl.ts index d325a6d..f9d6b3d 100644 --- a/plugin-mount/translations/mount_sl.ts +++ b/plugin-mount/translations/mount_sl.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Nastavitve upravljalnika odstranljivih nosilcev diff --git a/plugin-mount/translations/mount_sr.desktop b/plugin-mount/translations/mount_sr.desktop index 048f5a0..417f5f5 100644 --- a/plugin-mount/translations/mount_sr.desktop +++ b/plugin-mount/translations/mount_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_sr@latin.desktop b/plugin-mount/translations/mount_sr@latin.desktop index 39ba4ca..c0a4b50 100644 --- a/plugin-mount/translations/mount_sr@latin.desktop +++ b/plugin-mount/translations/mount_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_sr@latin.ts b/plugin-mount/translations/mount_sr@latin.ts index 950b4ea..4be6451 100644 --- a/plugin-mount/translations/mount_sr@latin.ts +++ b/plugin-mount/translations/mount_sr@latin.ts @@ -20,7 +20,7 @@ - LxQtMountConfiguration + LXQtMountConfiguration Removable Media Settings diff --git a/plugin-mount/translations/mount_sr_BA.ts b/plugin-mount/translations/mount_sr_BA.ts index 1d05e04..f25ef83 100644 --- a/plugin-mount/translations/mount_sr_BA.ts +++ b/plugin-mount/translations/mount_sr_BA.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Подешавање менаџера уклоњивих медија diff --git a/plugin-mount/translations/mount_sr_RS.ts b/plugin-mount/translations/mount_sr_RS.ts index 1d05e04..f25ef83 100644 --- a/plugin-mount/translations/mount_sr_RS.ts +++ b/plugin-mount/translations/mount_sr_RS.ts @@ -20,9 +20,9 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings + LXQt Removable media manager settings Подешавање менаџера уклоњивих медија diff --git a/plugin-mount/translations/mount_th_TH.desktop b/plugin-mount/translations/mount_th_TH.desktop index 72220dd..6e6bf93 100644 --- a/plugin-mount/translations/mount_th_TH.desktop +++ b/plugin-mount/translations/mount_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_th_TH.ts b/plugin-mount/translations/mount_th_TH.ts index 00cb276..2b55eb7 100644 --- a/plugin-mount/translations/mount_th_TH.ts +++ b/plugin-mount/translations/mount_th_TH.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - ค่าตั้งตัวจัดการสื่อแบบถอดเสียบได้ LxQt + LXQt Removable media manager settings + ค่าตั้งตัวจัดการสื่อแบบถอดเสียบได้ LXQt diff --git a/plugin-mount/translations/mount_tr.desktop b/plugin-mount/translations/mount_tr.desktop index 4018fbe..c878a04 100644 --- a/plugin-mount/translations/mount_tr.desktop +++ b/plugin-mount/translations/mount_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_tr.ts b/plugin-mount/translations/mount_tr.ts index bae5385..c31c3cb 100644 --- a/plugin-mount/translations/mount_tr.ts +++ b/plugin-mount/translations/mount_tr.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQt Çıkarılabilir ortam yönetici ayarları + LXQt Removable media manager settings + LXQt Çıkarılabilir ortam yönetici ayarları diff --git a/plugin-mount/translations/mount_uk.desktop b/plugin-mount/translations/mount_uk.desktop index 112063f..3946918 100644 --- a/plugin-mount/translations/mount_uk.desktop +++ b/plugin-mount/translations/mount_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_uk.ts b/plugin-mount/translations/mount_uk.ts index 3838030..48b274a 100644 --- a/plugin-mount/translations/mount_uk.ts +++ b/plugin-mount/translations/mount_uk.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - Налаштування знімних носіїв LxQt + LXQt Removable media manager settings + Налаштування знімних носіїв LXQt diff --git a/plugin-mount/translations/mount_zh_CN.GB2312.desktop b/plugin-mount/translations/mount_zh_CN.GB2312.desktop index 15f0263..ccdf022 100644 --- a/plugin-mount/translations/mount_zh_CN.GB2312.desktop +++ b/plugin-mount/translations/mount_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Removable media handler (USB, CD, DVD, ...) diff --git a/plugin-mount/translations/mount_zh_CN.desktop b/plugin-mount/translations/mount_zh_CN.desktop index 2558918..bf240b6 100644 --- a/plugin-mount/translations/mount_zh_CN.desktop +++ b/plugin-mount/translations/mount_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_zh_CN.ts b/plugin-mount/translations/mount_zh_CN.ts index e01eac9..d946173 100644 --- a/plugin-mount/translations/mount_zh_CN.ts +++ b/plugin-mount/translations/mount_zh_CN.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQt可移动媒体管理器设置 + LXQt Removable media manager settings + LXQt可移动媒体管理器设置 diff --git a/plugin-mount/translations/mount_zh_TW.desktop b/plugin-mount/translations/mount_zh_TW.desktop index bd69a9d..53ef555 100644 --- a/plugin-mount/translations/mount_zh_TW.desktop +++ b/plugin-mount/translations/mount_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Removable media Comment=Easy mounting and unmounting of USB and optical drives. diff --git a/plugin-mount/translations/mount_zh_TW.ts b/plugin-mount/translations/mount_zh_TW.ts index 81bf339..a855e1f 100644 --- a/plugin-mount/translations/mount_zh_TW.ts +++ b/plugin-mount/translations/mount_zh_TW.ts @@ -20,10 +20,10 @@ - LxQtMountConfiguration + LXQtMountConfiguration - LxQt Removable media manager settings - LxQt可卸除式裝置管理員設定 + LXQt Removable media manager settings + LXQt可卸除式裝置管理員設定 diff --git a/plugin-networkmonitor/lxqtnetworkmonitor.cpp b/plugin-networkmonitor/lxqtnetworkmonitor.cpp index 7df0e0a..494a7a1 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitor.cpp +++ b/plugin-networkmonitor/lxqtnetworkmonitor.cpp @@ -44,7 +44,7 @@ extern "C" { #define STATGRAB_NEWER_THAN_0_90 1 #endif -LxQtNetworkMonitor::LxQtNetworkMonitor(ILxQtPanelPlugin *plugin, QWidget* parent): +LXQtNetworkMonitor::LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent): QFrame(parent), mPlugin(plugin) { @@ -66,11 +66,11 @@ LxQtNetworkMonitor::LxQtNetworkMonitor(ILxQtPanelPlugin *plugin, QWidget* parent settingsChanged(); } -LxQtNetworkMonitor::~LxQtNetworkMonitor() +LXQtNetworkMonitor::~LXQtNetworkMonitor() { } -void LxQtNetworkMonitor::resizeEvent(QResizeEvent *) +void LXQtNetworkMonitor::resizeEvent(QResizeEvent *) { m_stuff.setMinimumWidth(m_pic.width() + 2); m_stuff.setMinimumHeight(m_pic.height() + 2); @@ -79,7 +79,7 @@ void LxQtNetworkMonitor::resizeEvent(QResizeEvent *) } -void LxQtNetworkMonitor::timerEvent(QTimerEvent *event) +void LXQtNetworkMonitor::timerEvent(QTimerEvent *event) { bool matched = false; @@ -129,7 +129,7 @@ void LxQtNetworkMonitor::timerEvent(QTimerEvent *event) update(); } -void LxQtNetworkMonitor::paintEvent(QPaintEvent *) +void LXQtNetworkMonitor::paintEvent(QPaintEvent *) { QPainter p(this); @@ -141,7 +141,7 @@ void LxQtNetworkMonitor::paintEvent(QPaintEvent *) p.drawPixmap(leftOffset, topOffset, m_pic); } -bool LxQtNetworkMonitor::event(QEvent *event) +bool LXQtNetworkMonitor::event(QEvent *event) { if (event->type() == QEvent::ToolTip) { @@ -169,14 +169,14 @@ bool LxQtNetworkMonitor::event(QEvent *event) return QFrame::event(event); } -//void LxQtNetworkMonitor::showConfigureDialog() +//void LXQtNetworkMonitor::showConfigureDialog() //{ -// LxQtNetworkMonitorConfiguration *confWindow = -// this->findChild("LxQtNetworkMonitorConfigurationWindow"); +// LXQtNetworkMonitorConfiguration *confWindow = +// this->findChild("LXQtNetworkMonitorConfigurationWindow"); // if (!confWindow) // { -// confWindow = new LxQtNetworkMonitorConfiguration(settings(), this); +// confWindow = new LXQtNetworkMonitorConfiguration(settings(), this); // } // confWindow->show(); @@ -184,7 +184,7 @@ bool LxQtNetworkMonitor::event(QEvent *event) // confWindow->activateWindow(); //} -void LxQtNetworkMonitor::settingsChanged() +void LXQtNetworkMonitor::settingsChanged() { m_iconIndex = mPlugin->settings()->value("icon", 1).toInt(); m_interface = mPlugin->settings()->value("interface").toString(); @@ -203,7 +203,7 @@ void LxQtNetworkMonitor::settingsChanged() m_pic.load(iconName("error")); } -QString LxQtNetworkMonitor::convertUnits(double num) +QString LXQtNetworkMonitor::convertUnits(double num) { QString unit = tr("B"); QStringList units = QStringList(tr("KiB")) << tr("MiB") << tr("GiB") << tr("TiB") << tr("PiB"); diff --git a/plugin-networkmonitor/lxqtnetworkmonitor.h b/plugin-networkmonitor/lxqtnetworkmonitor.h index e34c50f..e80a37b 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitor.h +++ b/plugin-networkmonitor/lxqtnetworkmonitor.h @@ -29,17 +29,17 @@ #define LXQTNETWORKMONITOR_H #include -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; /*! TODO: How to define cable is not connected? */ -class LxQtNetworkMonitor: public QFrame +class LXQtNetworkMonitor: public QFrame { Q_OBJECT public: - LxQtNetworkMonitor(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - ~LxQtNetworkMonitor(); + LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + ~LXQtNetworkMonitor(); virtual void settingsChanged(); protected: @@ -65,7 +65,7 @@ private: QString m_interface; QPixmap m_pic; - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; }; diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp index a9c83df..a1a88bf 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.cpp @@ -38,9 +38,9 @@ extern "C" { #define STATGRAB_NEWER_THAN_0_90 1 #endif -LxQtNetworkMonitorConfiguration::LxQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent) : +LXQtNetworkMonitorConfiguration::LXQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtNetworkMonitorConfiguration), + ui(new Ui::LXQtNetworkMonitorConfiguration), mSettings(settings), mOldSettings(settings) { @@ -55,18 +55,18 @@ LxQtNetworkMonitorConfiguration::LxQtNetworkMonitorConfiguration(QSettings *sett loadSettings(); } -LxQtNetworkMonitorConfiguration::~LxQtNetworkMonitorConfiguration() +LXQtNetworkMonitorConfiguration::~LXQtNetworkMonitorConfiguration() { delete ui; } -void LxQtNetworkMonitorConfiguration::saveSettings() +void LXQtNetworkMonitorConfiguration::saveSettings() { mSettings->setValue("icon", ui->iconCB->currentIndex()); mSettings->setValue("interface", ui->interfaceCB->currentText()); } -void LxQtNetworkMonitorConfiguration::loadSettings() +void LXQtNetworkMonitorConfiguration::loadSettings() { ui->iconCB->setCurrentIndex(mSettings->value("icon", 1).toInt()); @@ -85,7 +85,7 @@ void LxQtNetworkMonitorConfiguration::loadSettings() ui->interfaceCB->setCurrentIndex(qMax(qMin(0, count - 1), ui->interfaceCB->findText(interface))); } -void LxQtNetworkMonitorConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtNetworkMonitorConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h index cc33359..0c728b8 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h @@ -38,21 +38,21 @@ class QAbstractButton; namespace Ui { -class LxQtNetworkMonitorConfiguration; +class LXQtNetworkMonitorConfiguration; } -class LxQtNetworkMonitorConfiguration : public QDialog +class LXQtNetworkMonitorConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent = 0); - ~LxQtNetworkMonitorConfiguration(); + explicit LXQtNetworkMonitorConfiguration(QSettings *settings, QWidget *parent = 0); + ~LXQtNetworkMonitorConfiguration(); private: - Ui::LxQtNetworkMonitorConfiguration *ui; + Ui::LXQtNetworkMonitorConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; private slots: /* diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.ui b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.ui index a8099a9..1aecb5d 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.ui +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.ui @@ -1,7 +1,7 @@ - LxQtNetworkMonitorConfiguration - + LXQtNetworkMonitorConfiguration + 0 diff --git a/plugin-networkmonitor/lxqtnetworkmonitorplugin.cpp b/plugin-networkmonitor/lxqtnetworkmonitorplugin.cpp index ef73086..cd8bae7 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorplugin.cpp +++ b/plugin-networkmonitor/lxqtnetworkmonitorplugin.cpp @@ -30,29 +30,29 @@ #include "lxqtnetworkmonitor.h" #include "lxqtnetworkmonitorconfiguration.h" -LxQtNetworkMonitorPlugin::LxQtNetworkMonitorPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtNetworkMonitorPlugin::LXQtNetworkMonitorPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), - mWidget(new LxQtNetworkMonitor(this)) + ILXQtPanelPlugin(startupInfo), + mWidget(new LXQtNetworkMonitor(this)) { } -LxQtNetworkMonitorPlugin::~LxQtNetworkMonitorPlugin() +LXQtNetworkMonitorPlugin::~LXQtNetworkMonitorPlugin() { delete mWidget; } -QWidget *LxQtNetworkMonitorPlugin::widget() +QWidget *LXQtNetworkMonitorPlugin::widget() { return mWidget; } -QDialog *LxQtNetworkMonitorPlugin::configureDialog() +QDialog *LXQtNetworkMonitorPlugin::configureDialog() { - return new LxQtNetworkMonitorConfiguration(settings()); + return new LXQtNetworkMonitorConfiguration(settings()); } -void LxQtNetworkMonitorPlugin::settingsChanged() +void LXQtNetworkMonitorPlugin::settingsChanged() { mWidget->settingsChanged(); } diff --git a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h index 3441d60..0c2b2d1 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h @@ -32,16 +32,16 @@ #include "../panel/ilxqtpanelplugin.h" #include -class LxQtNetworkMonitor; +class LXQtNetworkMonitor; -class LxQtNetworkMonitorPlugin: public QObject, public ILxQtPanelPlugin +class LXQtNetworkMonitorPlugin: public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - explicit LxQtNetworkMonitorPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtNetworkMonitorPlugin(); + explicit LXQtNetworkMonitorPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtNetworkMonitorPlugin(); - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); virtual QString themeId() const { return "NetworkMonitor"; } @@ -52,19 +52,19 @@ protected: virtual void settingsChanged(); private: - LxQtNetworkMonitor *mWidget; + LXQtNetworkMonitor *mWidget; }; -class LxQtNetworkMonitorPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtNetworkMonitorPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtNetworkMonitorPlugin(startupInfo); + return new LXQtNetworkMonitorPlugin(startupInfo); } }; diff --git a/plugin-networkmonitor/resources/networkmonitor.desktop.in b/plugin-networkmonitor/resources/networkmonitor.desktop.in index c7c66b8..81b9fde 100644 --- a/plugin-networkmonitor/resources/networkmonitor.desktop.in +++ b/plugin-networkmonitor/resources/networkmonitor.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. #Icon=network-transmit-receive diff --git a/plugin-networkmonitor/translations/networkmonitor.ts b/plugin-networkmonitor/translations/networkmonitor.ts index 887671c..a9c7923 100644 --- a/plugin-networkmonitor/translations/networkmonitor.ts +++ b/plugin-networkmonitor/translations/networkmonitor.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_cs.desktop b/plugin-networkmonitor/translations/networkmonitor_cs.desktop index 4f23ddf..b8228d5 100644 --- a/plugin-networkmonitor/translations/networkmonitor_cs.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_cs.ts b/plugin-networkmonitor/translations/networkmonitor_cs.ts index 5ae0a10..505f291 100644 --- a/plugin-networkmonitor/translations/networkmonitor_cs.ts +++ b/plugin-networkmonitor/translations/networkmonitor_cs.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,9 +50,9 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings + LXQt Network Monitor settings Nastavení sledování sítě diff --git a/plugin-networkmonitor/translations/networkmonitor_da.desktop b/plugin-networkmonitor/translations/networkmonitor_da.desktop index 2df29fe..fe04734 100644 --- a/plugin-networkmonitor/translations/networkmonitor_da.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_da.ts b/plugin-networkmonitor/translations/networkmonitor_da.ts index f29aa53..ae36bda 100644 --- a/plugin-networkmonitor/translations/networkmonitor_da.ts +++ b/plugin-networkmonitor/translations/networkmonitor_da.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Indstillinger for LxQt Netværksmonitor + LXQt Network Monitor settings + Indstillinger for LXQt Netværksmonitor diff --git a/plugin-networkmonitor/translations/networkmonitor_de.ts b/plugin-networkmonitor/translations/networkmonitor_de.ts index a128522..79e3f97 100644 --- a/plugin-networkmonitor/translations/networkmonitor_de.ts +++ b/plugin-networkmonitor/translations/networkmonitor_de.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_el.desktop b/plugin-networkmonitor/translations/networkmonitor_el.desktop index c068ef0..538dd4f 100644 --- a/plugin-networkmonitor/translations/networkmonitor_el.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_el.desktop @@ -1,13 +1,2 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin - -Name=Network monitor -Comment=Displays network status and activity. - - - - -# Translations -Comment[el_GR]=Εμφάνιση της κατάστασης δικτύου και δραστηριότητας. -Name[el_GR]=Επόπτης δικτύου +Name[el]=Επόπτης δικτύου +Comment[el]=Εμφάνιση της κατάστασης και της δραστηριότητας του δικτύου diff --git a/plugin-networkmonitor/translations/networkmonitor_el.ts b/plugin-networkmonitor/translations/networkmonitor_el.ts index 5dc42bb..6bc1f50 100644 --- a/plugin-networkmonitor/translations/networkmonitor_el.ts +++ b/plugin-networkmonitor/translations/networkmonitor_el.ts @@ -1,8 +1,8 @@ - + - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,15 +50,15 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Ρυθμίσεις επίβλεψης δικτύου LxQt + LXQt Network Monitor settings + Ρυθμίσεις επίβλεψης δικτύου LXQt Network Monitor settings - + Ρυθμίσεις του επόπτη δικτύου diff --git a/plugin-networkmonitor/translations/networkmonitor_eo.desktop b/plugin-networkmonitor/translations/networkmonitor_eo.desktop index 36c540d..edd4983 100644 --- a/plugin-networkmonitor/translations/networkmonitor_eo.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_eo.ts b/plugin-networkmonitor/translations/networkmonitor_eo.ts index a6fc9fa..11f967c 100644 --- a/plugin-networkmonitor/translations/networkmonitor_eo.ts +++ b/plugin-networkmonitor/translations/networkmonitor_eo.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_es.desktop b/plugin-networkmonitor/translations/networkmonitor_es.desktop index 5352d05..7430bda 100644 --- a/plugin-networkmonitor/translations/networkmonitor_es.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_es.ts b/plugin-networkmonitor/translations/networkmonitor_es.ts index 6e06b39..62f6b2f 100644 --- a/plugin-networkmonitor/translations/networkmonitor_es.ts +++ b/plugin-networkmonitor/translations/networkmonitor_es.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Configuración del monitor de redes de LxQt + LXQt Network Monitor settings + Configuración del monitor de redes de LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_eu.desktop b/plugin-networkmonitor/translations/networkmonitor_eu.desktop index d608863..ab57315 100644 --- a/plugin-networkmonitor/translations/networkmonitor_eu.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_eu.ts b/plugin-networkmonitor/translations/networkmonitor_eu.ts index 2782b44..eb25928 100644 --- a/plugin-networkmonitor/translations/networkmonitor_eu.ts +++ b/plugin-networkmonitor/translations/networkmonitor_eu.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - LxQt sarearen monitorearen ezarpenak + LXQt Network Monitor settings + LXQt sarearen monitorearen ezarpenak diff --git a/plugin-networkmonitor/translations/networkmonitor_fi.desktop b/plugin-networkmonitor/translations/networkmonitor_fi.desktop index 4d98c3a..667954c 100644 --- a/plugin-networkmonitor/translations/networkmonitor_fi.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_fi.ts b/plugin-networkmonitor/translations/networkmonitor_fi.ts index 4ac5f01..97e18df 100644 --- a/plugin-networkmonitor/translations/networkmonitor_fi.ts +++ b/plugin-networkmonitor/translations/networkmonitor_fi.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - LxQtin verkonhallinnan asetukset + LXQt Network Monitor settings + LXQtin verkonhallinnan asetukset diff --git a/plugin-networkmonitor/translations/networkmonitor_fr.ts b/plugin-networkmonitor/translations/networkmonitor_fr.ts index 3171548..e28e8b0 100644 --- a/plugin-networkmonitor/translations/networkmonitor_fr.ts +++ b/plugin-networkmonitor/translations/networkmonitor_fr.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_hr.ts b/plugin-networkmonitor/translations/networkmonitor_hr.ts index e0bd49b..3608fac 100644 --- a/plugin-networkmonitor/translations/networkmonitor_hr.ts +++ b/plugin-networkmonitor/translations/networkmonitor_hr.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_hu.desktop b/plugin-networkmonitor/translations/networkmonitor_hu.desktop index 694cf7f..a74c0ec 100644 --- a/plugin-networkmonitor/translations/networkmonitor_hu.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_hu.ts b/plugin-networkmonitor/translations/networkmonitor_hu.ts index b910bf5..f06febd 100644 --- a/plugin-networkmonitor/translations/networkmonitor_hu.ts +++ b/plugin-networkmonitor/translations/networkmonitor_hu.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_it.desktop b/plugin-networkmonitor/translations/networkmonitor_it.desktop index d3e6e88..a6d6af8 100644 --- a/plugin-networkmonitor/translations/networkmonitor_it.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_it.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_it.ts b/plugin-networkmonitor/translations/networkmonitor_it.ts index 90dfa3a..c4788ab 100644 --- a/plugin-networkmonitor/translations/networkmonitor_it.ts +++ b/plugin-networkmonitor/translations/networkmonitor_it.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Impostazioni del monitor di rete di LxQt + LXQt Network Monitor settings + Impostazioni del monitor di rete di LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_ja.desktop b/plugin-networkmonitor/translations/networkmonitor_ja.desktop index 014ab5f..7558a03 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ja.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_ja.ts b/plugin-networkmonitor/translations/networkmonitor_ja.ts index 1321b80..d5ce285 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ja.ts +++ b/plugin-networkmonitor/translations/networkmonitor_ja.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_nl.desktop b/plugin-networkmonitor/translations/networkmonitor_nl.desktop index a53f431..2617d4d 100644 --- a/plugin-networkmonitor/translations/networkmonitor_nl.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_nl.ts b/plugin-networkmonitor/translations/networkmonitor_nl.ts index da59450..490827e 100644 --- a/plugin-networkmonitor/translations/networkmonitor_nl.ts +++ b/plugin-networkmonitor/translations/networkmonitor_nl.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Instellingen voor Netwerkbewaker van LxQt + LXQt Network Monitor settings + Instellingen voor Netwerkbewaker van LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_pl.ts b/plugin-networkmonitor/translations/networkmonitor_pl.ts index e402658..4f815df 100644 --- a/plugin-networkmonitor/translations/networkmonitor_pl.ts +++ b/plugin-networkmonitor/translations/networkmonitor_pl.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Ustawienia LxQt Network Monitor + LXQt Network Monitor settings + Ustawienia LXQt Network Monitor diff --git a/plugin-networkmonitor/translations/networkmonitor_pt.desktop b/plugin-networkmonitor/translations/networkmonitor_pt.desktop index be90c44..df69b40 100644 --- a/plugin-networkmonitor/translations/networkmonitor_pt.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_pt.ts b/plugin-networkmonitor/translations/networkmonitor_pt.ts index 36ad1dd..971869c 100644 --- a/plugin-networkmonitor/translations/networkmonitor_pt.ts +++ b/plugin-networkmonitor/translations/networkmonitor_pt.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Definições do monitor de rede do LxQt + LXQt Network Monitor settings + Definições do monitor de rede do LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_pt_BR.desktop b/plugin-networkmonitor/translations/networkmonitor_pt_BR.desktop index 8b6016a..a53db5f 100644 --- a/plugin-networkmonitor/translations/networkmonitor_pt_BR.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts b/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts index 973dabd..38c4c42 100644 --- a/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts +++ b/plugin-networkmonitor/translations/networkmonitor_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,9 +50,9 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings + LXQt Network Monitor settings Configurações de Monitoramento de Rede diff --git a/plugin-networkmonitor/translations/networkmonitor_ro_RO.desktop b/plugin-networkmonitor/translations/networkmonitor_ro_RO.desktop index d98d904..eeb6084 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ro_RO.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts b/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts index e3d019f..a43987a 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts +++ b/plugin-networkmonitor/translations/networkmonitor_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Setări monitorizare rețea LxQt + LXQt Network Monitor settings + Setări monitorizare rețea LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_ru.desktop b/plugin-networkmonitor/translations/networkmonitor_ru.desktop index d37c566..e9086f3 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ru.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_ru.ts b/plugin-networkmonitor/translations/networkmonitor_ru.ts index 3afc49d..b5b8d46 100644 --- a/plugin-networkmonitor/translations/networkmonitor_ru.ts +++ b/plugin-networkmonitor/translations/networkmonitor_ru.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,7 +50,7 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration Network Monitor settings diff --git a/plugin-networkmonitor/translations/networkmonitor_sr@latin.desktop b/plugin-networkmonitor/translations/networkmonitor_sr@latin.desktop index e0573b1..6f95355 100644 --- a/plugin-networkmonitor/translations/networkmonitor_sr@latin.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_th_TH.desktop b/plugin-networkmonitor/translations/networkmonitor_th_TH.desktop index 84ef080..793eb60 100644 --- a/plugin-networkmonitor/translations/networkmonitor_th_TH.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_th_TH.ts b/plugin-networkmonitor/translations/networkmonitor_th_TH.ts index 303ed5e..ebba4ae 100644 --- a/plugin-networkmonitor/translations/networkmonitor_th_TH.ts +++ b/plugin-networkmonitor/translations/networkmonitor_th_TH.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - ค่าตั้งการเฝ้าสังเกตเครือข่าย LxQt + LXQt Network Monitor settings + ค่าตั้งการเฝ้าสังเกตเครือข่าย LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_tr.desktop b/plugin-networkmonitor/translations/networkmonitor_tr.desktop index db2f801..f49dbf8 100644 --- a/plugin-networkmonitor/translations/networkmonitor_tr.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_tr.ts b/plugin-networkmonitor/translations/networkmonitor_tr.ts index 903d363..6216cfb 100644 --- a/plugin-networkmonitor/translations/networkmonitor_tr.ts +++ b/plugin-networkmonitor/translations/networkmonitor_tr.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - LxQt Ağ İzleme ayarları + LXQt Network Monitor settings + LXQt Ağ İzleme ayarları diff --git a/plugin-networkmonitor/translations/networkmonitor_uk.desktop b/plugin-networkmonitor/translations/networkmonitor_uk.desktop index d6c29ea..b1b696b 100644 --- a/plugin-networkmonitor/translations/networkmonitor_uk.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_uk.ts b/plugin-networkmonitor/translations/networkmonitor_uk.ts index ba0ddb1..e0ecca6 100644 --- a/plugin-networkmonitor/translations/networkmonitor_uk.ts +++ b/plugin-networkmonitor/translations/networkmonitor_uk.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - Налаштування монітору мережі LxQt + LXQt Network Monitor settings + Налаштування монітору мережі LXQt diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_CN.desktop b/plugin-networkmonitor/translations/networkmonitor_zh_CN.desktop index 02fa825..2539f68 100644 --- a/plugin-networkmonitor/translations/networkmonitor_zh_CN.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts b/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts index 5d06789..1728164 100644 --- a/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts +++ b/plugin-networkmonitor/translations/networkmonitor_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - LxQt 网络监测器设置 + LXQt Network Monitor settings + LXQt 网络监测器设置 diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_TW.desktop b/plugin-networkmonitor/translations/networkmonitor_zh_TW.desktop index a15014c..cbe8e4e 100644 --- a/plugin-networkmonitor/translations/networkmonitor_zh_TW.desktop +++ b/plugin-networkmonitor/translations/networkmonitor_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Network monitor Comment=Displays network status and activity. diff --git a/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts b/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts index 4fbb505..3f1e6c6 100644 --- a/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts +++ b/plugin-networkmonitor/translations/networkmonitor_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtNetworkMonitor + LXQtNetworkMonitor Network interface <b>%1</b> @@ -50,10 +50,10 @@ - LxQtNetworkMonitorConfiguration + LXQtNetworkMonitorConfiguration - LxQt Network Monitor settings - LxQt網路監視器設定 + LXQt Network Monitor settings + LXQt網路監視器設定 diff --git a/plugin-quicklaunch/lxqtquicklaunch.cpp b/plugin-quicklaunch/lxqtquicklaunch.cpp index 9a8c917..1fee3ff 100644 --- a/plugin-quicklaunch/lxqtquicklaunch.cpp +++ b/plugin-quicklaunch/lxqtquicklaunch.cpp @@ -45,14 +45,14 @@ #include -LxQtQuickLaunch::LxQtQuickLaunch(ILxQtPanelPlugin *plugin, QWidget* parent) : +LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) : QFrame(parent), mPlugin(plugin), mPlaceHolder(0) { setAcceptDrops(true); - mLayout = new LxQt::GridLayout(this); + mLayout = new LXQt::GridLayout(this); setLayout(mLayout); QSettings *settings = mPlugin->settings(); @@ -111,27 +111,27 @@ LxQtQuickLaunch::LxQtQuickLaunch(ILxQtPanelPlugin *plugin, QWidget* parent) : } -LxQtQuickLaunch::~LxQtQuickLaunch() +LXQtQuickLaunch::~LXQtQuickLaunch() { } -int LxQtQuickLaunch::indexOfButton(QuickLaunchButton* button) const +int LXQtQuickLaunch::indexOfButton(QuickLaunchButton* button) const { return mLayout->indexOf(button); } -int LxQtQuickLaunch::countOfButtons() const +int LXQtQuickLaunch::countOfButtons() const { return mLayout->count(); } -void LxQtQuickLaunch::realign() +void LXQtQuickLaunch::realign() { mLayout->setEnabled(false); - ILxQtPanel *panel = mPlugin->panel(); + ILXQtPanel *panel = mPlugin->panel(); if (mPlaceHolder) { @@ -155,7 +155,7 @@ void LxQtQuickLaunch::realign() } -void LxQtQuickLaunch::addButton(QuickLaunchAction* action) +void LXQtQuickLaunch::addButton(QuickLaunchAction* action) { mLayout->setEnabled(false); QuickLaunchButton* btn = new QuickLaunchButton(action, this); @@ -174,7 +174,7 @@ void LxQtQuickLaunch::addButton(QuickLaunchAction* action) } -void LxQtQuickLaunch::dragEnterEvent(QDragEnterEvent *e) +void LXQtQuickLaunch::dragEnterEvent(QDragEnterEvent *e) { // Getting URL from mainmenu... if (e->mimeData()->hasUrls()) @@ -190,7 +190,7 @@ void LxQtQuickLaunch::dragEnterEvent(QDragEnterEvent *e) } -void LxQtQuickLaunch::dropEvent(QDropEvent *e) +void LXQtQuickLaunch::dropEvent(QDropEvent *e) { const QMimeData *mime = e->mimeData(); @@ -224,7 +224,7 @@ void LxQtQuickLaunch::dropEvent(QDropEvent *e) saveSettings(); } -void LxQtQuickLaunch::switchButtons(QuickLaunchButton *button1, QuickLaunchButton *button2) +void LXQtQuickLaunch::switchButtons(QuickLaunchButton *button1, QuickLaunchButton *button2) { if (button1 == button2) return; @@ -241,7 +241,7 @@ void LxQtQuickLaunch::switchButtons(QuickLaunchButton *button1, QuickLaunchButto } -void LxQtQuickLaunch::buttonDeleted() +void LXQtQuickLaunch::buttonDeleted() { QuickLaunchButton *btn = qobject_cast(sender()); if (!btn) @@ -258,7 +258,7 @@ void LxQtQuickLaunch::buttonDeleted() } -void LxQtQuickLaunch::buttonMoveLeft() +void LXQtQuickLaunch::buttonMoveLeft() { QuickLaunchButton *btn = qobject_cast(sender()); if (!btn) @@ -273,7 +273,7 @@ void LxQtQuickLaunch::buttonMoveLeft() } -void LxQtQuickLaunch::buttonMoveRight() +void LXQtQuickLaunch::buttonMoveRight() { QuickLaunchButton *btn1 = qobject_cast(sender()); if (!btn1) @@ -288,7 +288,7 @@ void LxQtQuickLaunch::buttonMoveRight() } -void LxQtQuickLaunch::saveSettings() +void LXQtQuickLaunch::saveSettings() { QSettings *settings = mPlugin->settings(); settings->remove("apps"); @@ -317,7 +317,7 @@ void LxQtQuickLaunch::saveSettings() } -void LxQtQuickLaunch::showPlaceHolder() +void LXQtQuickLaunch::showPlaceHolder() { if (!mPlaceHolder) { diff --git a/plugin-quicklaunch/lxqtquicklaunch.h b/plugin-quicklaunch/lxqtquicklaunch.h index 624c428..274255f 100644 --- a/plugin-quicklaunch/lxqtquicklaunch.h +++ b/plugin-quicklaunch/lxqtquicklaunch.h @@ -42,7 +42,7 @@ class QuickLaunchButton; class QSettings; class QLabel; -namespace LxQt { +namespace LXQt { class GridLayout; } @@ -50,13 +50,13 @@ class GridLayout; /*! \brief Loader for "quick launcher" icons in the panel. \author Petr Vanek */ -class LxQtQuickLaunch : public QFrame +class LXQtQuickLaunch : public QFrame { Q_OBJECT public: - LxQtQuickLaunch(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - ~LxQtQuickLaunch(); + LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + ~LXQtQuickLaunch(); int indexOfButton(QuickLaunchButton* button) const; int countOfButtons() const; @@ -64,8 +64,8 @@ public: void realign(); private: - LxQt::GridLayout *mLayout; - ILxQtPanelPlugin *mPlugin; + LXQt::GridLayout *mLayout; + ILXQtPanelPlugin *mPlugin; QLabel *mPlaceHolder; void dragEnterEvent(QDragEnterEvent *e); diff --git a/plugin-quicklaunch/lxqtquicklaunchplugin.cpp b/plugin-quicklaunch/lxqtquicklaunchplugin.cpp index 2242eec..043da2f 100644 --- a/plugin-quicklaunch/lxqtquicklaunchplugin.cpp +++ b/plugin-quicklaunch/lxqtquicklaunchplugin.cpp @@ -29,24 +29,24 @@ #include "lxqtquicklaunch.h" -LxQtQuickLaunchPlugin::LxQtQuickLaunchPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtQuickLaunchPlugin::LXQtQuickLaunchPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), - mWidget(new LxQtQuickLaunch(this)) + ILXQtPanelPlugin(startupInfo), + mWidget(new LXQtQuickLaunch(this)) { } -LxQtQuickLaunchPlugin::~LxQtQuickLaunchPlugin() +LXQtQuickLaunchPlugin::~LXQtQuickLaunchPlugin() { delete mWidget; } -QWidget *LxQtQuickLaunchPlugin::widget() +QWidget *LXQtQuickLaunchPlugin::widget() { return mWidget; } -void LxQtQuickLaunchPlugin::realign() +void LXQtQuickLaunchPlugin::realign() { mWidget->realign(); } diff --git a/plugin-quicklaunch/lxqtquicklaunchplugin.h b/plugin-quicklaunch/lxqtquicklaunchplugin.h index 88c7a3b..133418e 100644 --- a/plugin-quicklaunch/lxqtquicklaunchplugin.h +++ b/plugin-quicklaunch/lxqtquicklaunchplugin.h @@ -32,14 +32,14 @@ #include -class LxQtQuickLaunch; +class LXQtQuickLaunch; -class LxQtQuickLaunchPlugin: public QObject, public ILxQtPanelPlugin +class LXQtQuickLaunchPlugin: public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - explicit LxQtQuickLaunchPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtQuickLaunchPlugin(); + explicit LXQtQuickLaunchPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtQuickLaunchPlugin(); virtual QWidget *widget(); virtual QString themeId() const { return "QuickLaunch"; } @@ -50,19 +50,19 @@ public: bool isSeparate() const { return true; } private: - LxQtQuickLaunch *mWidget; + LXQtQuickLaunch *mWidget; }; -class LxQtQuickLaunchPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtQuickLaunchPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtQuickLaunchPlugin(startupInfo); + return new LXQtQuickLaunchPlugin(startupInfo); } }; #endif // LXQTQUICKLAUNCHPLUGIN_H diff --git a/plugin-quicklaunch/quicklaunchaction.h b/plugin-quicklaunch/quicklaunchaction.h index 423850c..01d8f1d 100644 --- a/plugin-quicklaunch/quicklaunchaction.h +++ b/plugin-quicklaunch/quicklaunchaction.h @@ -34,7 +34,7 @@ class XdgDesktopFile; -/*! \brief Special action representation for LxQtQuickLaunch plugin. +/*! \brief Special action representation for LXQtQuickLaunch plugin. It supports XDG desktop files or "legacy" launching of specified apps. All process management is handled internally. \author Petr Vanek diff --git a/plugin-quicklaunch/quicklaunchbutton.cpp b/plugin-quicklaunch/quicklaunchbutton.cpp index 7ba8055..2ad733f 100644 --- a/plugin-quicklaunch/quicklaunchbutton.cpp +++ b/plugin-quicklaunch/quicklaunchbutton.cpp @@ -89,7 +89,7 @@ QHash QuickLaunchButton::settingsMap() void QuickLaunchButton::this_customContextMenuRequested(const QPoint & pos) { - LxQtQuickLaunch *panel = qobject_cast(parent()); + LXQtQuickLaunch *panel = qobject_cast(parent()); mMoveLeftAct->setEnabled( panel && panel->indexOfButton(this) > 0); mMoveRightAct->setEnabled(panel && panel->indexOfButton(this) < panel->countOfButtons() - 1); diff --git a/plugin-quicklaunch/resources/quicklaunch.desktop.in b/plugin-quicklaunch/resources/quicklaunch.desktop.in index f673143..4ecc0a0 100644 --- a/plugin-quicklaunch/resources/quicklaunch.desktop.in +++ b/plugin-quicklaunch/resources/quicklaunch.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. Icon=quickopen diff --git a/plugin-quicklaunch/translations/quicklaunch.ts b/plugin-quicklaunch/translations/quicklaunch.ts index ca203d4..3aa042c 100644 --- a/plugin-quicklaunch/translations/quicklaunch.ts +++ b/plugin-quicklaunch/translations/quicklaunch.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ar.desktop b/plugin-quicklaunch/translations/quicklaunch_ar.desktop index 367b8d2..ea355cb 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ar.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_ar.ts b/plugin-quicklaunch/translations/quicklaunch_ar.ts index 90f5092..d8f6a6d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ar.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ar.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_cs.desktop b/plugin-quicklaunch/translations/quicklaunch_cs.desktop index 9534ad1..8832686 100644 --- a/plugin-quicklaunch/translations/quicklaunch_cs.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_cs.ts b/plugin-quicklaunch/translations/quicklaunch_cs.ts index 078d8a8..2e01986 100644 --- a/plugin-quicklaunch/translations/quicklaunch_cs.ts +++ b/plugin-quicklaunch/translations/quicklaunch_cs.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.desktop b/plugin-quicklaunch/translations/quicklaunch_cs_CZ.desktop index 242038f..016641b 100644 --- a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts b/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts index 1041dde..7a9f695 100644 --- a/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts +++ b/plugin-quicklaunch/translations/quicklaunch_cs_CZ.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_da.desktop b/plugin-quicklaunch/translations/quicklaunch_da.desktop index e20a452..ded5bfc 100644 --- a/plugin-quicklaunch/translations/quicklaunch_da.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_da.ts b/plugin-quicklaunch/translations/quicklaunch_da.ts index 1d96f01..e33cc5d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_da.ts +++ b/plugin-quicklaunch/translations/quicklaunch_da.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop b/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop index 4bd52af..5fca64d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_da_DK.ts b/plugin-quicklaunch/translations/quicklaunch_da_DK.ts index a270973..3d969d0 100644 --- a/plugin-quicklaunch/translations/quicklaunch_da_DK.ts +++ b/plugin-quicklaunch/translations/quicklaunch_da_DK.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_de.ts b/plugin-quicklaunch/translations/quicklaunch_de.ts index 1f15174..d979ee5 100644 --- a/plugin-quicklaunch/translations/quicklaunch_de.ts +++ b/plugin-quicklaunch/translations/quicklaunch_de.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_el.desktop b/plugin-quicklaunch/translations/quicklaunch_el.desktop new file mode 100644 index 0000000..fcb7155 --- /dev/null +++ b/plugin-quicklaunch/translations/quicklaunch_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Γρήγορη εκκίνηση +Comment[el]=Εύκολη πρόσβαση στις αγαπημένες σας εφαρμογές diff --git a/plugin-quicklaunch/translations/quicklaunch_el_GR.ts b/plugin-quicklaunch/translations/quicklaunch_el.ts similarity index 90% rename from plugin-quicklaunch/translations/quicklaunch_el_GR.ts rename to plugin-quicklaunch/translations/quicklaunch_el.ts index 4501097..4705411 100644 --- a/plugin-quicklaunch/translations/quicklaunch_el_GR.ts +++ b/plugin-quicklaunch/translations/quicklaunch_el.ts @@ -1,8 +1,8 @@ - + - LxQtQuickLaunch + LXQtQuickLaunch Drop Error @@ -17,7 +17,8 @@ Drop application icons here - + Εναποθέστε εδώ +εικονίδια εφαρμογών diff --git a/plugin-quicklaunch/translations/quicklaunch_el_GR.desktop b/plugin-quicklaunch/translations/quicklaunch_el_GR.desktop deleted file mode 100644 index 5efea66..0000000 --- a/plugin-quicklaunch/translations/quicklaunch_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Quick launch -Comment=Easy access to your favourite applications. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Εκκίνηση των αγαπημένων σας εφαρμογών -Name[el_GR]=Γρήγορη εκκίνηση diff --git a/plugin-quicklaunch/translations/quicklaunch_eo.desktop b/plugin-quicklaunch/translations/quicklaunch_eo.desktop index 8bdd345..ca19b48 100644 --- a/plugin-quicklaunch/translations/quicklaunch_eo.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_eo.ts b/plugin-quicklaunch/translations/quicklaunch_eo.ts index 2a148dc..1ba64ed 100644 --- a/plugin-quicklaunch/translations/quicklaunch_eo.ts +++ b/plugin-quicklaunch/translations/quicklaunch_eo.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_es.desktop b/plugin-quicklaunch/translations/quicklaunch_es.desktop index 05f859b..57421ef 100644 --- a/plugin-quicklaunch/translations/quicklaunch_es.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_es.ts b/plugin-quicklaunch/translations/quicklaunch_es.ts index 48188b3..3310bd5 100644 --- a/plugin-quicklaunch/translations/quicklaunch_es.ts +++ b/plugin-quicklaunch/translations/quicklaunch_es.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_es_VE.desktop b/plugin-quicklaunch/translations/quicklaunch_es_VE.desktop index f3f0553..090c778 100644 --- a/plugin-quicklaunch/translations/quicklaunch_es_VE.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_es_VE.ts b/plugin-quicklaunch/translations/quicklaunch_es_VE.ts index e6596a5..f48fce4 100644 --- a/plugin-quicklaunch/translations/quicklaunch_es_VE.ts +++ b/plugin-quicklaunch/translations/quicklaunch_es_VE.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_eu.desktop b/plugin-quicklaunch/translations/quicklaunch_eu.desktop index 7462431..5dd9f7f 100644 --- a/plugin-quicklaunch/translations/quicklaunch_eu.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_eu.ts b/plugin-quicklaunch/translations/quicklaunch_eu.ts index a1c8c3b..830c0c3 100644 --- a/plugin-quicklaunch/translations/quicklaunch_eu.ts +++ b/plugin-quicklaunch/translations/quicklaunch_eu.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_fi.desktop b/plugin-quicklaunch/translations/quicklaunch_fi.desktop index 1f778d6..1df3c33 100644 --- a/plugin-quicklaunch/translations/quicklaunch_fi.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_fi.ts b/plugin-quicklaunch/translations/quicklaunch_fi.ts index 287c0c2..6198dcf 100644 --- a/plugin-quicklaunch/translations/quicklaunch_fi.ts +++ b/plugin-quicklaunch/translations/quicklaunch_fi.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop b/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop index 9550f25..86e4f38 100644 --- a/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts b/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts index 35c275e..d63862d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts +++ b/plugin-quicklaunch/translations/quicklaunch_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_hu.desktop b/plugin-quicklaunch/translations/quicklaunch_hu.desktop index 4ca808c..45c0c17 100644 --- a/plugin-quicklaunch/translations/quicklaunch_hu.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_hu.ts b/plugin-quicklaunch/translations/quicklaunch_hu.ts index 9c7e2fe..5b7aaed 100644 --- a/plugin-quicklaunch/translations/quicklaunch_hu.ts +++ b/plugin-quicklaunch/translations/quicklaunch_hu.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts b/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts index 4c85f5b..812f28b 100644 --- a/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts +++ b/plugin-quicklaunch/translations/quicklaunch_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ia.desktop b/plugin-quicklaunch/translations/quicklaunch_ia.desktop index a88914a..0f0ec1d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ia.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quicklaunch Comment=Launch your favorite Applications diff --git a/plugin-quicklaunch/translations/quicklaunch_ia.ts b/plugin-quicklaunch/translations/quicklaunch_ia.ts index 8bfd4c4..68015f5 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ia.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ia.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_id_ID.desktop b/plugin-quicklaunch/translations/quicklaunch_id_ID.desktop index 2058fc6..63ffd48 100644 --- a/plugin-quicklaunch/translations/quicklaunch_id_ID.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_id_ID.ts b/plugin-quicklaunch/translations/quicklaunch_id_ID.ts index d22169f..6f270ef 100644 --- a/plugin-quicklaunch/translations/quicklaunch_id_ID.ts +++ b/plugin-quicklaunch/translations/quicklaunch_id_ID.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_it_IT.desktop b/plugin-quicklaunch/translations/quicklaunch_it_IT.desktop index 4be775f..c44779f 100644 --- a/plugin-quicklaunch/translations/quicklaunch_it_IT.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_it_IT.ts b/plugin-quicklaunch/translations/quicklaunch_it_IT.ts index fa3fabd..08ff828 100644 --- a/plugin-quicklaunch/translations/quicklaunch_it_IT.ts +++ b/plugin-quicklaunch/translations/quicklaunch_it_IT.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ja.desktop b/plugin-quicklaunch/translations/quicklaunch_ja.desktop index 92a5201..13a1a98 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ja.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_ja.ts b/plugin-quicklaunch/translations/quicklaunch_ja.ts index 29d90a7..d5b2b25 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ja.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ja.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ko.desktop b/plugin-quicklaunch/translations/quicklaunch_ko.desktop index a88914a..0f0ec1d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ko.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quicklaunch Comment=Launch your favorite Applications diff --git a/plugin-quicklaunch/translations/quicklaunch_ko.ts b/plugin-quicklaunch/translations/quicklaunch_ko.ts index 45bb56b..34b0ffa 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ko.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ko.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_lt.desktop b/plugin-quicklaunch/translations/quicklaunch_lt.desktop index ae53d39..769553b 100644 --- a/plugin-quicklaunch/translations/quicklaunch_lt.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_lt.ts b/plugin-quicklaunch/translations/quicklaunch_lt.ts index 498cf45..f0037f3 100644 --- a/plugin-quicklaunch/translations/quicklaunch_lt.ts +++ b/plugin-quicklaunch/translations/quicklaunch_lt.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_nl.desktop b/plugin-quicklaunch/translations/quicklaunch_nl.desktop index 3530c59..5b5d933 100644 --- a/plugin-quicklaunch/translations/quicklaunch_nl.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_nl.ts b/plugin-quicklaunch/translations/quicklaunch_nl.ts index 41b819a..f7894a0 100644 --- a/plugin-quicklaunch/translations/quicklaunch_nl.ts +++ b/plugin-quicklaunch/translations/quicklaunch_nl.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_pl.desktop b/plugin-quicklaunch/translations/quicklaunch_pl.desktop index 21f4d07..037b5c4 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pl.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_pl.ts b/plugin-quicklaunch/translations/quicklaunch_pl.ts index 5f441d6..6ce9e6f 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pl.ts +++ b/plugin-quicklaunch/translations/quicklaunch_pl.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_pl_PL.desktop b/plugin-quicklaunch/translations/quicklaunch_pl_PL.desktop index 661010c..9485352 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pl_PL.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts b/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts index a455735..1c7b9c7 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts +++ b/plugin-quicklaunch/translations/quicklaunch_pl_PL.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_pt.desktop b/plugin-quicklaunch/translations/quicklaunch_pt.desktop index 8e438ff..3c5c243 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pt.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_pt.ts b/plugin-quicklaunch/translations/quicklaunch_pt.ts index a880dd4..fb6acb6 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pt.ts +++ b/plugin-quicklaunch/translations/quicklaunch_pt.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_pt_BR.desktop b/plugin-quicklaunch/translations/quicklaunch_pt_BR.desktop index d764348..8f0a0d3 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pt_BR.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts b/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts index 35db758..8451a4f 100644 --- a/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts +++ b/plugin-quicklaunch/translations/quicklaunch_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ro_RO.desktop b/plugin-quicklaunch/translations/quicklaunch_ro_RO.desktop index 5737f73..7021f76 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ro_RO.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts b/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts index 209c10a..d3d958f 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ru.desktop b/plugin-quicklaunch/translations/quicklaunch_ru.desktop index 57feb59..6d99881 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ru.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_ru.ts b/plugin-quicklaunch/translations/quicklaunch_ru.ts index d263e7e..d07de7d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ru.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ru.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop b/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop index c2b5628..7aa4061 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts b/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts index 5bfb41f..caeae91 100644 --- a/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts +++ b/plugin-quicklaunch/translations/quicklaunch_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_sk.desktop b/plugin-quicklaunch/translations/quicklaunch_sk.desktop index 1a1ca98..d33399e 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sk.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts b/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts index 9db0473..5a56e5c 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts +++ b/plugin-quicklaunch/translations/quicklaunch_sk_SK.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_sl.desktop b/plugin-quicklaunch/translations/quicklaunch_sl.desktop index fca8a6e..2fc78dd 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sl.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_sl.ts b/plugin-quicklaunch/translations/quicklaunch_sl.ts index 0dee705..31c53b1 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sl.ts +++ b/plugin-quicklaunch/translations/quicklaunch_sl.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_sr.desktop b/plugin-quicklaunch/translations/quicklaunch_sr.desktop index 328cd4c..3be634d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sr.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_sr@latin.desktop b/plugin-quicklaunch/translations/quicklaunch_sr@latin.desktop index 87df58e..02c4cbb 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sr@latin.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts b/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts index 793429e..877ea7a 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts +++ b/plugin-quicklaunch/translations/quicklaunch_sr@latin.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts b/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts index c067b5e..d76e457 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts +++ b/plugin-quicklaunch/translations/quicklaunch_sr_BA.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts b/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts index 414e650..d3c31f0 100644 --- a/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts +++ b/plugin-quicklaunch/translations/quicklaunch_sr_RS.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_th_TH.desktop b/plugin-quicklaunch/translations/quicklaunch_th_TH.desktop index 7e48f96..44f4976 100644 --- a/plugin-quicklaunch/translations/quicklaunch_th_TH.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_th_TH.ts b/plugin-quicklaunch/translations/quicklaunch_th_TH.ts index 8f46cc4..91f13bb 100644 --- a/plugin-quicklaunch/translations/quicklaunch_th_TH.ts +++ b/plugin-quicklaunch/translations/quicklaunch_th_TH.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_tr.desktop b/plugin-quicklaunch/translations/quicklaunch_tr.desktop index d890a48..fe7eb67 100644 --- a/plugin-quicklaunch/translations/quicklaunch_tr.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_tr.ts b/plugin-quicklaunch/translations/quicklaunch_tr.ts index 59ab575..da0e97a 100644 --- a/plugin-quicklaunch/translations/quicklaunch_tr.ts +++ b/plugin-quicklaunch/translations/quicklaunch_tr.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_uk.desktop b/plugin-quicklaunch/translations/quicklaunch_uk.desktop index fe14d3c..efbc3ec 100644 --- a/plugin-quicklaunch/translations/quicklaunch_uk.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_uk.ts b/plugin-quicklaunch/translations/quicklaunch_uk.ts index 471e7b2..6bfc5e0 100644 --- a/plugin-quicklaunch/translations/quicklaunch_uk.ts +++ b/plugin-quicklaunch/translations/quicklaunch_uk.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_CN.GB2312.desktop b/plugin-quicklaunch/translations/quicklaunch_zh_CN.GB2312.desktop index a88914a..0f0ec1d 100644 --- a/plugin-quicklaunch/translations/quicklaunch_zh_CN.GB2312.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quicklaunch Comment=Launch your favorite Applications diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_CN.desktop b/plugin-quicklaunch/translations/quicklaunch_zh_CN.desktop index 06aa195..91e2ded 100644 --- a/plugin-quicklaunch/translations/quicklaunch_zh_CN.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts b/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts index 5006503..6540f9e 100644 --- a/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts +++ b/plugin-quicklaunch/translations/quicklaunch_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_TW.desktop b/plugin-quicklaunch/translations/quicklaunch_zh_TW.desktop index 284b6b8..b144cf8 100644 --- a/plugin-quicklaunch/translations/quicklaunch_zh_TW.desktop +++ b/plugin-quicklaunch/translations/quicklaunch_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Quick launch Comment=Easy access to your favourite applications. diff --git a/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts b/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts index 67b6ace..415bb8b 100644 --- a/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts +++ b/plugin-quicklaunch/translations/quicklaunch_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtQuickLaunch + LXQtQuickLaunch Drop Error diff --git a/plugin-screensaver/panelscreensaver.cpp b/plugin-screensaver/panelscreensaver.cpp index f0624ad..3de2a3c 100644 --- a/plugin-screensaver/panelscreensaver.cpp +++ b/plugin-screensaver/panelscreensaver.cpp @@ -37,11 +37,11 @@ #define DEFAULT_SHORTCUT "Control+Alt+L" -PanelScreenSaver::PanelScreenSaver(const ILxQtPanelPluginStartupInfo &startupInfo) : +PanelScreenSaver::PanelScreenSaver(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { - mSaver = new LxQt::ScreenSaver(this); + mSaver = new LXQt::ScreenSaver(this); QList actions = mSaver->availableActions(); if (!actions.empty()) @@ -64,7 +64,7 @@ void PanelScreenSaver::shortcutRegistered() mShortcutKey->changeShortcut(DEFAULT_SHORTCUT); if (mShortcutKey->shortcut().isEmpty()) { - LxQt::Notification::notify(tr("Panel Screensaver: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); + LXQt::Notification::notify(tr("Panel Screensaver: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); } } } diff --git a/plugin-screensaver/panelscreensaver.h b/plugin-screensaver/panelscreensaver.h index 7926755..0f16f85 100644 --- a/plugin-screensaver/panelscreensaver.h +++ b/plugin-screensaver/panelscreensaver.h @@ -32,7 +32,7 @@ #include "../panel/ilxqtpanelplugin.h" #include -namespace LxQt { +namespace LXQt { class ScreenSaver; } namespace GlobalKeyShortcut @@ -40,12 +40,12 @@ namespace GlobalKeyShortcut class Action; } -class PanelScreenSaver : public QObject, public ILxQtPanelPlugin +class PanelScreenSaver : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - PanelScreenSaver(const ILxQtPanelPluginStartupInfo &startupInfo); + PanelScreenSaver(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mButton; } virtual QString themeId() const { return "PanelScreenSaver"; } @@ -55,17 +55,17 @@ private slots: private: QToolButton mButton; - LxQt::ScreenSaver * mSaver; + LXQt::ScreenSaver * mSaver; GlobalKeyShortcut::Action * mShortcutKey; }; -class PanelScreenSaverLibrary: public QObject, public ILxQtPanelPluginLibrary +class PanelScreenSaverLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new PanelScreenSaver(startupInfo); } diff --git a/plugin-screensaver/resources/screensaver.desktop.in b/plugin-screensaver/resources/screensaver.desktop.in index 94e2f74..74b0ccb 100644 --- a/plugin-screensaver/resources/screensaver.desktop.in +++ b/plugin-screensaver/resources/screensaver.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen Icon=system-lock-screen diff --git a/plugin-screensaver/translations/screensaver_ar.desktop b/plugin-screensaver/translations/screensaver_ar.desktop index fd9e6e0..d2475f2 100644 --- a/plugin-screensaver/translations/screensaver_ar.desktop +++ b/plugin-screensaver/translations/screensaver_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_cs.desktop b/plugin-screensaver/translations/screensaver_cs.desktop index 093eec3..96e2d96 100644 --- a/plugin-screensaver/translations/screensaver_cs.desktop +++ b/plugin-screensaver/translations/screensaver_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_cs_CZ.desktop b/plugin-screensaver/translations/screensaver_cs_CZ.desktop index 166ae4b..5203999 100644 --- a/plugin-screensaver/translations/screensaver_cs_CZ.desktop +++ b/plugin-screensaver/translations/screensaver_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_da.desktop b/plugin-screensaver/translations/screensaver_da.desktop index b35194e..0c9c3af 100644 --- a/plugin-screensaver/translations/screensaver_da.desktop +++ b/plugin-screensaver/translations/screensaver_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_da_DK.desktop b/plugin-screensaver/translations/screensaver_da_DK.desktop index 19d8704..0923df2 100644 --- a/plugin-screensaver/translations/screensaver_da_DK.desktop +++ b/plugin-screensaver/translations/screensaver_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_el.desktop b/plugin-screensaver/translations/screensaver_el.desktop new file mode 100644 index 0000000..2def9d1 --- /dev/null +++ b/plugin-screensaver/translations/screensaver_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Προφύλαξη οθόνης +Comment[el]=Ενεργοποίηση της προφύλαξης οθόνης και/ή κλείδωμα της οθόνης diff --git a/plugin-screensaver/translations/screensaver_el_GR.ts b/plugin-screensaver/translations/screensaver_el.ts similarity index 72% rename from plugin-screensaver/translations/screensaver_el_GR.ts rename to plugin-screensaver/translations/screensaver_el.ts index 311f26d..9869378 100644 --- a/plugin-screensaver/translations/screensaver_el_GR.ts +++ b/plugin-screensaver/translations/screensaver_el.ts @@ -1,6 +1,6 @@ - + PanelScreenSaver @@ -10,12 +10,12 @@ Lock Screen - + Κλείδωμα της οθόνης Panel Screensaver: Global shortcut '%1' cannot be registered - + Πίνακας προφύλαξης οθόνης: Η καθολική συντόμευση '%1' δεν μπορεί να καταχωρηθεί diff --git a/plugin-screensaver/translations/screensaver_el_GR.desktop b/plugin-screensaver/translations/screensaver_el_GR.desktop deleted file mode 100644 index 78719a2..0000000 --- a/plugin-screensaver/translations/screensaver_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Launch screensaver -Comment=Activate a screensaver and/or lock the screen - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Ενεργοποίηση προφύλαξης οθόνης και/ή κλειδώματος οθόνης -Name[el_GR]=Προφύλαξη οθόνης diff --git a/plugin-screensaver/translations/screensaver_eo.desktop b/plugin-screensaver/translations/screensaver_eo.desktop index 2bd5fb2..7a7b80b 100644 --- a/plugin-screensaver/translations/screensaver_eo.desktop +++ b/plugin-screensaver/translations/screensaver_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_es.desktop b/plugin-screensaver/translations/screensaver_es.desktop index b06cdc2..fa38da6 100644 --- a/plugin-screensaver/translations/screensaver_es.desktop +++ b/plugin-screensaver/translations/screensaver_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_es_VE.desktop b/plugin-screensaver/translations/screensaver_es_VE.desktop index 986dad5..f611590 100644 --- a/plugin-screensaver/translations/screensaver_es_VE.desktop +++ b/plugin-screensaver/translations/screensaver_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_eu.desktop b/plugin-screensaver/translations/screensaver_eu.desktop index cf078ab..1631423 100644 --- a/plugin-screensaver/translations/screensaver_eu.desktop +++ b/plugin-screensaver/translations/screensaver_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_fi.desktop b/plugin-screensaver/translations/screensaver_fi.desktop index d8783a4..75753f7 100644 --- a/plugin-screensaver/translations/screensaver_fi.desktop +++ b/plugin-screensaver/translations/screensaver_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_fr_FR.desktop b/plugin-screensaver/translations/screensaver_fr_FR.desktop index c5a211e..eba4720 100644 --- a/plugin-screensaver/translations/screensaver_fr_FR.desktop +++ b/plugin-screensaver/translations/screensaver_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_hu.desktop b/plugin-screensaver/translations/screensaver_hu.desktop index 1034321..d95f2d7 100644 --- a/plugin-screensaver/translations/screensaver_hu.desktop +++ b/plugin-screensaver/translations/screensaver_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ia.desktop b/plugin-screensaver/translations/screensaver_ia.desktop index 79caaeb..6d953ec 100644 --- a/plugin-screensaver/translations/screensaver_ia.desktop +++ b/plugin-screensaver/translations/screensaver_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_id_ID.desktop b/plugin-screensaver/translations/screensaver_id_ID.desktop index 79caaeb..6d953ec 100644 --- a/plugin-screensaver/translations/screensaver_id_ID.desktop +++ b/plugin-screensaver/translations/screensaver_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_it_IT.desktop b/plugin-screensaver/translations/screensaver_it_IT.desktop index 4bd63cd..bae95fa 100644 --- a/plugin-screensaver/translations/screensaver_it_IT.desktop +++ b/plugin-screensaver/translations/screensaver_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ja.desktop b/plugin-screensaver/translations/screensaver_ja.desktop index cd239be..f8cb05e 100644 --- a/plugin-screensaver/translations/screensaver_ja.desktop +++ b/plugin-screensaver/translations/screensaver_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ko.desktop b/plugin-screensaver/translations/screensaver_ko.desktop index 79caaeb..6d953ec 100644 --- a/plugin-screensaver/translations/screensaver_ko.desktop +++ b/plugin-screensaver/translations/screensaver_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_lt.desktop b/plugin-screensaver/translations/screensaver_lt.desktop index edc82c1..ad55350 100644 --- a/plugin-screensaver/translations/screensaver_lt.desktop +++ b/plugin-screensaver/translations/screensaver_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_nl.desktop b/plugin-screensaver/translations/screensaver_nl.desktop index 481e536..0f0fea2 100644 --- a/plugin-screensaver/translations/screensaver_nl.desktop +++ b/plugin-screensaver/translations/screensaver_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_pl.desktop b/plugin-screensaver/translations/screensaver_pl.desktop index 5e347c4..51febe6 100644 --- a/plugin-screensaver/translations/screensaver_pl.desktop +++ b/plugin-screensaver/translations/screensaver_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_pl_PL.desktop b/plugin-screensaver/translations/screensaver_pl_PL.desktop index 42de2df..e3c0e27 100644 --- a/plugin-screensaver/translations/screensaver_pl_PL.desktop +++ b/plugin-screensaver/translations/screensaver_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_pt.desktop b/plugin-screensaver/translations/screensaver_pt.desktop index d1d0a64..52f8cb6 100644 --- a/plugin-screensaver/translations/screensaver_pt.desktop +++ b/plugin-screensaver/translations/screensaver_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_pt_BR.desktop b/plugin-screensaver/translations/screensaver_pt_BR.desktop index f8443f0..8cba603 100644 --- a/plugin-screensaver/translations/screensaver_pt_BR.desktop +++ b/plugin-screensaver/translations/screensaver_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ro_RO.desktop b/plugin-screensaver/translations/screensaver_ro_RO.desktop index c99a318..3186fce 100644 --- a/plugin-screensaver/translations/screensaver_ro_RO.desktop +++ b/plugin-screensaver/translations/screensaver_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ru.desktop b/plugin-screensaver/translations/screensaver_ru.desktop index 1fd6a69..18f0474 100644 --- a/plugin-screensaver/translations/screensaver_ru.desktop +++ b/plugin-screensaver/translations/screensaver_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_ru_RU.desktop b/plugin-screensaver/translations/screensaver_ru_RU.desktop index 7ad644a..5a44d7a 100644 --- a/plugin-screensaver/translations/screensaver_ru_RU.desktop +++ b/plugin-screensaver/translations/screensaver_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_sk.desktop b/plugin-screensaver/translations/screensaver_sk.desktop index 908a564..827d5e4 100644 --- a/plugin-screensaver/translations/screensaver_sk.desktop +++ b/plugin-screensaver/translations/screensaver_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_sl.desktop b/plugin-screensaver/translations/screensaver_sl.desktop index 2f7d450..bec7127 100644 --- a/plugin-screensaver/translations/screensaver_sl.desktop +++ b/plugin-screensaver/translations/screensaver_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_sr.desktop b/plugin-screensaver/translations/screensaver_sr.desktop index ebd89e8..4152dd3 100644 --- a/plugin-screensaver/translations/screensaver_sr.desktop +++ b/plugin-screensaver/translations/screensaver_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_sr@latin.desktop b/plugin-screensaver/translations/screensaver_sr@latin.desktop index adccd4a..65b4bd0 100644 --- a/plugin-screensaver/translations/screensaver_sr@latin.desktop +++ b/plugin-screensaver/translations/screensaver_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_th_TH.desktop b/plugin-screensaver/translations/screensaver_th_TH.desktop index 69255e2..398849f 100644 --- a/plugin-screensaver/translations/screensaver_th_TH.desktop +++ b/plugin-screensaver/translations/screensaver_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_tr.desktop b/plugin-screensaver/translations/screensaver_tr.desktop index 6bb67d2..a250493 100644 --- a/plugin-screensaver/translations/screensaver_tr.desktop +++ b/plugin-screensaver/translations/screensaver_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_uk.desktop b/plugin-screensaver/translations/screensaver_uk.desktop index ef1e102..db13a91 100644 --- a/plugin-screensaver/translations/screensaver_uk.desktop +++ b/plugin-screensaver/translations/screensaver_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop b/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop index 79caaeb..6d953ec 100644 --- a/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop +++ b/plugin-screensaver/translations/screensaver_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_zh_CN.desktop b/plugin-screensaver/translations/screensaver_zh_CN.desktop index a0e44b3..edabcb7 100644 --- a/plugin-screensaver/translations/screensaver_zh_CN.desktop +++ b/plugin-screensaver/translations/screensaver_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-screensaver/translations/screensaver_zh_TW.desktop b/plugin-screensaver/translations/screensaver_zh_TW.desktop index 43a8dd7..08936b7 100644 --- a/plugin-screensaver/translations/screensaver_zh_TW.desktop +++ b/plugin-screensaver/translations/screensaver_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Launch screensaver Comment=Activate a screensaver and/or lock the screen diff --git a/plugin-sensors/lxqtsensors.cpp b/plugin-sensors/lxqtsensors.cpp index 78feb04..a05c7e8 100644 --- a/plugin-sensors/lxqtsensors.cpp +++ b/plugin-sensors/lxqtsensors.cpp @@ -35,7 +35,7 @@ #include -LxQtSensors::LxQtSensors(ILxQtPanelPlugin *plugin, QWidget* parent): +LXQtSensors::LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent): QFrame(parent), mPlugin(plugin), mSettings(plugin->settings()) @@ -122,12 +122,12 @@ LxQtSensors::LxQtSensors(ILxQtPanelPlugin *plugin, QWidget* parent): } -LxQtSensors::~LxQtSensors() +LXQtSensors::~LXQtSensors() { } -void LxQtSensors::updateSensorReadings() +void LXQtSensors::updateSensorReadings() { QString tooltip; @@ -232,7 +232,7 @@ void LxQtSensors::updateSensorReadings() } -void LxQtSensors::warningAboutHighTemperature() +void LXQtSensors::warningAboutHighTemperature() { // Iterator for temperature progress bars QSet::iterator temperatureProgressBarsIt = @@ -261,7 +261,7 @@ void LxQtSensors::warningAboutHighTemperature() } -void LxQtSensors::settingsChanged() +void LXQtSensors::settingsChanged() { mUpdateSensorReadingsTimer.setInterval(mSettings->value("updateInterval").toInt() * 1000); @@ -331,9 +331,9 @@ void LxQtSensors::settingsChanged() } -void LxQtSensors::realign() +void LXQtSensors::realign() { - // Default values for LxQtPanel::PositionBottom or LxQtPanel::PositionTop + // Default values for LXQtPanel::PositionBottom or LXQtPanel::PositionTop Qt::Orientation cur_orient = Qt::Vertical; Qt::LayoutDirection cur_layout_dir = Qt::LeftToRight; @@ -348,11 +348,11 @@ void LxQtSensors::realign() switch (mPlugin->panel()->position()) { - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: cur_orient = Qt::Horizontal; break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: cur_orient = Qt::Horizontal; cur_layout_dir = Qt::RightToLeft; break; @@ -380,14 +380,14 @@ void LxQtSensors::realign() } -double LxQtSensors::celsiusToFahrenheit(double celsius) +double LXQtSensors::celsiusToFahrenheit(double celsius) { // Fahrenheit = 32 * (9/5) * Celsius return 32 + 1.8 * celsius; } -void LxQtSensors::initDefaultSettings() +void LXQtSensors::initDefaultSettings() { if (!mSettings->contains("updateInterval")) { diff --git a/plugin-sensors/lxqtsensors.h b/plugin-sensors/lxqtsensors.h index 0769e53..9024ece 100644 --- a/plugin-sensors/lxqtsensors.h +++ b/plugin-sensors/lxqtsensors.h @@ -46,15 +46,15 @@ public: class QSettings; -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; class QBoxLayout; -class LxQtSensors : public QFrame +class LXQtSensors : public QFrame { Q_OBJECT public: - LxQtSensors(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - ~LxQtSensors(); + LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + ~LXQtSensors(); void settingsChanged(); void realign(); @@ -63,7 +63,7 @@ public slots: void warningAboutHighTemperature(); private: - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; QBoxLayout *mLayout; QTimer mUpdateSensorReadingsTimer; QTimer mWarningAboutHighTemperatureTimer; diff --git a/plugin-sensors/lxqtsensorsconfiguration.cpp b/plugin-sensors/lxqtsensorsconfiguration.cpp index 013e894..fc08fd6 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.cpp +++ b/plugin-sensors/lxqtsensorsconfiguration.cpp @@ -34,9 +34,9 @@ #include -LxQtSensorsConfiguration::LxQtSensorsConfiguration(QSettings *settings, QWidget *parent) : +LXQtSensorsConfiguration::LXQtSensorsConfiguration(QSettings *settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtSensorsConfiguration), + ui(new Ui::LXQtSensorsConfiguration), mSettings(settings), oldSettings(settings) { @@ -63,13 +63,13 @@ LxQtSensorsConfiguration::LxQtSensorsConfiguration(QSettings *settings, QWidget } -LxQtSensorsConfiguration::~LxQtSensorsConfiguration() +LXQtSensorsConfiguration::~LXQtSensorsConfiguration() { delete ui; } -void LxQtSensorsConfiguration::loadSettings() +void LXQtSensorsConfiguration::loadSettings() { ui->updateIntervalSB->setValue(mSettings->value("updateInterval").toInt()); ui->tempBarWidthSB->setValue(mSettings->value("tempBarWidth").toInt()); @@ -102,7 +102,7 @@ void LxQtSensorsConfiguration::loadSettings() } -void LxQtSensorsConfiguration::saveSettings() +void LXQtSensorsConfiguration::saveSettings() { mSettings->setValue("updateInterval", ui->updateIntervalSB->value()); mSettings->setValue("tempBarWidth", ui->tempBarWidthSB->value()); @@ -154,7 +154,7 @@ void LxQtSensorsConfiguration::saveSettings() } -void LxQtSensorsConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtSensorsConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { @@ -168,7 +168,7 @@ void LxQtSensorsConfiguration::dialogButtonsAction(QAbstractButton *btn) } -void LxQtSensorsConfiguration::changeProgressBarColor() +void LXQtSensorsConfiguration::changeProgressBarColor() { QAbstractButton* btn = qobject_cast(sender()); @@ -186,12 +186,12 @@ void LxQtSensorsConfiguration::changeProgressBarColor() } else { - qDebug() << "LxQtSensorsConfiguration::changeProgressBarColor():" << "invalid button cast"; + qDebug() << "LXQtSensorsConfiguration::changeProgressBarColor():" << "invalid button cast"; } } -void LxQtSensorsConfiguration::detectedChipSelected(int index) +void LXQtSensorsConfiguration::detectedChipSelected(int index) { mSettings->beginGroup("chips"); QStringList chipNames = mSettings->childGroups(); diff --git a/plugin-sensors/lxqtsensorsconfiguration.h b/plugin-sensors/lxqtsensorsconfiguration.h index d2823c0..1fb74da 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.h +++ b/plugin-sensors/lxqtsensorsconfiguration.h @@ -37,21 +37,21 @@ namespace Ui { - class LxQtSensorsConfiguration; + class LXQtSensorsConfiguration; } -class LxQtSensorsConfiguration : public QDialog +class LXQtSensorsConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtSensorsConfiguration(QSettings *settings, QWidget *parent = 0); - ~LxQtSensorsConfiguration(); + explicit LXQtSensorsConfiguration(QSettings *settings, QWidget *parent = 0); + ~LXQtSensorsConfiguration(); private: - Ui::LxQtSensorsConfiguration *ui; + Ui::LXQtSensorsConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache oldSettings; + LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. diff --git a/plugin-sensors/lxqtsensorsconfiguration.ui b/plugin-sensors/lxqtsensorsconfiguration.ui index 2e9f3c7..5241ed2 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.ui +++ b/plugin-sensors/lxqtsensorsconfiguration.ui @@ -1,7 +1,7 @@ - LxQtSensorsConfiguration - + LXQtSensorsConfiguration + 0 @@ -207,7 +207,7 @@ buttons accepted() - LxQtSensorsConfiguration + LXQtSensorsConfiguration accept() @@ -223,7 +223,7 @@ buttons rejected() - LxQtSensorsConfiguration + LXQtSensorsConfiguration reject() diff --git a/plugin-sensors/lxqtsensorsplugin.cpp b/plugin-sensors/lxqtsensorsplugin.cpp index f6e4ae6..fb6c895 100644 --- a/plugin-sensors/lxqtsensorsplugin.cpp +++ b/plugin-sensors/lxqtsensorsplugin.cpp @@ -30,39 +30,39 @@ #include "lxqtsensorsconfiguration.h" -LxQtSensorsPlugin::LxQtSensorsPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtSensorsPlugin::LXQtSensorsPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), - mWidget(new LxQtSensors(this)) + ILXQtPanelPlugin(startupInfo), + mWidget(new LXQtSensors(this)) { } -LxQtSensorsPlugin::~LxQtSensorsPlugin() +LXQtSensorsPlugin::~LXQtSensorsPlugin() { delete mWidget; } -QWidget *LxQtSensorsPlugin::widget() +QWidget *LXQtSensorsPlugin::widget() { return mWidget; } -QDialog *LxQtSensorsPlugin::configureDialog() +QDialog *LXQtSensorsPlugin::configureDialog() { - return new LxQtSensorsConfiguration(settings()); + return new LXQtSensorsConfiguration(settings()); } -void LxQtSensorsPlugin::realign() +void LXQtSensorsPlugin::realign() { mWidget->realign(); } -void LxQtSensorsPlugin::settingsChanged() +void LXQtSensorsPlugin::settingsChanged() { mWidget->settingsChanged(); } diff --git a/plugin-sensors/lxqtsensorsplugin.h b/plugin-sensors/lxqtsensorsplugin.h index 678bb2e..60d58b8 100644 --- a/plugin-sensors/lxqtsensorsplugin.h +++ b/plugin-sensors/lxqtsensorsplugin.h @@ -33,16 +33,16 @@ #include -class LxQtSensors; +class LXQtSensors; -class LxQtSensorsPlugin: public QObject, public ILxQtPanelPlugin +class LXQtSensorsPlugin: public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - explicit LxQtSensorsPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtSensorsPlugin(); + explicit LXQtSensorsPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtSensorsPlugin(); - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual QWidget *widget(); virtual QString themeId() const { return "Sensors"; } @@ -55,19 +55,19 @@ protected: virtual void settingsChanged(); private: - LxQtSensors *mWidget; + LXQtSensors *mWidget; }; -class LxQtSensorsPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtSensorsPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtSensorsPlugin(startupInfo); + return new LXQtSensorsPlugin(startupInfo); } }; diff --git a/plugin-sensors/resources/sensors.desktop.in b/plugin-sensors/resources/sensors.desktop.in index 8d8e43e..89f46a6 100644 --- a/plugin-sensors/resources/sensors.desktop.in +++ b/plugin-sensors/resources/sensors.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors.ts b/plugin-sensors/translations/sensors.ts index 0509b2d..5264753 100644 --- a/plugin-sensors/translations/sensors.ts +++ b/plugin-sensors/translations/sensors.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_ar.desktop b/plugin-sensors/translations/sensors_ar.desktop index 53317de..4d5bd99 100644 --- a/plugin-sensors/translations/sensors_ar.desktop +++ b/plugin-sensors/translations/sensors_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ca.desktop b/plugin-sensors/translations/sensors_ca.desktop index 3a5aa64..d947714 100644 --- a/plugin-sensors/translations/sensors_ca.desktop +++ b/plugin-sensors/translations/sensors_ca.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ca.ts b/plugin-sensors/translations/sensors_ca.ts index 2be5bef..995d8ba 100644 --- a/plugin-sensors/translations/sensors_ca.ts +++ b/plugin-sensors/translations/sensors_ca.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_cs.desktop b/plugin-sensors/translations/sensors_cs.desktop index 8a4e3b1..5e4dfcf 100644 --- a/plugin-sensors/translations/sensors_cs.desktop +++ b/plugin-sensors/translations/sensors_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_cs.ts b/plugin-sensors/translations/sensors_cs.ts index 1394911..defdae2 100644 --- a/plugin-sensors/translations/sensors_cs.ts +++ b/plugin-sensors/translations/sensors_cs.ts @@ -2,9 +2,9 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings + LXQt Sensors Settings Nastavení čidel diff --git a/plugin-sensors/translations/sensors_cs_CZ.desktop b/plugin-sensors/translations/sensors_cs_CZ.desktop index 0a99921..18e443b 100644 --- a/plugin-sensors/translations/sensors_cs_CZ.desktop +++ b/plugin-sensors/translations/sensors_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_cs_CZ.ts b/plugin-sensors/translations/sensors_cs_CZ.ts index d0cf8e5..59de93d 100644 --- a/plugin-sensors/translations/sensors_cs_CZ.ts +++ b/plugin-sensors/translations/sensors_cs_CZ.ts @@ -2,9 +2,9 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings + LXQt Sensors Settings Nastavení čidel diff --git a/plugin-sensors/translations/sensors_da.desktop b/plugin-sensors/translations/sensors_da.desktop index c478888..0f768e1 100644 --- a/plugin-sensors/translations/sensors_da.desktop +++ b/plugin-sensors/translations/sensors_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_da_DK.desktop b/plugin-sensors/translations/sensors_da_DK.desktop index d7f1d6c..e0f78c4 100644 --- a/plugin-sensors/translations/sensors_da_DK.desktop +++ b/plugin-sensors/translations/sensors_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_da_DK.ts b/plugin-sensors/translations/sensors_da_DK.ts index 5194907..58101cf 100644 --- a/plugin-sensors/translations/sensors_da_DK.ts +++ b/plugin-sensors/translations/sensors_da_DK.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Indstillinger for LxQt Sensorer + LXQt Sensors Settings + Indstillinger for LXQt Sensorer diff --git a/plugin-sensors/translations/sensors_de.ts b/plugin-sensors/translations/sensors_de.ts index eb1dea4..45c053a 100644 --- a/plugin-sensors/translations/sensors_de.ts +++ b/plugin-sensors/translations/sensors_de.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_el.desktop b/plugin-sensors/translations/sensors_el.desktop new file mode 100644 index 0000000..e22bdc4 --- /dev/null +++ b/plugin-sensors/translations/sensors_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Αισθητήρες +Comment[el]=Προβολή ενδείξεων των αισθητήρων υλικού. diff --git a/plugin-sensors/translations/sensors_el_GR.ts b/plugin-sensors/translations/sensors_el.ts similarity index 90% rename from plugin-sensors/translations/sensors_el_GR.ts rename to plugin-sensors/translations/sensors_el.ts index 9ab37bd..6b25d1f 100644 --- a/plugin-sensors/translations/sensors_el_GR.ts +++ b/plugin-sensors/translations/sensors_el.ts @@ -1,16 +1,16 @@ - + - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Ρυθμίσεις αισθητήρων LxQt + LXQt Sensors Settings + Ρυθμίσεις αισθητήρων LXQt Sensors Settings - + Ρυθμίσεις αισθητήρων @@ -60,12 +60,12 @@ Detected chips: - Ανιχνευμένα + Ανιχνευμένα κυκλώματα: Chip features: - Χαρακτηριστικά κυκλώματος + Χαρακτηριστικά κυκλώματος: diff --git a/plugin-sensors/translations/sensors_el_GR.desktop b/plugin-sensors/translations/sensors_el_GR.desktop deleted file mode 100644 index 974d432..0000000 --- a/plugin-sensors/translations/sensors_el_GR.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Sensors -Comment=View readings from hardware sensors. - - -# Translations -Name[el_GR]=Αισθητήρες -Comment[el_GR]=Προβολή ενδείξεων αισθητήρων υλικού (τρέχον lm_sensors) diff --git a/plugin-sensors/translations/sensors_eo.desktop b/plugin-sensors/translations/sensors_eo.desktop index 03c33d9..fa44479 100644 --- a/plugin-sensors/translations/sensors_eo.desktop +++ b/plugin-sensors/translations/sensors_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_es.desktop b/plugin-sensors/translations/sensors_es.desktop index e584923..2713065 100644 --- a/plugin-sensors/translations/sensors_es.desktop +++ b/plugin-sensors/translations/sensors_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_es.ts b/plugin-sensors/translations/sensors_es.ts index 6b4036d..8151843 100644 --- a/plugin-sensors/translations/sensors_es.ts +++ b/plugin-sensors/translations/sensors_es.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Opciones de Sensores de LxQt + LXQt Sensors Settings + Opciones de Sensores de LXQt diff --git a/plugin-sensors/translations/sensors_es_VE.desktop b/plugin-sensors/translations/sensors_es_VE.desktop index 6eef263..eabbc9a 100644 --- a/plugin-sensors/translations/sensors_es_VE.desktop +++ b/plugin-sensors/translations/sensors_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_es_VE.ts b/plugin-sensors/translations/sensors_es_VE.ts index 46578b1..ccfac46 100644 --- a/plugin-sensors/translations/sensors_es_VE.ts +++ b/plugin-sensors/translations/sensors_es_VE.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - preferencias de sensor LxQt + LXQt Sensors Settings + preferencias de sensor LXQt diff --git a/plugin-sensors/translations/sensors_eu.desktop b/plugin-sensors/translations/sensors_eu.desktop index ff100cd..ad2a8bd 100644 --- a/plugin-sensors/translations/sensors_eu.desktop +++ b/plugin-sensors/translations/sensors_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_eu.ts b/plugin-sensors/translations/sensors_eu.ts index e247486..3e25448 100644 --- a/plugin-sensors/translations/sensors_eu.ts +++ b/plugin-sensors/translations/sensors_eu.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - LxQt sentsoreen ezarpenak + LXQt Sensors Settings + LXQt sentsoreen ezarpenak diff --git a/plugin-sensors/translations/sensors_fi.desktop b/plugin-sensors/translations/sensors_fi.desktop index f71dad5..c7f1958 100644 --- a/plugin-sensors/translations/sensors_fi.desktop +++ b/plugin-sensors/translations/sensors_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_fi.ts b/plugin-sensors/translations/sensors_fi.ts index 483bf94..5c0099d 100644 --- a/plugin-sensors/translations/sensors_fi.ts +++ b/plugin-sensors/translations/sensors_fi.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_fr_FR.desktop b/plugin-sensors/translations/sensors_fr_FR.desktop index 8c8bb4a..0763738 100644 --- a/plugin-sensors/translations/sensors_fr_FR.desktop +++ b/plugin-sensors/translations/sensors_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_fr_FR.ts b/plugin-sensors/translations/sensors_fr_FR.ts index e10e395..7c4c1c5 100644 --- a/plugin-sensors/translations/sensors_fr_FR.ts +++ b/plugin-sensors/translations/sensors_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_hu.desktop b/plugin-sensors/translations/sensors_hu.desktop index 0a041a6..c5b9d62 100644 --- a/plugin-sensors/translations/sensors_hu.desktop +++ b/plugin-sensors/translations/sensors_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_hu.ts b/plugin-sensors/translations/sensors_hu.ts index 610033c..1f31d68 100644 --- a/plugin-sensors/translations/sensors_hu.ts +++ b/plugin-sensors/translations/sensors_hu.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_hu_HU.ts b/plugin-sensors/translations/sensors_hu_HU.ts index e0deadc..5ca69cb 100644 --- a/plugin-sensors/translations/sensors_hu_HU.ts +++ b/plugin-sensors/translations/sensors_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_it_IT.desktop b/plugin-sensors/translations/sensors_it_IT.desktop index 928c30a..a54e68d 100644 --- a/plugin-sensors/translations/sensors_it_IT.desktop +++ b/plugin-sensors/translations/sensors_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_it_IT.ts b/plugin-sensors/translations/sensors_it_IT.ts index 180f6be..0edc8dd 100644 --- a/plugin-sensors/translations/sensors_it_IT.ts +++ b/plugin-sensors/translations/sensors_it_IT.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Impostazioni dei sensori di LxQt + LXQt Sensors Settings + Impostazioni dei sensori di LXQt diff --git a/plugin-sensors/translations/sensors_ja.desktop b/plugin-sensors/translations/sensors_ja.desktop index f9471f6..8a6a2a3 100644 --- a/plugin-sensors/translations/sensors_ja.desktop +++ b/plugin-sensors/translations/sensors_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ja.ts b/plugin-sensors/translations/sensors_ja.ts index 4ede2b0..34b310d 100644 --- a/plugin-sensors/translations/sensors_ja.ts +++ b/plugin-sensors/translations/sensors_ja.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_lt.desktop b/plugin-sensors/translations/sensors_lt.desktop index 87d5565..ea30d5b 100644 --- a/plugin-sensors/translations/sensors_lt.desktop +++ b/plugin-sensors/translations/sensors_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_nl.desktop b/plugin-sensors/translations/sensors_nl.desktop index dd33760..c6e2c24 100644 --- a/plugin-sensors/translations/sensors_nl.desktop +++ b/plugin-sensors/translations/sensors_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_pl_PL.desktop b/plugin-sensors/translations/sensors_pl_PL.desktop index 42bf567..760269d 100644 --- a/plugin-sensors/translations/sensors_pl_PL.desktop +++ b/plugin-sensors/translations/sensors_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_pl_PL.ts b/plugin-sensors/translations/sensors_pl_PL.ts index 1d616ca..0c11504 100644 --- a/plugin-sensors/translations/sensors_pl_PL.ts +++ b/plugin-sensors/translations/sensors_pl_PL.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Ustawienia LxQt Sensors + LXQt Sensors Settings + Ustawienia LXQt Sensors diff --git a/plugin-sensors/translations/sensors_pt.desktop b/plugin-sensors/translations/sensors_pt.desktop index 88a4ae2..ab865a2 100644 --- a/plugin-sensors/translations/sensors_pt.desktop +++ b/plugin-sensors/translations/sensors_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_pt.ts b/plugin-sensors/translations/sensors_pt.ts index e16dcf6..ecd3e8d 100644 --- a/plugin-sensors/translations/sensors_pt.ts +++ b/plugin-sensors/translations/sensors_pt.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Definições dos sensores do LxQt + LXQt Sensors Settings + Definições dos sensores do LXQt diff --git a/plugin-sensors/translations/sensors_pt_BR.desktop b/plugin-sensors/translations/sensors_pt_BR.desktop index 7e68f5d..3b87da0 100644 --- a/plugin-sensors/translations/sensors_pt_BR.desktop +++ b/plugin-sensors/translations/sensors_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_pt_BR.ts b/plugin-sensors/translations/sensors_pt_BR.ts index 355723a..f14afea 100644 --- a/plugin-sensors/translations/sensors_pt_BR.ts +++ b/plugin-sensors/translations/sensors_pt_BR.ts @@ -2,9 +2,9 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings + LXQt Sensors Settings Configuraçoes Dos Sensores diff --git a/plugin-sensors/translations/sensors_ro_RO.desktop b/plugin-sensors/translations/sensors_ro_RO.desktop index e2338d9..9ce9441 100644 --- a/plugin-sensors/translations/sensors_ro_RO.desktop +++ b/plugin-sensors/translations/sensors_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ro_RO.ts b/plugin-sensors/translations/sensors_ro_RO.ts index c15eb19..e1884b6 100644 --- a/plugin-sensors/translations/sensors_ro_RO.ts +++ b/plugin-sensors/translations/sensors_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_ru.desktop b/plugin-sensors/translations/sensors_ru.desktop index 7318586..2d9b986 100644 --- a/plugin-sensors/translations/sensors_ru.desktop +++ b/plugin-sensors/translations/sensors_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ru.ts b/plugin-sensors/translations/sensors_ru.ts index 292f093..ba47cfd 100644 --- a/plugin-sensors/translations/sensors_ru.ts +++ b/plugin-sensors/translations/sensors_ru.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_ru_RU.desktop b/plugin-sensors/translations/sensors_ru_RU.desktop index d87797a..8c01516 100644 --- a/plugin-sensors/translations/sensors_ru_RU.desktop +++ b/plugin-sensors/translations/sensors_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_ru_RU.ts b/plugin-sensors/translations/sensors_ru_RU.ts index e71a227..5a2848d 100644 --- a/plugin-sensors/translations/sensors_ru_RU.ts +++ b/plugin-sensors/translations/sensors_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration Sensors Settings diff --git a/plugin-sensors/translations/sensors_sl.desktop b/plugin-sensors/translations/sensors_sl.desktop index 8f19cd7..dfcf55f 100644 --- a/plugin-sensors/translations/sensors_sl.desktop +++ b/plugin-sensors/translations/sensors_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_th_TH.desktop b/plugin-sensors/translations/sensors_th_TH.desktop index 08619d6..b2bd9c1 100644 --- a/plugin-sensors/translations/sensors_th_TH.desktop +++ b/plugin-sensors/translations/sensors_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_th_TH.ts b/plugin-sensors/translations/sensors_th_TH.ts index 8e97b20..66e914e 100644 --- a/plugin-sensors/translations/sensors_th_TH.ts +++ b/plugin-sensors/translations/sensors_th_TH.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - ค่าตั้งตัวตรวจจับ LxQt + LXQt Sensors Settings + ค่าตั้งตัวตรวจจับ LXQt diff --git a/plugin-sensors/translations/sensors_tr.desktop b/plugin-sensors/translations/sensors_tr.desktop index 1a7aad7..7f3b371 100644 --- a/plugin-sensors/translations/sensors_tr.desktop +++ b/plugin-sensors/translations/sensors_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_uk.desktop b/plugin-sensors/translations/sensors_uk.desktop index 761bef9..4d5763f 100644 --- a/plugin-sensors/translations/sensors_uk.desktop +++ b/plugin-sensors/translations/sensors_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_uk.ts b/plugin-sensors/translations/sensors_uk.ts index 30d6a98..fcb27d0 100644 --- a/plugin-sensors/translations/sensors_uk.ts +++ b/plugin-sensors/translations/sensors_uk.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - Налаштування сенсорів LxQt + LXQt Sensors Settings + Налаштування сенсорів LXQt diff --git a/plugin-sensors/translations/sensors_zh_CN.desktop b/plugin-sensors/translations/sensors_zh_CN.desktop index 4c5edfc..547140a 100644 --- a/plugin-sensors/translations/sensors_zh_CN.desktop +++ b/plugin-sensors/translations/sensors_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_zh_CN.ts b/plugin-sensors/translations/sensors_zh_CN.ts index e3b8010..58ebf12 100644 --- a/plugin-sensors/translations/sensors_zh_CN.ts +++ b/plugin-sensors/translations/sensors_zh_CN.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - LxQt 监测器设置 + LXQt Sensors Settings + LXQt 监测器设置 diff --git a/plugin-sensors/translations/sensors_zh_TW.desktop b/plugin-sensors/translations/sensors_zh_TW.desktop index d132394..63b2056 100644 --- a/plugin-sensors/translations/sensors_zh_TW.desktop +++ b/plugin-sensors/translations/sensors_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Sensors Comment=View readings from hardware sensors. diff --git a/plugin-sensors/translations/sensors_zh_TW.ts b/plugin-sensors/translations/sensors_zh_TW.ts index 428d7c2..5857223 100644 --- a/plugin-sensors/translations/sensors_zh_TW.ts +++ b/plugin-sensors/translations/sensors_zh_TW.ts @@ -2,10 +2,10 @@ - LxQtSensorsConfiguration + LXQtSensorsConfiguration - LxQt Sensors Settings - LxQt溫度感應設定 + LXQt Sensors Settings + LXQt溫度感應設定 diff --git a/plugin-showdesktop/resources/showdesktop.desktop.in b/plugin-showdesktop/resources/showdesktop.desktop.in index 3c69e51..c59915d 100644 --- a/plugin-showdesktop/resources/showdesktop.desktop.in +++ b/plugin-showdesktop/resources/showdesktop.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop Icon=user-desktop diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp index aa76831..461b9a4 100644 --- a/plugin-showdesktop/showdesktop.cpp +++ b/plugin-showdesktop/showdesktop.cpp @@ -41,9 +41,9 @@ #define DEFAULT_SHORTCUT "Control+Alt+D" -ShowDesktop::ShowDesktop(const ILxQtPanelPluginStartupInfo &startupInfo) : +ShowDesktop::ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { m_key = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/show_hide").arg(settings()->group()), tr("Show desktop"), this); if (m_key) @@ -66,7 +66,7 @@ void ShowDesktop::shortcutRegistered() m_key->changeShortcut(DEFAULT_SHORTCUT); if (m_key->shortcut().isEmpty()) { - LxQt::Notification::notify(tr("Show Desktop: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); + LXQt::Notification::notify(tr("Show Desktop: Global shortcut '%1' cannot be registered").arg(DEFAULT_SHORTCUT)); } } } diff --git a/plugin-showdesktop/showdesktop.h b/plugin-showdesktop/showdesktop.h index 4e1e9a1..4d5c4b4 100644 --- a/plugin-showdesktop/showdesktop.h +++ b/plugin-showdesktop/showdesktop.h @@ -38,12 +38,12 @@ namespace GlobalKeyShortcut class Action; } -class ShowDesktop : public QObject, public ILxQtPanelPlugin +class ShowDesktop : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - ShowDesktop(const ILxQtPanelPluginStartupInfo &startupInfo); + ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mButton; } virtual QString themeId() const { return "ShowDesktop"; } @@ -58,13 +58,13 @@ private: QToolButton mButton; }; -class ShowDesktopLibrary: public QObject, public ILxQtPanelPluginLibrary +class ShowDesktopLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new ShowDesktop(startupInfo); } diff --git a/plugin-showdesktop/translations/showdesktop_ar.desktop b/plugin-showdesktop/translations/showdesktop_ar.desktop index a69d729..40ba49d 100644 --- a/plugin-showdesktop/translations/showdesktop_ar.desktop +++ b/plugin-showdesktop/translations/showdesktop_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_cs.desktop b/plugin-showdesktop/translations/showdesktop_cs.desktop index 0293bb5..8f93895 100644 --- a/plugin-showdesktop/translations/showdesktop_cs.desktop +++ b/plugin-showdesktop/translations/showdesktop_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_cs_CZ.desktop b/plugin-showdesktop/translations/showdesktop_cs_CZ.desktop index 5bd303e..0c01bea 100644 --- a/plugin-showdesktop/translations/showdesktop_cs_CZ.desktop +++ b/plugin-showdesktop/translations/showdesktop_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_da.desktop b/plugin-showdesktop/translations/showdesktop_da.desktop index 20cfdf6..703165d 100644 --- a/plugin-showdesktop/translations/showdesktop_da.desktop +++ b/plugin-showdesktop/translations/showdesktop_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_da_DK.desktop b/plugin-showdesktop/translations/showdesktop_da_DK.desktop index a344476..e1314c8 100644 --- a/plugin-showdesktop/translations/showdesktop_da_DK.desktop +++ b/plugin-showdesktop/translations/showdesktop_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_el.desktop b/plugin-showdesktop/translations/showdesktop_el.desktop new file mode 100644 index 0000000..a6418db --- /dev/null +++ b/plugin-showdesktop/translations/showdesktop_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Εμφάνιση επιφάνειας εργασίας +Comment[el]=Ελαχιστοποίηση όλων των παραθύρων και εμφάνιση της επιφάνειας εργασίας diff --git a/plugin-showdesktop/translations/showdesktop_el_GR.ts b/plugin-showdesktop/translations/showdesktop_el.ts similarity index 87% rename from plugin-showdesktop/translations/showdesktop_el_GR.ts rename to plugin-showdesktop/translations/showdesktop_el.ts index 27c2144..a0af6d4 100644 --- a/plugin-showdesktop/translations/showdesktop_el_GR.ts +++ b/plugin-showdesktop/translations/showdesktop_el.ts @@ -1,12 +1,12 @@ - + ShowDesktop Show desktop - + Εμφάνιση επιφάνειας εργασίας diff --git a/plugin-showdesktop/translations/showdesktop_el_GR.desktop b/plugin-showdesktop/translations/showdesktop_el_GR.desktop deleted file mode 100644 index d0db21b..0000000 --- a/plugin-showdesktop/translations/showdesktop_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Show desktop -Comment=Minimize all windows and show the desktop - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Ελαχιστοποίηση όλων των παραθύρων και εμφάνιση της επιφάνειας εργασίας -Name[el_GR]=Εμφάνιση επιφάνειας εργασίας diff --git a/plugin-showdesktop/translations/showdesktop_eo.desktop b/plugin-showdesktop/translations/showdesktop_eo.desktop index 6e5cccd..35ac778 100644 --- a/plugin-showdesktop/translations/showdesktop_eo.desktop +++ b/plugin-showdesktop/translations/showdesktop_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_es.desktop b/plugin-showdesktop/translations/showdesktop_es.desktop index 69340c4..288be02 100644 --- a/plugin-showdesktop/translations/showdesktop_es.desktop +++ b/plugin-showdesktop/translations/showdesktop_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_es_VE.desktop b/plugin-showdesktop/translations/showdesktop_es_VE.desktop index 431d545..708afc2 100644 --- a/plugin-showdesktop/translations/showdesktop_es_VE.desktop +++ b/plugin-showdesktop/translations/showdesktop_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_eu.desktop b/plugin-showdesktop/translations/showdesktop_eu.desktop index 5cd784d..1950855 100644 --- a/plugin-showdesktop/translations/showdesktop_eu.desktop +++ b/plugin-showdesktop/translations/showdesktop_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_fi.desktop b/plugin-showdesktop/translations/showdesktop_fi.desktop index 7aea315..cf32c16 100644 --- a/plugin-showdesktop/translations/showdesktop_fi.desktop +++ b/plugin-showdesktop/translations/showdesktop_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_fr_FR.desktop b/plugin-showdesktop/translations/showdesktop_fr_FR.desktop index 83710dd..b613cb5 100644 --- a/plugin-showdesktop/translations/showdesktop_fr_FR.desktop +++ b/plugin-showdesktop/translations/showdesktop_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_hu.desktop b/plugin-showdesktop/translations/showdesktop_hu.desktop index c52c3ff..e1c0e11 100644 --- a/plugin-showdesktop/translations/showdesktop_hu.desktop +++ b/plugin-showdesktop/translations/showdesktop_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ia.desktop b/plugin-showdesktop/translations/showdesktop_ia.desktop index 6b0d1ac..cce7114 100644 --- a/plugin-showdesktop/translations/showdesktop_ia.desktop +++ b/plugin-showdesktop/translations/showdesktop_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show Desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_id_ID.desktop b/plugin-showdesktop/translations/showdesktop_id_ID.desktop index 9287947..2a3103f 100644 --- a/plugin-showdesktop/translations/showdesktop_id_ID.desktop +++ b/plugin-showdesktop/translations/showdesktop_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_it_IT.desktop b/plugin-showdesktop/translations/showdesktop_it_IT.desktop index 1b6bd6e..6d85106 100644 --- a/plugin-showdesktop/translations/showdesktop_it_IT.desktop +++ b/plugin-showdesktop/translations/showdesktop_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ja.desktop b/plugin-showdesktop/translations/showdesktop_ja.desktop index 04c5c2f..540c43b 100644 --- a/plugin-showdesktop/translations/showdesktop_ja.desktop +++ b/plugin-showdesktop/translations/showdesktop_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ko.desktop b/plugin-showdesktop/translations/showdesktop_ko.desktop index 6b0d1ac..cce7114 100644 --- a/plugin-showdesktop/translations/showdesktop_ko.desktop +++ b/plugin-showdesktop/translations/showdesktop_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show Desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_lt.desktop b/plugin-showdesktop/translations/showdesktop_lt.desktop index aab7a00..c84e63f 100644 --- a/plugin-showdesktop/translations/showdesktop_lt.desktop +++ b/plugin-showdesktop/translations/showdesktop_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_nl.desktop b/plugin-showdesktop/translations/showdesktop_nl.desktop index d6e909f..b10904f 100644 --- a/plugin-showdesktop/translations/showdesktop_nl.desktop +++ b/plugin-showdesktop/translations/showdesktop_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_pl.desktop b/plugin-showdesktop/translations/showdesktop_pl.desktop index ac0fbc9..6b1f111 100644 --- a/plugin-showdesktop/translations/showdesktop_pl.desktop +++ b/plugin-showdesktop/translations/showdesktop_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_pl_PL.desktop b/plugin-showdesktop/translations/showdesktop_pl_PL.desktop index c99a9b3..c4eb4c0 100644 --- a/plugin-showdesktop/translations/showdesktop_pl_PL.desktop +++ b/plugin-showdesktop/translations/showdesktop_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_pt.desktop b/plugin-showdesktop/translations/showdesktop_pt.desktop index accd4e7..95a6ba1 100644 --- a/plugin-showdesktop/translations/showdesktop_pt.desktop +++ b/plugin-showdesktop/translations/showdesktop_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_pt_BR.desktop b/plugin-showdesktop/translations/showdesktop_pt_BR.desktop index 6026f06..9f922c5 100644 --- a/plugin-showdesktop/translations/showdesktop_pt_BR.desktop +++ b/plugin-showdesktop/translations/showdesktop_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ro_RO.desktop b/plugin-showdesktop/translations/showdesktop_ro_RO.desktop index 233de18..b8ffbb7 100644 --- a/plugin-showdesktop/translations/showdesktop_ro_RO.desktop +++ b/plugin-showdesktop/translations/showdesktop_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ru.desktop b/plugin-showdesktop/translations/showdesktop_ru.desktop index 531038e..99485f3 100644 --- a/plugin-showdesktop/translations/showdesktop_ru.desktop +++ b/plugin-showdesktop/translations/showdesktop_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_ru_RU.desktop b/plugin-showdesktop/translations/showdesktop_ru_RU.desktop index 1568456..dcca717 100644 --- a/plugin-showdesktop/translations/showdesktop_ru_RU.desktop +++ b/plugin-showdesktop/translations/showdesktop_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_sk.desktop b/plugin-showdesktop/translations/showdesktop_sk.desktop index 8ca0f81..a783421 100644 --- a/plugin-showdesktop/translations/showdesktop_sk.desktop +++ b/plugin-showdesktop/translations/showdesktop_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_sl.desktop b/plugin-showdesktop/translations/showdesktop_sl.desktop index 3c81888..dd1d9b4 100644 --- a/plugin-showdesktop/translations/showdesktop_sl.desktop +++ b/plugin-showdesktop/translations/showdesktop_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_sr.desktop b/plugin-showdesktop/translations/showdesktop_sr.desktop index 78f7d5a..6f79038 100644 --- a/plugin-showdesktop/translations/showdesktop_sr.desktop +++ b/plugin-showdesktop/translations/showdesktop_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_sr@latin.desktop b/plugin-showdesktop/translations/showdesktop_sr@latin.desktop index 3a76132..5bd74d8 100644 --- a/plugin-showdesktop/translations/showdesktop_sr@latin.desktop +++ b/plugin-showdesktop/translations/showdesktop_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_th_TH.desktop b/plugin-showdesktop/translations/showdesktop_th_TH.desktop index 6a6a97d..a379732 100644 --- a/plugin-showdesktop/translations/showdesktop_th_TH.desktop +++ b/plugin-showdesktop/translations/showdesktop_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_tr.desktop b/plugin-showdesktop/translations/showdesktop_tr.desktop index e54558f..76c0cfb 100644 --- a/plugin-showdesktop/translations/showdesktop_tr.desktop +++ b/plugin-showdesktop/translations/showdesktop_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_uk.desktop b/plugin-showdesktop/translations/showdesktop_uk.desktop index dbe032e..aec8624 100644 --- a/plugin-showdesktop/translations/showdesktop_uk.desktop +++ b/plugin-showdesktop/translations/showdesktop_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_zh_CN.GB2312.desktop b/plugin-showdesktop/translations/showdesktop_zh_CN.GB2312.desktop index 6b0d1ac..cce7114 100644 --- a/plugin-showdesktop/translations/showdesktop_zh_CN.GB2312.desktop +++ b/plugin-showdesktop/translations/showdesktop_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show Desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_zh_CN.desktop b/plugin-showdesktop/translations/showdesktop_zh_CN.desktop index 405e95e..94fb58a 100644 --- a/plugin-showdesktop/translations/showdesktop_zh_CN.desktop +++ b/plugin-showdesktop/translations/showdesktop_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-showdesktop/translations/showdesktop_zh_TW.desktop b/plugin-showdesktop/translations/showdesktop_zh_TW.desktop index e3bc0e3..80ff942 100644 --- a/plugin-showdesktop/translations/showdesktop_zh_TW.desktop +++ b/plugin-showdesktop/translations/showdesktop_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Show desktop Comment=Minimize all windows and show the desktop diff --git a/plugin-spacer/resources/spacer.desktop.in b/plugin-spacer/resources/spacer.desktop.in index 6654498..711bb68 100644 --- a/plugin-spacer/resources/spacer.desktop.in +++ b/plugin-spacer/resources/spacer.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Spacer Comment=Space between widgets Icon=bookmark-new diff --git a/plugin-spacer/spacer.cpp b/plugin-spacer/spacer.cpp index 49ebad7..0cb2987 100644 --- a/plugin-spacer/spacer.cpp +++ b/plugin-spacer/spacer.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it @@ -51,9 +51,9 @@ void SpacerWidget::setOrientation(QString const & orientation) /************************************************ ************************************************/ -Spacer::Spacer(const ILxQtPanelPluginStartupInfo &startupInfo) : +Spacer::Spacer(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject() - , ILxQtPanelPlugin(startupInfo) + , ILXQtPanelPlugin(startupInfo) , mSize(8) { settingsChanged(); diff --git a/plugin-spacer/spacer.h b/plugin-spacer/spacer.h index 9fec1e0..a104cb9 100644 --- a/plugin-spacer/spacer.h +++ b/plugin-spacer/spacer.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it @@ -50,19 +50,19 @@ private: QString mOrientation; }; -class Spacer : public QObject, public ILxQtPanelPlugin +class Spacer : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - Spacer(const ILxQtPanelPluginStartupInfo &startupInfo); + Spacer(const ILXQtPanelPluginStartupInfo &startupInfo); virtual QWidget *widget() { return &mSpacer; } virtual QString themeId() const { return "Spacer"; } bool isSeparate() const { return true; } - virtual ILxQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } QDialog *configureDialog(); virtual void realign(); @@ -78,13 +78,13 @@ private: int mSize; }; -class SpacerPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class SpacerPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new Spacer(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new Spacer(startupInfo);} }; #endif diff --git a/plugin-spacer/spacerconfiguration.cpp b/plugin-spacer/spacerconfiguration.cpp index 60002ae..22fe346 100644 --- a/plugin-spacer/spacerconfiguration.cpp +++ b/plugin-spacer/spacerconfiguration.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it diff --git a/plugin-spacer/spacerconfiguration.h b/plugin-spacer/spacerconfiguration.h index def3410..dff712c 100644 --- a/plugin-spacer/spacerconfiguration.h +++ b/plugin-spacer/spacerconfiguration.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * * This program or library is free software; you can redistribute it diff --git a/plugin-spacer/translations/spacer_el.desktop b/plugin-spacer/translations/spacer_el.desktop new file mode 100644 index 0000000..40f0c9d --- /dev/null +++ b/plugin-spacer/translations/spacer_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Διάστημα +Comment[el]=Διάστημα μεταξύ των γραφικών συστατικών diff --git a/plugin-spacer/translations/spacer_el.ts b/plugin-spacer/translations/spacer_el.ts new file mode 100644 index 0000000..3ef1a51 --- /dev/null +++ b/plugin-spacer/translations/spacer_el.ts @@ -0,0 +1,37 @@ + + + + + SpacerConfiguration + + + Spacer Settings + Ρυθμίσεις διαστήματος + + + + Space width: + Πλάτος διαστήματος: + + + + Space type: + Τύπος διαστήματος: + + + + lined + με γραμμές + + + + dotted + διάστικτο + + + + invisible + αόρατο + + + diff --git a/plugin-statusnotifier/dbustypes.cpp b/plugin-statusnotifier/dbustypes.cpp index f4b345d..758bfed 100644 --- a/plugin-statusnotifier/dbustypes.cpp +++ b/plugin-statusnotifier/dbustypes.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/dbustypes.h b/plugin-statusnotifier/dbustypes.h index ecdb220..c3bce21 100644 --- a/plugin-statusnotifier/dbustypes.h +++ b/plugin-statusnotifier/dbustypes.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/resources/statusnotifier.desktop.in b/plugin-statusnotifier/resources/statusnotifier.desktop.in index 66a4bc0..7302dc6 100644 --- a/plugin-statusnotifier/resources/statusnotifier.desktop.in +++ b/plugin-statusnotifier/resources/statusnotifier.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Status Notifier Plugin Comment=Status Notifier Plugin Icon=go-bottom diff --git a/plugin-statusnotifier/statusnotifier.cpp b/plugin-statusnotifier/statusnotifier.cpp index 0d80484..1c5bcd3 100644 --- a/plugin-statusnotifier/statusnotifier.cpp +++ b/plugin-statusnotifier/statusnotifier.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -28,9 +28,9 @@ #include "statusnotifier.h" -StatusNotifier::StatusNotifier(const ILxQtPanelPluginStartupInfo &startupInfo) : +StatusNotifier::StatusNotifier(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { m_widget = new StatusNotifierWidget(this); } diff --git a/plugin-statusnotifier/statusnotifier.h b/plugin-statusnotifier/statusnotifier.h index 93aed9e..7692192 100644 --- a/plugin-statusnotifier/statusnotifier.h +++ b/plugin-statusnotifier/statusnotifier.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -32,11 +32,11 @@ #include "../panel/ilxqtpanelplugin.h" #include "statusnotifierwidget.h" -class StatusNotifier : public QObject, public ILxQtPanelPlugin +class StatusNotifier : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - StatusNotifier(const ILxQtPanelPluginStartupInfo &startupInfo); + StatusNotifier(const ILXQtPanelPluginStartupInfo &startupInfo); bool isSeparate() const { return true; } void realign(); @@ -48,13 +48,13 @@ private: StatusNotifierWidget *m_widget; }; -class StatusNotifierLibrary : public QObject, public ILxQtPanelPluginLibrary +class StatusNotifierLibrary : public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new StatusNotifier(startupInfo); } diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp index 525b043..a318c99 100644 --- a/plugin-statusnotifier/statusnotifierbutton.cpp +++ b/plugin-statusnotifier/statusnotifierbutton.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -34,7 +34,7 @@ #include "../panel/ilxqtpanelplugin.h" -StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath, ILxQtPanelPlugin* plugin, QWidget *parent) +StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent) : QToolButton(parent), mMenu(NULL), mStatus(Passive), @@ -222,7 +222,7 @@ void StatusNotifierButton::mouseReleaseEvent(QMouseEvent *event) else if (event->button() == Qt::MidButton) interface->SecondaryActivate(QCursor::pos().x(), QCursor::pos().y()); else if (Qt::RightButton == event->button()) - mMenu->popup(mPlugin->calculatePopupWindowPos(mMenu->sizeHint()).topLeft()); + mMenu->popup(QCursor::pos()); QToolButton::mouseReleaseEvent(event); } diff --git a/plugin-statusnotifier/statusnotifierbutton.h b/plugin-statusnotifier/statusnotifierbutton.h index ea0da60..8df67a6 100644 --- a/plugin-statusnotifier/statusnotifierbutton.h +++ b/plugin-statusnotifier/statusnotifierbutton.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -49,14 +49,14 @@ template inline T qFromUnaligned(const uchar *src) } #endif -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; class StatusNotifierButton : public QToolButton { Q_OBJECT public: - StatusNotifierButton(QString service, QString objectPath, ILxQtPanelPlugin* plugin, QWidget *parent = 0); + StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent = 0); ~StatusNotifierButton(); bool isValid() const { return mValid; } @@ -81,7 +81,7 @@ private: QIcon mIcon, mOverlayIcon, mAttentionIcon, mFallbackIcon; - ILxQtPanelPlugin* mPlugin; + ILXQtPanelPlugin* mPlugin; protected: void contextMenuEvent(QContextMenuEvent * event); diff --git a/plugin-statusnotifier/statusnotifieriteminterface.cpp b/plugin-statusnotifier/statusnotifieriteminterface.cpp index ad8fbda..8c388eb 100644 --- a/plugin-statusnotifier/statusnotifieriteminterface.cpp +++ b/plugin-statusnotifier/statusnotifieriteminterface.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/statusnotifieriteminterface.h b/plugin-statusnotifier/statusnotifieriteminterface.h index a1417b1..fd5854e 100644 --- a/plugin-statusnotifier/statusnotifieriteminterface.h +++ b/plugin-statusnotifier/statusnotifieriteminterface.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/statusnotifierwatcher.cpp b/plugin-statusnotifier/statusnotifierwatcher.cpp index 4fcfa2e..f23cd4e 100644 --- a/plugin-statusnotifier/statusnotifierwatcher.cpp +++ b/plugin-statusnotifier/statusnotifierwatcher.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/statusnotifierwatcher.h b/plugin-statusnotifier/statusnotifierwatcher.h index 0c2be8a..c322eca 100644 --- a/plugin-statusnotifier/statusnotifierwatcher.h +++ b/plugin-statusnotifier/statusnotifierwatcher.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier diff --git a/plugin-statusnotifier/statusnotifierwidget.cpp b/plugin-statusnotifier/statusnotifierwidget.cpp index 8a569ee..1a85023 100644 --- a/plugin-statusnotifier/statusnotifierwidget.cpp +++ b/plugin-statusnotifier/statusnotifierwidget.cpp @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -30,7 +30,7 @@ #include #include "../panel/ilxqtpanelplugin.h" -StatusNotifierWidget::StatusNotifierWidget(ILxQtPanelPlugin *plugin, QWidget *parent) : +StatusNotifierWidget::StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent) : QWidget(parent), mPlugin(plugin) { @@ -46,7 +46,7 @@ StatusNotifierWidget::StatusNotifierWidget(ILxQtPanelPlugin *plugin, QWidget *pa connect(mWatcher, &StatusNotifierWatcher::StatusNotifierItemUnregistered, this, &StatusNotifierWidget::itemRemoved); - setLayout(new LxQt::GridLayout(this)); + setLayout(new LXQt::GridLayout(this)); realign(); qDebug() << mWatcher->RegisteredStatusNotifierItems(); @@ -83,10 +83,10 @@ void StatusNotifierWidget::itemRemoved(const QString &serviceAndPath) void StatusNotifierWidget::realign() { - LxQt::GridLayout *layout = qobject_cast(this->layout()); + LXQt::GridLayout *layout = qobject_cast(this->layout()); layout->setEnabled(false); - ILxQtPanel *panel = mPlugin->panel(); + ILXQtPanel *panel = mPlugin->panel(); if (panel->isHorizontal()) { layout->setRowCount(panel->lineCount()); diff --git a/plugin-statusnotifier/statusnotifierwidget.h b/plugin-statusnotifier/statusnotifierwidget.h index 35e303a..1396f40 100644 --- a/plugin-statusnotifier/statusnotifierwidget.h +++ b/plugin-statusnotifier/statusnotifierwidget.h @@ -4,7 +4,7 @@ * LXDE-Qt - a lightweight, Qt based, desktop toolset * http://lxqt.org * - * Copyright: 2015 LxQt team + * Copyright: 2015 LXQt team * Authors: * Balázs Béla * Paulo Lieuthier @@ -41,7 +41,7 @@ class StatusNotifierWidget : public QWidget Q_OBJECT public: - StatusNotifierWidget(ILxQtPanelPlugin *plugin, QWidget *parent = 0); + StatusNotifierWidget(ILXQtPanelPlugin *plugin, QWidget *parent = 0); signals: @@ -52,7 +52,7 @@ public slots: void realign(); private: - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; StatusNotifierWatcher *mWatcher; QHash mServices; diff --git a/plugin-statusnotifier/translations/statusnotifier_el.desktop b/plugin-statusnotifier/translations/statusnotifier_el.desktop new file mode 100644 index 0000000..111b2c4 --- /dev/null +++ b/plugin-statusnotifier/translations/statusnotifier_el.desktop @@ -0,0 +1,3 @@ +Name[el]=Πρόσθετο ειδοποίησης κατάστασης +Comment[el]=Πρόσθετο ειδοποίησης κατάστασης + diff --git a/plugin-sysstat/lxqtsysstat.cpp b/plugin-sysstat/lxqtsysstat.cpp index ee6c020..acfea6c 100644 --- a/plugin-sysstat/lxqtsysstat.cpp +++ b/plugin-sysstat/lxqtsysstat.cpp @@ -39,12 +39,12 @@ #include #include -LxQtSysStat::LxQtSysStat(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtSysStat::LXQtSysStat(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mWidget(new QWidget()), - mFakeTitle(new LxQtSysStatTitle(mWidget)), - mContent(new LxQtSysStatContent(this, mWidget)) + mFakeTitle(new LXQtSysStatTitle(mWidget)), + mContent(new LXQtSysStatContent(this, mWidget)) { QVBoxLayout *borderLayout = new QVBoxLayout(mWidget); borderLayout->setContentsMargins(0, 0, 0, 0); @@ -61,24 +61,24 @@ LxQtSysStat::LxQtSysStat(const ILxQtPanelPluginStartupInfo &startupInfo): QTimer::singleShot(0, this, SLOT(lateInit())); } -LxQtSysStat::~LxQtSysStat() +LXQtSysStat::~LXQtSysStat() { delete mWidget; } -void LxQtSysStat::lateInit() +void LXQtSysStat::lateInit() { settingsChanged(); mContent->setTitleFont(mFakeTitle->font()); mSize = mContent->size(); } -QDialog *LxQtSysStat::configureDialog() +QDialog *LXQtSysStat::configureDialog() { - return new LxQtSysStatConfiguration(settings(), mWidget); + return new LXQtSysStatConfiguration(settings(), mWidget); } -void LxQtSysStat::realign() +void LXQtSysStat::realign() { QSize newSize = mContent->size(); if (mSize != newSize) @@ -88,23 +88,23 @@ void LxQtSysStat::realign() } } -void LxQtSysStat::settingsChanged() +void LXQtSysStat::settingsChanged() { mContent->updateSettings(settings()); } -LxQtSysStatTitle::LxQtSysStatTitle(QWidget *parent): +LXQtSysStatTitle::LXQtSysStatTitle(QWidget *parent): QLabel(parent) { } -LxQtSysStatTitle::~LxQtSysStatTitle() +LXQtSysStatTitle::~LXQtSysStatTitle() { } -bool LxQtSysStatTitle::event(QEvent *e) +bool LXQtSysStatTitle::event(QEvent *e) { if (e->type() == QEvent::FontChange) emit fontChanged(font()); @@ -112,7 +112,7 @@ bool LxQtSysStatTitle::event(QEvent *e) return QLabel::event(e); } -LxQtSysStatContent::LxQtSysStatContent(ILxQtPanelPlugin *plugin, QWidget *parent): +LXQtSysStatContent::LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent): QWidget(parent), mPlugin(plugin), mStat(NULL), @@ -125,7 +125,7 @@ LxQtSysStatContent::LxQtSysStatContent(ILxQtPanelPlugin *plugin, QWidget *parent setObjectName("SysStat_Graph"); } -LxQtSysStatContent::~LxQtSysStatContent() +LXQtSysStatContent::~LXQtSysStatContent() { } @@ -134,7 +134,7 @@ LxQtSysStatContent::~LxQtSysStatContent() #undef QSS_GET_COLOUR #define QSS_GET_COLOUR(GETNAME) \ -QColor LxQtSysStatContent::GETNAME##Colour() const \ +QColor LXQtSysStatContent::GETNAME##Colour() const \ { \ return mThemeColours.GETNAME##Colour; \ } @@ -142,7 +142,7 @@ QColor LxQtSysStatContent::GETNAME##Colour() const \ #undef QSS_COLOUR #define QSS_COLOUR(GETNAME, SETNAME) \ QSS_GET_COLOUR(GETNAME) \ -void LxQtSysStatContent::SETNAME##Colour(QColor value) \ +void LXQtSysStatContent::SETNAME##Colour(QColor value) \ { \ mThemeColours.GETNAME##Colour = value; \ if (mUseThemeColours) \ @@ -152,7 +152,7 @@ void LxQtSysStatContent::SETNAME##Colour(QColor value) \ #undef QSS_NET_COLOUR #define QSS_NET_COLOUR(GETNAME, SETNAME) \ QSS_GET_COLOUR(GETNAME) \ -void LxQtSysStatContent::SETNAME##Colour(QColor value) \ +void LXQtSysStatContent::SETNAME##Colour(QColor value) \ { \ mThemeColours.GETNAME##Colour = value; \ if (mUseThemeColours) \ @@ -181,7 +181,7 @@ QSS_NET_COLOUR(netTransmitted, setNetTransmitted) #undef QSS_COLOUR #undef QSS_GET_COLOUR -void LxQtSysStatContent::mixNetColours() +void LXQtSysStatContent::mixNetColours() { QColor netReceivedColour_hsv = mColours.netReceivedColour.toHsv(); QColor netTransmittedColour_hsv = mColours.netTransmittedColour.toHsv(); @@ -194,7 +194,7 @@ void LxQtSysStatContent::mixNetColours() (netReceivedColour_hsv.valueF() + netTransmittedColour_hsv.valueF() ) / 2 ); } -void LxQtSysStatContent::setTitleFont(QFont value) +void LXQtSysStatContent::setTitleFont(QFont value) { mTitleFont = value; updateTitleFontPixelHeight(); @@ -202,7 +202,7 @@ void LxQtSysStatContent::setTitleFont(QFont value) update(); } -void LxQtSysStatContent::updateTitleFontPixelHeight() +void LXQtSysStatContent::updateTitleFontPixelHeight() { if (mTitleLabel.isEmpty()) mTitleFontPixelHeight = 0; @@ -213,7 +213,7 @@ void LxQtSysStatContent::updateTitleFontPixelHeight() } } -void LxQtSysStatContent::updateSettings(const QSettings *settings) +void LXQtSysStatContent::updateSettings(const QSettings *settings) { double old_updateInterval = mUpdateInterval; int old_minimalSize = mMinimalSize; @@ -232,7 +232,7 @@ void LxQtSysStatContent::updateSettings(const QSettings *settings) mTitleLabel = settings->value("title/label", QString()).toString(); // default to CPU monitoring - mDataType = settings->value("data/type", LxQtSysStatConfiguration::msStatTypes[0]).toString(); + mDataType = settings->value("data/type", LXQtSysStatConfiguration::msStatTypes[0]).toString(); mDataSource = settings->value("data/source", QString("cpu")).toString(); @@ -356,12 +356,12 @@ void LxQtSysStatContent::updateSettings(const QSettings *settings) update(); } -void LxQtSysStatContent::resizeEvent(QResizeEvent * /*event*/) +void LXQtSysStatContent::resizeEvent(QResizeEvent * /*event*/) { reset(); } -void LxQtSysStatContent::reset() +void LXQtSysStatContent::reset() { setMinimumSize(mPlugin->panel()->isHorizontal() ? mMinimalSize : 2, mPlugin->panel()->isHorizontal() ? 2 : mMinimalSize); @@ -379,14 +379,14 @@ T clamp(const T &value, const T &min, const T &max) } // QPainter.drawLine with pen set to Qt::transparent doesn't clear anything -void LxQtSysStatContent::clearLine() +void LXQtSysStatContent::clearLine() { QRgb bg = QColor(Qt::transparent).rgba(); for (int i = 0; i < 100; ++i) reinterpret_cast(mHistoryImage.scanLine(i))[mHistoryOffset] = bg; } -void LxQtSysStatContent::cpuUpdate(float user, float nice, float system, float other, float frequencyRate, uint) +void LXQtSysStatContent::cpuUpdate(float user, float nice, float system, float other, float frequencyRate, uint) { int y_system = static_cast(system * 100.0 * frequencyRate); int y_user = static_cast(user * 100.0 * frequencyRate); @@ -436,7 +436,7 @@ void LxQtSysStatContent::cpuUpdate(float user, float nice, float system, float o update(0, mTitleFontPixelHeight, width(), height() - mTitleFontPixelHeight); } -void LxQtSysStatContent::cpuUpdate(float user, float nice, float system, float other) +void LXQtSysStatContent::cpuUpdate(float user, float nice, float system, float other) { int y_system = static_cast(system * 100.0); int y_user = static_cast(user * 100.0); @@ -479,7 +479,7 @@ void LxQtSysStatContent::cpuUpdate(float user, float nice, float system, float o update(0, mTitleFontPixelHeight, width(), height() - mTitleFontPixelHeight); } -void LxQtSysStatContent::memoryUpdate(float apps, float buffers, float cached) +void LXQtSysStatContent::memoryUpdate(float apps, float buffers, float cached) { int y_apps = static_cast(apps * 100.0); int y_buffers = static_cast(buffers * 100.0); @@ -515,7 +515,7 @@ void LxQtSysStatContent::memoryUpdate(float apps, float buffers, float cached) update(0, mTitleFontPixelHeight, width(), height() - mTitleFontPixelHeight); } -void LxQtSysStatContent::swapUpdate(float used) +void LXQtSysStatContent::swapUpdate(float used) { int y_used = static_cast(used * 100.0); @@ -536,7 +536,7 @@ void LxQtSysStatContent::swapUpdate(float used) update(0, mTitleFontPixelHeight, width(), height() - mTitleFontPixelHeight); } -void LxQtSysStatContent::networkUpdate(unsigned received, unsigned transmitted) +void LXQtSysStatContent::networkUpdate(unsigned received, unsigned transmitted) { qreal min_value = qMin(qMax(static_cast(qMin(received, transmitted)) / mNetRealMaximumSpeed, static_cast(0.0)), static_cast(1.0)); qreal max_value = qMin(qMax(static_cast(qMax(received, transmitted)) / mNetRealMaximumSpeed, static_cast(0.0)), static_cast(1.0)); @@ -572,7 +572,7 @@ void LxQtSysStatContent::networkUpdate(unsigned received, unsigned transmitted) update(0, mTitleFontPixelHeight, width(), height() - mTitleFontPixelHeight); } -void LxQtSysStatContent::paintEvent(QPaintEvent *event) +void LXQtSysStatContent::paintEvent(QPaintEvent *event) { QPainter p(this); @@ -618,10 +618,10 @@ void LxQtSysStatContent::paintEvent(QPaintEvent *event) } } -void LxQtSysStatContent::toolTipInfo(QString const & tooltip) +void LXQtSysStatContent::toolTipInfo(QString const & tooltip) { setToolTip(QStringLiteral("%1(%2)
%3") - .arg(QCoreApplication::translate("LxQtSysStatConfiguration", mDataType.toStdString().c_str())) - .arg(QCoreApplication::translate("LxQtSysStatConfiguration", mDataSource.toStdString().c_str())) + .arg(QCoreApplication::translate("LXQtSysStatConfiguration", mDataType.toStdString().c_str())) + .arg(QCoreApplication::translate("LXQtSysStatConfiguration", mDataSource.toStdString().c_str())) .arg(tooltip)); } diff --git a/plugin-sysstat/lxqtsysstat.h b/plugin-sysstat/lxqtsysstat.h index 6737fdb..bdf063d 100644 --- a/plugin-sysstat/lxqtsysstat.h +++ b/plugin-sysstat/lxqtsysstat.h @@ -34,24 +34,24 @@ #include -class LxQtSysStatTitle; -class LxQtSysStatContent; -class LxQtPanel; +class LXQtSysStatTitle; +class LXQtSysStatContent; +class LXQtPanel; namespace SysStat { class BaseStat; } -class LxQtSysStat : public QObject, public ILxQtPanelPlugin +class LXQtSysStat : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtSysStat(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtSysStat(); + LXQtSysStat(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtSysStat(); virtual QWidget *widget() { return mWidget; } virtual QString themeId() const { return "SysStat"; } - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } virtual bool isSeparate() const { return true; } QDialog *configureDialog(); @@ -64,17 +64,17 @@ protected slots: private: QWidget *mWidget; - LxQtSysStatTitle *mFakeTitle; - LxQtSysStatContent *mContent; + LXQtSysStatTitle *mFakeTitle; + LXQtSysStatContent *mContent; QSize mSize; }; -class LxQtSysStatTitle : public QLabel +class LXQtSysStatTitle : public QLabel { Q_OBJECT public: - LxQtSysStatTitle(QWidget *parent = NULL); - ~LxQtSysStatTitle(); + LXQtSysStatTitle(QWidget *parent = NULL); + ~LXQtSysStatTitle(); protected: bool event(QEvent *e); @@ -83,7 +83,7 @@ signals: void fontChanged(QFont); }; -class LxQtSysStatContent : public QWidget +class LXQtSysStatContent : public QWidget { Q_OBJECT @@ -102,8 +102,8 @@ class LxQtSysStatContent : public QWidget Q_PROPERTY(QColor netTransmittedColor READ netTransmittedColour WRITE setNetTransmittedColour) public: - LxQtSysStatContent(ILxQtPanelPlugin *plugin, QWidget *parent = NULL); - ~LxQtSysStatContent(); + LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent = NULL); + ~LXQtSysStatContent(); void updateSettings(const QSettings *); @@ -147,7 +147,7 @@ private: void toolTipInfo(QString const & tooltip); private: - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; SysStat::BaseStat *mStat; @@ -212,15 +212,15 @@ private: }; -class LxQtSysStatLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtSysStatLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtSysStat(startupInfo); + return new LXQtSysStat(startupInfo); } }; diff --git a/plugin-sysstat/lxqtsysstatcolours.cpp b/plugin-sysstat/lxqtsysstatcolours.cpp index ce7cfbf..74db132 100644 --- a/plugin-sysstat/lxqtsysstatcolours.cpp +++ b/plugin-sysstat/lxqtsysstatcolours.cpp @@ -33,9 +33,9 @@ #include -LxQtSysStatColours::LxQtSysStatColours(QWidget *parent) : +LXQtSysStatColours::LXQtSysStatColours(QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtSysStatColours), + ui(new Ui::LXQtSysStatColours), mSelectColourMapper(new QSignalMapper(this)) { setWindowModality(Qt::WindowModal); @@ -84,12 +84,12 @@ LxQtSysStatColours::LxQtSysStatColours(QWidget *parent) : connect(mSelectColourMapper, SIGNAL(mapped(const QString &)), SLOT(selectColour(const QString &))); } -LxQtSysStatColours::~LxQtSysStatColours() +LXQtSysStatColours::~LXQtSysStatColours() { delete ui; } -void LxQtSysStatColours::selectColour(const QString &name) +void LXQtSysStatColours::selectColour(const QString &name) { QColor color = QColorDialog::getColor(mColours[name], this); if (color.isValid()) @@ -101,7 +101,7 @@ void LxQtSysStatColours::selectColour(const QString &name) } } -void LxQtSysStatColours::setColours(const Colours &colours) +void LXQtSysStatColours::setColours(const Colours &colours) { mInitialColours = colours; mColours = colours; @@ -110,7 +110,7 @@ void LxQtSysStatColours::setColours(const Colours &colours) ui->buttons->button(QDialogButtonBox::Apply)->setEnabled(false); } -void LxQtSysStatColours::applyColoursToButtons() +void LXQtSysStatColours::applyColoursToButtons() { Colours::ConstIterator M = mColours.constEnd(); for (Colours::ConstIterator I = mColours.constBegin(); I != M; ++I) @@ -120,7 +120,7 @@ void LxQtSysStatColours::applyColoursToButtons() } } -void LxQtSysStatColours::on_buttons_clicked(QAbstractButton *button) +void LXQtSysStatColours::on_buttons_clicked(QAbstractButton *button) { switch (ui->buttons->standardButton(button)) { @@ -150,7 +150,7 @@ void LxQtSysStatColours::on_buttons_clicked(QAbstractButton *button) } } -void LxQtSysStatColours::restoreDefaults() +void LXQtSysStatColours::restoreDefaults() { bool wereTheSame = mColours == mDefaultColours; @@ -160,7 +160,7 @@ void LxQtSysStatColours::restoreDefaults() ui->buttons->button(QDialogButtonBox::Apply)->setEnabled(!wereTheSame); } -void LxQtSysStatColours::reset() +void LXQtSysStatColours::reset() { bool wereTheSame = mColours == mInitialColours; @@ -170,19 +170,19 @@ void LxQtSysStatColours::reset() ui->buttons->button(QDialogButtonBox::Apply)->setEnabled(!wereTheSame); } -void LxQtSysStatColours::apply() +void LXQtSysStatColours::apply() { emit coloursChanged(); ui->buttons->button(QDialogButtonBox::Apply)->setEnabled(false); } -LxQtSysStatColours::Colours LxQtSysStatColours::colours() const +LXQtSysStatColours::Colours LXQtSysStatColours::colours() const { return mColours; } -LxQtSysStatColours::Colours LxQtSysStatColours::defaultColours() const +LXQtSysStatColours::Colours LXQtSysStatColours::defaultColours() const { return mDefaultColours; } diff --git a/plugin-sysstat/lxqtsysstatcolours.h b/plugin-sysstat/lxqtsysstatcolours.h index 91f08c0..ffdfd2c 100644 --- a/plugin-sysstat/lxqtsysstatcolours.h +++ b/plugin-sysstat/lxqtsysstatcolours.h @@ -37,20 +37,20 @@ namespace Ui { - class LxQtSysStatColours; + class LXQtSysStatColours; } class QSignalMapper; class QAbstractButton; class QPushButton; -class LxQtSysStatColours : public QDialog +class LXQtSysStatColours : public QDialog { Q_OBJECT public: - explicit LxQtSysStatColours(QWidget *parent = NULL); - ~LxQtSysStatColours(); + explicit LXQtSysStatColours(QWidget *parent = NULL); + ~LXQtSysStatColours(); typedef QMap Colours; @@ -73,7 +73,7 @@ public slots: void apply(); private: - Ui::LxQtSysStatColours *ui; + Ui::LXQtSysStatColours *ui; QSignalMapper *mSelectColourMapper; QMap mShowColourMap; diff --git a/plugin-sysstat/lxqtsysstatcolours.ui b/plugin-sysstat/lxqtsysstatcolours.ui index 0035a98..56f2a05 100644 --- a/plugin-sysstat/lxqtsysstatcolours.ui +++ b/plugin-sysstat/lxqtsysstatcolours.ui @@ -1,7 +1,7 @@ - LxQtSysStatColours - + LXQtSysStatColours + 0 diff --git a/plugin-sysstat/lxqtsysstatconfiguration.cpp b/plugin-sysstat/lxqtsysstatconfiguration.cpp index 1723725..f8cf23f 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.cpp +++ b/plugin-sysstat/lxqtsysstatconfiguration.cpp @@ -37,7 +37,7 @@ //Note: strings can't actually be translated here (in static initialization time) // the QT_TR_NOOP here is just for qt translate tools to get the strings for translation -const QStringList LxQtSysStatConfiguration::msStatTypes = { +const QStringList LXQtSysStatConfiguration::msStatTypes = { QStringLiteral(QT_TR_NOOP("CPU")) , QStringLiteral(QT_TR_NOOP("Memory")) , QStringLiteral(QT_TR_NOOP("Network")) @@ -52,39 +52,39 @@ namespace void localizationWorkaround() { const char * loc; - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu1"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu2"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu3"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu4"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu5"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu6"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu7"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu8"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu9"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu11"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu12"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu13"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu14"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu15"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu16"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu17"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu18"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu19"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu20"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu21"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu22"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu23"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "cpu24"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "memory"); - loc = QT_TRANSLATE_NOOP("LxQtSysStatConfiguration", "swap"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu1"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu2"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu3"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu4"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu5"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu6"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu7"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu8"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu9"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu11"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu12"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu13"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu14"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu15"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu16"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu17"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu18"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu19"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu20"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu21"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu22"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu23"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "cpu24"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "memory"); + loc = QT_TRANSLATE_NOOP("LXQtSysStatConfiguration", "swap"); static_cast(t);//avoid unused variable warning } } -LxQtSysStatConfiguration::LxQtSysStatConfiguration(QSettings *settings, QWidget *parent) : +LXQtSysStatConfiguration::LXQtSysStatConfiguration(QSettings *settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtSysStatConfiguration), + ui(new Ui::LXQtSysStatConfiguration), mSettings(settings), oldSettings(settings), mStat(NULL), @@ -100,23 +100,23 @@ LxQtSysStatConfiguration::LxQtSysStatConfiguration(QSettings *settings, QWidget loadSettings(); - connect(ui->typeCOB, static_cast(&QComboBox::currentIndexChanged), this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->intervalSB, static_cast(&QDoubleSpinBox::valueChanged), this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->sizeSB, static_cast(&QSpinBox::valueChanged), this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->linesSB, static_cast(&QSpinBox::valueChanged), this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->titleLE, &QLineEdit::editingFinished, this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->useFrequencyCB, &QCheckBox::toggled, this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->logarithmicCB, &QCheckBox::toggled, this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->sourceCOB, static_cast(&QComboBox::currentIndexChanged), this, &LxQtSysStatConfiguration::saveSettings); - connect(ui->useThemeColoursRB, &QRadioButton::toggled, this, &LxQtSysStatConfiguration::saveSettings); + connect(ui->typeCOB, static_cast(&QComboBox::currentIndexChanged), this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->intervalSB, static_cast(&QDoubleSpinBox::valueChanged), this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->sizeSB, static_cast(&QSpinBox::valueChanged), this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->linesSB, static_cast(&QSpinBox::valueChanged), this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->titleLE, &QLineEdit::editingFinished, this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->useFrequencyCB, &QCheckBox::toggled, this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->logarithmicCB, &QCheckBox::toggled, this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->sourceCOB, static_cast(&QComboBox::currentIndexChanged), this, &LXQtSysStatConfiguration::saveSettings); + connect(ui->useThemeColoursRB, &QRadioButton::toggled, this, &LXQtSysStatConfiguration::saveSettings); } -LxQtSysStatConfiguration::~LxQtSysStatConfiguration() +LXQtSysStatConfiguration::~LXQtSysStatConfiguration() { delete ui; } -void LxQtSysStatConfiguration::loadSettings() +void LXQtSysStatConfiguration::loadSettings() { ui->intervalSB->setValue(mSettings->value("graph/updateInterval", 1.0).toDouble()); ui->sizeSB->setValue(mSettings->value("graph/minimalSize", 30).toInt()); @@ -144,7 +144,7 @@ void LxQtSysStatConfiguration::loadSettings() ui->customColoursB->setEnabled(!useThemeColours); } -void LxQtSysStatConfiguration::saveSettings() +void LXQtSysStatConfiguration::saveSettings() { mSettings->setValue("graph/useThemeColours", ui->useThemeColoursRB->isChecked()); mSettings->setValue("graph/updateInterval", ui->intervalSB->value()); @@ -168,7 +168,7 @@ void LxQtSysStatConfiguration::saveSettings() mSettings->setValue("net/logarithmicScaleSteps", ui->logScaleSB->value()); } -void LxQtSysStatConfiguration::on_buttons_clicked(QAbstractButton *btn) +void LXQtSysStatConfiguration::on_buttons_clicked(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { @@ -179,7 +179,7 @@ void LxQtSysStatConfiguration::on_buttons_clicked(QAbstractButton *btn) close(); } -void LxQtSysStatConfiguration::on_typeCOB_currentIndexChanged(int index) +void LXQtSysStatConfiguration::on_typeCOB_currentIndexChanged(int index) { if (mStat) mStat->deleteLater(); @@ -206,14 +206,14 @@ void LxQtSysStatConfiguration::on_typeCOB_currentIndexChanged(int index) ui->sourceCOB->setCurrentIndex(0); } -void LxQtSysStatConfiguration::on_maximumHS_valueChanged(int value) +void LXQtSysStatConfiguration::on_maximumHS_valueChanged(int value) { ui->maximumValueL->setText(PluginSysStat::netSpeedToString(value)); } -void LxQtSysStatConfiguration::coloursChanged() +void LXQtSysStatConfiguration::coloursChanged() { - const LxQtSysStatColours::Colours &colours = mColoursDialog->colours(); + const LXQtSysStatColours::Colours &colours = mColoursDialog->colours(); mSettings->setValue("grid/colour", colours["grid"].name()); mSettings->setValue("title/colour", colours["title"].name()); @@ -233,17 +233,17 @@ void LxQtSysStatConfiguration::coloursChanged() mSettings->setValue("net/transmittedColour", colours["netTransmitted"].name()); } -void LxQtSysStatConfiguration::on_customColoursB_clicked() +void LXQtSysStatConfiguration::on_customColoursB_clicked() { if (!mColoursDialog) { - mColoursDialog = new LxQtSysStatColours(this); + mColoursDialog = new LXQtSysStatColours(this); connect(mColoursDialog, SIGNAL(coloursChanged()), SLOT(coloursChanged())); } - LxQtSysStatColours::Colours colours; + LXQtSysStatColours::Colours colours; - const LxQtSysStatColours::Colours &defaultColours = mColoursDialog->defaultColours(); + const LXQtSysStatColours::Colours &defaultColours = mColoursDialog->defaultColours(); colours["grid"] = QColor(mSettings->value("grid/colour", defaultColours["grid"] .name()).toString()); colours["title"] = QColor(mSettings->value("title/colour", defaultColours["title"].name()).toString()); diff --git a/plugin-sysstat/lxqtsysstatconfiguration.h b/plugin-sysstat/lxqtsysstatconfiguration.h index e804bfc..e9b9f2a 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.h +++ b/plugin-sysstat/lxqtsysstatconfiguration.h @@ -37,22 +37,22 @@ namespace Ui { - class LxQtSysStatConfiguration; + class LXQtSysStatConfiguration; } namespace SysStat { class BaseStat; } -class LxQtSysStatColours; +class LXQtSysStatColours; -class LxQtSysStatConfiguration : public QDialog +class LXQtSysStatConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtSysStatConfiguration(QSettings *settings, QWidget *parent = 0); - ~LxQtSysStatConfiguration(); + explicit LXQtSysStatConfiguration(QSettings *settings, QWidget *parent = 0); + ~LXQtSysStatConfiguration(); public slots: void saveSettings(); @@ -71,15 +71,15 @@ signals: void maximumNetSpeedChanged(QString); private: - Ui::LxQtSysStatConfiguration *ui; + Ui::LXQtSysStatConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache oldSettings; + LXQt::SettingsCache oldSettings; void loadSettings(); SysStat::BaseStat *mStat; - LxQtSysStatColours *mColoursDialog; + LXQtSysStatColours *mColoursDialog; }; #endif // LXQTSYSSTATCONFIGURATION_H diff --git a/plugin-sysstat/lxqtsysstatconfiguration.ui b/plugin-sysstat/lxqtsysstatconfiguration.ui index 346872f..f6863e9 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.ui +++ b/plugin-sysstat/lxqtsysstatconfiguration.ui @@ -1,7 +1,7 @@ - LxQtSysStatConfiguration - + LXQtSysStatConfiguration + 0 @@ -396,7 +396,7 @@ buttons accepted() - LxQtSysStatConfiguration + LXQtSysStatConfiguration accept() @@ -412,7 +412,7 @@ buttons rejected() - LxQtSysStatConfiguration + LXQtSysStatConfiguration reject() diff --git a/plugin-sysstat/resources/sysstat.desktop.in b/plugin-sysstat/resources/sysstat.desktop.in index 2e51835..874c81e 100644 --- a/plugin-sysstat/resources/sysstat.desktop.in +++ b/plugin-sysstat/resources/sysstat.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System Statistics Comment=System Statistics plugin. Icon=utilities-system-monitor diff --git a/plugin-sysstat/translations/sysstat.ts b/plugin-sysstat/translations/sysstat.ts index 309f514..2cccbab 100644 --- a/plugin-sysstat/translations/sysstat.ts +++ b/plugin-sysstat/translations/sysstat.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration Graph diff --git a/plugin-sysstat/translations/sysstat_de.ts b/plugin-sysstat/translations/sysstat_de.ts index 31ec36a..14c1e90 100644 --- a/plugin-sysstat/translations/sysstat_de.ts +++ b/plugin-sysstat/translations/sysstat_de.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration System Statistics Settings diff --git a/plugin-sysstat/translations/sysstat_el.desktop b/plugin-sysstat/translations/sysstat_el.desktop new file mode 100644 index 0000000..23d4211 --- /dev/null +++ b/plugin-sysstat/translations/sysstat_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Στατιστικά συστήματος +Comment[el]=Πρόσθετο στατιστικών του συστήματος. diff --git a/plugin-sysstat/translations/sysstat_el.ts b/plugin-sysstat/translations/sysstat_el.ts new file mode 100644 index 0000000..0d1ad16 --- /dev/null +++ b/plugin-sysstat/translations/sysstat_el.ts @@ -0,0 +1,237 @@ + + + + + LxQtSysStatColours + + + System Statistics Colors + Χρώματα στατιστικών του συστήματος + + + + Graph + Γράφημα + + + + &Grid + &Κάνναβος + + + + + + + + + + + + + + + + Change ... + Αλλαγή... + + + + T&itle + Τ&ίτλος + + + + CPU + Επεξεργαστής + + + + &Nice + &Προτεραιότητα + + + + Ot&her + Ά&λλο + + + + &Frequency + &Συχνότητα + + + + S&ystem + Σύστη&μα + + + + &User + &Χρήστης + + + + Memory + Μνήμη + + + + Cache&d + Αποθηκευμένη προσ&ωρινά + + + + S&wap + Ανταλλαγής &δεδομένων + + + + &Applications + Ε&φαρμογές + + + + &Buffers + &Ενδιάμεση + + + + Network + Δίκτυο + + + + &Received + Ειλ&ημμένα + + + + &Transmitted + &Απεσταλμένα + + + + LxQtSysStatConfiguration + + + Graph + Γράφημα + + + + px + εικ + + + + s + δ + + + + Data + Δεδομένα + + + + System Statistics Settings + Ρυθμίσεις στατιστικών του συστήματος + + + + &Minimal size + Ελάχιστο μέ&γεθος + + + + Update &interval + Χρονικό &διάστημα ενημέρωσης + + + + &Title + &Τίτλος + + + + &Grid lines + &Γραμμές καννάβου + + + + <html><head/><body><p>Minimal width if the panel is horizontal.</p><p>Minimal height is the panel is vertical.</p></body></html> + <html><head/><body><p>Το ελάχιστο μέγεθος αν ο πίνακας είναι τοποθετημένος οριζόντια.</p><p>Το ελάχιστο ύψος αν ι πίνακας είναι τοποθετημένος κάθετα.</p></body></html> + + + + Use &frequency + Χρήση της συ&χνότητας + + + + Ma&ximum + Μέγισ&το + + + + Lo&garithmic scale + Λογαρι&θμική κλίμακα + + + + CPU + Επεξεργαστής + + + + Memory + Μνήμη + + + + Network + Δίκτυο + + + + &Source + &Πηγή + + + + T&ype + &Τύπος + + + + Colours + Χρώματα + + + + Use t&heme colours + Χρήση των χρωμάτων του &θέματος + + + + Use c&ustom colours + Χρήση &προσαρμοσμένων χρωμάτων + + + + Custom colour ... + Προσαρμοσμένα χρώματα... + + + + XXX KBs + XXX KBs + + + + steps + βήματα + + + diff --git a/plugin-sysstat/translations/sysstat_hu.ts b/plugin-sysstat/translations/sysstat_hu.ts index 1d07a6b..cb8f169 100644 --- a/plugin-sysstat/translations/sysstat_hu.ts +++ b/plugin-sysstat/translations/sysstat_hu.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration Graph diff --git a/plugin-sysstat/translations/sysstat_hu_HU.ts b/plugin-sysstat/translations/sysstat_hu_HU.ts index 49bf4d9..5e21fe4 100644 --- a/plugin-sysstat/translations/sysstat_hu_HU.ts +++ b/plugin-sysstat/translations/sysstat_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration Graph diff --git a/plugin-sysstat/translations/sysstat_ja.desktop b/plugin-sysstat/translations/sysstat_ja.desktop index 212b82d..410d8f7 100644 --- a/plugin-sysstat/translations/sysstat_ja.desktop +++ b/plugin-sysstat/translations/sysstat_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ja]=システム統計 Comment[ja]=システム統計のプラグイン diff --git a/plugin-sysstat/translations/sysstat_ja.ts b/plugin-sysstat/translations/sysstat_ja.ts index a7baee1..23e1f46 100644 --- a/plugin-sysstat/translations/sysstat_ja.ts +++ b/plugin-sysstat/translations/sysstat_ja.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration Graph diff --git a/plugin-sysstat/translations/sysstat_pt.ts b/plugin-sysstat/translations/sysstat_pt.ts index ae23b37..beeb3fe 100644 --- a/plugin-sysstat/translations/sysstat_pt.ts +++ b/plugin-sysstat/translations/sysstat_pt.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,10 +112,10 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration - LxQt SysStat Settings - Definições do LxQt SysStat + LXQt SysStat Settings + Definições do LXQt SysStat diff --git a/plugin-sysstat/translations/sysstat_ru.desktop b/plugin-sysstat/translations/sysstat_ru.desktop index b738aec..c8e02e8 100644 --- a/plugin-sysstat/translations/sysstat_ru.desktop +++ b/plugin-sysstat/translations/sysstat_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru]=Системная статистика Comment[ru]=Плагин системной статистики. diff --git a/plugin-sysstat/translations/sysstat_ru.ts b/plugin-sysstat/translations/sysstat_ru.ts index 4708e0d..c744b07 100644 --- a/plugin-sysstat/translations/sysstat_ru.ts +++ b/plugin-sysstat/translations/sysstat_ru.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration System Statistics Settings diff --git a/plugin-sysstat/translations/sysstat_ru_RU.desktop b/plugin-sysstat/translations/sysstat_ru_RU.desktop index 0ef8cb0..d895b5e 100644 --- a/plugin-sysstat/translations/sysstat_ru_RU.desktop +++ b/plugin-sysstat/translations/sysstat_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru_RU]=Системная статистика Comment[ru_RU]=Плагин системной статистики. diff --git a/plugin-sysstat/translations/sysstat_ru_RU.ts b/plugin-sysstat/translations/sysstat_ru_RU.ts index 329baab..6b97c40 100644 --- a/plugin-sysstat/translations/sysstat_ru_RU.ts +++ b/plugin-sysstat/translations/sysstat_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtSysStatColours + LXQtSysStatColours System Statistics Colors @@ -112,7 +112,7 @@ - LxQtSysStatConfiguration + LXQtSysStatConfiguration System Statistics Settings diff --git a/plugin-taskbar/lxqtgrouppopup.cpp b/plugin-taskbar/lxqtgrouppopup.cpp index 55eda7a..69950a2 100644 --- a/plugin-taskbar/lxqtgrouppopup.cpp +++ b/plugin-taskbar/lxqtgrouppopup.cpp @@ -42,7 +42,7 @@ vertical layout and drag&drop feature inside group ************************************************/ -LxQtGroupPopup::LxQtGroupPopup(LxQtTaskGroup *group): +LXQtGroupPopup::LXQtGroupPopup(LXQtTaskGroup *group): QFrame(group), mGroup(group) { @@ -55,29 +55,29 @@ LxQtGroupPopup::LxQtGroupPopup(LxQtTaskGroup *group): layout()->setSpacing(3); layout()->setMargin(3); - connect(&mCloseTimer, &QTimer::timeout, this, &LxQtGroupPopup::closeTimerSlot); + connect(&mCloseTimer, &QTimer::timeout, this, &LXQtGroupPopup::closeTimerSlot); mCloseTimer.setSingleShot(true); mCloseTimer.setInterval(400); } -LxQtGroupPopup::~LxQtGroupPopup() +LXQtGroupPopup::~LXQtGroupPopup() { } -void LxQtGroupPopup::dropEvent(QDropEvent *event) +void LXQtGroupPopup::dropEvent(QDropEvent *event) { qlonglong temp; WId window; - QDataStream stream(event->mimeData()->data(LxQtTaskButton::mimeDataFormat())); + QDataStream stream(event->mimeData()->data(LXQtTaskButton::mimeDataFormat())); stream >> temp; window = (WId) temp; - LxQtTaskButton *button; + LXQtTaskButton *button; int oldIndex(0); // get current position of the button being dragged for (int i = 0; i < layout()->count(); i++) { - LxQtTaskButton *b = qobject_cast(layout()->itemAt(i)->widget()); + LXQtTaskButton *b = qobject_cast(layout()->itemAt(i)->widget()); if (b && b->windowId() == window) { button = b; @@ -111,13 +111,13 @@ void LxQtGroupPopup::dropEvent(QDropEvent *event) l->invalidate(); } -void LxQtGroupPopup::dragEnterEvent(QDragEnterEvent *event) +void LXQtGroupPopup::dragEnterEvent(QDragEnterEvent *event) { event->accept(); QWidget::dragEnterEvent(event); } -void LxQtGroupPopup::dragLeaveEvent(QDragLeaveEvent *event) +void LXQtGroupPopup::dragLeaveEvent(QDragLeaveEvent *event) { hide(false/*not fast*/); QFrame::dragLeaveEvent(event); @@ -126,7 +126,7 @@ void LxQtGroupPopup::dragLeaveEvent(QDragLeaveEvent *event) /************************************************ * ************************************************/ -void LxQtGroupPopup::leaveEvent(QEvent *event) +void LXQtGroupPopup::leaveEvent(QEvent *event) { mCloseTimer.start(); } @@ -134,12 +134,12 @@ void LxQtGroupPopup::leaveEvent(QEvent *event) /************************************************ * ************************************************/ -void LxQtGroupPopup::enterEvent(QEvent *event) +void LXQtGroupPopup::enterEvent(QEvent *event) { mCloseTimer.stop(); } -void LxQtGroupPopup::hide(bool fast) +void LXQtGroupPopup::hide(bool fast) { if (fast) close(); @@ -147,19 +147,19 @@ void LxQtGroupPopup::hide(bool fast) mCloseTimer.start(); } -void LxQtGroupPopup::show() +void LXQtGroupPopup::show() { mCloseTimer.stop(); QFrame::show(); } -void LxQtGroupPopup::closeTimerSlot() +void LXQtGroupPopup::closeTimerSlot() { bool button_has_dnd_hover = false; QLayout* l = layout(); for (int i = 0; l->count() > i; ++i) { - LxQtTaskButton const * const button = dynamic_cast(l->itemAt(i)->widget()); + LXQtTaskButton const * const button = dynamic_cast(l->itemAt(i)->widget()); if (0 != button && button->hasDragAndDropHover()) { button_has_dnd_hover = true; diff --git a/plugin-taskbar/lxqtgrouppopup.h b/plugin-taskbar/lxqtgrouppopup.h index 67f2d7d..4a4c227 100644 --- a/plugin-taskbar/lxqtgrouppopup.h +++ b/plugin-taskbar/lxqtgrouppopup.h @@ -42,23 +42,23 @@ #include "lxqttaskgroup.h" #include "lxqttaskbar.h" -class LxQtGroupPopup: public QFrame +class LXQtGroupPopup: public QFrame { Q_OBJECT public: - LxQtGroupPopup(LxQtTaskGroup *group); - ~LxQtGroupPopup(); + LXQtGroupPopup(LXQtTaskGroup *group); + ~LXQtGroupPopup(); void hide(bool fast = false); void show(); // Layout - int indexOf(LxQtTaskButton *button) { return layout()->indexOf(button); } + int indexOf(LXQtTaskButton *button) { return layout()->indexOf(button); } int count() { return layout()->count(); } QLayoutItem * itemAt(int i) { return layout()->itemAt(i); } int spacing() { return layout()->spacing(); } - void addButton(LxQtTaskButton* button) { layout()->addWidget(button); } + void addButton(LXQtTaskButton* button) { layout()->addWidget(button); } void removeWidget(QWidget *button) { layout()->removeWidget(button); } protected: @@ -71,7 +71,7 @@ protected: void closeTimerSlot(); private: - LxQtTaskGroup *mGroup; + LXQtTaskGroup *mGroup; QTimer mCloseTimer; }; diff --git a/plugin-taskbar/lxqttaskbar.cpp b/plugin-taskbar/lxqttaskbar.cpp index 06cd032..2410be3 100644 --- a/plugin-taskbar/lxqttaskbar.cpp +++ b/plugin-taskbar/lxqttaskbar.cpp @@ -47,12 +47,12 @@ #include "lxqttaskbar.h" #include "lxqttaskgroup.h" -using namespace LxQt; +using namespace LXQt; /************************************************ ************************************************/ -LxQtTaskBar::LxQtTaskBar(ILxQtPanelPlugin *plugin, QWidget *parent) : +LXQtTaskBar::LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget *parent) : QFrame(parent), mButtonStyle(Qt::ToolButtonTextBesideIcon), mCloseOnMiddleClick(true), @@ -68,10 +68,10 @@ LxQtTaskBar::LxQtTaskBar(ILxQtPanelPlugin *plugin, QWidget *parent) : mStyle(new LeftAlignedTextStyle()) { setStyle(mStyle); - mLayout = new LxQt::GridLayout(this); + mLayout = new LXQt::GridLayout(this); setLayout(mLayout); mLayout->setMargin(0); - mLayout->setStretch(LxQt::GridLayout::StretchHorizontal | LxQt::GridLayout::StretchVertical); + mLayout->setStretch(LXQt::GridLayout::StretchHorizontal | LXQt::GridLayout::StretchVertical); realign(); mPlaceHolder->setMinimumSize(1, 1); @@ -84,13 +84,13 @@ LxQtTaskBar::LxQtTaskBar(ILxQtPanelPlugin *plugin, QWidget *parent) : connect(KWindowSystem::self(), SIGNAL(stackingOrderChanged()), SLOT(refreshTaskList())); connect(KWindowSystem::self(), static_cast(&KWindowSystem::windowChanged) - , this, &LxQtTaskBar::onWindowChanged); + , this, &LXQtTaskBar::onWindowChanged); } /************************************************ ************************************************/ -LxQtTaskBar::~LxQtTaskBar() +LXQtTaskBar::~LXQtTaskBar() { delete mStyle; } @@ -98,7 +98,7 @@ LxQtTaskBar::~LxQtTaskBar() /************************************************ ************************************************/ -bool LxQtTaskBar::acceptWindow(WId window) const +bool LXQtTaskBar::acceptWindow(WId window) const { QFlags ignoreList; ignoreList |= NET::DesktopMask; @@ -137,9 +137,9 @@ bool LxQtTaskBar::acceptWindow(WId window) const /************************************************ ************************************************/ -void LxQtTaskBar::dragEnterEvent(QDragEnterEvent* event) +void LXQtTaskBar::dragEnterEvent(QDragEnterEvent* event) { - if (event->mimeData()->hasFormat(LxQtTaskGroup::mimeDataFormat())) + if (event->mimeData()->hasFormat(LXQtTaskGroup::mimeDataFormat())) event->acceptProposedAction(); else event->ignore(); @@ -149,19 +149,19 @@ void LxQtTaskBar::dragEnterEvent(QDragEnterEvent* event) /************************************************ ************************************************/ -void LxQtTaskBar::dropEvent(QDropEvent* event) +void LXQtTaskBar::dropEvent(QDropEvent* event) { - if (!event->mimeData()->hasFormat(LxQtTaskGroup::mimeDataFormat())) + if (!event->mimeData()->hasFormat(LXQtTaskGroup::mimeDataFormat())) { event->ignore(); return; } QString data; - QDataStream stream(event->mimeData()->data(LxQtTaskGroup::mimeDataFormat())); + QDataStream stream(event->mimeData()->data(LXQtTaskGroup::mimeDataFormat())); stream >> data; - LxQtTaskGroup *group = mGroupsHash.value(data, NULL); + LXQtTaskGroup *group = mGroupsHash.value(data, NULL); if (!group) { qDebug() << "Dropped invalid"; @@ -204,10 +204,10 @@ void LxQtTaskBar::dropEvent(QDropEvent* event) /************************************************ ************************************************/ -void LxQtTaskBar::groupBecomeEmptySlot() +void LXQtTaskBar::groupBecomeEmptySlot() { //group now contains no buttons - clean up in hash and delete the group - LxQtTaskGroup *group = qobject_cast(sender()); + LXQtTaskGroup *group = qobject_cast(sender()); Q_ASSERT(group); mGroupsHash.erase(mGroupsHash.find(group->groupName())); @@ -218,16 +218,16 @@ void LxQtTaskBar::groupBecomeEmptySlot() ************************************************/ -void LxQtTaskBar::addWindow(WId window, QString const & groupId) +void LXQtTaskBar::addWindow(WId window, QString const & groupId) { - LxQtTaskGroup *group = mGroupsHash.value(groupId); + LXQtTaskGroup *group = mGroupsHash.value(groupId); if (!group) { - group = new LxQtTaskGroup(groupId, KWindowSystem::icon(window), mPlugin, this); + group = new LXQtTaskGroup(groupId, KWindowSystem::icon(window), mPlugin, this); connect(group, SIGNAL(groupBecomeEmpty(QString)), this, SLOT(groupBecomeEmptySlot())); connect(group, SIGNAL(visibilityChanged(bool)), this, SLOT(refreshPlaceholderVisibility())); - connect(group, &LxQtTaskGroup::popupShown, this, &LxQtTaskBar::groupPopupShown); + connect(group, &LXQtTaskGroup::popupShown, this, &LXQtTaskBar::groupPopupShown); connect(group, SIGNAL(windowDisowned(WId)), this, SLOT(refreshTaskList())); mLayout->addWidget(group); @@ -240,7 +240,7 @@ void LxQtTaskBar::addWindow(WId window, QString const & groupId) ************************************************/ -void LxQtTaskBar::refreshTaskList() +void LXQtTaskBar::refreshTaskList() { // Just add new windows to groups, deleting is up to the groups QList tmp = KWindowSystem::stackingOrder(); @@ -261,11 +261,11 @@ void LxQtTaskBar::refreshTaskList() /************************************************ ************************************************/ -void LxQtTaskBar::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) +void LXQtTaskBar::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) { // If grouping disabled group behaves like regular button QString id = mGroupingEnabled ? KWindowInfo(window, 0, NET::WM2WindowClass).windowClassClass() : QString("%1").arg(window); - LxQtTaskGroup *group = mGroupsHash.value(id); + LXQtTaskGroup *group = mGroupsHash.value(id); bool consumed{false}; if (nullptr != group) @@ -281,12 +281,12 @@ void LxQtTaskBar::onWindowChanged(WId window, NET::Properties prop, NET::Propert /************************************************ ************************************************/ -void LxQtTaskBar::refreshButtonRotation() +void LXQtTaskBar::refreshButtonRotation() { bool autoRotate = mAutoRotate && (mButtonStyle != Qt::ToolButtonIconOnly); - ILxQtPanel::Position panelPosition = mPlugin->panel()->position(); - QHashIterator j(mGroupsHash); + ILXQtPanel::Position panelPosition = mPlugin->panel()->position(); + QHashIterator j(mGroupsHash); while(j.hasNext()) { j.next(); @@ -297,11 +297,11 @@ void LxQtTaskBar::refreshButtonRotation() /************************************************ ************************************************/ -void LxQtTaskBar::refreshPlaceholderVisibility() +void LXQtTaskBar::refreshPlaceholderVisibility() { // if no visible group button show placeholder widget bool haveVisibleWindow = false; - QHashIterator j(mGroupsHash); + QHashIterator j(mGroupsHash); while (j.hasNext()) { j.next(); @@ -322,9 +322,9 @@ void LxQtTaskBar::refreshPlaceholderVisibility() /************************************************ ************************************************/ -void LxQtTaskBar::refreshIconGeometry() +void LXQtTaskBar::refreshIconGeometry() { - QHashIterator i(mGroupsHash); + QHashIterator i(mGroupsHash); while (i.hasNext()) { i.next(); @@ -335,11 +335,11 @@ void LxQtTaskBar::refreshIconGeometry() /************************************************ ************************************************/ -void LxQtTaskBar::setButtonStyle(Qt::ToolButtonStyle buttonStyle) +void LXQtTaskBar::setButtonStyle(Qt::ToolButtonStyle buttonStyle) { mButtonStyle = buttonStyle; - QHashIterator i(mGroupsHash); + QHashIterator i(mGroupsHash); while (i.hasNext()) { i.next(); @@ -350,7 +350,7 @@ void LxQtTaskBar::setButtonStyle(Qt::ToolButtonStyle buttonStyle) /************************************************ ************************************************/ -void LxQtTaskBar::settingsChanged() +void LXQtTaskBar::settingsChanged() { bool groupingEnabledOld = mGroupingEnabled; bool showOnlyOneDesktopTasksOld = mShowOnlyOneDesktopTasks; @@ -382,7 +382,7 @@ void LxQtTaskBar::settingsChanged() // Delete all groups if grouping feature toggled and start over if (groupingEnabledOld != mGroupingEnabled) { - Q_FOREACH (LxQtTaskGroup *group, mGroupsHash.values()) + Q_FOREACH (LXQtTaskGroup *group, mGroupsHash.values()) { mLayout->removeWidget(group); group->deleteLater(); @@ -395,7 +395,7 @@ void LxQtTaskBar::settingsChanged() || showOnlyCurrentScreenTasksOld != mShowOnlyCurrentScreenTasks || showOnlyMinimizedTasksOld != mShowOnlyMinimizedTasks ) - Q_FOREACH (LxQtTaskGroup *group, mGroupsHash) + Q_FOREACH (LXQtTaskGroup *group, mGroupsHash) group->showOnlySettingChanged(); refreshTaskList(); @@ -404,12 +404,12 @@ void LxQtTaskBar::settingsChanged() /************************************************ ************************************************/ -void LxQtTaskBar::realign() +void LXQtTaskBar::realign() { mLayout->setEnabled(false); refreshButtonRotation(); - ILxQtPanel *panel = mPlugin->panel(); + ILXQtPanel *panel = mPlugin->panel(); QSize maxSize = QSize(mButtonWidth, mButtonHeight); QSize minSize = QSize(0, 0); @@ -431,7 +431,7 @@ void LxQtTaskBar::realign() } else { - rotated = mAutoRotate && (panel->position() == ILxQtPanel::PositionLeft || panel->position() == ILxQtPanel::PositionRight); + rotated = mAutoRotate && (panel->position() == ILXQtPanel::PositionLeft || panel->position() == ILXQtPanel::PositionRight); // Vertical + Text if (rotated) @@ -450,11 +450,11 @@ void LxQtTaskBar::realign() mLayout->setCellMinimumSize(minSize); mLayout->setCellMaximumSize(maxSize); - mLayout->setDirection(rotated ? LxQt::GridLayout::TopToBottom : LxQt::GridLayout::LeftToRight); + mLayout->setDirection(rotated ? LXQt::GridLayout::TopToBottom : LXQt::GridLayout::LeftToRight); mLayout->setEnabled(true); //our placement on screen could have been changed - Q_FOREACH (LxQtTaskGroup *group, mGroupsHash) + Q_FOREACH (LXQtTaskGroup *group, mGroupsHash) group->showOnlySettingChanged(); refreshIconGeometry(); } @@ -462,7 +462,7 @@ void LxQtTaskBar::realign() /************************************************ ************************************************/ -void LxQtTaskBar::wheelEvent(QWheelEvent* event) +void LXQtTaskBar::wheelEvent(QWheelEvent* event) { static int threshold = 0; threshold += abs(event->delta()); @@ -474,12 +474,12 @@ void LxQtTaskBar::wheelEvent(QWheelEvent* event) int delta = event->delta() < 0 ? 1 : -1; // create temporary list of visible groups in the same order like on the layout - QList list; - LxQtTaskGroup *group = NULL; + QList list; + LXQtTaskGroup *group = NULL; for (int i = 0; i < mLayout->count(); i++) { QWidget * o = mLayout->itemAt(i)->widget(); - LxQtTaskGroup * g = qobject_cast(o); + LXQtTaskGroup * g = qobject_cast(o); if (!g) continue; @@ -495,7 +495,7 @@ void LxQtTaskBar::wheelEvent(QWheelEvent* event) if (!group) group = list.at(0); - LxQtTaskButton *button = NULL; + LXQtTaskButton *button = NULL; // switching between groups from temporary list in modulo addressing while (!button) @@ -511,7 +511,7 @@ void LxQtTaskBar::wheelEvent(QWheelEvent* event) /************************************************ ************************************************/ -void LxQtTaskBar::resizeEvent(QResizeEvent* event) +void LXQtTaskBar::resizeEvent(QResizeEvent* event) { refreshIconGeometry(); return QWidget::resizeEvent(event); @@ -520,7 +520,7 @@ void LxQtTaskBar::resizeEvent(QResizeEvent* event) /************************************************ ************************************************/ -void LxQtTaskBar::changeEvent(QEvent* event) +void LXQtTaskBar::changeEvent(QEvent* event) { // if current style is changed, reset the base style of the proxy style // so we can apply the new style correctly to task buttons. @@ -530,7 +530,7 @@ void LxQtTaskBar::changeEvent(QEvent* event) QFrame::changeEvent(event); } -void LxQtTaskBar::groupPopupShown(LxQtTaskGroup * const sender) +void LXQtTaskBar::groupPopupShown(LXQtTaskGroup * const sender) { //close all popups (should they be visible because of close delay) for (auto group : mGroupsHash) diff --git a/plugin-taskbar/lxqttaskbar.h b/plugin-taskbar/lxqttaskbar.h index e672051..a2ffefc 100644 --- a/plugin-taskbar/lxqttaskbar.h +++ b/plugin-taskbar/lxqttaskbar.h @@ -47,20 +47,20 @@ #include #include -class LxQtTaskButton; +class LXQtTaskButton; class ElidedButtonStyle; -namespace LxQt { +namespace LXQt { class GridLayout; } -class LxQtTaskBar : public QFrame +class LXQtTaskBar : public QFrame { Q_OBJECT public: - explicit LxQtTaskBar(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - virtual ~LxQtTaskBar(); + explicit LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + virtual ~LXQtTaskBar(); void realign(); @@ -75,7 +75,7 @@ public: bool isAutoRotate() const { return mAutoRotate; } bool isGroupingEnabled() const { return mGroupingEnabled; } bool isShowGroupOnHover() const { return mShowGroupOnHover; } - ILxQtPanel * panel() const { return mPlugin->panel(); } + ILXQtPanel * panel() const { return mPlugin->panel(); } public slots: void settingsChanged(); @@ -90,15 +90,15 @@ private slots: void refreshButtonRotation(); void refreshPlaceholderVisibility(); void groupBecomeEmptySlot(); - void groupPopupShown(LxQtTaskGroup * const sender); + void groupPopupShown(LXQtTaskGroup * const sender); void onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2); private: void addWindow(WId window, QString const & groupId); private: - QHash mGroupsHash; - LxQt::GridLayout *mLayout; + QHash mGroupsHash; + LXQt::GridLayout *mLayout; // Settings Qt::ToolButtonStyle mButtonStyle; @@ -121,7 +121,7 @@ private: void changeEvent(QEvent* event); void resizeEvent(QResizeEvent *event); - ILxQtPanelPlugin *mPlugin; + ILXQtPanelPlugin *mPlugin; QWidget *mPlaceHolder; LeftAlignedTextStyle *mStyle; }; diff --git a/plugin-taskbar/lxqttaskbarconfiguration.cpp b/plugin-taskbar/lxqttaskbarconfiguration.cpp index 23f90af..1e24e66 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.cpp +++ b/plugin-taskbar/lxqttaskbarconfiguration.cpp @@ -32,9 +32,9 @@ #include "ui_lxqttaskbarconfiguration.h" #include -LxQtTaskbarConfiguration::LxQtTaskbarConfiguration(QSettings &settings, QWidget *parent): +LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(QSettings &settings, QWidget *parent): QDialog(parent), - ui(new Ui::LxQtTaskbarConfiguration), + ui(new Ui::LXQtTaskbarConfiguration), mSettings(settings), oldSettings(settings) { @@ -73,12 +73,12 @@ LxQtTaskbarConfiguration::LxQtTaskbarConfiguration(QSettings &settings, QWidget connect(ui->showGroupOnHoverCB, SIGNAL(clicked()), this, SLOT(saveSettings())); } -LxQtTaskbarConfiguration::~LxQtTaskbarConfiguration() +LXQtTaskbarConfiguration::~LXQtTaskbarConfiguration() { delete ui; } -void LxQtTaskbarConfiguration::loadSettings() +void LXQtTaskbarConfiguration::loadSettings() { const bool showOnlyOneDesktopTasks = mSettings.value("showOnlyOneDesktopTasks", false).toBool(); ui->limitByDesktopCB->setChecked(showOnlyOneDesktopTasks); @@ -97,7 +97,7 @@ void LxQtTaskbarConfiguration::loadSettings() ui->showGroupOnHoverCB->setChecked(mSettings.value("showGroupOnHover",true).toBool()); } -void LxQtTaskbarConfiguration::saveSettings() +void LXQtTaskbarConfiguration::saveSettings() { mSettings.setValue("showOnlyOneDesktopTasks", ui->limitByDesktopCB->isChecked()); mSettings.setValue("showDesktopNum", ui->showDesktopNumCB->itemData(ui->showDesktopNumCB->currentIndex())); @@ -113,7 +113,7 @@ void LxQtTaskbarConfiguration::saveSettings() mSettings.setValue("showGroupOnHover",ui->showGroupOnHoverCB->isChecked()); } -void LxQtTaskbarConfiguration::dialogButtonsAction(QAbstractButton *btn) +void LXQtTaskbarConfiguration::dialogButtonsAction(QAbstractButton *btn) { if (ui->buttons->buttonRole(btn) == QDialogButtonBox::ResetRole) { diff --git a/plugin-taskbar/lxqttaskbarconfiguration.h b/plugin-taskbar/lxqttaskbarconfiguration.h index 4ee8de6..157eb2e 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.h +++ b/plugin-taskbar/lxqttaskbarconfiguration.h @@ -34,21 +34,21 @@ #include namespace Ui { - class LxQtTaskbarConfiguration; + class LXQtTaskbarConfiguration; } -class LxQtTaskbarConfiguration : public QDialog +class LXQtTaskbarConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtTaskbarConfiguration(QSettings &settings, QWidget *parent = 0); - ~LxQtTaskbarConfiguration(); + explicit LXQtTaskbarConfiguration(QSettings &settings, QWidget *parent = 0); + ~LXQtTaskbarConfiguration(); private: - Ui::LxQtTaskbarConfiguration *ui; + Ui::LXQtTaskbarConfiguration *ui; QSettings &mSettings; - LxQt::SettingsCache oldSettings; + LXQt::SettingsCache oldSettings; /* Read settings from conf file and put data into controls. diff --git a/plugin-taskbar/lxqttaskbarconfiguration.ui b/plugin-taskbar/lxqttaskbarconfiguration.ui index a18fce4..308dd5d 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.ui +++ b/plugin-taskbar/lxqttaskbarconfiguration.ui @@ -1,7 +1,7 @@ - LxQtTaskbarConfiguration - + LXQtTaskbarConfiguration + 0 @@ -201,7 +201,7 @@ buttons accepted() - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration accept() @@ -217,7 +217,7 @@ buttons rejected() - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration reject() diff --git a/plugin-taskbar/lxqttaskbarplugin.cpp b/plugin-taskbar/lxqttaskbarplugin.cpp index 90e3d35..2e5f732 100644 --- a/plugin-taskbar/lxqttaskbarplugin.cpp +++ b/plugin-taskbar/lxqttaskbarplugin.cpp @@ -28,27 +28,27 @@ #include "lxqttaskbarplugin.h" -LxQtTaskBarPlugin::LxQtTaskBarPlugin(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtTaskBarPlugin::LXQtTaskBarPlugin(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo) + ILXQtPanelPlugin(startupInfo) { - mTaskBar = new LxQtTaskBar(this); + mTaskBar = new LXQtTaskBar(this); } -LxQtTaskBarPlugin::~LxQtTaskBarPlugin() +LXQtTaskBarPlugin::~LXQtTaskBarPlugin() { delete mTaskBar; } -QDialog *LxQtTaskBarPlugin::configureDialog() +QDialog *LXQtTaskBarPlugin::configureDialog() { - return new LxQtTaskbarConfiguration(*(settings())); + return new LXQtTaskbarConfiguration(*(settings())); } -void LxQtTaskBarPlugin::realign() +void LXQtTaskBarPlugin::realign() { mTaskBar->realign(); } diff --git a/plugin-taskbar/lxqttaskbarplugin.h b/plugin-taskbar/lxqttaskbarplugin.h index 4778175..ef64421 100644 --- a/plugin-taskbar/lxqttaskbarplugin.h +++ b/plugin-taskbar/lxqttaskbarplugin.h @@ -33,14 +33,14 @@ #include "../panel/ilxqtpanelplugin.h" #include "lxqttaskbar.h" #include -class LxQtTaskBar; +class LXQtTaskBar; -class LxQtTaskBarPlugin : public QObject, public ILxQtPanelPlugin +class LXQtTaskBarPlugin : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtTaskBarPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtTaskBarPlugin(); + LXQtTaskBarPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtTaskBarPlugin(); QString themeId() const { return "TaskBar"; } virtual Flags flags() const { return HaveConfigDialog | NeedsHandle; } @@ -54,16 +54,16 @@ public: bool isSeparate() const { return true; } bool isExpandable() const { return true; } private: - LxQtTaskBar *mTaskBar; + LXQtTaskBar *mTaskBar; }; -class LxQtTaskBarPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtTaskBarPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const { return new LxQtTaskBarPlugin(startupInfo);} + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtTaskBarPlugin(startupInfo);} }; #endif // LXQTTASKBARPLUGIN_H diff --git a/plugin-taskbar/lxqttaskbutton.cpp b/plugin-taskbar/lxqttaskbutton.cpp index be30600..ef835a0 100644 --- a/plugin-taskbar/lxqttaskbutton.cpp +++ b/plugin-taskbar/lxqttaskbutton.cpp @@ -57,7 +57,7 @@ #include #include -bool LxQtTaskButton::sDraggging = false; +bool LXQtTaskButton::sDraggging = false; /************************************************ @@ -73,7 +73,7 @@ void LeftAlignedTextStyle::drawItemText(QPainter * painter, const QRect & rect, /************************************************ ************************************************/ -LxQtTaskButton::LxQtTaskButton(const WId window, LxQtTaskBar * taskbar, QWidget *parent) : +LXQtTaskButton::LXQtTaskButton(const WId window, LXQtTaskBar * taskbar, QWidget *parent) : QToolButton(parent), mWindow(window), mUrgencyHint(false), @@ -103,14 +103,14 @@ LxQtTaskButton::LxQtTaskButton(const WId window, LxQtTaskBar * taskbar, QWidget /************************************************ ************************************************/ -LxQtTaskButton::~LxQtTaskButton() +LXQtTaskButton::~LXQtTaskButton() { } /************************************************ ************************************************/ -void LxQtTaskButton::updateText() +void LXQtTaskButton::updateText() { KWindowInfo info(mWindow, NET::WMVisibleName | NET::WMName); QString title = info.visibleName().isEmpty() ? info.name() : info.visibleName(); @@ -121,7 +121,7 @@ void LxQtTaskButton::updateText() /************************************************ ************************************************/ -void LxQtTaskButton::updateIcon() +void LXQtTaskButton::updateIcon() { QIcon ico; QPixmap pix = KWindowSystem::icon(mWindow); @@ -132,7 +132,7 @@ void LxQtTaskButton::updateIcon() /************************************************ ************************************************/ -void LxQtTaskButton::refreshIconGeometry(QRect const & geom) +void LXQtTaskButton::refreshIconGeometry(QRect const & geom) { NETWinInfo info(QX11Info::connection(), windowId(), @@ -155,7 +155,7 @@ void LxQtTaskButton::refreshIconGeometry(QRect const & geom) /************************************************ ************************************************/ -void LxQtTaskButton::dragEnterEvent(QDragEnterEvent *event) +void LXQtTaskButton::dragEnterEvent(QDragEnterEvent *event) { if (event->mimeData()->hasFormat(mimeDataFormat())) { @@ -171,14 +171,14 @@ void LxQtTaskButton::dragEnterEvent(QDragEnterEvent *event) QToolButton::dragEnterEvent(event); } -void LxQtTaskButton::dragLeaveEvent(QDragLeaveEvent *event) +void LXQtTaskButton::dragLeaveEvent(QDragLeaveEvent *event) { mDNDTimer->stop(); event->ignore(); QToolButton::dragLeaveEvent(event); } -void LxQtTaskButton::dropEvent(QDropEvent *event) +void LXQtTaskButton::dropEvent(QDropEvent *event) { mDNDTimer->stop(); event->ignore(); @@ -188,7 +188,7 @@ void LxQtTaskButton::dropEvent(QDropEvent *event) /************************************************ ************************************************/ -void LxQtTaskButton::mousePressEvent(QMouseEvent* event) +void LXQtTaskButton::mousePressEvent(QMouseEvent* event) { const Qt::MouseButton b = event->button(); @@ -203,7 +203,7 @@ void LxQtTaskButton::mousePressEvent(QMouseEvent* event) /************************************************ ************************************************/ -void LxQtTaskButton::mouseReleaseEvent(QMouseEvent* event) +void LXQtTaskButton::mouseReleaseEvent(QMouseEvent* event) { if (event->button() == Qt::LeftButton) { @@ -218,7 +218,7 @@ void LxQtTaskButton::mouseReleaseEvent(QMouseEvent* event) /************************************************ ************************************************/ -QMimeData * LxQtTaskButton::mimeData() +QMimeData * LXQtTaskButton::mimeData() { QMimeData *mimedata = new QMimeData; QByteArray ba; @@ -231,7 +231,7 @@ QMimeData * LxQtTaskButton::mimeData() /************************************************ ************************************************/ -void LxQtTaskButton::mouseMoveEvent(QMouseEvent* event) +void LXQtTaskButton::mouseMoveEvent(QMouseEvent* event) { if (!(event->buttons() & Qt::LeftButton)) return; @@ -261,7 +261,7 @@ void LxQtTaskButton::mouseMoveEvent(QMouseEvent* event) /************************************************ ************************************************/ -bool LxQtTaskButton::isApplicationHidden() const +bool LXQtTaskButton::isApplicationHidden() const { KWindowInfo info(mWindow, NET::WMState); return (info.state() & NET::Hidden); @@ -270,7 +270,7 @@ bool LxQtTaskButton::isApplicationHidden() const /************************************************ ************************************************/ -bool LxQtTaskButton::isApplicationActive() const +bool LXQtTaskButton::isApplicationActive() const { return KWindowSystem::activeWindow() == mWindow; } @@ -278,7 +278,7 @@ bool LxQtTaskButton::isApplicationActive() const /************************************************ ************************************************/ -void LxQtTaskButton::activateWithDraggable() +void LXQtTaskButton::activateWithDraggable() { // raise app in any time when there is a drag // in progress to allow drop it into an app @@ -289,7 +289,7 @@ void LxQtTaskButton::activateWithDraggable() /************************************************ ************************************************/ -void LxQtTaskButton::raiseApplication() +void LXQtTaskButton::raiseApplication() { KWindowInfo info(mWindow, NET::WMDesktop | NET::WMState | NET::XAWMState); if (parentTaskBar()->raiseOnCurrentDesktop() && info.isMinimized()) @@ -310,7 +310,7 @@ void LxQtTaskButton::raiseApplication() /************************************************ ************************************************/ -void LxQtTaskButton::minimizeApplication() +void LXQtTaskButton::minimizeApplication() { KWindowSystem::minimizeWindow(mWindow); } @@ -318,7 +318,7 @@ void LxQtTaskButton::minimizeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::maximizeApplication() +void LXQtTaskButton::maximizeApplication() { QAction* act = qobject_cast(sender()); if (!act) @@ -347,7 +347,7 @@ void LxQtTaskButton::maximizeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::deMaximizeApplication() +void LXQtTaskButton::deMaximizeApplication() { KWindowSystem::clearState(mWindow, NET::Max); @@ -358,7 +358,7 @@ void LxQtTaskButton::deMaximizeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::shadeApplication() +void LXQtTaskButton::shadeApplication() { KWindowSystem::setState(mWindow, NET::Shaded); } @@ -366,7 +366,7 @@ void LxQtTaskButton::shadeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::unShadeApplication() +void LXQtTaskButton::unShadeApplication() { KWindowSystem::clearState(mWindow, NET::Shaded); } @@ -374,7 +374,7 @@ void LxQtTaskButton::unShadeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::closeApplication() +void LXQtTaskButton::closeApplication() { // FIXME: Why there is no such thing in KWindowSystem?? NETRootInfo(QX11Info::connection(), NET::CloseWindow).closeWindowRequest(mWindow); @@ -383,7 +383,7 @@ void LxQtTaskButton::closeApplication() /************************************************ ************************************************/ -void LxQtTaskButton::setApplicationLayer() +void LXQtTaskButton::setApplicationLayer() { QAction* act = qobject_cast(sender()); if (!act) @@ -412,7 +412,7 @@ void LxQtTaskButton::setApplicationLayer() /************************************************ ************************************************/ -void LxQtTaskButton::moveApplicationToDesktop() +void LXQtTaskButton::moveApplicationToDesktop() { QAction* act = qobject_cast(sender()); if (!act) @@ -430,7 +430,7 @@ void LxQtTaskButton::moveApplicationToDesktop() /************************************************ ************************************************/ -void LxQtTaskButton::contextMenuEvent(QContextMenuEvent* event) +void LXQtTaskButton::contextMenuEvent(QContextMenuEvent* event) { if (event->modifiers().testFlag(Qt::ControlModifier)) { @@ -574,7 +574,7 @@ void LxQtTaskButton::contextMenuEvent(QContextMenuEvent* event) /************************************************ ************************************************/ -void LxQtTaskButton::setUrgencyHint(bool set) +void LXQtTaskButton::setUrgencyHint(bool set) { if (mUrgencyHint == set) return; @@ -592,27 +592,27 @@ void LxQtTaskButton::setUrgencyHint(bool set) /************************************************ ************************************************/ -bool LxQtTaskButton::isOnDesktop(int desktop) const +bool LXQtTaskButton::isOnDesktop(int desktop) const { return KWindowInfo(mWindow, NET::WMDesktop).isOnDesktop(desktop); } -bool LxQtTaskButton::isOnCurrentScreen() const +bool LXQtTaskButton::isOnCurrentScreen() const { return QApplication::desktop()->screenGeometry(parentTaskBar()).intersects(KWindowInfo(mWindow, NET::WMFrameExtents).frameGeometry()); } -bool LxQtTaskButton::isMinimized() const +bool LXQtTaskButton::isMinimized() const { return KWindowInfo(mWindow,NET::WMState | NET::XAWMState).isMinimized(); } -Qt::Corner LxQtTaskButton::origin() const +Qt::Corner LXQtTaskButton::origin() const { return mOrigin; } -void LxQtTaskButton::setOrigin(Qt::Corner newOrigin) +void LXQtTaskButton::setOrigin(Qt::Corner newOrigin) { if (mOrigin != newOrigin) { @@ -621,22 +621,22 @@ void LxQtTaskButton::setOrigin(Qt::Corner newOrigin) } } -void LxQtTaskButton::setAutoRotation(bool value, ILxQtPanel::Position position) +void LXQtTaskButton::setAutoRotation(bool value, ILXQtPanel::Position position) { if (value) { switch (position) { - case ILxQtPanel::PositionTop: - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionTop: + case ILXQtPanel::PositionBottom: setOrigin(Qt::TopLeftCorner); break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: setOrigin(Qt::BottomLeftCorner); break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: setOrigin(Qt::TopRightCorner); break; } @@ -645,7 +645,7 @@ void LxQtTaskButton::setAutoRotation(bool value, ILxQtPanel::Position position) setOrigin(Qt::TopLeftCorner); } -void LxQtTaskButton::paintEvent(QPaintEvent *event) +void LXQtTaskButton::paintEvent(QPaintEvent *event) { if (mOrigin == Qt::TopLeftCorner) { @@ -720,7 +720,7 @@ void LxQtTaskButton::paintEvent(QPaintEvent *event) mDrawPixmap = drawPixmapNextTime; } -bool LxQtTaskButton::hasDragAndDropHover() const +bool LXQtTaskButton::hasDragAndDropHover() const { return mDNDTimer->isActive(); } diff --git a/plugin-taskbar/lxqttaskbutton.h b/plugin-taskbar/lxqttaskbutton.h index 419212a..3aaffbc 100644 --- a/plugin-taskbar/lxqttaskbutton.h +++ b/plugin-taskbar/lxqttaskbutton.h @@ -39,8 +39,8 @@ class QPainter; class QPalette; class QMimeData; -class LxQtTaskGroup; -class LxQtTaskBar; +class LXQtTaskGroup; +class LXQtTaskBar; class LeftAlignedTextStyle : public QProxyStyle { @@ -53,15 +53,15 @@ public: }; -class LxQtTaskButton : public QToolButton +class LXQtTaskButton : public QToolButton { Q_OBJECT Q_PROPERTY(Qt::Corner origin READ origin WRITE setOrigin) public: - explicit LxQtTaskButton(const WId window, LxQtTaskBar * taskBar, QWidget *parent = 0); - virtual ~LxQtTaskButton(); + explicit LXQtTaskButton(const WId window, LXQtTaskBar * taskBar, QWidget *parent = 0); + virtual ~LXQtTaskButton(); bool isApplicationHidden() const; bool isApplicationActive() const; @@ -77,11 +77,11 @@ public: void updateIcon(); Qt::Corner origin() const; - virtual void setAutoRotation(bool value, ILxQtPanel::Position position); + virtual void setAutoRotation(bool value, ILXQtPanel::Position position); - LxQtTaskGroup * parentGroup(void) const {return mParentGroup;} - void setParentGroup(LxQtTaskGroup * group) {mParentGroup = group;} - LxQtTaskBar * parentTaskBar() const {return mParentTaskBar;} + LXQtTaskGroup * parentGroup(void) const {return mParentGroup;} + void setParentGroup(LXQtTaskGroup * group) {mParentGroup = group;} + LXQtTaskBar * parentTaskBar() const {return mParentTaskBar;} void refreshIconGeometry(QRect const & geom); static QString mimeDataFormat() { return QLatin1String("lxqt/lxqttaskbutton"); } @@ -123,8 +123,8 @@ private: Qt::Corner mOrigin; QPixmap mPixmap; bool mDrawPixmap; - LxQtTaskGroup * mParentGroup; - LxQtTaskBar * mParentTaskBar; + LXQtTaskGroup * mParentGroup; + LXQtTaskBar * mParentTaskBar; // Timer for when draggind something into a button (the button's window // must be activated so that the use can continue dragging to the window @@ -138,6 +138,6 @@ signals: void dragging(bool executing = false); }; -typedef QHash LxQtTaskButtonHash; +typedef QHash LXQtTaskButtonHash; #endif // LXQTTASKBUTTON_H diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp index 9be7a5d..081bf77 100644 --- a/plugin-taskbar/lxqttaskgroup.cpp +++ b/plugin-taskbar/lxqttaskgroup.cpp @@ -44,10 +44,10 @@ /************************************************ ************************************************/ -LxQtTaskGroup::LxQtTaskGroup(const QString &groupName, QIcon icon, ILxQtPanelPlugin * plugin, LxQtTaskBar *parent) - : LxQtTaskButton(0, parent, parent), +LXQtTaskGroup::LXQtTaskGroup(const QString &groupName, QIcon icon, ILXQtPanelPlugin * plugin, LXQtTaskBar *parent) + : LXQtTaskButton(0, parent, parent), mGroupName(groupName), - mPopup(new LxQtGroupPopup(this)), + mPopup(new LXQtGroupPopup(this)), mPlugin(plugin), mPreventPopup(false) { @@ -66,13 +66,13 @@ LxQtTaskGroup::LxQtTaskGroup(const QString &groupName, QIcon icon, ILxQtPanelPlu /************************************************ ************************************************/ -void LxQtTaskGroup::contextMenuEvent(QContextMenuEvent *event) +void LXQtTaskGroup::contextMenuEvent(QContextMenuEvent *event) { setPopupVisible(false, true); mPreventPopup = true; if (windowId()) { - LxQtTaskButton::contextMenuEvent(event); + LXQtTaskButton::contextMenuEvent(event); return; } @@ -90,9 +90,9 @@ void LxQtTaskGroup::contextMenuEvent(QContextMenuEvent *event) /************************************************ ************************************************/ -void LxQtTaskGroup::closeGroup() +void LXQtTaskGroup::closeGroup() { - foreach (LxQtTaskButton * button, mButtonHash.values()) + foreach (LXQtTaskButton * button, mButtonHash.values()) if (button->isOnDesktop(KWindowSystem::currentDesktop())) button->closeApplication(); } @@ -100,12 +100,12 @@ void LxQtTaskGroup::closeGroup() /************************************************ ************************************************/ -LxQtTaskButton * LxQtTaskGroup::addWindow(WId id) +LXQtTaskButton * LXQtTaskGroup::addWindow(WId id) { if (mButtonHash.contains(id)) return mButtonHash.value(id); - LxQtTaskButton *btn = new LxQtTaskButton(id, parentTaskBar(), mPopup); + LXQtTaskButton *btn = new LXQtTaskButton(id, parentTaskBar(), mPopup); btn->setToolButtonStyle(toolButtonStyle()); if (btn->isApplicationActive()) @@ -128,9 +128,9 @@ LxQtTaskButton * LxQtTaskGroup::addWindow(WId id) /************************************************ ************************************************/ -LxQtTaskButton * LxQtTaskGroup::checkedButton() const +LXQtTaskButton * LXQtTaskGroup::checkedButton() const { - foreach (LxQtTaskButton* button, mButtonHash.values()) + foreach (LXQtTaskButton* button, mButtonHash.values()) if (button->isChecked()) return button; @@ -140,9 +140,9 @@ LxQtTaskButton * LxQtTaskGroup::checkedButton() const /************************************************ ************************************************/ -LxQtTaskButton * LxQtTaskGroup::getNextPrevChildButton(bool next, bool circular) +LXQtTaskButton * LXQtTaskGroup::getNextPrevChildButton(bool next, bool circular) { - LxQtTaskButton *button = checkedButton(); + LXQtTaskButton *button = checkedButton(); int idx = mPopup->indexOf(button); int inc = next ? 1 : -1; idx += inc; @@ -175,7 +175,7 @@ LxQtTaskButton * LxQtTaskGroup::getNextPrevChildButton(bool next, bool circular) QLayoutItem *item = mPopup->itemAt(idx); if (item) { - button = qobject_cast(item->widget()); + button = qobject_cast(item->widget()); if (button->isVisibleTo(mPopup)) return button; } @@ -186,10 +186,10 @@ LxQtTaskButton * LxQtTaskGroup::getNextPrevChildButton(bool next, bool circular) /************************************************ ************************************************/ -void LxQtTaskGroup::onActiveWindowChanged(WId window) +void LXQtTaskGroup::onActiveWindowChanged(WId window) { - LxQtTaskButton *button = mButtonHash.value(window, nullptr); - foreach (LxQtTaskButton *btn, mButtonHash.values()) + LXQtTaskButton *button = mButtonHash.value(window, nullptr); + foreach (LXQtTaskButton *btn, mButtonHash.values()) btn->setChecked(false); if (button) @@ -204,7 +204,7 @@ void LxQtTaskGroup::onActiveWindowChanged(WId window) /************************************************ ************************************************/ -void LxQtTaskGroup::onDesktopChanged(int number) +void LXQtTaskGroup::onDesktopChanged(int number) { refreshVisibility(); } @@ -212,11 +212,11 @@ void LxQtTaskGroup::onDesktopChanged(int number) /************************************************ ************************************************/ -void LxQtTaskGroup::onWindowRemoved(WId window) +void LXQtTaskGroup::onWindowRemoved(WId window) { if (mButtonHash.contains(window)) { - LxQtTaskButton *button = mButtonHash.value(window); + LXQtTaskButton *button = mButtonHash.value(window); mButtonHash.remove(window); mPopup->removeWidget(button); button->deleteLater(); @@ -237,7 +237,7 @@ void LxQtTaskGroup::onWindowRemoved(WId window) /************************************************ ************************************************/ -void LxQtTaskGroup::onChildButtonClicked() +void LXQtTaskGroup::onChildButtonClicked() { setPopupVisible(false, true); } @@ -245,7 +245,7 @@ void LxQtTaskGroup::onChildButtonClicked() /************************************************ ************************************************/ -void LxQtTaskGroup::setToolButtonsStyle(Qt::ToolButtonStyle style) +void LXQtTaskGroup::setToolButtonsStyle(Qt::ToolButtonStyle style) { setToolButtonStyle(style); for (auto & button : mButtonHash) @@ -257,7 +257,7 @@ void LxQtTaskGroup::setToolButtonsStyle(Qt::ToolButtonStyle style) /************************************************ ************************************************/ -int LxQtTaskGroup::buttonsCount() const +int LXQtTaskGroup::buttonsCount() const { return mButtonHash.count(); } @@ -265,10 +265,10 @@ int LxQtTaskGroup::buttonsCount() const /************************************************ ************************************************/ -int LxQtTaskGroup::visibleButtonsCount() const +int LXQtTaskGroup::visibleButtonsCount() const { int i = 0; - foreach (LxQtTaskButton *btn, mButtonHash.values()) + foreach (LXQtTaskButton *btn, mButtonHash.values()) if (btn->isVisibleTo(mPopup)) i++; return i; @@ -277,7 +277,7 @@ int LxQtTaskGroup::visibleButtonsCount() const /************************************************ ************************************************/ -void LxQtTaskGroup::draggingTimerTimeout() +void LXQtTaskGroup::draggingTimerTimeout() { if (windowId()) setPopupVisible(false); @@ -286,7 +286,7 @@ void LxQtTaskGroup::draggingTimerTimeout() /************************************************ ************************************************/ -void LxQtTaskGroup::onClicked(bool) +void LXQtTaskGroup::onClicked(bool) { if (visibleButtonsCount() > 1) { @@ -298,7 +298,7 @@ void LxQtTaskGroup::onClicked(bool) /************************************************ ************************************************/ -void LxQtTaskGroup::regroup() +void LXQtTaskGroup::regroup() { int cont = visibleButtonsCount(); recalculateFrameIfVisible(); @@ -306,8 +306,8 @@ void LxQtTaskGroup::regroup() if (cont == 1) { // Get first visible button - LxQtTaskButton * button = NULL; - foreach (LxQtTaskButton *btn, mButtonHash.values()) + LXQtTaskButton * button = NULL; + foreach (LXQtTaskButton *btn, mButtonHash.values()) { if (btn->isVisibleTo(mPopup)) { @@ -337,7 +337,7 @@ void LxQtTaskGroup::regroup() /************************************************ ************************************************/ -void LxQtTaskGroup::showOnlySettingChanged() +void LXQtTaskGroup::showOnlySettingChanged() { refreshVisibility(); } @@ -345,12 +345,12 @@ void LxQtTaskGroup::showOnlySettingChanged() /************************************************ ************************************************/ -void LxQtTaskGroup::recalculateFrameIfVisible() +void LXQtTaskGroup::recalculateFrameIfVisible() { if (mPopup->isVisible()) { recalculateFrameSize(); - if (mPlugin->panel()->position() == ILxQtPanel::PositionBottom) + if (mPlugin->panel()->position() == ILXQtPanel::PositionBottom) recalculateFramePosition(); } } @@ -358,23 +358,23 @@ void LxQtTaskGroup::recalculateFrameIfVisible() /************************************************ ************************************************/ -void LxQtTaskGroup::setAutoRotation(bool value, ILxQtPanel::Position position) +void LXQtTaskGroup::setAutoRotation(bool value, ILXQtPanel::Position position) { - foreach (LxQtTaskButton *button, mButtonHash.values()) + foreach (LXQtTaskButton *button, mButtonHash.values()) button->setAutoRotation(false, position); - LxQtTaskButton::setAutoRotation(value, position); + LXQtTaskButton::setAutoRotation(value, position); } /************************************************ ************************************************/ -void LxQtTaskGroup::refreshVisibility() +void LXQtTaskGroup::refreshVisibility() { bool will = false; - LxQtTaskBar const * taskbar = parentTaskBar(); + LXQtTaskBar const * taskbar = parentTaskBar(); const int showDesktop = taskbar->showDesktopNum(); - foreach(LxQtTaskButton * btn, mButtonHash.values()) + foreach(LXQtTaskButton * btn, mButtonHash.values()) { bool visible = taskbar->isShowOnlyOneDesktopTasks() ? btn->isOnDesktop(0 == showDesktop ? KWindowSystem::currentDesktop() : showDesktop) : true; visible &= taskbar->isShowOnlyCurrentScreenTasks() ? btn->isOnCurrentScreen() : true; @@ -394,7 +394,7 @@ void LxQtTaskGroup::refreshVisibility() /************************************************ ************************************************/ -QMimeData * LxQtTaskGroup::mimeData() +QMimeData * LXQtTaskGroup::mimeData() { QMimeData *mimedata = new QMimeData; QByteArray byteArray; @@ -407,7 +407,7 @@ QMimeData * LxQtTaskGroup::mimeData() /************************************************ ************************************************/ -void LxQtTaskGroup::setPopupVisible(bool visible, bool fast) +void LXQtTaskGroup::setPopupVisible(bool visible, bool fast) { if (visible && !mPreventPopup && 0 == windowId()) { @@ -428,7 +428,7 @@ void LxQtTaskGroup::setPopupVisible(bool visible, bool fast) /************************************************ ************************************************/ -void LxQtTaskGroup::refreshIconsGeometry() +void LXQtTaskGroup::refreshIconsGeometry() { QRect rect = geometry(); rect.moveTo(mapToGlobal(QPoint(0, 0))); @@ -439,7 +439,7 @@ void LxQtTaskGroup::refreshIconsGeometry() return; } - foreach(LxQtTaskButton *but, mButtonHash.values()) + foreach(LXQtTaskButton *but, mButtonHash.values()) { but->refreshIconGeometry(rect); but->setIconSize(QSize(mPlugin->panel()->iconSize(), mPlugin->panel()->iconSize())); @@ -449,7 +449,7 @@ void LxQtTaskGroup::refreshIconsGeometry() /************************************************ ************************************************/ -QSize LxQtTaskGroup::recalculateFrameSize() +QSize LXQtTaskGroup::recalculateFrameSize() { int height = recalculateFrameHeight(); mPopup->setMaximumHeight(1000); @@ -468,7 +468,7 @@ QSize LxQtTaskGroup::recalculateFrameSize() /************************************************ ************************************************/ -int LxQtTaskGroup::recalculateFrameHeight() const +int LXQtTaskGroup::recalculateFrameHeight() const { int cont = visibleButtonsCount(); int h = !mPlugin->panel()->isHorizontal() && parentTaskBar()->isAutoRotate() ? width() : height(); @@ -478,7 +478,7 @@ int LxQtTaskGroup::recalculateFrameHeight() const /************************************************ ************************************************/ -int LxQtTaskGroup::recalculateFrameWidth() const +int LXQtTaskGroup::recalculateFrameWidth() const { // FIXME: 300? int minimum = 300; @@ -496,22 +496,22 @@ int LxQtTaskGroup::recalculateFrameWidth() const /************************************************ ************************************************/ -QPoint LxQtTaskGroup::recalculateFramePosition() +QPoint LXQtTaskGroup::recalculateFramePosition() { // Set position int x_offset = 0, y_offset = 0; switch (mPlugin->panel()->position()) { - case ILxQtPanel::PositionTop: + case ILXQtPanel::PositionTop: y_offset += height(); break; - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionBottom: y_offset = -recalculateFrameHeight(); break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: x_offset += width(); break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: x_offset = -recalculateFrameWidth(); break; } @@ -525,7 +525,7 @@ QPoint LxQtTaskGroup::recalculateFramePosition() /************************************************ ************************************************/ -void LxQtTaskGroup::leaveEvent(QEvent *event) +void LXQtTaskGroup::leaveEvent(QEvent *event) { setPopupVisible(false); QToolButton::leaveEvent(event); @@ -534,7 +534,7 @@ void LxQtTaskGroup::leaveEvent(QEvent *event) /************************************************ ************************************************/ -void LxQtTaskGroup::enterEvent(QEvent *event) +void LXQtTaskGroup::enterEvent(QEvent *event) { QToolButton::enterEvent(event); @@ -548,21 +548,21 @@ void LxQtTaskGroup::enterEvent(QEvent *event) /************************************************ ************************************************/ -void LxQtTaskGroup::dragEnterEvent(QDragEnterEvent *event) +void LXQtTaskGroup::dragEnterEvent(QDragEnterEvent *event) { sDraggging = true; // only show the popup if we aren't dragging a taskgroup if (!event->mimeData()->hasFormat(mimeDataFormat())) { setPopupVisible(true); - LxQtTaskButton::dragEnterEvent(event); + LXQtTaskButton::dragEnterEvent(event); } } /************************************************ ************************************************/ -void LxQtTaskGroup::dragLeaveEvent(QDragLeaveEvent *event) +void LXQtTaskGroup::dragLeaveEvent(QDragLeaveEvent *event) { // if draggind something into the taskgroup or the taskgroups' popup, // do not close the popup @@ -570,24 +570,24 @@ void LxQtTaskGroup::dragLeaveEvent(QDragLeaveEvent *event) setPopupVisible(false); else sDraggging = false; - LxQtTaskButton::dragLeaveEvent(event); + LXQtTaskButton::dragLeaveEvent(event); } -void LxQtTaskGroup::mouseMoveEvent(QMouseEvent* event) +void LXQtTaskGroup::mouseMoveEvent(QMouseEvent* event) { // if dragging the taskgroup, do not show the popup setPopupVisible(false, true); - LxQtTaskButton::mouseMoveEvent(event); + LXQtTaskButton::mouseMoveEvent(event); } /************************************************ ************************************************/ -bool LxQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) +bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) { bool consumed{false}; bool needsRefreshVisibility{false}; - QVector buttons; + QVector buttons; if (mButtonHash.contains(window)) buttons.append(mButtonHash.value(window)); @@ -595,7 +595,7 @@ bool LxQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Prope if (window == windowId()) buttons.append(this); - foreach (LxQtTaskButton * button, buttons) + foreach (LXQtTaskButton * button, buttons) { consumed = true; // if class is changed the window won't belong to our group any more diff --git a/plugin-taskbar/lxqttaskgroup.h b/plugin-taskbar/lxqttaskgroup.h index 040bd1a..8097453 100644 --- a/plugin-taskbar/lxqttaskgroup.h +++ b/plugin-taskbar/lxqttaskgroup.h @@ -40,17 +40,17 @@ #include class QVBoxLayout; -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; -class LxQtGroupPopup; -class LxQtMasterPopup; +class LXQtGroupPopup; +class LXQtMasterPopup; -class LxQtTaskGroup: public LxQtTaskButton +class LXQtTaskGroup: public LXQtTaskButton { Q_OBJECT public: - LxQtTaskGroup(const QString & groupName, QIcon icon ,ILxQtPanelPlugin * plugin, LxQtTaskBar * parent); + LXQtTaskGroup(const QString & groupName, QIcon icon ,ILXQtPanelPlugin * plugin, LXQtTaskBar * parent); QString groupName() const { return mGroupName; } @@ -58,17 +58,17 @@ public: int buttonsCount() const; int visibleButtonsCount() const; - LxQtTaskButton * addWindow(WId id); - LxQtTaskButton * checkedButton() const; + LXQtTaskButton * addWindow(WId id); + LXQtTaskButton * checkedButton() const; // Returns the next or the previous button in the popup // if circular is true, then it will go around the list of buttons - LxQtTaskButton * getNextPrevChildButton(bool next, bool circular); + LXQtTaskButton * getNextPrevChildButton(bool next, bool circular); bool onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2); void refreshIconsGeometry(); void showOnlySettingChanged(); - void setAutoRotation(bool value, ILxQtPanel::Position position); + void setAutoRotation(bool value, ILXQtPanel::Position position); void setToolButtonsStyle(Qt::ToolButtonStyle style); void setPopupVisible(bool visible = true, bool fast = false); @@ -101,14 +101,14 @@ private slots: signals: void groupBecomeEmpty(QString name); void visibilityChanged(bool visible); - void popupShown(LxQtTaskGroup* sender); + void popupShown(LXQtTaskGroup* sender); void windowDisowned(WId window); private: QString mGroupName; - LxQtGroupPopup * mPopup; - LxQtTaskButtonHash mButtonHash; - ILxQtPanelPlugin * mPlugin; + LXQtGroupPopup * mPopup; + LXQtTaskButtonHash mButtonHash; + ILXQtPanelPlugin * mPlugin; bool mPreventPopup; QSize recalculateFrameSize(); diff --git a/plugin-taskbar/resources/taskbar.desktop.in b/plugin-taskbar/resources/taskbar.desktop.in index 48840b0..e92b943 100644 --- a/plugin-taskbar/resources/taskbar.desktop.in +++ b/plugin-taskbar/resources/taskbar.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications Icon=window-duplicate diff --git a/plugin-taskbar/translations/taskbar.ts b/plugin-taskbar/translations/taskbar.ts index 62d8e35..a948819 100644 --- a/plugin-taskbar/translations/taskbar.ts +++ b/plugin-taskbar/translations/taskbar.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_ar.desktop b/plugin-taskbar/translations/taskbar_ar.desktop index bcf2a28..9fee415 100644 --- a/plugin-taskbar/translations/taskbar_ar.desktop +++ b/plugin-taskbar/translations/taskbar_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ar.ts b/plugin-taskbar/translations/taskbar_ar.ts index 1cde641..b6f7062 100644 --- a/plugin-taskbar/translations/taskbar_ar.ts +++ b/plugin-taskbar/translations/taskbar_ar.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings إعدادات مدير مهام ريزر diff --git a/plugin-taskbar/translations/taskbar_cs.desktop b/plugin-taskbar/translations/taskbar_cs.desktop index 4ad2449..bc5a0d5 100644 --- a/plugin-taskbar/translations/taskbar_cs.desktop +++ b/plugin-taskbar/translations/taskbar_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_cs.ts b/plugin-taskbar/translations/taskbar_cs.ts index 6605eb1..682f0e7 100644 --- a/plugin-taskbar/translations/taskbar_cs.ts +++ b/plugin-taskbar/translations/taskbar_cs.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Nastavení správce úkolů diff --git a/plugin-taskbar/translations/taskbar_cs_CZ.desktop b/plugin-taskbar/translations/taskbar_cs_CZ.desktop index bde7a03..cf22953 100644 --- a/plugin-taskbar/translations/taskbar_cs_CZ.desktop +++ b/plugin-taskbar/translations/taskbar_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_cs_CZ.ts b/plugin-taskbar/translations/taskbar_cs_CZ.ts index c80ae3b..8662eab 100644 --- a/plugin-taskbar/translations/taskbar_cs_CZ.ts +++ b/plugin-taskbar/translations/taskbar_cs_CZ.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Nastavení správce úkolů diff --git a/plugin-taskbar/translations/taskbar_da.desktop b/plugin-taskbar/translations/taskbar_da.desktop index c3d5310..9489fe0 100644 --- a/plugin-taskbar/translations/taskbar_da.desktop +++ b/plugin-taskbar/translations/taskbar_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_da.ts b/plugin-taskbar/translations/taskbar_da.ts index c805b8d..3f3f176 100644 --- a/plugin-taskbar/translations/taskbar_da.ts +++ b/plugin-taskbar/translations/taskbar_da.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings LXQt Opgavehåndtering Indstillinger diff --git a/plugin-taskbar/translations/taskbar_da_DK.desktop b/plugin-taskbar/translations/taskbar_da_DK.desktop index fc3d830..f6c0b1d 100644 --- a/plugin-taskbar/translations/taskbar_da_DK.desktop +++ b/plugin-taskbar/translations/taskbar_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_da_DK.ts b/plugin-taskbar/translations/taskbar_da_DK.ts index adc69ba..20fd4b3 100644 --- a/plugin-taskbar/translations/taskbar_da_DK.ts +++ b/plugin-taskbar/translations/taskbar_da_DK.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt Jobliste Indstillinger + LXQt Task Manager Settings + LXQt Jobliste Indstillinger Window List Content diff --git a/plugin-taskbar/translations/taskbar_de.ts b/plugin-taskbar/translations/taskbar_de.ts index 834a0de..c29299e 100644 --- a/plugin-taskbar/translations/taskbar_de.ts +++ b/plugin-taskbar/translations/taskbar_de.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_el.desktop b/plugin-taskbar/translations/taskbar_el.desktop new file mode 100644 index 0000000..30b8fbe --- /dev/null +++ b/plugin-taskbar/translations/taskbar_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Διαχειριστής εργασιών +Comment[el]=Εναλλαγή μεταξύ των εκτελούμενων εφαρμογών diff --git a/plugin-taskbar/translations/taskbar_el_GR.ts b/plugin-taskbar/translations/taskbar_el.ts similarity index 76% rename from plugin-taskbar/translations/taskbar_el_GR.ts rename to plugin-taskbar/translations/taskbar_el.ts index c7b06a1..44cd9df 100644 --- a/plugin-taskbar/translations/taskbar_el_GR.ts +++ b/plugin-taskbar/translations/taskbar_el.ts @@ -1,8 +1,8 @@ - + - LxQtTaskButton + LXQtTaskButton Application @@ -66,7 +66,7 @@ &Layer - Στ&ρώμα + Στ&ρώση @@ -90,98 +90,98 @@ - LxQtTaskGroup + LXQtTaskGroup Group - + Ομάδα Close group - + Κλείσιμο της ομάδας - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Ρυθμίσεις διαχειριστή εργασιών LxQt + LXQt Task Manager Settings + Ρυθμίσεις του διαχειριστή εργασιών LXQt Window List Content - Περιεχόμενο λίστας παραθύρου + Περιεχόμενο της λίστας των παραθύρων Task Manager Settings - + Ρυθμίσεις του διαχειριστή εργασιών General - + Γενικά Show windows from c&urrent desktop - + Εμφάνιση των παραθύρων της &τρέχουσας επιφάνειας εργασίας Show windows from all des&ktops - + Εμφάνιση των παραθύρων &όλων των επιφανειών εργασίας Window &grouping - + Ομα&δοποίηση των παραθύρων Show popup on mouse hover - + Εμφάνιση αναδυόμενου κατά το πέρασμα του ποντικιού Appearance - + Εμφάνιση Maximum button width - + Μέγιστο πλάτος κουμπιού px - + εικ Show windows from current desktop - Εμφάνιση παραθύρων από την τρέχουσα επιφάνεια εργασίας + Εμφάνιση των παραθύρων της τρέχουσας επιφάνειας εργασίας Show windows from all desktops - Εμφάνιση παραθύρων από όλες τις επιφάνειες εργασίας + Εμφάνιση παραθύρων όλων των επιφανειών εργασίας Auto&rotate buttons when the panel is vertical - + &Αυτόματη περιστροφή των κουμπιών όταν ο πίνακας είναι τοποθετημένος κάθετα Window List Appearance - Εμφάνιση λίστας παραθύρων + Εμφάνιση της λίστας των παραθύρων Button style - Στυλ πλήκτρου + Ύφος του πλήκτρου Max button width - Μέγιστο πλάτος πλήκτρου + Μέγιστο πλάτος πλήκτρου diff --git a/plugin-taskbar/translations/taskbar_el_GR.desktop b/plugin-taskbar/translations/taskbar_el_GR.desktop deleted file mode 100644 index ae9fb20..0000000 --- a/plugin-taskbar/translations/taskbar_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Task manager -Comment=Switch between running applications - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Εναλλαγή μεταξύ εκτελούμενων εφαρμογών -Name[el_GR]=Διαχειριστής εργασιών diff --git a/plugin-taskbar/translations/taskbar_eo.desktop b/plugin-taskbar/translations/taskbar_eo.desktop index 3e6685b..665cfb0 100644 --- a/plugin-taskbar/translations/taskbar_eo.desktop +++ b/plugin-taskbar/translations/taskbar_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_eo.ts b/plugin-taskbar/translations/taskbar_eo.ts index 61663db..c44c8e8 100644 --- a/plugin-taskbar/translations/taskbar_eo.ts +++ b/plugin-taskbar/translations/taskbar_eo.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Agordoj de taskmastrumilo de LxQto + LXQt Task Manager Settings + Agordoj de taskmastrumilo de LXQto Window List Content diff --git a/plugin-taskbar/translations/taskbar_es.desktop b/plugin-taskbar/translations/taskbar_es.desktop index f9db5a4..09a836c 100644 --- a/plugin-taskbar/translations/taskbar_es.desktop +++ b/plugin-taskbar/translations/taskbar_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_es.ts b/plugin-taskbar/translations/taskbar_es.ts index 8789602..c2968af 100644 --- a/plugin-taskbar/translations/taskbar_es.ts +++ b/plugin-taskbar/translations/taskbar_es.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Opciones del administrador de tareas de LxQt + LXQt Task Manager Settings + Opciones del administrador de tareas de LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_es_VE.desktop b/plugin-taskbar/translations/taskbar_es_VE.desktop index 2c3841d..02400a0 100644 --- a/plugin-taskbar/translations/taskbar_es_VE.desktop +++ b/plugin-taskbar/translations/taskbar_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_es_VE.ts b/plugin-taskbar/translations/taskbar_es_VE.ts index d1d9baa..37c91b8 100644 --- a/plugin-taskbar/translations/taskbar_es_VE.ts +++ b/plugin-taskbar/translations/taskbar_es_VE.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Configuaracion de lista de tareas LxQt + LXQt Task Manager Settings + Configuaracion de lista de tareas LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_eu.desktop b/plugin-taskbar/translations/taskbar_eu.desktop index b585e0b..5658f4e 100644 --- a/plugin-taskbar/translations/taskbar_eu.desktop +++ b/plugin-taskbar/translations/taskbar_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_eu.ts b/plugin-taskbar/translations/taskbar_eu.ts index dee7fdc..6601ca5 100644 --- a/plugin-taskbar/translations/taskbar_eu.ts +++ b/plugin-taskbar/translations/taskbar_eu.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt ataza-kudeatzailearen ezarpenak + LXQt Task Manager Settings + LXQt ataza-kudeatzailearen ezarpenak Window List Content diff --git a/plugin-taskbar/translations/taskbar_fi.desktop b/plugin-taskbar/translations/taskbar_fi.desktop index 6485070..be621c2 100644 --- a/plugin-taskbar/translations/taskbar_fi.desktop +++ b/plugin-taskbar/translations/taskbar_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_fi.ts b/plugin-taskbar/translations/taskbar_fi.ts index 3a74d08..916136f 100644 --- a/plugin-taskbar/translations/taskbar_fi.ts +++ b/plugin-taskbar/translations/taskbar_fi.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt:n tehtävienhallinnan asetukset + LXQt Task Manager Settings + LXQt:n tehtävienhallinnan asetukset Window List Content diff --git a/plugin-taskbar/translations/taskbar_fr_FR.desktop b/plugin-taskbar/translations/taskbar_fr_FR.desktop index 528a962..77c1c4c 100644 --- a/plugin-taskbar/translations/taskbar_fr_FR.desktop +++ b/plugin-taskbar/translations/taskbar_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_fr_FR.ts b/plugin-taskbar/translations/taskbar_fr_FR.ts index dec8095..524f6d1 100644 --- a/plugin-taskbar/translations/taskbar_fr_FR.ts +++ b/plugin-taskbar/translations/taskbar_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Paramètres du gestionnaire des tâches de LxQt + LXQt Task Manager Settings + Paramètres du gestionnaire des tâches de LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_hu.desktop b/plugin-taskbar/translations/taskbar_hu.desktop index 22f402c..05bc3d6 100644 --- a/plugin-taskbar/translations/taskbar_hu.desktop +++ b/plugin-taskbar/translations/taskbar_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_hu.ts b/plugin-taskbar/translations/taskbar_hu.ts index 7a812d1..78334d5 100644 --- a/plugin-taskbar/translations/taskbar_hu.ts +++ b/plugin-taskbar/translations/taskbar_hu.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - A LxQt feladatkezelő beállításai + LXQt Task Manager Settings + A LXQt feladatkezelő beállításai Window List Content diff --git a/plugin-taskbar/translations/taskbar_hu_HU.ts b/plugin-taskbar/translations/taskbar_hu_HU.ts index f6c594a..11ffcfd 100644 --- a/plugin-taskbar/translations/taskbar_hu_HU.ts +++ b/plugin-taskbar/translations/taskbar_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - A LxQt feladatkezelő beállításai + LXQt Task Manager Settings + A LXQt feladatkezelő beállításai Window List Content diff --git a/plugin-taskbar/translations/taskbar_ia.desktop b/plugin-taskbar/translations/taskbar_ia.desktop index 796c9bb..1f7891d 100644 --- a/plugin-taskbar/translations/taskbar_ia.desktop +++ b/plugin-taskbar/translations/taskbar_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task Manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ia.ts b/plugin-taskbar/translations/taskbar_ia.ts index 95354c3..dbabdfb 100644 --- a/plugin-taskbar/translations/taskbar_ia.ts +++ b/plugin-taskbar/translations/taskbar_ia.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_id_ID.desktop b/plugin-taskbar/translations/taskbar_id_ID.desktop index 796c9bb..1f7891d 100644 --- a/plugin-taskbar/translations/taskbar_id_ID.desktop +++ b/plugin-taskbar/translations/taskbar_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task Manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_id_ID.ts b/plugin-taskbar/translations/taskbar_id_ID.ts index 959e2d1..68bd93f 100644 --- a/plugin-taskbar/translations/taskbar_id_ID.ts +++ b/plugin-taskbar/translations/taskbar_id_ID.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_it_IT.desktop b/plugin-taskbar/translations/taskbar_it_IT.desktop index 2788eb9..cf00fdf 100644 --- a/plugin-taskbar/translations/taskbar_it_IT.desktop +++ b/plugin-taskbar/translations/taskbar_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_it_IT.ts b/plugin-taskbar/translations/taskbar_it_IT.ts index f6498a8..117934d 100644 --- a/plugin-taskbar/translations/taskbar_it_IT.ts +++ b/plugin-taskbar/translations/taskbar_it_IT.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Impostazioni del Task Manager di LXQt diff --git a/plugin-taskbar/translations/taskbar_ja.desktop b/plugin-taskbar/translations/taskbar_ja.desktop index af8e794..4b0ebaa 100644 --- a/plugin-taskbar/translations/taskbar_ja.desktop +++ b/plugin-taskbar/translations/taskbar_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ja.ts b/plugin-taskbar/translations/taskbar_ja.ts index b81a168..8fb6941 100644 --- a/plugin-taskbar/translations/taskbar_ja.ts +++ b/plugin-taskbar/translations/taskbar_ja.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_ko.desktop b/plugin-taskbar/translations/taskbar_ko.desktop index 796c9bb..1f7891d 100644 --- a/plugin-taskbar/translations/taskbar_ko.desktop +++ b/plugin-taskbar/translations/taskbar_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task Manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ko.ts b/plugin-taskbar/translations/taskbar_ko.ts index 2b1d173..14bd851 100644 --- a/plugin-taskbar/translations/taskbar_ko.ts +++ b/plugin-taskbar/translations/taskbar_ko.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_lt.desktop b/plugin-taskbar/translations/taskbar_lt.desktop index 09b4c1b..9619591 100644 --- a/plugin-taskbar/translations/taskbar_lt.desktop +++ b/plugin-taskbar/translations/taskbar_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_lt.ts b/plugin-taskbar/translations/taskbar_lt.ts index 81bcf69..c17039b 100644 --- a/plugin-taskbar/translations/taskbar_lt.ts +++ b/plugin-taskbar/translations/taskbar_lt.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt užduočių tvarkutyvės nuostatos + LXQt Task Manager Settings + LXQt užduočių tvarkutyvės nuostatos Window List Content diff --git a/plugin-taskbar/translations/taskbar_nl.desktop b/plugin-taskbar/translations/taskbar_nl.desktop index cce1496..618d01a 100644 --- a/plugin-taskbar/translations/taskbar_nl.desktop +++ b/plugin-taskbar/translations/taskbar_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_nl.ts b/plugin-taskbar/translations/taskbar_nl.ts index 2e5a87b..506d006 100644 --- a/plugin-taskbar/translations/taskbar_nl.ts +++ b/plugin-taskbar/translations/taskbar_nl.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Instellingen voor taakbeheerder van LxQt + LXQt Task Manager Settings + Instellingen voor taakbeheerder van LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_pl.desktop b/plugin-taskbar/translations/taskbar_pl.desktop index 251074c..c5082ab 100644 --- a/plugin-taskbar/translations/taskbar_pl.desktop +++ b/plugin-taskbar/translations/taskbar_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_pl_PL.desktop b/plugin-taskbar/translations/taskbar_pl_PL.desktop index ae01ac8..65e9c18 100644 --- a/plugin-taskbar/translations/taskbar_pl_PL.desktop +++ b/plugin-taskbar/translations/taskbar_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_pl_PL.ts b/plugin-taskbar/translations/taskbar_pl_PL.ts index c14f3dd..f69f07b 100644 --- a/plugin-taskbar/translations/taskbar_pl_PL.ts +++ b/plugin-taskbar/translations/taskbar_pl_PL.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Ustawienia listy zadań LxQt + LXQt Task Manager Settings + Ustawienia listy zadań LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_pt.desktop b/plugin-taskbar/translations/taskbar_pt.desktop index 2c03a41..7d03bf2 100644 --- a/plugin-taskbar/translations/taskbar_pt.desktop +++ b/plugin-taskbar/translations/taskbar_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_pt.ts b/plugin-taskbar/translations/taskbar_pt.ts index e121959..5fe1d5e 100644 --- a/plugin-taskbar/translations/taskbar_pt.ts +++ b/plugin-taskbar/translations/taskbar_pt.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Definições do gestor de tarefas LxQt + LXQt Task Manager Settings + Definições do gestor de tarefas LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_pt_BR.desktop b/plugin-taskbar/translations/taskbar_pt_BR.desktop index 9ea13e3..e971bbe 100644 --- a/plugin-taskbar/translations/taskbar_pt_BR.desktop +++ b/plugin-taskbar/translations/taskbar_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_pt_BR.ts b/plugin-taskbar/translations/taskbar_pt_BR.ts index cb6db4e..d702762 100644 --- a/plugin-taskbar/translations/taskbar_pt_BR.ts +++ b/plugin-taskbar/translations/taskbar_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Configurações do gerenciador de tarefas do LxQt + LXQt Task Manager Settings + Configurações do gerenciador de tarefas do LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_ro_RO.desktop b/plugin-taskbar/translations/taskbar_ro_RO.desktop index 005309c..9daf041 100644 --- a/plugin-taskbar/translations/taskbar_ro_RO.desktop +++ b/plugin-taskbar/translations/taskbar_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ro_RO.ts b/plugin-taskbar/translations/taskbar_ro_RO.ts index a0ad0d3..dd208fc 100644 --- a/plugin-taskbar/translations/taskbar_ro_RO.ts +++ b/plugin-taskbar/translations/taskbar_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Window List Content Conținut listă ferestre diff --git a/plugin-taskbar/translations/taskbar_ru.desktop b/plugin-taskbar/translations/taskbar_ru.desktop index e049334..06b02d5 100644 --- a/plugin-taskbar/translations/taskbar_ru.desktop +++ b/plugin-taskbar/translations/taskbar_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ru.ts b/plugin-taskbar/translations/taskbar_ru.ts index 5e9cda9..db02412 100644 --- a/plugin-taskbar/translations/taskbar_ru.ts +++ b/plugin-taskbar/translations/taskbar_ru.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_ru_RU.desktop b/plugin-taskbar/translations/taskbar_ru_RU.desktop index d58c7bf..f271705 100644 --- a/plugin-taskbar/translations/taskbar_ru_RU.desktop +++ b/plugin-taskbar/translations/taskbar_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_ru_RU.ts b/plugin-taskbar/translations/taskbar_ru_RU.ts index 02202d0..f2db1c4 100644 --- a/plugin-taskbar/translations/taskbar_ru_RU.ts +++ b/plugin-taskbar/translations/taskbar_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_sk.desktop b/plugin-taskbar/translations/taskbar_sk.desktop index ed38f45..e300777 100644 --- a/plugin-taskbar/translations/taskbar_sk.desktop +++ b/plugin-taskbar/translations/taskbar_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_sk_SK.ts b/plugin-taskbar/translations/taskbar_sk_SK.ts index ba7c83c..0fcb053 100644 --- a/plugin-taskbar/translations/taskbar_sk_SK.ts +++ b/plugin-taskbar/translations/taskbar_sk_SK.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Nastavenia správcu úloh prostredia LxQt + LXQt Task Manager Settings + Nastavenia správcu úloh prostredia LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_sl.desktop b/plugin-taskbar/translations/taskbar_sl.desktop index 808db85..ddd4b89 100644 --- a/plugin-taskbar/translations/taskbar_sl.desktop +++ b/plugin-taskbar/translations/taskbar_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_sl.ts b/plugin-taskbar/translations/taskbar_sl.ts index 155fda5..b338739 100644 --- a/plugin-taskbar/translations/taskbar_sl.ts +++ b/plugin-taskbar/translations/taskbar_sl.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - Nastavitve upravitelja opravil za LxQt + LXQt Task Manager Settings + Nastavitve upravitelja opravil za LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_sr.desktop b/plugin-taskbar/translations/taskbar_sr.desktop index 947c212..08469d4 100644 --- a/plugin-taskbar/translations/taskbar_sr.desktop +++ b/plugin-taskbar/translations/taskbar_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_sr@latin.desktop b/plugin-taskbar/translations/taskbar_sr@latin.desktop index a392965..894942d 100644 --- a/plugin-taskbar/translations/taskbar_sr@latin.desktop +++ b/plugin-taskbar/translations/taskbar_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_sr@latin.ts b/plugin-taskbar/translations/taskbar_sr@latin.ts index fbde286..75ad954 100644 --- a/plugin-taskbar/translations/taskbar_sr@latin.ts +++ b/plugin-taskbar/translations/taskbar_sr@latin.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,7 +103,7 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration Task Manager Settings diff --git a/plugin-taskbar/translations/taskbar_sr_BA.ts b/plugin-taskbar/translations/taskbar_sr_BA.ts index 82ab86e..d21eb03 100644 --- a/plugin-taskbar/translations/taskbar_sr_BA.ts +++ b/plugin-taskbar/translations/taskbar_sr_BA.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Подешавања менаџера задатака diff --git a/plugin-taskbar/translations/taskbar_sr_RS.ts b/plugin-taskbar/translations/taskbar_sr_RS.ts index 2409003..32b5803 100644 --- a/plugin-taskbar/translations/taskbar_sr_RS.ts +++ b/plugin-taskbar/translations/taskbar_sr_RS.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Подешавања менаџера задатака diff --git a/plugin-taskbar/translations/taskbar_th_TH.desktop b/plugin-taskbar/translations/taskbar_th_TH.desktop index 0acbbb5..1911a89 100644 --- a/plugin-taskbar/translations/taskbar_th_TH.desktop +++ b/plugin-taskbar/translations/taskbar_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_th_TH.ts b/plugin-taskbar/translations/taskbar_th_TH.ts index 0ca915e..ccb7abd 100644 --- a/plugin-taskbar/translations/taskbar_th_TH.ts +++ b/plugin-taskbar/translations/taskbar_th_TH.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - ค่าตั้งตัวจัดการงาน LxQt + LXQt Task Manager Settings + ค่าตั้งตัวจัดการงาน LXQt Window List Content diff --git a/plugin-taskbar/translations/taskbar_tr.desktop b/plugin-taskbar/translations/taskbar_tr.desktop index fdbbc97..d76a76f 100644 --- a/plugin-taskbar/translations/taskbar_tr.desktop +++ b/plugin-taskbar/translations/taskbar_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_tr.ts b/plugin-taskbar/translations/taskbar_tr.ts index 862ae07..49cde65 100644 --- a/plugin-taskbar/translations/taskbar_tr.ts +++ b/plugin-taskbar/translations/taskbar_tr.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt Görev Yöneticisi Ayarları + LXQt Task Manager Settings + LXQt Görev Yöneticisi Ayarları Window List Content diff --git a/plugin-taskbar/translations/taskbar_uk.desktop b/plugin-taskbar/translations/taskbar_uk.desktop index 1219f40..a51ec79 100644 --- a/plugin-taskbar/translations/taskbar_uk.desktop +++ b/plugin-taskbar/translations/taskbar_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_uk.ts b/plugin-taskbar/translations/taskbar_uk.ts index 5752841..50ae185 100644 --- a/plugin-taskbar/translations/taskbar_uk.ts +++ b/plugin-taskbar/translations/taskbar_uk.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,9 +103,9 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings + LXQt Task Manager Settings Налаштування списку вікон diff --git a/plugin-taskbar/translations/taskbar_zh_CN.GB2312.desktop b/plugin-taskbar/translations/taskbar_zh_CN.GB2312.desktop index 796c9bb..1f7891d 100644 --- a/plugin-taskbar/translations/taskbar_zh_CN.GB2312.desktop +++ b/plugin-taskbar/translations/taskbar_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task Manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_zh_CN.desktop b/plugin-taskbar/translations/taskbar_zh_CN.desktop index 0afacc1..37f910d 100644 --- a/plugin-taskbar/translations/taskbar_zh_CN.desktop +++ b/plugin-taskbar/translations/taskbar_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_zh_CN.ts b/plugin-taskbar/translations/taskbar_zh_CN.ts index 15b1eb9..66a7e0b 100644 --- a/plugin-taskbar/translations/taskbar_zh_CN.ts +++ b/plugin-taskbar/translations/taskbar_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt任务管理器设置 + LXQt Task Manager Settings + LXQt任务管理器设置 Window List Content diff --git a/plugin-taskbar/translations/taskbar_zh_TW.desktop b/plugin-taskbar/translations/taskbar_zh_TW.desktop index dc5d003..3519097 100644 --- a/plugin-taskbar/translations/taskbar_zh_TW.desktop +++ b/plugin-taskbar/translations/taskbar_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Task manager Comment=Switch between running applications diff --git a/plugin-taskbar/translations/taskbar_zh_TW.ts b/plugin-taskbar/translations/taskbar_zh_TW.ts index 99f0b23..3c63f3f 100644 --- a/plugin-taskbar/translations/taskbar_zh_TW.ts +++ b/plugin-taskbar/translations/taskbar_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtTaskButton + LXQtTaskButton Application @@ -90,7 +90,7 @@ - LxQtTaskGroup + LXQtTaskGroup Group @@ -103,10 +103,10 @@ - LxQtTaskbarConfiguration + LXQtTaskbarConfiguration - LxQt Task Manager Settings - LxQt工作管理員設定 + LXQt Task Manager Settings + LXQt工作管理員設定 Window List Content diff --git a/plugin-tray/lxqttray.cpp b/plugin-tray/lxqttray.cpp index 83736d4..5cae55a 100644 --- a/plugin-tray/lxqttray.cpp +++ b/plugin-tray/lxqttray.cpp @@ -66,7 +66,7 @@ /************************************************ ************************************************/ -LxQtTray::LxQtTray(ILxQtPanelPlugin *plugin, QWidget *parent): +LXQtTray::LXQtTray(ILXQtPanelPlugin *plugin, QWidget *parent): QFrame(parent), mValid(false), mTrayId(0), @@ -76,7 +76,7 @@ LxQtTray::LxQtTray(ILxQtPanelPlugin *plugin, QWidget *parent): mPlugin(plugin), mDisplay(QX11Info::display()) { - mLayout = new LxQt::GridLayout(this); + mLayout = new LXQt::GridLayout(this); realign(); _NET_SYSTEM_TRAY_OPCODE = XfitMan::atom("_NET_SYSTEM_TRAY_OPCODE"); // Init the selection later just to ensure that no signals are sent until @@ -88,7 +88,7 @@ LxQtTray::LxQtTray(ILxQtPanelPlugin *plugin, QWidget *parent): /************************************************ ************************************************/ -LxQtTray::~LxQtTray() +LXQtTray::~LXQtTray() { stopTray(); } @@ -97,7 +97,7 @@ LxQtTray::~LxQtTray() /************************************************ ************************************************/ -bool LxQtTray::nativeEventFilter(const QByteArray &eventType, void *message, long *) +bool LXQtTray::nativeEventFilter(const QByteArray &eventType, void *message, long *) { if (eventType != "xcb_generic_event_t") return false; @@ -148,10 +148,10 @@ bool LxQtTray::nativeEventFilter(const QByteArray &eventType, void *message, lon /************************************************ ************************************************/ -void LxQtTray::realign() +void LXQtTray::realign() { mLayout->setEnabled(false); - ILxQtPanel *panel = mPlugin->panel(); + ILXQtPanel *panel = mPlugin->panel(); if (panel->isHorizontal()) { @@ -170,7 +170,7 @@ void LxQtTray::realign() /************************************************ ************************************************/ -void LxQtTray::clientMessageEvent(xcb_generic_event_t *e) +void LXQtTray::clientMessageEvent(xcb_generic_event_t *e) { unsigned long opcode; unsigned long message_type; @@ -209,7 +209,7 @@ void LxQtTray::clientMessageEvent(xcb_generic_event_t *e) /************************************************ ************************************************/ -TrayIcon* LxQtTray::findIcon(Window id) +TrayIcon* LXQtTray::findIcon(Window id) { foreach(TrayIcon* icon, mIcons) { @@ -223,7 +223,7 @@ TrayIcon* LxQtTray::findIcon(Window id) /************************************************ ************************************************/ -void LxQtTray::setIconSize(QSize iconSize) +void LXQtTray::setIconSize(QSize iconSize) { mIconSize = iconSize; unsigned long size = qMin(mIconSize.width(), mIconSize.height()); @@ -241,7 +241,7 @@ void LxQtTray::setIconSize(QSize iconSize) /************************************************ ************************************************/ -VisualID LxQtTray::getVisual() +VisualID LXQtTray::getVisual() { VisualID visualId = 0; Display* dsp = mDisplay; @@ -279,7 +279,7 @@ VisualID LxQtTray::getVisual() /************************************************ freedesktop systray specification ************************************************/ -void LxQtTray::startTray() +void LXQtTray::startTray() { Display* dsp = mDisplay; Window root = QX11Info::appRootWindow(); @@ -357,7 +357,7 @@ void LxQtTray::startTray() /************************************************ ************************************************/ -void LxQtTray::stopTray() +void LXQtTray::stopTray() { qDeleteAll(mIcons); if (mTrayId) @@ -372,7 +372,7 @@ void LxQtTray::stopTray() /************************************************ ************************************************/ -void LxQtTray::addIcon(Window winId) +void LXQtTray::addIcon(Window winId) { TrayIcon* icon = new TrayIcon(winId, this); if (!icon->isValid()) diff --git a/plugin-tray/lxqttray.h b/plugin-tray/lxqttray.h index 20ab76b..457085e 100644 --- a/plugin-tray/lxqttray.h +++ b/plugin-tray/lxqttray.h @@ -39,22 +39,22 @@ class TrayIcon; class QSize; -namespace LxQt { +namespace LXQt { class GridLayout; } /** * @brief This makes our trayplugin */ -class ILxQtPanelPlugin; +class ILXQtPanelPlugin; -class LxQtTray: public QFrame, QAbstractNativeEventFilter +class LXQtTray: public QFrame, QAbstractNativeEventFilter { Q_OBJECT Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) public: - LxQtTray(ILxQtPanelPlugin *plugin, QWidget* parent = 0); - ~LxQtTray(); + LXQtTray(ILXQtPanelPlugin *plugin, QWidget* parent = 0); + ~LXQtTray(); QSize iconSize() const { return mIconSize; } @@ -92,8 +92,8 @@ private: int mDamageEvent; int mDamageError; QSize mIconSize; - LxQt::GridLayout *mLayout; - ILxQtPanelPlugin *mPlugin; + LXQt::GridLayout *mLayout; + ILXQtPanelPlugin *mPlugin; Atom _NET_SYSTEM_TRAY_OPCODE; Display* mDisplay; }; diff --git a/plugin-tray/lxqttrayplugin.cpp b/plugin-tray/lxqttrayplugin.cpp index f7c8a09..b5db900 100644 --- a/plugin-tray/lxqttrayplugin.cpp +++ b/plugin-tray/lxqttrayplugin.cpp @@ -29,24 +29,24 @@ #include "lxqttrayplugin.h" #include "lxqttray.h" -LxQtTrayPlugin::LxQtTrayPlugin(const ILxQtPanelPluginStartupInfo &startupInfo) : +LXQtTrayPlugin::LXQtTrayPlugin(const ILXQtPanelPluginStartupInfo &startupInfo) : QObject(), - ILxQtPanelPlugin(startupInfo), - mWidget(new LxQtTray(this)) + ILXQtPanelPlugin(startupInfo), + mWidget(new LXQtTray(this)) { } -LxQtTrayPlugin::~LxQtTrayPlugin() +LXQtTrayPlugin::~LXQtTrayPlugin() { delete mWidget; } -QWidget *LxQtTrayPlugin::widget() +QWidget *LXQtTrayPlugin::widget() { return mWidget; } -void LxQtTrayPlugin::realign() +void LXQtTrayPlugin::realign() { mWidget->realign(); } diff --git a/plugin-tray/lxqttrayplugin.h b/plugin-tray/lxqttrayplugin.h index fafc610..10a57b9 100644 --- a/plugin-tray/lxqttrayplugin.h +++ b/plugin-tray/lxqttrayplugin.h @@ -32,13 +32,13 @@ #include "../panel/ilxqtpanelplugin.h" #include -class LxQtTray; -class LxQtTrayPlugin : public QObject, public ILxQtPanelPlugin +class LXQtTray; +class LXQtTrayPlugin : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - explicit LxQtTrayPlugin(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtTrayPlugin(); + explicit LXQtTrayPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtTrayPlugin(); virtual QWidget *widget(); virtual QString themeId() const { return "Tray"; } @@ -48,19 +48,19 @@ public: bool isSeparate() const { return true; } private: - LxQtTray *mWidget; + LXQtTray *mWidget; }; -class LxQtTrayPluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtTrayPluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT // Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtTrayPlugin(startupInfo); + return new LXQtTrayPlugin(startupInfo); } }; diff --git a/plugin-tray/resources/tray.desktop.in b/plugin-tray/resources/tray.desktop.in index 7225961..401b5a8 100644 --- a/plugin-tray/resources/tray.desktop.in +++ b/plugin-tray/resources/tray.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. Icon=go-bottom diff --git a/plugin-tray/translations/tray_ar.desktop b/plugin-tray/translations/tray_ar.desktop index 544a1e8..046c236 100644 --- a/plugin-tray/translations/tray_ar.desktop +++ b/plugin-tray/translations/tray_ar.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_cs.desktop b/plugin-tray/translations/tray_cs.desktop index a09379a..4f3ae31 100644 --- a/plugin-tray/translations/tray_cs.desktop +++ b/plugin-tray/translations/tray_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_cs_CZ.desktop b/plugin-tray/translations/tray_cs_CZ.desktop index 5a00e70..c7c8b61 100644 --- a/plugin-tray/translations/tray_cs_CZ.desktop +++ b/plugin-tray/translations/tray_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_da.desktop b/plugin-tray/translations/tray_da.desktop index cfeb5c0..4f3acf8 100644 --- a/plugin-tray/translations/tray_da.desktop +++ b/plugin-tray/translations/tray_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_da_DK.desktop b/plugin-tray/translations/tray_da_DK.desktop index 2bca7ae..6496a97 100644 --- a/plugin-tray/translations/tray_da_DK.desktop +++ b/plugin-tray/translations/tray_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_el.desktop b/plugin-tray/translations/tray_el.desktop new file mode 100644 index 0000000..c2ed175 --- /dev/null +++ b/plugin-tray/translations/tray_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Πλαίσιο συστήματος +Comment[el]=Προβολή των ελαχιστοποιημένων εφαρμογών στο πλαίσιο συστήματος. diff --git a/plugin-tray/translations/tray_el_GR.desktop b/plugin-tray/translations/tray_el_GR.desktop deleted file mode 100644 index c327815..0000000 --- a/plugin-tray/translations/tray_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=System tray -Comment=Display applications minimized to the system tray. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Πρόσβαση στις κρυφές εφαρμογές που ελαχιστοποιήθηκαν στο πλαίσιο συστήματος -Name[el_GR]=Πλαίσιο συστήματος diff --git a/plugin-tray/translations/tray_eo.desktop b/plugin-tray/translations/tray_eo.desktop index 536d196..2b2b0ea 100644 --- a/plugin-tray/translations/tray_eo.desktop +++ b/plugin-tray/translations/tray_eo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_es.desktop b/plugin-tray/translations/tray_es.desktop index a0dee4d..6ba9605 100644 --- a/plugin-tray/translations/tray_es.desktop +++ b/plugin-tray/translations/tray_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_es_VE.desktop b/plugin-tray/translations/tray_es_VE.desktop index 7717aa0..95e4bc5 100644 --- a/plugin-tray/translations/tray_es_VE.desktop +++ b/plugin-tray/translations/tray_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_eu.desktop b/plugin-tray/translations/tray_eu.desktop index cdb1700..fb1664b 100644 --- a/plugin-tray/translations/tray_eu.desktop +++ b/plugin-tray/translations/tray_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_fi.desktop b/plugin-tray/translations/tray_fi.desktop index d829580..7f238fb 100644 --- a/plugin-tray/translations/tray_fi.desktop +++ b/plugin-tray/translations/tray_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_fr_FR.desktop b/plugin-tray/translations/tray_fr_FR.desktop index 3befb02..05afaa3 100644 --- a/plugin-tray/translations/tray_fr_FR.desktop +++ b/plugin-tray/translations/tray_fr_FR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_hu.desktop b/plugin-tray/translations/tray_hu.desktop index 8f180da..cc16964 100644 --- a/plugin-tray/translations/tray_hu.desktop +++ b/plugin-tray/translations/tray_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ia.desktop b/plugin-tray/translations/tray_ia.desktop index 4863c5c..1a2aaea 100644 --- a/plugin-tray/translations/tray_ia.desktop +++ b/plugin-tray/translations/tray_ia.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Access hidden applications minimized in the system tray diff --git a/plugin-tray/translations/tray_id_ID.desktop b/plugin-tray/translations/tray_id_ID.desktop index 4863c5c..1a2aaea 100644 --- a/plugin-tray/translations/tray_id_ID.desktop +++ b/plugin-tray/translations/tray_id_ID.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Access hidden applications minimized in the system tray diff --git a/plugin-tray/translations/tray_it_IT.desktop b/plugin-tray/translations/tray_it_IT.desktop index 2e2d81f..6a7bcb4 100644 --- a/plugin-tray/translations/tray_it_IT.desktop +++ b/plugin-tray/translations/tray_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ja.desktop b/plugin-tray/translations/tray_ja.desktop index 686b3f6..387c065 100644 --- a/plugin-tray/translations/tray_ja.desktop +++ b/plugin-tray/translations/tray_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ko.desktop b/plugin-tray/translations/tray_ko.desktop index 4863c5c..1a2aaea 100644 --- a/plugin-tray/translations/tray_ko.desktop +++ b/plugin-tray/translations/tray_ko.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Access hidden applications minimized in the system tray diff --git a/plugin-tray/translations/tray_lt.desktop b/plugin-tray/translations/tray_lt.desktop index ca5a573..3f9573b 100644 --- a/plugin-tray/translations/tray_lt.desktop +++ b/plugin-tray/translations/tray_lt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_nl.desktop b/plugin-tray/translations/tray_nl.desktop index 330c634..993290a 100644 --- a/plugin-tray/translations/tray_nl.desktop +++ b/plugin-tray/translations/tray_nl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_pl.desktop b/plugin-tray/translations/tray_pl.desktop index 476e525..4c1e697 100644 --- a/plugin-tray/translations/tray_pl.desktop +++ b/plugin-tray/translations/tray_pl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_pl_PL.desktop b/plugin-tray/translations/tray_pl_PL.desktop index 7318e67..4d9f0ad 100644 --- a/plugin-tray/translations/tray_pl_PL.desktop +++ b/plugin-tray/translations/tray_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_pt.desktop b/plugin-tray/translations/tray_pt.desktop index f323312..99ad566 100644 --- a/plugin-tray/translations/tray_pt.desktop +++ b/plugin-tray/translations/tray_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_pt_BR.desktop b/plugin-tray/translations/tray_pt_BR.desktop index 4433563..fbd54ea 100644 --- a/plugin-tray/translations/tray_pt_BR.desktop +++ b/plugin-tray/translations/tray_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ro_RO.desktop b/plugin-tray/translations/tray_ro_RO.desktop index 385751d..86753e8 100644 --- a/plugin-tray/translations/tray_ro_RO.desktop +++ b/plugin-tray/translations/tray_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ru.desktop b/plugin-tray/translations/tray_ru.desktop index a33a7a8..b36a362 100644 --- a/plugin-tray/translations/tray_ru.desktop +++ b/plugin-tray/translations/tray_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_ru_RU.desktop b/plugin-tray/translations/tray_ru_RU.desktop index a01f6d3..5bfe9a8 100644 --- a/plugin-tray/translations/tray_ru_RU.desktop +++ b/plugin-tray/translations/tray_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_sk.desktop b/plugin-tray/translations/tray_sk.desktop index 93483bf..8819839 100644 --- a/plugin-tray/translations/tray_sk.desktop +++ b/plugin-tray/translations/tray_sk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_sl.desktop b/plugin-tray/translations/tray_sl.desktop index 3ac7521..0d7b31f 100644 --- a/plugin-tray/translations/tray_sl.desktop +++ b/plugin-tray/translations/tray_sl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_sr.desktop b/plugin-tray/translations/tray_sr.desktop index 58bc455..bcb5095 100644 --- a/plugin-tray/translations/tray_sr.desktop +++ b/plugin-tray/translations/tray_sr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_sr@latin.desktop b/plugin-tray/translations/tray_sr@latin.desktop index ffe4618..a9c6625 100644 --- a/plugin-tray/translations/tray_sr@latin.desktop +++ b/plugin-tray/translations/tray_sr@latin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_th_TH.desktop b/plugin-tray/translations/tray_th_TH.desktop index af63f22..339cbab 100644 --- a/plugin-tray/translations/tray_th_TH.desktop +++ b/plugin-tray/translations/tray_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_tr.desktop b/plugin-tray/translations/tray_tr.desktop index b4f8019..c90b886 100644 --- a/plugin-tray/translations/tray_tr.desktop +++ b/plugin-tray/translations/tray_tr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_uk.desktop b/plugin-tray/translations/tray_uk.desktop index 9eff55f..bc0ad88 100644 --- a/plugin-tray/translations/tray_uk.desktop +++ b/plugin-tray/translations/tray_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_zh_CN.GB2312.desktop b/plugin-tray/translations/tray_zh_CN.GB2312.desktop index 4863c5c..1a2aaea 100644 --- a/plugin-tray/translations/tray_zh_CN.GB2312.desktop +++ b/plugin-tray/translations/tray_zh_CN.GB2312.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Access hidden applications minimized in the system tray diff --git a/plugin-tray/translations/tray_zh_CN.desktop b/plugin-tray/translations/tray_zh_CN.desktop index e4158b3..485cae3 100644 --- a/plugin-tray/translations/tray_zh_CN.desktop +++ b/plugin-tray/translations/tray_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/translations/tray_zh_TW.desktop b/plugin-tray/translations/tray_zh_TW.desktop index c8d5a76..9d4b6f4 100644 --- a/plugin-tray/translations/tray_zh_TW.desktop +++ b/plugin-tray/translations/tray_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=System tray Comment=Display applications minimized to the system tray. diff --git a/plugin-tray/trayicon.h b/plugin-tray/trayicon.h index 7e8c413..28912fe 100644 --- a/plugin-tray/trayicon.h +++ b/plugin-tray/trayicon.h @@ -39,7 +39,7 @@ #define TRAY_ICON_SIZE_DEFAULT 24 class QWidget; -class LxQtPanel; +class LXQtPanel; class TrayIcon: public QFrame { diff --git a/plugin-volume/lxqtvolume.cpp b/plugin-volume/lxqtvolume.cpp index 0476c81..7e974b4 100644 --- a/plugin-volume/lxqtvolume.cpp +++ b/plugin-volume/lxqtvolume.cpp @@ -49,45 +49,45 @@ #define DEFAULT_DOWN_SHORTCUT "XF86AudioLowerVolume" #define DEFAULT_MUTE_SHORTCUT "XF86AudioMute" -LxQtVolume::LxQtVolume(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtVolume::LXQtVolume(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), m_engine(0), m_defaultSinkIndex(0), m_defaultSink(0) { m_volumeButton = new VolumeButton(this); - m_notification = new LxQt::Notification("", this); + m_notification = new LXQt::Notification("", this); m_keyVolumeUp = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/up").arg(settings()->group()), tr("Increase sound volume"), this); if (m_keyVolumeUp) { - connect(m_keyVolumeUp, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + connect(m_keyVolumeUp, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); connect(m_keyVolumeUp, SIGNAL(activated()), this, SLOT(handleShortcutVolumeUp())); } m_keyVolumeDown = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/down").arg(settings()->group()), tr("Decrease sound volume"), this); if (m_keyVolumeDown) { - connect(m_keyVolumeDown, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + connect(m_keyVolumeDown, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); connect(m_keyVolumeDown, SIGNAL(activated()), this, SLOT(handleShortcutVolumeDown())); } m_keyMuteToggle = GlobalKeyShortcut::Client::instance()->addAction(QString(), QString("/panel/%1/mute").arg(settings()->group()), tr("Mute/unmute sound volume"), this); if (m_keyMuteToggle) { - connect(m_keyMuteToggle, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + connect(m_keyMuteToggle, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); connect(m_keyMuteToggle, SIGNAL(activated()), this, SLOT(handleShortcutVolumeMute())); } settingsChanged(); } -LxQtVolume::~LxQtVolume() +LXQtVolume::~LXQtVolume() { delete m_volumeButton; } -void LxQtVolume::shortcutRegistered() +void LXQtVolume::shortcutRegistered() { GlobalKeyShortcut::Action * const shortcut = qobject_cast(sender()); @@ -95,7 +95,7 @@ void LxQtVolume::shortcutRegistered() if (shortcut == m_keyVolumeUp) { - disconnect(m_keyVolumeUp, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + disconnect(m_keyVolumeUp, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); if (m_keyVolumeUp->shortcut().isEmpty()) { @@ -107,7 +107,7 @@ void LxQtVolume::shortcutRegistered() } } else if (shortcut == m_keyVolumeDown) { - disconnect(m_keyVolumeDown, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + disconnect(m_keyVolumeDown, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); if (m_keyVolumeDown->shortcut().isEmpty()) { @@ -119,7 +119,7 @@ void LxQtVolume::shortcutRegistered() } } else if (shortcut == m_keyMuteToggle) { - disconnect(m_keyMuteToggle, &GlobalKeyShortcut::Action::registrationFinished, this, &LxQtVolume::shortcutRegistered); + disconnect(m_keyMuteToggle, &GlobalKeyShortcut::Action::registrationFinished, this, &LXQtVolume::shortcutRegistered); if (m_keyMuteToggle->shortcut().isEmpty()) { @@ -138,10 +138,10 @@ void LxQtVolume::shortcutRegistered() } m_notification->setTimeout(1000); - m_notification->setUrgencyHint(LxQt::Notification::UrgencyLow); + m_notification->setUrgencyHint(LXQt::Notification::UrgencyLow); } -void LxQtVolume::setAudioEngine(AudioEngine *engine) +void LXQtVolume::setAudioEngine(AudioEngine *engine) { if (m_engine) { if (m_engine->backendName() == engine->backendName()) @@ -161,7 +161,7 @@ void LxQtVolume::setAudioEngine(AudioEngine *engine) } -void LxQtVolume::settingsChanged() +void LXQtVolume::settingsChanged() { QString engineName = settings()->value(SETTINGS_AUDIO_ENGINE, SETTINGS_DEFAULT_AUDIO_ENGINE).toString(); qDebug() << "settingsChanged" << engineName; @@ -205,13 +205,13 @@ void LxQtVolume::settingsChanged() } } -void LxQtVolume::updateConfigurationSinkList() +void LXQtVolume::updateConfigurationSinkList() { if (m_engine && m_configDialog) m_configDialog->setSinkList(m_engine->sinks()); } -void LxQtVolume::handleShortcutVolumeUp() +void LXQtVolume::handleShortcutVolumeUp() { if (m_defaultSink) { @@ -221,7 +221,7 @@ void LxQtVolume::handleShortcutVolumeUp() } } -void LxQtVolume::handleShortcutVolumeDown() +void LXQtVolume::handleShortcutVolumeDown() { if (m_defaultSink) { @@ -231,26 +231,26 @@ void LxQtVolume::handleShortcutVolumeDown() } } -void LxQtVolume::handleShortcutVolumeMute() +void LXQtVolume::handleShortcutVolumeMute() { if (m_defaultSink) m_defaultSink->toggleMute(); } -QWidget *LxQtVolume::widget() +QWidget *LXQtVolume::widget() { return m_volumeButton; } -void LxQtVolume::realign() +void LXQtVolume::realign() { } -QDialog *LxQtVolume::configureDialog() +QDialog *LXQtVolume::configureDialog() { if(!m_configDialog) { - m_configDialog = new LxQtVolumeConfiguration(*settings()); + m_configDialog = new LXQtVolumeConfiguration(*settings()); m_configDialog->setAttribute(Qt::WA_DeleteOnClose, true); if (m_engine) diff --git a/plugin-volume/lxqtvolume.h b/plugin-volume/lxqtvolume.h index 56fd869..32706b0 100644 --- a/plugin-volume/lxqtvolume.h +++ b/plugin-volume/lxqtvolume.h @@ -36,7 +36,7 @@ class VolumeButton; class AudioEngine; class AudioDevice; -namespace LxQt { +namespace LXQt { class Notification; } namespace GlobalKeyShortcut @@ -44,18 +44,18 @@ namespace GlobalKeyShortcut class Action; } -class LxQtVolumeConfiguration; +class LXQtVolumeConfiguration; -class LxQtVolume : public QObject, public ILxQtPanelPlugin +class LXQtVolume : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtVolume(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtVolume(); + LXQtVolume(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtVolume(); virtual QWidget *widget(); virtual QString themeId() const { return "Volume"; } - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } void realign(); QDialog *configureDialog(); @@ -76,20 +76,20 @@ private: GlobalKeyShortcut::Action *m_keyVolumeUp; GlobalKeyShortcut::Action *m_keyVolumeDown; GlobalKeyShortcut::Action *m_keyMuteToggle; - LxQt::Notification *m_notification; - QPointer m_configDialog; + LXQt::Notification *m_notification; + QPointer m_configDialog; }; -class LxQtVolumePluginLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtVolumePluginLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtVolume(startupInfo); + return new LXQtVolume(startupInfo); } }; diff --git a/plugin-volume/lxqtvolumeconfiguration.cpp b/plugin-volume/lxqtvolumeconfiguration.cpp index 43120f7..30ff381 100644 --- a/plugin-volume/lxqtvolumeconfiguration.cpp +++ b/plugin-volume/lxqtvolumeconfiguration.cpp @@ -33,9 +33,9 @@ #include #include -LxQtVolumeConfiguration::LxQtVolumeConfiguration(QSettings &settings, QWidget *parent) : - LxQtPanelPluginConfigDialog(settings, parent), - ui(new Ui::LxQtVolumeConfiguration) +LXQtVolumeConfiguration::LXQtVolumeConfiguration(QSettings &settings, QWidget *parent) : + LXQtPanelPluginConfigDialog(settings, parent), + ui(new Ui::LXQtVolumeConfiguration) { ui->setupUi(this); @@ -66,12 +66,12 @@ LxQtVolumeConfiguration::LxQtVolumeConfiguration(QSettings &settings, QWidget *p #endif } -LxQtVolumeConfiguration::~LxQtVolumeConfiguration() +LXQtVolumeConfiguration::~LXQtVolumeConfiguration() { delete ui; } -void LxQtVolumeConfiguration::setSinkList(const QList sinks) +void LXQtVolumeConfiguration::setSinkList(const QList sinks) { // preserve the current index, as we change the list int tmp_index = settings().value(SETTINGS_DEVICE, SETTINGS_DEFAULT_DEVICE).toInt(); @@ -85,7 +85,7 @@ void LxQtVolumeConfiguration::setSinkList(const QList sinks) ui->devAddedCombo->setCurrentIndex(tmp_index); } -void LxQtVolumeConfiguration::audioEngineChanged(bool checked) +void LXQtVolumeConfiguration::audioEngineChanged(bool checked) { if (!checked) return; @@ -103,37 +103,37 @@ void LxQtVolumeConfiguration::audioEngineChanged(bool checked) ui->ignoreMaxVolumeCheckBox->setEnabled(canIgnoreMaxVolume); } -void LxQtVolumeConfiguration::sinkSelectionChanged(int index) +void LXQtVolumeConfiguration::sinkSelectionChanged(int index) { settings().setValue(SETTINGS_DEVICE, index >= 0 ? index : 0); } -void LxQtVolumeConfiguration::showOnClickedChanged(bool state) +void LXQtVolumeConfiguration::showOnClickedChanged(bool state) { settings().setValue(SETTINGS_SHOW_ON_LEFTCLICK, state); } -void LxQtVolumeConfiguration::muteOnMiddleClickChanged(bool state) +void LXQtVolumeConfiguration::muteOnMiddleClickChanged(bool state) { settings().setValue(SETTINGS_MUTE_ON_MIDDLECLICK, state); } -void LxQtVolumeConfiguration::mixerLineEditChanged(const QString &command) +void LXQtVolumeConfiguration::mixerLineEditChanged(const QString &command) { settings().setValue(SETTINGS_MIXER_COMMAND, command); } -void LxQtVolumeConfiguration::stepSpinBoxChanged(int step) +void LXQtVolumeConfiguration::stepSpinBoxChanged(int step) { settings().setValue(SETTINGS_STEP, step); } -void LxQtVolumeConfiguration::ignoreMaxVolumeCheckBoxChanged(bool state) +void LXQtVolumeConfiguration::ignoreMaxVolumeCheckBoxChanged(bool state) { settings().setValue(SETTINGS_IGNORE_MAX_VOLUME, state); } -void LxQtVolumeConfiguration::loadSettings() +void LXQtVolumeConfiguration::loadSettings() { QString engine = settings().value(SETTINGS_AUDIO_ENGINE, SETTINGS_DEFAULT_AUDIO_ENGINE).toString().toLower(); if (engine == "pulseaudio") diff --git a/plugin-volume/lxqtvolumeconfiguration.h b/plugin-volume/lxqtvolumeconfiguration.h index ab04866..8b6689c 100644 --- a/plugin-volume/lxqtvolumeconfiguration.h +++ b/plugin-volume/lxqtvolumeconfiguration.h @@ -59,16 +59,16 @@ class AudioDevice; namespace Ui { - class LxQtVolumeConfiguration; + class LXQtVolumeConfiguration; } -class LxQtVolumeConfiguration : public LxQtPanelPluginConfigDialog +class LXQtVolumeConfiguration : public LXQtPanelPluginConfigDialog { Q_OBJECT public: - explicit LxQtVolumeConfiguration(QSettings &settings, QWidget *parent = 0); - ~LxQtVolumeConfiguration(); + explicit LXQtVolumeConfiguration(QSettings &settings, QWidget *parent = 0); + ~LXQtVolumeConfiguration(); public slots: void setSinkList(const QList sinks); @@ -84,7 +84,7 @@ protected slots: virtual void loadSettings(); private: - Ui::LxQtVolumeConfiguration *ui; + Ui::LXQtVolumeConfiguration *ui; }; #endif // LXQTVOLUMECONFIGURATION_H diff --git a/plugin-volume/lxqtvolumeconfiguration.ui b/plugin-volume/lxqtvolumeconfiguration.ui index 2c6591b..75e3104 100644 --- a/plugin-volume/lxqtvolumeconfiguration.ui +++ b/plugin-volume/lxqtvolumeconfiguration.ui @@ -1,7 +1,7 @@ - LxQtVolumeConfiguration - + LXQtVolumeConfiguration + 0 @@ -134,7 +134,7 @@ buttons accepted() - LxQtVolumeConfiguration + LXQtVolumeConfiguration accept() @@ -150,7 +150,7 @@ buttons rejected() - LxQtVolumeConfiguration + LXQtVolumeConfiguration reject() diff --git a/plugin-volume/pulseaudioengine.cpp b/plugin-volume/pulseaudioengine.cpp index 406e94b..8f088ae 100644 --- a/plugin-volume/pulseaudioengine.cpp +++ b/plugin-volume/pulseaudioengine.cpp @@ -275,7 +275,7 @@ void PulseAudioEngine::setupSubscription() void PulseAudioEngine::handleContextStateChanged() { if (m_contextState == PA_CONTEXT_FAILED || m_contextState == PA_CONTEXT_TERMINATED) { - qWarning("LxQt-Volume: Context connection failed or terminated lets try to reconnect"); + qWarning("LXQt-Volume: Context connection failed or terminated lets try to reconnect"); m_reconnectionTimer.start(); } } diff --git a/plugin-volume/resources/volume.desktop.in b/plugin-volume/resources/volume.desktop.in index a519581..754289f 100644 --- a/plugin-volume/resources/volume.desktop.in +++ b/plugin-volume/resources/volume.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. Icon=multimedia-volume-control diff --git a/plugin-volume/translations/volume.ts b/plugin-volume/translations/volume.ts index 9c9af62..42d09c9 100644 --- a/plugin-volume/translations/volume.ts +++ b/plugin-volume/translations/volume.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_ar.ts b/plugin-volume/translations/volume_ar.ts index 493c95a..62be6ca 100644 --- a/plugin-volume/translations/volume_ar.ts +++ b/plugin-volume/translations/volume_ar.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered إظهار سطح المكتب: ﻻ يمكن تسجيل اختصار لوحة المفاتيح العامُّ `%1` @@ -35,7 +35,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_cs.desktop b/plugin-volume/translations/volume_cs.desktop index e8f34f5..f6cafff 100644 --- a/plugin-volume/translations/volume_cs.desktop +++ b/plugin-volume/translations/volume_cs.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_cs.ts b/plugin-volume/translations/volume_cs.ts index 1230b30..98a6eaa 100644 --- a/plugin-volume/translations/volume_cs.ts +++ b/plugin-volume/translations/volume_cs.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Ukázat plochu: Celkovou zkratku '%1' nelze zapsat @@ -35,9 +35,9 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings + LXQt Volume Control Settings Nastavení ovládání hlasitosti diff --git a/plugin-volume/translations/volume_cs_CZ.desktop b/plugin-volume/translations/volume_cs_CZ.desktop index 7833031..eac2099 100644 --- a/plugin-volume/translations/volume_cs_CZ.desktop +++ b/plugin-volume/translations/volume_cs_CZ.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_cs_CZ.ts b/plugin-volume/translations/volume_cs_CZ.ts index 815ac1f..25f37f7 100644 --- a/plugin-volume/translations/volume_cs_CZ.ts +++ b/plugin-volume/translations/volume_cs_CZ.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Ukázat plochu: Celkovou zkratku '%1' nelze zapsat @@ -35,9 +35,9 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings + LXQt Volume Control Settings Nastavení ovládání hlasitosti diff --git a/plugin-volume/translations/volume_da.desktop b/plugin-volume/translations/volume_da.desktop index 8638826..5a457af 100644 --- a/plugin-volume/translations/volume_da.desktop +++ b/plugin-volume/translations/volume_da.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_da_DK.desktop b/plugin-volume/translations/volume_da_DK.desktop index 6958179..8026bb8 100644 --- a/plugin-volume/translations/volume_da_DK.desktop +++ b/plugin-volume/translations/volume_da_DK.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_da_DK.ts b/plugin-volume/translations/volume_da_DK.ts index 0df3bcd..0daf213 100644 --- a/plugin-volume/translations/volume_da_DK.ts +++ b/plugin-volume/translations/volume_da_DK.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Vis Skrivebord: Global genvej '%1' kan ikke registreres @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Indstillinger for LxQt Lydstyrkekontrol + LXQt Volume Control Settings + Indstillinger for LXQt Lydstyrkekontrol diff --git a/plugin-volume/translations/volume_de.ts b/plugin-volume/translations/volume_de.ts index 4f32770..1d1cfbc 100644 --- a/plugin-volume/translations/volume_de.ts +++ b/plugin-volume/translations/volume_de.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_el.desktop b/plugin-volume/translations/volume_el.desktop new file mode 100644 index 0000000..06bfdd9 --- /dev/null +++ b/plugin-volume/translations/volume_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Έλεγχος έντασης ήχου +Comment[el]=Ελέγξτε την ένταση ήχου του συστήματος και εκκινήστε τον προτιμώμενο μίκτη. diff --git a/plugin-volume/translations/volume_el_GR.ts b/plugin-volume/translations/volume_el.ts similarity index 78% rename from plugin-volume/translations/volume_el_GR.ts rename to plugin-volume/translations/volume_el.ts index 98563c6..07a3b8f 100644 --- a/plugin-volume/translations/volume_el_GR.ts +++ b/plugin-volume/translations/volume_el.ts @@ -1,8 +1,8 @@ - + - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Εμφάνιση επιφάνειας εργασίας: Δεν είναι δυνατή η καταχώριση της καθολικής συντόμευσης "%1" @@ -10,40 +10,40 @@ Increase sound volume - + Αύξηση της έντασης του ήχου Decrease sound volume - + Μείωση της έντασης του ήχου Mute/unmute sound volume - + Σίγαση/αποσίγαση της έντασης του ήχου Volume Control: The following shortcuts can not be registered: %1 - + Έλεγχος έντασης: Οι ακόλουθες συντομεύσεις μπόρεσαν να καταχωρηθούν: %1 Volume: %1 - + Ένταση: %1 - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Ρυθμίσεις ελέγχου έντασης ήχου LxQt + LXQt Volume Control Settings + Ρυθμίσεις ελέγχου έντασης ήχου του LXQt Volume Control Settings - + Ρυθμίσεις του ελέγχου έντασης του ήχου @@ -63,7 +63,7 @@ OSS - + OSS @@ -101,12 +101,12 @@ Launch mixer - + Εκτέλεση του μίκτη Mixer - + Μίκτης diff --git a/plugin-volume/translations/volume_el_GR.desktop b/plugin-volume/translations/volume_el_GR.desktop deleted file mode 100644 index 206426c..0000000 --- a/plugin-volume/translations/volume_el_GR.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Service -ServiceTypes=LxQtPanel/Plugin -Name=Volume control -Comment=Control the system's volume and launch your preferred mixer. - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[el_GR]=Ελέγξτε την ένταση ήχου του συστήματος και ξεκινήστε τον προτιμώμενο μίκτη. -Name[el_GR]=Έλεγχος έντασης ήχου diff --git a/plugin-volume/translations/volume_eo.ts b/plugin-volume/translations/volume_eo.ts index 38b4f41..137d49e 100644 --- a/plugin-volume/translations/volume_eo.ts +++ b/plugin-volume/translations/volume_eo.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Montri labortablon: ĉiea klavkombino '%1' ne registreblas @@ -35,7 +35,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_es.desktop b/plugin-volume/translations/volume_es.desktop index 333136d..d8af16c 100644 --- a/plugin-volume/translations/volume_es.desktop +++ b/plugin-volume/translations/volume_es.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_es.ts b/plugin-volume/translations/volume_es.ts index 14fc080..29322f4 100644 --- a/plugin-volume/translations/volume_es.ts +++ b/plugin-volume/translations/volume_es.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Mostrar Escritorio: Atajo global '%1' no puede ser registrado @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Opciones del Control de Volumen de LxQt + LXQt Volume Control Settings + Opciones del Control de Volumen de LXQt diff --git a/plugin-volume/translations/volume_es_VE.desktop b/plugin-volume/translations/volume_es_VE.desktop index aea4eeb..c4b0b93 100644 --- a/plugin-volume/translations/volume_es_VE.desktop +++ b/plugin-volume/translations/volume_es_VE.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_es_VE.ts b/plugin-volume/translations/volume_es_VE.ts index d2a4f76..2b2675c 100644 --- a/plugin-volume/translations/volume_es_VE.ts +++ b/plugin-volume/translations/volume_es_VE.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Mostrar escritorio: Acceso de teclado global '%1' no puede registrarse @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Preferencias de control de volumen de LxQt + LXQt Volume Control Settings + Preferencias de control de volumen de LXQt diff --git a/plugin-volume/translations/volume_eu.desktop b/plugin-volume/translations/volume_eu.desktop index 6ebf4c0..dcf60e3 100644 --- a/plugin-volume/translations/volume_eu.desktop +++ b/plugin-volume/translations/volume_eu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_eu.ts b/plugin-volume/translations/volume_eu.ts index b35dd73..47a0d7c 100644 --- a/plugin-volume/translations/volume_eu.ts +++ b/plugin-volume/translations/volume_eu.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Erakutsi mahaigaina: Ezin da '%1' lasterbide globala erregistratu @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - LxQt bolumen-kontrolaren ezarpenak + LXQt Volume Control Settings + LXQt bolumen-kontrolaren ezarpenak diff --git a/plugin-volume/translations/volume_fi.desktop b/plugin-volume/translations/volume_fi.desktop index 121baa7..f6207c5 100644 --- a/plugin-volume/translations/volume_fi.desktop +++ b/plugin-volume/translations/volume_fi.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_fi.ts b/plugin-volume/translations/volume_fi.ts index 50c300c..03c378b 100644 --- a/plugin-volume/translations/volume_fi.ts +++ b/plugin-volume/translations/volume_fi.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Näytä työpöytä: globaalia pikanäppäintä '%1' ei voi rekisteröidä @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - LxQtin äänenhallinnan asetukset + LXQt Volume Control Settings + LXQtin äänenhallinnan asetukset diff --git a/plugin-volume/translations/volume_fr_FR.ts b/plugin-volume/translations/volume_fr_FR.ts index 842d3d2..fd7c5f4 100644 --- a/plugin-volume/translations/volume_fr_FR.ts +++ b/plugin-volume/translations/volume_fr_FR.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Montrer le bureau : le raccourci global '%1' ne peut pas être défini @@ -35,7 +35,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_hu.desktop b/plugin-volume/translations/volume_hu.desktop index 1f90583..c3e4153 100644 --- a/plugin-volume/translations/volume_hu.desktop +++ b/plugin-volume/translations/volume_hu.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_hu.ts b/plugin-volume/translations/volume_hu.ts index 5a59b05..6362698 100644 --- a/plugin-volume/translations/volume_hu.ts +++ b/plugin-volume/translations/volume_hu.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_hu_HU.ts b/plugin-volume/translations/volume_hu_HU.ts index 8901b59..0550169 100644 --- a/plugin-volume/translations/volume_hu_HU.ts +++ b/plugin-volume/translations/volume_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_it_IT.desktop b/plugin-volume/translations/volume_it_IT.desktop index 353e2eb..dfc7161 100644 --- a/plugin-volume/translations/volume_it_IT.desktop +++ b/plugin-volume/translations/volume_it_IT.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_it_IT.ts b/plugin-volume/translations/volume_it_IT.ts index 3a36662..1bc401d 100644 --- a/plugin-volume/translations/volume_it_IT.ts +++ b/plugin-volume/translations/volume_it_IT.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Mostra desktop: la scorciatoia globale '%1' non può essere registrata @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Impostazioni del controllo del volume di LxQt + LXQt Volume Control Settings + Impostazioni del controllo del volume di LXQt diff --git a/plugin-volume/translations/volume_ja.desktop b/plugin-volume/translations/volume_ja.desktop index d1d547e..bf5abf9 100644 --- a/plugin-volume/translations/volume_ja.desktop +++ b/plugin-volume/translations/volume_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ja]=音量調節 Comment[ja]=システムの音量を制御したり、ミキサーを起動したりします diff --git a/plugin-volume/translations/volume_ja.ts b/plugin-volume/translations/volume_ja.ts index 829e408..cd8b390 100644 --- a/plugin-volume/translations/volume_ja.ts +++ b/plugin-volume/translations/volume_ja.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_lt.ts b/plugin-volume/translations/volume_lt.ts index de1b083..aa35017 100644 --- a/plugin-volume/translations/volume_lt.ts +++ b/plugin-volume/translations/volume_lt.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Rodyti darbalaukį: globalusis klavišas „%1“ negali būti registruojamas @@ -35,7 +35,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_nl.ts b/plugin-volume/translations/volume_nl.ts index 8268eae..0e1ac0f 100644 --- a/plugin-volume/translations/volume_nl.ts +++ b/plugin-volume/translations/volume_nl.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Bureaublad weergeven: systeembrede sneltoets '%1' kan niet worden geregistreerd @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Instellingen voor volumebeheer van LxQt + LXQt Volume Control Settings + Instellingen voor volumebeheer van LXQt diff --git a/plugin-volume/translations/volume_pl_PL.desktop b/plugin-volume/translations/volume_pl_PL.desktop index 6e3a462..3820070 100644 --- a/plugin-volume/translations/volume_pl_PL.desktop +++ b/plugin-volume/translations/volume_pl_PL.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_pl_PL.ts b/plugin-volume/translations/volume_pl_PL.ts index 5b78505..c88cae0 100644 --- a/plugin-volume/translations/volume_pl_PL.ts +++ b/plugin-volume/translations/volume_pl_PL.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Pokaż Pulpit: Globalny skrót '%1' nie może zostać zarejestrowany @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Ustawienia regulacji poziomu dźwięku LxQt + LXQt Volume Control Settings + Ustawienia regulacji poziomu dźwięku LXQt diff --git a/plugin-volume/translations/volume_pt.desktop b/plugin-volume/translations/volume_pt.desktop index 85fb03e..c609f7f 100644 --- a/plugin-volume/translations/volume_pt.desktop +++ b/plugin-volume/translations/volume_pt.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_pt.ts b/plugin-volume/translations/volume_pt.ts index 3ec8efa..e3e6973 100644 --- a/plugin-volume/translations/volume_pt.ts +++ b/plugin-volume/translations/volume_pt.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Tecla de atalho global: "%1" não pode ser registada @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Definições do controlo de volume do LxQt + LXQt Volume Control Settings + Definições do controlo de volume do LXQt diff --git a/plugin-volume/translations/volume_pt_BR.desktop b/plugin-volume/translations/volume_pt_BR.desktop index d03cdbd..e242a85 100644 --- a/plugin-volume/translations/volume_pt_BR.desktop +++ b/plugin-volume/translations/volume_pt_BR.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_pt_BR.ts b/plugin-volume/translations/volume_pt_BR.ts index 52874e5..836cd40 100644 --- a/plugin-volume/translations/volume_pt_BR.ts +++ b/plugin-volume/translations/volume_pt_BR.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Mostrar Área De Trabalho: Atalho Global '%1'não pode se registrado @@ -35,9 +35,9 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings + LXQt Volume Control Settings Configurações Do Controle De Volume diff --git a/plugin-volume/translations/volume_ro_RO.desktop b/plugin-volume/translations/volume_ro_RO.desktop index 373ecb6..53355fc 100644 --- a/plugin-volume/translations/volume_ro_RO.desktop +++ b/plugin-volume/translations/volume_ro_RO.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_ro_RO.ts b/plugin-volume/translations/volume_ro_RO.ts index 0b368b3..a427e0b 100644 --- a/plugin-volume/translations/volume_ro_RO.ts +++ b/plugin-volume/translations/volume_ro_RO.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,10 +31,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Setări control volum LxQt + LXQt Volume Control Settings + Setări control volum LXQt diff --git a/plugin-volume/translations/volume_ru.desktop b/plugin-volume/translations/volume_ru.desktop index 21165b3..817f2f2 100644 --- a/plugin-volume/translations/volume_ru.desktop +++ b/plugin-volume/translations/volume_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_ru.ts b/plugin-volume/translations/volume_ru.ts index beb9ab1..637c4de 100644 --- a/plugin-volume/translations/volume_ru.ts +++ b/plugin-volume/translations/volume_ru.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_ru_RU.desktop b/plugin-volume/translations/volume_ru_RU.desktop index eb99000..725af38 100644 --- a/plugin-volume/translations/volume_ru_RU.desktop +++ b/plugin-volume/translations/volume_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_ru_RU.ts b/plugin-volume/translations/volume_ru_RU.ts index 93a7e7f..81323e7 100644 --- a/plugin-volume/translations/volume_ru_RU.ts +++ b/plugin-volume/translations/volume_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Increase sound volume @@ -31,7 +31,7 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration Volume Control Settings diff --git a/plugin-volume/translations/volume_sl.ts b/plugin-volume/translations/volume_sl.ts index 5ff9d41..633e538 100644 --- a/plugin-volume/translations/volume_sl.ts +++ b/plugin-volume/translations/volume_sl.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Prikaz namizja: globalne bližnjice »%1« ni moč registrirati @@ -35,9 +35,9 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings + LXQt Volume Control Settings Nastavitve upravljalnika glasnosti LXQt diff --git a/plugin-volume/translations/volume_th_TH.desktop b/plugin-volume/translations/volume_th_TH.desktop index 9ae62c8..ddd16a1 100644 --- a/plugin-volume/translations/volume_th_TH.desktop +++ b/plugin-volume/translations/volume_th_TH.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_th_TH.ts b/plugin-volume/translations/volume_th_TH.ts index f2422fd..2cf318b 100644 --- a/plugin-volume/translations/volume_th_TH.ts +++ b/plugin-volume/translations/volume_th_TH.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered แสดงพื้นโต๊ะ: ไม่สามารถตั้ง '%1' เป็นปุ่มลัดส่วนกลางได้ @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - ค่าตั้งควบคุมระดับเสียง LxQt + LXQt Volume Control Settings + ค่าตั้งควบคุมระดับเสียง LXQt diff --git a/plugin-volume/translations/volume_uk.desktop b/plugin-volume/translations/volume_uk.desktop index 6730561..444e4f7 100644 --- a/plugin-volume/translations/volume_uk.desktop +++ b/plugin-volume/translations/volume_uk.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_uk.ts b/plugin-volume/translations/volume_uk.ts index b9598a9..d1aa751 100644 --- a/plugin-volume/translations/volume_uk.ts +++ b/plugin-volume/translations/volume_uk.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered Показати стільницю: Не вдалося зареєструвати глобальне скорочення '%1' @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - Налаштування регулятора гучності LxQt + LXQt Volume Control Settings + Налаштування регулятора гучності LXQt diff --git a/plugin-volume/translations/volume_zh_CN.desktop b/plugin-volume/translations/volume_zh_CN.desktop index 396fca5..c6b1302 100644 --- a/plugin-volume/translations/volume_zh_CN.desktop +++ b/plugin-volume/translations/volume_zh_CN.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_zh_CN.ts b/plugin-volume/translations/volume_zh_CN.ts index 94dfc34..4ef36af 100644 --- a/plugin-volume/translations/volume_zh_CN.ts +++ b/plugin-volume/translations/volume_zh_CN.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered 显示桌面：无法注册全局快捷键'%1' @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - LxQt 声音控制设置 + LXQt Volume Control Settings + LXQt 声音控制设置 diff --git a/plugin-volume/translations/volume_zh_TW.desktop b/plugin-volume/translations/volume_zh_TW.desktop index 16d426a..629359f 100644 --- a/plugin-volume/translations/volume_zh_TW.desktop +++ b/plugin-volume/translations/volume_zh_TW.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=Volume control Comment=Control the system's volume and launch your preferred mixer. diff --git a/plugin-volume/translations/volume_zh_TW.ts b/plugin-volume/translations/volume_zh_TW.ts index 1c09ef6..3948727 100644 --- a/plugin-volume/translations/volume_zh_TW.ts +++ b/plugin-volume/translations/volume_zh_TW.ts @@ -2,7 +2,7 @@ - LxQtVolume + LXQtVolume Show Desktop: Global shortcut '%1' cannot be registered 顯示桌面:全域快捷鍵'%1'無法被註冊 @@ -35,10 +35,10 @@ - LxQtVolumeConfiguration + LXQtVolumeConfiguration - LxQt Volume Control Settings - LxQt音量調整設定 + LXQt Volume Control Settings + LXQt音量調整設定 diff --git a/plugin-volume/volumebutton.cpp b/plugin-volume/volumebutton.cpp index 4b90a9a..a738a1a 100644 --- a/plugin-volume/volumebutton.cpp +++ b/plugin-volume/volumebutton.cpp @@ -38,7 +38,7 @@ #include "../panel/ilxqtpanel.h" #include "../panel/ilxqtpanelplugin.h" -VolumeButton::VolumeButton(ILxQtPanelPlugin *plugin, QWidget* parent): +VolumeButton::VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent): QToolButton(parent), mPlugin(plugin), m_panel(plugin->panel()), diff --git a/plugin-volume/volumebutton.h b/plugin-volume/volumebutton.h index 7d5cb7f..ad08c34 100644 --- a/plugin-volume/volumebutton.h +++ b/plugin-volume/volumebutton.h @@ -32,15 +32,15 @@ #include class VolumePopup; -class ILxQtPanel; -class LxQtVolume; -class ILxQtPanelPlugin; +class ILXQtPanel; +class LXQtVolume; +class ILXQtPanelPlugin; class VolumeButton : public QToolButton { Q_OBJECT public: - VolumeButton(ILxQtPanelPlugin *plugin, QWidget* parent = 0); + VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent = 0); ~VolumeButton(); void setShowOnClicked(bool state); @@ -66,8 +66,8 @@ private slots: private: VolumePopup *m_volumePopup; - ILxQtPanelPlugin *mPlugin; - ILxQtPanel *m_panel; + ILXQtPanelPlugin *mPlugin; + ILXQtPanel *m_panel; QTimer m_popupHideTimer; bool m_showOnClick; bool m_muteOnMiddleClick; diff --git a/plugin-worldclock/lxqtworldclock.cpp b/plugin-worldclock/lxqtworldclock.cpp index d37384a..05f8a3c 100644 --- a/plugin-worldclock/lxqtworldclock.cpp +++ b/plugin-worldclock/lxqtworldclock.cpp @@ -40,9 +40,9 @@ #include -LxQtWorldClock::LxQtWorldClock(const ILxQtPanelPluginStartupInfo &startupInfo): +LXQtWorldClock::LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo): QObject(), - ILxQtPanelPlugin(startupInfo), + ILXQtPanelPlugin(startupInfo), mPopup(NULL), mTimer(new QTimer(this)), mUpdateInterval(1), @@ -52,7 +52,7 @@ LxQtWorldClock::LxQtWorldClock(const ILxQtPanelPluginStartupInfo &startupInfo): { mMainWidget = new QWidget(); mContent = new ActiveLabel(); - mRotatedWidget = new LxQt::RotatedWidget(*mContent, mMainWidget); + mRotatedWidget = new LXQt::RotatedWidget(*mContent, mMainWidget); mRotatedWidget->setTransferWheelEvent(true); @@ -72,12 +72,12 @@ LxQtWorldClock::LxQtWorldClock(const ILxQtPanelPluginStartupInfo &startupInfo): connect(mContent, SIGNAL(wheelScrolled(int)), SLOT(wheelScrolled(int))); } -LxQtWorldClock::~LxQtWorldClock() +LXQtWorldClock::~LXQtWorldClock() { delete mMainWidget; } -void LxQtWorldClock::timeout() +void LXQtWorldClock::timeout() { QDateTime now = QDateTime::currentDateTime(); qint64 nowMsec = now.toMSecsSinceEpoch(); @@ -97,13 +97,13 @@ void LxQtWorldClock::timeout() updatePopupContent(); } -void LxQtWorldClock::restartTimer(int updateInterval) +void LXQtWorldClock::restartTimer(int updateInterval) { mUpdateInterval = updateInterval; mTimer->start(qMin(100, updateInterval)); } -void LxQtWorldClock::settingsChanged() +void LXQtWorldClock::settingsChanged() { QSettings *_settings = settings(); @@ -295,12 +295,12 @@ void LxQtWorldClock::settingsChanged() timeout(); } -QDialog *LxQtWorldClock::configureDialog() +QDialog *LXQtWorldClock::configureDialog() { - return new LxQtWorldClockConfiguration(settings()); + return new LXQtWorldClockConfiguration(settings()); } -void LxQtWorldClock::wheelScrolled(int delta) +void LXQtWorldClock::wheelScrolled(int delta) { if (mTimeZones.count() > 1) { @@ -309,12 +309,12 @@ void LxQtWorldClock::wheelScrolled(int delta) } } -void LxQtWorldClock::activated(ActivationReason reason) +void LXQtWorldClock::activated(ActivationReason reason) { switch (reason) { - case ILxQtPanelPlugin::Trigger: - case ILxQtPanelPlugin::MiddleClick: + case ILXQtPanelPlugin::Trigger: + case ILXQtPanelPlugin::MiddleClick: break; default: @@ -323,10 +323,10 @@ void LxQtWorldClock::activated(ActivationReason reason) if (!mPopup) { - mPopup = new LxQtWorldClockPopup(mContent); + mPopup = new LXQtWorldClockPopup(mContent); connect(mPopup, SIGNAL(deactivated()), SLOT(deletePopup())); - if (reason == ILxQtPanelPlugin::Trigger) + if (reason == ILXQtPanelPlugin::Trigger) { mPopup->setObjectName(QLatin1String("WorldClockCalendar")); @@ -364,21 +364,21 @@ void LxQtWorldClock::activated(ActivationReason reason) } } -void LxQtWorldClock::deletePopup() +void LXQtWorldClock::deletePopup() { mPopupContent = NULL; mPopup->deleteLater(); mPopup = NULL; } -QString LxQtWorldClock::formatDateTime(const QDateTime &datetime, const QString &timeZoneName) +QString LXQtWorldClock::formatDateTime(const QDateTime &datetime, const QString &timeZoneName) { QTimeZone timeZone(timeZoneName.toLatin1()); QDateTime tzNow = datetime.toTimeZone(timeZone); return tzNow.toString(preformat(mFormat, timeZone, tzNow)); } -void LxQtWorldClock::updatePopupContent() +void LXQtWorldClock::updatePopupContent() { if (mPopupContent) { @@ -403,13 +403,13 @@ void LxQtWorldClock::updatePopupContent() } } -bool LxQtWorldClock::formatHasTimeZone(QString format) +bool LXQtWorldClock::formatHasTimeZone(QString format) { format.replace(QRegExp(QLatin1String("'[^']*'")), QString()); return format.toLower().contains(QLatin1String("t")); } -QString LxQtWorldClock::preformat(const QString &format, const QTimeZone &timeZone, const QDateTime &dateTime) +QString LXQtWorldClock::preformat(const QString &format, const QTimeZone &timeZone, const QDateTime &dateTime) { QString result = format; int from = 0; @@ -489,21 +489,21 @@ QString LxQtWorldClock::preformat(const QString &format, const QTimeZone &timeZo return result; } -void LxQtWorldClock::realign() +void LXQtWorldClock::realign() { if (mAutoRotate) switch (panel()->position()) { - case ILxQtPanel::PositionTop: - case ILxQtPanel::PositionBottom: + case ILXQtPanel::PositionTop: + case ILXQtPanel::PositionBottom: mRotatedWidget->setOrigin(Qt::TopLeftCorner); break; - case ILxQtPanel::PositionLeft: + case ILXQtPanel::PositionLeft: mRotatedWidget->setOrigin(Qt::BottomLeftCorner); break; - case ILxQtPanel::PositionRight: + case ILXQtPanel::PositionRight: mRotatedWidget->setOrigin(Qt::TopRightCorner); break; } @@ -541,20 +541,20 @@ void ActiveLabel::mouseReleaseEvent(QMouseEvent* event) QLabel::mouseReleaseEvent(event); } -LxQtWorldClockPopup::LxQtWorldClockPopup(QWidget *parent) : +LXQtWorldClockPopup::LXQtWorldClockPopup(QWidget *parent) : QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::Popup | Qt::X11BypassWindowManagerHint) { setLayout(new QHBoxLayout(this)); layout()->setMargin(1); } -void LxQtWorldClockPopup::show() +void LXQtWorldClockPopup::show() { QDialog::show(); activateWindow(); } -bool LxQtWorldClockPopup::event(QEvent *event) +bool LXQtWorldClockPopup::event(QEvent *event) { if (event->type() == QEvent::WindowDeactivate) emit deactivated(); diff --git a/plugin-worldclock/lxqtworldclock.h b/plugin-worldclock/lxqtworldclock.h index ee9206b..29f9db2 100644 --- a/plugin-worldclock/lxqtworldclock.h +++ b/plugin-worldclock/lxqtworldclock.h @@ -42,19 +42,19 @@ class ActiveLabel; class QTimer; -class LxQtWorldClockPopup; +class LXQtWorldClockPopup; -class LxQtWorldClock : public QObject, public ILxQtPanelPlugin +class LXQtWorldClock : public QObject, public ILXQtPanelPlugin { Q_OBJECT public: - LxQtWorldClock(const ILxQtPanelPluginStartupInfo &startupInfo); - ~LxQtWorldClock(); + LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo); + ~LXQtWorldClock(); virtual QWidget *widget() { return mMainWidget; } virtual QString themeId() const { return QLatin1String("WorldClock"); } - virtual ILxQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } + virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } bool isSeparate() const { return true; } void activated(ActivationReason reason); @@ -69,9 +69,9 @@ private slots: private: QWidget *mMainWidget; - LxQt::RotatedWidget* mRotatedWidget; + LXQt::RotatedWidget* mRotatedWidget; ActiveLabel *mContent; - LxQtWorldClockPopup* mPopup; + LXQtWorldClockPopup* mPopup; QTimer *mTimer; int mUpdateInterval; @@ -112,12 +112,12 @@ protected: void mouseReleaseEvent(QMouseEvent* event); }; -class LxQtWorldClockPopup : public QDialog +class LXQtWorldClockPopup : public QDialog { Q_OBJECT public: - LxQtWorldClockPopup(QWidget *parent = 0); + LXQtWorldClockPopup(QWidget *parent = 0); void show(); @@ -129,15 +129,15 @@ protected: }; -class LxQtWorldClockLibrary: public QObject, public ILxQtPanelPluginLibrary +class LXQtWorldClockLibrary: public QObject, public ILXQtPanelPluginLibrary { Q_OBJECT Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") - Q_INTERFACES(ILxQtPanelPluginLibrary) + Q_INTERFACES(ILXQtPanelPluginLibrary) public: - ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) const + ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { - return new LxQtWorldClock(startupInfo); + return new LXQtWorldClock(startupInfo); } }; diff --git a/plugin-worldclock/lxqtworldclockconfiguration.cpp b/plugin-worldclock/lxqtworldclockconfiguration.cpp index 7e215aa..3a35067 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.cpp +++ b/plugin-worldclock/lxqtworldclockconfiguration.cpp @@ -37,9 +37,9 @@ #include -LxQtWorldClockConfiguration::LxQtWorldClockConfiguration(QSettings *settings, QWidget *parent) : +LXQtWorldClockConfiguration::LXQtWorldClockConfiguration(QSettings *settings, QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtWorldClockConfiguration), + ui(new Ui::LXQtWorldClockConfiguration), mSettings(settings), mOldSettings(settings), mLockCascadeSettingChanges(false), @@ -88,12 +88,12 @@ LxQtWorldClockConfiguration::LxQtWorldClockConfiguration(QSettings *settings, QW loadSettings(); } -LxQtWorldClockConfiguration::~LxQtWorldClockConfiguration() +LXQtWorldClockConfiguration::~LXQtWorldClockConfiguration() { delete ui; } -void LxQtWorldClockConfiguration::loadSettings() +void LXQtWorldClockConfiguration::loadSettings() { mLockCascadeSettingChanges = true; @@ -236,7 +236,7 @@ void LxQtWorldClockConfiguration::loadSettings() mLockCascadeSettingChanges = false; } -void LxQtWorldClockConfiguration::saveSettings() +void LXQtWorldClockConfiguration::saveSettings() { if (mLockCascadeSettingChanges) return; @@ -383,7 +383,7 @@ void LxQtWorldClockConfiguration::saveSettings() mSettings->setValue(QLatin1String("autoRotate"), ui->autorotateCB->isChecked()); } -void LxQtWorldClockConfiguration::dialogButtonsAction(QAbstractButton *button) +void LXQtWorldClockConfiguration::dialogButtonsAction(QAbstractButton *button) { if (ui->buttons->buttonRole(button) == QDialogButtonBox::ResetRole) { @@ -394,7 +394,7 @@ void LxQtWorldClockConfiguration::dialogButtonsAction(QAbstractButton *button) close(); } -void LxQtWorldClockConfiguration::timeFormatChanged(int index) +void LXQtWorldClockConfiguration::timeFormatChanged(int index) { bool longTimeFormatSelected = index == 1; bool customTimeFormatSelected = index == 2; @@ -402,20 +402,20 @@ void LxQtWorldClockConfiguration::timeFormatChanged(int index) ui->timezoneGB->setEnabled(!longTimeFormatSelected); } -void LxQtWorldClockConfiguration::dateGroupToggled(bool dateIsChecked) +void LXQtWorldClockConfiguration::dateGroupToggled(bool dateIsChecked) { bool customDateFormatSelected = ui->dateFormatCB->currentIndex() == ui->dateFormatCB->count() - 1; ui->dateCustomW->setEnabled(dateIsChecked && customDateFormatSelected); } -void LxQtWorldClockConfiguration::dateFormatChanged(int index) +void LXQtWorldClockConfiguration::dateFormatChanged(int index) { bool customDateFormatSelected = index == ui->dateFormatCB->count() - 1; bool dateIsChecked = ui->dateGB->isChecked(); ui->dateCustomW->setEnabled(dateIsChecked && customDateFormatSelected); } -void LxQtWorldClockConfiguration::advancedFormatToggled(bool on) +void LXQtWorldClockConfiguration::advancedFormatToggled(bool on) { bool longTimeFormatSelected = ui->timeFormatCB->currentIndex() == 1; ui->timeGB->setEnabled(!on); @@ -423,11 +423,11 @@ void LxQtWorldClockConfiguration::advancedFormatToggled(bool on) ui->dateGB->setEnabled(!on); } -void LxQtWorldClockConfiguration::customiseManualFormatClicked() +void LXQtWorldClockConfiguration::customiseManualFormatClicked() { if (!mConfigurationManualFormat) { - mConfigurationManualFormat = new LxQtWorldClockConfigurationManualFormat(this); + mConfigurationManualFormat = new LXQtWorldClockConfigurationManualFormat(this); connect(mConfigurationManualFormat, SIGNAL(manualFormatChanged()), this, SLOT(manualFormatChanged())); } @@ -440,13 +440,13 @@ void LxQtWorldClockConfiguration::customiseManualFormatClicked() saveSettings(); } -void LxQtWorldClockConfiguration::manualFormatChanged() +void LXQtWorldClockConfiguration::manualFormatChanged() { mManualFormat = mConfigurationManualFormat->manualFormat(); saveSettings(); } -void LxQtWorldClockConfiguration::updateTimeZoneButtons() +void LXQtWorldClockConfiguration::updateTimeZoneButtons() { QList selectedItems = ui->timeZonesTW->selectedItems(); int selectedCount = selectedItems.count() / 2; @@ -502,7 +502,7 @@ void LxQtWorldClockConfiguration::updateTimeZoneButtons() ui->moveDownPB->setEnabled(canMoveDown); } -int LxQtWorldClockConfiguration::findTimeZone(const QString& timeZone) +int LXQtWorldClockConfiguration::findTimeZone(const QString& timeZone) { QList items = ui->timeZonesTW->findItems(timeZone, Qt::MatchExactly); foreach (QTableWidgetItem* item, items) @@ -511,10 +511,10 @@ int LxQtWorldClockConfiguration::findTimeZone(const QString& timeZone) return -1; } -void LxQtWorldClockConfiguration::addTimeZone() +void LXQtWorldClockConfiguration::addTimeZone() { if (!mConfigurationTimeZones) - mConfigurationTimeZones = new LxQtWorldClockConfigurationTimeZones(this); + mConfigurationTimeZones = new LXQtWorldClockConfigurationTimeZones(this); if (mConfigurationTimeZones->updateAndExec() == QDialog::Accepted) { @@ -537,7 +537,7 @@ void LxQtWorldClockConfiguration::addTimeZone() saveSettings(); } -void LxQtWorldClockConfiguration::removeTimeZone() +void LXQtWorldClockConfiguration::removeTimeZone() { foreach (QTableWidgetItem *item, ui->timeZonesTW->selectedItems()) if (item->column() == 0) @@ -553,7 +553,7 @@ void LxQtWorldClockConfiguration::removeTimeZone() saveSettings(); } -void LxQtWorldClockConfiguration::setBold(QTableWidgetItem *item, bool value) +void LXQtWorldClockConfiguration::setBold(QTableWidgetItem *item, bool value) { if (item) { @@ -563,19 +563,19 @@ void LxQtWorldClockConfiguration::setBold(QTableWidgetItem *item, bool value) } } -void LxQtWorldClockConfiguration::setBold(int row, bool value) +void LXQtWorldClockConfiguration::setBold(int row, bool value) { setBold(ui->timeZonesTW->item(row, 0), value); setBold(ui->timeZonesTW->item(row, 1), value); } -void LxQtWorldClockConfiguration::setDefault(int row) +void LXQtWorldClockConfiguration::setDefault(int row) { setBold(row, true); mDefaultTimeZone = ui->timeZonesTW->item(row, 0)->text(); } -void LxQtWorldClockConfiguration::setTimeZoneAsDefault() +void LXQtWorldClockConfiguration::setTimeZoneAsDefault() { setBold(findTimeZone(mDefaultTimeZone), false); @@ -584,7 +584,7 @@ void LxQtWorldClockConfiguration::setTimeZoneAsDefault() saveSettings(); } -void LxQtWorldClockConfiguration::editTimeZoneCustomName() +void LXQtWorldClockConfiguration::editTimeZoneCustomName() { int row = ui->timeZonesTW->selectedItems()[0]->row(); @@ -603,7 +603,7 @@ void LxQtWorldClockConfiguration::editTimeZoneCustomName() } } -void LxQtWorldClockConfiguration::moveTimeZoneUp() +void LXQtWorldClockConfiguration::moveTimeZoneUp() { int m = ui->timeZonesTW->rowCount(); bool skipTop = true; @@ -636,7 +636,7 @@ void LxQtWorldClockConfiguration::moveTimeZoneUp() saveSettings(); } -void LxQtWorldClockConfiguration::moveTimeZoneDown() +void LXQtWorldClockConfiguration::moveTimeZoneDown() { int m = ui->timeZonesTW->rowCount(); bool skipBottom = true; diff --git a/plugin-worldclock/lxqtworldclockconfiguration.h b/plugin-worldclock/lxqtworldclockconfiguration.h index 69e5428..19c422e 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.h +++ b/plugin-worldclock/lxqtworldclockconfiguration.h @@ -38,28 +38,28 @@ namespace Ui { - class LxQtWorldClockConfiguration; + class LXQtWorldClockConfiguration; } -class LxQtWorldClockConfigurationTimeZones; -class LxQtWorldClockConfigurationManualFormat; +class LXQtWorldClockConfigurationTimeZones; +class LXQtWorldClockConfigurationManualFormat; class QTableWidgetItem; -class LxQtWorldClockConfiguration : public QDialog +class LXQtWorldClockConfiguration : public QDialog { Q_OBJECT public: - explicit LxQtWorldClockConfiguration(QSettings *settings, QWidget *parent = NULL); - ~LxQtWorldClockConfiguration(); + explicit LXQtWorldClockConfiguration(QSettings *settings, QWidget *parent = NULL); + ~LXQtWorldClockConfiguration(); public slots: void saveSettings(); private: - Ui::LxQtWorldClockConfiguration *ui; + Ui::LXQtWorldClockConfiguration *ui; QSettings *mSettings; - LxQt::SettingsCache mOldSettings; + LXQt::SettingsCache mOldSettings; /* Read settings from conf file and put data into controls. @@ -92,8 +92,8 @@ private: bool mLockCascadeSettingChanges; - LxQtWorldClockConfigurationTimeZones *mConfigurationTimeZones; - LxQtWorldClockConfigurationManualFormat *mConfigurationManualFormat; + LXQtWorldClockConfigurationTimeZones *mConfigurationTimeZones; + LXQtWorldClockConfigurationManualFormat *mConfigurationManualFormat; QString mManualFormat; diff --git a/plugin-worldclock/lxqtworldclockconfiguration.ui b/plugin-worldclock/lxqtworldclockconfiguration.ui index e9994c9..3ee08fd 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.ui +++ b/plugin-worldclock/lxqtworldclockconfiguration.ui @@ -1,7 +1,7 @@ - LxQtWorldClockConfiguration - + LXQtWorldClockConfiguration + 0 @@ -591,7 +591,7 @@ buttons accepted() - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration accept() @@ -607,7 +607,7 @@ buttons rejected() - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration reject() diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp index 774920e..cc186b8 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.cpp @@ -34,9 +34,9 @@ #include "ui_lxqtworldclockconfigurationmanualformat.h" -LxQtWorldClockConfigurationManualFormat::LxQtWorldClockConfigurationManualFormat(QWidget *parent) : +LXQtWorldClockConfigurationManualFormat::LXQtWorldClockConfigurationManualFormat(QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtWorldClockConfigurationManualFormat) + ui(new Ui::LXQtWorldClockConfigurationManualFormat) { setObjectName("WorldClockConfigurationManualFormatWindow"); setWindowModality(Qt::WindowModal); @@ -45,17 +45,17 @@ LxQtWorldClockConfigurationManualFormat::LxQtWorldClockConfigurationManualFormat connect(ui->manualFormatPTE, SIGNAL(textChanged()), this, SIGNAL(manualFormatChanged())); } -LxQtWorldClockConfigurationManualFormat::~LxQtWorldClockConfigurationManualFormat() +LXQtWorldClockConfigurationManualFormat::~LXQtWorldClockConfigurationManualFormat() { delete ui; } -void LxQtWorldClockConfigurationManualFormat::setManualFormat(const QString& text) +void LXQtWorldClockConfigurationManualFormat::setManualFormat(const QString& text) { ui->manualFormatPTE->setPlainText(text); } -QString LxQtWorldClockConfigurationManualFormat::manualFormat() const +QString LXQtWorldClockConfigurationManualFormat::manualFormat() const { return ui->manualFormatPTE->toPlainText(); } diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h index 62572ee..bcfd545 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h @@ -35,18 +35,18 @@ namespace Ui { - class LxQtWorldClockConfigurationManualFormat; + class LXQtWorldClockConfigurationManualFormat; } class QTreeWidgetItem; -class LxQtWorldClockConfigurationManualFormat : public QDialog +class LXQtWorldClockConfigurationManualFormat : public QDialog { Q_OBJECT public: - explicit LxQtWorldClockConfigurationManualFormat(QWidget *parent = NULL); - ~LxQtWorldClockConfigurationManualFormat(); + explicit LXQtWorldClockConfigurationManualFormat(QWidget *parent = NULL); + ~LXQtWorldClockConfigurationManualFormat(); void setManualFormat(const QString&); @@ -56,7 +56,7 @@ signals: void manualFormatChanged(); private: - Ui::LxQtWorldClockConfigurationManualFormat *ui; + Ui::LXQtWorldClockConfigurationManualFormat *ui; }; #endif // LXQT_PANEL_WORLDCLOCK_CONFIGURATION_MANUAL_FORMAT_H diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui index c95c4c7..dd51501 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.ui @@ -1,7 +1,7 @@ - LxQtWorldClockConfigurationManualFormat - + LXQtWorldClockConfigurationManualFormat + 0 @@ -150,7 +150,7 @@ buttons accepted() - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat accept() @@ -166,7 +166,7 @@ buttons rejected() - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat reject() diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp b/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp index bbf9eb3..178d63f 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.cpp @@ -34,9 +34,9 @@ #include "ui_lxqtworldclockconfigurationtimezones.h" -LxQtWorldClockConfigurationTimeZones::LxQtWorldClockConfigurationTimeZones(QWidget *parent) : +LXQtWorldClockConfigurationTimeZones::LXQtWorldClockConfigurationTimeZones(QWidget *parent) : QDialog(parent), - ui(new Ui::LxQtWorldClockConfigurationTimeZones) + ui(new Ui::LXQtWorldClockConfigurationTimeZones) { setObjectName("WorldClockConfigurationTimeZonesWindow"); setWindowModality(Qt::WindowModal); @@ -46,17 +46,17 @@ LxQtWorldClockConfigurationTimeZones::LxQtWorldClockConfigurationTimeZones(QWidg connect(ui->timeZonesTW, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), SLOT(itemDoubleClicked(QTreeWidgetItem*,int))); } -LxQtWorldClockConfigurationTimeZones::~LxQtWorldClockConfigurationTimeZones() +LXQtWorldClockConfigurationTimeZones::~LXQtWorldClockConfigurationTimeZones() { delete ui; } -QString LxQtWorldClockConfigurationTimeZones::timeZone() +QString LXQtWorldClockConfigurationTimeZones::timeZone() { return mTimeZone; } -void LxQtWorldClockConfigurationTimeZones::itemSelectionChanged() +void LXQtWorldClockConfigurationTimeZones::itemSelectionChanged() { QList items = ui->timeZonesTW->selectedItems(); if (!items.empty()) @@ -65,13 +65,13 @@ void LxQtWorldClockConfigurationTimeZones::itemSelectionChanged() mTimeZone.clear(); } -void LxQtWorldClockConfigurationTimeZones::itemDoubleClicked(QTreeWidgetItem* /*item*/, int /*column*/) +void LXQtWorldClockConfigurationTimeZones::itemDoubleClicked(QTreeWidgetItem* /*item*/, int /*column*/) { if (!mTimeZone.isEmpty()) accept(); } -QTreeWidgetItem* LxQtWorldClockConfigurationTimeZones::makeSureParentsExist(const QStringList &parts, QMap &parentItems) +QTreeWidgetItem* LXQtWorldClockConfigurationTimeZones::makeSureParentsExist(const QStringList &parts, QMap &parentItems) { if (parts.length() == 1) return 0; @@ -98,7 +98,7 @@ QTreeWidgetItem* LxQtWorldClockConfigurationTimeZones::makeSureParentsExist(cons return newItem; } -int LxQtWorldClockConfigurationTimeZones::updateAndExec() +int LXQtWorldClockConfigurationTimeZones::updateAndExec() { QDateTime now = QDateTime::currentDateTime(); diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h index d3f1677..cb5150c 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h @@ -35,18 +35,18 @@ namespace Ui { - class LxQtWorldClockConfigurationTimeZones; + class LXQtWorldClockConfigurationTimeZones; } class QTreeWidgetItem; -class LxQtWorldClockConfigurationTimeZones : public QDialog +class LXQtWorldClockConfigurationTimeZones : public QDialog { Q_OBJECT public: - explicit LxQtWorldClockConfigurationTimeZones(QWidget *parent = NULL); - ~LxQtWorldClockConfigurationTimeZones(); + explicit LXQtWorldClockConfigurationTimeZones(QWidget *parent = NULL); + ~LXQtWorldClockConfigurationTimeZones(); int updateAndExec(); @@ -57,7 +57,7 @@ public slots: void itemDoubleClicked(QTreeWidgetItem*,int); private: - Ui::LxQtWorldClockConfigurationTimeZones *ui; + Ui::LXQtWorldClockConfigurationTimeZones *ui; QString mTimeZone; diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.ui b/plugin-worldclock/lxqtworldclockconfigurationtimezones.ui index 017c5cd..b823921 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.ui +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.ui @@ -1,7 +1,7 @@ - LxQtWorldClockConfigurationTimeZones - + LXQtWorldClockConfigurationTimeZones + 0 @@ -71,7 +71,7 @@ buttons accepted() - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones accept() @@ -87,7 +87,7 @@ buttons rejected() - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones reject() diff --git a/plugin-worldclock/resources/worldclock.desktop.in b/plugin-worldclock/resources/worldclock.desktop.in index f0aecd0..e957f5a 100644 --- a/plugin-worldclock/resources/worldclock.desktop.in +++ b/plugin-worldclock/resources/worldclock.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name=World clock Comment=World clock plugin. Icon=clock diff --git a/plugin-worldclock/translations/worldclock.ts b/plugin-worldclock/translations/worldclock.ts index 846c397..32c44a4 100644 --- a/plugin-worldclock/translations/worldclock.ts +++ b/plugin-worldclock/translations/worldclock.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -239,7 +239,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -288,7 +288,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_de.ts b/plugin-worldclock/translations/worldclock_de.ts index c51cf08..595ff3f 100644 --- a/plugin-worldclock/translations/worldclock_de.ts +++ b/plugin-worldclock/translations/worldclock_de.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -239,7 +239,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -324,7 +324,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_el.desktop b/plugin-worldclock/translations/worldclock_el.desktop new file mode 100644 index 0000000..05e992b --- /dev/null +++ b/plugin-worldclock/translations/worldclock_el.desktop @@ -0,0 +1,2 @@ +Name[el]=Παγκόσμιο ρολόι +Comment[el]=Πρόσθετο παγκόσμιου ρολογιού diff --git a/plugin-worldclock/translations/worldclock_el.ts b/plugin-worldclock/translations/worldclock_el.ts new file mode 100644 index 0000000..ff3ebb4 --- /dev/null +++ b/plugin-worldclock/translations/worldclock_el.ts @@ -0,0 +1,370 @@ + + + + + LxQtWorldClock + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + LxQtWorldClockConfiguration + + + World Clock Settings + Ρυθμίσεις παγκόσμιου ρολογιού + + + + Display &format + &Μορφή εμφάνισης + + + + &Time + &Ώρα + + + + F&ormat: + Μ&ορφή: + + + + + + Short + Σύντομη + + + + + + Long + Μακριά + + + + + Custom + Προσαρμοσμένη + + + + Sho&w seconds + Εμφάνι&ση των δευτερολέπτων + + + + Pad &hour with zero + &Συμπλήρωση της ώρας με μηδενικά + + + + T&ime zone + &Ζώνη ώρας + + + + &Position: + &Θέση: + + + + For&mat: + &Μορφή: + + + + + Below + Κάτω + + + + + Above + Πάνω + + + + + Before + Πριν + + + + + After + Μετά + + + + Offset from UTC + Διαφορά από την UTC + + + + Abbreviation + Συντομογραφία + + + + IANA id + Αναγνωριστικό IANA + + + + + + Custom name + Προσαρμοσμένο όνομα + + + + &Use 12-hour format + &Χρήση της 12άωρης μορφής + + + + Location identifier + Αναγνωριστικό τοποθεσίας + + + + &Date + &Ημερομηνία + + + + Po&sition: + &Θέση: + + + + Fo&rmat: + &Μορφή: + + + + ISO 8601 + ISO 8601 + + + + Show &year + Εμφάνιση του έ&τους + + + + Show day of wee&k + Εμφάνιση της ημέρας της ε&βδομάδας + + + + Pad d&ay with zero + Συμπλή&ρωση της ημέρας με μηδενικά + + + + &Long month and day of week names + &Μακριά ονόματα του μήνα και της ημέρας της εβδομάδας + + + + Ad&vanced manual format + Προη&γμένη χειροκίνητη μορφή + + + + &Customise ... + &Προσαρμογή... + + + + Time &zones + &Ζώνες ώρας + + + + &Add ... + &Προσθήκη... + + + + &Remove + Α&φαίρεση + + + + Set as &default + &Ορισμός ως προκαθορισμένο + + + + &Edit custom name ... + &Επεξεργασία προσαρμοσμένου ονόματος... + + + + Move &up + Μετακίνηση &πάνω + + + + Move do&wn + Μετακίνηση &κάτω + + + + &General + &Γενικά + + + + Auto&rotate when the panel is vertical + &Αυτόματη περιστροφή όταν ο πίνακας είναι τοποθετημένος κάθετα + + + + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' + + + + Input custom time zone name + Εισαγωγή του προσαρμοσμένου ονόματος της ζώνης ώρας + + + + LxQtWorldClockConfigurationManualFormat + + + World Clock Time Zones + Ζώνες ώρας του παγκόσμιου ρολογιού + + + + <h1>Custom Date/Time Format Syntax</h1> +<p>A date pattern is a string of characters, where specific strings of characters are replaced with date and time data from a calendar when formatting or used to generate data for a calendar when parsing.</p> +<p>The Date Field Symbol Table below contains the characters used in patterns to show the appropriate formats for a given locale, such as yyyy for the year. Characters may be used multiple times. For example, if y is used for the year, 'yy' might produce '99', whereas 'yyyy' produces '1999'. For most numerical fields, the number of characters specifies the field width. For example, if h is the hour, 'h' might produce '5', but 'hh' produces '05'. For some characters, the count specifies whether an abbreviated or full form should be used, but may have other choices, as given below.</p> +<p>Two single quotes represents a literal single quote, either inside or outside single quotes. Text within single quotes is not interpreted in any way (except for two adjacent single quotes). Otherwise all ASCII letter from a to z and A to Z are reserved as syntax characters, and require quoting if they are to represent literal characters. In addition, certain ASCII punctuation characters may become variable in the future (eg ":" being interpreted as the time separator and '/' as a date separator, and replaced by respective locale-sensitive characters in display).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Code</th><th>Meaning</th></tr> +<tr><td>d</td><td>the day as number without a leading zero (1 to 31)</td></tr> +<tr><td>dd</td><td>the day as number with a leading zero (01 to 31)</td></tr> +<tr><td>ddd</td><td>the abbreviated localized day name (e.g. 'Mon' to 'Sun').</td></tr> +<tr><td>dddd</td><td>the long localized day name (e.g. 'Monday' to 'Sunday</td></tr> +<tr><td>M</td><td>the month as number without a leading zero (1-12)</td></tr> +<tr><td>MM</td><td>the month as number with a leading zero (01-12)</td></tr> +<tr><td>MMM</td><td>the abbreviated localized month name (e.g. 'Jan' to 'Dec').</td></tr> +<tr><td>MMMM</td><td>the long localized month name (e.g. 'January' to 'December').</td></tr> +<tr><td>yy</td><td>the year as two digit number (00-99)</td></tr> +<tr><td>yyyy</td><td>the year as four digit number</td></tr> +<tr><td>h</td><td>the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display)</td></tr> +<tr><td>hh</td><td>the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display)</td></tr> +<tr><td>H</td><td>the hour without a leading zero (0 to 23, even with AM/PM display)</td></tr> +<tr><td>HH</td><td>the hour with a leading zero (00 to 23, even with AM/PM display)</td></tr> +<tr><td>m</td><td>the minute without a leading zero (0 to 59)</td></tr> +<tr><td>mm</td><td>the minute with a leading zero (00 to 59)</td></tr> +<tr><td>s</td><td>the second without a leading zero (0 to 59)</td></tr> +<tr><td>ss</td><td>the second with a leading zero (00 to 59)</td></tr> +<tr><td>z</td><td>the milliseconds without leading zeroes (0 to 999)</td></tr> +<tr><td>zzz</td><td>the milliseconds with leading zeroes (000 to 999)</td></tr> +<tr><td>AP <i>or</i> A</td><td>use AM/PM display. <b>A/AP</b> will be replaced by either "AM" or "PM".<</td></tr> +<tr><td>ap <i>or</i> a</td><td>use am/pm display. <b>a/ap</b> will be replaced by either "am" or "pm".<</td></tr> +<tr><td>t</td><td>the timezone (for example "CEST")</td></tr> +<tr><td>T</td><td>the offset from UTC</td></tr> +<tr><td>TT</td><td>the timezone IANA id</td></tr> +<tr><td>TTT</td><td>the timezone abbreviation</td></tr> +<tr><td>TTTT</td><td>the timezone short display name</td></tr> +<tr><td>TTTTT</td><td>the timezone long display name</td></tr> +<tr><td>TTTTTT</td><td>the timezone custom name. You can change it the 'Time zones' tab of the configuration window</td></tr></table> +<p><br /><b>Note:</b> Any characters in the pattern that are not in the ranges of ['a'..'z'] and ['A'..'Z'] will be treated as quoted text. For instance, characters like ':', '.', ' ', '#' and '@' will appear in the resulting time text even they are not enclosed within single quotes.The single quote is used to 'escape' letters. Two single quotes in a row, whether inside or outside a quoted sequence, represent a 'real' single quote.</p> + + <h1>Προσαρμοσμένη σύνταξη ημερομηνίας/ώρας</h1> +<p>Μια σχηματομορφή ημερομηνίας είναι μια συμβολοσειρά χαρακτήρων, όπου συγκεκριμένοι χαρακτήρες αντικαθιστώνται με τα δεδομένα της ημερομηνίας και της ώρας από ένα ημερολόγιο κατά την μορφοποίηση ή όταν χρησιμοποιείται για την δημιουργία δεδομένον ημερολογίου κατά την ανάλυση.</p> +<p>Ο παρακάτω πίνακας του πεδίου συμβόλου της ημερομηνίας περιέχει τους χαρακτήρες που χρησιμοποιούνται στις σχηματομορφές για να εμφανίσουν τις κατάλληλες μορφές για μια δοσμένη τοπικότητα, όπως yyyy για το έτος. Οι χαρακτήρες μπορούν να χρησιμοποιηθούν περισσότερες φορές. Για παράδειγμα, αν χρησιμοποιείται για το έτος,το 'yy' μπορεί να παράγει '99', ενώ το 'yyyy' παράγει '1999'. Για τα περισσότερα των αριθμητικών πεδίων, το πλήθος των χαρακτήρων καθορίζει το πλάτος του πεδίου. Για παράδειγμα, αν h είναι η ώρα, το 'h' μπορεί να παράγει '5', αλλά το 'hh' παράγει '05'. Για ορισμένους χαρακτήρες, το πλήθος καθορίζει αν θα χρησιμοποιείται μια πλήρης ή συντομογραφημένη μορφή, αλλά μπορεί να έχει και άλλες επιλογές, όπως αναφέρεται παρακάτω.</p> +<p>Δυο μονά εισαγωγικά αναπαριστούν κυριολεκτικά μονά εισαγωγικά, είτε εσωτερικά είτε εξωτερικά μονά εισαγωγικά. Το κείμενο που εσωκλείεται σε μονά εισαγωγικά δεν ερμηνεύεται σε καμιά περίπτωση (εκτός των δυο παρακείμενων μονών εισαγωγικών). Διαφορετικά όλα τα γράμματα ASCII από το a ως το z και από το A ως το Z είναι δεσμευμένα ως χαρακτήρες σύνταξης, και απαιτούνται εισαγωγικά αν πρόκειται να αναπαραστήσουν κυριολεκτικούς χαρακτήρες. Επιπρόσθετα, ορισμένοι χαρακτήρες στίξης ASCII μπορεί να χρησιμοποιηθούν μελλοντικά ως μεταβλητές (πχ η ":" ερμηνεύεται ως διαχωριστικό ώρας και και η '/' ως διαχωριστικό ημερομηνίας, και αντικαθίσταται από τους εκάστοτε χαρακτήρες τοπικότητας στην οθόνη).<br /></p> +<table border="1" width="100%" cellpadding="4" cellspacing="0"> +<tr><th width="20%">Κωδικός</th><th>Σημασία</th></tr> +<tr><td>d</td><td>η ημέρα ως αριθμός χωρίς το αρχικό μηδενικό (1 ως 31)</td></tr> +<tr><td>dd</td><td>η ημέρα ως αριθμός με το αρχικό μηδενικό (01 ως 31)</td></tr> +<tr><td>ddd</td><td>η συντομογραφημένη τοπικοποιημένη ονομασία της ημέρας (π.χ. 'Δευ' ως 'Κυρ').</td></tr> +<tr><td>dddd</td><td>η μακριά τοπικοποιημένη ονομασία της ημέρας (π.χ. 'Δευτέρα' ως 'Κυριακή</td></tr> +<tr><td>M</td><td>ο μήνας ως αριθμός δίχως το αρχικό μηδενικό (1-12)</td></tr> +<tr><td>MM</td><td>ο μήνας ως αριθμός με το αρχικό μηδενικό (01-12)</td></tr> +<tr><td>MMM</td><td>η συντομογραφημένη τοπικοποιημένη ονομασία του μήνα (π.χ. 'Ιαν' ως 'Δεκ').</td></tr> +<tr><td>MMMM</td><td>η μακριά τοπικοποιημένη ονομασία του μήνα (π.χ. 'Ιανουάριος' ως 'Δεκέμβριος').</td></tr> +<tr><td>yy</td><td>το έτος ως διψήφιος αριθμός (00-99)</td></tr> +<tr><td>yyyy</td><td>το έτος ως τετραψήφιος αριθμός</td></tr> +<tr><td>h</td><td>η ώρα δίχως το αρχικό μηδενικό (0 ως 23 ή 1 ως 12 αν απεικονίζεται ως ΠΜ/ΜΜ)</td></tr> +<tr><td>hh</td><td>η ώρα με το αρχικό μηδενικό (00 ως 23 ή 01 ως 12 αν απεικονίζεται ως ΠΜ/ΜΜ)</td></tr> +<tr><td>H</td><td>η ώρα με το αρχικό μηδενικό (0 ως 23, ακόμα και με απεικόνιση ως ΠΜ/ΜΜ)</td></tr> +<tr><td>HH</td><td>η ώρα με το αρχικό μηδενικό (00 ως 23, ακόμα και με απεικόνιση ως ΠΜ/ΜΜ)</td></tr> +<tr><td>m</td><td>τα λεπτά δίχως το αρχικό μηδενικό (0 ως 59)</td></tr> +<tr><td>mm</td><td>τα λεπτά με το αρχικό μηδενικό (00 ως 59)</td></tr> +<tr><td>s</td><td>τα δευτερόλεπτα δίχως το αρχικό μηδενικό (0 ως 59)</td></tr> +<tr><td>ss</td><td>τα δευτερόλεπτα με το αρχικό μηδενικό (00 ως 59)</td></tr> +<tr><td>z</td><td>τα χιλιοστά δευτερολέπτου δίχως τα αρχικά μηδενικά (0 ως 999)</td></tr> +<tr><td>zzz</td><td>τα χιλιοστά δευτερολέπτου με τα αρχικά μηδενικά (000 ως 999)</td></tr> +<tr><td>AP <i>or</i> A</td><td>χρήση της απεικόνισης ως ΠΜ/ΜΜ. Τα <b>A/AP</b> θα αντικατασταθούν από "ΠΠ" ή "ΜΜ".<</td></tr> +<tr><td>ap <i>or</i> a</td><td>χρήση της απεικόνισης πμ/μμ. Τα <b>a/ap</b> θα αντικατασταθούν από τα "πμ" ή "μμ".<</td></tr> +<tr><td>t</td><td>η ζώνη ώρας (για παράδειγμα "CEST")</td></tr> +<tr><td>T</td><td>η διαφορά από την ώρα UTC</td></tr> +<tr><td>TT</td><td>το αναγνωριστικό IANA της ζώνης ώρας</td></tr> +<tr><td>TTT</td><td>η συντομογραφία της ζώνης ώρας</td></tr> +<tr><td>TTTT</td><td>το βραχύ όνομα της ζώνης ώρας</td></tr> +<tr><td>TTTTT</td><td>το μακρύ όνομα της ζώνης ώρας</td></tr> +<tr><td>TTTTTT</td><td>το προσαρμοσμένο όνομα της ζώνης ώρας. Μπορείτε να το αλλάξετε από την καρτέλα «Ζώνες ώρας» του παραθύρου διαμόρφωσης</td></tr></table> +<p><br /><b>Σημείωση:</b> Οποιοσδήποτε χαρακτήρας στη σχηματομορφή που δεν είναι σε εύρος του ['a'..'z'] και ['A'..'Z'] θα διαχειρίζεται ως κείμενο σε εισαγωγικά. Παραδείγματος χάριν, οι χαρακτήρες όπως ':', '.', ' ', '#' και '@' θα εμφανίζονται στο τελικό κείμενο της ώρας ακόμα και αν δεν είναι έγκλειστοι σε μονά εισαγωγικά. Τα μονά εισαγωγικά χρησιμοποιούνται για τη «διαφυγή» γραμμάτων. Δυο μονά εισαγωγικά σε μια γραμμή, είτε εσωτερικά είτε εξωτερικά της ακολουθίας έγκλειστης σε εισαγωγικά, αναπαριστούν ένα ζεύγος «πραγματικών» μονών εισαγωγικών.</p> + + + + + LxQtWorldClockConfigurationTimeZones + + + World Clock Time Zones + Ζώνες ώρας του παγκόσμιου ρολογιού + + + + Time zone + Ζώνη ώρας + + + + Name + Όνομα + + + + Comment + Σχόλιο + + + + Country + Χώρα + + + + UTC + UTC + + + + + Other + Άλλο + + + + Local timezone + Τοπικής ζώνης ώρας + + + diff --git a/plugin-worldclock/translations/worldclock_hu.ts b/plugin-worldclock/translations/worldclock_hu.ts index e77c109..a5e333e 100644 --- a/plugin-worldclock/translations/worldclock_hu.ts +++ b/plugin-worldclock/translations/worldclock_hu.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -239,7 +239,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -288,7 +288,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_hu_HU.ts b/plugin-worldclock/translations/worldclock_hu_HU.ts index c281ad3..76ab27d 100644 --- a/plugin-worldclock/translations/worldclock_hu_HU.ts +++ b/plugin-worldclock/translations/worldclock_hu_HU.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -239,7 +239,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -288,7 +288,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_ja.desktop b/plugin-worldclock/translations/worldclock_ja.desktop index b9b6f8e..a1b09d7 100644 --- a/plugin-worldclock/translations/worldclock_ja.desktop +++ b/plugin-worldclock/translations/worldclock_ja.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ja]=世界時計 Comment[ja]=世界時計のウィジェットです diff --git a/plugin-worldclock/translations/worldclock_ja.ts b/plugin-worldclock/translations/worldclock_ja.ts index 08a506a..e6a5034 100644 --- a/plugin-worldclock/translations/worldclock_ja.ts +++ b/plugin-worldclock/translations/worldclock_ja.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -239,7 +239,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -324,7 +324,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_pt.ts b/plugin-worldclock/translations/worldclock_pt.ts index 7a76d26..f4cb4e0 100644 --- a/plugin-worldclock/translations/worldclock_pt.ts +++ b/plugin-worldclock/translations/worldclock_pt.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -263,7 +263,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -347,7 +347,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_ru.desktop b/plugin-worldclock/translations/worldclock_ru.desktop index 34bfbcd..901f660 100644 --- a/plugin-worldclock/translations/worldclock_ru.desktop +++ b/plugin-worldclock/translations/worldclock_ru.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru]=Мировое время Comment[ru]=Плагин мирового времени. diff --git a/plugin-worldclock/translations/worldclock_ru.ts b/plugin-worldclock/translations/worldclock_ru.ts index e16c1c0..a0090a3 100644 --- a/plugin-worldclock/translations/worldclock_ru.ts +++ b/plugin-worldclock/translations/worldclock_ru.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -263,7 +263,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -347,7 +347,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones diff --git a/plugin-worldclock/translations/worldclock_ru_RU.desktop b/plugin-worldclock/translations/worldclock_ru_RU.desktop index 75090eb..0e8eaaa 100644 --- a/plugin-worldclock/translations/worldclock_ru_RU.desktop +++ b/plugin-worldclock/translations/worldclock_ru_RU.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -ServiceTypes=LxQtPanel/Plugin +ServiceTypes=LXQtPanel/Plugin Name[ru_RU]=Мировое время Comment[ru_RU]=Плагин мирового времени. diff --git a/plugin-worldclock/translations/worldclock_ru_RU.ts b/plugin-worldclock/translations/worldclock_ru_RU.ts index 31c2b4b..6c34f92 100644 --- a/plugin-worldclock/translations/worldclock_ru_RU.ts +++ b/plugin-worldclock/translations/worldclock_ru_RU.ts @@ -2,7 +2,7 @@ - LxQtWorldClock + LXQtWorldClock '<b>'HH:mm:ss'</b><br/><font size="-2">'ddd, d MMM yyyy'<br/>'TT'</font>' @@ -10,7 +10,7 @@ - LxQtWorldClockConfiguration + LXQtWorldClockConfiguration World Clock Settings @@ -263,7 +263,7 @@ - LxQtWorldClockConfigurationManualFormat + LXQtWorldClockConfigurationManualFormat World Clock Time Zones @@ -347,7 +347,7 @@ - LxQtWorldClockConfigurationTimeZones + LXQtWorldClockConfigurationTimeZones World Clock Time Zones