* 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include "gtkprivate.h"
#include "gtkintl.h"
-#include <gdk/gdkkeysyms.h>
-
/**
* SECTION:gtkaccellabel
* @Short_description: A label which displays an accelerator key on the right of the text
* @Title: GtkAccelLabel
- * @See_also: #GtkItemFactory, #GtkAccelGroup
+ * @See_also: #GtkAccelGroup
*
* The #GtkAccelLabel widget is a subclass of #GtkLabel that also displays an
* accelerator key on the right of the label text, e.g. 'Ctl+S'.
* GtkAccelLabel is automatically set up to display the GtkMenuItem
* accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. *<!---->/
* gtk_widget_add_accelerator (save_item, "activate", accel_group,
- * GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+ * GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
* </programlisting>
* </example>
*/
struct _GtkAccelLabelPrivate
{
- guint accel_padding; /* should be style property? */
- GtkWidget *accel_widget; /* done*/
+ GtkWidget *accel_widget; /* done */
GClosure *accel_closure; /* has set function */
GtkAccelGroup *accel_group; /* set by set_accel_closure() */
gchar *accel_string; /* has set function */
+ guint accel_padding; /* should be style property? */
guint16 accel_string_width; /* seems to be private */
};
gint *min_width,
gint *nat_width);
-#define GTK_ACCEL_LABEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelPrivate))
-
G_DEFINE_TYPE (GtkAccelLabel, gtk_accel_label, GTK_TYPE_LABEL)
widget_class->get_preferred_width = gtk_accel_label_get_preferred_width;
widget_class->destroy = gtk_accel_label_destroy;
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ACCEL_LABEL);
+
class->signal_quote1 = g_strdup ("<:");
class->signal_quote2 = g_strdup (":>");
static void
gtk_accel_label_init (GtkAccelLabel *accel_label)
{
- GtkAccelLabelPrivate *priv = GTK_ACCEL_LABEL_GET_PRIVATE (accel_label);
+ GtkAccelLabelPrivate *priv;
+
+ accel_label->priv = G_TYPE_INSTANCE_GET_PRIVATE (accel_label,
+ GTK_TYPE_ACCEL_LABEL,
+ GtkAccelLabelPrivate);
+ priv = accel_label->priv;
priv->accel_padding = 3;
priv->accel_widget = NULL;
priv->accel_closure = NULL;
priv->accel_group = NULL;
priv->accel_string = NULL;
-
- accel_label->priv = priv;
}
/**
direction = gtk_widget_get_direction (widget);
ac_width = gtk_accel_label_get_accel_width (accel_label);
gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_get_preferred_size (widget, &requisition, NULL);
+ gtk_widget_get_preferred_size (widget, NULL, &requisition);
if (allocation.width >= requisition.width + ac_width)
{
+ GtkStyleContext *context;
PangoLayout *label_layout;
PangoLayout *accel_layout;
GtkLabel *label = GTK_LABEL (widget);
gint y;
gint xpad;
+ context = gtk_widget_get_style_context (widget);
label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
cairo_save (cr);
y += get_first_baseline (label_layout) - get_first_baseline (accel_layout) - allocation.y;
- gtk_paint_layout (gtk_widget_get_style (widget),
- cr,
- gtk_widget_get_state (widget),
- FALSE,
- widget,
- "accellabel",
- x, y,
- accel_layout);
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR);
+
+ gtk_render_layout (context, cr, x, y, accel_layout);
+ gtk_style_context_restore (context);
g_object_unref (accel_layout);
}
gtk_accel_label_set_accel_closure (accel_label, closure);
}
+static void
+accel_widget_weak_ref_cb (GtkAccelLabel *accel_label,
+ GtkWidget *old_accel_widget)
+{
+ g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
+ g_return_if_fail (GTK_IS_WIDGET (accel_label->priv->accel_widget));
+
+ g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+ refetch_widget_accel_closure,
+ accel_label);
+ accel_label->priv->accel_widget = NULL;
+ g_object_notify (G_OBJECT (accel_label), "accel-widget");
+}
+
/**
* gtk_accel_label_set_accel_widget:
* @accel_label: a #GtkAccelLabel
* @accel_widget: the widget to be monitored.
*
- * Sets the widget to be monitored by this accelerator label.
- **/
+ * Sets the widget to be monitored by this accelerator label.
+ */
void
gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
- GtkWidget *accel_widget)
+ GtkWidget *accel_widget)
{
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_widget)
g_return_if_fail (GTK_IS_WIDGET (accel_widget));
-
+
if (accel_widget != accel_label->priv->accel_widget)
{
if (accel_label->priv->accel_widget)
- {
- gtk_accel_label_set_accel_closure (accel_label, NULL);
- g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
- refetch_widget_accel_closure,
- accel_label);
- g_object_unref (accel_label->priv->accel_widget);
- }
+ {
+ gtk_accel_label_set_accel_closure (accel_label, NULL);
+ g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+ refetch_widget_accel_closure,
+ accel_label);
+ g_object_weak_unref (G_OBJECT (accel_label->priv->accel_widget),
+ (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+ }
accel_label->priv->accel_widget = accel_widget;
if (accel_label->priv->accel_widget)
- {
- g_object_ref (accel_label->priv->accel_widget);
- g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
- G_CALLBACK (refetch_widget_accel_closure),
- accel_label, G_CONNECT_SWAPPED);
- refetch_widget_accel_closure (accel_label);
- }
+ {
+ g_object_weak_ref (G_OBJECT (accel_label->priv->accel_widget),
+ (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+ g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
+ G_CALLBACK (refetch_widget_accel_closure),
+ accel_label, G_CONNECT_SWAPPED);
+ refetch_widget_accel_closure (accel_label);
+ }
g_object_notify (G_OBJECT (accel_label), "accel-widget");
}
}
}
/* Underscores in key names are better displayed as spaces
- * E.g., Page_Up should be "Page Up"
+ * E.g., Page_Up should be "Page Up".
+ *
+ * Some keynames also have prefixes that are not suitable
+ * for display, e.g XF86AudioMute, so strip those out, too.
+ *
+ * This function is only called on untranslated keynames,
+ * so no need to be UTF-8 safe.
*/
static void
-substitute_underscores (char *str)
+append_without_underscores (GString *s,
+ gchar *str)
{
- char *p;
+ gchar *p;
+
+ if (g_str_has_prefix (str, "XF86"))
+ p = str + 4;
+ else if (g_str_has_prefix (str, "ISO_"))
+ p = str + 4;
+ else
+ p = str;
- for (p = str; *p; p++)
- if (*p == '_')
- *p = ' ';
+ for ( ; *p; p++)
+ {
+ if (*p == '_')
+ g_string_append_c (s, ' ');
+ else
+ g_string_append_c (s, *p);
+ }
}
/* On Mac, if the key has symbolic representation (e.g. arrow keys),
const gchar *str;
str = g_dpgettext2 (GETTEXT_PACKAGE, "keyboard label", tmp);
if (str == tmp)
- {
- g_string_append (gstring, tmp);
- substitute_underscores (gstring->str);
- }
+ append_without_underscores (gstring, tmp);
else
g_string_append (gstring, str);
}
projects / ~andy / gtk / blobdiff