Commit 05eee177 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

uset the logo-icon image for the main menu, this however doesn't look too

Fri Aug 28 02:19:18 1998  George Lebl  <jirka@5z.com>

        * menu.c: uset the logo-icon image for the main menu, this
          however doesn't look too good since the background is white

        * panel_config_global.[ch],session.c,main.c: tiles are now
          optional (can be set from global configuration), all other
          icon stuff will become settable as well soon
parent a8b50d65
Fri Aug 28 02:19:18 1998 George Lebl <jirka@5z.com>
* menu.c: uset the logo-icon image for the main menu, this
however doesn't look too good since the background is white
* panel_config_global.[ch],session.c,main.c: tiles are now
optional (can be set from global configuration), all other
icon stuff will become settable as well soon
Fri Aug 28 01:32:36 1998 George Lebl <jirka@5z.com>
* button-widget.c: fixed up the position calculation
......
Fri Aug 28 02:19:18 1998 George Lebl <jirka@5z.com>
* menu.c: uset the logo-icon image for the main menu, this
however doesn't look too good since the background is white
* panel_config_global.[ch],session.c,main.c: tiles are now
optional (can be set from global configuration), all other
icon stuff will become settable as well soon
Fri Aug 28 01:32:36 1998 George Lebl <jirka@5z.com>
* button-widget.c: fixed up the position calculation
......
......@@ -215,15 +215,14 @@ main(int argc, char **argv)
applet_count = 0;
panel_tooltips = gtk_tooltips_new();
/*set the globals*/
load_up_globals();
/*FIXME: make this configurable*/
button_widget_load_tile(MENU_TILE,"tile-green-up.png","tile-green-down.png",2,2);
button_widget_load_tile(DRAWER_TILE,"tile-purple-up.png","tile-purple-down.png",2,2);
button_widget_load_tile(LAUNCHER_TILE,"tile-normal-up.png","tile-normal-down.png",2,2);
button_widget_tile_enable(TRUE);
/*set the globals*/
load_up_globals();
init_user_panels();
......
......@@ -1547,7 +1547,7 @@ get_pixmap(char *menudir, PanelOrientType orient, int main_menu)
{
char *pixmap_name;
if (main_menu) {
pixmap_name = gnome_unconditional_pixmap_file ("panel-menu-main.xpm");
pixmap_name = gnome_unconditional_pixmap_file("gnome-logo-icon.png");
} else {
char *dentry_name;
GnomeDesktopEntry *item_info;
......
......@@ -16,6 +16,7 @@ struct _GlobalConfig {
PanelMovementType movement_type;
int disable_animations;
int applet_padding;
int tiles_enabled;
};
......
......@@ -201,6 +201,41 @@ set_movement (GtkWidget *widget, gpointer data)
return FALSE;
}
GtkWidget *
icon_notebook_page(void)
{
GtkWidget *frame;
GtkWidget *button;
GtkWidget *box;
GtkWidget *vbox;
/* main vbox */
vbox = gtk_vbox_new (FALSE, CONFIG_PADDING_SIZE);
gtk_container_border_width(GTK_CONTAINER (vbox), CONFIG_PADDING_SIZE);
/* General frame */
frame = gtk_frame_new (_("General"));
gtk_container_border_width(GTK_CONTAINER (frame), CONFIG_PADDING_SIZE);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE,
CONFIG_PADDING_SIZE);
/* vbox for frame */
box = gtk_vbox_new (FALSE, CONFIG_PADDING_SIZE);
gtk_container_border_width(GTK_CONTAINER (box), CONFIG_PADDING_SIZE);
gtk_container_add (GTK_CONTAINER (frame), box);
/* Enable tiles frame */
button = gtk_check_button_new_with_label (_("Tiles enabled"));
if (temp_config.tiles_enabled)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_toggle_button_value),
&(temp_config.tiles_enabled));
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE,
CONFIG_PADDING_SIZE);
return (vbox);
}
GtkWidget *
misc_notebook_page(void)
......@@ -353,6 +388,11 @@ panel_config_global(void)
gtk_notebook_append_page (GTK_NOTEBOOK(prop_nbook),
page, gtk_label_new (_("Animation settings")));
/* Icon notebook page */
page = icon_notebook_page ();
gtk_notebook_append_page (GTK_NOTEBOOK(prop_nbook),
page, gtk_label_new (_("Icon settings")));
/* Miscellaneous notebook page */
page = misc_notebook_page ();
gtk_notebook_append_page (GTK_NOTEBOOK(prop_nbook),
......
......@@ -16,6 +16,7 @@ struct _GlobalConfig {
PanelMovementType movement_type;
int disable_animations;
int applet_padding;
int tiles_enabled;
};
......
......@@ -85,6 +85,7 @@ apply_global_config(void)
gtk_tooltips_disable(panel_tooltips);
set_show_small_icons();
send_tooltips_state(global_config.tooltips_enabled);
button_widget_tile_enable(global_config.tiles_enabled);
}
/*shouldn't this be in gnome-dentry?? :)*/
......@@ -427,6 +428,8 @@ do_session_save(GnomeClient *client,
global_config.disable_animations);
gnome_config_set_int("applet_padding",
global_config.applet_padding);
gnome_config_set_bool("tiles_enabled",
global_config.tiles_enabled);
}
gnome_config_pop_prefix ();
......@@ -878,6 +881,9 @@ load_up_globals(void)
global_config.movement_type=gnome_config_get_int(buf);
global_config.applet_padding=gnome_config_get_int("applet_padding=3");
global_config.tiles_enabled =
gnome_config_get_bool("tiles_enabled=TRUE");
gnome_config_pop_prefix();
......
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