Commit 68acf78c authored by Cosimo Cecchi's avatar Cosimo Cecchi

level-bar: introduce GtkLevelBar

Similar to CcStrengthBar from gnome-control-center, but more generic and
with thorough CSS styling support.

https://bugzilla.gnome.org/show_bug.cgi?id=677892
parent 129d3f09
......@@ -102,6 +102,7 @@
<xi:include href="xml/gtklabel.xml" />
<xi:include href="xml/gtkprogressbar.xml" />
<xi:include href="xml/gtkstatusbar.xml" />
<xi:include href="xml/gtklevelbar.xml" />
<xi:include href="xml/gtkinfobar.xml" />
<xi:include href="xml/gtkstatusicon.xml" />
<xi:include href="xml/gtkspinner.xml" />
......
......@@ -3247,6 +3247,38 @@ GtkStatusIconPrivate
gtk_status_icon_get_type
</SECTION>
<SECTION>
<FILE>gtklevelbar</FILE>
<TITLE>GtkLevelBar</TITLE>
GTK_LEVEL_BAR_OFFSET_LOW
GTK_LEVEL_BAR_OFFSET_HIGH
GtkLevelBarMode
GtkLevelBar
gtk_level_bar_new
gtk_level_bar_new_for_interval
gtk_level_bar_set_mode
gtk_level_bar_get_mode
gtk_level_bar_set_value
gtk_level_bar_get_value
gtk_level_bar_set_min_value
gtk_level_bar_get_min_value
gtk_level_bar_set_max_value
gtk_level_bar_get_max_value
gtk_level_bar_add_offset_value
gtk_level_bar_remove_offset_value
gtk_level_bar_get_offset_value
<SUBSECTION Standard>
GTK_LEVEL_BAR
GTK_IS_LEVEL_BAR
GTK_TYPE_LEVEL_BAR
GTK_LEVEL_BAR_CLASS
GTK_IS_LEVEL_BAR_CLASS
GTK_LEVEL_BAR_GET_CLASS
<SUBSECTION Private>
GtkLevelBarPrivate
gtk_level_bar_get_type
</SECTION>
<SECTION>
<FILE>gtktable</FILE>
<TITLE>GtkTable</TITLE>
......@@ -5721,6 +5753,7 @@ GTK_STYLE_CLASS_RIGHT
GTK_STYLE_CLASS_LINKED
GTK_STYLE_CLASS_ARROW
GTK_STYLE_CLASS_OSD
GTK_STYLE_CLASS_LEVEL_BAR
GTK_STYLE_REGION_COLUMN
GTK_STYLE_REGION_COLUMN_HEADER
GTK_STYLE_REGION_ROW
......
......@@ -157,6 +157,7 @@ gtk_spinner_get_type
gtk_statusbar_get_type
gtk_status_icon_get_type
gtk_switch_get_type
gtk_level_bar_get_type
gtk_style_get_type
gtk_style_context_get_type
gtk_style_provider_get_type
......
......@@ -90,6 +90,7 @@
<link linkend="GtkCalendar">GtkCalendar</link>
<link linkend="GtkProgressBar">GtkProgressBar</link>
<link linkend="GtkStatusbar">GtkStatusbar</link>
<link linkend="GtkStrengthBar">GtkStrengthBar</link>
<link linkend="GtkHRuler">GtkHRuler</link>
<link linkend="GtkVRuler">GtkVRuler</link>
<link linkend="GtkHScrollbar">GtkHScrollbar</link>
......
......@@ -265,6 +265,7 @@ gtk_public_h_sources = \
gtkinvisible.h \
gtklabel.h \
gtklayout.h \
gtklevelbar.h \
gtklinkbutton.h \
gtkliststore.h \
gtklockbutton.h \
......@@ -729,6 +730,7 @@ gtk_base_c_sources = \
gtkkeyhash.c \
gtklabel.c \
gtklayout.c \
gtklevelbar.c \
gtklinkbutton.c \
gtkliststore.c \
gtklockbutton.c \
......
......@@ -122,6 +122,7 @@
#include <gtk/gtkinvisible.h>
#include <gtk/gtklabel.h>
#include <gtk/gtklayout.h>
#include <gtk/gtklevelbar.h>
#include <gtk/gtklinkbutton.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtklockbutton.h>
......
......@@ -2566,6 +2566,21 @@ gtk_switch_get_active
gtk_switch_get_type
gtk_switch_new
gtk_switch_set_active
gtk_level_bar_get_type
gtk_level_bar_new
gtk_level_bar_new_for_interval
gtk_level_bar_set_mode
gtk_level_bar_get_mode
gtk_level_bar_set_value
gtk_level_bar_get_value
gtk_level_bar_set_min_value
gtk_level_bar_get_min_value
gtk_level_bar_set_max_value
gtk_level_bar_get_max_value
gtk_level_bar_add_offset_value
gtk_level_bar_remove_offset_value
gtk_level_bar_get_offset_value
gtk_level_bar_mode_get_type
gtk_style_apply_default_background
gtk_style_attach
gtk_style_context_add_class
......
......@@ -932,6 +932,22 @@ typedef enum {
GTK_BORDER_STYLE_RIDGE
} GtkBorderStyle;
/**
* GtkLevelBarMode:
* @GTK_LEVEL_BAR_MODE_CONTINUOUS: the bar has a continuous mode
* @GTK_LEVEL_BAR_MODE_DISCRETE: the bar has a discrete mode
*
* Describes how #GtkLevelBar contents should be rendered.
* Note that this enumeration could be extended with additional modes
* in the future.
*
* Since: 3.6
*/
typedef enum {
GTK_LEVEL_BAR_MODE_CONTINUOUS,
GTK_LEVEL_BAR_MODE_DISCRETE
} GtkLevelBarMode;
G_END_DECLS
......
This diff is collapsed.
/* GTK - The GIMP Toolkit
* Copyright © 2012 Red Hat, Inc.
*
* 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, see <http://www.gnu.org/licenses/>.
*
* Author: Cosimo Cecchi <cosimoc@gnome.org>
*
*/
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_LEVEL_BAR_H__
#define __GTK_LEVEL_BAR_H__
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
#define GTK_TYPE_LEVEL_BAR (gtk_level_bar_get_type ())
#define GTK_LEVEL_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LEVEL_BAR, GtkLevelBar))
#define GTK_LEVEL_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LEVEL_BAR, GtkLevelBarClass))
#define GTK_IS_LEVEL_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LEVEL_BAR))
#define GTK_IS_LEVEL_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LEVEL_BAR))
#define GTK_LEVEL_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LEVEL_BAR, GtkLevelBarClass))
/**
* GTK_LEVEL_BAR_OFFSET_LOW:
*
* The name used for the stock low offset included by #GtkLevelBar.
*
* Since: 3.6
*/
#define GTK_LEVEL_BAR_OFFSET_LOW "low"
/**
* GTK_LEVEL_BAR_OFFSET_HIGH:
*
* The name used for the stock high offset included by #GtkLevelBar.
*
* Since: 3.6
*/
#define GTK_LEVEL_BAR_OFFSET_HIGH "high"
typedef struct _GtkLevelBarClass GtkLevelBarClass;
typedef struct _GtkLevelBar GtkLevelBar;
typedef struct _GtkLevelBarPrivate GtkLevelBarPrivate;
struct _GtkLevelBar {
/*< private >*/
GtkWidget parent;
GtkLevelBarPrivate *priv;
};
struct _GtkLevelBarClass {
/*< private >*/
GtkWidgetClass parent_class;
void (* offset_changed) (GtkLevelBar *self,
const gchar *name);
/* padding for future class expansion */
gpointer padding[16];
};
GDK_AVAILABLE_IN_3_6
GType gtk_level_bar_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_6
GtkWidget *gtk_level_bar_new (void);
GDK_AVAILABLE_IN_3_6
GtkWidget *gtk_level_bar_new_for_interval (gdouble min_value,
gdouble max_value);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_set_mode (GtkLevelBar *self,
GtkLevelBarMode mode);
GDK_AVAILABLE_IN_3_6
GtkLevelBarMode gtk_level_bar_get_mode (GtkLevelBar *self);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_set_value (GtkLevelBar *self,
gdouble value);
GDK_AVAILABLE_IN_3_6
gdouble gtk_level_bar_get_value (GtkLevelBar *self);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_set_min_value (GtkLevelBar *self,
gdouble value);
GDK_AVAILABLE_IN_3_6
gdouble gtk_level_bar_get_min_value (GtkLevelBar *self);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_set_max_value (GtkLevelBar *self,
gdouble value);
GDK_AVAILABLE_IN_3_6
gdouble gtk_level_bar_get_max_value (GtkLevelBar *self);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_add_offset_value (GtkLevelBar *self,
const gchar *name,
gdouble value);
GDK_AVAILABLE_IN_3_6
void gtk_level_bar_remove_offset_value (GtkLevelBar *self,
const gchar *name);
GDK_AVAILABLE_IN_3_6
gboolean gtk_level_bar_get_offset_value (GtkLevelBar *self,
const gchar *name,
gdouble *value);
G_END_DECLS
#endif /* __GTK_LEVEL_BAR_H__ */
......@@ -691,6 +691,16 @@ struct _GtkStyleContextClass
*/
#define GTK_STYLE_CLASS_OSD "osd"
/**
* GTK_STYLE_CLASS_LEVEL_BAR:
*
* A CSS class used when rendering a level indicator, such
* as a battery charge level, or a password strength.
*
* This is used by #GtkLevelBar.
*/
#define GTK_STYLE_CLASS_LEVEL_BAR "level-bar"
/* Predefined set of widget regions */
/**
......
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