applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the glade file look a little bit better, hide the property widgets

Browse source 
2002-05-10  Seth Nickell  <snickell@stanford.edu>

	* gnome-window-properties.c: (set_wm_change_pending),
	(state_changed), (create_dialog):
	* gnome-window-properties.glade:

	Make the glade file look a little bit better, hide the property widgets when
	there is a window manager change pending.
This commit is contained in:
Seth Nickell 2002-05-11 04:48:16 +00:00 • committed by Seth Nickell
parent ad15ad16c9
commit 0410c11e51
3 changed files with 88 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
capplets/windows/ChangeLog
View file

@ -1,3 +1,12 @@
2002-05-10 Seth Nickell <snickell@stanford.edu>
* gnome-window-properties.c: (set_wm_change_pending),
(state_changed), (create_dialog):
* gnome-window-properties.glade:
Make the glade file look a little bit better, hide the property widgets when
there is a window manager change pending.
2002-05-10 Seth Nickell <snickell@stanford.edu> 2002-05-10 Seth Nickell <snickell@stanford.edu>
* .cvsignore: * .cvsignore:

15
capplets/windows/gnome-window-properties.c
View file

@ -38,6 +38,7 @@ typedef struct {
static GtkWidget *capplet; static GtkWidget *capplet;
static GtkWidget *wm_widget; static GtkWidget *wm_widget;
static GtkWidget *apply_now_button; static GtkWidget *apply_now_button;
static GtkWidget *properties_box;
static WindowManager *selected_wm = NULL; static WindowManager *selected_wm = NULL;
@ -191,6 +192,13 @@ wm_widget_add_wm (WindowManager *wm, const char *row_text)
gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), 0); gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), 0);
} }
static void
set_wm_change_pending (gboolean pending)
{
gtk_widget_set_sensitive (apply_now_button, pending);
gtk_widget_set_sensitive (properties_box, !pending);
}
static void static void
response_cb (GtkDialog *dialog, gint response_id, gpointer data) response_cb (GtkDialog *dialog, gint response_id, gpointer data)
{ {
@ -206,7 +214,7 @@ response_cb (GtkDialog *dialog, gint response_id, gpointer data)
static void static void
state_changed (void) state_changed (void)
{ {
gtk_widget_set_sensitive (apply_now_button, TRUE); set_wm_change_pending (TRUE);
} }
static void static void
@ -725,9 +733,12 @@ create_dialog (void)
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-window-properties.glade", "prefs_widget", NULL); dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-window-properties.glade", "prefs_widget", NULL);
apply_now_button = WID ("apply_now_button"); apply_now_button = WID ("apply_now_button");
gtk_widget_set_sensitive (apply_now_button, FALSE);
g_signal_connect (G_OBJECT (apply_now_button), "clicked", apply_wm, NULL); g_signal_connect (G_OBJECT (apply_now_button), "clicked", apply_wm, NULL);
properties_box = WID ("properties_box");
set_wm_change_pending (FALSE);
wm_widget = wm_widget_new (); wm_widget = wm_widget_new ();
gtk_box_pack_start (GTK_BOX (WID ("wm_widget_box")), wm_widget, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (WID ("wm_widget_box")), wm_widget, TRUE, TRUE, 0);

141
capplets/windows/gnome-window-properties.glade
View file

@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface> <glade-interface>
<requires lib="gnome"/>
<widget class="GtkWindow" id="window1"> <widget class="GtkWindow" id="window1">
<property name="visible">True</property> <property name="visible">True</property>
@ -14,7 +15,7 @@
<child> <child>
<widget class="GtkVBox" id="prefs_widget"> <widget class="GtkVBox" id="prefs_widget">
<property name="border_width">10</property> <property name="border_width">9</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
@ -23,13 +24,13 @@
<widget class="GtkHBox" id="hbox1"> <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">9</property>
<child> <child>
<widget class="GtkHBox" id="hbox4"> <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">3</property>
<child> <child>
<widget class="GtkLabel" id="label1"> <widget class="GtkLabel" id="label1">
@ -110,34 +111,37 @@
</child> </child>
<child> <child>
<widget class="GtkVBox" id="vbox2"> <widget class="GtkVBox" id="properties_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">10</property> <property name="spacing">9</property>
<child> <child>
<widget class="GtkHBox" id="hbox3"> <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">5</property> <property name="spacing">3</property>
<child> <child>
<widget class="GtkFrame" id="frame1"> <widget class="GtkVBox" id="vbox6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0</property> <property name="homogeneous">False</property>
<property name="label_yalign">0.5</property> <property name="spacing">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkImage" id="image1"> <widget class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0.5</property> <property name="label" translatable="yes">Window Border Appearance</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
</widget> </widget>
</child>
</widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
@ -145,77 +149,68 @@
</packing> </packing>
</child> </child>
<child>
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkOptionMenu" id="optionmenu2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">-1</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkOptionMenu" id="optionmenu3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">-1</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkOptionMenu" id="optionmenu4"> <widget class="GtkOptionMenu" id="optionmenu4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="history">-1</property> <property name="history">-1</property>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Titlebar Font</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GnomeFontPicker" id="fontpicker1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
<property name="show_size">True</property>
<property name="use_font_in_label">True</property>
<property name="label_font_size">14</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>