From 992cd2e8a63da5d0c40d89bb7bcf978b5e06b74a Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sun, 12 Jun 2016 14:31:31 +0200
Subject: [PATCH] Updated web links.

---
 gui/win_main.ui  | 64 +++++++++++++++++++++---------------------------
 src/win_main.cpp | 19 +++++++-------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/gui/win_main.ui b/gui/win_main.ui
index b56c89f..c38f7c5 100644
--- a/gui/win_main.ui
+++ b/gui/win_main.ui
@@ -353,10 +353,10 @@
       <iconset resource="../res/resources.qrc">
        <normaloff>:/buttons/setup.png</normaloff>:/buttons/setup.png</iconset>
      </property>
-     <addaction name="actionWebVideoLAN"/>
-     <addaction name="actionWebKomisar"/>
-     <addaction name="actionWebJEEB"/>
-     <addaction name="actionWebFreeCodecs"/>
+     <addaction name="actionWebX264VideoLAN"/>
+     <addaction name="actionWebX264Komisar"/>
+     <addaction name="separator"/>
+     <addaction name="actionWebX264FreeCodecs"/>
     </widget>
     <widget class="QMenu" name="menuDownloadAvisynth">
      <property name="title">
@@ -368,9 +368,10 @@
      </property>
      <addaction name="actionWebAvisynth32"/>
      <addaction name="actionWebAvisynth64"/>
+     <addaction name="separator"/>
      <addaction name="actionWebAvisynthPlus"/>
     </widget>
-    <widget class="QMenu" name="menuDownload_x265_Binaries">
+    <widget class="QMenu" name="menuDownloadX265">
      <property name="title">
       <string>Download x265 Binaries</string>
      </property>
@@ -378,11 +379,11 @@
       <iconset resource="../res/resources.qrc">
        <normaloff>:/buttons/setup.png</normaloff>:/buttons/setup.png</iconset>
      </property>
-     <addaction name="actionWebX265BinRU"/>
-     <addaction name="actionWebX265BinORG"/>
-     <addaction name="actionWebX265BinEU"/>
+     <addaction name="actionWebX265Fllear"/>
+     <addaction name="actionWebX265LigH"/>
+     <addaction name="actionWebX265Snowfag"/>
      <addaction name="separator"/>
-     <addaction name="actionWebX265BinFF"/>
+     <addaction name="actionWebX265FreeCodecs"/>
     </widget>
     <addaction name="actionCheckForUpdates"/>
     <addaction name="separator"/>
@@ -392,7 +393,7 @@
     <addaction name="actionWebSupport"/>
     <addaction name="separator"/>
     <addaction name="menuDownloadX264"/>
-    <addaction name="menuDownload_x265_Binaries"/>
+    <addaction name="menuDownloadX265"/>
     <addaction name="menuDownloadAvisynth"/>
     <addaction name="actionWebVapourSynth"/>
     <addaction name="separator"/>
@@ -460,22 +461,22 @@
     <string>Official x264 Web-Site</string>
    </property>
   </action>
-  <action name="actionWebKomisar">
+  <action name="actionWebX264Komisar">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>Komisar's Web-Site</string>
+    <string>x264 builds for Windows by Komisar</string>
    </property>
   </action>
-  <action name="actionWebVideoLAN">
+  <action name="actionWebX264VideoLAN">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>VideoLAN Builds</string>
+    <string>x264 builds for Windows by VideoLAN</string>
    </property>
   </action>
   <action name="actionOnlineDocX264">
@@ -592,16 +593,7 @@
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>64-Bit Avisynth (Experimental)</string>
-   </property>
-  </action>
-  <action name="actionWebJEEB">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
-   </property>
-   <property name="text">
-    <string>JEEB's Web-Site</string>
+    <string>64-Bit Avisynth (Deprecated)</string>
    </property>
   </action>
   <action name="actionWebSecret">
@@ -610,7 +602,7 @@
      <normaloff>:/buttons/book_open.png</normaloff>:/buttons/book_open.png</iconset>
    </property>
    <property name="text">
-    <string>Secret Recipe - Shush!</string>
+    <string>Secret Recipe - Confidential</string>
    </property>
   </action>
   <action name="actionWebAvsWiki">
@@ -695,7 +687,7 @@
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>Avisynth+ (32-Bit / 64-Bit)</string>
+    <string>Avisynth+ (32- and 64-Bit)</string>
    </property>
   </action>
   <action name="actionWebX265">
@@ -712,49 +704,49 @@
     <string>Download x265 Binaries</string>
    </property>
   </action>
-  <action name="actionWebX265BinRU">
+  <action name="actionWebX265Fllear">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>*Unofficial* x265 binaries [x265.ru]</string>
+    <string>x265 builds for Windows by Fllear</string>
    </property>
   </action>
