X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fobconf%2Fmain.c;h=f4af5c533cb2eb60d510469c26ca4db5eceef4e8;hb=1ce196c4f3576eaeaf1d23be1a24a5ef98183e38;hp=594a9d6f540b07b96cabdb5a16c358dda8ab9982;hpb=b874b99640b69e084953df0522392dd0f748f553;p=chaz%2Fopenbox

diff --git a/tools/obconf/main.c b/tools/obconf/main.c
index 594a9d6f..f4af5c53 100644
--- a/tools/obconf/main.c
+++ b/tools/obconf/main.c
@@ -11,7 +11,7 @@
 static GtkWidget *mainwin;
 static GtkWidget *mainlist;
 static GtkListStore *mainstore;
-static GtkWidget *mainnote;
+static GtkWidget *mainworkarea;
 static GdkPixbuf *ob_icon;
 
 enum {
@@ -23,7 +23,6 @@ gboolean on_mainwindow_delete_event(GtkWidget *w, GdkEvent *e, gpointer d);
 void on_quit_activate(GtkMenuItem *item, gpointer d);
 void on_applybutton_clicked(GtkButton *but, gpointer d);
 void on_revertbutton_clicked(GtkButton *but, gpointer d);
-void on_helpbutton_clicked(GtkButton *but, gpointer d);
 void on_selection_changed(GtkTreeSelection *selection, gpointer data);
 
 static void obconf_error(GError *e)
@@ -67,7 +66,7 @@ static void load_stock ()
     }
 }
 
-GtkWidget* build_menu(GtkWidget *win, GtkAccelGroup *accel)
+GtkWidget* build_menu(GtkAccelGroup *accel)
 {
     GtkWidget *menu;
     GtkWidget *submenu;
@@ -105,7 +104,7 @@ GtkWidget* build_menu(GtkWidget *win, GtkAccelGroup *accel)
     return menu;
 }
 
-GtkWidget* build_list(GtkWidget *parent, GtkListStore **model)
+GtkWidget* build_list(GtkListStore **model)
 {
     GtkWidget *list;
     GtkListStore *store;
@@ -117,6 +116,7 @@ GtkWidget* build_list(GtkWidget *parent, GtkListStore **model)
                                G_TYPE_STRING);
 
     list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE);
 
     sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
     gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
@@ -138,8 +138,12 @@ int main(int argc, char **argv)
 {
     GtkWidget *menu;
     GtkWidget *vbox;
-    GtkWidget *hbox;
+    GtkWidget *hpane;
     GtkAccelGroup *accel;
+    GtkWidget *sep;
+    GtkWidget *bbox;
+    GtkWidget *but;
+    GtkWidget *bar;
 
     gtk_set_locale();
     gtk_init(&argc, &argv);
@@ -155,20 +159,53 @@ int main(int argc, char **argv)
     accel = gtk_accel_group_new();
     gtk_window_add_accel_group(GTK_WINDOW(mainwin), accel);
 
-    vbox = gtk_vbox_new(FALSE, 3);
+    vbox = gtk_vbox_new(FALSE, 5);
     gtk_container_add(GTK_CONTAINER(mainwin), vbox);
 
     /* Menu */
 
-    menu = build_menu(mainwin, accel);
+    menu = build_menu(accel);
     gtk_box_pack_start(GTK_BOX(vbox), menu, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new(FALSE, 2);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+    hpane = gtk_hpaned_new();
+    gtk_box_pack_start(GTK_BOX(vbox), hpane, TRUE, TRUE, 0);
 
     /* List */
 
-    mainlist = build_list(hbox, &mainstore);
+    mainlist = build_list(&mainstore);
+    gtk_container_add(GTK_CONTAINER(hpane), mainlist);
+
+    /* Main work area */
+
+    mainworkarea = gtk_layout_new(NULL, NULL);
+    gtk_container_add(GTK_CONTAINER(hpane), mainworkarea);
+
+    /* Separator */
+
+    sep = gtk_hseparator_new();
+    gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
+
+    /* Button box */
+
+    bbox = gtk_hbutton_box_new();
+    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+    gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 6);
+    gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+
+    /* Revert Button */
+
+    but = gtk_button_new_with_mnemonic("_Revert");
+    gtk_box_pack_start(GTK_BOX(bbox), but, FALSE, FALSE, 0);
+
+    /* Apply Button */
+
+    but = gtk_button_new_with_mnemonic("_Apply");
+    gtk_box_pack_start(GTK_BOX(bbox), but, FALSE, FALSE, 0);
+
+    /* Status bar */
+
+    bar = gtk_statusbar_new();
+    gtk_box_pack_start(GTK_BOX(vbox), bar, FALSE, FALSE, 0);
 
     gtk_widget_show_all(mainwin);
 
@@ -200,11 +237,6 @@ void on_revertbutton_clicked(GtkButton *but, gpointer d)
     g_message("revert");
 }
 
-void on_helpbutton_clicked(GtkButton *but, gpointer d)
-{
-    g_message("help");
-}
-
 void on_selection_changed(GtkTreeSelection *sel, gpointer data)
 {
     GtkTreeIter iter;