From 2cf688bd92bb16249c54d840d59ee6ddf1a9fb31 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 18 Sep 2008 19:31:48 +0000 Subject: [PATCH] PATCH: [ 2116922 ] Web: Changes for new stable release 2.10.0 --- Web/404.php | 17 +++++++++++------ Web/WinMergePAD.xml | 22 +++++++++++----------- Web/about/index.php | 13 +++++++------ Web/downloads/index.php | 8 ++++---- Web/history.php | 10 ++++++++++ Web/index.php | 4 ++-- Web/page.inc | 34 ++++++++++++++++------------------ 7 files changed, 61 insertions(+), 47 deletions(-) diff --git a/Web/404.php b/Web/404.php index 763436ecd..8635bfd1f 100644 --- a/Web/404.php +++ b/Web/404.php @@ -14,12 +14,17 @@

Were you looking for...

printFoot(); diff --git a/Web/WinMergePAD.xml b/Web/WinMergePAD.xml index 25b9a167b..508e8a777 100644 --- a/Web/WinMergePAD.xml +++ b/Web/WinMergePAD.xml @@ -34,15 +34,15 @@ WinMerge - 2.8.6 - 08 - 07 + 2.10.0 + 09 + 17 2008 0 Freeware - Minor Update + Major Update Install and Uninstall Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64 Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Slovak,Spanish,Swedish,Turkish,Ukrainian @@ -51,8 +51,8 @@ System Utilities::File Compression - 3034033 - 2963 + 3232299 + 3157 3 @@ -77,14 +77,14 @@ - http://winmerge.org/2.8/ - http://winmerge.org/2.8/ - http://winmerge.org/2.8/images/screenshot.png - http://winmerge.org/2.8/images/icon.gif + http://winmerge.org/about/ + http://winmerge.org/downloads/ + http://winmerge.org/about/screenshots/screenshot.png + http://winmerge.org/about/screenshots/icon.gif http://winmerge.org/WinMergePAD.xml - http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-Setup.exe + http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-Setup.exe diff --git a/Web/about/index.php b/Web/about/index.php index e18496061..96f539905 100644 --- a/Web/about/index.php +++ b/Web/about/index.php @@ -3,6 +3,7 @@ $page = new Page; $page->printHead('About WinMerge', TAB_ABOUT); + $stablerelease = $page->getStableRelease(); ?>

About WinMerge

WinMerge is an Open Source (GPL) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