-  <action name="actionWebX265BinFF">
+  <action name="actionWebX265FreeCodecs">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>FFmepg with x265 encoding support</string>
+    <string>Codecs.com Mirror (x265)</string>
    </property>
   </action>
-  <action name="actionWebX265BinEU">
+  <action name="actionWebX265Snowfag">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>*Unofficial* x265 binaries [builds.x265.eu]</string>
+    <string>x265 builds for Windows by Snowfag</string>
    </property>
   </action>
-  <action name="actionWebX265BinORG">
+  <action name="actionWebX265LigH">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>*Unofficial* x265 binaries [chromashift.org]</string>
+    <string>x265 builds for Windows by LigH</string>
    </property>
   </action>
-  <action name="actionWebFreeCodecs">
+  <action name="actionWebX264FreeCodecs">
    <property name="icon">
     <iconset resource="../res/resources.qrc">
      <normaloff>:/buttons/world_link.png</normaloff>:/buttons/world_link.png</iconset>
    </property>
    <property name="text">
-    <string>Codecs.com Mirror</string>
+    <string>Codecs.com Mirror (x264)</string>
    </property>
   </action>
   <action name="actionJob_MoveUp">
diff --git a/src/win_main.cpp b/src/win_main.cpp
index 1666735..318ee8e 100644
--- a/src/win_main.cpp
+++ b/src/win_main.cpp
@@ -227,16 +227,15 @@ MainWindow::MainWindow(const MUtils::CPUFetaures::cpu_info_t &cpuFeatures, MUtil
 	SETUP_WEBLINK(ui->actionWebMulder,          home_url);
 	SETUP_WEBLINK(ui->actionWebX264,            "http://www.videolan.org/developers/x264.html");
 	SETUP_WEBLINK(ui->actionWebX265,            "http://www.videolan.org/developers/x265.html");
-	SETUP_WEBLINK(ui->actionWebKomisar,         "http://komisar.gin.by/");
-	SETUP_WEBLINK(ui->actionWebVideoLAN,        "http://download.videolan.org/pub/x264/binaries/");
-	SETUP_WEBLINK(ui->actionWebJEEB,            "http://x264.fushizen.eu/");
-	SETUP_WEBLINK(ui->actionWebFreeCodecs,      "http://www.free-codecs.com/x264_video_codec_download.htm");
-	SETUP_WEBLINK(ui->actionWebX265BinRU,       "http://x265.ru/en/builds/");
-	SETUP_WEBLINK(ui->actionWebX265BinEU,       "http://builds.x265.eu/");
-	SETUP_WEBLINK(ui->actionWebX265BinORG,      "http://chromashift.org/x265_builds/");
-	SETUP_WEBLINK(ui->actionWebX265BinFF,       "http://ffmpeg.zeranoe.com/builds/");
-	SETUP_WEBLINK(ui->actionWebAvisynth32,      "http://sourceforge.net/projects/avisynth2/files/AviSynth%202.5/");
-	SETUP_WEBLINK(ui->actionWebAvisynth64,      "http://code.google.com/p/avisynth64/downloads/list");
+	SETUP_WEBLINK(ui->actionWebX264Komisar,     "http://komisar.gin.by/");
+	SETUP_WEBLINK(ui->actionWebX264VideoLAN,    "http://download.videolan.org/pub/x264/binaries/");
+	SETUP_WEBLINK(ui->actionWebX264FreeCodecs,  "http://www.free-codecs.com/x264_video_codec_download.htm");
+	SETUP_WEBLINK(ui->actionWebX265Fllear,      "http://x265.ru/en/builds/");
+	SETUP_WEBLINK(ui->actionWebX265LigH,        "https://www.mediafire.com/?6lfp2jlygogwa");
+	SETUP_WEBLINK(ui->actionWebX265Snowfag,     "http://builds.x265.eu/");
+	SETUP_WEBLINK(ui->actionWebX265FreeCodecs,  "http://www.free-codecs.com/x265_hevc_encoder_download.htm");
+	SETUP_WEBLINK(ui->actionWebAvisynth32,      "https://sourceforge.net/projects/avisynth2/files/AviSynth%202.6/");
+	SETUP_WEBLINK(ui->actionWebAvisynth64,      "http://forum.doom9.org/showthread.php?t=152800");
 	SETUP_WEBLINK(ui->actionWebAvisynthPlus,    "http://www.avs-plus.net/");
 	SETUP_WEBLINK(ui->actionWebVapourSynth,     "http://www.vapoursynth.com/");
 	SETUP_WEBLINK(ui->actionWebVapourSynthDocs, "http://www.vapoursynth.com/doc/");