mirror of
https://github.com/arcan1s/awesome-widgets.git
synced 2025-07-13 13:55:50 +00:00
prerelease updates
* update Ukrainian translation * update patches * merge qt5.3-qtconcurrent-and-qlogging-category.patch into qt5.4-replace-qml-dialogs.patch * update cmake files * update README
This commit is contained in:
@ -11,7 +11,7 @@ index 3698602..42871c8 100644
|
||||
m_genericConfig = QString("%1/awesomewidgets/general.ini")
|
||||
.arg(QStandardPaths::writableLocation(
|
||||
QStandardPaths::GenericDataLocation));
|
||||
@@ -69,14 +69,14 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
|
||||
@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
|
||||
bool AWUpdateHelper::checkVersion()
|
||||
{
|
||||
QSettings settings(m_genericConfig, QSettings::IniFormat);
|
||||
@ -22,10 +22,11 @@ index 3698602..42871c8 100644
|
||||
// update version
|
||||
settings.setValue(QString("Version"), QString(VERSION));
|
||||
settings.sync();
|
||||
qCInfo(LOG_AW) << "Found version" << version << "actual one is"
|
||||
<< m_foundVersion;
|
||||
|
||||
qCInfo(LOG_AW) << "Found version" << version << "actual one is" << VERSION;
|
||||
- if (version != QVersionNumber::fromString(VERSION)) {
|
||||
+ if (version != QString(VERSION)) {
|
||||
- if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
|
||||
+ if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
|
||||
genMessageBox(i18n("Changelog of %1", QString(VERSION)),
|
||||
QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
|
||||
QMessageBox::Ok)
|
||||
@ -65,12 +66,12 @@ index 3698602..42871c8 100644
|
||||
@@ -128,8 +127,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
|
||||
|
||||
switch (ret) {
|
||||
case QMessageBox::Ok:
|
||||
case QMessageBox::AcceptRole:
|
||||
- QDesktopServices::openUrl(QString(RELEASES)
|
||||
- + m_foundVersion.toString());
|
||||
+ QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion);
|
||||
break;
|
||||
case QMessageBox::Cancel:
|
||||
case QMessageBox::RejectRole:
|
||||
default:
|
||||
@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
|
||||
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
|
||||
|
Reference in New Issue
Block a user