From 82c18396345b26119469a5857a7daa62cae167d7 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 1 Sep 2015 01:12:10 +0300 Subject: [PATCH] drop hidding method --- .../package/contents/config/main.xml | 3 - .../package/contents/ui/advanced.qml | 17 --- .../package/contents/ui/main.qml | 7 - sources/desktop-panel/plugin/dpadds.cpp | 131 ------------------ sources/desktop-panel/plugin/dpadds.h | 8 +- sources/translations/awesome-widgets.pot | 17 +-- sources/translations/en.po | 32 ++--- sources/translations/es.po | 32 ++--- sources/translations/fr.po | 32 ++--- sources/translations/nl.po | 32 ++--- sources/translations/pt_BR.po | 32 ++--- sources/translations/ru.po | 32 ++--- sources/translations/uk.po | 32 ++--- sources/translations/zh.po | 31 ++--- 14 files changed, 128 insertions(+), 310 deletions(-) diff --git a/sources/desktop-panel/package/contents/config/main.xml b/sources/desktop-panel/package/contents/config/main.xml index b8bd4fe..afa8ab5 100644 --- a/sources/desktop-panel/package/contents/config/main.xml +++ b/sources/desktop-panel/package/contents/config/main.xml @@ -38,9 +38,6 @@ ¤ - - -1 - diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml index aec8319..ad96552 100644 --- a/sources/desktop-panel/package/contents/ui/advanced.qml +++ b/sources/desktop-panel/package/contents/ui/advanced.qml @@ -230,23 +230,6 @@ Item { onCurrentIndexChanged: cfg_mark = currentText } } - -// Row { -// height: implicitHeight -// width: parent.width -// QtControls.Label { -// height: parent.height -// width: parent.width * 2 / 5 -// horizontalAlignment: Text.AlignRight -// verticalAlignment: Text.AlignVCenter -// text: i18n("Panels to be hidden") -// } -// QtControls.Button { -// width: parent.width * 3 / 5 -// text: i18n("Edit panels") -// onClicked: cfg_panels = dpAdds.editPanelsToContol(plasmoid.configuration.panels) -// } -// } } QtDialogs.ColorDialog { diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index 89fed9d..a1845b3 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -170,18 +170,11 @@ Item { } } - Plasmoid.onActivated: { - if (debug) console.debug() - -// dpAdds.changePanelsState() - } - Plasmoid.onUserConfiguringChanged: { if (plasmoid.userConfiguring) return if (debug) console.debug() dpAdds.setMark(plasmoid.configuration.mark) - dpAdds.setPanelsToControl(plasmoid.configuration.panels) dpAdds.setToolTipData(tooltipSettings) needUpdate() diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 193f70d..fa419bc 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -203,22 +203,6 @@ void DPAdds::setMark(const QString newMark) } -void DPAdds::setPanelsToControl(const QString newPanels) -{ - qCDebug(LOG_DP); - qCDebug(LOG_DP) << "Panels" << newPanels; - - panelsToControl.clear(); - if (newPanels == QString("-1")) { - int count = getPanels().count(); - for (int i=0; iaddWidget(widget); - layout->addWidget(buttons); - dialog->setLayout(layout); - connect(buttons, SIGNAL(rejected()), dialog, SLOT(reject())); - connect(buttons, SIGNAL(accepted()), dialog, SLOT(accept())); - - // fill - QList panels = getPanels(); - for (int i=0; ilocation()), widget); - if ((current.split(QChar(',')).contains(QString::number(i))) || - (current == QString("-1"))) - item->setCheckState(Qt::Checked); - else - item->setCheckState(Qt::Unchecked); - } - - // exec - QString value; - QStringList indexes; - int ret = dialog->exec(); - switch (ret) { - case QDialog::Accepted: - for (int i=0; icount(); i++) - if (widget->item(i)->checkState() == Qt::Checked) - indexes.append(QString::number(i)); - if (indexes.count() == widget->count()) - value = QString("-1"); - else - value = indexes.join(QChar(',')); - break; - default: - value = current; - break; - } - - return value; -} - - QString DPAdds::getAboutText(const QString type) const { qCDebug(LOG_DP); @@ -361,33 +294,6 @@ QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const } -void DPAdds::changePanelsState() const -{ - qCDebug(LOG_DP); - if (panelsToControl.isEmpty()) return; - -// QList panels = getPanels(); -// for (int i=0; iview()->isVisible(); -// int winId = panels.at(i)->view()->winId(); -// if (wasVisible) { -// qCDebug(LOG_DP) << "Hide panel"; -// KWindowInfo oldInfo = KWindowSystem::windowInfo(winId, NET::WMState); -// oldState = oldInfo.state(); -// panels.at(i)->view()->setVisible(false); -// } else { -// qCDebug(LOG_DP) << "Show panel"; -// panels.at(i)->view()->setVisible(true); -// KWindowSystem::clearState(winId, NET::KeepAbove); -// KWindowSystem::setState(winId, oldState | NET::StaysOnTop); -// KWindowSystem::setOnAllDesktops(winId, true); -// } -// } -// panels.clear(); -} - - void DPAdds::sendNotification(const QString eventId, const QString message) { qCDebug(LOG_DP); @@ -437,40 +343,3 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const return info; } - - -QList DPAdds::getPanels() const -{ - qCDebug(LOG_DP); - -// Plasma::Corona *corona = new Plasma::Corona(this); - QList panels; -// foreach(Plasma::Containment *cont, corona->containments()) { -// if (cont->containmentType() != Plasma::Types::ContainmentType::PanelContainment) continue -// panels.append(cont); -// } -// delete corona; - - return panels; -} - - -QString DPAdds::panelLocationToStr(Plasma::Types::Location location) const -{ - qCDebug(LOG_DP); - qCDebug(LOG_DP) << "Location" << location; - - switch (location) { - case Plasma::Types::Location::TopEdge: - return i18n("Top Edge"); - case Plasma::Types::Location::BottomEdge: - return i18n("Bottom Edge"); - case Plasma::Types::Location::LeftEdge: - return i18n("Left Edge"); - case Plasma::Types::Location::RightEdge: - return i18n("Right Edge"); - default: - qCWarning(LOG_DP) << "Unknown location" << location; - return i18n("Unknown location (%1)", location); - } -} diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index e786676..5345397 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -54,11 +54,9 @@ public: Q_INVOKABLE QString parsePattern(const QString pattern, const int desktop) const; // values Q_INVOKABLE void setMark(const QString newMark); - Q_INVOKABLE void setPanelsToControl(const QString newPanels); Q_INVOKABLE void setToolTipData(const QVariantMap tooltipData); Q_INVOKABLE QString valueByKey(const QString key, int desktop = -1) const; // configuration slots - Q_INVOKABLE QString editPanelsToContol(const QString current); Q_INVOKABLE QString getAboutText(const QString type = "header") const; Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const; @@ -67,20 +65,16 @@ signals: void windowListChanged() const; public slots: - Q_INVOKABLE void changePanelsState() const; Q_INVOKABLE static void sendNotification(const QString eventId, const QString message); Q_INVOKABLE void setCurrentDesktop(const int desktop) const; private: DesktopWindowsInfo getInfoByDesktop(const int desktop) const; - QList getPanels() const; - QString panelLocationToStr(Plasma::Types::Location location) const; // variables - int oldState, tooltipWidth = 200; + int tooltipWidth = 200; QString mark = QString("*"); QString tooltipColor = QString("#000000"); QString tooltipType = QString("none"); - QList panelsToControl; }; diff --git a/sources/translations/awesome-widgets.pot b/sources/translations/awesome-widgets.pot index 55431b6..2125264 100644 --- a/sources/translations/awesome-widgets.pot +++ b/sources/translations/awesome-widgets.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -520,21 +520,6 @@ msgstr "" msgid "Mark" msgstr "" -msgid "Top Edge" -msgstr "" - -msgid "Bottom Edge" -msgstr "" - -msgid "Left Edge" -msgstr "" - -msgid "Right Edge" -msgstr "" - -msgid "Unknown location (%1)" -msgstr "" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "" diff --git a/sources/translations/en.po b/sources/translations/en.po index 0401210..d6166b8 100644 --- a/sources/translations/en.po +++ b/sources/translations/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-08-30 16:30+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: English \n" @@ -529,21 +529,6 @@ msgstr "Vertical layout" msgid "Mark" msgstr "Mark" -msgid "Top Edge" -msgstr "Top Edge" - -msgid "Bottom Edge" -msgstr "Bottom Edge" - -msgid "Left Edge" -msgstr "Left Edge" - -msgid "Right Edge" -msgstr "Right Edge" - -msgid "Unknown location (%1)" -msgstr "Unknown location (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" @@ -552,6 +537,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" +#~ msgid "Top Edge" +#~ msgstr "Top Edge" + +#~ msgid "Bottom Edge" +#~ msgstr "Bottom Edge" + +#~ msgid "Left Edge" +#~ msgstr "Left Edge" + +#~ msgid "Right Edge" +#~ msgstr "Right Edge" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Unknown location (%1)" + #~ msgid "Ticker: %1" #~ msgstr "Ticker: %1" diff --git a/sources/translations/es.po b/sources/translations/es.po index ecb0444..fa2b5de 100644 --- a/sources/translations/es.po +++ b/sources/translations/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-07-31 22:13+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Spanish \n" @@ -540,21 +540,6 @@ msgstr "Orientación vertical" msgid "Mark" msgstr "Marca" -msgid "Top Edge" -msgstr "Borde superior" - -msgid "Bottom Edge" -msgstr "Borde inferior" - -msgid "Left Edge" -msgstr "Borde izquierdo" - -msgid "Right Edge" -msgstr "Borde derecho" - -msgid "Unknown location (%1)" -msgstr "Ubicación desconocida (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Tu nombre" @@ -563,6 +548,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "Tu correo electrónico" +#~ msgid "Top Edge" +#~ msgstr "Borde superior" + +#~ msgid "Bottom Edge" +#~ msgstr "Borde inferior" + +#~ msgid "Left Edge" +#~ msgstr "Borde izquierdo" + +#~ msgid "Right Edge" +#~ msgstr "Borde derecho" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Ubicación desconocida (%1)" + #~ msgid "Exec: %1" #~ msgstr "Ejecutar: %1" diff --git a/sources/translations/fr.po b/sources/translations/fr.po index 6ecd3fc..d3f9b58 100644 --- a/sources/translations/fr.po +++ b/sources/translations/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-07-31 22:16+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: French \n" @@ -550,21 +550,6 @@ msgstr "Positionnement vertical" msgid "Mark" msgstr "Marquer" -msgid "Top Edge" -msgstr "Bord du haut" - -msgid "Bottom Edge" -msgstr "Bord du bas" - -msgid "Left Edge" -msgstr "Bord gauche" - -msgid "Right Edge" -msgstr "Bord droit" - -msgid "Unknown location (%1)" -msgstr "Position inconnue (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev MerMouY" @@ -573,6 +558,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com mermouy@gmail.com" +#~ msgid "Top Edge" +#~ msgstr "Bord du haut" + +#~ msgid "Bottom Edge" +#~ msgstr "Bord du bas" + +#~ msgid "Left Edge" +#~ msgstr "Bord gauche" + +#~ msgid "Right Edge" +#~ msgstr "Bord droit" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Position inconnue (%1)" + #~ msgid "Exec: %1" #~ msgstr "Exec: %1" diff --git a/sources/translations/nl.po b/sources/translations/nl.po index 440bd34..abec34d 100644 --- a/sources/translations/nl.po +++ b/sources/translations/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Awesome widgets\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-08-20 22:52+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Dutch \n" @@ -546,21 +546,6 @@ msgstr "Verticale layout" msgid "Mark" msgstr "Markeren" -msgid "Top Edge" -msgstr "Bovenrand" - -msgid "Bottom Edge" -msgstr "Onderrand" - -msgid "Left Edge" -msgstr "Linkerrand" - -msgid "Right Edge" -msgstr "Linkerrand" - -msgid "Unknown location (%1)" -msgstr "Onbekende positie (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Heimen Stoffels" @@ -569,6 +554,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "vistausss@outlook.com" +#~ msgid "Top Edge" +#~ msgstr "Bovenrand" + +#~ msgid "Bottom Edge" +#~ msgstr "Onderrand" + +#~ msgid "Left Edge" +#~ msgstr "Linkerrand" + +#~ msgid "Right Edge" +#~ msgstr "Linkerrand" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Onbekende positie (%1)" + #~ msgid "Run ksysguard" #~ msgstr "ksysguard openen" diff --git a/sources/translations/pt_BR.po b/sources/translations/pt_BR.po index ce8e955..63bedd9 100644 --- a/sources/translations/pt_BR.po +++ b/sources/translations/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-07-31 22:21+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -534,21 +534,6 @@ msgstr "Layout vertical" msgid "Mark" msgstr "Marca" -msgid "Top Edge" -msgstr "Canto do topo" - -msgid "Bottom Edge" -msgstr "Canto de baixo" - -msgid "Left Edge" -msgstr "Canto esquerdo" - -msgid "Right Edge" -msgstr "Canto direito" - -msgid "Unknown location (%1)" -msgstr "Localização desconhecida (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "under" @@ -557,6 +542,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "under@insicuri.net" +#~ msgid "Top Edge" +#~ msgstr "Canto do topo" + +#~ msgid "Bottom Edge" +#~ msgstr "Canto de baixo" + +#~ msgid "Left Edge" +#~ msgstr "Canto esquerdo" + +#~ msgid "Right Edge" +#~ msgstr "Canto direito" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Localização desconhecida (%1)" + #~ msgid "Exec: %1" #~ msgstr "Exec: %1" diff --git a/sources/translations/ru.po b/sources/translations/ru.po index 3b7abae..84a9ea7 100644 --- a/sources/translations/ru.po +++ b/sources/translations/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-08-30 16:31+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -530,21 +530,6 @@ msgstr "Вертикальная разметка" msgid "Mark" msgstr "Метка" -msgid "Top Edge" -msgstr "Верхняя грань" - -msgid "Bottom Edge" -msgstr "Нижняя грань" - -msgid "Left Edge" -msgstr "Левая грань" - -msgid "Right Edge" -msgstr "Правая грань" - -msgid "Unknown location (%1)" -msgstr "Неизвестное положение (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" @@ -553,6 +538,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" +#~ msgid "Top Edge" +#~ msgstr "Верхняя грань" + +#~ msgid "Bottom Edge" +#~ msgstr "Нижняя грань" + +#~ msgid "Left Edge" +#~ msgstr "Левая грань" + +#~ msgid "Right Edge" +#~ msgstr "Правая грань" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Неизвестное положение (%1)" + #~ msgid "Ticker: %1" #~ msgstr "Тикер: %1" diff --git a/sources/translations/uk.po b/sources/translations/uk.po index 8f7fe91..2121ad3 100644 --- a/sources/translations/uk.po +++ b/sources/translations/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-07-31 22:23+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Ukrainian \n" @@ -542,21 +542,6 @@ msgstr "Вертикальна розмітка" msgid "Mark" msgstr "Позначка" -msgid "Top Edge" -msgstr "Верхній край" - -msgid "Bottom Edge" -msgstr "Нижній край" - -msgid "Left Edge" -msgstr "Лівий край" - -msgid "Right Edge" -msgstr "Правий край" - -msgid "Unknown location (%1)" -msgstr "Невідоме положення (%1)" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Slobodyan Victor" @@ -565,6 +550,21 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "sarumyan@i.ua" +#~ msgid "Top Edge" +#~ msgstr "Верхній край" + +#~ msgid "Bottom Edge" +#~ msgstr "Нижній край" + +#~ msgid "Left Edge" +#~ msgstr "Лівий край" + +#~ msgid "Right Edge" +#~ msgstr "Правий край" + +#~ msgid "Unknown location (%1)" +#~ msgstr "Невідоме положення (%1)" + #~ msgid "Exec: %1" #~ msgstr "Команда: %1" diff --git a/sources/translations/zh.po b/sources/translations/zh.po index 303eade..e0907f3 100644 --- a/sources/translations/zh.po +++ b/sources/translations/zh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2015-08-30 16:30+0300\n" +"POT-Creation-Date: 2015-08-31 21:39+0300\n" "PO-Revision-Date: 2015-07-31 22:24+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -546,22 +546,6 @@ msgstr "" msgid "Mark" msgstr "标记" -msgid "Top Edge" -msgstr "顶部边缘" - -msgid "Bottom Edge" -msgstr "底部边缘" - -msgid "Left Edge" -msgstr "左端边缘" - -#, fuzzy -msgid "Right Edge" -msgstr "未知位置（%1)" - -msgid "Unknown location (%1)" -msgstr "" - msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "用户名" @@ -570,6 +554,19 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "用户邮箱" +#~ msgid "Top Edge" +#~ msgstr "顶部边缘" + +#~ msgid "Bottom Edge" +#~ msgstr "底部边缘" + +#~ msgid "Left Edge" +#~ msgstr "左端边缘" + +#, fuzzy +#~ msgid "Right Edge" +#~ msgstr "未知位置（%1)" + #, fuzzy #~ msgid "Select color" #~ msgstr "选择字体"