270.26270.26

4 files changed, 26 insertions, 19 deletions

diff --git a/src/gtk+-2.x/ctk3dvisionpro.c b/src/gtk+-2.x/ctk3dvisionpro.c
index c2d48d7..83b3e9d 100644
--- a/src/gtk+-2.x/ctk3dvisionpro.c
+++ b/src/gtk+-2.x/ctk3dvisionpro.c
@@ -1354,17 +1354,17 @@ static ChannelRangeDlg *create_channel_range_change_dlg(Ctk3DVisionPro *ctk_3d_v
 
     switch (range) {
     case SVP_SHORT_RANGE:
-        label = gtk_label_new("You have changed transceiver range to short range (less than 2m.).\n"
+        label = gtk_label_new("You have changed transceiver range to short range (less than 5m.).\n"
                               "Only glasses in this range will be available.\n\n"
                               "Do you want to apply changes?");
         break;
     case SVP_MEDIUM_RANGE:
-        label = gtk_label_new("You have changed transceiver range to medium range (less than 10m.).\n"
+        label = gtk_label_new("You have changed transceiver range to medium range (less than 15m.).\n"
                               "Only glasses in this range will be available.\n\n"
                               "Do you want to apply changes?");
         break;
     case SVP_LONG_RANGE:
-        label = gtk_label_new("You have changed transceiver range to long range.\n"
+        label = gtk_label_new("You have changed transceiver range to long range (less than 30m.).\n"
                               "Only glasses in this range will be available.\n\n"
                               "Do you want to apply changes?");
         break;
@@ -1704,9 +1704,9 @@ GtkWidget* ctk_3d_vision_pro_new(NvCtrlAttributeHandle *handle,
     hbox = gtk_hbox_new(FALSE, 5);
     menu = gtk_menu_new();
     add_menu_item(menu, "Invalid Range");
-    add_menu_item(menu, "Short Range (up to 2 meter)");
-    add_menu_item(menu, "Medium Range (up to 10 meter)");
-    add_menu_item(menu, "Long Range");
+    add_menu_item(menu, "Short Range (upto 5 meter)");
+    add_menu_item(menu, "Medium Range (upto 15 meter)");
+    add_menu_item(menu, "Long Range (upto 30 meter)");
     ctk_3d_vision_pro->option_menu = gtk_option_menu_new ();
     gtk_option_menu_set_menu
         (GTK_OPTION_MENU(ctk_3d_vision_pro->option_menu), menu);
@@ -1881,20 +1881,20 @@ GtkTextBuffer *ctk_3d_vision_pro_create_help(GtkTextTagTable *table)
                          "Possible values for transeiver range are 'Short Range' "
                          "'Medium Range' and 'Long Range'.");
     ctk_help_para(b, &i, "Short Range: \n"
-                         "Allows glasses within a 2-meter (6.5-foot) range to "
+                         "Allows glasses within a 5-meter (15-foot) range to "
                          "be synced with the hub. This range is typically used "
                          "for sharing 3D simulations and training information "
                          "on a local workstation.");
     ctk_help_para(b, &i, "Medium Range: \n"
-                         "Allows glasses within a 10-meter (32-foot) range to "
+                         "Allows glasses within a 15-meter (45-foot) range to "
                          "be synced with the hub. This range is typically used "
-                         "for sharing a presentation with a limited audience. or "
+                         "for sharing a presentation with a limited audience or "
                          "interacting with 3D CAD models during a collaborative "
                          "design session.");
     ctk_help_para(b, &i, "Long Range: \n"
-                         "All glasses detected within the range and frequency of "
-                         "the hub will be synced. This range is typically used "
-                         "in a theater or visualization center.");
+                         "Allows glasses within a 30-meter (90-foot) range to "
+                         "be synced with the hub. This range is typically used in a "
+                         "theater or visualization center.");
 
     ctk_help_finish(b);
 
diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c
index 7d0d574..1939795 100644
--- a/src/gtk+-2.x/ctkpowermizer.c
+++ b/src/gtk+-2.x/ctkpowermizer.c
@@ -77,10 +77,6 @@ static const char *__memory_clock_freq_help =
 static const char *__processor_clock_freq_help =
 "This indicates the current Processor Clock frequency.";
 
-static const char *__clock_freq_help =
-"This indicates the GPU's current Graphics Clock, Memory Clock and Processor "
-"Clock frequencies.";
-
 static const char *__performance_levels_table_help =
 "This indicates the Performance Levels available for the GPU.  Each "
 "performance level is indicated by a Performance Level number, along with "
@@ -825,18 +821,29 @@ GtkTextBuffer *ctk_powermizer_create_help(GtkTextTagTable *table,
 {
     GtkTextIter i;
     GtkTextBuffer *b;
+    gchar *s;
 
     b = gtk_text_buffer_new(table);
     
     gtk_text_buffer_get_iter_at_offset(b, &i, 0);
 
     ctk_help_title(b, &i, "PowerMizer Monitor Help");
+    ctk_help_para(b, &i, "When SLI is enabled, this page is only exposed "
+                  "on the master GPU, and changes here will apply to "
+                  "all GPUs in the SLI group.");
     
     ctk_help_heading(b, &i, "Adaptive Clocking");
     ctk_help_para(b, &i, __adaptive_clock_help);
 
     ctk_help_heading(b, &i, "Clock Frequencies");
-    ctk_help_para(b, &i, __clock_freq_help);
+    if (ctk_powermizer->processor_clock) {
+        s = "This indicates the GPU's current Graphics Clock, "
+            "Memory Clock and Processor Clock frequencies.";
+    } else {
+        s = "This indicates the GPU's current Graphics Clock and "
+            "Memory Clock frequencies.";
+    }
+    ctk_help_para(b, &i, s);
 
     ctk_help_heading(b, &i, "Power Source");
     ctk_help_para(b, &i, __power_source_help);
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index 7210fb9..5ee1b56 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -536,7 +536,7 @@
 
 
 /*
- * NV_CTRL_FRAMELOCK_SYNC_READY - reports whether a slave frame lock
+ * NV_CTRL_FRAMELOCK_SYNC_READY - reports whether a frame lock
  * board is receiving sync (regardless of whether or not any display
  * devices are using the sync).
  *
diff --git a/version.mk b/version.mk
index 44c4bf5..000cb37 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 270.18
+NVIDIA_VERSION = 270.26