[Ayttm-commits] CVS: ayttm/src prefs.c,1.2,1.3

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv29919/src

Modified Files:
        prefs.c 
Log Message:
more prefs cleaning


Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prefs.c     27 Dec 2002 16:46:52 -0000      1.2
+++ prefs.c     29 Dec 2002 10:22:34 -0000      1.3
@@ -224,6 +224,7 @@
  *
  */
 
+static GtkWidget *plugin_prefs_win;
 static GtkWidget * length_contact_window_entry = NULL;
 static GtkWidget * font_size_entry = NULL;
 static GtkWidget * alternate_browser_entry = NULL;
@@ -334,7 +335,7 @@
 
     gtk_box_pack_start(GTK_BOX(hbox), alternate_browser_entry, TRUE, TRUE, 10);
     gtk_widget_show(alternate_browser_entry);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 10);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
     gtk_widget_show(hbox);
 
     gtk_widget_show(vbox);
@@ -1114,7 +1115,7 @@
      gtk_entry_set_text(GTK_ENTRY(local_encoding_entry), 
cGetLocalPref("local_encoding"));
      gtk_box_pack_start(GTK_BOX(hbox), local_encoding_entry, TRUE, TRUE, 10);
      gtk_widget_show(local_encoding_entry);
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 10);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
      gtk_widget_show(hbox);
 
 
@@ -1128,7 +1129,7 @@
      gtk_widget_show(remote_encoding_entry);
      gtk_widget_show(hbox);
 
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 10);
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Recoding")));
      gtk_widget_show(vbox);
 
@@ -1416,6 +1417,7 @@
 {
        eb_debug(DBG_MOD, "updating prefs\n");
        eb_input_accept(prefs);
+       gtk_widget_hide(plugin_prefs_win);
 }
 
 /* Sort the clist based upon the column passed */
@@ -1493,6 +1495,7 @@
                /* If the window already has a child, destroy it. */
                if(GTK_BIN(plugin_prefs_w)->child!=NULL)
                {
+                       gtk_widget_hide(plugin_prefs_win);
                        gtk_widget_destroy(GTK_BIN(plugin_prefs_w)->child);
                }
 
@@ -1514,9 +1517,9 @@
                        gtk_scrolled_window_add_with_viewport
                                (GTK_SCROLLED_WINDOW(plugin_prefs_w),
                                vbox);
-//                     gtk_container_add(GTK_CONTAINER(plugin_prefs_w), vbox);
                        gtk_widget_show(vbox);
                        gtk_widget_show(plugin_prefs_w);
+                       gtk_widget_show(plugin_prefs_win);
                }
                else
                        eb_debug(DBG_MOD, "No prefs defined for %s\n", 
plugin_path);
@@ -1596,18 +1599,20 @@
        gtk_signal_connect(GTK_OBJECT(module_list), "select-row",
                        GTK_SIGNAL_FUNC(plugin_selected), NULL);
 
-       label = gtk_label_new(_("Plugin Prefs"));
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
-       w=gtk_scrolled_window_new(NULL, NULL);
+       w=gtk_scrolled_window_new(NULL,NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w),
                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_usize(w, 0, 100);
+       gtk_widget_set_usize(w, 300, 300);
        gtk_widget_show(w);
        SetPref("widget::plugin_prefs_w", w);
-       gtk_box_pack_start(GTK_BOX(vbox), w, TRUE, TRUE, 10);
-
-        
+       /*gtk_box_pack_start(GTK_BOX(vbox), w, TRUE, TRUE, 10);*/
+       plugin_prefs_win = gtk_window_new(GTK_WINDOW_DIALOG);
+       gtk_window_set_position(GTK_WINDOW(plugin_prefs_win), 
GTK_WIN_POS_MOUSE);
+       gtk_window_set_title(GTK_WINDOW(plugin_prefs_win), _("Plugin 
preferences"));
+       gtk_container_add(GTK_CONTAINER(plugin_prefs_win), w);
+       gtk_widget_hide(plugin_prefs_win);
+       
        gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Modules")));
        gtk_widget_show(vbox);
        gtk_widget_show(GTK_WIDGET(module_list));