implement #36

fix (?) initialization
update translations

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-11-21 05:12+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
@@ -34,19 +34,19 @@ msgstr "Update text"
 msgid "Check for updates"
 msgstr "Check for updates"
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr "Current version : %1"
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr "New version : %1"
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr "Click \"Ok\" to download"
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr "There are updates"
 

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-05 11:18+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Spanish <kde-russian@lists.kde.ru>\n"
@@ -34,19 +34,19 @@ msgstr "Actualizar texto"
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-05 11:20+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: French <kde-russian@lists.kde.ru>\n"
@@ -35,19 +35,19 @@ msgstr "Mettre à jour le texte"
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/awesome-widget/po/plasma_applet_awesome-widget.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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+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"
@@ -33,19 +33,19 @@ msgstr ""
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-05 11:21+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-russian@lists.kde.ru>\n"
@@ -33,19 +33,19 @@ msgstr "Atualizar texto"
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-11-21 05:12+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -34,19 +34,19 @@ msgstr "Обновить текст"
 msgid "Check for updates"
 msgstr "Проверить обновления"
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr "Текущая версия : %1"
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr "Новая версия : %1"
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr "Нажмите \"Ok\" для загрузки"
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr "Найдены обновления"
 

sources/awesome-widget/po/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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-05 11:22+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
@@ -34,19 +34,19 @@ msgstr "Оновити текст"
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/awesome-widget/po/zh.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: 2014-11-21 05:12+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-10 22:50+0800\n"
 "Last-Translator: Steve Lemuel <wlemuel@hotmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -33,19 +33,19 @@ msgstr "刷新文本"
 msgid "Check for updates"
 msgstr ""
 
-#: awesome-widget.cpp:482
+#: awesome-widget.cpp:491
 msgid "Current version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:483
+#: awesome-widget.cpp:492
 msgid "New version : %1"
 msgstr ""
 
-#: awesome-widget.cpp:484
+#: awesome-widget.cpp:493
 msgid "Click \"Ok\" to download"
 msgstr ""
 
-#: awesome-widget.cpp:485
+#: awesome-widget.cpp:494
 msgid "There are updates"
 msgstr ""
 

sources/desktop-panel/desktop-panel.cpp

@@ -142,35 +142,6 @@ void DesktopPanel::init()
 }
 
 
-QPixmap DesktopPanel::getDesktopId(const int num)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Number" << num;
-
-    QList<WId> desktops;
-    QList<WId> windows = KWindowSystem::windows();
-    for (int i=0; i<windows.count(); i++) {
-        KWindowInfo winInfo = KWindowSystem::windowInfo(windows[i], NET::Property::WMName |
-                                                        NET::Property::WMDesktop | NET::Property::WMGeometry |
-                                                        NET::Property::WMState | NET::Property::WMWindowType);
-        if (winInfo.windowType(NET::WindowTypeMask::DesktopMask) != NET::WindowType::Desktop) continue;
-        if (!winInfo.isOnDesktop(num)) continue;
-        desktops.append(winInfo.win());
-    }
-    if (desktops.count() == 0) return QPixmap();
-
-    QPixmap pixmap = QPixmap::grabWindow(desktops[0]);
-    QPainter painter(&pixmap);
-    for (int i=0; i<desktops.count(); i++)
-        painter.drawPixmap(KWindowSystem::windowInfo(desktops[i], NET::Property::WMGeometry).geometry(),
-                           QPixmap::grabWindow(desktops[i]));
-
-    return pixmap;
-
-//    return desktops;
-}
-
-
 DesktopPanel::DesktopWindowsInfo DesktopPanel::getInfoByDesktop(const int num)
 {
     if (debug) qDebug() << PDEBUG;
@@ -185,10 +156,14 @@ DesktopPanel::DesktopWindowsInfo DesktopPanel::getInfoByDesktop(const int num)
         KWindowInfo winInfo = KWindowSystem::windowInfo(windows[i],
                                                         NET::Property::WMDesktop | NET::Property::WMGeometry |
                                                         NET::Property::WMState | NET::Property::WMWindowType);
-        if (winInfo.windowType(NET::WindowTypeMask::NormalMask) != NET::WindowType::Normal) continue;
-        if (winInfo.isMinimized()) continue;
         if (!winInfo.isOnDesktop(num)) continue;
-        info.windows.append(winInfo.geometry());
+        if (winInfo.windowType(NET::WindowTypeMask::NormalMask) == NET::WindowType::Normal) {
+            if (winInfo.isMinimized()) continue;
+            info.windows.append(winInfo.geometry());
+            info.winId.append(windows[i]);
+        } else if (winInfo.windowType(NET::WindowTypeMask::DesktopMask) == NET::WindowType::Desktop) {
+            info.desktopId.append(windows[i]);
+        }
     }
 
     return info;
