diff options
Diffstat (limited to 'mixgtk/mixgtk_device.c')
| -rw-r--r-- | mixgtk/mixgtk_device.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c index 1d28b6e..c1abd0b 100644 --- a/mixgtk/mixgtk_device.c +++ b/mixgtk/mixgtk_device.c @@ -1,7 +1,7 @@ /* -*-c-*- ---------------- mixgtk_device.c : * actual types for mixgtk devices * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -181,8 +181,8 @@ init_input_widgets_ (void) { input_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_INPUT_DIALOG); g_assert (input_dlg_); - input_dlg_entry_ = GTK_ENTRY (mixgtk_widget_factory_get_child_by_name - (MIXGTK_INPUT_DIALOG, "input_entry")); + input_dlg_entry_ = + GTK_ENTRY (mixgtk_widget_factory_get_by_name ("input_entry")); g_assert (input_dlg_entry_); GtkEntryCompletion *completion = gtk_entry_completion_new (); input_list_ = gtk_list_store_new (1, G_TYPE_STRING); @@ -195,6 +195,7 @@ init_input_widgets_ (void) gtk_entry_completion_set_minimum_key_length (completion, 1); gtk_entry_completion_set_text_column (completion, 0); gtk_entry_set_completion (input_dlg_entry_, completion); + gtk_widget_hide (input_dlg_); } static gboolean @@ -339,7 +340,7 @@ mixgtk_device_construct_gui_ (struct mixgtk_device_t *dev) gtk_tree_view_new_with_model (GTK_TREE_MODEL (bindev->store)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dev->widget), FALSE); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE); + // gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE); for (k = 0; k < BIN_DEV_COL_; ++k) { @@ -480,11 +481,17 @@ mixgtk_device_set_format (mix_device_type_t dev, gboolean dec) } +static gpointer +combo_child_ () +{ + return gtk_bin_get_child (GTK_BIN (combo_)); +} + static mix_device_type_t get_device_idx_ (void) { int k; - const gchar *name = gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_)->child)); + const gchar *name = gtk_entry_get_text (GTK_ENTRY (combo_child_ ())); for (k = 0; k <= LAST_BIN_DEV_; ++k) if (!strcmp (name, DEF_NAMES_[k])) break; return k; @@ -495,16 +502,13 @@ init_devform_ (void) { devdlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVFORM_DIALOG); g_assert (devdlg_); - dtoggle_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "decradio"); + dtoggle_ = mixgtk_widget_factory_get_by_name ("decradio"); g_assert (dtoggle_); - wtoggle_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "wordradio"); + wtoggle_ = mixgtk_widget_factory_get_by_name ("wordradio"); g_assert (wtoggle_); - combo_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "dev_combo"); + combo_ = mixgtk_widget_factory_get_by_name ("dev_combo"); g_assert (combo_); - gtk_editable_set_editable (GTK_EDITABLE (GTK_BIN (combo_)->child), FALSE); + gtk_editable_set_editable (GTK_EDITABLE (combo_child_ ()), FALSE); } void @@ -572,9 +576,8 @@ on_devdir_activate () { devdir_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVDIR_DIALOG); g_assert (devdir_dlg_); - devdir_entry_ = GTK_ENTRY - (mixgtk_widget_factory_get_child_by_name (MIXGTK_DEVDIR_DIALOG, - DEVDIR_ENTRY_NAME)); + devdir_entry_ = + GTK_ENTRY (mixgtk_widget_factory_get_by_name (DEVDIR_ENTRY_NAME)); g_assert (devdir_entry_); } gtk_entry_set_text (devdir_entry_, mix_device_get_dir ()); @@ -591,8 +594,8 @@ on_devdir_browse_clicked () gtk_file_chooser_dialog_new (_("Devices folder"), GTK_WINDOW (devdir_dlg_), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); if (current != NULL) |