From d3e0332f8dbbf64e854814576cbeaa25f117e4dc Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 16 Nov 2003 18:56:41 +0000 Subject: [PATCH] configure.in themes/Makefile.am themes/Small/.cvsignore 2003-11-16 Michael Natterer * configure.in * themes/Makefile.am * themes/Small/.cvsignore * themes/Small/Makefile.am * themes/Small/gtkrc: added a "Small" theme so users don't have to edit their ~/.gimp-1.3/gtkrc to get the smaller look. * app/widgets/gimpdock.c: use "gimp-dock-separator", not just "dock-separator" as widget name. * etc/gtkrc: changed accordingly. Removed small style since it is a theme now. Cleanup. --- ChangeLog | 15 +++++++ app/widgets/gimpdock.c | 2 +- configure.in | 1 + etc/gtkrc | 36 +++------------- themes/Makefile.am | 2 +- themes/Small/.cvsignore | 2 + themes/Small/Makefile.am | 7 ++++ themes/Small/gtkrc | 88 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 121 insertions(+), 32 deletions(-) create mode 100644 themes/Small/.cvsignore create mode 100644 themes/Small/Makefile.am create mode 100644 themes/Small/gtkrc diff --git a/ChangeLog b/ChangeLog index 0dfa76e6b5..1dd8514ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-11-16 Michael Natterer + + * configure.in + * themes/Makefile.am + * themes/Small/.cvsignore + * themes/Small/Makefile.am + * themes/Small/gtkrc: added a "Small" theme so users don't have to + edit their ~/.gimp-1.3/gtkrc to get the smaller look. + + * app/widgets/gimpdock.c: use "gimp-dock-separator", not just + "dock-separator" as widget name. + + * etc/gtkrc: changed accordingly. Removed small style since it is + a theme now. Cleanup. + 2003-11-16 Sven Neumann * plug-ins/common/png.c: fixed the default gamma value which I diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index d2b98164a4..2b04f27fea 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -278,7 +278,7 @@ gimp_dock_separator_new (GimpDock *dock) event_box = gtk_event_box_new (); - gtk_widget_set_name (event_box, "dock-separator"); + gtk_widget_set_name (event_box, "gimp-dock-separator"); gtk_widget_style_get (GTK_WIDGET (dock), "separator_height", &separator_height, diff --git a/configure.in b/configure.in index 3e8ca7ae76..f7eb7333f0 100644 --- a/configure.in +++ b/configure.in @@ -1438,6 +1438,7 @@ themes/Makefile themes/Default/Makefile themes/Default/images/Makefile themes/Default/images/preferences/Makefile +themes/Small/Makefile data/Makefile data/environ/Makefile data/misc/Makefile diff --git a/etc/gtkrc b/etc/gtkrc index c1199a14fc..3fd69ee80e 100644 --- a/etc/gtkrc +++ b/etc/gtkrc @@ -9,38 +9,13 @@ # # widget style # class style - +# # You can add your own GIMP-specific GTK styles here. -# Example style for small screens: - -style "gimp-small-style" -{ - GtkWidget::focus_padding = 0 - GtkOptionMenu::indicator_size = { 4, 7 } - GtkOptionMenu::indicator_spacing = { 4, 3, 1, 1 } - - GtkPaned::handle_size = 5 - GimpDock::separator_height = 5 - GimpImageDock::minimal_width = 200 - GimpImageDock::menu_preview_size = small-toolbar - GimpToolbox::tool_icon_size = menu - GimpDockbook::tab_border = 0 - GimpDockbook::tab_icon_size = menu - GimpColorNotebook::tab_border = 0 - GimpColorNotebook::tab_icon_size = menu - GimpDockable::content_border = 1 - GimpEditor::content_spacing = 1 - GimpEditor::button_spacing = 1 - GimpEditor::button_icon_size = menu -} - -# class "GtkWidget" style "gimp-small-style" - - +# # Example keybinding to remap Help to F2 - +# binding "gimp-help-binding" { bind "F2" { "show-help" (255) } @@ -54,11 +29,12 @@ binding "gimp-help-binding" # class "GtkWidget" binding "gimp-help-binding" +# # The dock separator DND highlight color is configurable. - +# style "gimp-red-separator-style" { bg[SELECTED] = "#aa2448" } -# widget "*dock-separator*" style "gimp-red-separator-style" +# widget "*gimp-dock-separator*" style "gimp-red-separator-style" diff --git a/themes/Makefile.am b/themes/Makefile.am index cdf0a1a61e..0a79713d8a 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = Default +SUBDIRS = Default Small diff --git a/themes/Small/.cvsignore b/themes/Small/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/themes/Small/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/themes/Small/Makefile.am b/themes/Small/Makefile.am new file mode 100644 index 0000000000..324db9dfb9 --- /dev/null +++ b/themes/Small/Makefile.am @@ -0,0 +1,7 @@ +## Process this file with automake to produce Makefile.in + +themedatadir = $(gimpdatadir)/themes/Small + +themedata_DATA = gtkrc + +EXTRA_DIST = $(themedata_DATA) diff --git a/themes/Small/gtkrc b/themes/Small/gtkrc new file mode 100644 index 0000000000..d40be6e0ef --- /dev/null +++ b/themes/Small/gtkrc @@ -0,0 +1,88 @@ +# pixmap_path ":::..." +# +# include "rc-file" +# +# style [= ] +# { +#