cleaned up the gtkrc situation (bug #5974)

--Sven
2000-02-07 19:06:18 +00:00 · 2000-02-07 19:06:18 +00:00 · 4006d7f259
parent 743aaa7dee
commit 4006d7f259
12 changed files with 36 additions and 75 deletions
--- a/14
+++ b/14
@ -1,3 +1,17 @@
+Mon Feb  7 20:05:19 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* Makefile.am
+	* README
+	* gimp.spec
+	* gtkrc
+	* user_install
+	* gtkrc.forest2: changed the notice on user_install about Gimp's 
+	gtkrc, removed the hardcoded font in our gtkrc (left the ruler
+	font in there however) and removed gtkrc.forest2 since it is
+	already distributed with GTK themes.
+
+	* app/install.c: marked another hardcoded font for translation.
+
 Mon Feb  7 19:26:26 CET 2000  Sven Neumann <sven@gimp.org>

 	* app/gimphelp.c: fixed one of those errors you only notice if
--- a/Makefile.am
+++ b/Makefile.am
@ -116,8 +116,7 @@ gimpdata_DATA = \
 	gimp_logo.ppm		 \
 	gimp_splash.ppm		 \
 	gimp1_1_splash.ppm	 \
-	ps-menurc		 \
-	gtkrc.forest2
+	ps-menurc

 gimpdata_SCRIPTS = user_install

--- a/6
+++ b/6
@ -45,9 +45,9 @@ Many of the developers hang out there.  Some of the Byxnet servers are:

 	irc.gimp.org:6667

-You can customize the look of the interface quite a bit my editing the
-~/.gimp/gtkrc file. A sample file, gtkrc.forest, is included (Thanks to
-Tuomas Kuosmanen)
+The look of GIMP's interface can be customized like any other GTK app
+by editing the ~/.gtkrc file. Additionally GIMP reads ~/.gimp/gtkrc
+so you can have settings that only apply to The GIMP. 

 Included is a set of keybindings similar to those in Adobe Photoshop (tm).
 You can find them in the ps-menurc file.  To use them, copy this file to
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@ -291,9 +291,9 @@ install_help (InstallCallback callback)
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL,
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);

