Attachment 311806 Details for Bug 453551 – Ask the user if he wants to use vnc instead of text mode

[patch] Ask the user if he wants to use vnc instead of text mode

vncovertextmode.diff (text/plain), 2.55 KB, created by Martin Sivák on 2008-07-15 11:31:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Sivák

Created: 2008-07-15 11:31:42 UTC

Size: 2.55 KB

patch

obsolete

>diff --git a/anaconda b/anaconda
>index 3b17b80..ab0f438 100755
>--- a/anaconda
>+++ b/anaconda
>@@ -754,6 +754,17 @@ if __name__ == "__main__":
>             opts.display_mode = 't'
>         else:
>             opts.display_mode = 'g'
>+    
>+    if opts.display_mode == 't': #we prefer vnc over text mode, so ask about that
>+        title = _("Would you like to use VNC?")
>+        message = _("The VNC mode instalation offers more functionality than the text mode, would you like to use it instead?")
>+
>+        ret = vnc.askVncWindow(title, message)
>+        if ret != -1:
>+            opts.display_mode = 'g'
>+            flags.usevnc = 1
>+            if ret is not None:
>+                vncpassword = ret
> 
>     if opts.debug:
>         flags.debug = True
>diff --git a/vnc.py b/vnc.py
>index 097ca00..81882ba 100644
>--- a/vnc.py
>+++ b/vnc.py
>@@ -27,13 +27,24 @@ import logging
> log = logging.getLogger("anaconda")
> 
> # return -1 to use text mode, None for no vncpass, or vncpass otherwise
>-def askVncWindow():
>+def askVncWindow(title = None, message = None):
>     if not os.access('/usr/bin/Xvnc', os.X_OK):
>         return -1
> 
>     if network.hasActiveNetDev() == False:
>         return -1
> 
>+    if not title:
>+        title = _("Unable to Start X")
>+    if not message:
>+        message = _("X was unable to start on your "
>+                    "machine.  Would you like to "
>+                    "start VNC to connect to "
>+                    "this computer from another "
>+                    "computer and perform a "
>+                    "graphical install or continue "
>+                    "with a text mode install?")
>+
>     screen = SnackScreen()
>     vncpass = None
>     vncconnect = 0
>@@ -44,14 +55,7 @@ def askVncWindow():
>     step = 0
>     while step < STEP_DONE:
>         if step == STEP_MESSAGE:
>-            button = ButtonChoiceWindow(screen, _("Unable to Start X"),
>-                                        _("X was unable to start on your "
>-                                          "machine.  Would you like to "
>-                                          "start VNC to connect to "
>-                                          "this computer from another "
>-                                          "computer and perform a "
>-                                          "graphical install or continue "
>-                                          "with a text mode install?"),
>+            button = ButtonChoiceWindow(screen, title, message,
>                                         buttons = [ _("Use text mode"),
>                                                     _("Start VNC") ])
>

Actions: View | Diff

Attachments on bug 453551: 311806