added --gui-type=settings-paned, settings-notebook, settings-menu

src/main.c

@@ -338,7 +338,7 @@ create_layout (GtkWidget *dlg)
         gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 2);
       if (text)
         gtk_box_pack_start (GTK_BOX (box), text, TRUE, TRUE, 2);
-        gtk_box_pack_start (GTK_BOX (layout), box, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (layout), box, FALSE, FALSE, options.data.gui_type_height);
       if (imw)
         {
           if (options.mode == YAD_MODE_ENTRY)
@@ -364,33 +364,45 @@ create_layout (GtkWidget *dlg)
         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
         if (text)
-          gtk_box_pack_start (GTK_BOX (box), text, FALSE, FALSE, 0);
+          gtk_box_pack_start (GTK_BOX (box), text, FALSE, FALSE, 2);
         if (imw)
           gtk_box_pack_start (GTK_BOX (box), imw, TRUE, TRUE, 0);
         if (image)
-          gtk_box_pack_start (GTK_BOX (layout), image, FALSE, FALSE, 0);
+          gtk_box_pack_start (GTK_BOX (layout), image, FALSE, FALSE, 2);
           gtk_box_pack_start (GTK_BOX (layout), box, TRUE, TRUE, 0);
         break;
-      case YAD_GUI_DIALOG:
+      case YAD_GUI_SETTINGS_PANED:
         layout = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
 
         if (image)
           gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 2);
         if (text)
-          gtk_box_pack_start (GTK_BOX (box), text, FALSE, FALSE, 2);
-          gtk_box_pack_start (GTK_BOX (layout), box, TRUE, FALSE, 0);
+          gtk_box_pack_start (GTK_BOX (box), text, TRUE, TRUE, 2);
+          gtk_box_pack_start (GTK_BOX (layout), box, FALSE, FALSE, options.data.gui_type_height);
         if (imw)
-          gtk_box_pack_start (GTK_BOX (box), imw, TRUE, TRUE, 0);
+            gtk_box_pack_start (GTK_BOX (box), imw, TRUE, TRUE, options.data.gui_type_width);
+        break;
+      case YAD_GUI_SETTINGS_NOTEBOOK:
+        layout = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+        box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+
+        if (image)
+          gtk_box_pack_start (GTK_BOX (layout), image, FALSE, FALSE, 2);
+        if (text)
+          gtk_box_pack_start (GTK_BOX (layout), text, FALSE, FALSE, 2);
+          gtk_box_pack_start (GTK_BOX (layout), box, FALSE, FALSE, options.data.gui_type_width);
+        if (imw)
+          gtk_box_pack_start (GTK_BOX (box), imw, TRUE, TRUE, options.data.gui_type_height);
         break;
-      case YAD_GUI_SETTINGS:
+      case YAD_GUI_SETTINGS_MENU:
         layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
         if (image)
-          gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
+          gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 2);
         if (text)
-          gtk_box_pack_start (GTK_BOX (box), text, TRUE, TRUE, 0);
+          gtk_box_pack_start (GTK_BOX (box), text, TRUE, TRUE, 2);
           gtk_box_pack_start (GTK_BOX (layout), box, TRUE, TRUE, options.data.gui_type_width);
         if (imw)
           gtk_box_pack_start (GTK_BOX (box), imw, TRUE, TRUE, options.data.gui_type_height);

src/option.c

@@ -99,10 +99,12 @@ set_gui_type (const gchar * option_name, const gchar * value, gpointer data, GEr
     options.data.gui_type = YAD_GUI_START;
   else if (strcasecmp (value, "start-old") == 0)
     options.data.gui_type = YAD_GUI_START_OLD;
-  else if (strcasecmp (value, "dialog") == 0)
-    options.data.gui_type = YAD_GUI_DIALOG;
-  else if (strcasecmp (value, "settings") == 0)
-    options.data.gui_type = YAD_GUI_SETTINGS;
+  else if (strcasecmp (value, "settings-paned") == 0)
+    options.data.gui_type = YAD_GUI_SETTINGS_PANED;
+  else if (strcasecmp (value, "settings-notebook") == 0)
+    options.data.gui_type = YAD_GUI_SETTINGS_NOTEBOOK;
+  else if (strcasecmp (value, "settings-menu") == 0)
+    options.data.gui_type = YAD_GUI_SETTINGS_MENU;
   else
     g_printerr (_("Unknown gui type: %s\n"), value);
 

src/yad.h

@@ -203,8 +203,9 @@ typedef enum {
   YAD_GUI_NORMAL,
   YAD_GUI_START,
   YAD_GUI_START_OLD,
-  YAD_GUI_SETTINGS,
-  YAD_GUI_DIALOG,
+  YAD_GUI_SETTINGS_PANED,
+  YAD_GUI_SETTINGS_NOTEBOOK,
+  YAD_GUI_SETTINGS_MENU,
 } YadGuiType;
 
 typedef struct {