[Goodies-commits] r7489 - in xfce4-notes-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-06-06 21:12:43 +0000 (Sat, 06 Jun 2009)
New Revision: 7489

Added:
   xfce4-notes-plugin/trunk/panel-plugin/color.vapi
Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
   xfce4-notes-plugin/trunk/panel-plugin/application.vala
   xfce4-notes-plugin/trunk/panel-plugin/defines.h
Log:
Milestone reached

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-06-06 20:52:11 UTC (rev 7488)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-06-06 21:12:43 UTC (rev 7489)
@@ -1,5 +1,16 @@
 2009-06-06  Mike Massonnet <mmassonnet at xfce.org>
 
+Milestone reached
+	* panel-plugin/Makefile.am:
+	  - Build the new Vala sources to C, and the C sources to the binary.
+	* panel-plugin/color.vapi:
+	  - Ability to use the functions in color.h in the Vala sources.
+	* panel-plugin/application.vala:
+	  - Uncomment the last little bit that was missing: setting the
+	  background color.
+
+2009-06-06  Mike Massonnet <mmassonnet at xfce.org>
+
 Forgot config.vapi
 	* panel-plugin/config.vapi:
 	  - Links to most declarations from config.h for Vala sources.

Modified: xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-06 20:52:11 UTC (rev 7488)
+++ xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-06 21:12:43 UTC (rev 7489)
@@ -41,15 +41,17 @@
 #
 if MAINTAINER_MODE
 xfce4_notes_plugin_VALASOURCES =					\
+	main.vala							\
+	application.vala						\
+	window.vala							\
+	note.vala							\
 	hypertextview.vala
 
-vala_built_SOURCES =							\
-	$(xfce4_notes_plugin_VALASOURCES:.vala=.c)			\
-	$(xfce4_notes_plugin_VALASOURCES:.vala=.h)
+vala_built_SOURCES = $(xfce4_notes_plugin_VALASOURCES:.vala=.c)
 
 BUILT_SOURCES = vala.stamp
 vala.stamp: $(xfce4_notes_plugin_VALASOURCES)
-	$(VALAC) --pkg=gtk+-2.0 $^ -C -H vala-objects.h
+	$(VALAC) --vapidir=. --pkg=config --pkg=color --pkg=libxfconf-0 --pkg=libxfce4panel-1.0 $^ -C
 	touch $@
 endif
 
@@ -60,14 +62,8 @@
 plugin_PROGRAMS = xfce4-notes-plugin
 
 xfce4_notes_plugin_SOURCES =						\
-	defines.h							\
-	xfce-arrow-button.c						\
-	xfce-arrow-button.h						\
 	color.c								\
 	color.h								\
-	panel-plugin.c							\
-	notes.c								\
-	notes.h
 xfce4_notes_plugin_SOURCES += $(vala_built_SOURCES)
 
 xfce4_notes_plugin_CFLAGS =						\
@@ -106,6 +102,9 @@
 EXTRA_DIST =								\
 	$(desktop_in_in_files) $(xfce4_notes_plugin_VALASOURCES)
 
+CLEANFILES =								\
+	$(BUILT_SOURCES) $(vala_built_SOURCES)
+
 DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files) $(BUILT_SOURCES) $(vala_built_SOURCES)
+	$(desktop_DATA) $(desktop_in_files)
 

Modified: xfce4-notes-plugin/trunk/panel-plugin/application.vala
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/application.vala	2009-06-06 20:52:11 UTC (rev 7488)
+++ xfce4-notes-plugin/trunk/panel-plugin/application.vala	2009-06-06 21:12:43 UTC (rev 7489)
@@ -39,7 +39,7 @@
 
 			xfconf_channel.property_changed += (channel, prop, val) => {
 				if (prop == "/global/background-color") {
-					// TODO Xnp.Color.set_background (val);
+					Xnp.Color.set_background (val.get_string ());
 				}
 			};
 

Added: xfce4-notes-plugin/trunk/panel-plugin/color.vapi
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/color.vapi	                        (rev 0)
+++ xfce4-notes-plugin/trunk/panel-plugin/color.vapi	2009-06-06 21:12:43 UTC (rev 7489)
@@ -0,0 +1,7 @@
+[CCode (cprefix = "", lower_case_prefix = "", cheader_filename = "color.h")]
+namespace Xnp.Color {
+	[CCode (cname = "color_set_background")]
+	public static void set_background (string color);
+	[CCode (cname = "__gdk_color_constrast")]
+	public static void contrast (Gdk.Color color, double contrast);
+}

Modified: xfce4-notes-plugin/trunk/panel-plugin/defines.h
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/defines.h	2009-06-06 20:52:11 UTC (rev 7488)
+++ xfce4-notes-plugin/trunk/panel-plugin/defines.h	2009-06-06 21:12:43 UTC (rev 7489)
@@ -42,7 +42,7 @@
 #define SIZE_SMALL                      240
 #define SIZE_NORMAL                     305
 #define SIZE_LARGE                      340
-#define SIZE_FACTOR                     1.15
+#define SIZE_FACTOR                     1.25
 
 /* Background color values */
 #define BACKGROUND_YELLOW               "#ECDE79"