Merge lp:~samuelbf/ltsp/menu-flat into lp:ltsp/ldm

[SamuelBF]

In LDM, adding an option to have options (host, language, session ...) in one line rather than under a menu "preferences".

The name of the option is LDM_MENU_FLAT in lts.conf.

Unmerged revisions

1601. By Samuel Bizien-Filippi <email address hidden> on 2018-06-29

Adding an option to replace the "Preferences" menu by list of buttons.
The option is LDM_MENU_FLAT

=== modified file 'gtkgreet/greeter.c'
--- gtkgreet/greeter.c	2017-06-16 13:30:25 +0000
+++ gtkgreet/greeter.c	2018-06-29 09:32:31 +0000
@@ -583,6 +583,110 @@
     return;
 }
 
+GtkWidget *button_with_icon(char *label, char *iconsrc, GCallback callback, gpointer data)
+{
+    GtkWidget *button, *icon;
+
+    button = gtk_button_new_with_mnemonic(_(label));
+    icon = gtk_image_new_from_file(ldm_theme_file(iconsrc));
+    gtk_button_set_image((GtkButton *) button, icon);
+
+    gtk_button_set_relief((GtkButton *) button, GTK_RELIEF_NONE);
+    gtk_button_set_focus_on_click((GtkButton *) button, FALSE);
+
+    g_signal_connect(G_OBJECT(button), "clicked",
+                     callback, data);
+
+    return button;
+}
+
+static void draw_flatmenu(GtkWidget *BottomBarBox, GtkWidget *window)
+{
+    GtkWidget *lang_button, *sess_button, *host_button, *custom_button,
+        *halt_button, *reboot_button;
+    gchar custom_env_var[20], *custom_mnemonic, *custom_command;
+    int i;
+
+    if (getenv("LDM_FORCE_LANGUAGE") == NULL) {
+        lang_button = button_with_icon("Select _Language ...", "language",
+                                       G_CALLBACK(langwin), window);
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(lang_button), FALSE, FALSE, 5);
+    }
+
+    if (getenv("LDM_FORCE_SESSION") == NULL) {
+        sess_button = button_with_icon("Select _Session ...", "session",
+                                       G_CALLBACK(sesswin), window);
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(sess_button), FALSE, FALSE, 5);
+    }
+
+    if (ldminfo_size() > 1) {
+        host_button = button_with_icon("Select _Host ...", "host",
+                                       G_CALLBACK(hostwin), window);
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(host_button), FALSE, FALSE, 5);
+    }
+
+    for (i = 0; i <= 9; i++) {
+        g_sprintf(custom_env_var, "LDM_MENU_ITEM_%d", i);
+        custom_mnemonic = getenv(custom_env_var);
+        if (custom_mnemonic == NULL) {
+            continue;
+        }
+        g_sprintf(custom_env_var, "LDM_MENU_COMMAND_%d", i);
+        custom_command = getenv(custom_env_var);
+        if (custom_command == NULL) {
+            continue;
+        }
+        custom_button = button_with_icon(custom_mnemonic, "backend",
+                                         G_CALLBACK(spawn_command), g_strdup(custom_command));
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(custom_button), FALSE, FALSE, 5);
+    }
+
+    reboot_button = button_with_icon("_Reboot", "reboot",
+                                     G_CALLBACK(spawn_command), "/sbin/reboot");
+    gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                       GTK_WIDGET(reboot_button), FALSE, FALSE, 5);
+
+    halt_button = button_with_icon("Shut_down", "shutdown",
+                                   G_CALLBACK(spawn_command), "/sbin/poweroff");
+    gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                       GTK_WIDGET(halt_button), FALSE, FALSE, 5);
+
+    return;
+}
+
+/*
+ * draw_prefbutton : add a button "Preferences" poping up menu to bottombarbox.
+ * (alternative to draw_flatmenu)
+ */
+static void draw_prefbutton(GtkWidget *BottomBarBox, GtkWidget *window)
+{
+    GtkWidget *optionbutton;
+    GtkWidget *optionbutton_box, *optionbutton_spacer;
+
+    optionbutton = button_with_icon("_Preferences", "preferences", G_CALLBACK(popup_menu), window);
+
+#ifndef K12LINUX
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
+#else
+        optionbutton_box = gtk_vbox_new(FALSE, 0);
+        optionbutton_spacer = gtk_label_new("");
+        gtk_box_pack_start(GTK_BOX(optionbutton_box),
+                           GTK_WIDGET(optionbutton_spacer), TRUE, FALSE,
+                           0);
+        gtk_box_pack_end(GTK_BOX(optionbutton_box),
+                         GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
+        gtk_box_pack_start(GTK_BOX(BottomBarBox),
+                           GTK_WIDGET(optionbutton_box), FALSE, FALSE, 5);
+#endif
+
+    return;
+}
+
 /*
  * scopy()
  *
@@ -634,8 +738,6 @@
     GtkWidget *logo, *EntryBox;
     GtkWidget *timeoutspacer1, *timeoutspacer2, *timeoutlabel;
     GtkWidget *entryspacer1, *entryspacer2;
-    GtkWidget *optionico;
-    GtkWidget *optionbutton;
     GdkWindow *root;
     GdkPixbuf *pix;
     gint width, height;
@@ -708,21 +810,6 @@
     /**** Create the login window ****/
     loginWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-    /* Create the options button */
-    {
-
-
-        optionbutton = gtk_button_new_with_mnemonic(_("_Preferences"));
-        optionico = gtk_image_new_from_file(ldm_theme_file("preferences"));
-        gtk_button_set_image((GtkButton *) optionbutton, optionico);
-
-        gtk_button_set_relief((GtkButton *) optionbutton, GTK_RELIEF_NONE);
-        gtk_button_set_focus_on_click((GtkButton *) optionbutton, FALSE);
-
-        g_signal_connect(G_OBJECT(optionbutton), "clicked",
-                         G_CALLBACK(popup_menu), loginWindow);
-    }
-
     /**** Create the login window ****/
     {
         GtkWidget *guestbox, *guestspacer1, *guestspacer2, *vbox, *vbox2,
@@ -762,8 +849,8 @@
 
         UserPrompt = gtk_label_new("");
 
-        if (lw < 180)
-            lw = 180;
+        if (lw < 360)
+            lw = 360;
 
         gtk_misc_set_alignment((GtkMisc *) UserPrompt, 1, 0.5);
         gtk_widget_set_size_request(UserPrompt, (lw / 2), 0);
@@ -859,26 +946,20 @@
         gtk_widget_set_size_request(prefBar, width, BOTTOM_BAR_HEIGHT);
 
         BottomBarBox = gtk_hbox_new(FALSE, 0);
+
+        if (ldm_getenv_bool("LDM_MENU_FLAT")) {
+            draw_flatmenu(BottomBarBox, loginWindow);
+        } else {
+            draw_prefbutton(BottomBarBox, loginWindow);
+        }
+
 #ifndef K12LINUX
-        gtk_box_pack_start(GTK_BOX(BottomBarBox),
-                           GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
-
         gtk_box_pack_end(GTK_BOX(BottomBarBox),
                          GTK_WIDGET(timelabel), FALSE, FALSE, 5);
 
         gtk_box_pack_end(GTK_BOX(BottomBarBox),
                          GTK_WIDGET(syslabel), FALSE, FALSE, 0);
 #else
-        optionbutton_box = gtk_vbox_new(FALSE, 0);
-        optionbutton_spacer = gtk_label_new("");
-        gtk_box_pack_start(GTK_BOX(optionbutton_box),
-                           GTK_WIDGET(optionbutton_spacer), TRUE, FALSE,
-                           0);
-        gtk_box_pack_end(GTK_BOX(optionbutton_box),
-                         GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
-        gtk_box_pack_start(GTK_BOX(BottomBarBox),
-                           GTK_WIDGET(optionbutton_box), FALSE, FALSE, 5);
-
         if (has_bottom_right_image == TRUE) {
             bottom_right_box = gtk_vbox_new(FALSE, 0);
             bottom_right_spacer = gtk_label_new("");