@@ -297,6 +272,7 @@ void DesktopPanel::reinit()
         labels[i]->adjustSize();
         proxyWidgets[i]->setGeometry(labels[i]->geometry());
     }
+    emit(KWindowSystem::setCurrentDesktop(KWindowSystem::currentDesktop()));
 }
 
 
@@ -334,6 +310,9 @@ void DesktopPanel::paintTooltip(const int active)
     if (active == activeTooltip) return;
 
     // prepare
+    // clear
+    toolTip.setImage(0);
+    toolTip.setWindowsToPreview(QList<WId>());
     activeTooltip = active;
     DesktopWindowsInfo info = getInfoByDesktop(active + 1);
     float margin = 5.0 * info.desktop.width() / 400.0;
@@ -348,7 +327,7 @@ void DesktopPanel::paintTooltip(const int active)
                           info.desktop.width() + 2.0 * margin, 0);
     toolTipScene->addLine(info.desktop.width() + 2.0 * margin, 0, 0, 0);
 
-    if (configuration[QString("desktopPreview")].toInt() == 0) {
+    if (configuration[QString("tooltipType")].toInt() == 1) {
         // only contours
         QPen pen = QPen();
         pen.setWidthF(2.0 * info.desktop.width() / 400.0);
@@ -364,11 +343,12 @@ void DesktopPanel::paintTooltip(const int active)
                                   info.windows[i].left() + margin, info.windows[i].bottom() + margin, pen);
         }
         toolTip.setImage(QPixmap::grabWidget(toolTipView).scaledToWidth(configuration[QString("tooltipWidth")].toInt()));
+    } else if (configuration[QString("tooltipType")].toInt() == 2) {
+        // clean desktop
+        toolTip.setWindowsToPreview(info.desktopId);
     } else {
         // desktop preview
-        toolTip.setImage(getDesktopId(active + 1).scaledToWidth(configuration[QString("tooltipWidth")].toInt()));
+        toolTip.setWindowsToPreview(info.winId);
-//        toolTip.setImage(QPixmap::grabWindow(getDesktopId(active + 1)).scaledToWidth(configuration[QString("tooltipWidth")].toInt()));
-//        toolTip.setWindowsToPreview(KWindowSystem::windows());
     }
 
     Plasma::ToolTipManager::self()->setContent(this, toolTip);
@@ -434,10 +414,7 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
         uiWidConfig.checkBox_tooltip->setCheckState(Qt::Unchecked);
     else
         uiWidConfig.checkBox_tooltip->setCheckState(Qt::Checked);
-    if (configuration[QString("desktopPreview")].toInt() == 0)
+    uiWidConfig.comboBox_tooltipType->setCurrentIndex(configuration[QString("tooltipType")].toInt());
-        uiWidConfig.checkBox_desktopPreview->setCheckState(Qt::Unchecked);
-    else
-        uiWidConfig.checkBox_desktopPreview->setCheckState(Qt::Checked);
     uiWidConfig.spinBox_tooltip->setValue(configuration[QString("tooltipWidth")].toInt());
     uiWidConfig.kcolorcombo_tooltipColor->setColor(QColor(configuration[QString("tooltipColor")]));
     if (configuration[QString("background")].toInt() == 0)
@@ -522,8 +499,8 @@ void DesktopPanel::configAccepted()
 
     cg.writeEntry("pattern", uiWidConfig.textEdit_elements->toPlainText());
     cg.writeEntry("tooltip", QString::number(uiWidConfig.checkBox_tooltip->checkState()));
+    cg.writeEntry("tooltipType", QString::number(uiWidConfig.comboBox_tooltipType->currentIndex()));
     cg.writeEntry("tooltipWidth", QString::number(uiWidConfig.spinBox_tooltip->value()));
-    cg.writeEntry("desktopPreview", QString::number(uiWidConfig.checkBox_desktopPreview->checkState()));
     cg.writeEntry("tooltipColor", uiWidConfig.kcolorcombo_tooltipColor->color().name());
     cg.writeEntry("background", QString::number(uiWidConfig.checkBox_background->checkState()));
     cg.writeEntry("layout", QString::number(uiWidConfig.checkBox_layout->checkState()));
