static GtkWidget *mainwin;
static GtkWidget *mainlist;
static GtkListStore *mainstore;
-static GtkWidget *mainnote;
+static GtkWidget *mainworkarea;
static GdkPixbuf *ob_icon;
enum {
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)
}
}
-GtkWidget* build_menu(GtkWidget *win, GtkAccelGroup *accel)
+GtkWidget* build_menu(GtkAccelGroup *accel)
{
GtkWidget *menu;
GtkWidget *submenu;
return menu;
}
-GtkWidget* build_list(GtkWidget *parent, GtkListStore **model)
+GtkWidget* build_list(GtkListStore **model)
{
GtkWidget *list;
GtkListStore *store;
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);
{
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);
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);
g_message("revert");
}
-void on_helpbutton_clicked(GtkButton *but, gpointer d)
-{
- g_message("help");
-}
-
void on_selection_changed(GtkTreeSelection *sel, gpointer data)
{
GtkTreeIter iter;