Update SourceView to version 3.6.

gtkd-developers · Oct 7, 2012 · b134c03 · b134c03
1 parent 1025b2b
commit b134c03
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 18 deletions.
diff --git a/srcsv/gsv/SourceCompletion.d b/srcsv/gsv/SourceCompletion.d
@@ -400,7 +400,7 @@ public class SourceCompletion : ObjectG
 	 * Params:
 	 * providers = a list of GtkSourceCompletionProvider, or NULL. [element-type GtkSource.CompletionProvider][allow-none]
 	 * context = The GtkSourceCompletionContext
-	 * with which to start the completion. [transfer full]
+	 * with which to start the completion. [transfer floating]
 	 * Returns: TRUE if it was possible to the show completion window.
 	 */
 	public int show(ListG providers, SourceCompletionContext context)
@@ -440,7 +440,7 @@ public class SourceCompletion : ObjectG
 	 */
 	public SourceView getView()
 	{
-		// struct _GtkSourceView * gtk_source_completion_get_view (GtkSourceCompletion *completion);
+		// GtkSourceView * gtk_source_completion_get_view (GtkSourceCompletion *completion);
 		auto p = gtk_source_completion_get_view(gtkSourceCompletion);
 		if(p is null)
 		{
@@ -455,7 +455,7 @@ public class SourceCompletion : ObjectG
 	 * the current cursor position will be used.
 	 * Params:
 	 * position = a GtkTextIter, or NULL. [allow-none]
-	 * Returns: a new GtkSourceCompletionContext. The reference being returned is a 'floating' reference, so if you invoke gtk_source_completion_show with this context you don't need to unref it. [transfer full]
+	 * Returns: a new GtkSourceCompletionContext. The reference being returned is a 'floating' reference, so if you invoke gtk_source_completion_show with this context you don't need to unref it. [transfer floating]
 	 */
 	public SourceCompletionContext createContext(TextIter position)
 	{

diff --git a/srcsv/gsv/SourceCompletionContext.d b/srcsv/gsv/SourceCompletionContext.d
@@ -23,7 +23,7 @@
 
 /*
  * Conversion parameters:
- * inFile  = gtksourceview-3.0-completioncontext.html
+ * inFile  = GtkSourceCompletionContext.html
  * outPack = gsv
  * outFile = SourceCompletionContext
  * strct   = GtkSourceCompletionContext
@@ -76,6 +76,17 @@ private import gobject.ObjectG;
 
 /**
  * Description
+ * A completion context is created when a completion occurs. The completion can
+ * be activated by several means, listed in GtkSourceCompletionActivation.
+ * The completion can be activated by user request, i.e. when the user presses
+ * Control+space, by default.
+ * The completion can also be activated interactively, on each insertion or
+ * deletion in the GtkTextBuffer.
+ * A GtkTextIter is associated with the context, this is where the completion
+ * takes place. With this GtkTextIter, you can get the associated
+ * GtkTextBuffer with gtk_text_iter_get_buffer().
+ * Once the context is created, the eligible providers are asked to add
+ * proposals with gtk_source_completion_context_add_proposals().
  */
 public class SourceCompletionContext : ObjectG
 {

diff --git a/srcsv/gsv/SourceCompletionProviderIF.d b/srcsv/gsv/SourceCompletionProviderIF.d
@@ -113,7 +113,8 @@ public interface SourceCompletionProviderIF
 	public Pixbuf gtkSourceCompletionProviderGetIcon();
 
 	/**
-	 * Populate context with proposals from provider.
+	 * Populate context with proposals from provider added with the
+	 * gtk_source_completion_context_add_proposals() function.
 	 * Params:
 	 * context = a GtkSourceCompletionContext.
 	 */

diff --git a/srcsv/gsv/SourceCompletionProviderT.d b/srcsv/gsv/SourceCompletionProviderT.d
@@ -130,7 +130,8 @@ public template SourceCompletionProviderT(TStruct)
 	}
 
 	/**
-	 * Populate context with proposals from provider.
+	 * Populate context with proposals from provider added with the
+	 * gtk_source_completion_context_add_proposals() function.
 	 * Params:
 	 * context = a GtkSourceCompletionContext.
 	 */

diff --git a/srcsv/gsv/SourceView.d b/srcsv/gsv/SourceView.d
@@ -277,11 +277,14 @@ public class SourceView : TextView
 
 	void delegate(SourceView)[] onShowCompletionListeners;
 	/**
-	 * The ::show-completion signal is a keybinding signal which gets
-	 * emitted when the user initiates a completion in default mode.
+	 * The ::show-completion signal is a key binding signal which gets
+	 * emitted when the user requests a completion, by pressing
+	 * Control+space.
+	 * This will create a GtkSourceCompletionContext with the activation
+	 * type as GTK_SOURCE_COMPLETION_ACTIVATION_USER_REQUESTED.
 	 * Applications should not connect to it, but may emit it with
-	 * g_signal_emit_by_name if they need to control the default mode
-	 * completion activation.
+	 * g_signal_emit_by_name() if they need to activate the completion by
+	 * another means, for example with another key binding or a menu entry.
 	 */
 	void addOnShowCompletion(void delegate(SourceView) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
 	{

diff --git a/srcsv/gsvc/gsv.d b/srcsv/gsvc/gsv.d
@@ -404,7 +404,7 @@ mixin( gshared ~"extern(C)
 
 	// gsv.SourceCompletionContext
 
-	void function(GtkSourceCompletionContext* context, void* provider, GList* proposals, gboolean finished) c_gtk_source_completion_context_add_proposals;
+	void function(GtkSourceCompletionContext* context, GtkSourceCompletionProvider* provider, GList* proposals, gboolean finished) c_gtk_source_completion_context_add_proposals;
 	void function(GtkSourceCompletionContext* context, GtkTextIter* iter) c_gtk_source_completion_context_get_iter;
 	GtkSourceCompletionActivation function(GtkSourceCompletionContext* context) c_gtk_source_completion_context_get_activation;
 

diff --git a/srcsv/gsvc/gsvtypes.d b/srcsv/gsvc/gsvtypes.d
@@ -52,12 +52,16 @@ public enum GtkSourceCompletionActivation
 alias GtkSourceCompletionActivation SourceCompletionActivation;
 
 /**
- * GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL: normal state
- * GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR: area in the renderer represents the
+ * GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL
+ * normal state
+ * GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR
+ * area in the renderer represents the
  * line on which the insert cursor is currently positioned
- * GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT: the mouse pointer is currently
+ * GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT
+ * the mouse pointer is currently
  * over the activatable area of the renderer
- * GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED: area in the renderer represents
+ * GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED
+ * area in the renderer represents
  * a line in the buffer which contains part of the selection
  */
 public enum GtkSourceGutterRendererState

diff --git a/wrap/APILookupSourceView.txt b/wrap/APILookupSourceView.txt
@@ -116,7 +116,7 @@ structWrap: GtkSourceView* SourceView
 structWrap: GtkTextIter* TextIter
 outFile: SourceCompletion
 
-file: gtksourceview-3.0-completioncontext.html
+file: GtkSourceCompletionContext.html
 struct: GtkSourceCompletionContext
 class: SourceCompletionContext
 prefix: gtk_source_completion_context_

diff --git a/wrap/downloadFiles.sh b/wrap/downloadFiles.sh
@@ -40,8 +40,8 @@ curl -L http://ftp.gnome.org/pub/GNOME/sources/libgda/1.2/libgda-1.2.4.tar.gz |
 ln -s  libgda-1.2.4/doc/C/html gda
 
 #gtkSourceView
-curl http://developer.gnome.org/gtksourceview/gtksourceview-html-3.4.2.tar.gz | tar xvfz -
-ln -s gtksourceview-html-3.4.2 sourceview
+curl http://developer.gnome.org/gtksourceview/gtksourceview-html-3.6.0.tar.gz | tar xvfz -
+ln -s gtksourceview-html-3.6.0 sourceview
 
 #gstreamer
 curl http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.14.tar.gz | tar xvfz -