ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2005-01-28 Mike Kestner <mkestner@novell.com>

Browse source 
* gtk/Dialog.custom : add a params array for button info to the ctor.
	* gtk/FileChooserDialog.custom : add a params array for button info to 
	both ctors.  Chain them to IntPtr.Zero.
	* gtk/Gtk.metadata : hide the ellipsis ctors for the dialog types.
	[Fixes #71818]
	* sample/GtkDemo/DemoDialog.cs : make the InteractiveDialog use the
	new Dialog ctor as it does in the c version.

svn path=/trunk/gtk-sharp/; revision=39713
This commit is contained in:
Mike Kestner 2005-01-28 16:03:27 +00:00
parent ccd3cebf9d
commit 289b127b10
7 changed files with 169 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-01-28 Mike Kestner <mkestner@novell.com>
* gtk/Dialog.custom : add a params array for button info to the ctor.
* gtk/FileChooserDialog.custom : add a params array for button info to
both ctors. Chain them to IntPtr.Zero.
* gtk/Gtk.metadata : hide the ellipsis ctors for the dialog types.
[Fixes #71818]
* sample/GtkDemo/DemoDialog.cs : make the InteractiveDialog use the
new Dialog ctor as it does in the c version.
2005-01-27 Mike Kestner <mkestner@novell.com> 2005-01-27 Mike Kestner <mkestner@novell.com>
* gtk/NodeSelection.cs : use new GetSelectedRows() overload. * gtk/NodeSelection.cs : use new GetSelectedRows() overload.

14
doc/en/Gtk/Dialog.xml
View file

@ -304,20 +304,22 @@ namespace GtkDialogSample
</Docs> </Docs>
</Member> </Member>
<Member MemberName=".ctor"> <Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags);" /> <MemberSignature Language="C#" Value="public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags, object [] button_data);" />
<MemberType>Constructor</MemberType> <MemberType>Constructor</MemberType>
<ReturnValue /> <ReturnValue />
<Parameters> <Parameters>
<Parameter Name="title" Type="System.String" /> <Parameter Name="title" Type="System.String" />
<Parameter Name="parent" Type="Gtk.Window" /> <Parameter Name="parent" Type="Gtk.Window" />
<Parameter Name="flags" Type="Gtk.DialogFlags" /> <Parameter Name="flags" Type="Gtk.DialogFlags" />
<Parameter Name="button_data" Type="System.Object[]" />
</Parameters> </Parameters>
<Docs> <Docs>
<summary>Creates a new dialog box.</summary> <summary>Creates a new dialog box.</summary>
<param name="title">an object of type <see cref="T:System.String" />.</param> <param name="title">a title <see cref="T:System.String" /></param>
<param name="parent">an object of type <see cref="T:Gtk.Window" />.</param> <param name="parent">a parent <see cref="T:Gtk.Window" />, or <see langword="null"/> for an unparented dialog.</param>
<param name="flags">an object of type <see cref="T:Gtk.DialogFlags" />.</param> <param name="flags">dialog characteristic such as modality and destruction policy.</param>
<returns>an object of type <see cref="T:Gtk.Dialog" />.</returns> <param name="button_data">a list of button text/response pairs if desired.</param>
<returns>a <see cref="T:Gtk.Dialog" /></returns>
<remarks> <remarks>
Creates a new <see cref="T:Gtk.Dialog" /> with the specified title and parent widget. Creates a new <see cref="T:Gtk.Dialog" /> with the specified title and parent widget.
The <see cref="T:Gtk.DialogFlags" /> argument can be used to make the dialog modal (<see cref="F:Gtk.DialogFlags.Modal" />) The <see cref="T:Gtk.DialogFlags" /> argument can be used to make the dialog modal (<see cref="F:Gtk.DialogFlags.Modal" />)
@ -532,4 +534,4 @@ namespace GtkDialogSample
</Docs> </Docs>
</Member> </Member>
</Members> </Members>
</Type> </Type>

191
doc/en/Gtk/FileChooserDialog.xml
View file

@ -10,7 +10,7 @@
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement> <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs> <Docs>
<summary>A dialog box for choosing files.</summary> <summary>A dialog box for choosing files.</summary>
<remarks>Similar to <see cref="T:Gtk.FileChooserWidget"/> but in a dialog.</remarks> <remarks>Similar to <see cref="T:Gtk.FileChooserWidget" /> but in a dialog.</remarks>
</Docs> </Docs>
<Base> <Base>
<BaseTypeName>Gtk.Dialog</BaseTypeName> <BaseTypeName>Gtk.Dialog</BaseTypeName>
@ -74,7 +74,7 @@
<Parameters /> <Parameters />
<Docs> <Docs>
<summary>Unselects all the files in the current folder of a file chooser.</summary> <summary>Unselects all the files in the current folder of a file chooser.</summary>
<remarks/> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="SetFilename"> <Member MemberName="SetFilename">
@ -88,11 +88,11 @@
</Parameters> </Parameters>
<Docs> <Docs>
<summary> <summary>
Sets <paramref name="filename"/> as the current filename for Sets <paramref name="filename" /> as the current filename for
the file chooser; the file chooser;
If the file name isn't in the current folder of the file chooser, then the If the file name isn't in the current folder of the file chooser, then the
current folder of the file chooser will be changed to the folder containing current folder of the file chooser will be changed to the folder containing
<paramref name="filename"/>. <paramref name="filename" />.
</summary> </summary>
<param name="filename">a <see cref="T:System.String" /></param> <param name="filename">a <see cref="T:System.String" /></param>
<returns>a <see cref="T:System.Boolean" />, true if both the <returns>a <see cref="T:System.Boolean" />, true if both the
@ -100,12 +100,12 @@
selected successfully, false otherwise. </returns> selected successfully, false otherwise. </returns>
<remarks> <remarks>
This is equivalent to a sequence of This is equivalent to a sequence of
<see cref="M:Gtk.FileChooser.UnselectAll"/> <see cref="M:Gtk.FileChooser.UnselectAll" />
followed by <see cref="M:Gtk.FileChooser.SelectFilename"/>. followed by <see cref="M:Gtk.FileChooser.SelectFilename" />.
Note that the file must exist, or nothing will be done except Note that the file must exist, or nothing will be done except
for the directory change. To pre-enter a filename for the user, as in for the directory change. To pre-enter a filename for the user, as in
a save-as dialog, use <see cref="M:Gtk.FileChooser.SetCurrentFilename"/>. a save-as dialog, use <see cref="M:Gtk.FileChooser.SetCurrentFilename" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -125,7 +125,7 @@
<param name="uri">a <see cref="T:System.String" /></param> <param name="uri">a <see cref="T:System.String" /></param>
<returns>a <see cref="T:System.Boolean" /></returns> <returns>a <see cref="T:System.Boolean" /></returns>
<remarks> <remarks>
See also <see cref="M:Gtk.FileChooser.AddShortcutFolderUri"/>. See also <see cref="M:Gtk.FileChooser.AddShortcutFolderUri" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -177,9 +177,9 @@
</Parameters> </Parameters>
<Docs> <Docs>
<summary> <summary>
Selects the file at <paramref name="uri"/>. If the URI doesn't refer to a Selects the file at <paramref name="uri" />. If the URI doesn't refer to a
file in the current folder of the file chooser, then the current folder of file in the current folder of the file chooser, then the current folder of
the file chooser will be changed to the folder that's part of <paramref name="uri"/> . the file chooser will be changed to the folder that's part of <paramref name="uri" /> .
</summary> </summary>
<param name="uri">a <see cref="T:System.String" /></param> <param name="uri">a <see cref="T:System.String" /></param>
<returns>a <see cref="T:System.Boolean" />, true if both the <returns>a <see cref="T:System.Boolean" />, true if both the
@ -199,10 +199,10 @@
<Parameter Name="filter" Type="Gtk.FileFilter" /> <Parameter Name="filter" Type="Gtk.FileFilter" />
</Parameters> </Parameters>
<Docs> <Docs>
<summary>Removes <paramref name="filter"/> from the list of filters that the user can select between.</summary> <summary>Removes <paramref name="filter" /> from the list of filters that the user can select between.</summary>
<param name="filter">a <see cref="T:Gtk.FileFilter" /></param> <param name="filter">a <see cref="T:Gtk.FileFilter" /></param>
<remarks> <remarks>
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="AddShortcutFolder"> <Member MemberName="AddShortcutFolder">
@ -241,7 +241,7 @@
<remarks> <remarks>
If the file name isn't in the current If the file name isn't in the current
folder of the file chooser, then the current folder of the file chooser will folder of the file chooser, then the current folder of the file chooser will
be changed to the folder containing <paramref name="filename"/>. be changed to the folder containing <paramref name="filename" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -276,7 +276,7 @@
</Parameters> </Parameters>
<Docs> <Docs>
<summary> <summary>
Adds <paramref name="filter"/> to the list of filters that the Adds <paramref name="filter" /> to the list of filters that the
user can select between. user can select between.
</summary> </summary>
<param name="filter">a <see cref="T:Gtk.FileFilter" /></param> <param name="filter">a <see cref="T:Gtk.FileFilter" /></param>
@ -299,7 +299,7 @@
<summary>Removes a folder from a file chooser's list of shortcut folders.</summary> <summary>Removes a folder from a file chooser's list of shortcut folders.</summary>
<param name="folder">a <see cref="T:System.String" /></param> <param name="folder">a <see cref="T:System.String" /></param>
<returns>a <see cref="T:System.Boolean" /></returns> <returns>a <see cref="T:System.Boolean" /></returns>
<remarks>See also <see cref="M:Gtk.FileChooser.AddShortcutFolder"/>.</remarks> <remarks>See also <see cref="M:Gtk.FileChooser.AddShortcutFolder" />.</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="UnselectUri"> <Member MemberName="UnselectUri">
@ -313,7 +313,7 @@
</Parameters> </Parameters>
<Docs> <Docs>
<summary> <summary>
Unselects the file referred to by <paramref name="uri"/>. Unselects the file referred to by <paramref name="uri" />.
</summary> </summary>
<param name="uri">a <see cref="T:System.String" /></param> <param name="uri">a <see cref="T:System.String" /></param>
<remarks> <remarks>
@ -354,7 +354,7 @@
</Parameters> </Parameters>
<Docs> <Docs>
<summary> <summary>
Sets the file referred to by <paramref name="uri"/> as the Sets the file referred to by <paramref name="uri" /> as the
current file for the the file chooser. current file for the the file chooser.
</summary> </summary>
<param name="uri">a <see cref="T:System.String" /></param> <param name="uri">a <see cref="T:System.String" /></param>
@ -364,13 +364,13 @@
<remarks> <remarks>
If the file name isn't in the current folder of the file chooser, If the file name isn't in the current folder of the file chooser,
then the current folder of the file chooser will be changed to the folder containing then the current folder of the file chooser will be changed to the folder containing
<paramref name="uri"/>. This is equivalent to a sequence of <paramref name="uri" />. This is equivalent to a sequence of
<see cref="M:Gtk.FileChooser.UnselectAll"/> <see cref="M:Gtk.FileChooser.UnselectAll" />
followed by <see cref="M:Gtk.FileChooserDialog.SelectUri"/>. followed by <see cref="M:Gtk.FileChooserDialog.SelectUri" />.
Note that the file must exist, or nothing will be done except Note that the file must exist, or nothing will be done except
for the directory change. To pre-enter a filename for the user, as in for the directory change. To pre-enter a filename for the user, as in
a save-as dialog, use <see cref="M:Gtk.FileChooserDialog.SetCurrentFilename"/>. a save-as dialog, use <see cref="M:Gtk.FileChooserDialog.SetCurrentFilename" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -452,51 +452,6 @@
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="title" Type="System.String" />
<Parameter Name="parent" Type="Gtk.Window" />
<Parameter Name="action" Type="Gtk.FileChooserAction" />
</Parameters>
<Docs>
<summary>Public constructor.</summary>
<param name="title">a <see cref="T:System.String" />, title for the dialog</param>
<param name="parent">a <see cref="T:Gtk.Window" />, parent window</param>
<param name="action">a <see cref="T:Gtk.FileChooserAction" />, the action this dialog should be doing</param>
<returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
<remarks>
</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action, string backend);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="title" Type="System.String" />
<Parameter Name="parent" Type="Gtk.Window" />
<Parameter Name="action" Type="Gtk.FileChooserAction" />
<Parameter Name="backend" Type="System.String" />
</Parameters>
<Docs>
<summary>Makes a new file chooser dialog with a specific
file chooser backend</summary>
<param name="title">a <see cref="T:System.String" /></param>
<param name="parent">a <see cref="T:Gtk.Window" /></param>
<param name="action">a <see cref="T:System.Int32" /></param>
<param name="backend">a <see cref="T:System.String" />, the backend name</param>
<returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
<remarks>
This is especially useful if you use
<see cref="P:Gtk.FileChooser.LocalOnly" /> to allow
non-local files and you use a more expressive vfs, such as gnome-vfs,
to load files.
</remarks>
</Docs>
</Member>
<Member MemberName="GType"> <Member MemberName="GType">
<MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" /> <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
<MemberType>Property</MemberType> <MemberType>Property</MemberType>
@ -591,10 +546,10 @@
accessible through the operating systems native file accessible through the operating systems native file
file system and therefore the application only file system and therefore the application only
needs to worry about the filename functions in needs to worry about the filename functions in
<see cref="T:Gtk.FileChooser"/>, like <see cref="T:Gtk.FileChooser" />, like
<see cref="M:Gtk.FileChooser.GetFilename"/>, <see cref="M:Gtk.FileChooser.GetFilename" />,
rather than the URI functions like rather than the URI functions like
<see cref="M:Gtk.FileChooser.GetUri"/>. <see cref="M:Gtk.FileChooser.GetUri" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -607,7 +562,7 @@
<Parameters /> <Parameters />
<Docs> <Docs>
<summary> <summary>
Sets whether the preview widget set by <see cref="M:Gtk.FileChooser.SetPreviewWidget"/> Sets whether the preview widget set by <see cref="M:Gtk.FileChooser.SetPreviewWidget" />
should be shown for the current filename. should be shown for the current filename.
</summary> </summary>
<returns>a <see cref="T:System.Boolean" /></returns> <returns>a <see cref="T:System.Boolean" /></returns>
@ -710,8 +665,8 @@
<returns>a <see cref="T:System.Boolean" /></returns> <returns>a <see cref="T:System.Boolean" /></returns>
<remarks> <remarks>
This is only relevant if the action is set to be This is only relevant if the action is set to be
<see cref="M:Gtk.FileChooserAction.Open"/> or <see cref="M:Gtk.FileChooserAction.Open" /> or
<see cref="M:Gtk.FileChooserAction.Save"/>. <see cref="M:Gtk.FileChooserAction.Save" />.
It cannot be set with either of the folder actions. It cannot be set with either of the folder actions.
</remarks> </remarks>
</Docs> </Docs>
@ -730,26 +685,26 @@
</summary> </summary>
<returns>a <see cref="T:Gtk.Widget" /></returns> <returns>a <see cref="T:Gtk.Widget" /></returns>
<remarks> <remarks>
<para> <para>
To implement a preview, after setting the To implement a preview, after setting the
preview widget, you connect to the preview widget, you connect to the
<see cref="E:Gtk.FileChooser.SelectionChanged"/> <see cref="E:Gtk.FileChooser.SelectionChanged" />
signal, and check signal, and check
<see cref="P:Gtk.FileChooser.PreviewFilename"/> or <see cref="P:Gtk.FileChooser.PreviewFilename" /> or
<see cref="P:Gtk.FileChooser.PreviewUri"/> <see cref="P:Gtk.FileChooser.PreviewUri" />
on each change. If you can on each change. If you can
display a preview of the new file, update your widget and display a preview of the new file, update your widget and
set the preview active using set the preview active using
<see cref="P:Gtk.FileChooser.PreviewWidgetActive"/> <see cref="P:Gtk.FileChooser.PreviewWidgetActive" />
Otherwise, set the preview inactive. Otherwise, set the preview inactive.
</para> </para>
<para> <para>
When there is no application-supplied preview widget, or the When there is no application-supplied preview widget, or the
application-supplied preview widget is not active, the file chooser application-supplied preview widget is not active, the file chooser
may display an internally generated preview of the current file or may display an internally generated preview of the current file or
it may display no preview at all. it may display no preview at all.
</para> </para>
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Action"> <Member MemberName="Action">
@ -768,8 +723,8 @@
<remarks> <remarks>
For example, For example,
an option to create a new folder might be shown if the action is an option to create a new folder might be shown if the action is
<see cref="M:Gtk.FileChooserAction.Save"/> but not if the action is <see cref="M:Gtk.FileChooserAction.Save" /> but not if the action is
<see cref="M:Gtk.FileChooserAction.Open"/>. <see cref="M:Gtk.FileChooserAction.Open" />.
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
@ -867,7 +822,7 @@
<Docs> <Docs>
<summary>This event is fired every time the selected file changes.</summary> <summary>This event is fired every time the selected file changes.</summary>
<remarks> <remarks>
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="FileActivated"> <Member MemberName="FileActivated">
@ -905,23 +860,22 @@
selected file changes. selected file changes.
</summary> </summary>
<remarks> <remarks>
<para>You should use this signal if you want your file chooser to have <para>You should use this signal if you want your file chooser to have
a preview widget.</para> a preview widget.</para>
<para>Once you have installed a preview widget with
<para>Once you have installed a preview widget with <see cref="P:Gtk.FileChooser.PreviewWidget" />, you should update it when this
<see cref="P:Gtk.FileChooser.PreviewWidget"/>, you should update it when this
signal is emitted. You can use the properties signal is emitted. You can use the properties
<see cref="P:Gtk.FileChooser.PreviewFilename"/> or <see cref="P:Gtk.FileChooser.PreviewFilename" /> or
<see cref="P:Gtk.FileChooser.PreviewUri"/> <see cref="P:Gtk.FileChooser.PreviewUri" />
to get the name of the file to preview. to get the name of the file to preview.
Your widget may not be able to preview all kinds of files; your callback Your widget may not be able to preview all kinds of files; your callback
must set <see cref="P:Gtk.FileChooser.PreviewWidgetActive"/> to inform the file must set <see cref="P:Gtk.FileChooser.PreviewWidgetActive" /> to inform the file
chooser about whether the preview was generated successfully or not. chooser about whether the preview was generated successfully or not.
</para> </para>
<para> <para>
TODO: insert example from gtkfilechooser-preview in gtk+ docs. TODO: insert example from gtkfilechooser-preview in gtk+ docs.
</para> </para>
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="CurrentFolderChanged"> <Member MemberName="CurrentFolderChanged">
@ -947,5 +901,60 @@
</remarks> </remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="protected FileChooserDialog ();" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action, object [] button_data);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="title" Type="System.String" />
<Parameter Name="parent" Type="Gtk.Window" />
<Parameter Name="action" Type="Gtk.FileChooserAction" />
<Parameter Name="button_data" Type="System.Object[]" />
</Parameters>
<Docs>
<summary>Creates a file chooser dialog.</summary>
<param name="title">a title <see cref="T:System.String" /></param>
<param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null"/>.</param>
<param name="action">an action, for example save or open.</param>
<param name="button_data">a list of button text/response pairs for buttons to be added to the dialog, if desired.</param>
<returns>a <see cref="T:Gtk.FileChooserDialog" /></returns>
<remarks />
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileChooserDialog (string title, Gtk.Window parent, Gtk.FileChooserAction action, string backend, object [] button_data);" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters>
<Parameter Name="title" Type="System.String" />
<Parameter Name="parent" Type="Gtk.Window" />
<Parameter Name="action" Type="Gtk.FileChooserAction" />
<Parameter Name="backend" Type="System.String" />
<Parameter Name="button_data" Type="System.Object[]" />
</Parameters>
<Docs>
<summary>Creates a file chooser dialog with a specific file chooser backend</summary>
<param name="title">a title <see cref="T:System.String" /></param>
<param name="parent">a parent <see cref="T:Gtk.Window" /> for the dialog, or <see langword="null"/>.</param>
<param name="action">an action, for example save or open.</param>
<param name="backend">a <see cref="T:System.String" />, the backend name</param>
<param name="button_data">a list of button text/response pairs for buttons to be added to the dialog, if desired.</param>
<remarks>
This is especially useful if you use <see cref="P:Gtk.FileChooser.LocalOnly" /> to allow
non-local files and you use a more expressive vfs, such as gnome-vfs, to load files.
</remarks>
</Docs>
</Member>
</Members> </Members>
</Type> </Type>

