diff --git a/sources/3rdparty/about/about.ui b/sources/3rdparty/about/about.ui new file mode 100644 index 0000000..a350df8 --- /dev/null +++ b/sources/3rdparty/about/about.ui @@ -0,0 +1,218 @@ + + + About + + + + 0 + 0 + 450 + 359 + + + + + + + 0 + + + + About + + + + + + true + + + + + 0 + 0 + 418 + 284 + + + + + + + + + + Qt::AlignCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::AlignCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::AlignJustify|Qt::AlignVCenter + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + Qt::RichText + + + true + + + true + + + Qt::TextBrowserInteraction + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + Acknowledgement + + + + + + true + + + + + 0 + 0 + 418 + 284 + + + + + + + + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + true + + + Qt::TextBrowserInteraction + + + + + + + Qt::Vertical + + + + 20 + 229 + + + + + + + + + + + + + + + + + + + Qt::RichText + + + Qt::AlignCenter + + + true + + + true + + + Qt::TextBrowserInteraction + + + + + + + + diff --git a/sources/3rdparty/tasks b/sources/3rdparty/tasks index d4e154a..230bdec 160000 --- a/sources/3rdparty/tasks +++ b/sources/3rdparty/tasks @@ -1 +1 @@ -Subproject commit d4e154aa948b82cee2d41b145763ffd9d9ec3ca7 +Subproject commit 230bdecd2c18ee2ec5350d94778a51158565c119 diff --git a/sources/awesome-widget/CMakeLists.txt b/sources/awesome-widget/CMakeLists.txt index 8217219..43a3256 100644 --- a/sources/awesome-widget/CMakeLists.txt +++ b/sources/awesome-widget/CMakeLists.txt @@ -23,7 +23,7 @@ file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_ 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_UI *.ui ${PROJECT_TRDPARTY_DIR}/about/*.ui) file (GLOB SUBPROJECT_NOTIFY *.notifyrc) # prepare diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h index ad4ab8e..a0d3d97 100644 --- a/sources/awesome-widget/awesome-widget.h +++ b/sources/awesome-widget/awesome-widget.h @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -121,6 +122,7 @@ private: Plasma::DataEngine *sysmonEngine; Plasma::DataEngine *timeEngine; // configuration interface + Ui::About uiAboutConfig; Ui::AdvancedWindow uiAdvancedConfig; Ui::AppearanceWindow uiAppConfig; Ui::ConfigWindow uiWidConfig; diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 29acab8..505e3e2 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -28,6 +28,7 @@ #include #include #include +#include "version.h" QMap AwesomeWidget::readDataEngineConfiguration() @@ -139,6 +140,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) uiDEConfig.setupUi(deConfigWidget); QWidget *tooltipWidget = new QWidget; uiTooltipConfig.setupUi(tooltipWidget); + QWidget *aboutWidget = new QWidget; + uiAboutConfig.setupUi(aboutWidget); //widget uiWidConfig.textEdit_elements->setPlainText(configuration[QString("text")]); @@ -402,11 +405,34 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) uiDEConfig.comboBox_playerSelect->setCurrentIndex( uiDEConfig.comboBox_playerSelect->findText(deSettings[QString("PLAYER")], Qt::MatchFixedString)); + // about + uiAboutConfig.label_name->setText(QString(NAME)); + uiAboutConfig.label_version->setText(i18n("Version %1\n(build date %2)", QString(VERSION), QString(BUILD_DATE))); + uiAboutConfig.label_description->setText(i18n("A set of minimalistic plasmoid widgets")); + uiAboutConfig.label_links->setText(i18n("Links:") + QString("
") + + QString("%2
").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) + + QString("%2
").arg(QString(REPOSITORY)).arg(i18n("Repository")) + + QString("%2
").arg(QString(BUGTRACKER)).arg(i18n("Bugtracker")) + + QString("%2
").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) + + QString("%2").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages"))); + uiAboutConfig.label_license->setText(QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) + + i18n("This software is licensed under %1", QString(LICENSE)) + QString("")); + // 2nd tab + QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); + for (int i=0; i%1 (%2 license)") + .arg(trdPartyList[i].split(QChar(','))[0]) + .arg(trdPartyList[i].split(QChar(','))[1]) + .arg(trdPartyList[i].split(QChar(','))[2]); + uiAboutConfig.label_translators->setText(i18n("Translators: %1", QString(TRANSLATORS))); + uiAboutConfig.label_trdparty->setText(i18n("This software uses: %1", trdPartyList.join(QString(", ")))); + parent->addPage(configWidget, i18n("Widget"), Applet::icon()); parent->addPage(advWidget, i18n("Advanced"), QString("system-run")); parent->addPage(tooltipWidget, i18n("Tooltip"), QString("preferences-desktop-color")); parent->addPage(appWidget, i18n("Appearance"), QString("preferences-desktop-theme")); parent->addPage(deConfigWidget, i18n("DataEngine"), QString("utilities-system-monitor")); + parent->addPage(aboutWidget, i18n("About"), QString("help-about")); connect(uiAdvancedConfig.listWidget_fanDevice, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(editFanItem(QListWidgetItem *))); diff --git a/sources/version.h.in b/sources/version.h.in index 05705bb..f8a0a59 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -5,7 +5,7 @@ #define NAME "Awesome Widgets" #define VERSION "@PROJECT_VERSION@" #define AUTHOR "@PROJECT_AUTHOR@" -#define TRANSLATORS "Ernesto Avilés Vzqz (Spanish),Mermouy (French),underr (Brazillian Portuguese),Виктор Слободян (Ukrainian),Lemueler (Chinese)" +#define TRANSLATORS "Ernesto Aviles Vzqz (Spanish);Mermouy (French);underr (Brazillian Portuguese);Viktor Slobodyan (Ukrainian);Lemueler (Chinese)" #define EMAIL "@PROJECT_CONTACT@" #define LICENSE "@PROJECT_LICENSE@" #define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks"