diff options
Diffstat (limited to 'docs/reference/gtk')
| -rw-r--r-- | docs/reference/gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-docs.sgml | 10 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk3-sections.txt | 60 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk3.types | 3 | ||||
| -rw-r--r-- | docs/reference/gtk/images/colorchooser.png | bin | 0 -> 16019 bytes | |||
| -rw-r--r-- | docs/reference/gtk/images/fontchooser.png | bin | 0 -> 63622 bytes | |||
| -rw-r--r-- | docs/reference/gtk/visual_index.xml | 6 |
7 files changed, 77 insertions, 4 deletions
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 54f3c7a33d..5099c337a3 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -287,6 +287,7 @@ HTML_IMAGES = \ $(srcdir)/images/check-button.png \ $(srcdir)/images/color-button.png \ $(srcdir)/images/colorsel.png \ + $(srcdir)/images/colorchooser.png \ $(srcdir)/images/combo-box.png \ $(srcdir)/images/combo-box-entry.png \ $(srcdir)/images/entry.png \ @@ -296,6 +297,7 @@ HTML_IMAGES = \ $(srcdir)/images/filechooser.png \ $(srcdir)/images/font-button.png \ $(srcdir)/images/fontsel.png \ + $(srcdir)/images/fontchooser.png \ $(srcdir)/images/frame.png \ $(srcdir)/images/icon-view.png \ $(srcdir)/images/image.png \ diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 06b94b6167..c435070341 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -209,18 +209,22 @@ <chapter id="SelectorWidgets"> <title>Selectors (Color/File/Font)</title> + <xi:include href="xml/gtkcolorchooser.xml" /> <xi:include href="xml/gtkcolorbutton.xml" /> - <xi:include href="xml/gtkcolorseldlg.xml" /> + <xi:include href="xml/gtkcolorchooserwidget.xml" /> + <xi:include href="xml/gtkcolorchooserdialog.xml" /> <xi:include href="xml/gtkcolorsel.xml" /> + <xi:include href="xml/gtkcolorseldlg.xml" /> <xi:include href="xml/gtkhsv.xml" /> <xi:include href="xml/gtkfilechooser.xml" /> <xi:include href="xml/gtkfilechooserbutton.xml" /> <xi:include href="xml/gtkfilechooserdialog.xml" /> <xi:include href="xml/gtkfilechooserwidget.xml" /> <xi:include href="xml/gtkfilefilter.xml" /> - <xi:include href="xml/gtkfontbutton.xml" /> <xi:include href="xml/gtkfontchooser.xml" /> - <xi:include href="xml/gtkfontchooserdlg.xml" /> + <xi:include href="xml/gtkfontbutton.xml" /> + <xi:include href="xml/gtkfontchooserwidget.xml" /> + <xi:include href="xml/gtkfontchooserdialog.xml" /> <xi:include href="xml/gtkfontsel.xml" /> <xi:include href="xml/gtkfontseldlg.xml" /> </chapter> diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index 393e274eff..4674beb913 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -1535,7 +1535,7 @@ gtk_font_chooser_widget_get_type </SECTION> <SECTION> -<FILE>gtkfontchooserdlg</FILE> +<FILE>gtkfontchooserdialog</FILE> <TITLE>GtkFontChooserDialog</TITLE> GtkFontChooserDialog gtk_font_chooser_dialog_new @@ -7298,3 +7298,61 @@ GtkOverlayClass gtk_overlay_get_type GtkOverlayPrivate </SECTION> + +<SECTION> +<FILE>gtkcolorchooser</FILE> +<TITLE>GtkColorChooser</TITLE> +GtkColorChooser +gtk_color_chooser_get_rgba +gtk_color_chooser_set_rgba +gtk_color_chooser_get_use_alpha +gtk_color_chooser_set_use_alpha +gtk_color_chooser_add_palette + +<SUBSECTION Standard> +GTK_TYPE_COLOR_CHOOSER +GTK_COLOR_CHOOSER +GTK_IS_COLOR_CHOOSER +GTK_COLOR_CHOOSER_GET_IFACE + +<SUBSECTION Private> +gtk_color_chooser_get_type +</SECTION> + +<SECTION> +<FILE>gtkcolorchooserwidget</FILE> +<TITLE>GtkColorChooserWidget</TITLE> +GtkColorChooserWidget +gtk_color_chooser_widget_new + +<SUBSECTION Standard> +GTK_TYPE_COLOR_CHOOSER_WIDGET +GTK_COLOR_CHOOSER_WIDGET +GTK_COLOR_CHOOSER_WIDGET_CLASS +GTK_IS_COLOR_CHOOSER_WIDGET +GTK_IS_COLOR_CHOOSER_WIDGET_CLASS +GTK_COLOR_CHOOSER_WIDGET_GET_CLASS + +<SUBSECTION Private> +gtk_color_chooser_widget_get_type +GtkColorChooserWidgetPrivate +</SECTION> + +<SECTION> +<FILE>gtkcolorchooserdialog</FILE> +<TITLE>GtkColorChooserDialog</TITLE> +GtkColorChooserDialog +gtk_color_chooser_dialog_new + +<SUBSECTION Standard> +GTK_TYPE_COLOR_CHOOSER_DIALOG +GTK_COLOR_CHOOSER_DIALOG +GTK_COLOR_CHOOSER_DIALOG_CLASS +GTK_IS_COLOR_CHOOSER_DIALOG +GTK_IS_COLOR_CHOOSER_DIALOG_CLASS +GTK_COLOR_CHOOSER_DIALOG_GET_CLASS + +<SUBSECTION Private> +GtkColorChooserDialogPrivate +gtk_color_chooser_dialog_get_type +</SECTION> diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types index 7fe92ad4cb..c67ac722a0 100644 --- a/docs/reference/gtk/gtk3.types +++ b/docs/reference/gtk/gtk3.types @@ -47,6 +47,9 @@ gtk_check_button_get_type gtk_check_menu_item_get_type gtk_clipboard_get_type gtk_color_button_get_type +gtk_color_chooser_get_type +gtk_color_chooser_dialog_get_type +gtk_color_chooser_widget_get_type gtk_color_selection_dialog_get_type gtk_color_selection_get_type gtk_combo_box_get_type diff --git a/docs/reference/gtk/images/colorchooser.png b/docs/reference/gtk/images/colorchooser.png Binary files differnew file mode 100644 index 0000000000..fcdabf0081 --- /dev/null +++ b/docs/reference/gtk/images/colorchooser.png diff --git a/docs/reference/gtk/images/fontchooser.png b/docs/reference/gtk/images/fontchooser.png Binary files differnew file mode 100644 index 0000000000..38e3e8f81c --- /dev/null +++ b/docs/reference/gtk/images/fontchooser.png diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index 37cc0ec6cf..7fb63932d4 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -135,4 +135,10 @@ <link linkend="GtkSwitch"> <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic> </link> + <link linkend="GtkColorChooserDialog"> + <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic> + </link> + <link linkend="GtkFontChooserDialog"> + <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic> + </link> </para> |
