some fixes, prepare to release 2.0.2

fix notifiations

AUTHORS

@@ -6,3 +6,4 @@ Translators:
 Ernesto Avilés Vzqz (Spanish translation)
 @underr (Brazillian Portuguese translation)
 Виктор Слободян (Ukrainian translation)
+Steve Lemuel (Chinese translation)

CHANGELOG

@@ -1,3 +1,11 @@
+Ver.2.0.2:
++ add $fan* tags
++ add Chinese translation (thanks to @Lemueler)
+- remove ps stats from notification
+* yet another fix cpu* and cpucl*
+* rewrite DP configuration interface
+* fix non-standard temp units
+
 Ver.2.0.1:
 + add support of custom interfaces
 * fix label edge's shading

CHANGELOG-RU

@@ -1,3 +1,11 @@
+Вер.2.0.2:
++ добавлены теги $fan*
++ добавлен китайский перевод (спасибо @Lemueler)
+- удалено ps stats из уведомлений
+* еще один фикс тегов cpu* и cpucl
+* переписан конфигурационный интерфейс DP
+* исправлены нестандартные единицы температуры
+
 Вер.2.0.1:
 + добавлена поддержка кастомных интерфейсов
 * фикс затенения краев поля

sources/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
 project (awesome-widgets)
 set (PROJECT_VERSION_MAJOR 2)
 set (PROJECT_VERSION_MINOR 0)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 2)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 

sources/awesome-widget/CMakeLists.txt

@@ -18,14 +18,13 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${PROJECT_TRDPARTY_DIR})
 
 # set sources
-set (SUBPROJECT_MISC_DIR "contents/misc")
 file (GLOB SUBPROJECT_DESKTOP_IN *.desktop)
 file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN})
 file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp
                                            ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp)
 set (TASK_HEADER ${PROJECT_TRDPARTY_DIR}/task/task.h)
 file (GLOB SUBPROJECT_UI *.ui)