10
gtk/Dialog.custom
View file

@ -24,10 +24,9 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
// Manually wrap until we figure out how to gen ellipses.
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern IntPtr gtk_dialog_new_with_buttons (string title, IntPtr i, int flags, IntPtr dummy); static extern IntPtr gtk_dialog_new_with_buttons (string title, IntPtr i, int flags, IntPtr dummy);
public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags) : base(IntPtr.Zero) public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags, params object[] button_data) : base(IntPtr.Zero)
{ {
if (GetType() != typeof (Dialog)) { if (GetType() != typeof (Dialog)) {
GLib.Value[] vals = new GLib.Value [1]; GLib.Value[] vals = new GLib.Value [1];
@ -42,10 +41,11 @@ public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags) : base(In
DestroyWithParent = true; DestroyWithParent = true;
if ((flags & DialogFlags.NoSeparator) > 0) if ((flags & DialogFlags.NoSeparator) > 0)
HasSeparator = false; HasSeparator = false;
return; } else
} Raw = gtk_dialog_new_with_buttons (title, parent.Handle, (int) flags, IntPtr.Zero);
Raw = gtk_dialog_new_with_buttons (title, parent.Handle, (int) flags, IntPtr.Zero); for (int i = 0; i < button_data.Length - 1; i += 2)
AddButton ((string) button_data [i], (int) button_data [i + 1]);
} }
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]

