aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-23 22:21:55 -0600
committerTed Gould <ted@gould.cx>2011-02-23 22:21:55 -0600
commitf4920ad7a859f4cb35548741954fece0af6264ca (patch)
tree3a0c6d36d0f0926ddd0c8d0a5d47342b61ff67cb
parente3ccf5fa098bbc85cb1b1085683d2c748f1ca85b (diff)
downloadlibayatana-appindicator-f4920ad7a859f4cb35548741954fece0af6264ca.tar.gz
libayatana-appindicator-f4920ad7a859f4cb35548741954fece0af6264ca.tar.bz2
libayatana-appindicator-f4920ad7a859f4cb35548741954fece0af6264ca.zip
Switching to the new style of setting the a11y label
-rw-r--r--docs/reference/tmpl/libappindicator-unused.sgml36
-rw-r--r--example/simple-client.c35
2 files changed, 39 insertions, 32 deletions
diff --git a/docs/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml
index 1428b51..789a03f 100644
--- a/docs/reference/tmpl/libappindicator-unused.sgml
+++ b/docs/reference/tmpl/libappindicator-unused.sgml
@@ -1,6 +1,42 @@
+<!-- ##### MACRO APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL AppIndicator::new-accessible-desc ##### -->
+<para>
+
+</para>
+
+@appindicator: the object which received the signal.
+@arg1:
+
+<!-- ##### ARG AppIndicator:accessible-desc ##### -->
+<para>
+
+</para>
+
+
<!-- ##### ARG AppIndicator:icon-path ##### -->
<para>
</para>
+<!-- ##### FUNCTION app_indicator_get_accessible_desc ##### -->
+<para>
+
+</para>
+
+@self:
+@Returns:
+
+<!-- ##### FUNCTION app_indicator_set_accessible_desc ##### -->
+<para>
+
+</para>
+
+@self:
+@accessible_desc:
+
diff --git a/example/simple-client.c b/example/simple-client.c
index 5d464ac..9e63e14 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -27,7 +27,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
GMainLoop * mainloop = NULL;
static gboolean active = TRUE;
static gboolean can_haz_label = TRUE;
-static gboolean can_haz_a11yname = TRUE;
static void
label_toggle_cb (GtkWidget * widget, gpointer data)
@@ -44,20 +43,6 @@ label_toggle_cb (GtkWidget * widget, gpointer data)
}
static void
-a11yname_toggle_cb (GtkWidget * widget, gpointer data)
-{
- can_haz_a11yname = !can_haz_a11yname;
-
- if (can_haz_a11yname) {
- gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "Hide accessible description");
- } else {
- gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "Show accessible description");
- }
-
- return;
-}
-
-static void
activate_clicked_cb (GtkWidget *widget, gpointer data)
{
AppIndicator * ci = APP_INDICATOR(data);
@@ -80,9 +65,9 @@ local_icon_toggle_cb (GtkWidget *widget, gpointer data)
AppIndicator * ci = APP_INDICATOR(data);
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
- app_indicator_set_icon(ci, LOCAL_ICON);
+ app_indicator_set_icon_full(ci, LOCAL_ICON, "Local Icon");
} else {
- app_indicator_set_icon(ci, "indicator-messages");
+ app_indicator_set_icon_full(ci, "indicator-messages", "System Icon");
}
return;
@@ -161,13 +146,6 @@ percent_change (gpointer user_data)
} else {
app_indicator_set_label (APP_INDICATOR(user_data), NULL, NULL);
}
- if (can_haz_a11yname) {
- gchar * percentstr = g_strdup_printf("%d%%", percentage + 1);
- app_indicator_set_accessible_desc (APP_INDICATOR(user_data), percentstr);
- g_free(percentstr);
- } else {
- app_indicator_set_accessible_desc (APP_INDICATOR(user_data), NULL);
- }
return TRUE;
}
@@ -187,7 +165,7 @@ main (int argc, char ** argv)
g_assert (G_IS_OBJECT (ci));
app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
- app_indicator_set_attention_icon(ci, "indicator-messages-new");
+ app_indicator_set_attention_icon_full(ci, "indicator-messages-new", "System Messages Icon Highlighted");
app_indicator_set_label (ci, "1%", "100%");
g_signal_connect (ci, "scroll-event",
@@ -244,13 +222,6 @@ main (int argc, char ** argv)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show(item);
- item = gtk_menu_item_new_with_label ("Show accessible description");
- a11yname_toggle_cb(item, ci);
- g_signal_connect (item, "activate",
- G_CALLBACK (a11yname_toggle_cb), ci);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show(item);
-
app_indicator_set_menu (ci, GTK_MENU (menu));
mainloop = g_main_loop_new(NULL, FALSE);