gtk: Update to use new APIs (fixes build).

[sigrok-gtk.git] / toolbar.c

diff --git a/toolbar.c b/toolbar.c
index ee4f38ad1cbc307a0c3f3b8e9ed8f02417d752d0..e02d1b79727ab94c62359db129dddf885bde716d 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -59,12 +59,11 @@ static void prop_edited(GtkCellRendererText *cel, gchar *path, gchar *text,
                if (sr_parse_sizestring(text, &tmp_u64) != SR_OK)
                        return;
 
-               ret = dev->plugin->set_configuration(dev->plugin_index,
-                               cap, &tmp_u64);
+               ret = dev->driver->dev_config_set(dev->driver_index,
+                                                 cap, &tmp_u64);
                break;
        case SR_T_CHAR:
-               ret = dev->plugin->set_configuration(dev->plugin_index,
-                               cap, text);
+               ret = dev->driver->dev_config_set(dev->driver_index, cap, text);
                break;
        /* SR_T_BOOL will be handled by prop_toggled */
        }
@@ -87,8 +86,8 @@ static void prop_toggled(GtkCellRendererToggle *cel, gchar *path,
                                        DEV_PROP_TYPE, &type, -1);
 
        val = !gtk_cell_renderer_toggle_get_active(cel);
-       ret = dev->plugin->set_configuration(dev->plugin_index, cap, 
-                                       GINT_TO_POINTER(val));
+       ret = dev->driver->dev_config_set(dev->driver_index, cap, 
+                                         GINT_TO_POINTER(val));
 
        if (!ret)
                gtk_list_store_set(props, &iter, DEV_PROP_BOOLVALUE, val, -1);
@@ -138,11 +137,11 @@ static void dev_set_options(GtkAction *action, GtkWindow *parent)
                                        G_TYPE_BOOLEAN, G_TYPE_STRING,
                                        G_TYPE_BOOLEAN);
        gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(props));
-       int *hwcaps = dev->plugin->hwcap_get_all();
+       const int *hwcaps = dev->driver->hwcap_get_all();
        int cap;
        GtkTreeIter iter;
        for (cap = 0; hwcaps[cap]; cap++) {
-               struct sr_hwcap_option *hwo;
+               const struct sr_hwcap_option *hwo;
                if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
                        continue;
                gtk_list_store_append(props, &iter);
@@ -231,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);
 }
 
@@ -354,8 +353,8 @@ static void capture_run(GtkAction *action, GObject *parent)
        }
 
        if (time_msec) {
-               if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-                       if (dev->plugin->set_configuration(dev->plugin_index,
+               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) {
                                g_critical("Failed to configure time limit.");
@@ -369,8 +368,8 @@ static void capture_run(GtkAction *action, GObject *parent)
                        limit_samples = 0;
                        if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
                                guint64 tmp_u64;
-                               tmp_u64 = *((uint64_t *)dev->plugin->get_dev_info(
-                                                       dev->plugin_index,
+                               tmp_u64 = *((uint64_t *)dev->driver->dev_info_get(
+                                                       dev->driver_index,
                                                        SR_DI_CUR_SAMPLERATE));
                                limit_samples = tmp_u64 * time_msec / (uint64_t) 1000;
                        }
@@ -379,7 +378,7 @@ static void capture_run(GtkAction *action, GObject *parent)
                                return;
                        }
 
-                       if (dev->plugin->set_configuration(dev->plugin_index,
+                       if (dev->driver->dev_config_set(dev->driver_index,
                                                SR_HWCAP_LIMIT_SAMPLES,
                                                &limit_samples) != SR_OK) {
                                g_critical("Failed to configure time-based sample limit.");
@@ -388,7 +387,7 @@ static void capture_run(GtkAction *action, GObject *parent)
                }
        }
        if (limit_samples) {
-               if (dev->plugin->set_configuration(dev->plugin_index,
+               if (dev->driver->dev_config_set(dev->driver_index,
                                                SR_HWCAP_LIMIT_SAMPLES,
                                                &limit_samples) != SR_OK) {
                        g_critical("Failed to configure sample limit.");
@@ -396,8 +395,8 @@ static void capture_run(GtkAction *action, GObject *parent)
                }
        }
 
-       if (dev->plugin->set_configuration(dev->plugin_index,
-                 SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
+       if (dev->driver->dev_config_set(dev->driver_index,
+           SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
                printf("Failed to configure probes.\n");
                sr_session_destroy();
                return;
@@ -486,15 +485,15 @@ 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)},
 
        {"HelpMenu", NULL, "_Help", NULL, NULL, NULL},
-       {"HelpWiki", GTK_STOCK_ABOUT, "Sigrok _Wiki", NULL, NULL,
+       {"HelpWiki", GTK_STOCK_ABOUT, "sigrok _Wiki", NULL, NULL,
                G_CALLBACK(help_wiki)},
        {"HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, NULL,
                G_CALLBACK(help_about)},
@@ -579,17 +578,8 @@ GtkWidget *toolbar_init(GtkWindow *parent)
        toolbar = GTK_TOOLBAR(gtk_ui_manager_get_widget(ui, "/toolbar"));
        gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(toolbar), FALSE, TRUE, 0);
 
-       /* Device selection GtkComboBox */
-       GtkToolItem *toolitem = gtk_tool_item_new();
-       GtkWidget *align = gtk_alignment_new(0.5, 0.5, 2, 0);
-       GtkWidget *dev = dev_select_combo_box_new(parent);
-
-       gtk_container_add(GTK_CONTAINER(align), dev);
-       gtk_container_add(GTK_CONTAINER(toolitem), align);
-       gtk_toolbar_insert(toolbar, toolitem, 0);
-
        /* Time/Samples entry */
-       toolitem = gtk_tool_item_new();
+       GtkToolItem *toolitem = gtk_tool_item_new();
        GtkWidget *timesamples = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(timesamples), "100");
        gtk_entry_set_alignment(GTK_ENTRY(timesamples), 1.0);
@@ -599,7 +589,7 @@ GtkWidget *toolbar_init(GtkWindow *parent)
 
        /* Time unit combo box */
        toolitem = gtk_tool_item_new();
-       align = gtk_alignment_new(0.5, 0.5, 2, 0);
+       GtkWidget *align = gtk_alignment_new(0.5, 0.5, 2, 0);
        GtkWidget *timeunit = gtk_combo_box_new_text();
        gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "samples");
        gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "ms");
@@ -612,6 +602,16 @@ GtkWidget *toolbar_init(GtkWindow *parent)
        g_object_set_data(G_OBJECT(parent), "timesamples", timesamples);
        g_object_set_data(G_OBJECT(parent), "timeunit", timeunit);
 
+       /* Device selection GtkComboBox */
+       toolitem = gtk_tool_item_new();
+       align = gtk_alignment_new(0.5, 0.5, 2, 0);
+       GtkWidget *dev = dev_select_combo_box_new(parent);
+
+       gtk_container_add(GTK_CONTAINER(align), dev);
+       gtk_container_add(GTK_CONTAINER(toolitem), align);
+       gtk_toolbar_insert(toolbar, toolitem, 0);
+
+
        return GTK_WIDGET(vbox);
 }