[gnome-calendar] Improved autotools files.
- From: Erick PÃrez Castellanos <erickpc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] Improved autotools files.
- Date: Tue, 21 Aug 2012 12:40:00 +0000 (UTC)
commit 5742f8e4599560c05388f2f7957c0e3caf8e523e
Author: Erick PÃrez Castellanos <erick red gmail com>
Date: Sun Aug 19 03:03:38 2012 -0400
Improved autotools files.
Moved all the style data to a theme directory ala gnome-shell.
Added close-window.svg image.
Added gcal-marshalers.list and rules to Makefile.am to generate the correct
source and header.
Note: The absence of this changes about the marshallers generation was
making imposible to compile the changes about GcalView API. This will complete
that commit.
Makefile.am | 11 +--
configure.ac | 3 +-
data/Makefile.am | 15 ++--
data/theme/close-window.svg | 152 +++++++++++++++++++++++++++++++++++++++
data/{ => theme}/gtk-styles.css | 34 +++++----
src/Makefile.am | 47 +++++++++++-
src/gcal-marshalers.list | 1 +
7 files changed, 231 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 11c62fa..1b3b0a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,17 +15,14 @@ INTLTOOL_FILES = \
intltool-merge.in \
intltool-update.in
-EXTRA_DIST = \
- $(gnome_calendardoc_DATA) \
- $(INTLTOOL_FILES) \
+EXTRA_DIST = \
+ $(gnome_calendardoc_DATA) \
+ $(INTLTOOL_FILES) \
THANKS \
TODO \
autogen.sh
-CLEANFILES = \
- AUTHORS
-
-DISTCLEANFILES = \
+DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
diff --git a/configure.ac b/configure.ac
index 5a539c2..77369dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# require automake 1.11
AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE
dnl ***************************************************************************
dnl Internationalization
@@ -50,6 +50,7 @@ dnl ================================================================
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS(maximum)
GNOME_MAINTAINER_MODE_DEFINES
diff --git a/data/Makefile.am b/data/Makefile.am
index c173b62..67b3b4c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,14 +17,15 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
styledir = $(pkgdatadir)/style
-dist_style_DATA = \
- gtk-styles.css
+dist_style_DATA = \
+ theme/gtk-styles.css \
+ theme/close-window.svg
-EXTRA_DIST= \
- gnome-calendar.desktop \
- $(desktop_in_files) \
+EXTRA_DIST= \
+ gnome-calendar.desktop \
+ $(desktop_in_files) \
$(gsettingsschema_in_files)
-CLEANFILES = \
- $(desktop_DATA) \
+CLEANFILES = \
+ $(desktop_DATA) \
$(gsettings_SCHEMAS)
diff --git a/data/theme/close-window.svg b/data/theme/close-window.svg
new file mode 100644
index 0000000..10bbef9
--- /dev/null
+++ b/data/theme/close-window.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.0"
+ id="Foreground"
+ x="0px"
+ y="0px"
+ width="32"
+ height="32"
+ viewBox="0 0 23.272727 23.272727"
+ enable-background="new 0 0 16 16"
+ xml:space="preserve"
+ sodipodi:version="0.32"
+ inkscape:version="0.48+devel r10081 custom"
+ sodipodi:docname="close-window.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+ id="metadata2399"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs2397"><linearGradient
+ id="linearGradient3173"><stop
+ style="stop-color:#c4c4c4;stop-opacity:1;"
+ offset="0"
+ id="stop3175" /><stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3177" /></linearGradient><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 8 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="16 : 8 : 1"
+ inkscape:persp3d-origin="8 : 5.3333333 : 1"
+ id="perspective2401" /><filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter16494-4"
+ x="-0.20989846"
+ width="1.4197969"
+ y="-0.20903821"
+ height="1.4180764"><feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.3282637"
+ id="feGaussianBlur16496-8" /></filter><radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient16498-6"
+ id="radialGradient16504-1"
+ cx="7.6582627"
+ cy="5.8191104"
+ fx="7.6582627"
+ fy="5.8191104"
+ r="8.6928644"
+ gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ inkscape:collect="always"
+ id="linearGradient16498-6"><stop
+ style="stop-color:#7b7b7b;stop-opacity:1"
+ offset="0"
+ id="stop16500-8" /><stop
+ style="stop-color:#101010;stop-opacity:1"
+ offset="1"
+ id="stop16502-0" /></linearGradient><filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter16524-9"
+ x="-0.212979"
+ width="1.425958"
+ y="-0.21305652"
+ height="1.426113"><feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.71020915"
+ id="feGaussianBlur16526-0" /></filter></defs><sodipodi:namedview
+ inkscape:window-height="1114"
+ inkscape:window-width="1463"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#000000"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="10.720189"
+ inkscape:cy="13.739577"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:current-layer="Foreground"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ borderlayer="true"
+ inkscape:showpageshadow="false"
+ inkscape:window-maximized="0"><inkscape:grid
+ type="xygrid"
+ id="grid11246"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+<g
+ style="display:inline"
+ id="g16402-8"
+ transform="translate(4.7533483,2.8238929)"><g
+ id="g3175-4"><path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="0"
+ inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
+ xlink:href="#path2394-32"
+ style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
+ id="path16480-5"
+ inkscape:href="#path2394-32"
+ d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
+ transform="translate(0,1.028519)" /><path
+ clip-rule="evenodd"
+ d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
+ id="path2394-32"
+ style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0" /><g
+ id="g3172-6" /></g><g
+ transform="matrix(0.72727273,0,0,0.72727273,2.368236,2.1803254)"
+ style="fill:#ffffff;fill-opacity:1;display:inline"
+ id="g27275-6-6"
+ inkscape:label="window-close"><g
+ style="fill:#ffffff;fill-opacity:1;display:inline"
+ id="g27277-1-1"
+ transform="translate(-41,-760)"><path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="0"
+ inkscape:original="M 44.21875 764.1875 L 44.21875 765.1875 C 44.19684 765.46825 44.289258 765.74287 44.5 765.9375 L 46.78125 768.21875 L 44.5 770.46875 C 44.31181 770.65692 44.218747 770.92221 44.21875 771.1875 L 44.21875 772.1875 L 45.21875 772.1875 C 45.48404 772.1875 45.749336 772.09444 45.9375 771.90625 L 48.21875 769.625 L 50.5 771.90625 C 50.688164 772.0944 50.953449 772.18749 51.21875 772.1875 L 52.21875 772.1875 L 52.21875 771.1875 C 52.218742 770.9222 52.125688 770.65692 51.9375 770.46875 L 49.6875 768.21875 L 51.96875 765.9375 C 52.18441 765.73815 52.21875 765.47397 52.21875 765.1875 L 52.21875 764.1875 L 51.21875 764.1875 C 50.977922 764.1945 50.796875 764.2695 50.53125 764.5 L 48.21875 766.78125 L 45.9375 764.5 C 45.75987 764.31608 45.504951 764.1987 45.25 764.1875 C 45.23954 764.18704 45.22912 764.18738 45.21875 764.1875 L 44.21875 764.1875 z "
+ xlink:href="#path27279-0-5"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16524-9);enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ id="path16506-5"
+ inkscape:href="#path27279-0-5"
+ d="m 44.21875,764.1875 0,1 c -0.02191,0.28075 0.07051,0.55537 0.28125,0.75 l 2.28125,2.28125 -2.28125,2.25 c -0.18819,0.18817 -0.281253,0.45346 -0.28125,0.71875 l 0,1 1,0 c 0.26529,0 0.530586,-0.0931 0.71875,-0.28125 L 48.21875,769.625 50.5,771.90625 c 0.188164,0.18815 0.453449,0.28124 0.71875,0.28125 l 1,0 0,-1 c -8e-6,-0.2653 -0.09306,-0.53058 -0.28125,-0.71875 l -2.25,-2.25 2.28125,-2.28125 c 0.21566,-0.19935 0.25,-0.46353 0.25,-0.75 l 0,-1 -1,0 c -0.240828,0.007 -0.421875,0.082 -0.6875,0.3125 l -2.3125,2.28125 L 45.9375,764.5 c -0.17763,-0.18392 -0.432549,-0.3013 -0.6875,-0.3125 -0.01046,-4.6e-4 -0.02088,-1.2e-4 -0.03125,0 l -1,0 z"
+ transform="translate(0,1.3535534)" /><path
+ sodipodi:nodetypes="ccsccccccccccccccccccccccc"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+ id="path27279-0-5"
+ inkscape:connector-curvature="0"
+ d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z" /></g></g></g></svg>
\ No newline at end of file
diff --git a/data/gtk-styles.css b/data/theme/gtk-styles.css
similarity index 79%
rename from data/gtk-styles.css
rename to data/theme/gtk-styles.css
index 53b2da1..dc70e03 100644
--- a/data/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -33,20 +33,6 @@ GtkClutterOffscreen.contents .frame {
padding: 2px;
}
-.sources-views {
- padding: 12px;
- border-radius: 0;
- border-style: none;
-
- background-image: -gtk-gradient(linear, left top, left bottom,
- from(@osd_toolbar_bg_a),
- color-stop(0.63, @osd_toolbar_bg_b),
- to(@osd_toolbar_bg_c));
-
- color: @osd_fg;
- background-color: @osd_bg;
-}
-
.osd.view {
color: @osd_fg;
background-color: transparent;
@@ -54,6 +40,7 @@ GtkClutterOffscreen.contents .frame {
.calendar-view header {
font: bold 12;
+ padding: 12px;
}
.calendar-view {
@@ -64,6 +51,7 @@ GtkClutterOffscreen.contents .frame {
.calendar-view:selected {
color: #0C73E5;
+ background-color: shade (#fff, 0.5);
font: bold;
}
@@ -109,3 +97,21 @@ GtkClutterOffscreen.overlay .frame {
GtkClutterOffscreen.overlay .frame * {
color: @theme_fg_color;
}
+
+GtkOverlay > GtkButton {
+ padding-top: 0px;
+ padding-right: 0px;
+ background-color: transparent;
+ background-image: none;
+ border: 0;
+}
+
+.new-event-view {
+ padding: 18px;
+ border-radius: 3px;
+ border: darkblue 1px solid;
+ color: @theme_fg_color;
+ background-color: @theme_bg_color;
+ -GcalArrowContainer-arrow-size: 12px;
+ -GcalArrowContainer-shadow-span: 6px;
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index cd0f9a6..f38f72b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@ AM_CFLAGS = \
bin_PROGRAMS = gnome-calendar
BUILT_SOURCES = \
+ gcal-marshalers.c \
+ gcal-marshalers.h \
gcal-enum-types.c \
gcal-enum-types.h
@@ -69,17 +71,56 @@ gnome_calendar_LDADD = \
ENUM_TYPES = \
gcal-utils.h
+if MAINTAINER_MODE
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ stamp-gcal-marshalers.h \
+ xgen-ac \
+ xgen-ah \
+ xgen-etbc \
+ xgen-etbh \
+ xgen-tmc \
+ xgen-tmh \
+ $(NULL)
+
gcal-enum-types.h: gcal-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.h.template $(ENUM_TYPES)) > $@
gcal-enum-types.c: gcal-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.c.template $(ENUM_TYPES)) > $@
+gcal-marshalers.h: stamp-gcal-marshalers.h
+ @true
+
+stamp-gcal-marshalers.h: gcal-marshalers.list Makefile
+ $(AM_V_GEN) ( \
+ cd $(srcdir) \
+ && ( glib-genmarshal \
+ --prefix=_gcal_marshal \
+ --header gcal-marshalers.list ) >> xgen-tmh \
+ && ( cmp -s xgen-tmh gcal-marshalers.h || cp xgen-tmh gcal-marshalers.h ) \
+ && rm -f xgen-tmh \
+ && echo timestamp > $(@F) \
+ )
+
+gcal-marshalers.c: gcal-marshalers.list gcal-marshalers.h Makefile
+ $(AM_V_GEN) ( \
+ cd $(srcdir) \
+ && echo "#include \"gcal-marshalers.h\"" > xgen-tmc \
+ && ( glib-genmarshal \
+ --prefix=_gcal_marshal \
+ --body gcal-marshalers.list ) >> xgen-tmc \
+ && cp xgen-tmc gcal-marshalers.c \
+ && rm -f xgen-tmc \
+ )
+
+endif
+
EXTRA_DIST = \
gcal-enum-types.h.template \
- gcal-enum-types.c.template
-
-CLEANFILES = $(BUILT_SOURCES)
+ gcal-enum-types.c.template \
+ gcal-marshalers.list
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/src/gcal-marshalers.list b/src/gcal-marshalers.list
new file mode 100644
index 0000000..d205cad
--- /dev/null
+++ b/src/gcal-marshalers.list
@@ -0,0 +1 @@
+VOID:POINTER,POINTER,DOUBLE,DOUBLE
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