-file (GLOB SUBPROJECT_NOTIFY ${SUBPROJECT_MISC_DIR}/*.notifyrc)
+file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
 # prepare
 configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP})

sources/awesome-widget/advanced.ui

@@ -43,7 +43,7 @@
         <x>0</x>
         <y>0</y>
         <width>677</width>
-        <height>590</height>
+        <height>677</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -234,6 +234,30 @@ $m - uptime minutes without zero</string>
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QVBoxLayout" name="layout_fanDevice">
+         <item>
+          <widget class="QLabel" name="label_fanDevice">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Fan devices</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QListWidget" name="listWidget_fanDevice">
+           <property name="toolTip">
+            <string>Editable</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <layout class="QVBoxLayout" name="layout_mount">
          <item>

sources/awesome-widget/awesome-widget.cpp

@@ -134,11 +134,11 @@ float AwesomeWidget::getTemp(const float temp)
     else if (configuration[QString("tempUnits")] == QString("Reaumur"))
         convertedTemp = temp * 0.8;
     else if (configuration[QString("tempUnits")] == QString("cm^-1"))
-        convertedTemp = temp * 0.695;
+        convertedTemp = (temp + 273.15) * 0.695;
     else if (configuration[QString("tempUnits")] == QString("kJ/mol"))
-        convertedTemp = temp * 8.31;
+        convertedTemp = (temp + 273.15) * 8.31;
     else if (configuration[QString("tempUnits")] == QString("kcal/mol"))
-        convertedTemp = temp * 1.98;
+        convertedTemp = (temp + 273.15) * 1.98;
 
     return convertedTemp;
 }
@@ -265,6 +265,8 @@ QStringList AwesomeWidget::getKeys()
     // temperature
     for (int i=counts[QString("temp")]-1; i>=0; i--)
         allKeys.append(QString("temp") + QString::number(i));
+    for (int i=counts[QString("fan")]-1; i>=0; i--)
+        allKeys.append(QString("fan") + QString::number(i));
     // gputemp
     allKeys.append(QString("gputemp"));
     // gpu

sources/awesome-widget/awesome-widget.h

@@ -76,6 +76,7 @@ private slots:
     void addNewPkgCommand(QTableWidgetItem *item);
     void contextMenuCustomCommand(const QPoint pos);
     void contextMenuPkgCommand(const QPoint pos);
+    void editFanItem(QListWidgetItem *item);
     void editHddItem(QListWidgetItem *item);
     void editHddSpeedItem(QListWidgetItem *item);
     void editMountItem(QListWidgetItem *item);

sources/awesome-widget/configuration.cpp

@@ -171,11 +171,16 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
         QString sensor = qoutput.split(QString("\n\n"))[i];
         for (int j=0; j<sensor.split(QChar('\n')).count(); j++) {
             QString device = sensor.split(QChar('\n'))[j];
-            if (device.indexOf(QChar(0260)) > -1) {
+            if (device.contains(QChar(0260))) {
                 QListWidgetItem *item = new QListWidgetItem(QString("lmsensors/") + sensor.split(QChar('\n'))[0] + QString("/") +
                         device.split(QChar(':'))[0].replace(QChar(' '), QChar('_')));
                 item->setCheckState(Qt::Unchecked);
                 uiAdvancedConfig.listWidget_tempDevice->addItem(item);
+            } else if (device.contains(QString("RPM"))) {
+                QListWidgetItem *item = new QListWidgetItem(QString("lmsensors/") + sensor.split(QChar('\n'))[0] + QString("/") +
+                        device.split(QChar(':'))[0].replace(QChar(' '), QChar('_')));
+                item->setCheckState(Qt::Unchecked);
+                uiAdvancedConfig.listWidget_fanDevice->addItem(item);
             }
         }
     }
@@ -191,6 +196,18 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
             for (int j=0; j<items.count(); j++)
                 items[j]->setCheckState(Qt::Checked);
     }
+    for (int i=0; i<configuration[QString("fanDevice")].split(QString("@@")).count(); i++) {
+        QList<QListWidgetItem *> items = uiAdvancedConfig.listWidget_fanDevice
+                ->findItems(configuration[QString("fanDevice")].split(QString("@@"))[i], Qt::MatchFixedString);
+        if ((items.isEmpty()) &&
+                (!configuration[QString("fanDevice")].split(QString("@@"))[i].isEmpty())) {
+            QListWidgetItem *item = new QListWidgetItem(configuration[QString("fanDevice")].split(QString("@@"))[i]);
+            item->setCheckState(Qt::Checked);
+            uiAdvancedConfig.listWidget_fanDevice->addItem(item);
+        } else
+            for (int j=0; j<items.count(); j++)
+                items[j]->setCheckState(Qt::Checked);
+    }
     cmd = QString("mount");
     if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
     process = runTask(cmd);
@@ -392,6 +409,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     parent->addPage(appWidget, i18n("Appearance"), QString("preferences-desktop-theme"));
     parent->addPage(deConfigWidget, i18n("DataEngine"), QString("utilities-system-monitor"));
 
+    connect(uiAdvancedConfig.listWidget_fanDevice, SIGNAL(itemActivated(QListWidgetItem *)),
+            this, SLOT(editFanItem(QListWidgetItem *)));
     connect(uiAdvancedConfig.listWidget_hddDevice, SIGNAL(itemActivated(QListWidgetItem *)),
             this, SLOT(editHddItem(QListWidgetItem *)));
     connect(uiAdvancedConfig.listWidget_hddSpeedDevice, SIGNAL(itemActivated(QListWidgetItem *)),
@@ -448,6 +467,11 @@ void AwesomeWidget::configAccepted()
             items.append(uiAdvancedConfig.listWidget_tempDevice->item(i)->text());
     cg.writeEntry("tempDevice", items.join(QString("@@")));
     items.clear();
+    for (int i=0; i<uiAdvancedConfig.listWidget_fanDevice->count(); i++)
+        if (uiAdvancedConfig.listWidget_fanDevice->item(i)->checkState() == Qt::Checked)
+            items.append(uiAdvancedConfig.listWidget_fanDevice->item(i)->text());
+    cg.writeEntry("fanDevice", items.join(QString("@@")));
+    items.clear();
     for (int i=0; i<uiAdvancedConfig.listWidget_mount->count(); i++)
         if (uiAdvancedConfig.listWidget_mount->item(i)->checkState() == Qt::Checked)
             items.append(uiAdvancedConfig.listWidget_mount->item(i)->text());
@@ -541,6 +565,7 @@ void AwesomeWidget::configChanged()
     configuration[QString("customUptime")] = cg.readEntry("customUptime", "$dd,$hh,$mm");
     configuration[QString("tempUnits")] = cg.readEntry("tempUnits", "Celsius");
     configuration[QString("tempDevice")] = cg.readEntry("tempDevice", "");
+    configuration[QString("fanDevice")] = cg.readEntry("fanDevice", "");
     configuration[QString("mount")] = cg.readEntry("mount", "/");
     configuration[QString("hdd")] = cg.readEntry("hdd", "/dev/sda");
     configuration[QString("disk")] = cg.readEntry("disk", "disk/sda_(8:0)");
@@ -621,6 +646,7 @@ void AwesomeWidget::configChanged()
     counts[QString("cpu")] = getNumberCpus();
     counts[QString("custom")] = deSettings[QString("CUSTOM")].split(QString("@@")).count();
     counts[QString("disk")] = configuration[QString("disk")].split(QString("@@")).count();
+    counts[QString("fan")] = configuration[QString("fanDevice")].split(QString("@@")).count();
     counts[QString("hddtemp")] = configuration[QString("hdd")].split(QString("@@")).count();
     counts[QString("mount")] = configuration[QString("mount")].split(QString("@@")).count();
     counts[QString("pkg")] = deSettings[QString("PKGCMD")].split(QChar(',')).count();
@@ -691,6 +717,14 @@ void AwesomeWidget::contextMenuPkgCommand(const QPoint pos)
 }
 
 
+void AwesomeWidget::editFanItem(QListWidgetItem *item)
+{
+    if (debug) qDebug() << PDEBUG;
+
+    uiAdvancedConfig.listWidget_fanDevice->openPersistentEditor(item);
+}
+
+
 void AwesomeWidget::editHddItem(QListWidgetItem *item)
 {
     if (debug) qDebug() << PDEBUG;
@@ -734,9 +768,9 @@ void AwesomeWidget::setFontFormating()
                                       false, false);
     if (font != defaultFont) {
         QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText();
-        uiWidConfig.textEdit_elements->insertPlainText(QString("<font color=\"%1\" face=\"%2\" size=\"%3\">")
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<span style=\"color:%1; font-family:'%2'; font-size:%3pt;\">")
                                                        .arg(font.color().name()).arg(font.family()).arg(font.pointSize()) +
-                                                       selectedText + QString("</font>"));
+                                                       selectedText + QString("</span>"));
     }
 }
 

sources/awesome-widget/customlabel.cpp

@@ -90,21 +90,6 @@ void CustomLabel::mousePressEvent(QGraphicsSceneMouseEvent *event)
         if (process.exitCode != 0)
             if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
         text += QString("Uptime: %1\n").arg(QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed());
-        // ps stats
-        cmd = QString("ps --no-headers -o command");
-        if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
-        process = runTask(cmd);
-        if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-        if (process.exitCode != 0)
-            if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
-        QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
-        QStringList processes;
-        for (int i=0; i<qoutput.split(QChar('\n')).count(); i++)
-            if (qoutput.split(QChar('\n'))[i] != QString("ps --no-headers -o command"))
-                processes.append(qoutput.split(QChar('\n'))[i]);
-        text += QString("ps stats: %1 | %2")
-                .arg(processes.count())
-                .arg(processes.join(QChar(',')));
 
         widget->sendNotification(QString("system"), text);
     }

sources/awesome-widget/deinteraction.cpp

@@ -35,7 +35,7 @@ void AwesomeWidget::connectToEngine()
         extsysmonEngine->connectSource(QString("battery"),
                                        this, configuration[QString("interval")].toInt());
     // cpu
-    regExp = QRegExp(QString("cpu[0-9].*"));
+    regExp = QRegExp(QString("cpu(?!cl).*"));
     if ((foundKeys.indexOf(regExp) > -1) ||
             (configuration[QString("cpuTooltip")].toInt() == 2)) {
         sysmonEngine->connectSource(QString("cpu/system/TotalLoad"),
@@ -45,7 +45,7 @@ void AwesomeWidget::connectToEngine()
                                         this, configuration[QString("interval")].toInt());
     }
     // cpuclock
-    regExp = QRegExp(QString("cpucl[0-9].*"));
+    regExp = QRegExp(QString("cpucl.*"));
     if ((foundKeys.indexOf(regExp) > -1) ||
             (configuration[QString("cpuclTooltip")].toInt() == 2)) {
         sysmonEngine->connectSource(QString("cpu/system/AverageClock"),
@@ -73,6 +73,12 @@ void AwesomeWidget::connectToEngine()
             sysmonEngine->connectSource(configuration[QString("disk")].split(QString("@@"))[i] + QString("/Rate/wblk"),
                                         this, configuration[QString("interval")].toInt());
         }
+    // fan
+    regExp = QRegExp(QString("fan.*"));
+    if (foundKeys.indexOf(regExp) > -1)
+        for (int i=0; i<configuration[QString("fanDevice")].split(QString("@@")).count(); i++)
+            sysmonEngine->connectSource(configuration[QString("fanDevice")].split(QString("@@"))[i],
+                                        this, configuration[QString("interval")].toInt());
     // gpu
     regExp = QRegExp(QString("gpu"));
     if (foundKeys.indexOf(regExp) > -1)
@@ -384,11 +390,19 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
             tooltipValues[QString("swap")].append(values[QString("swap")].toFloat());
         }
     } else if (sourceName.indexOf(tempRegExp) > -1) {
-        for (int i=0; i<counts[QString("temp")]; i++)
+        if (data[QString("units")].toString() == QString("rpm")) {
-            if (sourceName == configuration[QString("tempDevice")].split(QString("@@"))[i]) {
+            for (int i=0; i<counts[QString("fan")]; i++)
-                values[QString("temp") + QString::number(i)] = QString("%1").arg(getTemp(data[QString("value")].toFloat()), 4, 'f', 1);
+                if (sourceName == configuration[QString("fanDevice")].split(QString("@@"))[i]) {
-                break;
+                    values[QString("fan") + QString::number(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 1);
-            }
+                    break;
+                }
+        } else {
+            for (int i=0; i<counts[QString("temp")]; i++)
+                if (sourceName == configuration[QString("tempDevice")].split(QString("@@"))[i]) {
+                    values[QString("temp") + QString::number(i)] = QString("%1").arg(getTemp(data[QString("value")].toFloat()), 4, 'f', 1);
+                    break;
+                }
+        }
     } else if (sourceName == QString("Local")) {
         values[QString("time")] = data[QString("DateTime")].toDateTime().toString(Qt::TextDate);
         values[QString("isotime")] = data[QString("DateTime")].toDateTime().toString(Qt::ISODate);
@@ -428,7 +442,7 @@ void AwesomeWidget::disconnectFromEngine()
             (configuration[QString("batteryTooltip")].toInt() == 2))
         extsysmonEngine->disconnectSource(QString("battery"), this);
     // cpu
-    regExp = QRegExp(QString("cpu.*"));
+    regExp = QRegExp(QString("cpu(?!cl).*"));
     if ((foundKeys.indexOf(regExp) > -1) ||
         (configuration[QString("cpuTooltip")].toInt() == 2)) {
         sysmonEngine->disconnectSource(QString("cpu/system/TotalLoad"), this);
@@ -458,6 +472,11 @@ void AwesomeWidget::disconnectFromEngine()
             sysmonEngine->disconnectSource(configuration[QString("disk")].split(QString("@@"))[i] + QString("/Rate/rblk"), this);
             sysmonEngine->disconnectSource(configuration[QString("disk")].split(QString("@@"))[i] + QString("/Rate/wblk"), this);
         }
+    // fan
+    regExp = QRegExp(QString("fan.*"));
+    if (foundKeys.indexOf(regExp) > -1)
+        for (int i=0; i<configuration[QString("fanDevice")].split(QString("@@")).count(); i++)
+            sysmonEngine->disconnectSource(configuration[QString("fanDevice")].split(QString("@@"))[i], this);
     // gpu
     regExp = QRegExp(QString("gpu"));
     if (foundKeys.indexOf(regExp) > -1)

sources/awesome-widget/po/zh.po

@@ -0,0 +1,355 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Steve Lemuel <wlemuel@hotmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
+"POT-Creation-Date: 2014-09-08 01:52+0400\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"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: awesome-widget.cpp:77
+msgid "Run ksysguard"
+msgstr "运行任务管理器"
+
+#: awesome-widget.cpp:80
+msgid "Show README"
+msgstr "显示帮助文档"
+
+#: awesome-widget.cpp:83
+msgid "Update text"
+msgstr "刷新文本"
+
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
+msgid "Custom command"
+msgstr "自定义命令"
+
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
+msgid "Package manager"
+msgstr "包管理器"
+
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
+msgid "Null lines"
+msgstr "空行"
+
+#: configuration.cpp:362
+msgid "Widget"
+msgstr "窗口小部件"
+
+#: configuration.cpp:363
+msgid "Advanced"
+msgstr "高级设置"
+
+#: configuration.cpp:364
+msgid "Tooltip"
+msgstr "提示"
+
+#: configuration.cpp:365
+msgid "Appearance"
+msgstr "外观"
+
+#: configuration.cpp:366
+msgid "DataEngine"
+msgstr "数据引擎"
+
+#: configuration.cpp:645 configuration.cpp:659
+msgid "Remove"
+msgstr "移除"
+
+#: configuration.cpp:706
+msgid "Select font"
+msgstr "选择字体"
+
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Enable background"
+msgstr "启用背景"
+
+#: po/rc.cpp:6 rc.cpp:6
+msgid "Enable popup on mouse click"
+msgstr "鼠标点击时弹出对话框"
+
+#: po/rc.cpp:9 rc.cpp:9
+msgid "Custom time format"
+msgstr "自定义时间格式"
+
+#: po/rc.cpp:12 rc.cpp:12
+msgid ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+msgstr ""
+"$dddd - 详细工作日\n"
+"$ddd - 简短工作日\n"
+"$dd - 日\n"
+"$d - 日 w\\o 零\n"
+"$MMMM - 详细月份\n"
+"$MMM - 简短月份\n"
+"$MM - 月\n"
+"$M - 月 w\\o 零\n"
+"$yyyy - 年\n"
+"$yy - 简短年份\n"
+"$hh - 小时 (24 小时制)\n"
+"$h - 小时 w\\o 零 (24 小时制)\n"
+"$mm - 分\n"
+"$m - 分 w\\o 零\n"
+"$ss - 秒\n"
+"$s - 秒 w\\o 零"
+
+#: po/rc.cpp:30 rc.cpp:30
+msgid "Custom uptime format"
+msgstr "自定义启动时间显示格式"
+
+#: po/rc.cpp:33 rc.cpp:33
+msgid ""
+"$dd - uptime days\n"
+"$d - uptime days without zero\n"
+"$hh - uptime hours\n"
+"$h - uptime hours without zero\n"
+"$mm - uptime minutes\n"
+"$m - uptime minutes without zero"
+msgstr ""
+"$dd - 运行天数\n"
+"$d - 运行天数（不显示0）\n"
+"$hh - 运行小时数\n"
+"$h - 运行小时数（不显示0）\n"
+"$mm - 运行分钟数\n"
+"$m - 运行分钟数（不显示0）"
+
+#: po/rc.cpp:41 rc.cpp:41
+msgid "Temperature units"
+msgstr "温度单位"
+
+#: po/rc.cpp:44 rc.cpp:44
+msgid "Temperature devices"
+msgstr "温度传感器"
+
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
+msgid "Editable"
+msgstr "可编辑的"
+
+#: po/rc.cpp:50 rc.cpp:50
+msgid "Mount points"
+msgstr "挂载点"
+
+#: po/rc.cpp:56 rc.cpp:56
+msgid "HDD devices (speed)"
+msgstr "硬盘（高速）"
+
+#: po/rc.cpp:62 rc.cpp:62
+msgid "HDD devices (temp)"
+msgstr "硬盘（临时）"
+
+#: po/rc.cpp:68 rc.cpp:68
+msgid "Disable auto select device and set specified device"
+msgstr "禁用自动选择设备和设置特殊设备"
+
+#: po/rc.cpp:71 rc.cpp:71
+msgid "Set network device"
+msgstr "设置网络设备"
+
+#: po/rc.cpp:74 rc.cpp:74
+msgid "AC online tag"
+msgstr "外接电源使用中标签"
+
+#: po/rc.cpp:77 rc.cpp:77
+msgid "Line, which returns when AC is online"
+msgstr "外接电源使用时显示线条"
+
+#: po/rc.cpp:80 rc.cpp:80
+msgid "AC offline tag"
+msgstr "外接电源未使用标签"
+
+#: po/rc.cpp:83 rc.cpp:83
+msgid "Line, which returns when AC is offline"
+msgstr "外接电源未使用时显示线条"
+
+#: po/rc.cpp:86 rc.cpp:86
+msgid "Time interval"
+msgstr "时间周期"
+
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
+msgid "Font"
+msgstr "字体"
+
+#: po/rc.cpp:92 rc.cpp:92
+msgid "Font size"
+msgstr "字体大小"
+
+#: po/rc.cpp:95 rc.cpp:95
+msgid "Font color"
+msgstr "字体颜色"
+
+#: po/rc.cpp:98 rc.cpp:98
+msgid "Font style"
+msgstr "字体样式"
+
+#: po/rc.cpp:101 rc.cpp:101
+msgid "Font weight"
+msgstr "字体宽度"
+
+#: po/rc.cpp:104 rc.cpp:104
+msgid "HDD"
+msgstr "硬盘"
+
+#: po/rc.cpp:107 rc.cpp:107
+msgid "MPD port"
+msgstr "MPD 端口"
+
+#: po/rc.cpp:110 rc.cpp:110
+msgid "GPU device"
+msgstr "GPU 设备"
+
+#: po/rc.cpp:113 rc.cpp:113
+msgid "hddtemp cmd"
+msgstr "硬盘温度显示命令"
+
+#: po/rc.cpp:116 rc.cpp:116
+msgid "Music player"
+msgstr "音乐播放器"
+
+#: po/rc.cpp:119 rc.cpp:119
+msgid "MPD address"
+msgstr "MPD 地址"
+
+#: po/rc.cpp:122 rc.cpp:122
+msgid "Desktop check cmd"
+msgstr "检测桌面命令"
+
+#: po/rc.cpp:125 rc.cpp:125
+msgid "<b>NOTE:</b> Player DBus interface should be an active"
+msgstr "<b>提示:</b> 播放器 DBus 应当处于激活状态"
+
+#: po/rc.cpp:128 rc.cpp:128
+msgid "MPRIS player name"
+msgstr "MPRIS 播放器名"
+
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
+msgid ""
+"Editable\n"
+"del - remove item"
+msgstr ""
+"可编辑的\n"
+"del - 移除项目"
+
+#: po/rc.cpp:148 rc.cpp:148
+msgid "Battery device"
+msgstr "电池设备"
+
+#: po/rc.cpp:151 rc.cpp:151
+msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+msgstr "默认为 \"/sys/class/power_supply/BAT0/capacity\""
+
+#: po/rc.cpp:154 rc.cpp:154
+msgid "AC device"
+msgstr "外界电源设备"
+
+#: po/rc.cpp:157 rc.cpp:157
+msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgstr "默认为 \"/sys/class/power_supply/AC/online\""
+
+#: po/rc.cpp:160 rc.cpp:160
+msgid ""
+"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
+"To enable them just make needed checkbox fully checked."
+msgstr ""
+"CPU， CPU 时钟，内存，虚拟内存和网络连接标签均支持图形化提示显示。 "
+"请在相应复选框中勾选以启用该功能。 "
+
+#: po/rc.cpp:163 rc.cpp:163
+msgid "Number of values for tooltips"
+msgstr "提示的数值"
+
+#: po/rc.cpp:166 rc.cpp:166
+msgid "Background"
+msgstr "背景"
+
+#: po/rc.cpp:169 rc.cpp:169
+msgid "CPU color"
+msgstr "CPU 颜色"
+
+#: po/rc.cpp:172 rc.cpp:172
+msgid "CPU clock color"
+msgstr "CPU 时钟颜色"
+
+#: po/rc.cpp:175 rc.cpp:175
+msgid "Memory color"
+msgstr "内存显示颜色"
+
+#: po/rc.cpp:178 rc.cpp:178
+msgid "Swap color"
+msgstr "虚拟内存颜色"
+
+#: po/rc.cpp:181 rc.cpp:181
+msgid "Download speed color"
+msgstr "下载速度颜色"
+
+#: po/rc.cpp:184 rc.cpp:184
+msgid "Upload speed color"
+msgstr "上传速度颜色"
+
+#: po/rc.cpp:187 rc.cpp:187
+msgid "Battery active color"
+msgstr "电池使用状态提示颜色"
+
+#: po/rc.cpp:190 rc.cpp:190
+msgid "Battery inactive color"
+msgstr "电池未使用状态提示颜色"
+
+#: po/rc.cpp:193 rc.cpp:193
+msgid ""
+"Detailed information may be found on <a href=\"http://arcanis.name/projects/"
+"awesome-widgets/\">project homepage</a>"
+msgstr ""
+"详情请参照 <a href=\"http://arcanis.name/projects/ "
+"awesome-widgets/\">项目主页</a>"
+
+#: po/rc.cpp:199 rc.cpp:199
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: po/rc.cpp:202 rc.cpp:202
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: po/rc.cpp:205 rc.cpp:205
+msgid "Ctrl+U"
+msgstr "Ctrl+U"
+
+#: po/rc.cpp:208 rc.cpp:208
+msgid "Add"
+msgstr "添加"
+
+#: po/rc.cpp:209 rc.cpp:209
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "用户名"
+
+#: po/rc.cpp:210 rc.cpp:210
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "用户邮箱"
+
+

sources/desktop-panel/desktop-panel.cpp

@@ -26,7 +26,7 @@
 #include <Plasma/Theme>
 #include <QDebug>
 #include <QFile>
-#include <QGraphicsLinearLayout>
+#include <QGraphicsGridLayout>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QProcessEnvironment>
@@ -94,9 +94,6 @@ DesktopPanel::DesktopPanel(QObject *parent, const QVariantList &args)
 
 DesktopPanel::~DesktopPanel()
 {
-//     for (int i=0; i<labels.count(); i++)
-//         delete labels[i];
-//     delete layout;
 }
 
 
@@ -106,7 +103,7 @@ void DesktopPanel::init()
 
     extsysmonEngine = dataEngine(QString("ext-sysmon"));
 
-    layout = new QGraphicsLinearLayout();
+    layout = new QGraphicsGridLayout();
     layout->setContentsMargins(1, 1, 1, 1);
     setLayout(layout);
 
@@ -154,15 +151,18 @@ QString DesktopPanel::panelLocationToStr(Plasma::Location loc)
 QString DesktopPanel::parsePattern(const QString rawLine, const int num)
 {
     if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Run function with raw line" << rawLine;
+    if (debug) qDebug() << PDEBUG << ":" << "Raw line" << rawLine;
-    if (debug) qDebug() << PDEBUG << ":" << "Run function with number" << num;
+    if (debug) qDebug() << PDEBUG << ":" << "Number" << num;
 
-    QString line, mark;
+    QString line, fullMark, mark;
     line = rawLine;
     if (currentDesktop == num + 1)
         mark = configuration[QString("mark")];
     else
         mark = QString("");
+    fullMark = QString("%1").arg(mark, configuration[QString("mark")].count(), QLatin1Char(' '));
+    if (line.contains(QString("$fullmark")))
+        line.replace(QString("$fullmark"), fullMark);
     if (line.contains(QString("$mark")))
         line.replace(QString("$mark"), mark);
     if (line.contains(QString("$name")))
@@ -189,7 +189,7 @@ void DesktopPanel::reinit()
     }
     labels.clear();
     // layout
-    layout = new QGraphicsLinearLayout();
+    layout = new QGraphicsGridLayout();
     layout->setContentsMargins(1, 1, 1, 1);
     setLayout(layout);
 
@@ -197,24 +197,18 @@ void DesktopPanel::reinit()
     // layout
     if (configuration[QString("background")].toInt() == 0)
         setBackgroundHints(NoBackground);
-    if (configuration[QString("layout")].toInt() == 0)
-        layout->setOrientation(Qt::Horizontal);
-    else
-        layout->setOrientation(Qt::Vertical);
-    // left stretch
-    if (configuration[QString("leftStretch")].toInt() == 2)
-        layout->addStretch(1);
     // labels
     for (int i=0; i<desktopNames.count(); i++) {
         labels.append(new CustomPlasmaLabel(this, i));
-        layout->addItem(labels[i]);
+        labels[i]->setWordWrap(false);
+        labels[i]->setAttribute(Qt::WA_NoSystemBackground, true);
+        if (configuration[QString("layout")].toInt() == 0)
+            layout->addItem(labels[i], 0, i);
+        else
+            layout->addItem(labels[i], i, 0);
     }
-    // right stretch
-    if (configuration[QString("rightStretch")].toInt() == 2)
-        layout->addStretch(1);
 
-    updateText();
+    updateText(true);
-    resize(10, 10);
 }
 
 
@@ -259,21 +253,24 @@ void DesktopPanel::setCurrentDesktop(const int number)
 }
 
 
-void DesktopPanel::updateText()
+void DesktopPanel::updateText(const bool first)
 {
     if (debug) qDebug() << PDEBUG;
 
-    if (labels.isEmpty()) return;
     QString line, text;
     for (int i=0; i<labels.count(); i++) {
         if (debug) qDebug() << PDEBUG << ":" << "Label" << i;
-        line = parsePattern(configuration[QString("pattern")], i);
+        if (first)
+            line = configuration[QString("pattern")];
+        else
+            line = parsePattern(configuration[QString("pattern")], i);
         if (currentDesktop == i + 1)
             text = currentFormatLine[0] + line + currentFormatLine[1];
         else
             text = formatLine[0] + line + formatLine[1];
         labels[i]->setText(text);
     }
+    update();
 }
 
 
@@ -281,7 +278,7 @@ void DesktopPanel::updateText()
 void DesktopPanel::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data)
 {
     if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Run function with source name" << sourceName;
+    if (debug) qDebug() << PDEBUG << ":" << "Source name" << sourceName;
 
     if (data.keys().count() == 0)
         return;
@@ -308,6 +305,7 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
     QWidget *toggleWidget = new QWidget;
     uiToggleConfig.setupUi(toggleWidget);
 
+    uiWidConfig.textEdit_elements->setPlainText(configuration[QString("pattern")]);
     if (configuration[QString("background")].toInt() == 0)
         uiWidConfig.checkBox_background->setCheckState(Qt::Unchecked);
     else
@@ -316,18 +314,9 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
         uiWidConfig.checkBox_layout->setCheckState(Qt::Unchecked);
     else
         uiWidConfig.checkBox_layout->setCheckState(Qt::Checked);
-    if (configuration[QString("leftStretch")].toInt() == 0)
-        uiWidConfig.checkBox_leftStretch->setCheckState(Qt::Unchecked);
-    else
-        uiWidConfig.checkBox_leftStretch->setCheckState(Qt::Checked);
-    if (configuration[QString("rightStretch")].toInt() == 0)
-        uiWidConfig.checkBox_rightStretch->setCheckState(Qt::Unchecked);
-    else
-        uiWidConfig.checkBox_rightStretch->setCheckState(Qt::Checked);
     uiWidConfig.spinBox_interval->setValue(configuration[QString("interval")].toInt());
     uiWidConfig.comboBox_mark->setItemText(uiWidConfig.comboBox_mark->count()-1, configuration[QString("mark")]);
     uiWidConfig.comboBox_mark->setCurrentIndex(uiWidConfig.comboBox_mark->count()-1);
-    uiWidConfig.lineEdit_pattern->setText(configuration[QString("pattern")]);
     uiWidConfig.lineEdit_desktopcmd->setText(configuration[QString("desktopcmd")]);
 
     KConfigGroup cg = config();
@@ -376,6 +365,18 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
     parent->addPage(appWidget, i18n("Appearance"), QString("preferences-desktop-theme"));
     parent->addPage(toggleWidget, i18n("Toggle panels"), QString("plasma"));
 
+    connect(uiWidConfig.pushButton_tags, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_br, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_font, SIGNAL(clicked(bool)), this, SLOT(setFontFormating()));
+    connect(uiWidConfig.pushButton_bold, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_italic, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_underline, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_strike, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_left, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_center, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_right, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+    connect(uiWidConfig.pushButton_fill, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+
     connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
     connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
 }
@@ -388,13 +389,11 @@ void DesktopPanel::configAccepted()
     extsysmonEngine->disconnectSource(QString("desktop"), this);
     KConfigGroup cg = config();
 
+    cg.writeEntry("pattern", uiWidConfig.textEdit_elements->toPlainText());
     cg.writeEntry("background", QString::number(uiWidConfig.checkBox_background->checkState()));
     cg.writeEntry("layout", QString::number(uiWidConfig.checkBox_layout->checkState()));
-    cg.writeEntry("leftStretch", QString::number(uiWidConfig.checkBox_leftStretch->checkState()));
-    cg.writeEntry("rightStretch", QString::number(uiWidConfig.checkBox_rightStretch->checkState()));
     cg.writeEntry("interval", QString::number(uiWidConfig.spinBox_interval->value()));
     cg.writeEntry("mark", uiWidConfig.comboBox_mark->currentText());
-    cg.writeEntry("pattern", uiWidConfig.lineEdit_pattern->text());
     cg.writeEntry("desktopcmd", uiWidConfig.lineEdit_desktopcmd->text());
 
     cg.writeEntry("currentFontFamily", uiAppConfig.fontComboBox_fontActive->currentFont().family());
@@ -426,15 +425,13 @@ void DesktopPanel::configChanged()
 
     KConfigGroup cg = config();
 
+    configuration[QString("pattern")] = cg.readEntry("pattern", "[$fullmark$number/$total: $name]");
     configuration[QString("background")] = cg.readEntry("background", "2");
     configuration[QString("desktopcmd")] = cg.readEntry("desktopcmd", "qdbus org.kde.kwin /KWin setCurrentDesktop $number");
     configuration[QString("interval")] = cg.readEntry("interval", "1000");
     configuration[QString("layout")] = cg.readEntry("layout", "0");
-    configuration[QString("leftStretch")] = cg.readEntry("leftStretch", "2");
     configuration[QString("mark")] = cg.readEntry("mark", "¤");
     configuration[QString("panels")] = cg.readEntry("panels", "-1");
-    configuration[QString("pattern")] = cg.readEntry("pattern", "[$mark$number/$total: $name]");
-    configuration[QString("rightStretch")] = cg.readEntry("rightStretch", "2");
 
     extsysmonEngine->connectSource(QString("desktop"), this, configuration[QString("interval")].toInt());
 
@@ -479,4 +476,49 @@ void DesktopPanel::configChanged()
 }
 
 
+void DesktopPanel::setFontFormating()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    CFont defaultFont = CFont(uiAppConfig.fontComboBox_fontInactive->currentFont().family(),
+                              uiAppConfig.spinBox_fontSizeInactive->value(),
+                              400, false, uiAppConfig.kcolorcombo_fontColorInactive->color());
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultFont,
+                                      false, false);
+    QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText();
+    uiWidConfig.textEdit_elements->insertPlainText(QString("<span style=\"color:%1; font-family:'%2'; font-size:%3pt;\">")
+                                                   .arg(font.color().name()).arg(font.family()).arg(font.pointSize()) +
+                                                   selectedText + QString("</span>"));
+}
+
+
+void DesktopPanel::setFormating()
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Sender" << sender();
+
+    QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText();
+    if (sender() == uiWidConfig.pushButton_tags)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("$") + uiWidConfig.comboBox_tags->currentText());
+    else if (sender() == uiWidConfig.pushButton_br)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<br>\n"));
+    else if (sender() == uiWidConfig.pushButton_bold)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<b>") + selectedText + QString("</b>"));
+    else if (sender() == uiWidConfig.pushButton_italic)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<i>") + selectedText + QString("</i>"));
+    else if (sender() == uiWidConfig.pushButton_underline)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<u>") + selectedText + QString("</u>"));
+    else if (sender() == uiWidConfig.pushButton_strike)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<s>") + selectedText + QString("</s>"));
+    else if (sender() == uiWidConfig.pushButton_left)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<p align=\"left\">") + selectedText + QString("</p>"));
+    else if (sender() == uiWidConfig.pushButton_center)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<p align=\"center\">") + selectedText + QString("</p>"));
+    else if (sender() == uiWidConfig.pushButton_right)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<p align=\"right\">") + selectedText + QString("</p>"));
+    else if (sender() == uiWidConfig.pushButton_fill)
+        uiWidConfig.textEdit_elements->insertPlainText(QString("<p align=\"justify\">") + selectedText + QString("</p>"));
+}
+
+
 #include "desktop-panel.moc"

sources/desktop-panel/desktop-panel.h

@@ -28,7 +28,7 @@
 #include <ui_widget.h>
 
 
-class QGraphicsLinearLayout;
+class QGraphicsGridLayout;
 class DesktopPanel;
 
 
@@ -76,6 +76,8 @@ public slots:
 
 private slots:
     void reinit();
+    void setFontFormating();
+    void setFormating();
 
 protected:
     void createConfigurationInterface(KConfigDialog *parent);
@@ -84,9 +86,9 @@ private:
     // functions
     QList<Plasma::Containment *> getPanels();
     QString panelLocationToStr(Plasma::Location loc);
-    void updateText();
+    void updateText(const bool first = false);
     // ui
-    QGraphicsLinearLayout *layout;
+    QGraphicsGridLayout *layout;
     QList<CustomPlasmaLabel *> labels;
     // debug
     bool debug;
@@ -100,9 +102,7 @@ private:
     Ui::ToggleWindow uiToggleConfig;
     // configuration
     QMap<QString, QString> configuration;
-    QStringList desktopNames;
+    QStringList desktopNames, currentFormatLine, formatLine;
-    QStringList currentFormatLine;
-    QStringList formatLine;
 };
 
 K_EXPORT_PLASMA_APPLET(desktop-panel, DesktopPanel)

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\n"
-"PO-Revision-Date: 2014-09-08 02:02+0400\n"
+"PO-Revision-Date: 2014-09-15 10:02+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: desktop-panel.cpp:141
 msgid "Top Edge"
-msgstr ""
+msgstr "Top Edge"
 
 #: desktop-panel.cpp:143
 msgid "Bottom Edge"
@@ -38,23 +38,27 @@ msgstr "Right Edge"
 msgid "Unknown Position (%1)"
 msgstr "Unknown Position (%1)"
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Appearance"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr "Toggle panels"
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr "Select font"
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr "Active desktop"
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Font"
 
@@ -83,57 +87,49 @@ msgid "To control panels please set widget shortcut."
 msgstr "To control panels please set widget shortcut."
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr "Enable background"
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Vertical layout"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Add stretch to left/top of the layout"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Add stretch to right/bottom of the layout"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Time interval"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr "Enable background"
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr "Mark"
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr "A mark which will be shown if this desktop is active"
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr "Pattern"
+msgstr "Vertical layout"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr "Command to change desktop"
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr "Command which will change the current desktop"
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr "Ctrl+U"
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr "Add"
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -144,12 +140,29 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Add stretch to left/top of the layout"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Add stretch to right/bottom of the layout"
+
+#~ msgid "Pattern"
+#~ msgstr "Pattern"
+
+#~ msgid ""
+#~ "$mark - show mark if the current desktop is active\n"
+#~ "$name - desktop name\n"
+#~ "$number - desktop number\n"
+#~ "$total - total number of desktops"
+#~ msgstr ""
+#~ "$mark - show mark if the current desktop is active\n"
+#~ "$name - desktop name\n"
+#~ "$number - desktop number\n"
+#~ "$total - total number of desktops"
+
 #~ msgid "Set font family"
 #~ msgstr "Set font family"
 
-#~ msgid "Set font size"
-#~ msgstr "Set font size"
-
 #~ msgid "Set font color"
 #~ msgstr "Set font color"
 

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
@@ -38,23 +38,27 @@ msgstr ""
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr ""
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr ""
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr ""
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Fuente"
 
@@ -83,53 +87,49 @@ msgid "To control panels please set widget shortcut."
 msgstr ""
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr ""
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Orientación vertical"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Añadir extensión a la izquierda/superior de la distribución"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Añadir extensión a la derecha/inferior de la distribución"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Intervalo de tiempo"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr ""
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr ""
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr ""
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr ""
+msgstr "Orientación vertical"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr ""
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr ""
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr ""
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr ""
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr ""
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr ""
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -139,3 +139,9 @@ msgstr "Tu nombre"
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "Tus correos"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Añadir extensión a la izquierda/superior de la distribución"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Añadir extensión a la derecha/inferior de la distribución"

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
@@ -39,23 +39,27 @@ msgstr ""
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Apparence"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr ""
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr ""
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr ""
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Police"
 
@@ -84,53 +88,49 @@ msgid "To control panels please set widget shortcut."
 msgstr ""
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr ""
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Positionnement vertical"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Étirer le positionnement vers haut/gauche"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Étirer le positionnement vers bas/droite"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Intervalle"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr ""
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr ""
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr ""
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr ""
+msgstr "Positionnement vertical"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr ""
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr ""
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr ""
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr ""
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr ""
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr ""
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -140,3 +140,9 @@ msgstr "Evgeniy Alekseev"
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Étirer le positionnement vers haut/gauche"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Étirer le positionnement vers bas/droite"

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
@@ -37,23 +37,27 @@ msgstr ""
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr ""
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr ""
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr ""
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr ""
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr ""
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr ""
 
@@ -82,53 +86,49 @@ msgid "To control panels please set widget shortcut."
 msgstr ""
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr ""
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr ""
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr ""
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr ""
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr ""
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr ""
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr ""
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr ""
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
 msgstr ""
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr ""
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr ""
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr ""
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr ""
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr ""
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr ""
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
@@ -37,23 +37,27 @@ msgstr ""
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Aparência"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr ""
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr ""
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr ""
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Tamanho da fonte"
 
@@ -82,53 +86,49 @@ msgid "To control panels please set widget shortcut."
 msgstr ""
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr ""
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Layout vertical"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Adicionar esticamento à esquerda/topo do layout"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Adicionar esticamento à direita/inferior do layout"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Intervalo de tempo"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr ""
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr ""
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr ""
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr ""
+msgstr "Layout vertical"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr ""
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr ""
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr ""
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr ""
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr ""
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr ""
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -138,3 +138,9 @@ msgstr "under"
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "dreanazous@gmail.com"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Adicionar esticamento à esquerda/topo do layout"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Adicionar esticamento à direita/inferior do layout"

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\n"
-"PO-Revision-Date: 2014-09-08 02:03+0400\n"
+"PO-Revision-Date: 2014-09-15 10:03+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -38,23 +38,27 @@ msgstr "Правый край"
 msgid "Unknown Position (%1)"
 msgstr "Неизвестное положение (%1)"
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Виджет"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr "Скрыть панели"
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr "Выберете шрифт"
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr "Активный рабочий стол"
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Шрифт"
 
@@ -83,57 +87,49 @@ msgid "To control panels please set widget shortcut."
 msgstr "Чтобы управлять панелями, настройте комбинацию клавиш."
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr "Включить фон"
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Вертикальная разметка"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Добавить пустое место слева/сверху виджета"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Добавить пустое место справа/снизу виджета"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Интервал обновления"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr "Включить фон"
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr "Метка"
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr "Метка, которая будет показана, если данный рабочий стол активен"
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr "Шаблон"
+msgstr "Вертикальная разметка"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-"$mark - показать метку, если данный рабочий стол активен\n"
-"$name - имя рабочего стола\n"
-"$number - номер рабочего стола\n"
-"$total - общее число рабочий столов"
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr "Команда"
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr "Команда которая изменит текущий рабочий стол"
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr "Ctrl+U"
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr "Добавить"
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -144,3 +140,22 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Добавить пустое место слева/сверху виджета"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Добавить пустое место справа/снизу виджета"
+
+#~ msgid "Pattern"
+#~ msgstr "Шаблон"
+
+#~ msgid ""
+#~ "$mark - show mark if the current desktop is active\n"
+#~ "$name - desktop name\n"
+#~ "$number - desktop number\n"
+#~ "$total - total number of desktops"
+#~ msgstr ""
+#~ "$mark - показать метку, если данный рабочий стол активен\n"
+#~ "$name - имя рабочего стола\n"
+#~ "$number - номер рабочего стола\n"
+#~ "$total - общее число рабочий столов"

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-09-08 02:02+0400\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
@@ -38,23 +38,27 @@ msgstr ""
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:375
+#: desktop-panel.cpp:367
 msgid "Widget"
 msgstr "Віджет"
 
-#: desktop-panel.cpp:376
+#: desktop-panel.cpp:368
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
-#: desktop-panel.cpp:377
+#: desktop-panel.cpp:369
 msgid "Toggle panels"
 msgstr ""
 
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr ""
+
 #: po/rc.cpp:3 rc.cpp:3
 msgid "Active desktop"
 msgstr ""
 
-#: po/rc.cpp:6 po/rc.cpp:24 rc.cpp:6 rc.cpp:24
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
 msgid "Font"
 msgstr "Шрифт"
 
@@ -83,53 +87,49 @@ msgid "To control panels please set widget shortcut."
 msgstr ""
 
 #: po/rc.cpp:42 rc.cpp:42
-msgid "Enable background"
-msgstr ""
-
-#: po/rc.cpp:45 rc.cpp:45
-msgid "Vertical layout"
-msgstr "Вертикальна розмітка"
-
-#: po/rc.cpp:48 rc.cpp:48
-msgid "Add stretch to left/top of the layout"
-msgstr "Додати порожнє місце ліворуч/вгорі віджету"
-
-#: po/rc.cpp:51 rc.cpp:51
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Додати порожнє місце праворуч/внизу віджету"
-
-#: po/rc.cpp:54 rc.cpp:54
 msgid "Time interval"
 msgstr "Інтервал оновлення"
 
-#: po/rc.cpp:57 rc.cpp:57
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr ""
+
+#: po/rc.cpp:48 rc.cpp:48
 msgid "Mark"
 msgstr ""
 
-#: po/rc.cpp:60 rc.cpp:60
+#: po/rc.cpp:51 rc.cpp:51
 msgid "A mark which will be shown if this desktop is active"
 msgstr ""
 
-#: po/rc.cpp:63 rc.cpp:63
+#: po/rc.cpp:54 rc.cpp:54
-msgid "Pattern"
+msgid "Vertical layout"
-msgstr ""
+msgstr "Вертикальна розмітка"
 
-#: po/rc.cpp:66 rc.cpp:66
+#: po/rc.cpp:57 rc.cpp:57
-msgid ""
-"$mark - show mark if the current desktop is active\n"
-"$name - desktop name\n"
-"$number - desktop number\n"
-"$total - total number of desktops"
-msgstr ""
-
-#: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"
 msgstr ""
 
-#: po/rc.cpp:75 rc.cpp:75
+#: po/rc.cpp:60 rc.cpp:60
 msgid "Command which will change the current desktop"
 msgstr ""
 
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr ""
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr ""
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr ""
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr ""
+
 #: po/rc.cpp:76 rc.cpp:76
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -139,3 +139,9 @@ msgstr "Slobodyan Victor"
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "sarumyan@i.ua"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Додати порожнє місце ліворуч/вгорі віджету"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Додати порожнє місце праворуч/внизу віджету"

sources/desktop-panel/po/zh.po

@@ -0,0 +1,161 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Steve Lemuel <wlemuel@hotmail.com>, 2014.
+# Evgeniy Alekseev <esalexeev@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
+"POT-Creation-Date: 2014-09-15 10:02+0400\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"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: desktop-panel.cpp:141
+msgid "Top Edge"
+msgstr "顶部边缘"
+
+#: desktop-panel.cpp:143
+msgid "Bottom Edge"
+msgstr "底部边缘"
+
+#: desktop-panel.cpp:145
+msgid "Left Edge"
+msgstr "左端边缘"
+
+#: desktop-panel.cpp:147
+msgid "Right Edge"
+msgstr "右端边缘"
+
+#: desktop-panel.cpp:149
+msgid "Unknown Position (%1)"
+msgstr "未知位置（%1）"
+
+#: desktop-panel.cpp:367
+msgid "Widget"
+msgstr "窗口小部件"
+
+#: desktop-panel.cpp:368
+msgid "Appearance"
+msgstr "外观"
+
+#: desktop-panel.cpp:369
+msgid "Toggle panels"
+msgstr "控制面板状态切换(显示/隐藏)"
+
+#: desktop-panel.cpp:489
+msgid "Select font"
+msgstr "选择字体"
+
+#: po/rc.cpp:3 rc.cpp:3
+msgid "Active desktop"
+msgstr "当前激活桌面"
+
+#: po/rc.cpp:6 po/rc.cpp:24 po/rc.cpp:63 rc.cpp:6 rc.cpp:24 rc.cpp:63
+msgid "Font"
+msgstr "字体"
+
+#: po/rc.cpp:9 po/rc.cpp:27 rc.cpp:9 rc.cpp:27
+msgid "Font size"
+msgstr "字体大小"
+
+#: po/rc.cpp:12 po/rc.cpp:30 rc.cpp:12 rc.cpp:30
+msgid "Font color"
+msgstr "字体颜色"
+
+#: po/rc.cpp:15 po/rc.cpp:33 rc.cpp:15 rc.cpp:33
+msgid "Font weight"
+msgstr "字体宽度"
+
+#: po/rc.cpp:18 po/rc.cpp:36 rc.cpp:18 rc.cpp:36
+msgid "Font style"
+msgstr "字体样式"
+
+#: po/rc.cpp:21 rc.cpp:21
+msgid "Inactive desktop"
+msgstr "未激活桌面"
+
+#: po/rc.cpp:39 rc.cpp:39
+msgid "To control panels please set widget shortcut."
+msgstr "设置控制面板的快捷键"
+
+#: po/rc.cpp:42 rc.cpp:42
+msgid "Time interval"
+msgstr "时间间隔"
+
+#: po/rc.cpp:45 rc.cpp:45
+msgid "Enable background"
+msgstr "启用背景"
+
+#: po/rc.cpp:48 rc.cpp:48
+msgid "Mark"
+msgstr "标记"
+
+#: po/rc.cpp:51 rc.cpp:51
+msgid "A mark which will be shown if this desktop is active"
+msgstr "当前桌面处于激活状态下，该当标记显示。 "
+
+#: po/rc.cpp:54 rc.cpp:54
+msgid "Vertical layout"
+msgstr "垂直布局"
+
+#: po/rc.cpp:57 rc.cpp:57
+msgid "Command to change desktop"
+msgstr "桌面切换命令"
+
+#: po/rc.cpp:60 rc.cpp:60
+msgid "Command which will change the current desktop"
+msgstr "当前桌面更改命令"
+
+#: po/rc.cpp:66 rc.cpp:66
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: po/rc.cpp:69 rc.cpp:69
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: po/rc.cpp:72 rc.cpp:72
+msgid "Ctrl+U"
+msgstr "Ctrl+U"
+
+#: po/rc.cpp:75 rc.cpp:75
+msgid "Add"
+msgstr "添加"
+
+#: po/rc.cpp:76 rc.cpp:76
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "用户名"
+
+#: po/rc.cpp:77 rc.cpp:77
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "用户邮箱"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "添加左上角拉伸"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "添加右下角拉伸"
+
+#~ msgid "Pattern"
+#~ msgstr "样式"
+
+#~ msgid ""
+#~ "$mark - show mark if the current desktop is active\n"
+#~ "$name - desktop name\n"
+#~ "$number - desktop number\n"
+#~ "$total - total number of desktops"
+#~ msgstr ""
+#~ "$mark - 当前桌面处于激活状态时，显示标记\n"
+#~ "$name - 桌面名称\n"
+#~ "$number - 桌面数量\n"
+#~ "$total - 桌面总数量"

sources/desktop-panel/widget.ui

@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
+    <width>729</width>
-    <height>343</height>
+    <height>428</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>480</width>
+    <width>700</width>
     <height>320</height>
    </size>
   </property>
@@ -20,267 +20,386 @@
    <string notr="true">Widget</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="4" column="0">
-    <widget class="QScrollArea" name="scrollArea">
+    <layout class="QHBoxLayout" name="layout_interval">
-     <property name="widgetResizable">
+     <item>
-      <bool>true</bool>
+      <widget class="QLabel" name="label_interval">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Time interval</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_interval">
+       <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="QSpinBox" name="spinBox_interval">
+       <property name="minimumSize">
+        <size>
+         <width>180</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>10000</number>
+       </property>
+       <property name="singleStep">
+        <number>500</number>
+       </property>
+       <property name="value">
+        <number>1000</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="checkBox_background">
+     <property name="text">
+      <string>Enable background</string>
      </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
+    </widget>
-      <property name="geometry">
+   </item>
-       <rect>
+   <item row="5" column="0">
-        <x>0</x>
+    <layout class="QHBoxLayout" name="layout_mark">
-        <y>0</y>
+     <item>
-        <width>464</width>
+      <widget class="QLabel" name="label_mark">
-        <height>327</height>
+       <property name="minimumSize">
-       </rect>
+        <size>
-      </property>
+         <width>200</width>
-      <layout class="QVBoxLayout" name="verticalLayout">
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Mark</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBox_mark">
+       <property name="toolTip">
+        <string>A mark which will be shown if this desktop is active</string>
+       </property>
+       <property name="editable">
+        <bool>true</bool>
+       </property>
        <item>
-        <widget class="QCheckBox" name="checkBox_background">
+        <property name="text">
-         <property name="text">
+         <string notr="true">#</string>
-          <string>Enable background</string>
+        </property>
-         </property>
-        </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox_layout">
+        <property name="text">
-         <property name="text">
+         <string notr="true">$</string>
-          <string>Vertical layout</string>
+        </property>
-         </property>
-        </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox_leftStretch">
+        <property name="text">
-         <property name="text">
+         <string notr="true">%</string>
-          <string>Add stretch to left/top of the layout</string>
+        </property>
-         </property>
-        </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox_rightStretch">
+        <property name="text">
-         <property name="text">
+         <string notr="true">&amp;</string>
-          <string>Add stretch to right/bottom of the layout</string>
+        </property>
-         </property>
-        </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="layout_interval">
+        <property name="text">
-         <item>
+         <string notr="true">*</string>
-          <widget class="QLabel" name="label_interval">
+        </property>
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Time interval</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="spacer_interval">
-           <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="QSpinBox" name="spinBox_interval">
-           <property name="minimumSize">
-            <size>
-             <width>180</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>10000</number>
-           </property>
-           <property name="singleStep">
-            <number>500</number>
-           </property>
-           <property name="value">
-            <number>1000</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="layout_mark">
+        <property name="text">
-         <item>
+         <string notr="true">@</string>
-          <widget class="QLabel" name="label_mark">
+        </property>
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Mark</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_mark">
-           <property name="toolTip">
-            <string>A mark which will be shown if this desktop is active</string>
-           </property>
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-           <item>
-            <property name="text">
-             <string notr="true">#</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">$</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">%</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">&amp;</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">*</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">@</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">¤</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">¶</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">·</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">º</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">×</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">†</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">•</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">(current)</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="layout_pattern">
+        <property name="text">
-         <item>
+         <string notr="true">¤</string>
-          <widget class="QLabel" name="label_pattern">
+        </property>
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Pattern</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_pattern">
-           <property name="toolTip">
-            <string>$mark - show mark if the current desktop is active
-$name - desktop name
-$number - desktop number
-$total - total number of desktops</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="layout_desktopcmd">
+        <property name="text">
-         <item>
+         <string notr="true">¶</string>
-          <widget class="QLabel" name="label_desktopcmd">
+        </property>
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Command to change desktop</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_desktopcmd">
-           <property name="toolTip">
-            <string>Command which will change the current desktop</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </item>
        <item>
-        <spacer name="spacer_widget">
+        <property name="text">
-         <property name="orientation">
+         <string notr="true">·</string>
-          <enum>Qt::Vertical</enum>
+        </property>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>152</height>
-          </size>
-         </property>
-        </spacer>
        </item>
-      </layout>
+       <item>
-     </widget>
+        <property name="text">
+         <string notr="true">º</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">×</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">†</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">•</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">(current)</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0">
+    <widget class="QCheckBox" name="checkBox_layout">
+     <property name="text">
+      <string>Vertical layout</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <layout class="QHBoxLayout" name="layout_desktopcmd">
+     <item>
+      <widget class="QLabel" name="label_desktopcmd">
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Command to change desktop</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit_desktopcmd">
+       <property name="toolTip">
+        <string>Command which will change the current desktop</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="layput_mainFormating">
+     <item>
+      <widget class="QPushButton" name="pushButton_font">
+       <property name="text">
+        <string>Font</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_br">
+       <property name="icon">
+        <iconset theme="stock_text_indent">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_mainFormatingCenter1">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_bold">
+       <property name="icon">
+        <iconset theme="format-text-bold">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+       <property name="shortcut">
+        <string>Ctrl+B</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_italic">
+       <property name="icon">
+        <iconset theme="format-text-italic">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+       <property name="shortcut">
+        <string>Ctrl+I</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_underline">
+       <property name="icon">
+        <iconset theme="format-text-underline">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+       <property name="shortcut">
+        <string>Ctrl+U</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_strike">
+       <property name="icon">
+        <iconset theme="format-text-strikethrough">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_mainFormatingCenter2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_left">
+       <property name="icon">
+        <iconset theme="format-justify-left">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_center">
+       <property name="icon">
+        <iconset theme="format-justify-center">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_right">
+       <property name="icon">
+        <iconset theme="format-justify-right">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_fill">
+       <property name="icon">
+        <iconset theme="format-justify-fill">
+         <normaloff>../awesome-widget</normaloff>../awesome-widget</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_mainFormatingCenter3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBox_tags">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string notr="true">fullmark</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">mark</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">name</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">number</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string notr="true">total</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_tags">
+       <property name="text">
+        <string>Add</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QTextEdit" name="textEdit_elements">
+     <property name="lineWrapMode">
+      <enum>QTextEdit::NoWrap</enum>
+     </property>
+     <property name="acceptRichText">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
   </layout>