this change makes it so you are prompted if you monitor was not probed. the prompt occurs after the keyboard and mice screens, so all peripheral questions are at the beginning. previous state of these files tags as before-cambridge-monitor-query-change

1 files changed, 17 insertions, 2 deletions

diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 6a9fd3bfa..385fe5d85 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -433,6 +433,20 @@ class MonitorWindow (InstallWindow):
 		idname = self.currentMonitor
 		monname = self.currentMonitor
 
+	    # warn user their monitor type is unprobed
+	    if idname == "Unprobed Monitor":
+		rc = self.intf.messageWindow(_("Monitor Unspecified"),
+			    _("You have not selected a monitor type.  It is "
+			      "recommended you choose the closest matching "
+			      "model in order to have the highest possible "
+			      "display quality."),
+					     type="custom",
+					     custom_buttons = [_("Proceed"),
+					     _("Choose monitor type")],
+					     custom_icon="warning")
+		if rc:
+		    raise gui.StayOnScreen
+
 	    # XXX - this is messed up - we set the monitor object in instdata
 	    #       to the current values, then we have to push it into the
 	    #       xhwstate as well.  Need to join this operation somehow.
@@ -594,10 +608,11 @@ class MonitorWindow (InstallWindow):
         (entry, other) = entrys
         self.enableIfSyncsValid(entry, other)
 
-    def getScreen (self, xsetup, monitor):
+    def getScreen (self, xsetup, monitor, intf):
 
-        self.monitor = monitor
+	self.intf = intf
         self.xsetup = xsetup
+        self.monitor = monitor
 
         # some flags to let us know when to ignore callbacks we caused
         self.ignoreEntryChanges = 0