Commit 6baa568f authored by Bastien Nocera's avatar Bastien Nocera Committed by Bastien Nocera

reviewed by: Matthias Clasen <mclasen@redhat.com>

2007-05-19  Bastien Nocera  <hadess@hadess.net>

	reviewed by: Matthias Clasen <mclasen@redhat.com>

	* gtk/Makefile.am:
	* gtk/gtk.h:
	* gtk/gtk.symbols:
	* gtk/gtkscalebutton.[ch]: Add the GtkScaleButton widget,
	a button that pops up a scale when pressed

2007-05-19  Bastien Nocera  <hadess@hadess.net>

	* POTFILES.in: Add scale button to the list

2007-05-20  Bastien Nocera  <hadess@hadess.net>

	* gtk/gtk-docs.sgml:
	* gtk/gtk-sections.txt: add the GtkScaleButton widget
	to the docs


svn path=/trunk/; revision=17876
parent dc1ccf64
2007-05-19 Bastien Nocera <hadess@hadess.net>
reviewed by: Matthias Clasen <mclasen@redhat.com>
* gtk/Makefile.am:
* gtk/gtk.h:
* gtk/gtk.symbols:
* gtk/gtkscalebutton.[ch]: Add the GtkScaleButton widget,
a button that pops up a scale when pressed
2007-05-19 Matthias Clasen <mclasen@redhat.com> 2007-05-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols: * gtk/gtk.symbols:
......
2007-05-20 Bastien Nocera <hadess@hadess.net>
* gtk/gtk-docs.sgml:
* gtk/gtk-sections.txt: add the GtkScaleButton widget
to the docs
2007-05-19 Matthias Clasen <mclasen@redhat.com> 2007-05-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-sections.txt: Add gtk_notebook_[gs]et_group * gtk/gtk-sections.txt: Add gtk_notebook_[gs]et_group
......
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<!ENTITY GtkRecentManager SYSTEM "xml/gtkrecentmanager.xml"> <!ENTITY GtkRecentManager SYSTEM "xml/gtkrecentmanager.xml">
<!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml"> <!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml">
<!ENTITY GtkScale SYSTEM "xml/gtkscale.xml"> <!ENTITY GtkScale SYSTEM "xml/gtkscale.xml">
<!ENTITY GtkScaleButton SYSTEM "xml/gtkscalebutton.xml">
<!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml"> <!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml">
<!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml"> <!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml">
<!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml"> <!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml">
...@@ -391,6 +392,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or ...@@ -391,6 +392,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
&GtkButton; &GtkButton;
&GtkCheckButton; &GtkCheckButton;
&GtkRadioButton; &GtkRadioButton;
&GtkScaleButton;
&GtkToggleButton; &GtkToggleButton;
&GtkLinkButton; &GtkLinkButton;
</chapter> </chapter>
......
...@@ -3021,9 +3021,11 @@ gtk_scale_get_type ...@@ -3021,9 +3021,11 @@ gtk_scale_get_type
<TITLE>GtkScaleButton</TITLE> <TITLE>GtkScaleButton</TITLE>
GtkScaleButton GtkScaleButton
gtk_scale_button_new gtk_scale_button_new
gtk_scale_button_set_adjustment
gtk_scale_button_set_icons
gtk_scale_button_set_value gtk_scale_button_set_value
gtk_scale_button_get_adjustment
gtk_scale_button_get_value gtk_scale_button_get_value
gtk_scale_button_set_icons
<SUBSECTION Standard> <SUBSECTION Standard>
GTK_SCALE_BUTTON GTK_SCALE_BUTTON
GTK_SCALE_IS_BUTTON GTK_SCALE_IS_BUTTON
......
...@@ -259,6 +259,7 @@ gtk_public_h_sources = \ ...@@ -259,6 +259,7 @@ gtk_public_h_sources = \
gtkrecentmanager.h \ gtkrecentmanager.h \
gtkruler.h \ gtkruler.h \
gtkscale.h \ gtkscale.h \
gtkscalebutton.h \
gtkscrollbar.h \ gtkscrollbar.h \
gtkscrolledwindow.h \ gtkscrolledwindow.h \
gtkselection.h \ gtkselection.h \
...@@ -533,6 +534,7 @@ gtk_base_c_sources = \ ...@@ -533,6 +534,7 @@ gtk_base_c_sources = \
gtkrecentmanager.c \ gtkrecentmanager.c \
gtkruler.c \ gtkruler.c \
gtkscale.c \ gtkscale.c \
gtkscalebutton.c \
gtkscrollbar.c \ gtkscrollbar.c \
gtkscrolledwindow.c \ gtkscrolledwindow.c \
gtkselection.c \ gtkselection.c \
......
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
#include <gtk/gtkrecentmanager.h> #include <gtk/gtkrecentmanager.h>
#include <gtk/gtkruler.h> #include <gtk/gtkruler.h>
#include <gtk/gtkscale.h> #include <gtk/gtkscale.h>
#include <gtk/gtkscalebutton.h>
#include <gtk/gtkscrollbar.h> #include <gtk/gtkscrollbar.h>
#include <gtk/gtkscrolledwindow.h> #include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkselection.h> #include <gtk/gtkselection.h>
......
...@@ -3234,6 +3234,18 @@ gtk_scale_set_value_pos ...@@ -3234,6 +3234,18 @@ gtk_scale_set_value_pos
#endif #endif
#endif #endif
#if IN_HEADER(__GTK_SCALE_BUTTON_H__)
#if IN_FILE(__GTK_SCALE_BUTTON_C__)
gtk_scale_button_get_type G_GNUC_CONST
gtk_scale_button_get_value
gtk_scale_button_new
gtk_scale_button_set_icons
gtk_scale_button_set_value
gtk_scale_button_get_adjustment
gtk_scale_button_set_adjustment
#endif
#endif
#if IN_HEADER(__GTK_SCROLLBAR_H__) #if IN_HEADER(__GTK_SCROLLBAR_H__)
#if IN_FILE(__GTK_SCROLLBAR_C__) #if IN_FILE(__GTK_SCROLLBAR_C__)
gtk_scrollbar_get_type G_GNUC_CONST gtk_scrollbar_get_type G_GNUC_CONST
......
This diff is collapsed.
/* GTK - The GIMP Toolkit
* Copyright (C) 2005 Ronald S. Bultje
* Copyright (C) 2006, 2007 Christian Persch
* Copyright (C) 2006 Jan Arne Petersen
* Copyright (C) 2007 Red Hat, Inc.
*
* Authors:
* - Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* - Bastien Nocera <bnocera@redhat.com>
* - Jan Arne Petersen <jpetersen@jpetersen.org>
* - Christian Persch <chpe@svn.gnome.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 2007. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_SCALE_BUTTON_H__
#define __GTK_SCALE_BUTTON_H__
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
#define GTK_TYPE_SCALE_BUTTON (gtk_scale_button_get_type ())
#define GTK_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButton))
#define GTK_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
#define GTK_IS_SCALE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON))
#define GTK_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE_BUTTON))
#define GTK_SCALE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE_BUTTON, GtkScaleButtonClass))
typedef struct _GtkScaleButton GtkScaleButton;
typedef struct _GtkScaleButtonClass GtkScaleButtonClass;
typedef struct _GtkScaleButtonPrivate GtkScaleButtonPrivate;
struct _GtkScaleButtonClass
{
GtkButtonClass parent_class;
/* signals */
void (* value_changed) (GtkScaleButton *button, gdouble value);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
struct _GtkScaleButton
{
GtkButton parent;
GtkWidget *plus_button;
GtkWidget *minus_button;
GtkScaleButtonPrivate *priv;
};
GType gtk_scale_button_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_scale_button_new (GtkIconSize size,
gdouble min,
gdouble max,
gdouble step,
const gchar **icons);
void gtk_scale_button_set_icons (GtkScaleButton *button,
const gchar **icons);
gdouble gtk_scale_button_get_value (GtkScaleButton *button);
void gtk_scale_button_set_value (GtkScaleButton *button,
gdouble value);
GtkAdjustment* gtk_scale_button_get_adjustment (GtkScaleButton *button);
void gtk_scale_button_set_adjustment (GtkScaleButton *button,
GtkAdjustment *adjustment);
G_END_DECLS
#endif /* __GTK_SCALE_BUTTON_H__ */
2007-05-19 Bastien Nocera <hadess@hadess.net>
* POTFILES.in: Add scale button to the list
2007-05-20 Yair Hershkovitz <yairhr@gmail.com> 2007-05-20 Yair Hershkovitz <yairhr@gmail.com>
* he.po: Updated Hebrew translation. * he.po: Updated Hebrew translation.
......
...@@ -173,6 +173,7 @@ gtk/gtkrecentchoosermenu.c ...@@ -173,6 +173,7 @@ gtk/gtkrecentchoosermenu.c
gtk/gtkrecentmanager.c gtk/gtkrecentmanager.c
gtk/gtkruler.c gtk/gtkruler.c
gtk/gtkscale.c gtk/gtkscale.c
gtk/gtkscalebutton.c
gtk/gtkscrollbar.c gtk/gtkscrollbar.c
gtk/gtkscrolledwindow.c gtk/gtkscrolledwindow.c
gtk/gtkselection.c gtk/gtkselection.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment