Commit 4578e198 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Added new "options_button" which pops up the F10 menu. Modified themes to

2006-01-30  Brian Cameron  <brian.cameron@sun.com>

        * gui/greeter/themes/happygnome/disconnect.png,
          gui/greeter/themes/happygnome/options.png,
          gui/greeter/themes/happygnome/sessions.png,
          gui/greeter/themes/happygnome/system.png,
          gui/greeter/themes/happygnome/happygnome.xml,
          gui/greeter/themes/happygnome-list/disconnect.png,
          gui/greeter/themes/happygnome-list/options.png,
          gui/greeter/themes/happygnome-list/sessions.png,
          gui/greeter/themes/happygnome-list/system.png,
          gui/greeter/themes/happygnome-list/happygnome.xml,
          gui/greeter/themes/circles/Makefile.am,
          gui/greeter/themes/circles/circles.xml,
          gui/greeter/greeter_canvas_item.c,
          gui/greeter/greeter_parser.c, gui/gdmlogin.c,
          docs/C/gdm.xml:  Added new "options_button" which pops up
          the F10 menu.  Modified themes to now use the new options
          button for a cleaner one-button look.  Patch provied by
          Sebastien Bacher <seb128@debian.org>.  Modifications to
          existing themes made by myself.  Also modified string
          "Remote login via XDMCP" to "Remote Login via XDMCP".
