README: Update status/URLs/repos, add more info.

[sigrok-gtk.git] / devselect.c

diff --git a/devselect.c b/devselect.c
index 3b842eaf76642277767a634b11d5add4529e0d44..f664df82dc0987d8918d57ef401039677ea4714a 100644 (file)
--- a/devselect.c
+++ b/devselect.c
@@ -17,13 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include <gtk/gtk.h>
 #include "sigrok-gtk.h"
 
 static void dev_selected(GtkComboBox *devbox, GObject *parent)
 {
        GtkTreeModel *devlist = gtk_combo_box_get_model(devbox);
+       GtkEntry *timesamples = g_object_get_data(parent, "timesamples");
        GtkComboBox *timeunit = g_object_get_data(parent, "timeunit");
        GtkTreeIter iter;
        const gchar *name;
@@ -47,11 +48,15 @@ static void dev_selected(GtkComboBox *devbox, GObject *parent)
        }
        g_object_set_data(parent, "dev", dev);
 
-       /* Update timeunit depending on device capabilities. */
-       if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_SAMPLES))
-               gtk_combo_box_set_active(timeunit, 0);
-       else
-               gtk_combo_box_set_active(timeunit, 1);
+       /*
+        * Grey out the time unless the device is valid,
+        * and it supports sample limiting
+        */
+       const gboolean limit_samples = dev &&
+               sr_driver_hwcap_exists(dev->driver,
+               SR_HWCAP_LIMIT_SAMPLES);
+       gtk_widget_set_sensitive((GtkWidget*)timesamples, limit_samples);
+       gtk_widget_set_sensitive((GtkWidget*)timeunit, limit_samples);
 }
 
 static void dev_menuitem_toggled(GtkMenuItem *item, GtkComboBox *combo)
@@ -82,7 +87,7 @@ void dev_select_rescan(GtkAction *action, GtkWindow *parent)
        GtkListStore *devlist = GTK_LIST_STORE(gtk_combo_box_get_model(devbox));
        GtkTreeIter iter;
        struct sr_dev *dev;
-       struct sr_dev_inst *sdi;
+       const struct sr_dev_inst *sdi;
        gchar *sdevname = NULL;
        GSList *devs, *l;
        GtkUIManager *ui = g_object_get_data(G_OBJECT(parent), "ui_manager");