From 6ff577a4f6d8eef4dda1c86400ba07ea0bce4189 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Fri, 2 Jun 2000 11:20:00 +0000 Subject: [PATCH] r288: Removed the borders from the toolbar buttons and put the new help icon in some of the action windows. --- ROX-Filer/Help/Changes | 13 +++++++++++ ROX-Filer/pixmaps/help.xpm | 57 ++++++++++++++++++++++----------------------- ROX-Filer/src/action.c | 20 +++++++--------- ROX-Filer/src/action.h | 2 +- ROX-Filer/src/filer.c | 5 ++-- ROX-Filer/src/gui_support.c | 17 ++++++++++++++ ROX-Filer/src/gui_support.h | 3 +++ ROX-Filer/src/menu.c | 2 +- ROX-Filer/src/minibuffer.c | 15 +++++------- 9 files changed, 81 insertions(+), 53 deletions(-) rewrite ROX-Filer/pixmaps/help.xpm (78%) diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes index 476ec95e..23ff75d8 100644 --- a/ROX-Filer/Help/Changes +++ b/ROX-Filer/Help/Changes @@ -3,6 +3,19 @@ by Thomas Leonard +02-Jun-2000 +~~~~~~~~~~~ +Made the help button look a bit nicer and changed the Find and Permissions +action windows to use the icon instead of a text button. Removed the 3D +borders from the help and toolbar buttons when not selected (looks much +better!). + +01-Jun-2000 +~~~~~~~~~~~ +Added a Help icon to the toolbar, which does the same as choosing `Show +ROX-Filer Help' from the menu. + + 25-May-2000 ~~~~~~~~~~~ Started adding some code to truncate long filenames (not finished yet). diff --git a/ROX-Filer/pixmaps/help.xpm b/ROX-Filer/pixmaps/help.xpm dissimilarity index 78% index 9aa10951..b12daf42 100644 --- a/ROX-Filer/pixmaps/help.xpm +++ b/ROX-Filer/pixmaps/help.xpm @@ -1,29 +1,28 @@ -/* XPM */ -static char * help_xpm[] = { -"14 14 12 1", -" c None", -". c #0091FF", -"+ c #38A9FF", -"@ c #219FFF", -"# c #FFFFFF", -"$ c #C6E6FF", -"% c #1C9DFF", -"& c #71C1FF", -"* c #E2F2FF", -"= c #AADAFF", -"- c #55B5FF", -"; c #8DCDFF", -" ...+@. ", -" ...+#$%. ", -" ....&#*+.. ", -" ......&+.... ", -"..............", -"....&=##-.....", -".....=##-.....", -".....=##......", -".....##;......", -"....+##-+%....", -" ...=##%=+... ", -" ..=##;-... ", -" .+==&... ", -" ...... "}; +/* XPM */ +static char * help_xpm[] = { +"14 14 11 1", +" c None", +". c #2828EF", +"+ c #8787F6", +"@ c #CECEFB", +"# c #FFFFFF", +"$ c #9E9EF7", +"% c #5757F2", +"& c #E6E6FD", +"* c #B7B7F9", +"= c #6F6FF4", +"- c #3F3FF0", +" ...... ", +" ....+... ", +" ....@#$... ", +" .....%&%.... ", +"..............", +"....%+*+......", +".....*#*......", +".....@#=......", +".....##-......", +"....+##%+.....", +" ...*#*$=.... ", +" ..+##%.... ", +" ........ ", +" ...... "}; diff --git a/ROX-Filer/src/action.c b/ROX-Filer/src/action.c index 7a3002a1..8ddc3fff 100644 --- a/ROX-Filer/src/action.c +++ b/ROX-Filer/src/action.c @@ -331,7 +331,7 @@ static void entry_changed(GtkEntry *entry, GUIside *gui_side) fflush(gui_side->to_child); } -void show_condition_help(void) +void show_condition_help(gpointer data) { static GtkWidget *help = NULL; @@ -1892,7 +1892,7 @@ void action_find(FilerWindow *filer_window) { GUIside *gui_side; Collection *collection; - GtkWidget *hbox, *label, *button, *scroller; + GtkWidget *hbox, *label, *scroller; gchar *titles[2]; titles[0] = _("Name"); @@ -1947,10 +1947,9 @@ void action_find(FilerWindow *filer_window) gtk_signal_connect(GTK_OBJECT(gui_side->entry), "changed", entry_changed, gui_side); gtk_box_pack_start(GTK_BOX(gui_side->vbox), hbox, FALSE, TRUE, 4); - button = gtk_button_new_with_label(_("Show expression reference")); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(show_condition_help), NULL); + gtk_box_pack_start(GTK_BOX(hbox), + new_help_button(show_condition_help, NULL), + FALSE, TRUE, 4); gtk_window_set_title(GTK_WINDOW(gui_side->window), _("Find")); gtk_window_set_focus(GTK_WINDOW(gui_side->window), gui_side->entry); @@ -2054,7 +2053,7 @@ void action_chmod(FilerWindow *filer_window) { GUIside *gui_side; Collection *collection; - GtkWidget *hbox, *label, *button; + GtkWidget *hbox, *label; collection = filer_window->collection; @@ -2089,10 +2088,9 @@ void action_chmod(FilerWindow *filer_window) gtk_signal_connect(GTK_OBJECT(gui_side->entry), "changed", entry_changed, gui_side); gtk_box_pack_start(GTK_BOX(gui_side->vbox), hbox, FALSE, TRUE, 0); - button = gtk_button_new_with_label(_("Show command reference")); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", - show_chmod_help, NULL); + gtk_box_pack_start(GTK_BOX(hbox), + new_help_button(show_chmod_help, NULL), + FALSE, TRUE, 4); gtk_window_set_focus(GTK_WINDOW(gui_side->window), gui_side->entry); gtk_window_set_title(GTK_WINDOW(gui_side->window), _("Permissions")); diff --git a/ROX-Filer/src/action.h b/ROX-Filer/src/action.h index 8a2b249b..215989e7 100644 --- a/ROX-Filer/src/action.h +++ b/ROX-Filer/src/action.h @@ -20,6 +20,6 @@ void action_find(FilerWindow *filer_window); void action_move(GSList *paths, char *dest); void action_copy(GSList *paths, char *dest, char *leaf); void action_link(GSList *paths, char *dest); -void show_condition_help(void); +void show_condition_help(gpointer data); #endif /* _ACTION_H */ diff --git a/ROX-Filer/src/filer.c b/ROX-Filer/src/filer.c index d6d1adea..eb312e2f 100644 --- a/ROX-Filer/src/filer.c +++ b/ROX-Filer/src/filer.c @@ -1787,7 +1787,7 @@ static GtkWidget *create_toolbar(FilerWindow *filer_window) box = gtk_hbutton_box_new(); gtk_button_box_set_child_size_default(16, 16); - gtk_hbutton_box_set_spacing_default(2); + gtk_hbutton_box_set_spacing_default(0); gtk_button_box_set_layout(GTK_BUTTON_BOX(box), GTK_BUTTONBOX_START); } @@ -1809,7 +1809,7 @@ static GtkWidget *create_toolbar(FilerWindow *filer_window) add_button(box, im_help, GTK_SIGNAL_FUNC(toolbar_help_clicked), filer_window, - _("Help"), _("Show ROX-Filer Help")); + _("Help"), _("Show ROX-Filer help")); return frame; } @@ -1870,6 +1870,7 @@ static void add_button(GtkWidget *box, MaskedPixmap *icon, else { button = gtk_button_new(); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS); gtk_container_add(GTK_CONTAINER(button), icon_widget); diff --git a/ROX-Filer/src/gui_support.c b/ROX-Filer/src/gui_support.c index 2263909b..f0d3ff55 100644 --- a/ROX-Filer/src/gui_support.c +++ b/ROX-Filer/src/gui_support.c @@ -37,6 +37,7 @@ #include "main.h" #include "gui_support.h" +#include "pixmaps.h" GdkFont *item_font = NULL; GdkFont *fixed_font = NULL; @@ -293,3 +294,19 @@ gboolean load_file(char *pathname, char **data_out, long *length_out) return retval; } + +GtkWidget *new_help_button(HelpFunc show_help, gpointer data) +{ + GtkWidget *b, *icon; + + b = gtk_button_new(); + gtk_button_set_relief(GTK_BUTTON(b), GTK_RELIEF_NONE); + icon = gtk_pixmap_new(im_help->pixmap, im_help->mask); + gtk_container_add(GTK_CONTAINER(b), icon); + gtk_signal_connect_object(GTK_OBJECT(b), "clicked", show_help, data); + + GTK_WIDGET_UNSET_FLAGS(b, GTK_CAN_FOCUS); + + return b; +} + diff --git a/ROX-Filer/src/gui_support.h b/ROX-Filer/src/gui_support.h index 4d688d32..7149cd5e 100644 --- a/ROX-Filer/src/gui_support.h +++ b/ROX-Filer/src/gui_support.h @@ -22,6 +22,8 @@ extern gint fixed_width; extern GdkColor red; extern GdkGC *red_gc; +typedef void (*HelpFunc)(gpointer data); + void gui_support_init(); int get_choice(char *title, char *message, @@ -32,5 +34,6 @@ void make_panel_window(GdkWindow *window); gint hide_dialog_event(GtkWidget *widget, GdkEvent *event, gpointer window); void delayed_error(char *title, char *error); gboolean load_file(char *pathname, char **data_out, long *length_out); +GtkWidget *new_help_button(HelpFunc show_help, gpointer data); #endif /* _GUI_SUPPORT_H */ diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c index 6dee23ba..260e31df 100644 --- a/ROX-Filer/src/menu.c +++ b/ROX-Filer/src/menu.c @@ -203,7 +203,7 @@ static GtkItemFactoryEntry filer_menu_def[] = { {">" N_("Set Run Action..."), NULL, run_action, 0, NULL}, {">" N_("Select If..."), NULL, select_if, 0, NULL}, {">", NULL, NULL, 0, ""}, -{">" N_("Show ROX-Filer help"), NULL, rox_help, 0, NULL}, +{">" N_("Show ROX-Filer Help"), NULL, rox_help, 0, NULL}, }; static GtkItemFactoryEntry panel_menu_def[] = { diff --git a/ROX-Filer/src/minibuffer.c b/ROX-Filer/src/minibuffer.c index d758ecda..90104692 100644 --- a/ROX-Filer/src/minibuffer.c +++ b/ROX-Filer/src/minibuffer.c @@ -65,16 +65,13 @@ static void show_help(FilerWindow *filer_window); */ void create_minibuffer(FilerWindow *filer_window) { - GtkWidget *hbox, *label, *mini, *help, *icon; + GtkWidget *hbox, *label, *mini; hbox = gtk_hbox_new(FALSE, 0); - icon = gtk_pixmap_new(im_help->pixmap, im_help->mask); - help = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(help), icon); - gtk_box_pack_start(GTK_BOX(hbox), help, FALSE, TRUE, 0); - gtk_signal_connect_object(GTK_OBJECT(help), "clicked", - GTK_SIGNAL_FUNC(show_help), (GtkObject *) filer_window); + gtk_box_pack_start(GTK_BOX(hbox), + new_help_button((HelpFunc) show_help, filer_window), + FALSE, TRUE, 0); label = gtk_label_new(NULL); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 2); @@ -207,7 +204,7 @@ static void show_help(FilerWindow *filer_window) "where the name of the file should go (eg ` gimp \"$1\" ')"); break; case MINI_SELECT_IF: - show_condition_help(); + show_condition_help(NULL); return; default: message = "?!?"; @@ -879,7 +876,7 @@ static gint key_press_event(GtkWidget *widget, shell_recall(filer_window, -1); break; case GDK_Tab: - return TRUE; + break; case GDK_Return: select_return_pressed(filer_window); break; -- 2.11.4.GIT