sr: Made hwcap const

[sigrok-gtk.git] / toolbar.c

diff --git a/toolbar.c b/toolbar.c
index b9a79784fe2a318280106775d4c00267ce5ecd08..e02d1b79727ab94c62359db129dddf885bde716d 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -137,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->driver->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);
@@ -485,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)},
@@ -578,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);
@@ -598,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");
@@ -611,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);
 }