Commit 1d647df1 authored by Matthias Clasen's avatar Matthias Clasen

Add a lock button widget

This is a special-purpose button that can be used together with
GPermission objects to control the sensitivity of system settings.

Suitable permission objects can e.g. be obtained from PolicyKit.

http://bugzilla.gnome.org/show_bug.cgi?id=626457
parent 5cb3f5ff
......@@ -296,6 +296,9 @@ HTML_IMAGES = \
$(srcdir)/images/label.png \
$(srcdir)/images/link-button.png \
$(srcdir)/images/list-and-tree.png \
$(srcdir)/images/lockbutton-locked.png \
$(srcdir)/images/lockbutton-unlocked.png \
$(srcdir)/images/lockbutton-sorry.png \
$(srcdir)/images/menubar.png \
$(srcdir)/images/messagedialog.png \
$(srcdir)/images/multiline-text.png \
......
......@@ -115,6 +115,7 @@
<xi:include href="xml/gtkscalebutton.xml" />
<xi:include href="xml/gtkvolumebutton.xml" />
<xi:include href="xml/gtkswitch.xml" />
<xi:include href="xml/gtklockbutton.xml" />
</chapter>
<chapter id="NumericEntry">
......
......@@ -7048,3 +7048,25 @@ GTK_APP_CHOOSER_WIDGET_GET_CLASS
GtkAppChooserWidgetPrivate
gtk_app_chooser_widget_get_type
</SECTION>
<SECTION>
<FILE>gtklockbutton</FILE>
<TITLE>GtkLockButton</TITLE>
GtkLockButton
gtk_lock_button_new
gtk_lock_button_get_permission
gtk_lock_button_set_permission
<SUBSECTION Standard>
GtkLockButtonClass
GTK_TYPE_LOCK_BUTTON
GTK_LOCK_BUTTON
GTK_IS_LOCK_BUTTON
GTK_LOCK_BUTTON_CLASS
GTK_IS_LOCK_BUTTON_CLASS
GTK_LOCK_BUTTON_GET_CLASS
<SUBSECTION Private>
gtk_lock_button_get_type
GtkLockButtonPrivate
</SECTION>
......@@ -92,6 +92,7 @@ gtk_label_get_type
gtk_layout_get_type
gtk_link_button_get_type
gtk_list_store_get_type
gtk_lock_button_get_type
gtk_menu_bar_get_type
gtk_menu_get_type
gtk_menu_item_get_type
......
......@@ -51,6 +51,9 @@
<link linkend="GtkLinkButton">
<inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic>
</link>
<link linkend="GtkLockButton">
<inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic>
</link>
<link linkend="GtkMenuBar">
<inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
</link>
......
......@@ -221,6 +221,54 @@ create_link_button (void)
return new_widget_info ("link-button", align, SMALL);
}
#define G_TYPE_TEST_PERMISSION (g_test_permission_get_type ())
#define G_TEST_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
G_TYPE_TEST_PERMISSION, \
GTestPermission))
#define G_IS_TEST_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
G_TYPE_TEST_PERMISSION))
typedef struct _GTestPermission GTestPermission;
typedef struct _GTestPermissionClass GTestPermissionClass;
struct _GTestPermission
{
GPermission parent;
gboolean success;
};
struct _GTestPermissionClass
{
GPermissionClass parent_class;
};
G_DEFINE_TYPE (GTestPermission, g_test_permission, G_TYPE_PERMISSION)
static void
g_test_permission_init (GTestPermission *test)
{
g_permission_impl_update (G_PERMISSION (test), FALSE, TRUE, TRUE);
}
static void
g_test_permission_class_init (GTestPermissionClass *class)
{
}
static WidgetInfo *
create_lockbutton (void)
{
GtkWidget *widget;
GtkWidget *align;
widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
return new_widget_info ("lock-button", align, SMALL);
}
static WidgetInfo *
create_entry (void)
{
......@@ -1152,6 +1200,7 @@ get_all_widgets (void)
retval = g_list_prepend (retval, create_switch ());
retval = g_list_prepend (retval, create_appchooserbutton ());
retval = g_list_prepend (retval, create_appchooserdialog ());
retval = g_list_prepend (retval, create_lockbutton ());
return retval;
}
......@@ -241,6 +241,7 @@ gtk_public_h_sources = \
gtklayout.h \
gtklinkbutton.h \
gtkliststore.h \
gtklockbutton.h \
gtkmain.h \
gtkmenu.h \
gtkmenubar.h \
......@@ -562,6 +563,7 @@ gtk_base_c_sources = \
gtklayout.c \
gtklinkbutton.c \
gtkliststore.c \
gtklockbutton.c \
gtkmain.c \
gtkmarshalers.c \
gtkmenu.c \
......
......@@ -126,6 +126,7 @@
#include <gtk/gtklayout.h>
#include <gtk/gtklinkbutton.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtklockbutton.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenubar.h>
......
......@@ -1445,6 +1445,10 @@ gtk_list_store_set_valist
gtk_list_store_set_value
gtk_list_store_set_valuesv
gtk_list_store_swap
gtk_lock_button_get_type G_GNUC_CONST
gtk_lock_button_new
gtk_lock_button_get_permission
gtk_lock_button_set_permission
gtk_main
gtk_main_do_event
gtk_main_iteration
......
This diff is collapsed.
/* GTK - The GIMP Toolkit
* Copyright (C) 2010 Red Hat, Inc.
* Author: Matthias Clasen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/
#ifndef __GTK_LOCK_BUTTON_H__
#define __GTK_LOCK_BUTTON_H__
#include <gtk/gtkbin.h>
#include <gio/gio.h>
G_BEGIN_DECLS
#define GTK_TYPE_LOCK_BUTTON (gtk_lock_button_get_type ())
#define GTK_LOCK_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_LOCK_BUTTON, GtkLockButton))
#define GTK_LOCK_BUTTON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTK_LOCK_BUTTON, GtkLockButtonClass))
#define GTK_IS_LOCK_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_LOCK_BUTTON))
#define GTK_IS_LOCK_BUTTON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_LOCK_BUTTON))
#define GTK_LOCK_BUTTON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_LOCK_BUTTON, GtkLockButtonClass))
typedef struct _GtkLockButton GtkLockButton;
typedef struct _GtkLockButtonClass GtkLockButtonClass;
typedef struct _GtkLockButtonPrivate GtkLockButtonPrivate;
struct _GtkLockButton
{
GtkBin parent;
GtkLockButtonPrivate *priv;
};
struct _GtkLockButtonClass
{
GtkBinClass parent_class;
void (*reserved0) (void);
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
void (*reserved4) (void);
void (*reserved5) (void);
void (*reserved6) (void);
void (*reserved7) (void);
};
GType gtk_lock_button_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_lock_button_new (GPermission *permission);
GPermission *gtk_lock_button_get_permission (GtkLockButton *button);
void gtk_lock_button_set_permission (GtkLockButton *button,
GPermission *permission);
G_END_DECLS
#endif /* __GTK_LOCK_BUTTON_H__ */
......@@ -118,6 +118,7 @@ gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklinkbutton.c
gtk/gtkliststore.c
gtk/gtklockbutton.c
gtk/gtkmain.c
gtk/gtkmenubar.c
gtk/gtkmenu.c
......
......@@ -118,6 +118,7 @@ gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklinkbutton.c
gtk/gtkliststore.c
gtk/gtklockbutton.c
gtk/gtkmain.c
gtk/gtkmenubar.c
gtk/gtkmenu.c
......
......@@ -59,6 +59,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testicontheme \
testimage \
testinput \
testlockbutton \
testmenubars \
testmountoperation \
testmultidisplay \
......@@ -158,6 +159,7 @@ testgrid_DEPENDENCIES = $(TEST_DEPS)
testgtk_DEPENDENCIES = $(TEST_DEPS)
testinput_DEPENDENCIES = $(TEST_DEPS)
testimage_DEPENDENCIES = $(TEST_DEPS)
testlockbutton_DEPENDENCIES = $(TEST_DEPS)
testmenubars_DEPENDENCIES = $(TEST_DEPS)
testmountoperation_DEPENDENCIES = $(TEST_DEPS)
testmultidisplay_DEPENDENCIES = $(TEST_DEPS)
......@@ -241,6 +243,7 @@ testiconview_LDADD = $(LDADDS)
testiconview_keynav_LDADD = $(LDADDS)
testinput_LDADD = $(LDADDS)
testimage_LDADD = $(LDADDS)
testlockbutton_LDADD = $(LDADDS)
testmenubars_LDADD = $(LDADDS)
testmountoperation_LDADD = $(LDADDS)
testmultidisplay_LDADD = $(LDADDS)
......
/* testlockbutton.c
* Copyright (C) 2011 Red Hat, Inc.
* Authors: Matthias Clasen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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.
*/
#include <gtk/gtk.h>
#include <gio/gio.h>
/* a fake permission implementation */
#define G_TYPE_TEST_PERMISSION (g_test_permission_get_type ())
#define G_TEST_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
G_TYPE_TEST_PERMISSION, \
GTestPermission))
#define G_IS_TEST_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
G_TYPE_TEST_PERMISSION))
typedef struct _GTestPermission GTestPermission;
typedef struct _GTestPermissionClass GTestPermissionClass;
struct _GTestPermission
{
GPermission parent;
gboolean success;
};
struct _GTestPermissionClass
{
GPermissionClass parent_class;
};
G_DEFINE_TYPE (GTestPermission, g_test_permission, G_TYPE_PERMISSION)
static void
g_test_permission_init (GTestPermission *test)
{
}
static gboolean
update_allowed (GTestPermission *test,
gboolean allowed,
GError **error)
{
gboolean can_acquire, can_release;
g_object_get (test,
"can-acquire", &can_acquire,
"can-release", &can_release,
NULL);
if (test->success)
{
g_permission_impl_update (G_PERMISSION (test),
allowed, can_acquire, can_release);
return TRUE;
}
else
{
g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR_FAILED, "Sorry, no luck");
return FALSE;
}
}
static gboolean
acquire (GPermission *permission,
GCancellable *cancellable,
GError **error)
{
GTestPermission *test = G_TEST_PERMISSION (permission);
return update_allowed (test, TRUE, error);
}
static void
acquire_async (GPermission *permission,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
g_print ("GTestPermission::acquire_async\n");
result = g_simple_async_result_new ((GObject*)permission,
callback,
user_data,
acquire_async);
g_simple_async_result_complete (result);
g_object_unref (result);
}
gboolean
acquire_finish (GPermission *permission,
GAsyncResult *result,
GError **error)
{
GTestPermission *test = G_TEST_PERMISSION (permission);
g_print ("GTestPermission::acquire_finish\n");
return update_allowed (test, TRUE, error);
}
static gboolean
release (GPermission *permission,
GCancellable *cancellable,
GError **error)
{
GTestPermission *test = G_TEST_PERMISSION (permission);
return update_allowed (test, FALSE, error);
}
static void
release_async (GPermission *permission,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
result = g_simple_async_result_new ((GObject*)permission,
callback,
user_data,
acquire_async);
g_simple_async_result_complete (result);
g_object_unref (result);
}
gboolean
release_finish (GPermission *permission,
GAsyncResult *result,
GError **error)
{
GTestPermission *test = G_TEST_PERMISSION (permission);
return update_allowed (test, FALSE, error);
}
static void
g_test_permission_class_init (GTestPermissionClass *class)
{
GPermissionClass *permission_class = G_PERMISSION_CLASS (class);
permission_class->acquire = acquire;
permission_class->acquire_async = acquire_async;
permission_class->acquire_finish = acquire_finish;
permission_class->release = release;
permission_class->release_async = release_async;
permission_class->release_finish = release_finish;
}
void
g_test_permission_set_success (GTestPermission *permission,
gboolean success)
{
permission->success = success;
}
static GtkWidget *allowed_button;
static GtkWidget *can_acquire_button;
static GtkWidget *can_release_button;
static GtkWidget *success_button;
static void
update_clicked (GtkButton *button, GtkLockButton *lockbutton)
{
GPermission *permission;
gboolean allowed, can_acquire, can_release;
gboolean success;
permission = gtk_lock_button_get_permission (lockbutton);
allowed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allowed_button));
can_acquire = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (can_acquire_button));
can_release = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (can_release_button));
success = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (success_button));
g_permission_impl_update (permission, allowed, can_acquire, can_release);
g_test_permission_set_success (G_TEST_PERMISSION (permission), success);
}
static GtkWidget *content;
static void
permission_changed (GPermission *permission,
GParamSpec *pspec)
{
gboolean allowed, can_acquire, can_release;
g_object_get (permission,
"allowed", &allowed,
"can-acquire", &can_acquire,
"can-release", &can_release,
NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (allowed_button), allowed);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (can_acquire_button), can_acquire);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (can_release_button), can_release);
gtk_widget_set_sensitive (content, allowed);
}
int
main (int argc, char *argv[])
{
GtkWidget *window;
GtkWidget *dialog;
GtkWidget *button;
GtkWidget *box;
GtkWidget *bbox;
GtkWidget *update;
GPermission *permission;
gtk_init (&argc, &argv);
permission = g_object_new (G_TYPE_TEST_PERMISSION, NULL);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (window), 12);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), box);
allowed_button = gtk_check_button_new_with_label ("Allowed");
gtk_container_add (GTK_CONTAINER (box), allowed_button);
can_acquire_button = gtk_check_button_new_with_label ("Can acquire");
gtk_container_add (GTK_CONTAINER (box), can_acquire_button);
can_release_button = gtk_check_button_new_with_label ("Can release");
gtk_container_add (GTK_CONTAINER (box), can_release_button);
success_button = gtk_check_button_new_with_label ("Will succeed");
gtk_container_add (GTK_CONTAINER (box), success_button);
update = gtk_button_new_with_label ("Update");
gtk_container_add (GTK_CONTAINER (box), update);
g_signal_connect (permission, "notify",
G_CALLBACK (permission_changed), NULL);
button = gtk_lock_button_new (permission);
g_signal_connect (update, "clicked",
G_CALLBACK (update_clicked), button);
dialog = gtk_dialog_new_with_buttons ("Dialog", NULL, 0,
"Close", GTK_RESPONSE_CLOSE,
"Some other action", GTK_RESPONSE_APPLY,
NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
bbox = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (bbox), button, TRUE);
gtk_button_box_set_child_non_homogeneous (GTK_BUTTON_BOX (bbox), button, TRUE);
content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (content), gtk_check_button_new_with_label ("Control 1"));
gtk_container_add (GTK_CONTAINER (content), gtk_check_button_new_with_label ("Control 2"));
gtk_widget_set_sensitive (content, FALSE);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), content);
gtk_widget_show_all (window);
gtk_widget_show_all (dialog);
gtk_main ();
return 0;
}
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