parent 476f15ff
......@@ -5712,7 +5712,7 @@ homogeneous=&quot;bool&quot;&gt;
<filename>caps-lock-warning</filename>, _(&quot;Caps Lock key is on.&quot;
</para>
<para>
<filename>chooser</filename>, _(&quot;Remote login via _XDMCP&quot;
<filename>chooser</filename>, _(&quot;Remote Login via _XDMCP&quot;
</para>
<para>
<filename>config</filename>, _(&quot;_Configure&quot;
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-27 13:17-0800\n"
"POT-Creation-Date: 2006-01-30 11:17-0800\n"
"PO-Revision-Date: 2006-01-22 13:10+0100\n"
"Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
"Language-Team: Spanish <traductores@es.gnome.org>\n"
......@@ -7292,7 +7292,7 @@ msgstr ""
#: ../C/gdm.xml:5714 (para)
#, fuzzy
msgid "<filename>chooser</filename>, _(\"Remote login via _XDMCP\""
msgid "<filename>chooser</filename>, _(\"Remote Login via _XDMCP\""
msgstr "<filename>chooser</filename>, _(\"Selector _XDMCP\""
#: ../C/gdm.xml:5717 (para)
......
......@@ -3107,7 +3107,7 @@ homogeneous="bool"&gt;
<para><filename>cancel</filename>, _("_Cancelar"</para>
<para><filename>caps-lock-warning</filename>, _("La tecla BloqMayús está activada."</para>
<para><filename>chooser</filename>, _("Remote login via _XDMCP"</para>
<para><filename>chooser</filename>, _("Remote Login via _XDMCP"</para>
<para><filename>config</filename>, _("_Configurar"</para>
<para><filename>disconnect</filename>, _("D_esconectar"</para>
<para><filename>halt</filename>, _("_Apagar")</para>
......
......@@ -2470,7 +2470,7 @@ gdm_login_gui_init (void)
menu = gtk_menu_new ();
if (gdm_config_get_bool (GDM_KEY_CHOOSER_BUTTON)) {
item = gtk_menu_item_new_with_mnemonic (_("Remote login via _XDMCP..."));
item = gtk_menu_item_new_with_mnemonic (_("Remote Login via _XDMCP..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (gdm_login_use_chooser_handler),
......
......@@ -193,6 +193,31 @@ get_gdk_color_from_rgb (GdkColor *c, guint32 rgb)
c->pixel = 0;
}
static void
menu_position_func (GtkMenu *menu,
int *x,
int *y,
gboolean *push_in,
GreeterItemInfo *item)
{
GtkAllocation rect;
GtkRequisition requisition;
rect = item->allocation;
gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
*x = rect.x;
*y = rect.y - requisition.height;
*push_in = TRUE;
}
static void
greeter_options_handler (GreeterItemInfo *item, GtkWidget *menubar)
{
gtk_menu_popup (GTK_MENU(gtk_menu_item_get_submenu(gtk_container_get_children(GTK_CONTAINER(menubar))->data)),
NULL, NULL, (GtkMenuPositionFunc)menu_position_func,
item, 0, gtk_get_current_event_time());
}
void
greeter_item_create_canvas_item (GreeterItemInfo *item)
{
......@@ -387,7 +412,11 @@ greeter_item_create_canvas_item (GreeterItemInfo *item)
"height", (double)rect.height,
"width", (double)rect.width,
NULL);
greeter_item_register_action_callback ("options_button",
(ActionFunc)greeter_options_handler,
menubar);
/* Here add a tooltip, so that the user knows about F10 */
tooltips = gtk_tooltips_new ();
gtk_tooltips_set_tip (tooltips, GTK_WIDGET (entry),
......
......@@ -1088,12 +1088,17 @@ parse_stock (xmlNodePtr node,
else if (g_ascii_strcasecmp ((char *) prop, "chooser") == 0)
{
g_free (*translated_text);
*translated_text = g_strdup (_("Remote login via _XDMCP"));
*translated_text = g_strdup (_("Remote Login via _XDMCP"));
}
else if (g_ascii_strcasecmp ((char *) prop, "config") == 0)
{
g_free (*translated_text);
*translated_text = g_strdup (_("_Configure"));
*translated_text = g_strdup (_("Confi_gure"));
}
else if (g_ascii_strcasecmp ((char *) prop, "options") == 0)
{
g_free (*translated_text);
*translated_text = g_strdup (_("Op_tions"));
}
else if (g_ascii_strcasecmp ((char *) prop, "caps-lock-warning") == 0)
{
......
......@@ -150,7 +150,7 @@ greeter_system_append_system_menu (GtkWidget *menu)
tooltips = gtk_tooltips_new ();
if (gdm_config_get_bool (GDM_KEY_CHOOSER_BUTTON)) {
w = gtk_menu_item_new_with_mnemonic (_("Remote login via _XDMCP..."));
w = gtk_menu_item_new_with_mnemonic (_("Remote Login via _XDMCP..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
gtk_widget_show (GTK_WIDGET (w));
g_signal_connect (G_OBJECT (w), "activate",
......@@ -165,7 +165,7 @@ greeter_system_append_system_menu (GtkWidget *menu)
if (gdm_config_get_bool (GDM_KEY_CONFIG_AVAILABLE) &&
bin_exists (gdm_config_get_string (GDM_KEY_CONFIGURATOR))) {
w = gtk_menu_item_new_with_mnemonic (_("_Configure Login Manager..."));
w = gtk_menu_item_new_with_mnemonic (_("Confi_gure Login Manager..."));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
gtk_widget_show (GTK_WIDGET (w));
g_signal_connect (G_OBJECT (w), "activate",
......
......@@ -16,4 +16,4 @@ circles_in_files = \
EXTRA_DIST = $(circles_DATA) $(circles_in_files)
clean-local:
rm -f GdmGreeterTheme.desktop
/bin/rm -f GdmGreeterTheme.desktop
......@@ -13,7 +13,7 @@
<normal color="#ffffff"/>
<pos x="0" y="4" width="100%" height="100%"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="rect" id="language_button" button="true">
<item type="rect" id="options_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
......@@ -28,80 +28,8 @@
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Language -->
<stock type="language"/>
</item>
</box>
</item>
<item type="rect" id="session_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="help.png" tint="#dddddd"/>
<prelight file="help.png"/>
<active file="help.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Session -->
<stock type="session"/>
</item>
</box>
</item>
<item type="rect" id="system_button" button="true">
<normal color="#ffffff"/>
<show modes="console" type="system"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="options.png" tint="#dddddd"/>
<prelight file="options.png"/>
<active file="options.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Actions -->
<stock type="system"/>
</item>
</box>
</item>
<item type="rect" id="disconnect_button" button="true">
<normal color="#ffffff"/>
<show modes="flexi,remote"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="options.png" tint="#dddddd"/>
<prelight file="options.png"/>
<active file="options.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: D_isconnect -->
<stock type="disconnect"/>
<show modes="remote"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Quit -->
<stock type="quit"/>
<show modes="flexi"/>
<!-- Stock label for: _Options -->
<stock type="options"/>
</item>
</box>
</item>
......
......@@ -3,12 +3,9 @@ happygnome_DATA = \
GdmGreeterTheme.desktop \
happygnome.xml \
background.svg \
disconnect.png \
gnome-logo.png \
options.png \
screenshot.png \
session.png \
system.png
screenshot.png
happygnome_in_files = \
GdmGreeterTheme.desktop.in
......@@ -19,4 +16,3 @@ EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
clean-local:
/bin/rm -f GdmGreeterTheme.desktop
......@@ -13,7 +13,7 @@
<normal color="#ffffff"/>
<pos x="0" y="4" width="100%" height="100%"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="rect" id="language_button" button="true">
<item type="rect" id="options_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
......@@ -28,80 +28,8 @@
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Language -->
<stock type="language"/>
</item>
</box>
</item>
<item type="rect" id="session_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="session.png" tint="#dddddd"/>
<prelight file="session.png"/>
<active file="session.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Session -->
<stock type="session"/>
</item>
</box>
</item>
<item type="rect" id="system_button" button="true">
<normal color="#ffffff"/>
<show modes="console" type="system"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="system.png" tint="#dddddd"/>
<prelight file="system.png"/>
<active file="system.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Actions -->
<stock type="system"/>
</item>
</box>
</item>
<item type="rect" id="disconnect_button" button="true">
<normal color="#ffffff"/>
<show modes="flexi,remote"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="disconnect.png" tint="#dddddd"/>
<prelight file="disconnect.png"/>
<active file="disconnect.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: D_isconnect -->
<stock type="disconnect"/>
<show modes="remote"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Quit -->
<stock type="quit"/>
<show modes="flexi"/>
<!-- Stock label for: _Options -->
<stock type="options"/>
</item>
</box>
</item>
......
......@@ -3,12 +3,9 @@ happygnome_DATA = \
GdmGreeterTheme.desktop \
happygnome.xml \
background.svg \
disconnect.png \
gnome-logo.png \
options.png \
screenshot.png \
session.png \
system.png
screenshot.png
happygnome_in_files = \
GdmGreeterTheme.desktop.in
......@@ -18,4 +15,4 @@ happygnome_in_files = \
EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
clean-local:
rm -f GdmGreeterTheme.desktop
/bin/rm -f GdmGreeterTheme.desktop
......@@ -13,7 +13,7 @@
<normal color="#ffffff"/>
<pos x="0" y="4" width="100%" height="100%"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="rect" id="language_button" button="true">
<item type="rect" id="options_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
......@@ -28,80 +28,8 @@
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Language -->
<stock type="language"/>
</item>
</box>
</item>
<item type="rect" id="session_button" button="true">
<normal color="#ffffff"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="session.png" tint="#dddddd"/>
<prelight file="session.png"/>
<active file="session.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Session -->
<stock type="session"/>
</item>
</box>
</item>
<item type="rect" id="system_button" button="true">
<normal color="#ffffff"/>
<show modes="console" type="system"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="system.png" tint="#dddddd"/>
<prelight file="system.png"/>
<active file="system.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Actions -->
<stock type="system"/>
</item>
</box>
</item>
<item type="rect" id="disconnect_button" button="true">
<normal color="#ffffff"/>
<show modes="flexi,remote"/>
<pos y="50%" anchor="w" width="box" height="box"/>
<box orientation="horizontal" spacing="10" xpadding="10">
<item type="pixmap">
<normal file="disconnect.png" tint="#dddddd"/>
<prelight file="disconnect.png"/>
<active file="disconnect.png" tint="#ff0000"/>
<pos y="50%" anchor="w"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: D_isconnect -->
<stock type="disconnect"/>
<show modes="remote"/>
</item>
<item type="label">
<normal color="#000000" font="Sans 12"/>
<prelight color="#666666" font="Sans 12"/>
<active color="#ff0000" font="Sans 12"/>
<pos y="50%" anchor="w"/>
<!-- Stock label for: _Quit -->
<stock type="quit"/>
<show modes="flexi"/>
<!-- Stock label for: _Options -->
<stock type="options"/>
</item>
</box>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment