[gimp/gtk3-port: 226/227] foo
- From: Clayton Walker <claytonw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 226/227] foo
- Date: Mon, 21 Oct 2013 21:37:23 +0000 (UTC)
commit 04c6bf3a64a28db6b1dcfaea9e8f5f6f1c0fc42c
Author: Michael Natterer <mitch gimp org>
Date: Wed Feb 22 22:50:17 2012 +0100
foo
Makefile.am | 2 +-
app/display/gimpdisplayshell.c | 26 ++++++++++++++++----------
plug-ins/Makefile.am | 6 +++---
plug-ins/common/Makefile.am | 4 ++--
4 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 37aae62..19e36b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = \
$(GIMP_MODULES) \
$(GIMP_PLUGINS) \
etc \
- devel-docs \
+## devel-docs \
docs \
build
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 32867bc..0507f7d 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -185,14 +185,6 @@ G_DEFINE_TYPE_WITH_CODE (GimpDisplayShell, gimp_display_shell,
static guint display_shell_signals[LAST_SIGNAL] = { 0 };
-static const gchar display_rc_style[] =
- "style \"check-button-style\"\n"
- "{\n"
- " GtkToggleButton::child-displacement-x = 0\n"
- " GtkToggleButton::child-displacement-y = 0\n"
- "}\n"
- "widget \"*\" style \"check-button-style\"";
-
static void
gimp_display_shell_class_init (GimpDisplayShellClass *klass)
{
@@ -284,8 +276,6 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass)
g_param_spec_object ("icon", NULL, NULL,
GDK_TYPE_PIXBUF,
GIMP_PARAM_READWRITE));
-
- gtk_rc_parse_string (display_rc_style);
}
static void
@@ -297,9 +287,25 @@ gimp_color_managed_iface_init (GimpColorManagedInterface *iface)
static void
gimp_display_shell_init (GimpDisplayShell *shell)
{
+ GtkCssProvider *css;
+ const gchar *str;
+
gtk_orientable_set_orientation (GTK_ORIENTABLE (shell),
GTK_ORIENTATION_VERTICAL);
+ str =
+ "GimpDisplayShell GtkCheckButton {\n"
+ " -GtkButton-child-displacement-x: 0;\n"
+ " -GtkButton-child-displacement-y: 0;\n"
+ "}\n";
+
+ css = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (css, str, -1, NULL);
+ gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (shell)),
+ GTK_STYLE_PROVIDER (css),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ g_object_unref (css);
+
shell->options = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
shell->fullscreen_options = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
shell->no_image_options = g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_NO_IMAGE, NULL);
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 50eb645..e9360fb 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -58,7 +58,7 @@ endif
SUBDIRS = \
$(script_fu) \
- $(pygimp) \
+## $(pygimp) \
color-rotate \
file-bmp \
$(file_compressor) \
@@ -74,11 +74,11 @@ SUBDIRS = \
flame \
fractal-explorer \
gfig \
- gimpressionist \
+## gimpressionist \
gradient-flare \
help \
$(help_browser) \
- ifs-compose \
+## ifs-compose \
imagemap \
lighting \
map-object \
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 441aae7..96647fb 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -46,7 +46,7 @@ AM_CPPFLAGS = \
libexec_PROGRAMS = \
align-layers \
animation-optimize \
- animation-play \
+## animation-play \
apply-canvas \
blinds \
blur \
@@ -69,7 +69,7 @@ libexec_PROGRAMS = \
contrast-stretch-hsv \
convolution-matrix \
crop-zealous \
- curve-bend \
+## curve-bend \
decompose \
deinterlace \
depth-merge \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]