File 0000-disable-autoupdate.patch of Package fritzing
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/pri/version.pri
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/pri/version.pri
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/pri/version.pri
@@ -17,17 +17,11 @@ include(gitversion.pri)
HEADERS += \
src/version/modfiledialog.h \
- src/version/updatedialog.h \
src/version/version.h \
- src/version/versionchecker.h \
- src/version/partschecker.h
SOURCES += \
src/version/modfiledialog.cpp \
- src/version/updatedialog.cpp \
src/version/version.cpp \
- src/version/versionchecker.cpp \
- src/version/partschecker.cpp
FORMS += \
src/version/modfiledialog.ui
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/fapplication.cpp
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/src/fapplication.cpp
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/fapplication.cpp
@@ -26,8 +26,6 @@ along with Fritzing. If not, see <http:
#include "version/version.h"
#include "dialogs/prefsdialog.h"
#include "fsvgrenderer.h"
-#include "version/versionchecker.h"
-#include "version/updatedialog.h"
#include "itemdrag.h"
#include "items/wire.h"
#include "partsbinpalette/binmanager/binmanager.h"
@@ -60,7 +58,6 @@ along with Fritzing. If not, see <http:
#include "sketch/pcbsketchwidget.h"
#include "help/firsttimehelpdialog.h"
#include "help/aboutbox.h"
-#include "version/partschecker.h"
#include "testing/FTesting.h"
// dependency injection :P
@@ -623,10 +620,6 @@ FApplication::~FApplication(void)
clearModels();
- if (m_updateDialog != nullptr) {
- delete m_updateDialog;
- }
-
FSvgRenderer::cleanup();
ViewLayer::cleanup();
ViewLayer::cleanup();
@@ -827,19 +820,6 @@ bool FApplication::loadReferenceModel(co
QFileInfo info(dbPath);
bool dbExists = (info.size() > 0) && !fullLoad;
- QString sha;
- if (!dbExists) {
- // fullLoad == true means we are creating the parts database
- // so get the sha for last commit of the parts folder and store it in the database
- // this sha will be used to determine whether the user's parts folder can be updated from the remote repo
- sha = PartsChecker::getSha(dir.absolutePath());
- if (sha.isEmpty()) {
- DebugDialog::debug(QString("1.6 SHA empty"));
- return false;
- }
- referenceModel->setSha(sha);
- }
-
// loads local parts, resource parts, and any other parts in files not in the db--these part override db parts with the same moduleID
QString db = databaseName;
if (databaseName.isEmpty() && !dbExists) {
@@ -1330,12 +1310,6 @@ int FApplication::startup()
splash.hide();
m_splash = nullptr;
- m_updateDialog = new UpdateDialog();
- m_updateDialog->setRepoPath(FolderUtils::getAppPartsSubFolderPath(""), m_referenceModel->sha());
- connect(m_updateDialog, SIGNAL(enableAgainSignal(bool)), this, SLOT(enableCheckUpdates(bool)));
- connect(m_updateDialog, SIGNAL(installNewParts()), this, SLOT(installNewParts()));
- checkForUpdates(false);
-
return 0;
}
@@ -1508,55 +1482,6 @@ struct Thing {
};
-void FApplication::checkForUpdates() {
- checkForUpdates(true);
-}
-
-void FApplication::checkForUpdates(bool atUserRequest)
-{
- enableCheckUpdates(false);
-
- auto * versionChecker = new VersionChecker();
-
- QSettings settings;
- if (!atUserRequest) {
- // if I've already been notified about these updates, don't bug me again
- QString lastMainVersionChecked = settings.value("lastMainVersionChecked").toString();
- if (!lastMainVersionChecked.isEmpty()) {
- versionChecker->ignore(lastMainVersionChecked, false);
- }
- QString lastInterimVersionChecked = settings.value("lastInterimVersionChecked").toString();
- if (!lastInterimVersionChecked.isEmpty()) {
- versionChecker->ignore(lastInterimVersionChecked, true);
- }
- }
-
- QString atom = QString("http%3://fritzing.org/download/feed/atom/%1/%2")
- .arg(PLATFORM_NAME)
- .arg(Version::makeRequestParamsString(true))
- .arg(QSslSocket::supportsSsl() ? "s" : "");
- DebugDialog::debug(atom);
- versionChecker->setUrl(atom);
- m_updateDialog->setAtUserRequest(atUserRequest);
- m_updateDialog->setVersionChecker(versionChecker);
-
- if (atUserRequest) {
- m_updateDialog->exec();
- }
-}
-
-void FApplication::enableCheckUpdates(bool enabled)
-{
- //DebugDialog::debug("before enable check updates");
- Q_FOREACH (QWidget *widget, QApplication::topLevelWidgets()) {
- auto *mainWindow = qobject_cast<MainWindow *>(widget);
- if (mainWindow != nullptr) {
- mainWindow->enableCheckUpdates(enabled);
- }
- }
- //DebugDialog::debug("after enable check updates");
-}
-
void FApplication::createUserDataStoreFolderStructures() {
FolderUtils::createUserDataStoreFolders();
FolderUtils::copyBin(BinManager::MyPartsBinLocation, BinManager::MyPartsBinTemplateLocation);
@@ -2162,10 +2087,7 @@ void FApplication::regenerateDatabaseFin
if (thread == nullptr) return;
QDialog * progressDialog = thread->progressDialog();
- if (progressDialog == m_updateDialog) {
- m_updateDialog->installFinished(thread->error());
- }
- else {
+ {
if (thread->error().isEmpty()) {
QTimer::singleShot(50, Qt::PreciseTimer, this, SLOT(quit()));
}
@@ -2182,7 +2104,3 @@ void FApplication::regenerateDatabaseFin
thread->deleteLater();
}
-
-void FApplication::installNewParts() {
- regeneratePartsDatabaseAux(m_updateDialog);
-}
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/fapplication.h
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/src/fapplication.h
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/fapplication.h
@@ -137,9 +137,6 @@ Q_SIGNALS:
public Q_SLOTS:
void preferences();
void preferencesAfter();
- void checkForUpdates();
- void checkForUpdates(bool atUserRequest);
- void enableCheckUpdates(bool enabled);
void createUserDataStoreFolderStructures();
void changeActivation(bool activate, QWidget * originator);
void updateActivation();
@@ -152,7 +149,6 @@ public Q_SLOTS:
void doCommand(const QString & command, const QString & params, QString & result, int & status);
void regeneratePartsDatabase();
void regenerateDatabaseFinished();
- void installNewParts();
protected:
@@ -220,7 +216,6 @@ protected:
QStringList m_filesToLoad;
QString m_libPath;
QString m_translationPath;
- class UpdateDialog * m_updateDialog = nullptr;
QTimer m_activationTimer;
QPointer<class FritzingWindow> m_lastTopmostWindow;
QList<QWidget *> m_orderedTopLevelWidgets;
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow.cpp
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/src/mainwindow/mainwindow.cpp
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow.cpp
@@ -284,7 +284,6 @@ MainWindow::MainWindow(ReferenceModel *r
m_welcomeView = nullptr;
m_windowMenuSeparator = nullptr;
m_schematicWireColorMenu = m_breadboardWireColorMenu = nullptr;
- m_checkForUpdatesAct = nullptr;
m_fileProgressDialog = nullptr;
m_currentGraphicsView = nullptr;
m_comboboxChanged = false;
@@ -2338,13 +2337,6 @@ void MainWindow::resizeEvent(QResizeEven
FritzingWindow::resizeEvent(event);
}
-void MainWindow::enableCheckUpdates(bool enabled)
-{
- if (m_checkForUpdatesAct != nullptr) {
- m_checkForUpdatesAct->setEnabled(enabled);
- }
-}
-
void MainWindow::migratePartLabelOffset(QList<ModelPart*> modelParts) {
QList<QString> migratedParts;
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow.h
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/src/mainwindow/mainwindow.h
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow.h
@@ -164,7 +164,6 @@ public:
QAction *raiseWindowAction();
QSizeGrip *sizeGrip();
QStatusBar *realStatusBar();
- void enableCheckUpdates(bool enabled);
void getPartsEditorNewAnd(ItemBase * fromItem);
void addDefaultParts();
@@ -902,7 +901,6 @@ protected:
QAction *m_examplesAct = nullptr;
QAction *m_partsRefAct = nullptr;
QAction *m_visitFritzingDotOrgAct = nullptr;
- QAction *m_checkForUpdatesAct = nullptr;
QAction *m_aboutQtAct = nullptr;
QAction *m_reportBugAct = nullptr;
QAction *m_enableDebugAct = nullptr;
Index: fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow_menu.cpp
===================================================================
--- fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25.orig/src/mainwindow/mainwindow_menu.cpp
+++ fritzing-app-a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25/src/mainwindow/mainwindow_menu.cpp
@@ -1294,10 +1294,6 @@ void MainWindow::createHelpMenuActions()
m_visitFritzingDotOrgAct->setStatusTip(tr("fritzing.org"));
connect(m_visitFritzingDotOrgAct, SIGNAL(triggered(bool)), this, SLOT(visitFritzingDotOrg()));
- m_checkForUpdatesAct = new QAction(tr("Check for updates..."), this);
- m_checkForUpdatesAct->setStatusTip(tr("Check whether a newer version of Fritzing is available for download"));
- connect(m_checkForUpdatesAct, SIGNAL(triggered()), QApplication::instance(), SLOT(checkForUpdates()));
-
m_aboutAct = new QAction(tr("&About"), this);
m_aboutAct->setStatusTip(tr("Show the application's about box"));
connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
@@ -1648,8 +1644,6 @@ void MainWindow::createHelpMenu()
m_helpMenu->addSeparator();
m_helpMenu->addAction(m_partsEditorHelpAct);
m_helpMenu->addSeparator();
- m_helpMenu->addAction(m_checkForUpdatesAct);
- m_helpMenu->addSeparator();
m_helpMenu->addAction(m_reportBugAct);
m_helpMenu->addAction(m_enableDebugAct);
m_helpMenu->addSeparator();
