gtk: Use +/- to zoom in/out.

[sigrok-gtk.git] / toolbar.c

diff --git a/toolbar.c b/toolbar.c
index 0d7c6faba264c720bde03d61c8640fcd87a46cf5..f4f8a5def4b8b906855f30ce0d240588fe341771 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -230,7 +230,7 @@ static void probe_named(GtkCellRendererText *cel, gchar *path, gchar *text,
 
        gtk_tree_model_get_iter_from_string(probes, &iter, path);
        gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
-       sr_dev_probe_name(dev, i, text);
+       sr_dev_probe_name_set(dev, i, text);
        gtk_list_store_set(GTK_LIST_STORE(probes), &iter, PROBE_NAME, text, -1);
 }
 
@@ -353,7 +353,7 @@ static void capture_run(GtkAction *action, GObject *parent)
        }
 
        if (time_msec) {
-               if (sr_hw_has_hwcap(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+               if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
                        if (dev->driver->dev_config_set(dev->driver_index,
                                                        SR_HWCAP_LIMIT_MSEC,
                                                        &time_msec) != SR_OK) {
@@ -485,9 +485,9 @@ static const GtkActionEntry action_items[] = {
                "Exit the program", G_CALLBACK(gtk_main_quit) },
 
        {"ViewMenu", NULL, "_View", NULL, NULL, NULL},
-       {"ViewZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "<control>z", NULL,
+       {"ViewZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "plus", NULL,
                G_CALLBACK(zoom_in)},
-       {"ViewZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "<control><shift>Z",
+       {"ViewZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus",
                NULL, G_CALLBACK(zoom_out)},
        {"ViewZoomFit", GTK_STOCK_ZOOM_FIT, NULL, NULL,
                NULL, G_CALLBACK(zoom_fit)},