diff --git a/ChangeLog b/ChangeLog index 586588092b..3d34f8dd52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2002-03-01 Michael Natterer + + * themes/Default/images/preferences/Makefile.am + * themes/Default/images/preferences/folders-brushes.png + * themes/Default/images/preferences/folders-gradients.png + * themes/Default/images/preferences/folders-palettes.png + * themes/Default/images/preferences/folders-patterns.png + + * themes/Default/images/preferences/folders-plug-ins.png: some new + icons made from Jimmac's new tool icons and Tigert's abstract + palette icon. + + * themes/Default/images/preferences/folders.xcf.gz: all folders + icons as layered image. + + * app/gui/preferences-dialog.c: use them. + 2002-02-28 Michael Natterer * app/gui/preferences-dialog.c: put the title label & icon outside diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 6c4baa7f23..e46663adbe 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -2840,41 +2840,42 @@ preferences_dialog_create (Gimp *gimp) { gchar *tree_label; gchar *label; + gchar *icon; gchar *help_data; gchar *fs_label; gchar **mpath; } paths[] = { - { N_("Brushes"), N_("Brush Folders"), + { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", "dialogs/preferences/folders.html#brushes", N_("Select Brush Folders"), &edit_brush_path }, - { N_("Patterns"), N_("Pattern Folders"), + { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", "dialogs/preferences/folders.html#patterns", N_("Select Pattern Folders"), &edit_pattern_path }, - { N_("Palettes"), N_("Palette Folders"), + { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", "dialogs/preferences/folders.html#palettes", N_("Select Palette Folders"), &edit_palette_path }, - { N_("Gradients"), N_("Gradient Folders"), + { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", "dialogs/preferences/folders.html#gradients", N_("Select Gradient Folders"), &edit_gradient_path }, - { N_("Plug-Ins"), N_("Plug-In Folders"), + { N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", "dialogs/preferences/folders.html#plug_ins", N_("Select Plug-In Folders"), &edit_plug_in_path }, - { N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), + { N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders.png", "dialogs/preferences/folders.html#tool_plug_ins", N_("Select Tool Plug-In Folders"), &edit_tool_plug_in_path }, - { N_("Modules"), N_("Module Folders"), + { N_("Modules"), N_("Module Folders"), "folders.png", "dialogs/preferences/folders.html#modules", N_("Select Module Folders"), &edit_module_path }, - { N_("Themes"), N_("Theme Folders"), + { N_("Themes"), N_("Theme Folders"), "folders.png", "dialogs/preferences/folders.html#themes", N_("Select Theme Folders"), &edit_theme_path } @@ -2885,7 +2886,7 @@ preferences_dialog_create (Gimp *gimp) vbox = prefs_notebook_append_page (gimp, GTK_NOTEBOOK (notebook), gettext (paths[i].label), - "folders.png", + paths[i].icon, GTK_TREE_STORE (tree), gettext (paths[i].tree_label), paths[i].help_data, diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 6c4baa7f23..e46663adbe 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -2840,41 +2840,42 @@ preferences_dialog_create (Gimp *gimp) { gchar *tree_label; gchar *label; + gchar *icon; gchar *help_data; gchar *fs_label; gchar **mpath; } paths[] = { - { N_("Brushes"), N_("Brush Folders"), + { N_("Brushes"), N_("Brush Folders"), "folders-brushes.png", "dialogs/preferences/folders.html#brushes", N_("Select Brush Folders"), &edit_brush_path }, - { N_("Patterns"), N_("Pattern Folders"), + { N_("Patterns"), N_("Pattern Folders"), "folders-patterns.png", "dialogs/preferences/folders.html#patterns", N_("Select Pattern Folders"), &edit_pattern_path }, - { N_("Palettes"), N_("Palette Folders"), + { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", "dialogs/preferences/folders.html#palettes", N_("Select Palette Folders"), &edit_palette_path }, - { N_("Gradients"), N_("Gradient Folders"), + { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", "dialogs/preferences/folders.html#gradients", N_("Select Gradient Folders"), &edit_gradient_path }, - { N_("Plug-Ins"), N_("Plug-In Folders"), + { N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png", "dialogs/preferences/folders.html#plug_ins", N_("Select Plug-In Folders"), &edit_plug_in_path }, - { N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), + { N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders.png", "dialogs/preferences/folders.html#tool_plug_ins", N_("Select Tool Plug-In Folders"), &edit_tool_plug_in_path }, - { N_("Modules"), N_("Module Folders"), + { N_("Modules"), N_("Module Folders"), "folders.png", "dialogs/preferences/folders.html#modules", N_("Select Module Folders"), &edit_module_path }, - { N_("Themes"), N_("Theme Folders"), + { N_("Themes"), N_("Theme Folders"), "folders.png", "dialogs/preferences/folders.html#themes", N_("Select Theme Folders"), &edit_theme_path } @@ -2885,7 +2886,7 @@ preferences_dialog_create (Gimp *gimp) vbox = prefs_notebook_append_page (gimp, GTK_NOTEBOOK (notebook), gettext (paths[i].label), - "folders.png", + paths[i].icon, GTK_TREE_STORE (tree), gettext (paths[i].tree_label), paths[i].help_data, diff --git a/themes/Default/images/preferences/Makefile.am b/themes/Default/images/preferences/Makefile.am index 49095ea55f..0d68495700 100644 --- a/themes/Default/images/preferences/Makefile.am +++ b/themes/Default/images/preferences/Makefile.am @@ -7,6 +7,11 @@ PREFS_IMAGES = @STRIP_BEGIN@ \ display.png \ environment.png \ folders.png \ + folders-brushes.png \ + folders-gradients.png \ + folders-palettes.png \ + folders-patterns.png \ + folders-plug-ins.png \ help-system.png \ image-windows.png \ input-devices.png \ @@ -18,4 +23,6 @@ PREFS_IMAGES = @STRIP_BEGIN@ \ themedata_DATA = $(PREFS_IMAGES) -EXTRA_DIST = $(themedata_DATA) +EXTRA_DIST = \ + $(themedata_DATA) \ + folders.xcf.gz diff --git a/themes/Default/images/preferences/folders-brushes.png b/themes/Default/images/preferences/folders-brushes.png new file mode 100644 index 0000000000..41464f4abe Binary files /dev/null and b/themes/Default/images/preferences/folders-brushes.png differ diff --git a/themes/Default/images/preferences/folders-gradients.png b/themes/Default/images/preferences/folders-gradients.png new file mode 100644 index 0000000000..10450e103a Binary files /dev/null and b/themes/Default/images/preferences/folders-gradients.png differ diff --git a/themes/Default/images/preferences/folders-palettes.png b/themes/Default/images/preferences/folders-palettes.png new file mode 100644 index 0000000000..8a88d8610f Binary files /dev/null and b/themes/Default/images/preferences/folders-palettes.png differ diff --git a/themes/Default/images/preferences/folders-patterns.png b/themes/Default/images/preferences/folders-patterns.png new file mode 100644 index 0000000000..5e46072ac8 Binary files /dev/null and b/themes/Default/images/preferences/folders-patterns.png differ diff --git a/themes/Default/images/preferences/folders-plug-ins.png b/themes/Default/images/preferences/folders-plug-ins.png new file mode 100644 index 0000000000..c36e516bf3 Binary files /dev/null and b/themes/Default/images/preferences/folders-plug-ins.png differ diff --git a/themes/Default/images/preferences/folders.xcf.gz b/themes/Default/images/preferences/folders.xcf.gz new file mode 100644 index 0000000000..20578a379e Binary files /dev/null and b/themes/Default/images/preferences/folders.xcf.gz differ