@@ -25,7 +26,7 @@
  • Archive file support using 7-Zip
  • Plugin support
  • Localizable interface
    • -
  • Online manual and installed HTML Help manual
    • +
  • Online manual and installed HTML Help manual

    • Screenshots

    @@ -34,16 +35,16 @@

    See the screenshots page for more screenshots.

    Installation

    -

    Just download the installer and double-click it.

    -

    Or you may simply unzip the binary zip package into the desired location, and run +

    Just download the installer and double-click it.

    +

    Or you may simply unzip the binary zip package into the desired location, and run WinMergeU.exe (except for Windows 98/ME users who should use WinMerge.exe).

    -

    For more information, please see the Installation section of the Manual.

    +

    For more information, please see the Installation section of the Manual.

    Using WinMerge

    -

    For information on using WinMerge, see our online Manual, +

    For information on using WinMerge, see our online Manual, or you can use the local help file (just press F1 inside WinMerge) for offline use.

    -

    Here is the current change log.

    +

    Here is the current change log.

    printFoot(); ?> \ No newline at end of file diff --git a/Web/downloads/index.php b/Web/downloads/index.php index 872132ad8..a68ba2123 100644 --- a/Web/downloads/index.php +++ b/Web/downloads/index.php @@ -15,7 +15,7 @@

    Current Version

    printDownloadNow(); ?> -

    The current version is getVersionNumber();?> and was released at getDate();?>. For detailed info on what's new, read the change log and the release notes.

    +

    The current version is getVersionNumber();?> and was released at getDate();?>. For detailed info on what's new, read the change log and the release notes.

    • Installer @@ -43,7 +43,7 @@
    -

    The easiest way to install WinMerge is to download and run the Installer. Read the online manual for help using it.

    +

    The easiest way to install WinMerge is to download and run the Installer. Read the online manual for help using it.

    Other Versions

    • Stable Versions
      • @@ -79,8 +79,8 @@ You can browse th
      Developer Version
      https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk
      -
      WinMerge 2.8
      -
      https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8
      +
      WinMerge 2.10
      +
      https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10
      printFoot(); diff --git a/Web/history.php b/Web/history.php index d35af7563..fce59e496 100644 --- a/Web/history.php +++ b/Web/history.php @@ -6,6 +6,16 @@ ?>

      History

      +

      WinMerge 2.10

      +
        +
      • WinMerge 2.10.0 (2008-09-17)
        • +
      + +
      +

      WinMerge 2.8

      • WinMerge 2.8.6 (2008-08-07)
        • diff --git a/Web/index.php b/Web/index.php index 59101231a..b149f858b 100644 --- a/Web/index.php +++ b/Web/index.php @@ -19,8 +19,8 @@

      WinMerge getVersionNumber();?> - latest stable version

      -

      WinMerge getVersionNumber();?> is the latest stable version, and is recommended for most users.

      -

      Download WinMerge getVersionNumber();?> Installer

      +

      WinMerge getVersionNumber();?> is the latest stable version, and is recommended for most users.

      +printDownloadNow(); ?>

      Support

      If you need support, look at our support page for more information how you can get it.

      diff --git a/Web/page.inc b/Web/page.inc index 788d5e20c..27246cd85 100644 --- a/Web/page.inc +++ b/Web/page.inc @@ -37,23 +37,23 @@ * Constructor */ function Page() { - $this->_title = 'WinMerge 2.8'; + $this->_title = 'WinMerge'; $this->_charset = 'ISO-8859-1'; $this->_description = 'WinMerge HomePage: Visual text file comparison and merging (Open Source software).'; $this->_keywords = 'WinMerge, free, download, Beyond Compare, Scooter Software, DLSuperC, DLSubCF, Component Software Diff, Viff, TreeDiff, FileSync, WMatch, Quick Spot, NTDMatch, windiff, WDIFF, FolderMatch, Merge 99, Merge99, PMdiff, PMDiff, PMDIFF, pmdiff, visual, visually, file, folder, directory, synchronization, comparison, graphical, document, text, compare, diff, difference, revision, Araxis, compare folders, compare files, synchronize folders, merge files, merge folders, Y2K, Year 2000, Year 2K, side-by-side, VFC, GFC, gdiff, CSDiff, OS2GFC, vdiff, ediff, fc'; $this->_rssfeeds = array(); - $this->_tab = WINMERGE_2_8; + $this->_tab = TAB_HOME; /* _Stable Release */ $this->_stablerelease = new Release; - $this->_stablerelease->setVersionNumber('2.8.6'); - $this->_stablerelease->setDate('2008-08-07'); - $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-Setup.exe', 3051113); - $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-exe.zip', 3349594); - $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-exe.7z', 1822229); - $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.6.zip', 1287510); - $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.6.7z', 753831); - $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-src.zip', 8607863); - $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.6-src.7z', 4377158); + $this->_stablerelease->setVersionNumber('2.10.0'); + $this->_stablerelease->setDate('2008-09-17'); + $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-Setup.exe', 3232299); + $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-exe.zip', 3413050); + $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-exe.7z', 2006316); + $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.10.0.zip', 1287520); + $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.10.0.7z', 753835); + $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-src.zip', 9730347); + $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.10.0-src.7z', 5090123); } /** @@ -141,7 +141,8 @@ case WINMERGE_2_2: //if WinMerge 2.2 ... case WINMERGE_2_4: //if WinMerge 2.4 ... case WINMERGE_2_6: //if WinMerge 2.6 ... - $temp .= "

      This is an old version of WinMerge, for the latest version go to the main site.

      \n"; + case WINMERGE_2_8: //if WinMerge 2.8 ... + $temp .= "

      This is an old version of WinMerge, for the latest version go to the download page.

      \n"; break; } print($temp); @@ -200,9 +201,6 @@ if ($this->_tab == WINMERGE_2_8) { //if WinMerge 2.8 ... $temp .= "
    • WinMerge 2.8
      • \n"; } - else { //if NOT WinMerge 2.8 ... - $temp .= "
    • WinMerge 2.8
      • \n"; - } if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ... $temp .= "
    • WinMerge 2.6
      • \n"; } @@ -221,9 +219,9 @@ if ($this->_tab == TAB_DOCS) { //if "Documentation" ... $temp .= "
    • Documentation
      • \n"; } - //else { //if NOT "Documentation" ... - // $temp .= "
    • Documentation
      • \n"; - //} + else { //if NOT "Documentation" ... + $temp .= "
    • Documentation
      • \n"; + } if ($this->_tab == TAB_DOWNLOADS) { //if "Downloads" ... $temp .= "
    • Downloads
      • \n"; } -- 2.11.0