@@ -560,8 +537,8 @@ void DesktopPanel::configChanged()
 
     configuration[QString("pattern")] = cg.readEntry("pattern", "[$fullmark$number/$total: $name]");
     configuration[QString("tooltip")] = cg.readEntry("tooltip", "2");
+    configuration[QString("tooltipType")] = cg.readEntry("tooltipType", "0");
     configuration[QString("tooltipWidth")] = cg.readEntry("tooltipWidth", "200");
-    configuration[QString("desktopPreview")] = cg.readEntry("desktopPreview", "2");
     configuration[QString("tooltipColor")] = cg.readEntry("tooltipColor", "#ffffff");
     configuration[QString("background")] = cg.readEntry("background", "2");
     configuration[QString("layout")] = cg.readEntry("layout", "0");

sources/desktop-panel/desktop-panel.h

@@ -64,14 +64,15 @@ class DesktopPanel : public Plasma::Applet
 
     typedef struct {
         QRect desktop;
+        QList<WId> desktopId;
         QList<QRect> windows;
+        QList<WId> winId;
     } DesktopWindowsInfo;
 
 public:
     DesktopPanel(QObject *parent, const QVariantList &args);
     ~DesktopPanel();
     void init();
-    QPixmap getDesktopId(const int num);
     DesktopWindowsInfo getInfoByDesktop(const int num);
     QString parsePattern(const QString rawLine, const int num);
 

sources/desktop-panel/po/en.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
-"PO-Revision-Date: 2014-09-15 10:02+0400\n"
+"PO-Revision-Date: 2014-12-15 02:41+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,39 +18,39 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr "Top Edge"
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr "Bottom Edge"
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr "Left Edge"
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr "Right Edge"
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr "Unknown Position (%1)"
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Appearance"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr "Toggle panels"
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr "Select font"
 
@@ -112,15 +112,15 @@ msgstr "Add"
 
 #: po/rc.cpp:63 rc.cpp:63
 msgid "Tooltip width"
-msgstr ""
+msgstr "Tooltip width"
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid "px"
-msgstr ""
+msgstr "px"
 
 #: po/rc.cpp:69 rc.cpp:69
 msgid "Window border color on tooltip"
-msgstr ""
+msgstr "Window border color on tooltip"
 
 #: po/rc.cpp:72 rc.cpp:72
 msgid "Enable background"
@@ -132,18 +132,33 @@ msgstr "Vertical layout"
 
 #: po/rc.cpp:78 rc.cpp:78
 msgid "Enable tooltip"
-msgstr ""
+msgstr "Enable tooltip"
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr "Windows"
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr "Contours"
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr "Clean desktop"
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Show windows instead of contours"
+#~ msgstr "Show windows instead of contours"
+
 #~ msgid "Time interval"
 #~ msgstr "Time interval"
 

sources/desktop-panel/po/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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-06-05 10:21+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Spanish <kde-spanish@lists.kde.ru>\n"
@@ -18,39 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr ""
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr ""
 
@@ -134,12 +134,24 @@ msgstr "Orientación vertical"
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr ""
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Tu nombre"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "Tus correos"

sources/desktop-panel/po/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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-06-05 19:24+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: French <kde-french@lists.kde.ru>\n"
@@ -19,39 +19,39 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Apparence"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr ""
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr ""
 
@@ -135,12 +135,24 @@ msgstr "Positionnement vertical"
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr ""
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"

sources/desktop-panel/po/plasma_applet_desktop-panel.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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+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"
@@ -17,39 +17,39 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr ""
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr ""
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr ""
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr ""
 
@@ -133,12 +133,24 @@ msgstr ""
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr ""
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""

sources/desktop-panel/po/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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-06-09 01:47+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-russian@lists.kde.ru>\n"
@@ -17,39 +17,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Aparência"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr ""
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr ""
 
@@ -133,12 +133,24 @@ msgstr "Layout vertical"
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr ""
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "under"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "dreanazous@gmail.com"

sources/desktop-panel/po/ru.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
-"PO-Revision-Date: 2014-11-20 17:58+0300\n"
+"PO-Revision-Date: 2014-12-15 02:41+0300\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,39 +18,39 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr "Верхний край"
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr "Нижний край"
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr "Левый край"
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr "Правый край"
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr "Неизвестное положение (%1)"
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Виджет"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr "Скрыть панели"
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr "Выберете шрифт"
 
