arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

drop hidding method

Browse Source
This commit is contained in:
arcan1s 2015-09-01 01:12:10 +03:00
parent 08dae3b02b
commit 82c1839634
14 changed files with 128 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/desktop-panel/package/contents/config/main.xml
View File

@ -38,9 +38,6 @@
<entry name="mark" type="string">
<default>¤</default>
</entry>
<entry name="panels" type="int">
<default>-1</default>
</entry>
</group>
<group name="Appearance">

17
sources/desktop-panel/package/contents/ui/advanced.qml
View File

@ -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 {

7
sources/desktop-panel/package/contents/ui/main.qml
View File

@ -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()

131
sources/desktop-panel/plugin/dpadds.cpp
View File

@ -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; i<count; i++)
panelsToControl.append(i);
} else
foreach(QString panel, newPanels.split(QChar(',')))
panelsToControl.append(panel.toInt());
}
void DPAdds::setToolTipData(const QVariantMap tooltipData)
{
qCDebug(LOG_DP);
@ -252,57 +236,6 @@ QString DPAdds::valueByKey(const QString key, int desktop) const
}
QString DPAdds::editPanelsToContol(const QString current)
{
qCDebug(LOG_DP);
qCDebug(LOG_DP) << "Current panels" << current;
// paint
QDialog *dialog = new QDialog(nullptr);
QListWidget *widget = new QListWidget(dialog);
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Open | QDialogButtonBox::Close,
Qt::Vertical, dialog);
QHBoxLayout *layout = new QHBoxLayout(dialog);
layout->addWidget(widget);
layout->addWidget(buttons);
dialog->setLayout(layout);
connect(buttons, SIGNAL(rejected()), dialog, SLOT(reject()));
connect(buttons, SIGNAL(accepted()), dialog, SLOT(accept()));
// fill
QList<Plasma::Containment *> panels = getPanels();
for (int i=0; i<panels.count(); i++) {
QListWidgetItem *item = new QListWidgetItem(panelLocationToStr(panels.at(i)->location()), 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; i<widget->count(); 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<Plasma::Containment *> panels = getPanels();
// for (int i=0; i<panels.count(); i++) {
// if (!panelsToControl.contains(i)) continue;
// bool wasVisible = panels.at(i)->view()->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<Plasma::Containment *> DPAdds::getPanels() const
{
qCDebug(LOG_DP);
// Plasma::Corona *corona = new Plasma::Corona(this);
QList<Plasma::Containment *> 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);
}
}

8
sources/desktop-panel/plugin/dpadds.h
View File

@ -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<Plasma::Containment *> 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<int> panelsToControl;
};

17
sources/translations/awesome-widgets.pot
View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""

32
sources/translations/en.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: English <kde-russian@lists.kde.ru>\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"

32
sources/translations/es.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Spanish <kde-russian@lists.kde.ru>\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"

32
sources/translations/fr.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: French <kde-russian@lists.kde.ru>\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"

32
sources/translations/nl.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\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"

32
sources/translations/pt_BR.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\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"

32
sources/translations/ru.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\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"

32
sources/translations/uk.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Ukrainian <kde-russian@lists.kde.ru>\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"

31
sources/translations/zh.po
View File

@ -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 <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\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 "选择字体"