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

* add commit SHA information

Browse Source 
* allow to open link in quotes editor
* fix bug with no data updates in configuration ui
This commit is contained in:
arcan1s 2015-09-28 19:27:55 +03:00
parent 92ce241742
commit 84f6f1a820
10 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/CMakeLists.txt
View File

@ -17,6 +17,9 @@ set(PROJECT_VERSION_MAJOR "2")
set(PROJECT_VERSION_MINOR "4")
set(PROJECT_VERSION_PATCH "0")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
# append git version if any
include(checkgit.cmake)
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
string(TIMESTAMP CURRENT_YEAR "%Y")
@ -25,10 +28,13 @@ message(STATUS "Project: ${PROJECT_NAME}")
message(STATUS "Version: ${PROJECT_VERSION}")
message(STATUS "Build date: ${CURRENT_DATE}")
option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
# components
option(BUILD_PLASMOIDS "Build plasmoids" ON)
option(BUILD_DEB_PACKAGE "Build deb package" OFF)
option(BUILD_RPM_PACKAGE "Build rpm package" OFF)
# build details
option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
option(BUILD_TEST "Build with additional test abilities" OFF)
# flags
if(CMAKE_COMPILER_IS_GNUCXX)

2
sources/awesome-widget/package/contents/ui/dataengine.qml
View File