20
gtk/FileChooserDialog.custom
View file

@ -23,7 +23,7 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern IntPtr gtk_file_chooser_dialog_new(string title, IntPtr parent, int action, IntPtr nil); static extern IntPtr gtk_file_chooser_dialog_new(string title, IntPtr parent, int action, IntPtr nil);
public FileChooserDialog (string title, Window parent, FileChooserAction action) public FileChooserDialog (string title, Window parent, FileChooserAction action, params object[] button_data) : base (IntPtr.Zero)
{ {
if (GetType () != typeof (FileChooserDialog)) { if (GetType () != typeof (FileChooserDialog)) {
CreateNativeObject (new string[0], new GLib.Value[0]); CreateNativeObject (new string[0], new GLib.Value[0]);
@ -31,15 +31,17 @@
if (parent != null) if (parent != null)
TransientFor = parent; TransientFor = parent;
Action = action; Action = action;
return; } else
} Raw = gtk_file_chooser_dialog_new (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, IntPtr.Zero);
Raw = gtk_file_chooser_dialog_new (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, IntPtr.Zero);
for (int i = 0; i < button_data.Length - 1; i += 2)
AddButton ((string) button_data [i], (int) button_data [i + 1]);
} }
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern IntPtr gtk_file_chooser_dialog_new_with_backend(string title, IntPtr parent, int action, string backend, IntPtr nil); static extern IntPtr gtk_file_chooser_dialog_new_with_backend(string title, IntPtr parent, int action, string backend, IntPtr nil);
public FileChooserDialog (string title, Window parent, FileChooserAction action, string backend) public FileChooserDialog (string title, Window parent, FileChooserAction action, string backend, params object[] button_data) : base (IntPtr.Zero)
{ {
if (GetType () != typeof (FileChooserDialog)) { if (GetType () != typeof (FileChooserDialog)) {
CreateNativeObject (new string[] { "file-system-backend" }, new GLib.Value[] { new GLib.Value (backend) } ); CreateNativeObject (new string[] { "file-system-backend" }, new GLib.Value[] { new GLib.Value (backend) } );
@ -47,9 +49,11 @@
if (parent != null) if (parent != null)
TransientFor = parent; TransientFor = parent;
Action = action; Action = action;
return; } else
} Raw = gtk_file_chooser_dialog_new_with_backend (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, backend, IntPtr.Zero);
Raw = gtk_file_chooser_dialog_new_with_backend (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, backend, IntPtr.Zero);
for (int i = 0; i < button_data.Length - 1; i += 2)
AddButton ((string) button_data [i], (int) button_data [i + 1]);
} }
[DllImport ("libgtk-win32-2.0-0.dll")] [DllImport ("libgtk-win32-2.0-0.dll")]

