Commit 861ff51c authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

use some gnome-stock pixmaps

Mon May 04 22:31:06 1998  George Lebl  <jirka@5z.com>

        * menu.c: use some gnome-stock pixmaps

        * gnome_config.c,gnome_config_global.c: minor fixes
parent a70bd2e7
Mon May 04 22:31:06 1998 George Lebl <jirka@5z.com>
* menu.c: use some gnome-stock pixmaps
* gnome_config.c,gnome_config_global.c: minor fixes
Mon May 04 22:04:32 1998 George Lebl <jirka@5z.com>
* menu.c: added an about box
......
Mon May 04 22:31:06 1998 George Lebl <jirka@5z.com>
* menu.c: use some gnome-stock pixmaps
* gnome_config.c,gnome_config_global.c: minor fixes
Mon May 04 22:04:32 1998 George Lebl <jirka@5z.com>
* menu.c: added an about box
......
......@@ -101,6 +101,7 @@ setup_menuitem (GtkWidget *menuitem, GtkWidget *pixmap, char *title)
if (pixmap) {
gtk_container_add (GTK_CONTAINER (align), pixmap);
gtk_widget_set_usize (align, 22, 16);
gtk_widget_show (pixmap);
} else
gtk_widget_set_usize (align, 22, 16);
......@@ -452,13 +453,19 @@ create_panel_submenu (GtkWidget *app_menu)
add_menu_separator(menu);
menuitem = gtk_menu_item_new ();
setup_menuitem (menuitem, 0, _("Global properties..."));
setup_menuitem (menuitem,
gnome_stock_pixmap_widget(menu,
GNOME_STOCK_PIXMAP_PREFERENCES),
_("Global properties..."));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) panel_configure, 0);
menuitem = gtk_menu_item_new ();
setup_menuitem (menuitem, 0, _("About..."));
setup_menuitem (menuitem,
gnome_stock_pixmap_widget(menu,
GNOME_STOCK_PIXMAP_ABOUT),
_("About..."));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) about_cb, 0);
......@@ -500,7 +507,10 @@ add_special_entries (GtkWidget *menu, GtkWidget *app_menu)
gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_lock, 0);
menuitem = gtk_menu_item_new ();
setup_menuitem (menuitem, 0, _("Log out"));
setup_menuitem (menuitem,
gnome_stock_pixmap_widget(menu,
GNOME_STOCK_PIXMAP_QUIT),
_("Log out"));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate", (GtkSignalFunc) panel_logout, 0);
......
......@@ -113,48 +113,44 @@ position_notebook_page(GtkWidget *propertybox)
/* Top Position */
button = gtk_radio_button_new_with_label (NULL, _("Top"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_TOP)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_TOP);
if (panel_config_struct.snapped == PANEL_TOP) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Bottom Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Bottom"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_BOTTOM)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_BOTTOM);
if (panel_config_struct.snapped == PANEL_BOTTOM) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Left Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Left"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_LEFT)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_LEFT);
if (panel_config_struct.snapped == PANEL_LEFT) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Right Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Right"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_RIGHT)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_RIGHT);
if (panel_config_struct.snapped == PANEL_RIGHT) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Auto-hide/stayput frame */
......@@ -169,24 +165,22 @@ position_notebook_page(GtkWidget *propertybox)
/* Stay Put */
button = gtk_radio_button_new_with_label (NULL, _("Explicitly Hide"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.mode == PANEL_EXPLICIT_HIDE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_mode),
(gpointer)PANEL_EXPLICIT_HIDE);
if (panel_config_struct.mode == PANEL_EXPLICIT_HIDE) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, CONFIG_PADDING_SIZE);
/* Auto-hide */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Auto Hide"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.mode == PANEL_AUTO_HIDE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_mode),
(gpointer)PANEL_AUTO_HIDE);
if (panel_config_struct.mode == PANEL_AUTO_HIDE) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, CONFIG_PADDING_SIZE);
panel_config_struct.config_box = propertybox;
......
......@@ -113,48 +113,44 @@ position_notebook_page(GtkWidget *propertybox)
/* Top Position */
button = gtk_radio_button_new_with_label (NULL, _("Top"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_TOP)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_TOP);
if (panel_config_struct.snapped == PANEL_TOP) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Bottom Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Bottom"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_BOTTOM)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_BOTTOM);
if (panel_config_struct.snapped == PANEL_BOTTOM) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Left Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Left"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_LEFT)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_LEFT);
if (panel_config_struct.snapped == PANEL_LEFT) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Right Position */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Right"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.snapped == PANEL_RIGHT)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_snapped),
(gpointer)PANEL_RIGHT);
if (panel_config_struct.snapped == PANEL_RIGHT) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, CONFIG_PADDING_SIZE);
/* Auto-hide/stayput frame */
......@@ -169,24 +165,22 @@ position_notebook_page(GtkWidget *propertybox)
/* Stay Put */
button = gtk_radio_button_new_with_label (NULL, _("Explicitly Hide"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.mode == PANEL_EXPLICIT_HIDE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_mode),
(gpointer)PANEL_EXPLICIT_HIDE);
if (panel_config_struct.mode == PANEL_EXPLICIT_HIDE) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, CONFIG_PADDING_SIZE);
/* Auto-hide */
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Auto Hide"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
if (panel_config_struct.mode == PANEL_AUTO_HIDE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_mode),
(gpointer)PANEL_AUTO_HIDE);
if (panel_config_struct.mode == PANEL_AUTO_HIDE) {
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
}
gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, CONFIG_PADDING_SIZE);
panel_config_struct.config_box = propertybox;
......
......@@ -177,11 +177,11 @@ misc_notebook_page(void)
/* Tooltips enable */
button = gtk_check_button_new_with_label (_("Tooltips enabled"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (set_toggle_button_value),
&(temp_config.tooltips_enabled));
if (temp_config.tooltips_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.tooltips_enabled));
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE,
CONFIG_PADDING_SIZE);
......@@ -198,11 +198,11 @@ misc_notebook_page(void)
/* Small Icons */
button = gtk_check_button_new_with_label (_("Show small icons"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (set_toggle_button_value),
&(temp_config.show_small_icons));
if (temp_config.show_small_icons)
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.show_small_icons));
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE,
CONFIG_PADDING_SIZE);
......@@ -219,11 +219,11 @@ misc_notebook_page(void)
/* Switched */
button = gtk_radio_button_new_with_label (NULL, _("Switched movement"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (set_movement),
(gpointer)PANEL_SWITCH_MOVE);
if (temp_config.movement_type == PANEL_SWITCH_MOVE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_movement),
(gpointer)PANEL_SWITCH_MOVE);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE,
CONFIG_PADDING_SIZE);
......@@ -231,11 +231,11 @@ misc_notebook_page(void)
button = gtk_radio_button_new_with_label (
gtk_radio_button_group (GTK_RADIO_BUTTON (button)),
_("Free movement (doesn't disturb other applets)"));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (set_movement),
(gpointer)PANEL_FREE_MOVE);
if (temp_config.movement_type == PANEL_FREE_MOVE)
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_signal_connect (GTK_OBJECT (button), "toggled",
GTK_SIGNAL_FUNC (set_movement),
(gpointer)PANEL_FREE_MOVE);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE,
CONFIG_PADDING_SIZE);
......@@ -264,6 +264,7 @@ panel_config_global(void)
global_config.explicit_hide_step_size;
temp_config.tooltips_enabled = global_config.tooltips_enabled;
temp_config.show_small_icons = global_config.show_small_icons;
temp_config.movement_type = global_config.movement_type;
/* main window */
config_window = gnome_property_box_new ();
......
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