@ -345,7 +345,7 @@ Item {
if (debug) console.debug()
// init submodule
awKeys.initKeys(plasmoid.configuration.text)
awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.queueLimit)
}
Component.onDestruction: {

14
sources/awesome-widget/package/contents/ui/widget.qml
View File

@ -349,11 +349,7 @@ Item {
engine: "systemmonitor"
connectedSources: systemmonitorDE.sources
interval: 5000
onNewData: {
if (debug) console.debug("Update source", sourceName)
awKeys.dataUpdateReceived(sourceName, data)
}
onNewData: awKeys.dataUpdateReceived(sourceName, data)
}
PlasmaCore.DataSource {
@ -365,7 +361,6 @@ Item {
onNewData: {
// even after a disconnect it is possible that we'll receive an update
if (sourceName == "update") return
if (debug) console.debug("Update source", sourceName)
awKeys.dataUpdateReceived(sourceName, data)
}
}
@ -375,11 +370,7 @@ Item {
engine: "time"
connectedSources: ["Local"]
interval: 5000
onNewData: {
if (debug) console.debug("Update source", sourceName)
awKeys.dataUpdateReceived(sourceName, data)
}
onNewData: awKeys.dataUpdateReceived(sourceName, data)
}
@ -398,6 +389,7 @@ Item {
awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
awKeys.unlock()
}
onDropSource: {

9
sources/awesome-widget/plugin/awactions.cpp
View File

@ -118,9 +118,10 @@ QString AWActions::getAboutText(const QString type) const
QString text;
if (type == QString("header"))
text = QString(NAME);
else if (type == QString("version"))
else if (type == QString("version")) {
text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
else if (type == QString("description"))
if (!QString(COMMIT_SHA).isEmpty()) text += QString(" (%1)").arg(QString(COMMIT_SHA));
} else if (type == QString("description"))
text = i18n("A set of minimalistic plasmoid widgets");
else if (type == QString("links"))
text = i18n("Links:") + QString("<br>") +
@ -237,6 +238,7 @@ void AWActions::showInfo(const QString version) const
qCDebug(LOG_AW) << "Version" << version;
QString text = i18n("You are using the actual version %1", version);
if (!QString(COMMIT_SHA).isEmpty()) text += QString(" (%1)").arg(QString(COMMIT_SHA));
QMessageBox::information(nullptr, i18n("No new version found"), text);
}
@ -248,7 +250,8 @@ void AWActions::showUpdates(const QString version) const
qCDebug(LOG_AW) << "Version" << version;
QString text;
text += i18n("Current version : %1", QString(VERSION)) + QString("\n");
text += i18n("Current version : %1", QString(VERSION));
text += QString(COMMIT_SHA).isEmpty() ? QString("\n") : QString(" (%1)\n").arg(QString(COMMIT_SHA));
text += i18n("New version : %1", version) + QString("\n\n");
text += i18n("Click \"Ok\" to download");

2
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -464,6 +464,7 @@ void AWKeys::reinitKeys()
// init
QStringList allKeys = dictKeys();
#ifdef BUILD_TEST
// not documented feature - place all available tags
m_pattern = m_pattern.replace(QString("$ALL"), [allKeys]() {
QStringList strings;
@ -471,6 +472,7 @@ void AWKeys::reinitKeys()
strings.append(QString("%1: $%1").arg(tag));
return strings.join(QString(" | "));
}());
#endif /* BUILD_TEST */
// append lists
// bars

2
sources/awesomewidgets/extitemaggregator.h
View File

@ -176,7 +176,7 @@ private:
}
// sort items
std::sort(items.begin(), items.end(), [](const T *lhs, const T *rhs){
std::sort(items.begin(), items.end(), [](const T *lhs, const T *rhs) {
return lhs->number() < rhs->number();
});
return items;

3
sources/awesomewidgets/extquotes.ui
View File

@ -92,6 +92,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>

11
sources/checkgit.cmake Normal file
View File

@ -0,0 +1,11 @@
exec_program(
"git"
${CMAKE_CURRENT_SOURCE_DIR}
ARGS "log" "-1" "--format=\"%h\""
OUTPUT_VARIABLE COMMIT_SHA
RETURN_VALUE GIT_RETURN
)
if(${GIT_RETURN} EQUAL "0")
set(PROJECT_COMMIT_SHA "${COMMIT_SHA}")
endif()

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

@ -248,9 +248,10 @@ QString DPAdds::getAboutText(const QString type) const
QString text;
if (type == QString("header"))
text = QString(NAME);
else if (type == QString("version"))
else if (type == QString("version")) {
text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
else if (type == QString("description"))
if (!QString(COMMIT_SHA).isEmpty()) text += QString(" (%1)").arg(QString(COMMIT_SHA));
} else if (type == QString("description"))
text = i18n("A set of minimalistic plasmoid widgets");
else if (type == QString("links"))
text = i18n("Links:") + QString("<br>") +

8
sources/version.h.in
View File

@ -4,6 +4,7 @@
// information
#define NAME "Awesome Widgets"
#define VERSION "@PROJECT_VERSION@"
#define COMMIT_SHA "@PROJECT_COMMIT_SHA@"
#define AUTHOR "@PROJECT_AUTHOR@"
#define TRANSLATORS "Ernesto Aviles Vzqz (Spanish), Mermouy (French), underr (Brazillian Portuguese), Viktor Slobodyan (Ukrainian), Lemueler (Chinese), Heimen Stoffels (Dutch)"
#define EMAIL "@PROJECT_CONTACT@"
@ -24,6 +25,7 @@
// available time keys
#define TIME_KEYS "dddd,ddd,dd,d,MMMM,MMM,MM,M,yyyy,yy,hh,h,HH,H,mm,m,ss,s,t,ap,a,AP,A"
#cmakedefine BUILD_FUTURE
#cmakedefine BUILD_TEST
// links
#define HOMEPAGE "https://arcanis.name/projects/awesome-widgets/"
@ -42,6 +44,12 @@
// cmake properties
#define CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
// components
#define BUILD_PLASMOIDS "@BUILD_PLASMOIDS@"
#define BUILD_DEB_PACKAGE "@BUILD_DEB_PACKAGE@"
#define BUILD_RPM_PACKAGE "@BUILD_RPM_PACKAGE@"
// additional functions
#define PROP_FUTURE "@BUILD_FUTURE@"
#define PROP_TEST "@BUILD_TEST@"
#endif /* VERSION_H */