# HG changeset patch # User Chris Cannam # Date 1313669758 -3600 # Node ID 88c29b718702a66e9c6f211bcc1b2499e2811ec2 # Parent 1d90cd7a1c5f9cdcb434df7e8dbcc0cac010f12e# Parent cd3dd285d0ffca0c0c8b477b5a3e74a44abeb1a2 Merge diff -r cd3dd285d0ff -r 88c29b718702 easyhg.pro --- a/easyhg.pro Thu Aug 18 12:57:35 2011 +0100 +++ b/easyhg.pro Thu Aug 18 13:15:58 2011 +0100 @@ -62,7 +62,8 @@ src/workstatuswidget.h \ src/moreinformationdialog.h \ src/annotatedialog.h \ - src/hgignoredialog.h + src/hgignoredialog.h \ + src/versiontester.h SOURCES = \ src/main.cpp \ src/mainwindow.cpp \ @@ -97,7 +98,8 @@ src/workstatuswidget.cpp \ src/moreinformationdialog.cpp \ src/annotatedialog.cpp \ - src/hgignoredialog.cpp + src/hgignoredialog.cpp \ + src/versiontester.cpp macx-* { SOURCES += src/common_osx.mm diff -r cd3dd285d0ff -r 88c29b718702 src/mainwindow.cpp --- a/src/mainwindow.cpp Thu Aug 18 12:57:35 2011 +0100 +++ b/src/mainwindow.cpp Thu Aug 18 13:15:58 2011 +0100 @@ -50,6 +50,7 @@ #include "version.h" #include "workstatuswidget.h" #include "hgignoredialog.h" +#include "versiontester.h" MainWindow::MainWindow(QString myDirPath) : @@ -131,6 +132,11 @@ cs->addDefaultName("default"); cs->addDefaultName(getUserInfo()); + VersionTester *vt = new VersionTester + ("easymercurial.org", "/latest-version.txt", EASYHG_VERSION); + connect(vt, SIGNAL(newerVersionAvailable(QString)), + this, SLOT(newerVersionAvailable(QString))); + hgTest(); updateRecentMenu(); } @@ -3062,6 +3068,17 @@ settings.setValue("firststart", m_firstStart); } - - - +void MainWindow::newerVersionAvailable(QString version) +{ + QSettings settings; + settings.beginGroup("NewerVersionWarning"); + QString tag = QString("version-%1-available-show").arg(version); + if (settings.value(tag, true).toBool()) { + QString title(tr("Newer version available")); + QString text(tr("
You are using version %1 of EasyMercurial, but version %3 is now available.
Please see the EasyMercurial website for more information.
").arg(EASYHG_VERSION).arg(version)); + QMessageBox::information(this, title, text); + settings.setValue(tag, false); + } + settings.endGroup(); +} + diff -r cd3dd285d0ff -r 88c29b718702 src/mainwindow.h --- a/src/mainwindow.h Thu Aug 18 12:57:35 2011 +0100 +++ b/src/mainwindow.h Thu Aug 18 13:15:58 2011 +0100 @@ -116,6 +116,8 @@ void checkFilesystem(); void actuallyRestoreFileSystemWatcher(); + void newerVersionAvailable(QString); + private: void hgQueryBranch(); void hgQueryHeads(); diff -r cd3dd285d0ff -r 88c29b718702 src/versiontester.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/versiontester.cpp Thu Aug 18 13:15:58 2011 +0100 @@ -0,0 +1,96 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +/* + EasyMercurial + + Based on hgExplorer by Jari Korhonen + Copyright (c) 2010 Jari Korhonen + Copyright (c) 2011 Chris Cannam + Copyright (c) 2011 Queen Mary, University of London + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. See the file + COPYING included with this distribution for more information. +*/ + +#include "versiontester.h" +#include "debug.h" + +#include