Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.4
gdm.import4250
gdm-greeter-greater-ui.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gdm-greeter-greater-ui.patch of Package gdm.import4250
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== --- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c @@ -1044,35 +1044,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } -static void -rotate_computer_info (GdmGreeterLoginWindow *login_window) -{ - GtkWidget *notebook; - int current_page; - int n_pages; - - /* switch page */ - notebook = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-notebook")); - current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); - n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); - - if (current_page + 1 < n_pages) { - gtk_notebook_next_page (GTK_NOTEBOOK (notebook)); - } else { - gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0); - } - -} - -static gboolean -on_computer_info_label_button_press (GtkWidget *widget, - GdkEventButton *event, - GdmGreeterLoginWindow *login_window) -{ - rotate_computer_info (login_window); - return FALSE; -} - static char * file_read_one_line (const char *filename) { @@ -1184,16 +1155,19 @@ create_computer_info (GdmGreeterLoginWin if (strcmp (localhost, "localhost") == 0 || strcmp (localhost, "localhost.localdomain") == 0) { - rotate_computer_info (login_window); + gtk_widget_hide (label); } } label = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-version-label")); if (label != NULL) { char *version; + char *markup; version = get_system_version (); - gtk_label_set_text (GTK_LABEL (label), version); + markup = g_markup_printf_escaped ("<b>%s</b>", version); + gtk_label_set_markup (GTK_LABEL (label), markup); g_free (version); + g_free (markup); } gdm_profile_end (NULL); @@ -1293,9 +1267,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); - box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box")); - g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window); - if (login_window->priv->user_list_disabled) { switch_mode (login_window, MODE_AUTHENTICATION); } else { Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui =================================================================== --- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui +++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui @@ -2,28 +2,29 @@ <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <object class="GtkFrame" id="window-frame"> + <object class="GtkFrame" id="window-frame"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">out</property> + <child> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">out</property> + <property name="border_width">24</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkVBox" id="window-box"> <property name="visible">True</property> - <property name="border_width">24</property> + <property name="orientation">vertical</property> + <property name="spacing">10</property> <child> - <object class="GtkVBox" id="window-box"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="spacing">10</property> + <property name="spacing">12</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkImage" id="logo-image"> <property name="visible">True</property> - <child> - <object class="GtkImage" id="logo-image"> - <property name="visible">True</property> - <property name="pixel_size">64</property> - <property name="icon_name">computer</property> - </object> - </child> + <property name="yalign">0</property> + <property name="pixel_size">48</property> + <property name="icon_name">computer</property> </object> <packing> <property name="expand">False</property> @@ -32,227 +33,103 @@ </packing> </child> <child> - <object class="GtkEventBox" id="computer-info-event-box"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="visible_window">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkNotebook" id="computer-info-notebook"> + <object class="GtkLabel" id="computer-info-version-label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Version</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="computer-info-name-label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Computer Name</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <child> - <object class="GtkLabel" id="computer-info-name-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Computer Name</property> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label">page 5</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="computer-info-version-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Version</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">4</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">5</property> - <property name="tab_fill">False</property> - </packing> - </child> <child> - <placeholder/> - </child> - <child type="tab"> - <object class="GtkLabel" id="label16"> + <object class="GtkLabel" id="auth-banner-label"> <property name="visible">True</property> + <property name="justify">center</property> + <property name="wrap">True</property> </object> - <packing> - <property name="position">6</property> - <property name="tab_fill">False</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> <child> - <object class="GtkLabel" id="auth-banner-label"> - <property name="visible">True</property> - <property name="justify">center</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkVBox" id="selection-box"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">10</property> + <child> + <placeholder/> + </child> <child> - <object class="GtkVBox" id="selection-box"> + <object class="GtkHBox" id="auth-input-box"> <property name="visible">True</property> - <property name="spacing">10</property> + <property name="spacing">6</property> <child> - <placeholder/> - </child> - <child> - <object class="GtkHBox" id="auth-input-box"> + <object class="GtkLabel" id="auth-prompt-label"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="auth-prompt-label"> - <property name="visible">True</property> - - <accessibility> - <relation type="label-for" target="auth-prompt-entry"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="auth-prompt-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="activates_default">True</property> - <accessibility> - <relation type="labelled-by" target="auth-prompt-label"/> - </accessibility> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <accessibility> + <relation type="label-for" target="auth-prompt-entry"/> + </accessibility> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="auth-message-box"> + <object class="GtkEntry" id="auth-prompt-entry"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="auth-message-label"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <accessibility> + <relation type="labelled-by" target="auth-prompt-label"/> + </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> - </object> - </child> - </object> - <packing> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkHButtonBox" id="buttonbox"> - <property name="visible">True</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel-button"> - <property name="label">Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="unlock-button"> - <property name="label" translatable="yes">Unlock</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -261,31 +138,88 @@ </packing> </child> <child> - <object class="GtkButton" id="log-in-button"> - <property name="label" translatable="yes">Login</property> + <object class="GtkHBox" id="auth-message-box"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> + <child> + <object class="GtkLabel" id="auth-message-label"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="buttonbox"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel-button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="unlock-button"> + <property name="label" translatable="yes">Unlock</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="log-in-button"> + <property name="label" translatable="yes">Login</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> </child> </object> </child> </object> + </child> + </object> </interface> Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new =================================================================== --- /dev/null +++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new @@ -0,0 +1,225 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkFrame" id="window-frame"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">out</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="border_width">24</property> + <child> + <object class="GtkVBox" id="window-box"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">10</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="logo-image"> + <property name="visible">True</property> + <property name="yalign">0</property> + <property name="pixel_size">48</property> + <property name="icon_name">computer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="computer-info-version-label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Version</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="computer-info-name-label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Computer Name</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="auth-banner-label"> + <property name="visible">True</property> + <property name="justify">center</property> + <property name="wrap">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="selection-box"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">10</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkHBox" id="auth-input-box"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="auth-prompt-label"> + <property name="visible">True</property> + <accessibility> + <relation type="label-for" target="auth-prompt-entry"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="auth-prompt-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <accessibility> + <relation type="labelled-by" target="auth-prompt-label"/> + </accessibility> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="auth-message-box"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="auth-message-label"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="buttonbox"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel-button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="unlock-button"> + <property name="label" translatable="yes">Unlock</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="log-in-button"> + <property name="label" translatable="yes">Login</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> +</interface>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