@@ -134,16 +134,31 @@ msgstr "Вертикальная разметка"
 msgid "Enable tooltip"
 msgstr "Включить тултип"
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr "Окна"
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr "Контуры"
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr "Пустой рабочий стол"
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Show windows instead of contours"
+#~ msgstr "Показывать окна вместо контуров"
+
 #~ msgid "Time interval"
 #~ msgstr "Интервал обновления"
 

sources/desktop-panel/po/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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-06-06 01:23+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Ukrainian <kde-ukrainian@lists.kde.ru>\n"
@@ -18,39 +18,39 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "Віджет"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr ""
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr ""
 
@@ -134,12 +134,24 @@ msgstr "Вертикальна розмітка"
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+msgid "Clean desktop"
+msgstr ""
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Slobodyan Victor"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "sarumyan@i.ua"

sources/desktop-panel/po/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: 2014-11-20 17:40+0300\n"
+"POT-Creation-Date: 2014-12-15 02:40+0300\n"
 "PO-Revision-Date: 2014-09-15 10:04+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: American English <kde-russian@lists.kde.ru>\n"
@@ -18,39 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:188
+#: desktop-panel.cpp:193
 msgid "Top Edge"
 msgstr "顶部边缘"
 
-#: desktop-panel.cpp:190
+#: desktop-panel.cpp:195
 msgid "Bottom Edge"
 msgstr "底部边缘"
 
-#: desktop-panel.cpp:192
+#: desktop-panel.cpp:197
 msgid "Left Edge"
 msgstr "左端边缘"
 
-#: desktop-panel.cpp:194
+#: desktop-panel.cpp:199
 msgid "Right Edge"
 msgstr "右端边缘"
 
-#: desktop-panel.cpp:196
+#: desktop-panel.cpp:201
 msgid "Unknown Position (%1)"
 msgstr "未知位置（%1）"
 
-#: desktop-panel.cpp:454
+#: desktop-panel.cpp:473
 msgid "Widget"
 msgstr "窗口小部件"
 
-#: desktop-panel.cpp:455
+#: desktop-panel.cpp:474
 msgid "Appearance"
 msgstr "外观"
 
-#: desktop-panel.cpp:456
+#: desktop-panel.cpp:475
 msgid "Toggle panels"
 msgstr "控制面板状态切换(显示/隐藏)"
 
-#: desktop-panel.cpp:575
+#: desktop-panel.cpp:596
 msgid "Select font"
 msgstr "选择字体"
 
@@ -134,12 +134,25 @@ msgstr "垂直布局"
 msgid "Enable tooltip"
 msgstr ""
 
-#: po/rc.cpp:79 rc.cpp:79
+#: po/rc.cpp:81 rc.cpp:81
+msgid "Windows"
+msgstr ""
+
+#: po/rc.cpp:84 rc.cpp:84
+msgid "Contours"
+msgstr ""
+
+#: po/rc.cpp:87 rc.cpp:87
+#, fuzzy
+msgid "Clean desktop"
+msgstr "当前激活桌面"
+
+#: po/rc.cpp:88 rc.cpp:88
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "用户名"
 
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:89 rc.cpp:89
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "用户邮箱"

sources/desktop-panel/widget.ui

@@ -20,7 +20,7 @@
    <string notr="true">Widget</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="10" column="0">
+   <item row="9" column="0">
     <layout class="QHBoxLayout" name="layout_mark">
      <item>
       <widget class="QLabel" name="label_mark">
@@ -336,7 +336,7 @@
      </item>
     </layout>
    </item>
-   <item row="7" column="0">
+   <item row="6" column="0">
     <layout class="QHBoxLayout" name="layout_tooltipColor">
      <item>
       <widget class="QLabel" name="label_tooltipColor">
@@ -415,19 +415,6 @@
    </item>
    <item row="4" column="0">
     <layout class="QHBoxLayout" name="layout_tooltip_2">
-     <item>
-      <spacer name="spacer_tooltip">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QCheckBox" name="checkBox_tooltip">
        <property name="sizePolicy">
@@ -436,39 +423,37 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="layoutDirection">
+        <enum>Qt::RightToLeft</enum>
+       </property>
        <property name="text">
         <string>Enable tooltip</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="6" column="0">
-    <layout class="QHBoxLayout" name="layout_desktopPreview">
      <item>
-      <spacer name="spacer_desktopPreview">
+      <widget class="QComboBox" name="comboBox_tooltipType">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="checkBox_desktopPreview">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
+       <item>
-        <string>Use desktop preview</string>
+        <property name="text">
-       </property>
+         <string>Windows</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Contours</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Clean desktop</string>
+        </property>
+       </item>
       </widget>
      </item>
     </layout>