diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | config/gdm.conf.in | 7 | ||||
| -rw-r--r-- | daemon/auth.c | 16 | ||||
| -rw-r--r-- | daemon/display.c | 4 | ||||
| -rw-r--r-- | daemon/errorgui.c | 9 | ||||
| -rw-r--r-- | daemon/gdm.c | 20 | ||||
| -rw-r--r-- | daemon/server.c | 27 | ||||
| -rw-r--r-- | daemon/slave.c | 39 | ||||
| -rw-r--r-- | daemon/xdmcp.c | 94 | ||||
| -rw-r--r-- | gui/gdmlogin.c | 2 | ||||
| -rw-r--r-- | gui/gdmsetup-strings.c | 28 | ||||
| -rw-r--r-- | gui/gdmsetup.glade | 1912 | ||||
| -rw-r--r-- | gui/greeter/greeter_parser.c | 2 | ||||
| -rw-r--r-- | gui/greeter/greeter_session.c | 57 | ||||
| -rw-r--r-- | gui/greeter/greeter_system.c | 77 | ||||
| -rw-r--r-- | gui/greeter/themes/circles/circles.xml.in | 4 | ||||
| -rw-r--r-- | gui/greeter/themes/happygnome-list/happygnome.xml.in | 4 | ||||
| -rw-r--r-- | gui/greeter/themes/happygnome/happygnome.xml.in | 4 |
18 files changed, 1372 insertions, 949 deletions
@@ -1,3 +1,18 @@ +Thu Jun 05 11:37:19 2003 George Lebl <jirka@5z.com> + + * daemon/xdmcp.c, daemon/auth.c, daemon/display.c, daemon/errorgui.c, + daemon/gdm.c, daemon/server.c, daemon/slave.c: Fix #56654 by removing + programmer references out of translatable strings + + * gui/gdmsetup.glade, gui/greeter/greeter_session.c + gui/greeter/greeter_system.c: An attempt at getting at least + a little bit closer to the HIG specification. + + * gui/gdmlogin.c, gui/greeter/greeter_system.c, gui/gdmsetup.glade, + config/gdm.conf.in, gui/greeter/themes/*/*.xml.in: + The system menu is renamed to "Actions" since that's a lot more + appropriate + Wed Jun 04 17:34:22 2003 George Lebl <jirka@5z.com> * daemon/verify-pam.c: Fix some issues from bug #106537. don't diff --git a/config/gdm.conf.in b/config/gdm.conf.in index 200ec575..325ac1a8 100644 --- a/config/gdm.conf.in +++ b/config/gdm.conf.in @@ -210,9 +210,10 @@ Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or # password. Kind of cool looking Quiver=true -# The system menu is shown in the greeter, this is the menu that contains -# reboot, shutdown, suspend, config and chooser. None of these is available -# if this is off. They can be turned off individually however +# The Actions menu (formerly system menu) is shown in the greeter, this is the +# menu that contains reboot, shutdown, suspend, config and chooser. None of +# these is available if this is off. They can be turned off individually +# however SystemMenu=true # Should the chooser button be shown. If this is shown, GDM can drop into # chooser mode which will run the xdmcp chooser locally and allow the user diff --git a/daemon/auth.c b/daemon/auth.c index 27af302d..6a314d11 100644 --- a/daemon/auth.c +++ b/daemon/auth.c @@ -434,7 +434,9 @@ try_user_add_again: authfd = g_mkstemp (d->userauth); if (authfd == -1) { - gdm_error (_("gdm_auth_user_add: Could not open cookie file %s"), d->userauth); + gdm_error (_("%s: Could not open cookie file %s"), + "gdm_auth_user_add", + d->userauth); g_free (d->userauth); d->userauth = NULL; @@ -451,7 +453,9 @@ try_user_add_again: /* FIXME: Better implement my own locking. The libXau one is not kosher */ if (XauLockAuth (d->userauth, 3, 3, 0) != LOCK_SUCCESS) { - gdm_error (_("gdm_auth_user_add: Could not lock cookie file %s"), d->userauth); + gdm_error (_("%s: Could not lock cookie file %s"), + "gdm_auth_user_add", + d->userauth); g_free (d->userauth); d->userauth = NULL; @@ -468,7 +472,9 @@ try_user_add_again: if (!af) { /* Really no need to clean up here - this process is a goner anyway */ - gdm_error (_("gdm_auth_user_add: Could not open cookie file %s"), d->userauth); + gdm_error (_("%s: Could not open cookie file %s"), + "gdm_auth_user_add", + d->userauth); if (locked) XauUnlockAuth (d->userauth); g_free (d->userauth); @@ -571,7 +577,9 @@ gdm_auth_user_remove (GdmDisplay *d, uid_t user) TRUE, GdmUserMaxFile, GdmRelaxPerms)) { g_free (authdir); g_free (authfile); - gdm_error (_("gdm_auth_user_remove: Ignoring suspiciously looking cookie file %s"), d->userauth); + gdm_error (_("%s: Ignoring suspiciously looking cookie file %s"), + "gdm_auth_user_remove", + d->userauth); return; } diff --git a/daemon/display.c b/daemon/display.c index 99f7f97f..afca73cd 100644 --- a/daemon/display.c +++ b/daemon/display.c @@ -270,7 +270,9 @@ gdm_display_manage (GdmDisplay *d) case -1: d->slavepid = 0; - gdm_error (_("gdm_display_manage: Failed forking gdm slave process for %s"), d->name); + gdm_error (_("%s: Failed forking gdm slave process for %s"), + "gdm_display_manage", + d->name); return FALSE; diff --git a/daemon/errorgui.c b/daemon/errorgui.c index 7de951a1..c6393375 100644 --- a/daemon/errorgui.c +++ b/daemon/errorgui.c @@ -280,7 +280,8 @@ gdm_error_box_full (GdmDisplay *d, GtkMessageType type, const char *error, } else if (pid > 0) { gdm_wait_for_extra (NULL); } else { - gdm_error (_("gdm_error_box: Cannot fork to display error/info box")); + gdm_error (_("%s: Cannot fork to display error/info box"), + "gdm_error_box"); } } @@ -432,7 +433,8 @@ gdm_failsafe_question (GdmDisplay *d, } close (p[0]); } else { - gdm_error (_("gdm_failsafe_question: Cannot fork to display error/info box")); + gdm_error (_("%s: Cannot fork to display error/info box"), + "gdm_failsafe_question"); } return NULL; } @@ -554,7 +556,8 @@ gdm_failsafe_yesno (GdmDisplay *d, } close (p[0]); } else { - gdm_error (_("gdm_failsafe_question: Cannot fork to display error/info box")); + gdm_error (_("%s: Cannot fork to display error/info box"), + "gdm_failsafe_question"); } return FALSE; } diff --git a/daemon/gdm.c b/daemon/gdm.c index 5ea5af17..6e5bdedf 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -882,8 +882,10 @@ deal_with_x_crashes (GdmDisplay *d) /* Yay we have a failsafe */ if ( ! ve_string_empty (bin) && access (bin, X_OK) == 0) { - gdm_info (_("deal_with_x_crashes: Trying failsafe X " - "server %s"), GdmFailsafeXServer); + gdm_info (_("%s: Trying failsafe X " + "server %s"), + "deal_with_x_crashes", + GdmFailsafeXServer); g_free (bin); g_free (d->command); d->command = g_strdup (GdmFailsafeXServer); @@ -898,8 +900,9 @@ deal_with_x_crashes (GdmDisplay *d) access (GdmXKeepsCrashing, X_OK|R_OK) == 0) { pid_t pid; - gdm_info (_("deal_with_x_crashes: Running the " - "XKeepsCrashing script")); + gdm_info (_("%s: Running the " + "XKeepsCrashing script"), + "deal_with_x_crashes"); pid = gdm_fork_extra (); @@ -1147,7 +1150,8 @@ start_autopsy: switch (status) { case DISPLAY_ABORT: /* Bury this display for good */ - gdm_info (_("gdm_child_action: Aborting display %s"), d->name); + gdm_info (_("%s: Aborting display %s"), + "gdm_child_action", d->name); if (gdm_restart_mode) gdm_safe_restart (); @@ -1167,7 +1171,8 @@ start_autopsy: argv = ve_split (GdmRebootReal); execv (argv[0], argv); - gdm_error (_("gdm_child_action: Reboot failed: %s"), strerror (errno)); + gdm_error (_("%s: Reboot failed: %s"), + "gdm_child_action", strerror (errno)); status = DISPLAY_REMANAGE; goto start_autopsy; @@ -1182,7 +1187,8 @@ start_autopsy: argv = ve_split (GdmHaltReal); execv (argv[0], argv); - gdm_error (_("gdm_child_action: Halt failed: %s"), strerror (errno)); + gdm_error (_("%s: Halt failed: %s"), + "gdm_child_action", strerror (errno)); status = DISPLAY_REMANAGE; goto start_autopsy; diff --git a/daemon/server.c b/daemon/server.c index 12eba886..2ec17089 100644 --- a/daemon/server.c +++ b/daemon/server.c @@ -965,7 +965,8 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) dup2 (logfd, 1); dup2 (logfd, 2); } else { - gdm_error (_("gdm_server_spawn: Could not open logfile for display %s!"), d->name); + gdm_error (_("%s: Could not open logfile for display %s!"), + "gdm_server_spawn", d->name); } @@ -975,15 +976,18 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) sigemptyset (&ign_signal.sa_mask); if (sigaction (SIGUSR1, &ign_signal, NULL) < 0) { - gdm_error (_("gdm_server_spawn: Error setting USR1 to SIG_IGN")); + gdm_error (_("%s: Error setting %s to %s"), + "gdm_server_spawn", "USR1", "SIG_IGN"); _exit (SERVER_ABORT); } if (sigaction (SIGTTIN, &ign_signal, NULL) < 0) { - gdm_error (_("gdm_server_spawn: Error setting TTIN to SIG_IGN")); + gdm_error (_("%s: Error setting %s to %s"), + "gdm_server_spawn", "TTIN", "SIG_IGN"); _exit (SERVER_ABORT); } if (sigaction (SIGTTOU, &ign_signal, NULL) < 0) { - gdm_error (_("gdm_server_spawn: Error setting TTOU to SIG_IGN")); + gdm_error (_("%s: Error setting %s to %s"), + "gdm_server_spawn", "TTOU", "SIG_IGN"); _exit (SERVER_ABORT); } @@ -993,11 +997,13 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) sigemptyset (&dfl_signal.sa_mask); if (sigaction (SIGHUP, &dfl_signal, NULL) < 0) { - gdm_error (_("gdm_server_spawn: Error setting HUP to SIG_DFL")); + gdm_error (_("%s: Error setting %s to %s"), + "gdm_server_spawn", "HUP", "SIG_DFL"); _exit (SERVER_ABORT); } if (sigaction (SIGTERM, &dfl_signal, NULL) < 0) { - gdm_error (_("gdm_server_spawn: Error setting TERM to SIG_DFL")); + gdm_error (_("%s: Error setting %s to %s"), + "gdm_server_spawn", "TERM", "SIG_DFL"); _exit (SERVER_ABORT); } @@ -1089,14 +1095,16 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) execv (argv[0], argv); - gdm_error (_("gdm_server_spawn: Xserver not found: %s"), command); + gdm_error (_("%s: Xserver not found: %s"), + "gdm_server_spawn", command); _exit (SERVER_ABORT); case -1: g_strfreev (argv); g_free (command); - gdm_error (_("gdm_server_spawn: Can't fork Xserver process!")); + gdm_error (_("%s: Can't fork Xserver process!"), + "gdm_server_spawn"); d->servpid = 0; d->servstat = SERVER_DEAD; @@ -1105,7 +1113,8 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) default: g_strfreev (argv); g_free (command); - gdm_debug ("gdm_server_spawn: Forked server on pid %d", (int)pid); + gdm_debug ("%s: Forked server on pid %d", + "gdm_server_spawn", (int)pid); break; } } diff --git a/daemon/slave.c b/daemon/slave.c index 50427e09..2d54326b 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -795,7 +795,7 @@ focus_first_x_window (const char *class_res_name) pid = fork (); if (pid < 0) { - gdm_error (_("focus_first_x_window: cannot fork")); + gdm_error (_("%s: cannot fork"), "focus_first_x_window"); return; } /* parent */ @@ -819,7 +819,8 @@ focus_first_x_window (const char *class_res_name) disp = XOpenDisplay (d->name); if (disp == NULL) { - gdm_error (_("focus_first_x_window: cannot open display %s"), + gdm_error (_("%s: cannot open display %s"), + "focus_first_x_window", d->name); _exit (0); } @@ -1656,13 +1657,15 @@ gdm_slave_greeter (void) gchar *modules = g_strdup_printf("--gtk-module=%s", GdmGtkModulesList); execl (argv[0], argv[0], modules, NULL); /* Something went wrong */ - gdm_error (_("gdm_slave_greeter: Cannot start greeter with gtk modules: %s. Trying without modules"), - GdmGtkModulesList); + gdm_error (_("%s: Cannot start greeter with gtk modules: %s. Trying without modules"), + "gdm_slave_greeter", + GdmGtkModulesList); g_free(modules); } execv (argv[0], argv); - gdm_error (_("gdm_slave_greeter: Cannot start greeter trying default: %s"), + gdm_error (_("%s: Cannot start greeter trying default: %s"), + "gdm_slave_greeter", EXPANDED_BINDIR "/gdmlogin"); gnome_setenv ("GDM_WHACKED_GREETER_CONFIG", "true", TRUE); @@ -2492,7 +2495,8 @@ session_child_run (struct passwd *pwent, &sessexec); if (sesspath == NULL) { /* yaikes */ - gdm_error (_("gdm_slave_session_start: gnome-session not found for a failsafe gnome session, trying xterm")); + gdm_error (_("%s: gnome-session not found for a failsafe gnome session, trying xterm"), + "gdm_slave_session_start"); session = GDM_SESSION_FAILSAFE_XTERM; gdm_error_box (d, GTK_MESSAGE_ERROR, @@ -2572,12 +2576,14 @@ session_child_run (struct passwd *pwent, if (strcmp (shell, "/sbin/nologin") == 0 || strcmp (shell, "/bin/false") == 0 || strcmp (shell, "/bin/true") == 0) { - gdm_error (_("gdm_slave_session_start: User not allowed to log in")); + gdm_error (_("%s: User not allowed to log in"), + "gdm_slave_session_start"); gdm_error_box (d, GTK_MESSAGE_ERROR, _("The system administrator has\n" "disabled your account.")); } else if (access (sessexec != NULL ? sessexec : sesspath, X_OK) != 0) { - gdm_error (_("gdm_slave_session_start: Could not find/run session `%s'"), sesspath); + gdm_error (_("%s: Could not find/run session `%s'"), + "gdm_slave_session_start", sesspath); /* if we can't read and exec the session, then make a nice * error dialog */ gdm_error_box @@ -2617,7 +2623,8 @@ session_child_run (struct passwd *pwent, /* nutcase fallback */ execl ("/bin/sh", "-sh", "-c", exec, NULL); - gdm_error (_("gdm_slave_session_start: Could not start session `%s'"), sesspath); + gdm_error (_("%s: Could not start session `%s'"), + "gdm_slave_session_start", sesspath); gdm_error_box (d, GTK_MESSAGE_ERROR, _("Cannot start your shell. It could be that the\n" @@ -3276,7 +3283,8 @@ gdm_slave_xioerror_handler (Display *disp) gdm_slave_session_stop (d->logged_in && login != NULL); - gdm_error (_("gdm_slave_xioerror_handler: Fatal X error - Restarting %s"), d->name); + gdm_error (_("%s: Fatal X error - Restarting %s"), + "gdm_slave_xioerror_handler", d->name); if ((d->type == TYPE_LOCAL || d->type == TYPE_FLEXI) && @@ -3760,7 +3768,8 @@ gdm_parse_enriched_login (const gchar *s, GdmDisplay *display) if(str->len > 0 && str->str[str->len - 1] == '|') { g_string_truncate(str, str->len - 1); if (pipe (pipe1) < 0) { - gdm_error (_("gdm_parse_enriched_login: Failed creating pipe")); + gdm_error (_("%s: Failed creating pipe"), + "gdm_parse_enriched_login"); } else { pid = gdm_fork_extra (); @@ -3788,12 +3797,14 @@ gdm_parse_enriched_login (const gchar *s, GdmDisplay *display) argv = ve_split (str->str); execv (argv[0], argv); - gdm_error (_("gdm_parse_enriched_login: Failed executing: %s"), - str->str); + gdm_error (_("%s: Failed executing: %s"), + "gdm_parse_enriched_login", + str->str); _exit (EXIT_SUCCESS); case -1: - gdm_error (_("gdm_parse_enriched_login: Can't fork script process!")); + gdm_error (_("%s: Can't fork script process!"), + "gdm_parse_enriched_login"); close (pipe1[0]); close (pipe1[1]); break; diff --git a/daemon/xdmcp.c b/daemon/xdmcp.c index 18ca82b7..a09c599a 100644 --- a/daemon/xdmcp.c +++ b/daemon/xdmcp.c @@ -241,7 +241,8 @@ gdm_xdmcp_init (void) /* Fetch and store local hostname in XDMCP friendly format */ hostbuf[1023] = '\0'; if (gethostname (hostbuf, 1023) != 0) { - gdm_error (_("gdm_xdmcp_init: Could not get server hostname: %s!"), strerror (errno)); + gdm_error (_("%s: Could not get server hostname: %s!"), + "gdm_xdmcp_init", strerror (errno)); strcmp (hostbuf, "localhost.localdomain"); } @@ -261,7 +262,7 @@ gdm_xdmcp_init (void) gdm_xdmcpfd = socket (AF_INET, SOCK_DGRAM, 0); /* UDP */ if (gdm_xdmcpfd < 0) { - gdm_error (_("gdm_xdmcp_init: Could not create socket!")); + gdm_error (_("%s: Could not create socket!"), "gdm_xdmcp_init"); GdmXdmcp = FALSE; return FALSE; } @@ -271,7 +272,7 @@ gdm_xdmcp_init (void) serv_sa.sin_addr.s_addr = htonl (INADDR_ANY); if (bind (gdm_xdmcpfd, (struct sockaddr*) &serv_sa, sizeof (serv_sa)) == -1) { - gdm_error (_("gdm_xdmcp_init: Could not bind to XDMCP socket!")); + gdm_error (_("%s: Could not bind to XDMCP socket!"), "gdm_xdmcp_init"); gdm_xdmcp_close (); GdmXdmcp = FALSE; return FALSE; @@ -330,18 +331,21 @@ gdm_xdmcp_decode_packet (GIOChannel *source, GIOCondition cond, gpointer data) }; if (!XdmcpFill (gdm_xdmcpfd, &buf, (XdmcpNetaddr)&clnt_sa, &sa_len)) { - gdm_error (_("gdm_xdmcp_decode: Could not create XDMCP buffer!")); + gdm_error (_("%s: Could not create XDMCP buffer!"), + "gdm_xdmcp_decode_packet"); return TRUE; } if (!XdmcpReadHeader (&buf, &header)) { - gdm_error (_("gdm_xdmcp_decode: Could not read XDMCP header!")); + gdm_error (_("%s: Could not read XDMCP header!"), + "gdm_xdmcp_decode_packet"); return TRUE; } if (header.version != XDM_PROTOCOL_VERSION && header.version != GDM_XDMCP_PROTOCOL_VERSION) { - gdm_error (_("gdm_xdmcp_decode: Incorrect XDMCP version!")); + gdm_error (_("%s: Incorrect XDMCP version!"), + "gdm_xdmcp_decode_packet"); return TRUE; } @@ -394,7 +398,8 @@ gdm_xdmcp_decode_packet (GIOChannel *source, GIOCondition cond, gpointer data) break; default: - gdm_error (_("gdm_xdmcp_decode_packet: Unknown opcode from host %s"), + gdm_error (_("%s: Unknown opcode from host %s"), + "gdm_xdmcp_decode_packet", inet_ntoa (clnt_sa.sin_addr)); break; } @@ -413,7 +418,8 @@ gdm_xdmcp_handle_query (struct sockaddr_in *clnt_sa, gint len, gint type) /* Extract array of authentication names from Xdmcp packet */ if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authlist)) { - gdm_error (_("gdm_xdmcp_handle_query: Could not extract authlist from packet")); + gdm_error (_("%s: Could not extract authlist from packet"), + "gdm_xdmcp_handle_query"); return; } @@ -425,7 +431,8 @@ gdm_xdmcp_handle_query (struct sockaddr_in *clnt_sa, gint len, gint type) } if (len != explen) { - gdm_error (_("gdm_xdmcp_handle_query: Error in checksum")); + gdm_error (_("%s: Error in checksum"), + "gdm_xdmcp_handle_query"); XdmcpDisposeARRAYofARRAY8 (&clnt_authlist); return; } @@ -668,14 +675,16 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len) /* Read display address */ if (! XdmcpReadARRAY8 (&buf, &clnt_addr)) { - gdm_error (_("gdm_xdmcp_handle_forward_query: Could not read display address")); + gdm_error (_("%s: Could not read display address"), + "gdm_xdmcp_handle_forward_query"); return; } /* Read display port */ if (! XdmcpReadARRAY8 (&buf, &clnt_port)) { XdmcpDisposeARRAY8 (&clnt_addr); - gdm_error (_("gdm_xdmcp_handle_forward_query: Could not read display port number")); + gdm_error (_("%s: Could not read display port number"), + "gdm_xdmcp_handle_forward_query"); return; } @@ -683,7 +692,8 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len) if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authlist)) { XdmcpDisposeARRAY8 (&clnt_addr); XdmcpDisposeARRAY8 (&clnt_port); - gdm_error (_("gdm_xdmcp_handle_forward_query: Could not extract authlist from packet")); + gdm_error (_("%s: Could not extract authlist from packet"), + "gdm_xdmcp_handle_forward_query"); return; } @@ -699,13 +709,15 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len) } if (len != explen) { - gdm_error (_("gdm_xdmcp_handle_forward_query: Error in checksum")); + gdm_error (_("%s: Error in checksum"), + "gdm_xdmcp_handle_forward_query"); goto out; } if (clnt_port.length != 2 || clnt_addr.length != 4) { - gdm_error (_("gdm_xdmcp_handle_forward_query: Bad address")); + gdm_error (_("%s: Bad address"), + "gdm_xdmcp_handle_forward_query"); goto out; } @@ -959,33 +971,38 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len) /* Check with tcp_wrappers if client is allowed to access */ if (! gdm_xdmcp_host_allow (clnt_sa)) { - gdm_error (_("gdm_xdmcp_handle_request: Got REQUEST from banned host %s"), + gdm_error (_("%s: Got REQUEST from banned host %s"), + "gdm_xdmcp_handle_request", inet_ntoa (clnt_sa->sin_addr)); return; } /* Remote display number */ if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Display Number")); + gdm_error (_("%s: Could not read Display Number"), + "gdm_xdmcp_handle_request"); return; } /* We don't care about connection type. Address says it all */ if (! XdmcpReadARRAY16 (&buf, &clnt_conntyp)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Connection Type")); + gdm_error (_("%s: Could not read Connection Type"), + "gdm_xdmcp_handle_request"); return; } /* This is TCP/IP - we don't care */ if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_addr)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Client Address")); + gdm_error (_("%s: Could not read Client Address"), + "gdm_xdmcp_handle_request"); XdmcpDisposeARRAY16 (&clnt_conntyp); return; } /* Read authentication type */ if (! XdmcpReadARRAY8 (&buf, &clnt_authname)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Authentication Names")); + gdm_error (_("%s: Could not read Authentication Names"), + "gdm_xdmcp_handle_request"); XdmcpDisposeARRAYofARRAY8 (&clnt_addr); XdmcpDisposeARRAY16 (&clnt_conntyp); return; @@ -993,7 +1010,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len) /* Read authentication data */ if (! XdmcpReadARRAY8 (&buf, &clnt_authdata)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Authentication Data")); + gdm_error (_("%s: Could not read Authentication Data"), + "gdm_xdmcp_handle_request"); XdmcpDisposeARRAYofARRAY8 (&clnt_addr); XdmcpDisposeARRAY16 (&clnt_conntyp); XdmcpDisposeARRAY8 (&clnt_authname); @@ -1002,7 +1020,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len) /* Read and select from supported authorization list */ if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authorization)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Authorization List")); + gdm_error (_("%s: Could not read Authorization List"), + "gdm_xdmcp_handle_request"); XdmcpDisposeARRAY8 (&clnt_authdata); XdmcpDisposeARRAYofARRAY8 (&clnt_addr); XdmcpDisposeARRAY16 (&clnt_conntyp); @@ -1017,7 +1036,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len) /* Manufacturer ID */ if (! XdmcpReadARRAY8 (&buf, &clnt_manufacturer)) { - gdm_error (_("gdm_xdmcp_handle_request: Could not read Manufacturer ID")); + gdm_error (_("%s: Could not read Manufacturer ID"), + "gdm_xdmcp_handle_request"); XdmcpDisposeARRAY8 (&clnt_authname); XdmcpDisposeARRAY8 (&clnt_authdata); XdmcpDisposeARRAYofARRAY8 (&clnt_addr); @@ -1040,7 +1060,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len) explen += 2+clnt_manufacturer.length; if (explen != len) { - gdm_error (_("gdm_xdmcp_handle_request: Failed checksum from %s"), + gdm_error (_("%s: Failed checksum from %s"), + "gdm_xdmcp_handle_request", inet_ntoa (clnt_sa->sin_addr)); XdmcpDisposeARRAY8 (&clnt_authname); XdmcpDisposeARRAY8 (&clnt_authdata); @@ -1207,20 +1228,23 @@ gdm_xdmcp_handle_manage (struct sockaddr_in *clnt_sa, gint len) /* Check with tcp_wrappers if client is allowed to access */ if (! gdm_xdmcp_host_allow (clnt_sa)) { - gdm_error (_("gdm_xdmcp_handle_manage: Got Manage from banned host %s"), + gdm_error (_("%s: Got Manage from banned host %s"), + "gdm_xdmcp_handle_manage", inet_ntoa (clnt_sa->sin_addr)); return; } /* SessionID */ if (! XdmcpReadCARD32 (&buf, &clnt_sessid)) { - gdm_error (_("gdm_xdmcp_handle_manage: Could not read Session ID")); + gdm_error (_("%s: Could not read Session ID"), + "gdm_xdmcp_handle_manage"); return; } /* Remote display number */ if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) { - gdm_error (_("gdm_xdmcp_handle_manage: Could not read Display Number")); + gdm_error (_("%s: Could not read Display Number"), + "gdm_xdmcp_handle_manage"); return; } @@ -1229,7 +1253,8 @@ gdm_xdmcp_handle_manage (struct sockaddr_in *clnt_sa, gint len) /* Display Class */ if (! XdmcpReadARRAY8 (&buf, &clnt_dspclass)) { - gdm_error (_("gdm_xdmcp_handle_manage: Could not read Display Class")); + gdm_error (_("%s: Could not read Display Class"), + "gdm_xdmcp_handle_manage"); return; } @@ -1442,20 +1467,23 @@ gdm_xdmcp_handle_keepalive (struct sockaddr_in *clnt_sa, gint len) /* Check with tcp_wrappers if client is allowed to access */ if (! gdm_xdmcp_host_allow (clnt_sa)) { - gdm_error (_("gdm_xdmcp_handle_keepalive: Got KEEPALIVE from banned host %s"), + gdm_error (_("%s: Got KEEPALIVE from banned host %s"), + "gdm_xdmcp_handle_keepalive", inet_ntoa (clnt_sa->sin_addr)); return; } /* Remote display number */ if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) { - gdm_error (_("gdm_xdmcp_handle_keepalive: Could not read Display Number")); + gdm_error (_("%s: Could not read Display Number"), + "gdm_xdmcp_handle_keepalive"); return; } /* SessionID */ if (! XdmcpReadCARD32 (&buf, &clnt_sessid)) { - gdm_error (_("gdm_xdmcp_handle_keepalive: Could not read Session ID")); + gdm_error (_("%s: Could not read Session ID"), + "gdm_xdmcp_handle_keepalive"); return; } @@ -1658,20 +1686,20 @@ gdm_xdmcp_displays_check (void) int gdm_xdmcp_init (void) { - gdm_error (_("gdm_xdmcp_init: No XDMCP support")); + gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_init"); return FALSE; } void gdm_xdmcp_run (void) { - gdm_error (_("gdm_xdmcp_run: No XDMCP support")); + gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_run"); } void gdm_xdmcp_close (void) { - gdm_error (_("gdm_xdmcp_close: No XDMCP support")); + gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_close"); } #endif /* HAVE_LIBXDMCP */ diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index 92815f7a..3a16125e 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -3073,7 +3073,7 @@ gdm_login_gui_init (void) } if (got_anything) { - item = gtk_menu_item_new_with_mnemonic (_("S_ystem")); + item = gtk_menu_item_new_with_mnemonic (_("_Actions")); gtk_menu_shell_append (GTK_MENU_SHELL (menubar), item); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); gtk_widget_show (GTK_WIDGET (item)); diff --git a/gui/gdmsetup-strings.c b/gui/gdmsetup-strings.c index f783842c..be2ed9ed 100644 --- a/gui/gdmsetup-strings.c +++ b/gui/gdmsetup-strings.c @@ -5,31 +5,37 @@ */ gchar *s = N_("GDM Setup"); +gchar *s = N_("<b>Greeter</b>"); +gchar *s = N_(" "); gchar *s = N_("L_ocal: "); gchar *s = N_("_Remote: "); +gchar *s = N_("Always use 24 hour cloc_k format"); gchar *s = N_("Standard greeter"); gchar *s = N_("Graphical greeter"); gchar *s = N_("Standard greeter"); gchar *s = N_("Graphical greeter"); -gchar *s = N_("Always use 24 hour cloc_k format"); -gchar *s = N_("Greeter"); +gchar *s = N_("<b>Automatic Login</b>"); +gchar *s = N_(" "); gchar *s = N_("_Login a user automatically on first bootup"); gchar *s = N_("_Automatic login username:"); gchar *s = N_("*"); -gchar *s = N_("Automatic login"); +gchar *s = N_("<b>Timed Login</b>"); +gchar *s = N_(" "); gchar *s = N_("Login a user automa_tically after a specified number of seconds"); gchar *s = N_("Timed login us_ername:"); gchar *s = N_("_Seconds before login:"); gchar *s = N_("*"); -gchar *s = N_("Timed login"); gchar *s = N_("General"); +gchar *s = N_("<b>Logo</b>"); +gchar *s = N_(" "); gchar *s = N_("*"); gchar *s = N_("_Welcome string: "); -gchar *s = N_("Welcome string: "); gchar *s = N_("*"); -gchar *s = N_("Logo"); +gchar *s = N_("<b>Miscellaneous</b>"); +gchar *s = N_(" "); gchar *s = N_("Show choosable user images (_face browser)"); -gchar *s = N_("Miscellaneous"); +gchar *s = N_("<b>Background</b>"); +gchar *s = N_(" "); gchar *s = N_("_No background"); gchar *s = N_("_Image"); gchar *s = N_("Co_lor"); @@ -38,7 +44,6 @@ gchar *s = N_("*"); gchar *s = N_("_Only color on remote displays"); gchar *s = N_("_Background color: "); gchar *s = N_("Pick a color"); -gchar *s = N_("Background"); gchar *s = N_("Standard greeter"); gchar *s = N_("<b>Preview:</b>"); gchar *s = N_("No screenshot available"); @@ -52,16 +57,17 @@ gchar *s = N_("copyright"); gchar *s = N_("_Install new theme"); gchar *s = N_("_Delete theme"); gchar *s = N_("Graphical greeter"); +gchar *s = N_("<b>Options</b>"); +gchar *s = N_(" "); gchar *s = N_("Allow _root to login with GDM"); gchar *s = N_("Allow root to login r_emotely with GDM"); gchar *s = N_("Allow remote _timed logins"); -gchar *s = N_("Show the system menu. If not set, none of the system commands will be available (this includes reboot, shutdown, configure, chooser)"); -gchar *s = N_("Show _system menu"); +gchar *s = N_("Show the \"Actions\" menu (formerly known as the \"System\" menu). If not set, none of the system commands will be available (this includes reboot, shutdown, configure, chooser)"); +gchar *s = N_("Show _actions menu"); gchar *s = N_("Allow c_onfiguration from the login screen"); gchar *s = N_("Allo_w running XDMCP chooser from the login screen"); gchar *s = N_("Always disallow TCP connections to _X server"); gchar *s = N_("Retry _delay (seconds) :"); -gchar *s = N_("Options"); gchar *s = N_("Security"); gchar *s = N_("No XDMCP support in the binary. To enable XDMCP support you must recompile GDM with the XDMCP libraries."); gchar *s = N_("Honour _indirect requests"); diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade index 13dc3d53..48744359 100644 --- a/gui/gdmsetup.glade +++ b/gui/gdmsetup.glade @@ -12,7 +12,7 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> - <property name="has_separator">True</property> + <property name="has_separator">False</property> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox1"> @@ -68,547 +68,621 @@ <property name="enable_popup">False</property> <child> - <widget class="GtkTable" id="table1"> - <property name="border_width">8</property> + <widget class="GtkVBox" id="vbox10"> + <property name="border_width">5</property> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">1</property> <property name="homogeneous">False</property> - <property name="row_spacing">8</property> - <property name="column_spacing">0</property> + <property name="spacing">18</property> <child> - <widget class="GtkFrame" id="frame2"> + <widget class="GtkVBox" id="vbox11"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkTable" id="table2"> - <property name="border_width">4</property> + <widget class="GtkLabel" id="label36"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Greeter</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox7"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="local_greeter_label"> + <widget class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="label" translatable="yes">L_ocal: </property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">local_greeter</property> - <accessibility> - <atkrelation target="local_greeter" type="label-for"/> - </accessibility> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="remote_greeter_label"> + <widget class="GtkTable" id="table2"> <property name="visible">True</property> - <property name="label" translatable="yes">_Remote: </property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">remote_greeter</property> - <accessibility> - <atkrelation target="remote_greeter" type="label-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> - <child> - <widget class="GtkOptionMenu" id="local_greeter"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">0</property> - <accessibility> - <atkrelation target="local_greeter_label" type="labelled-by"/> - </accessibility> + <child> + <widget class="GtkLabel" id="local_greeter_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">L_ocal: </property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">local_greeter</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> <child> - <widget class="GtkMenu" id="menu1"> + <widget class="GtkLabel" id="remote_greeter_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Remote: </property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">remote_greeter</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkMenuItem" id="standard_greeter_local"> - <property name="visible">True</property> - <property name="label" translatable="yes">Standard greeter</property> - <property name="use_underline">True</property> - </widget> - </child> + <child> + <widget class="GtkCheckButton" id="sg_use_24_clock"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Always use 24 hour cloc_k format</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkOptionMenu" id="local_greeter"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">0</property> <child> - <widget class="GtkMenuItem" id="graphical_greeter_local"> - <property name="visible">True</property> - <property name="label" translatable="yes">Graphical greeter</property> - <property name="use_underline">True</property> + <widget class="GtkMenu" id="menu1"> + + <child> + <widget class="GtkMenuItem" id="standard_greeter_local"> + <property name="visible">True</property> + <property name="label" translatable="yes">Standard greeter</property> + <property name="use_underline">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="graphical_greeter_local"> + <property name="visible">True</property> + <property name="label" translatable="yes">Graphical greeter</property> + <property name="use_underline">True</property> + </widget> + </child> </widget> </child> </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkOptionMenu" id="remote_greeter"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">0</property> - <accessibility> - <atkrelation target="remote_greeter_label" type="labelled-by"/> - </accessibility> <child> - <widget class="GtkMenu" id="menu2"> + <widget class="GtkOptionMenu" id="remote_greeter"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">0</property> <child> - <widget class="GtkMenuItem" id="standard_greeter_remote"> - <property name="visible">True</property> - <property name="label" translatable="yes">Standard greeter</property> - <property name="use_underline">True</property> - </widget> - </child> + <widget class="GtkMenu" id="menu2"> - <child> - <widget class="GtkMenuItem" id="graphical_greeter_remote"> - <property name="visible">True</property> - <property name="label" translatable="yes">Graphical greeter</property> - <property name="use_underline">True</property> + <child> + <widget class="GtkMenuItem" id="standard_greeter_remote"> + <property name="visible">True</property> + <property name="label" translatable="yes">Standard greeter</property> + <property name="use_underline">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="graphical_greeter_remote"> + <property name="visible">True</property> + <property name="label" translatable="yes">Graphical greeter</property> + <property name="use_underline">True</property> + </widget> + </child> </widget> </child> </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="sg_use_24_clock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Always use 24 hour cloc_k format</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox12"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label1"> + <widget class="GtkLabel" id="label38"> <property name="visible">True</property> - <property name="label" translatable="yes">Greeter</property> + <property name="label" translatable="yes"><b>Automatic Login</b></property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame5"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkTable" id="table4"> - <property name="border_width">4</property> + <widget class="GtkHBox" id="hbox8"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> - - <child> - <widget class="GtkCheckButton" id="autologin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Login a user automatically on first bootup</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="label19"> + <widget class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="label" translatable="yes">_Automatic login username:</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">autologin_entry</property> - <accessibility> - <atkrelation target="autologin_combo" type="label-for"/> - <atkrelation target="autologin_entry" type="label-for"/> - </accessibility> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkCombo" id="autologin_combo"> + <widget class="GtkTable" id="table4"> <property name="visible">True</property> - <property name="value_in_list">False</property> - <property name="allow_empty">True</property> - <property name="case_sensitive">False</property> - <property name="enable_arrow_keys">True</property> - <property name="enable_arrows_always">False</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="autologin_entry"> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + + <child> + <widget class="GtkCheckButton" id="autologin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - <accessibility> - <atkrelation target="label19" type="labelled-by"/> - </accessibility> + <property name="label" translatable="yes">_Login a user automatically on first bootup</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Automatic login username:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">autologin_entry</property> </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> </child> - <child internal-child="list"> - <widget class="GtkList" id="combo-list2"> + <child> + <widget class="GtkCombo" id="autologin_combo"> <property name="visible">True</property> - <property name="selection_mode">GTK_SELECTION_BROWSE</property> + <property name="value_in_list">False</property> + <property name="allow_empty">True</property> + <property name="case_sensitive">False</property> + <property name="enable_arrow_keys">True</property> + <property name="enable_arrows_always">False</property> + + <child internal-child="entry"> + <widget class="GtkEntry" id="autologin_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + </child> + + <child internal-child="list"> + <widget class="GtkList" id="combo-list2"> + <property name="visible">True</property> + <property name="selection_mode">GTK_SELECTION_BROWSE</property> + </widget> + </child> </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox13"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label8"> + <widget class="GtkLabel" id="label42"> <property name="visible">True</property> - <property name="label" translatable="yes">Automatic login</property> + <property name="label" translatable="yes"><b>Timed Login</b></property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame6"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkTable" id="table5"> - <property name="border_width">4</property> + <widget class="GtkHBox" id="hbox9"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> - - <child> - <widget class="GtkCheckButton" id="timedlogin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Login a user automa_tically after a specified number of seconds</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="timed_login_label"> + <widget class="GtkLabel" id="label43"> <property name="visible">True</property> - <property name="label" translatable="yes">Timed login us_ername:</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">timedlogin_entry</property> - <accessibility> - <atkrelation target="timed_login_label" type="label-for"/> - </accessibility> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkLabel" id="timedlogin_seconds_label"> + <widget class="GtkTable" id="table5"> <property name="visible">True</property> - <property name="label" translatable="yes">_Seconds before login:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">timedlogin_seconds</property> - <accessibility> - <atkrelation target="timedlogin_seconds" type="label-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> - <child> - <widget class="GtkCombo" id="timedlogin_combo"> - <property name="visible">True</property> - <property name="value_in_list">False</property> - <property name="allow_empty">True</property> - <property name="case_sensitive">False</property> - <property name="enable_arrow_keys">True</property> - <property name="enable_arrows_always">False</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="timedlogin_entry"> + <child> + <widget class="GtkCheckButton" id="timedlogin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - <accessibility> - <atkrelation target="timed_login_label" type="labelled-by"/> - </accessibility> + <property name="label" translatable="yes">Login a user automa_tically after a specified number of seconds</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> </child> - <child internal-child="list"> - <widget class="GtkList" id="combo-list1"> + <child> + <widget class="GtkLabel" id="timed_login_label"> <property name="visible">True</property> - <property name="selection_mode">GTK_SELECTION_BROWSE</property> + <property name="label" translatable="yes">Timed login us_ername:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">timedlogin_entry</property> </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="timedlogin_seconds"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="timedlogin_seconds_label" type="labelled-by"/> - </accessibility> + <child> + <widget class="GtkLabel" id="timedlogin_seconds_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Seconds before login:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">timedlogin_seconds</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="timedlogin_seconds"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">1 0 100 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCombo" id="timedlogin_combo"> + <property name="visible">True</property> + <property name="value_in_list">False</property> + <property name="allow_empty">True</property> + <property name="case_sensitive">False</property> + <property name="enable_arrow_keys">True</property> + <property name="enable_arrows_always">False</property> + + <child internal-child="entry"> + <widget class="GtkEntry" id="timedlogin_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + </child> + + <child internal-child="list"> + <widget class="GtkList" id="combo-list1"> + <property name="visible">True</property> + <property name="selection_mode">GTK_SELECTION_BROWSE</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="label" translatable="yes">Timed login</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -638,69 +712,56 @@ </child> <child> - <widget class="GtkTable" id="table6"> - <property name="border_width">8</property> + <widget class="GtkHBox" id="hbox12"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">8</property> - <property name="column_spacing">8</property> + <property name="spacing">18</property> <child> - <widget class="GtkFrame" id="frame7"> + <widget class="GtkVBox" id="vbox14"> + <property name="border_width">5</property> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox3"> - <property name="border_width">4</property> + <widget class="GtkVBox" id="vbox15"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">4</property> + <property name="spacing">6</property> <child> - <widget class="GnomePixmapEntry" id="sg_logo"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="history_id">logo</property> - <property name="max_saved">10</property> - <property name="modal">False</property> - <property name="do_preview">True</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - </child> + <property name="label" translatable="yes"><b>Logo</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox2"> + <widget class="GtkHBox" id="hbox10"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="sg_welcome_label"> + <widget class="GtkLabel" id="label45"> <property name="visible">True</property> - <property name="label" translatable="yes">_Welcome string: </property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> @@ -709,11 +770,6 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">sg_welcome</property> - <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">Welcome string: </atkproperty> - <atkrelation target="sg_welcome" type="label-for"/> - </accessibility> </widget> <packing> <property name="padding">0</property> @@ -723,19 +779,93 @@ </child> <child> - <widget class="GtkEntry" id="sg_welcome"> + <widget class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - <accessibility> - <atkrelation target="sg_welcome_label" type="labelled-by"/> - </accessibility> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GnomePixmapEntry" id="sg_logo"> + <property name="visible">True</property> + <property name="history_id">logo</property> + <property name="max_saved">10</property> + <property name="modal">False</property> + <property name="do_preview">True</property> + + <child internal-child="entry"> + <widget class="GtkEntry" id="combo-entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="sg_welcome_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Welcome string: </property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">sg_welcome</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="sg_welcome"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -746,64 +876,37 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="label" translatable="yes">Logo</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame9"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkVBox" id="vbox5"> - <property name="border_width">4</property> + <widget class="GtkVBox" id="vbox16"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">4</property> + <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sg_browser"> + <widget class="GtkLabel" id="label48"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Show choosable user images (_face browser)</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><b>Miscellaneous</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -811,68 +914,26 @@ <property name="fill">False</property> </packing> </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label28"> - <property name="visible">True</property> - <property name="label" translatable="yes">Miscellaneous</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame8"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkVBox" id="vbox4"> - <property name="border_width">4</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">4</property> <child> - <widget class="GtkHBox" id="hbox3"> + <widget class="GtkHBox" id="hbox11"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> - <widget class="GtkRadioButton" id="sg_no_bg_rb"> + <widget class="GtkLabel" id="label49"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_No background</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -882,107 +943,83 @@ </child> <child> - <widget class="GtkRadioButton" id="sg_image_bg_rb"> + <widget class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Image</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">sg_no_bg_rb</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">6</property> - <child> - <widget class="GtkRadioButton" id="sg_color_bg_rb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Co_lor</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">sg_no_bg_rb</property> + <child> + <widget class="GtkCheckButton" id="sg_browser"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Show choosable user images (_face browser)</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="sg_scale_background"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Scale background image to fit</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GnomePixmapEntry" id="sg_backimage"> - <property name="visible">True</property> - <property name="history_id">background</property> - <property name="max_saved">10</property> - <property name="modal">False</property> - <property name="do_preview">True</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> <property name="expand">True</property> <property name="fill">True</property> </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox17"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> + + <child> + <widget class="GtkVBox" id="vbox18"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="sg_remote_color_only"> + <widget class="GtkLabel" id="label52"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Only color on remote displays</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><b>Background</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -992,16 +1029,16 @@ </child> <child> - <widget class="GtkHBox" id="hbox4"> + <widget class="GtkHBox" id="hbox13"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="sg_backcolor_label"> + <widget class="GtkLabel" id="label53"> <property name="visible">True</property> - <property name="label" translatable="yes">_Background color: </property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> @@ -1010,10 +1047,6 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">sg_backcolor</property> - <accessibility> - <atkrelation target="sg_backcolor" type="label-for"/> - </accessibility> </widget> <packing> <property name="padding">0</property> @@ -1023,57 +1056,220 @@ </child> <child> - <widget class="GnomeColorPicker" id="sg_backcolor"> + <widget class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="dither">True</property> - <property name="use_alpha">False</property> - <property name="title" translatable="yes">Pick a color</property> - <accessibility> - <atkrelation target="sg_backcolor_label" type="controlled-by"/> - </accessibility> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkRadioButton" id="sg_no_bg_rb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_No background</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="sg_image_bg_rb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Image</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">sg_no_bg_rb</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="sg_color_bg_rb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Co_lor</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">sg_no_bg_rb</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="sg_scale_background"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Scale background image to fit</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GnomePixmapEntry" id="sg_backimage"> + <property name="visible">True</property> + <property name="history_id">background</property> + <property name="max_saved">10</property> + <property name="modal">False</property> + <property name="do_preview">True</property> + + <child internal-child="entry"> + <widget class="GtkEntry" id="combo-entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="sg_remote_color_only"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Only color on remote displays</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="sg_backcolor_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Background color: </property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">sg_backcolor</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GnomeColorPicker" id="sg_backcolor"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="dither">True</property> + <property name="use_alpha">False</property> + <property name="title" translatable="yes">Pick a color</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="label" translatable="yes">Background</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">2</property> - <property name="y_options">fill</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -1179,7 +1375,7 @@ <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -1480,139 +1676,31 @@ widget</property> </child> <child> - <widget class="GtkFrame" id="frame4"> - <property name="border_width">8</property> + <widget class="GtkVBox" id="vbox8"> + <property name="border_width">5</property> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> <child> - <widget class="GtkVBox" id="vbox2"> - <property name="border_width">8</property> + <widget class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">4</property> - - <child> - <widget class="GtkCheckButton" id="allowroot"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow _root to login with GDM</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="allowremoteroot"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow root to login r_emotely with GDM</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="allowremoteauto"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow remote _timed logins</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="sysmenu"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Show the system menu. If not set, none of the system commands will be available (this includes reboot, shutdown, configure, chooser)</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Show _system menu</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="config_available"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow c_onfiguration from the login screen</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="spacing">6</property> <child> - <widget class="GtkCheckButton" id="chooser_button"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Allo_w running XDMCP chooser from the login screen</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="disallow_tcp"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Always disallow TCP connections to _X server</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><b>Options</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -1622,16 +1710,16 @@ widget</property> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <widget class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">2</property> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="retry_delay_label"> + <widget class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="label" translatable="yes">Retry _delay (seconds) :</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> @@ -1640,10 +1728,6 @@ widget</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">retry_delay</property> - <accessibility> - <atkrelation target="retry_delay" type="label-for"/> - </accessibility> </widget> <packing> <property name="padding">0</property> @@ -1653,52 +1737,210 @@ widget</property> </child> <child> - <widget class="GtkSpinButton" id="retry_delay"> + <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="retry_delay_label" type="labelled-by"/> - </accessibility> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="allowroot"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allow _root to login with GDM</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="allowremoteroot"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allow root to login r_emotely with GDM</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="allowremoteauto"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allow remote _timed logins</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="sysmenu"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Show the "Actions" menu (formerly known as the "System" menu). If not set, none of the system commands will be available (this includes reboot, shutdown, configure, chooser)</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Show _actions menu</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="config_available"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allow c_onfiguration from the login screen</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="chooser_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Allo_w running XDMCP chooser from the login screen</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="disallow_tcp"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Always disallow TCP connections to _X server</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="retry_delay_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Retry _delay (seconds) :</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">retry_delay</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="retry_delay"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">1 0 100 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="label" translatable="yes">Options</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -1770,8 +2012,8 @@ widget</property> <property name="n_rows">9</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkCheckButton" id="honour_indirect"> diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c index 8b3092e1..2b39f6e3 100644 --- a/gui/greeter/greeter_parser.c +++ b/gui/greeter/greeter_parser.c @@ -932,7 +932,7 @@ parse_stock (xmlNodePtr node, else if (g_ascii_strcasecmp (prop, "system") == 0) { g_free (*translated_text); - *translated_text = g_strdup (_("S_ystem")); + *translated_text = g_strdup (_("_Actions")); } else if (g_ascii_strcasecmp (prop, "disconnect") == 0) { diff --git a/gui/greeter/greeter_session.c b/gui/greeter/greeter_session.c index 4532087e..49fb6ea5 100644 --- a/gui/greeter/greeter_session.c +++ b/gui/greeter/greeter_session.c @@ -195,6 +195,11 @@ greeter_save_gnome_session (void) void greeter_session_init (void) { + GtkWidget *w = NULL; + GtkWidget *hbox = NULL; + GtkWidget *main_vbox = NULL; + GtkWidget *vbox = NULL; + GtkWidget *cat_vbox = NULL; GtkWidget *radio; GtkWidget *dialog; DIR *sessdir; @@ -202,15 +207,16 @@ greeter_session_init (void) struct stat statbuf; gint linklen; gboolean got_default_link = FALSE; - GtkTooltips *tooltips; - GtkWidget *vbox; + static GtkTooltips *tooltips = NULL; GtkRequisition req; + char *s; g_free (current_session); current_session = NULL; session_dialog = dialog = gtk_dialog_new (); - tooltips = gtk_tooltips_new (); + if (tooltips == NULL) + tooltips = gtk_tooltips_new (); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, @@ -222,7 +228,37 @@ greeter_session_init (void) gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - vbox = gtk_vbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); + + main_vbox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 5); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + main_vbox, + FALSE, FALSE, 0); + + cat_vbox = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (main_vbox), + cat_vbox, + FALSE, FALSE, 0); + + s = g_strdup_printf ("<b>%s</b>", + _("Choose a Session")); + w = gtk_label_new (s); + gtk_label_set_use_markup (GTK_LABEL (w), TRUE); + g_free (s); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (cat_vbox), w, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (cat_vbox), + hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), + gtk_label_new (" "), + FALSE, FALSE, 0); + vbox = gtk_vbox_new (FALSE, 6); + /* we will pack this later depending on size */ if (GdmShowLastSession) { @@ -451,7 +487,7 @@ greeter_session_init (void) if (current_session == NULL) current_session = g_strdup (default_session); - gtk_widget_show (vbox); + gtk_widget_show_all (vbox); gtk_widget_size_request (vbox, &req); /* if too large */ @@ -460,6 +496,9 @@ greeter_session_init (void) gtk_widget_set_size_request (sw, req.width, 0.7 * gdm_wm_screen.height); + gtk_scrolled_window_set_shadow_type + (GTK_SCROLLED_WINDOW (sw), + GTK_SHADOW_NONE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, @@ -467,13 +506,13 @@ greeter_session_init (void) gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), vbox); gtk_widget_show (sw); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (hbox), sw, - FALSE, FALSE, 4); + TRUE, TRUE, 0); } else { - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (hbox), vbox, - FALSE, FALSE, 4); + TRUE, TRUE, 0); } } diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c index ac30e43f..a9375e51 100644 --- a/gui/greeter/greeter_system.c +++ b/gui/greeter/greeter_system.c @@ -14,6 +14,9 @@ #include "gdmwm.h" #include "vicious.h" + +GtkWidget *dialog; + /* doesn't check for executability, just for existance */ static gboolean bin_exists (const char *command) @@ -105,12 +108,6 @@ greeter_config_handler (void) /* we should be now fine for focusing new windows */ gdm_wm_focus_new_windows (TRUE); -#if 0 - /* Taken from gdmlogin, does this apply? */ - /* configure interruption */ - login_entry = FALSE; /* no matter where we are, - this is no longer a login_entry */ -#endif /* configure interruption */ printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_CONFIGURE); fflush (stdout); @@ -213,12 +210,25 @@ greeter_system_append_system_menu (GtkWidget *menu) } } +static gboolean radio_button_press_event(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + if (event->type == GDK_2BUTTON_PRESS) { + gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); + } + return FALSE; +} static void greeter_system_handler (GreeterItemInfo *info, gpointer user_data) { - GtkWidget *dialog; + char *s; + GtkWidget *w = NULL; + GtkWidget *hbox = NULL; + GtkWidget *main_vbox = NULL; + GtkWidget *vbox = NULL; + GtkWidget *cat_vbox = NULL; GtkWidget *group_radio = NULL; GtkWidget *halt_radio = NULL; GtkWidget *suspend_radio = NULL; @@ -237,6 +247,39 @@ greeter_system_handler (GreeterItemInfo *info, dialog = gtk_dialog_new (); if (tooltips == NULL) tooltips = gtk_tooltips_new (); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); + + main_vbox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 5); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + main_vbox, + FALSE, FALSE, 0); + + cat_vbox = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (main_vbox), + cat_vbox, + FALSE, FALSE, 0); + + s = g_strdup_printf ("<b>%s</b>", + _("Choose an Action")); + w = gtk_label_new (s); + gtk_label_set_use_markup (GTK_LABEL (w), TRUE); + g_free (s); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (cat_vbox), w, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (cat_vbox), + hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), + gtk_label_new (" "), + FALSE, FALSE, 0); + vbox = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (hbox), + vbox, + TRUE, TRUE, 0); if (working_command_exists (GdmHalt)) { if (group_radio != NULL) @@ -248,7 +291,9 @@ greeter_system_handler (GreeterItemInfo *info, _("Shut down your computer so that " "you may turn it off."), NULL); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + g_signal_connect(G_OBJECT(halt_radio), "button_press_event", + G_CALLBACK(radio_button_press_event), NULL); + gtk_box_pack_start (GTK_BOX (vbox), halt_radio, FALSE, FALSE, 4); gtk_widget_show (halt_radio); @@ -260,7 +305,9 @@ greeter_system_handler (GreeterItemInfo *info, reboot_radio = gtk_radio_button_new_with_mnemonic (radio_group, _("_Reboot the computer")); group_radio = reboot_radio; - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + g_signal_connect(G_OBJECT(reboot_radio), "button_press_event", + G_CALLBACK(radio_button_press_event), NULL); + gtk_box_pack_start (GTK_BOX (vbox), reboot_radio, FALSE, FALSE, 4); gtk_widget_show (reboot_radio); @@ -272,7 +319,9 @@ greeter_system_handler (GreeterItemInfo *info, suspend_radio = gtk_radio_button_new_with_mnemonic (radio_group, _("Sus_pend the computer")); group_radio = suspend_radio; - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + g_signal_connect(G_OBJECT(suspend_radio), "button_press_event", + G_CALLBACK(radio_button_press_event), NULL); + gtk_box_pack_start (GTK_BOX (vbox), suspend_radio, FALSE, FALSE, 4); gtk_widget_show (suspend_radio); @@ -289,7 +338,9 @@ greeter_system_handler (GreeterItemInfo *info, "you to log into available remote " "machines, if there are any."), NULL); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + g_signal_connect(G_OBJECT(chooser_radio), "button_press_event", + G_CALLBACK(radio_button_press_event), NULL); + gtk_box_pack_start (GTK_BOX (vbox), chooser_radio, FALSE, FALSE, 4); gtk_widget_show (chooser_radio); @@ -306,7 +357,9 @@ greeter_system_handler (GreeterItemInfo *info, _("Configure GDM (this login manager). " "This will require the root password."), NULL); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + g_signal_connect(G_OBJECT(config_radio), "button_press_event", + G_CALLBACK(radio_button_press_event), NULL); + gtk_box_pack_start (GTK_BOX (vbox), config_radio, FALSE, FALSE, 4); gtk_widget_show (config_radio); diff --git a/gui/greeter/themes/circles/circles.xml.in b/gui/greeter/themes/circles/circles.xml.in index 9d51b0ba..49f792b5 100644 --- a/gui/greeter/themes/circles/circles.xml.in +++ b/gui/greeter/themes/circles/circles.xml.in @@ -73,10 +73,10 @@ <prelight color="#666666" font="Sans 14"/> <active color="#ff0000" font="Sans 14"/> <pos y="50%" anchor="w"/> - <!-- Stock label for: S_ystem --> + <!-- Stock label for: _Actions --> <stock type="system"/> <!-- Kept for compatibility with older gdm versions --> - <_text>S_ystem</_text> + <_text>_Actions</_text> </item> </box> </item> diff --git a/gui/greeter/themes/happygnome-list/happygnome.xml.in b/gui/greeter/themes/happygnome-list/happygnome.xml.in index aee2b0ea..266d11f4 100644 --- a/gui/greeter/themes/happygnome-list/happygnome.xml.in +++ b/gui/greeter/themes/happygnome-list/happygnome.xml.in @@ -73,10 +73,10 @@ <prelight color="#666666" font="Sans 14"/> <active color="#ff0000" font="Sans 14"/> <pos y="50%" anchor="w"/> - <!-- Stock label for: S_ystem --> + <!-- Stock label for: _Actions --> <stock type="system"/> <!-- Kept for compatibility with older gdm versions --> - <_text>S_ystem</_text> + <_text>_Actions</_text> </item> </box> </item> diff --git a/gui/greeter/themes/happygnome/happygnome.xml.in b/gui/greeter/themes/happygnome/happygnome.xml.in index fdd70297..711305ac 100644 --- a/gui/greeter/themes/happygnome/happygnome.xml.in +++ b/gui/greeter/themes/happygnome/happygnome.xml.in @@ -73,10 +73,10 @@ <prelight color="#666666" font="Sans 14"/> <active color="#ff0000" font="Sans 14"/> <pos y="50%" anchor="w"/> - <!-- Stock label for: S_ystem --> + <!-- Stock label for: _Actions --> <stock type="system"/> <!-- Kept for compatibility with older gdm versions --> - <_text>S_ystem</_text> + <_text>_Actions</_text> </item> </box> </item> |