4
gtk/Gtk.metadata
View file

@ -158,7 +158,7 @@
<attr path="/api/namespace/object[@cname='GtkContainer']/signal[@name='Remove']" name="name">Removed</attr> <attr path="/api/namespace/object[@cname='GtkContainer']/signal[@name='Remove']" name="name">Removed</attr>
<attr path="/api/namespace/object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr> <attr path="/api/namespace/object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr>
<attr path="/api/namespace/object[@cname='GtkContainer']/method[@cname='gtk_container_child_type']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GtkContainer']/method[@cname='gtk_container_child_type']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/constructor[@cname='gtk_dialog_new_with_buttons']/*/*[@type='GtkWindow*']" name="null_ok">1</attr> <attr path="/api/namespace/object[@cname='GtkDialog']/constructor[@cname='gtk_dialog_new_with_buttons']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr> <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetDefaultResponse']/*/*[@name='response_id']" name="type">GtkResponseType</attr> <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetDefaultResponse']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetResponseSensitive']/*/*[@name='response_id']" name="type">GtkResponseType</attr> <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetResponseSensitive']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
@ -170,6 +170,8 @@
<attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr> <attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
<attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr> <attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr>
<attr path="/api/namespace/object[@cname='GtkExpander']/constructor[@cname='gtk_expander_new_with_mnemonic']" name="preferred">1</attr> <attr path="/api/namespace/object[@cname='GtkExpander']/constructor[@cname='gtk_expander_new_with_mnemonic']" name="preferred">1</attr>
<attr path="/api/namespace/object[@cname='GtkFileChooserDialog']/constructor[@cname='gtk_file_chooser_dialog_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkFileChooserDialog']/constructor[@cname='gtk_file_chooser_dialog_new_with_backend']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkFileSelection']/method[@name='GetSelections']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GtkFileSelection']/method[@name='GetSelections']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkFilePath']" name="parent">GObject</attr> <attr path="/api/namespace/object[@cname='GtkFilePath']" name="parent">GObject</attr>
<attr path="/api/namespace/object[@cname='GtkExpander']/signal[@name='Activate']" name="name">Activated</attr> <attr path="/api/namespace/object[@cname='GtkExpander']/signal[@name='Activate']" name="name">Activated</attr>

76
sample/GtkDemo/DemoDialog.cs
View file

@ -10,12 +10,6 @@
* Dialog widgets are used to pop up a transient window for user feedback. * Dialog widgets are used to pop up a transient window for user feedback.
*/ */
// TODO: - Couldn't find a good equivalent to gtk_dialog_new_with_buttons
// in InteractiveDialogClicked
// - Check how to handle response type. Can we make the button to have
// the binding to the cancel signal automagicly like in
// gtk_dialog_new_with_buttons or should we just use the if ?
using System; using System;
using Gtk; using Gtk;
@ -102,49 +96,41 @@ namespace GtkDemo
private void InteractiveDialogClicked (object o, EventArgs args) private void InteractiveDialogClicked (object o, EventArgs args)
{ {
using (MessageDialog dialog = new MessageDialog (this, Dialog dialog = new Dialog ("Interactive Dialog", this, DialogFlags.Modal | DialogFlags.DestroyWithParent, Gtk.Stock.Ok, ResponseType.Ok, "_Non-stock Button", ResponseType.Cancel);
DialogFlags.Modal | DialogFlags.DestroyWithParent,
MessageType.Question, HBox hbox = new HBox (false, 8);
ButtonsType.Ok, hbox.BorderWidth = 8;
null)) { dialog.VBox.PackStart (hbox, false, false, 0);
Table table = new Table (2, 2, false);
table.RowSpacing = 4;
table.ColumnSpacing = 4;
hbox.PackStart (table, false, false, 0);
Label label = new Label ("_Entry1");
table.Attach (label, 0, 1, 0, 1);
Entry localEntry1 = new Entry();
localEntry1.Text = entry1.Text;
table.Attach (localEntry1, 1, 2, 0, 1);
label.MnemonicWidget = localEntry1;
label = new Label ("E_ntry2");
table.Attach (label, 0, 1, 1, 2);
Entry localEntry2 = new Entry();
localEntry2.Text = entry2.Text;
table.Attach (localEntry2, 1, 2, 1, 2);
label.MnemonicWidget = localEntry2;
dialog.AddButton ("_Non-stock Button", (int) ResponseType.Cancel); hbox.ShowAll ();
HBox hbox = new HBox (false, 8);
hbox.BorderWidth = 8;
dialog.VBox.PackStart (hbox, false, false, 0);
Table table = new Table (2, 2, false);
table.RowSpacing = 4;
table.ColumnSpacing = 4;
hbox.PackStart (table, false, false, 0);
Label label = new Label ("_Entry1");
table.Attach (label, 0, 1, 0, 1);
Entry localEntry1 = new Entry();
localEntry1.Text = entry1.Text;
table.Attach (localEntry1, 1, 2, 0, 1);
label.MnemonicWidget = localEntry1;
label = new Label ("E_ntry2");
table.Attach (label, 0, 1, 1, 2);
Entry localEntry2 = new Entry();
localEntry2.Text = entry2.Text;
table.Attach (localEntry2, 1, 2, 1, 2);
label.MnemonicWidget = localEntry2;
hbox.ShowAll ();
ResponseType response = (ResponseType) dialog.Run (); ResponseType response = (ResponseType) dialog.Run ();
if (response == ResponseType.Ok) if (response == ResponseType.Ok) {
{ entry1.Text = localEntry1.Text;
entry1.Text = localEntry1.Text; entry2.Text = localEntry2.Text;
entry2.Text = localEntry2.Text; }
}
dialog.Hide (); dialog.Destroy ();
}
} }
} }
} }