Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > 54ab815dc0bca2052d46c07311dc67d9 > files > 2

fritzing-0.7.1b-1.fc15.src.rpm

diff -urP fritzing-0.7.1b.source.orig/src/fapplication.cpp fritzing-0.7.1b.source/src/fapplication.cpp
--- fritzing-0.7.1b.source.orig/src/fapplication.cpp	2012-03-10 07:09:14.000000000 -0800
+++ fritzing-0.7.1b.source/src/fapplication.cpp	2012-03-10 23:55:35.017018480 -0800
@@ -762,10 +762,6 @@
 	if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.825);
 	ProcessEventBlocker::processEvents();
 
-	m_updateDialog = new UpdateDialog();
-	connect(m_updateDialog, SIGNAL(enableAgainSignal(bool)), this, SLOT(enableCheckUpdates(bool)));
-	checkForUpdates(false);
-
 	if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.875);
 
 	loadSomething(firstRun, prevVersion);
@@ -963,57 +959,6 @@
         ViewLayer::ViewLayerID viewLayerID;
 };
 
-
-
-void FApplication::checkForUpdates() {
-	checkForUpdates(true);
-}
-
-void FApplication::checkForUpdates(bool atUserRequest)
-{
-	if (atUserRequest) {
-		enableCheckUpdates(false);
-	}
-
-	VersionChecker * 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://fritzing.org/download/feed/atom/%1/%2")
-		.arg(PLATFORM_NAME)
-		.arg(makeRequestParamsString());
-    DebugDialog::debug(atom);
-    versionChecker->setUrl(atom);
-	m_updateDialog->setAtUserRequest(atUserRequest);
-	m_updateDialog->setVersionChecker(versionChecker);
-
-	if (atUserRequest) {
-		m_updateDialog->show();
-	}
-}
-
-void FApplication::enableCheckUpdates(bool enabled)
-{
-    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
-        MainWindow *mainWindow = qobject_cast<MainWindow *>(widget);
-		if (mainWindow) {
-			mainWindow->enableCheckUpdates(enabled);
-		}
-	}
-}
-
-
 void FApplication::createUserDataStoreFolderStructure() {
 	// make sure that the folder structure for parts and bins, exists
 	QString userDataStorePath = FolderUtils::getUserDataStorePath();
diff -urP fritzing-0.7.1b.source.orig/src/fapplication.h fritzing-0.7.1b.source/src/fapplication.h
--- fritzing-0.7.1b.source.orig/src/fapplication.h	2012-03-10 07:09:14.000000000 -0800
+++ fritzing-0.7.1b.source/src/fapplication.h	2012-03-10 23:55:35.018018458 -0800
@@ -64,9 +64,6 @@
 
 public slots:
 	void preferences();
-	void checkForUpdates();
-	void checkForUpdates(bool atUserRequest);
-	void enableCheckUpdates(bool enabled);
 	void createUserDataStoreFolderStructure();
 	void changeActivation(bool activate, QWidget * originator);
 	void updateActivation();
diff -urP fritzing-0.7.1b.source.orig/src/mainwindow.cpp fritzing-0.7.1b.source/src/mainwindow.cpp
--- fritzing-0.7.1b.source.orig/src/mainwindow.cpp	2012-03-10 07:09:14.000000000 -0800
+++ fritzing-0.7.1b.source/src/mainwindow.cpp	2012-03-10 23:58:33.173816017 -0800
@@ -166,7 +166,6 @@
 	m_windowMenuSeparator = NULL;
 	m_wireColorMenu = NULL;
 	m_viewSwitcherDock = NULL;
-	m_checkForUpdatesAct = NULL;
 	m_fileProgressDialog = NULL;
 	m_currentGraphicsView = NULL;
 	m_comboboxChanged = false;
@@ -1757,13 +1756,6 @@
 	m_showInViewHelpAct->setChecked(show);
 }
 
-void MainWindow::enableCheckUpdates(bool enabled)
-{
-	if (m_checkForUpdatesAct != NULL) {
-		m_checkForUpdatesAct->setEnabled(enabled);
-	}
-}
-
 
 void MainWindow::swapSelectedDelay(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase) 
 {
diff -urP fritzing-0.7.1b.source.orig/src/mainwindow.h fritzing-0.7.1b.source/src/mainwindow.h
--- fritzing-0.7.1b.source.orig/src/mainwindow.h	2012-03-10 07:09:09.000000000 -0800
+++ fritzing-0.7.1b.source/src/mainwindow.h	2012-03-10 23:55:35.020018428 -0800
@@ -93,7 +93,6 @@
 	QSizeGrip *sizeGrip();
 	QStatusBar *realStatusBar();
 	void showAllFirstTimeHelp(bool show);
-	void enableCheckUpdates(bool enabled);
 
 	class PartsEditorMainWindow* getPartsEditor(ModelPart *modelPart, long id, ItemBase * fromItem, class PartsBinPaletteWidget* requester);
 	ModelPart *loadPartFromFile(const QString& newPartPath, bool connectorsChanged=false);
@@ -669,7 +668,6 @@
     QAction *m_partsRefAct;
     QAction *m_showInViewHelpAct;;
     QAction *m_visitFritzingDotOrgAct;
-    QAction *m_checkForUpdatesAct;
     QAction *m_aboutQtAct;
     QAction *m_reportBugAct;
 	QAction *m_enableDebugAct;
diff -urP fritzing-0.7.1b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.1b.source/src/mainwindow_menu.cpp
--- fritzing-0.7.1b.source.orig/src/mainwindow_menu.cpp	2012-03-10 07:09:14.000000000 -0800
+++ fritzing-0.7.1b.source/src/mainwindow_menu.cpp	2012-03-10 23:55:35.022018373 -0800
@@ -938,10 +938,6 @@
 	m_visitFritzingDotOrgAct->setStatusTip(tr("www.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()));
@@ -1180,7 +1176,6 @@
     m_helpMenu->addAction(m_examplesAct);
     m_helpMenu->addAction(m_partsRefAct);
 	m_helpMenu->addSeparator();
-	m_helpMenu->addAction(m_checkForUpdatesAct);
 	m_helpMenu->addAction(m_importFilesFromPrevInstallAct);
 	m_helpMenu->addSeparator();
 	m_helpMenu->addAction(m_reportBugAct);
diff -urP fritzing-0.7.1b.source.orig/translations/fritzing_de.ts fritzing-0.7.1b.source/translations/fritzing_de.ts
--- fritzing-0.7.1b.source.orig/translations/fritzing_de.ts	2012-03-10 23:55:24.377324371 -0800
+++ fritzing-0.7.1b.source/translations/fritzing_de.ts	2012-03-10 23:59:04.140396287 -0800
@@ -3280,11 +3280,6 @@
         <translation>Notiz hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow_menu.cpp" line="940"/>
-        <source>Check for updates...</source>
-        <translation>Nach Updates suchen...</translation>
-    </message>
-    <message>
         <location filename="../src/mainwindow_menu.cpp" line="941"/>
         <source>Check whether a newer version of Fritzing is available for download</source>
         <translation>Überprüfen, ob eine neuere Fritzing-Version zum Download bereit steht</translation>