Commit e2d1167d authored by Glynn Foster's avatar Glynn Foster Committed by Glynn Foster

basep-widget.c, gnome-panel-properties.c, Remove 'hide_panel_frame' which

2001-10-19  Glynn Foster  <glynn.foster@sun.com>

	* basep-widget.c, gnome-panel-properties.c,
	* panel_config_global.h, session.c: Remove
	'hide_panel_frame' which now defaults to FALSE. So whether
	buttons are flush with the panel depends on background type
	only. Another useless property best removed :)
parent d1ed24c6
2001-10-19 Glynn Foster <glynn.foster@sun.com>
* basep-widget.c, gnome-panel-properties.c,
* panel_config_global.h, session.c: Remove
'hide_panel_frame' which now defaults to FALSE. So whether
buttons are flush with the panel depends on background type
only. Another useless property best removed :)
2001-10-19 Mark McLoughlin <mark@skynet.ie>
* menu.c: (create_menu_at_fr), (create_desktop_menu),
......
......@@ -1179,8 +1179,7 @@ basep_widget_update_winhints (BasePWidget *basep)
void
basep_update_frame (BasePWidget *basep)
{
gboolean hide_frame = global_config.hide_panel_frame ||
PANEL_WIDGET (basep->panel)->back_type == PANEL_BACK_PIXMAP;
gboolean hide_frame = PANEL_WIDGET (basep->panel)->back_type == PANEL_BACK_PIXMAP;
if (hide_frame && GTK_WIDGET_VISIBLE (basep->frame)) {
gtk_widget_show (basep->innerebox);
......@@ -1334,7 +1333,7 @@ basep_widget_construct (BasePWidget *basep,
gtk_widget_show(basep->panel);
if(back_type != PANEL_BACK_PIXMAP && !global_config.hide_panel_frame) {
if(back_type != PANEL_BACK_PIXMAP) {
gtk_widget_show(basep->frame);
gtk_container_add(GTK_CONTAINER(basep->frame),basep->panel);
} else {
......
......@@ -79,7 +79,6 @@ static GtkAdjustment *tile_depth[LAST_TILE];
static GtkWidget *entry_up[LAST_TILE];
static GtkWidget *entry_down[LAST_TILE];
static GtkWidget *hide_panel_frame_cb;
static GtkWidget *tile_when_over_cb;
static GtkWidget *saturate_when_over_cb;
......@@ -362,8 +361,6 @@ static void
sync_buttons_page_with_config(GlobalConfig *conf)
{
int i;
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_panel_frame_cb),
conf->hide_panel_frame);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(tile_when_over_cb),
conf->tile_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(saturate_when_over_cb),
......@@ -388,8 +385,6 @@ static void
sync_config_with_buttons_page(GlobalConfig *conf)
{
int i;
conf->hide_panel_frame =
GTK_TOGGLE_BUTTON(hide_panel_frame_cb)->active;
conf->tile_when_over =
GTK_TOGGLE_BUTTON(tile_when_over_cb)->active;
conf->saturate_when_over =
......@@ -574,14 +569,6 @@ buttons_notebook_page (void)
gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
gtk_widget_show (notebook);
/* show/hide frame */
hide_panel_frame_cb = gtk_check_button_new_with_label (_("Make buttons flush with panel edge"));
gtk_signal_connect (GTK_OBJECT (hide_panel_frame_cb), "toggled",
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), hide_panel_frame_cb, FALSE, FALSE, 0);
/* only show tiles when mouse is over the button */
tile_when_over_cb = gtk_check_button_new_with_label (_("Show button tiles only when cursor is over the button"));
gtk_signal_connect (GTK_OBJECT (tile_when_over_cb), "toggled",
......@@ -1377,8 +1364,6 @@ loadup_vals (void)
global_config.drawer_auto_close =
conditional_get_bool ("drawer_auto_close", FALSE, NULL);
global_config.hide_panel_frame =
conditional_get_bool ("hide_panel_frame", FALSE, NULL);
global_config.tile_when_over =
conditional_get_bool ("tile_when_over", FALSE, NULL);
global_config.saturate_when_over =
......@@ -1502,8 +1487,6 @@ write_config (GlobalConfig *conf)
conf->normal_layer);
gnome_config_set_bool("drawer_auto_close",
conf->drawer_auto_close);
gnome_config_set_bool("hide_panel_frame",
conf->hide_panel_frame);
gnome_config_set_bool("tile_when_over",
conf->tile_when_over);
gnome_config_set_bool("saturate_when_over",
......
......@@ -79,7 +79,6 @@ static GtkAdjustment *tile_depth[LAST_TILE];
static GtkWidget *entry_up[LAST_TILE];
static GtkWidget *entry_down[LAST_TILE];
static GtkWidget *hide_panel_frame_cb;
static GtkWidget *tile_when_over_cb;
static GtkWidget *saturate_when_over_cb;
......@@ -362,8 +361,6 @@ static void
sync_buttons_page_with_config(GlobalConfig *conf)
{
int i;
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_panel_frame_cb),
conf->hide_panel_frame);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(tile_when_over_cb),
conf->tile_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(saturate_when_over_cb),
......@@ -388,8 +385,6 @@ static void
sync_config_with_buttons_page(GlobalConfig *conf)
{
int i;
conf->hide_panel_frame =
GTK_TOGGLE_BUTTON(hide_panel_frame_cb)->active;
conf->tile_when_over =
GTK_TOGGLE_BUTTON(tile_when_over_cb)->active;
conf->saturate_when_over =
......@@ -574,14 +569,6 @@ buttons_notebook_page (void)
gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
gtk_widget_show (notebook);
/* show/hide frame */
hide_panel_frame_cb = gtk_check_button_new_with_label (_("Make buttons flush with panel edge"));
gtk_signal_connect (GTK_OBJECT (hide_panel_frame_cb), "toggled",
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), hide_panel_frame_cb, FALSE, FALSE, 0);
/* only show tiles when mouse is over the button */
tile_when_over_cb = gtk_check_button_new_with_label (_("Show button tiles only when cursor is over the button"));
gtk_signal_connect (GTK_OBJECT (tile_when_over_cb), "toggled",
......@@ -1377,8 +1364,6 @@ loadup_vals (void)
global_config.drawer_auto_close =
conditional_get_bool ("drawer_auto_close", FALSE, NULL);
global_config.hide_panel_frame =
conditional_get_bool ("hide_panel_frame", FALSE, NULL);
global_config.tile_when_over =
conditional_get_bool ("tile_when_over", FALSE, NULL);
global_config.saturate_when_over =
......@@ -1502,8 +1487,6 @@ write_config (GlobalConfig *conf)
conf->normal_layer);
gnome_config_set_bool("drawer_auto_close",
conf->drawer_auto_close);
gnome_config_set_bool("hide_panel_frame",
conf->hide_panel_frame);
gnome_config_set_bool("tile_when_over",
conf->tile_when_over);
gnome_config_set_bool("saturate_when_over",
......
......@@ -27,7 +27,6 @@ struct _GlobalConfig {
char *tile_down[LAST_TILE];
int tile_border[LAST_TILE];
int tile_depth[LAST_TILE];
gboolean hide_panel_frame;
gboolean tile_when_over;
gboolean saturate_when_over;
gboolean confirm_panel_remove;
......
......@@ -27,7 +27,6 @@ struct _GlobalConfig {
char *tile_down[LAST_TILE];
int tile_border[LAST_TILE];
int tile_depth[LAST_TILE];
gboolean hide_panel_frame;
gboolean tile_when_over;
gboolean saturate_when_over;
gboolean confirm_panel_remove;
......
......@@ -1763,8 +1763,6 @@ load_up_globals (void)
global_config.drawer_auto_close =
conditional_get_bool ("drawer_auto_close", FALSE, NULL);
global_config.hide_panel_frame =
conditional_get_bool ("hide_panel_frame", FALSE, NULL);
global_config.tile_when_over =
conditional_get_bool ("tile_when_over", FALSE, NULL);
global_config.saturate_when_over =
......@@ -1866,8 +1864,6 @@ write_global_config (void)
global_config.normal_layer);
gnome_config_set_bool ("drawer_auto_close",
global_config.drawer_auto_close);
gnome_config_set_bool ("hide_panel_frame",
global_config.hide_panel_frame);
gnome_config_set_bool ("tile_when_over",
global_config.tile_when_over);
gnome_config_set_bool ("saturate_when_over",
......@@ -1950,8 +1946,6 @@ convert_write_config(void)
global_config.keep_bottom);
gnome_config_set_bool("drawer_auto_close",
global_config.drawer_auto_close);
gnome_config_set_bool("hide_panel_frame",
global_config.hide_panel_frame);
gnome_config_set_bool("tile_when_over",
global_config.tile_when_over);
buf = g_string_new(NULL);
......@@ -2038,7 +2032,6 @@ convert_read_old_config(void)
global_config.keep_bottom = gnome_config_get_bool("keep_bottom=FALSE");
global_config.drawer_auto_close = gnome_config_get_bool("drawer_auto_close=FALSE");
global_config.hide_panel_frame = gnome_config_get_bool("hide_panel_frame=FALSE");
global_config.tile_when_over = gnome_config_get_bool("tile_when_over=FALSE");
for(i=0;i<LAST_TILE;i++) {
g_string_sprintf(buf,"new_tiles_enabled_%d=TRUE",i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment