add preference option to disable update checking

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2273 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 40 insertions, 11 deletions

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index c2b0659d3..5266636dd 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -3311,6 +3311,20 @@ no-dct-decimate=0:cabac=1</property>
                       <object class="GtkVBox" id="vbox42">
                         <property name="visible">True</property>
                         <child>
+                          <object class="GtkCheckButton" id="check_updates">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text">Check for updates to HandBrake at startup.</property>
+                            <property name="label" translatable="yes">Check for Updates</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="pref_changed_cb"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+
+                        <child>
                           <object class="GtkCheckButton" id="use_source_name">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -3323,6 +3337,7 @@ label.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
 
@@ -3369,8 +3384,8 @@ auto-generated destination name.</property>
                             </child>
                           </object>
                           <packing>
-                              <property name="expand">False</property>
-                              <property name="position">1</property>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
@@ -3386,7 +3401,7 @@ non-hidef screens.  </property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">2</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
@@ -3404,7 +3419,7 @@ the required multiple.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">3</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                         <child>
@@ -3422,6 +3437,10 @@ the required multiple.</property>
                                     <property name="shadow_type">none</property>
                                     <property name="adjustment">preview_count_adj</property>
                                     <property name="numeric">True</property>
+                                    <property name="tooltip_text">Number of preview images that are generated
+during a source scan.  More images can improve
+detection of cropping and other parameters, but
+increases scan duration.</property>
                                     <signal name="value_changed" handler="pref_changed_cb"/>
                                   </object>
                                   <packing>
@@ -3446,7 +3465,7 @@ the required multiple.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">4</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
 
@@ -3462,6 +3481,8 @@ the required multiple.</property>
                                   <object class="GtkComboBox" id="VideoQualityGranularity">
                                     <property name="visible">True</property>
                                     <property name="width_request">55</property>
+                                    <property name="tooltip_text">Granularity of the video quality slider
+in the Video settings tab.</property>
                                     <signal name="changed" handler="vqual_granularity_changed_cb"/>
                                   </object>
                                   <packing>
@@ -3484,7 +3505,7 @@ the required multiple.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">5</property>
+                            <property name="position">6</property>
                           </packing>
                         </child>
                         <child>
@@ -3501,7 +3522,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">6</property>
+                            <property name="position">7</property>
                           </packing>
                         </child>
 
@@ -3539,7 +3560,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">7</property>
+                            <property name="position">8</property>
                           </packing>
                         </child>
 
@@ -3552,7 +3573,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">8</property>
+                            <property name="position">9</property>
                           </packing>
                         </child>
                         <child>
@@ -3564,7 +3585,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">9</property>
+                            <property name="position">10</property>
                           </packing>
                         </child>
                       </object>
diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index 3498a19b3..5b8106590 100644
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -96,6 +96,8 @@
 		<false />
 		<key>title_no_in_destination</key>
 		<false />
+		<key>check_updates</key>
+		<true />
 		<key>chapters_in_destination</key>
 		<false />
 		<key>default_source</key>
diff --git a/gtk/src/main.c b/gtk/src/main.c
index 086373912..a9dba9f8f 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -619,7 +619,13 @@ main (int argc, char *argv[])
 	}
 	// Reload and check status of the last saved queue
 	g_idle_add((GSourceFunc)ghb_reload_queue, ud);
-	g_thread_create((GThreadFunc)ghb_check_update, ud, FALSE, NULL);
+	if (ghb_settings_get_boolean(ud->settings, "check_updates"))
+	{
+g_message("checking");
+		g_thread_create((GThreadFunc)ghb_check_update, ud, FALSE, NULL);
+	}
+else
+g_message("skipping");
 	// Start timer for monitoring libhb status, 500ms
 	g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
 	// Everything should be go-to-go.  Lets rock!