-  font_strong = gdk_fontset_load ( _("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
-  font_emphasis = gdk_font_load ("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*");
-  font = gdk_fontset_load ( _("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));
+  font_strong = gdk_fontset_load (_("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
+  font_emphasis = gdk_font_load (_("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*"));
+  font = gdk_fontset_load (_("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));

  /*  Realize the widget before allowing new text to be inserted  */
  gtk_widget_realize (text);
--- a/app/gui/user-install-dialog.c
+++ b/app/gui/user-install-dialog.c
@ -291,9 +291,9 @@ install_help (InstallCallback callback)
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL,
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);

-  font_strong = gdk_fontset_load ( _("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
-  font_emphasis = gdk_font_load ("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*");
-  font = gdk_fontset_load ( _("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));
+  font_strong = gdk_fontset_load (_("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
+  font_emphasis = gdk_font_load (_("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*"));
+  font = gdk_fontset_load (_("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));

  /*  Realize the widget before allowing new text to be inserted  */
  gtk_widget_realize (text);
--- a/app/install.c
+++ b/app/install.c
@ -291,9 +291,9 @@ install_help (InstallCallback callback)
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL,
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);

-  font_strong = gdk_fontset_load ( _("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
-  font_emphasis = gdk_font_load ("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*");
-  font = gdk_fontset_load ( _("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));
+  font_strong = gdk_fontset_load (_("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
+  font_emphasis = gdk_font_load (_("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*"));
+  font = gdk_fontset_load (_("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));

  /*  Realize the widget before allowing new text to be inserted  */
  gtk_widget_realize (text);
--- a/app/user_install.c
+++ b/app/user_install.c
@ -291,9 +291,9 @@ install_help (InstallCallback callback)
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL,
 		    GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);

-  font_strong = gdk_fontset_load ( _("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
-  font_emphasis = gdk_font_load ("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*");
-  font = gdk_fontset_load ( _("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));
+  font_strong = gdk_fontset_load (_("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,*"));
+  font_emphasis = gdk_font_load (_("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*"));
+  font = gdk_fontset_load (_("-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,*"));

  /*  Realize the widget before allowing new text to be inserted  */
  gtk_widget_realize (text);
--- a/data/misc/user_install
+++ b/data/misc/user_install
@ -60,9 +60,6 @@ echo "mkdir $2/gimpressionist/Presets"
 mkdir $2/gimpressionist/Presets
 echo "cp $1/palettes/* $2/palettes"
 cp $1/palettes/* $2/palettes
-
-if [ -r $HOME/.gtkrc ]
-then
-    echo "NOTICE: GIMP uses its own gtkrc file.  Your default .gtkrc will NOT"
-    echo "be used.  You may wish to edit GIMP's gtkrc (in $2/gtkrc)."
-fi
+echo "NOTICE: GIMP uses an additional gtkrc file so you can"
+echo "configure it to look differently than other GTK apps."
+ecco "You may wish to edit GIMP's gtkrc (in $2/gtkrc)."
--- a/gimp.spec
+++ b/gimp.spec
@ -506,7 +506,6 @@ cat gimp-perl gimp-perl-plugin-files >gimp-perl-files
 %{prefix}/share/gimp/gimp_splash.ppm
 %{prefix}/share/gimp/gimp1_1_splash.ppm
 %{prefix}/share/gimp/ps-menurc
-%{prefix}/share/gimp/gtkrc.forest2


 %defattr (0555, bin, bin)
--- a/6
+++ b/6
@ -11,11 +11,6 @@ style "ruler"
  font = "-adobe-helvetica-medium-r-normal--*-80-*-*-*-*-*-*"
 }

-style "default"
-{
-  font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*"
-}
-
 style "tooltips"
 {
  bg[NORMAL] = { 0.94, 0.90, 0.54 }
@ -24,4 +19,3 @@ style "tooltips"
 widget "gtk-tooltips" style "tooltips"

 widget_class "*Ruler*" style "ruler"
-widget_class "*" style "default"
--- a/gtkrc.forest2
+++ b/gtkrc.forest2
@ -1,39 +0,0 @@
-# style <name> [= <name>]
-# {
-#   <option>
-# }
-#
-# widget <widget_set> style <style_name>
-# widget_class <widget_class_set> style <style_name>
-
-pixmap_path "/home/tigert/.gnome/textures"
-
-style "default"
-{
-#  font = "-schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso8859-1"
-  font = "-*-lucida-medium-r-normal-*-10-*-*-*-*-*-iso8859-1"
-
-# base, text, bg, fg are possible
-bg[NORMAL] = { 0.70, 0.75, 0.67 }
-bg[SELECTED] = { 0.31, 0.35, 0.35 }
-bg[INSENSITIVE] = { 0.70, 0.75, 0.67 }
-bg[ACTIVE] = { 0.61, 0.65, 0.58 }
-bg[PRELIGHT] = { 0.84, 0.89, 0.81 }
-
-fg[NORMAL] = { 0.0, 0.0, 0.0 }
-fg[SELECTED] = { 0.9, 0.9, 0.9 }
-fg[ACTIVE] = { 0.33, 0.2, 0.0 }
-fg[PRELIGHT] = { 0.5, 0.1, 0.0 }
-
-text[INSENSITIVE] = { 0.60, 0.65, 0.57 }
-
-}
-
-style "ruler" = "default"
-{
-  font = "-adobe-helvetica-medium-r-normal--*-80-*-*-*-*-*-*"
-}
-
-
-widget_class "*Ruler*" style "ruler"
-widget_class "*" style "default"
--- a/9
+++ b/9
@ -60,9 +60,6 @@ echo "mkdir $2/gimpressionist/Presets"
 mkdir $2/gimpressionist/Presets
 echo "cp $1/palettes/* $2/palettes"
 cp $1/palettes/* $2/palettes
-
-if [ -r $HOME/.gtkrc ]
-then
-    echo "NOTICE: GIMP uses its own gtkrc file.  Your default .gtkrc will NOT"
-    echo "be used.  You may wish to edit GIMP's gtkrc (in $2/gtkrc)."
-fi
+echo "NOTICE: GIMP uses an additional gtkrc file so you can"
+echo "configure it to look differently than other GTK apps."
+ecco "You may wish to edit GIMP's gtkrc (in $2/gtkrc)."