Author: craig
Date: Fri Mar 20 23:59:54 2020
New Revision: 23522
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23522
Log:
#16029: Add extra message to Upgrade Checker to make note of package manager
based installations
Modified:
trunk/Scribus/scribus/upgradechecker.cpp
trunk/Scribus/scribus/upgradechecker.h
Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23522&path=/trunk/Scribus/scribus/upgradechecker.cpp
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.cpp (original)
+++ trunk/Scribus/scribus/upgradechecker.cpp Fri Mar 20 23:59:54 2020
@@ -27,12 +27,6 @@
UpgradeChecker::UpgradeChecker()
{
init();
-
- m_fin = false;
- m_file = nullptr;
- m_networkManager = nullptr;
- m_networkReply = nullptr;
- m_writeToConsole = true;
}
UpgradeChecker::~UpgradeChecker()
@@ -233,6 +227,7 @@
for ( QStringList::Iterator it = m_updates.begin(); it !=
m_updates.end(); ++it )
outputText(*it);
outputText("<b>"+ tr("Please visit www.scribus.net for
details.")+"</b>");
+ outputText("<b>"+ tr("If you have installed Scribus from a
package management system, for example on a Linux-based operating system, your
package manager may have this upgrade available.")+"</b>");
}
outputText(m_message);
}
Modified: trunk/Scribus/scribus/upgradechecker.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23522&path=/trunk/Scribus/scribus/upgradechecker.h
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.h (original)
+++ trunk/Scribus/scribus/upgradechecker.h Fri Mar 20 23:59:54 2020
@@ -39,20 +39,20 @@
void init();
virtual void outputText(const QString& text, bool noLineFeed=false);
void reportError(const QString& s);
- bool m_writeToConsole;
+ QFile *m_file {nullptr};
+ QNetworkAccessManager* m_networkManager {nullptr};
+ QNetworkReply *m_networkReply {nullptr};
+ QString m_message;
+ QString m_platform;
+ QString m_stability;
+ QString m_tempFile;
QString m_version;
- QString m_stability;
+ QStringList m_updates;
+ bool m_errorReported {false};
+ bool m_fin {false};
+ bool m_isCVS {false};
+ bool m_writeToConsole {true};
uint major, minor, m_revision1, m_revision2;
- bool m_isCVS;
- QString m_platform;
- QStringList m_updates;
- QString m_tempFile;
- bool m_fin;
- QNetworkAccessManager* m_networkManager;
- QNetworkReply *m_networkReply;
- QString m_message;
- QFile *m_file;
- bool m_errorReported;
};
class UpgradeCheckerGUI : public UpgradeChecker
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
