| Age | Commit message (Collapse) | Author |
|---|
|
This function is now only called by set_view_mode(), so inline it
for simplicity.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
There is no need to reconstruct the entire tree store when a symbol's
value changes. Simply call gtk_tree_store_set() to update the row data.
Introduce update_trees() to factor out the common update logic.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The row[] array is used to prepare data passed to set_node(), but this
indirection is unnecessary. Squash fill_row() into set_node() and call
gtk_tree_store_set() directly.
Also, calling gdk_pixbuf_new_from_xpm_data() for every row is
inefficient. Call it once and store the resulting pixbuf in a global
variable.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Move the relevant code into init_left_tree() or init_right_tree().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
These variables are unnecessary because the current model can be
retrieved using gtk_tree_view_get_model().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Currently, update_tree() adds/removes entries to show/hide rows.
This approach is extremely complicated.
Use the tree model filter to control row visibility instead.
Do not toggle the MENU_CHANGED flag, as it is hard to control this
correctly.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Preserve the current menu selection when switching to a different view
mode, as it improves usability.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The 'current' (SINGLE view) and 'browsed' (SPLIT_VIEW) variables serve
similar purposes and are not needed at the same time. Merge them.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Pass the tree store as a function parameter to make it clearer which
tree is being updated.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
These are modal dialogs in xconfig. Make them modal in gconfig as well.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
The "window" and "style" arguments for replace_button_icon() are
now unused. Remove them and refactor the function accordingly.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
gdk_pixmap_create_from_xpm_d has been deprecated since version 2.22.
Use a GdkPixbuf instead. You can use gdk_pixbuf_new_from_xpm_data() to
create it. [1]
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gdk/gdkpixmap.c#L742
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
gtk_file_selection_new() is deprecated, and gtk_file_chooser_dialog_new()
should be used instead. [1]
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/tmpl/gtkfilesel.sgml?ref_type=tags#L156
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
gtk_file_selection_new() is deprecated, and gtk_file_chooser_dialog_new()
should be used instead. [1]
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/docs/reference/gtk/tmpl/gtkfilesel.sgml?ref_type=tags#L156
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
The "clicked" event handler for GtkToolButton takes the GtkToolButton*
as the first parameter.
This is different from the existing on_save_activate() handler.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
It is better not to hardcode model1 or model2 for consistency.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Although this is only used in the right tree view, it is better not to
hardcode model2 for consistency.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The on_treeview2_cursor_changed() handler is connected to both the left
and right tree views, but it hardcodes model2 (the GtkTreeModel of the
right tree view). This is incorrect. Get the associated model from the
view.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Currently, on_treeview2_key_press_event() returns early for the tree1
widget. We can make it work on the left pane as well by avoiding the
hardcoded use of model2.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Now that all signals are connected manually, this is no longer
necessary.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
This fixes several -Wmissing-prototypes warnings.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Move the relevant initialization code closer together.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
This allows removal of the forward delcaration of on_save_activate().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
This clarifies which view is currently selected.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Factor out common code for setting the view into a new function,
set_view_mode().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
This allows removal of the forward declaration of renderer_edited().
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
I also removed unnecessary initializers.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
This is not used at all.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
Not all position parameters are used here. Passing NULL to
gtk_tree_view_get_cursor() or gtk_tree_view_get_path_at_pos() is
allowed. [1] [2]
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtktreeview.c#L12638
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtktreeview.c#L12795
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The height of the window is not used here. Passing NULL to
gtk_window_get_default_size() is allowed. [1]
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtkwindow.c#L3974
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The tree1 and tree2 variables are initialized earlier in
init_tree_model(), so the NULL checks are redundant.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The parents[] array is used to store the GtkTreeIter of parent nodes,
but this can be simplified: we can pass a GtkTreeIter pointer down
when _display_tree() recurses.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
These nodes do not appear to serve anything useful.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
gtk_set_locale() has been deprecated since version 2.24, and setlocale()
should be used directly. [1]
However, gtk_init() automatically does this, so there is typically no
point in calling this function.
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/2.24.33/gtk/gtkmain.c#L1152
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The use of the this function is not recommended, and it has been
deprecated since GTK 3.14.
[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.14.0/gtk/gtktreeview.c#L11891
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
This function is primarily used in widget implementations, and isn't
very useful otherwise.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The columns are visible by default.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The headers are visible by default.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The 'widget' variable is set, but not used in later code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
This if-block is empty.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Remove old code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
When gtk_dialog_run() returns GTK_RESPONSE_YES or GTK_RESPONSE_NO,
gtk_widget_destroy() is not called, resulting in a memory leak.
It is better to always destroy the dialog, even if the application
is about to exit.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
If gtk_tree_model_get_iter() fails, gtk_tree_path_free() is not called.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
|
The variable "resizeable" is a typo and always set to FALSE, resulting
in dead code in init_right_tree(). It is unclear column resizing should
be disabled. Enable it.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
This helper returns the parent menu, or NULL if there is no parent.
The main difference from the previous version is that it always returns
the parent menu even when the given argument is itself a menu.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
The current menu_get_parent_menu() does not always return the parent
menu; if the given argument is itself a menu, it returns that menu.
Rename this function to better reflect this behavior.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
It is useful to display the selected choice's value in the Value column.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
When you select "Show All Options" or "Show Prompt Options", choice
entries display a check box icon, but this has no point because
choice is always y since commit fde192511bdb ("kconfig: remove tristate
choice support").
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
In gconf, choice entries display the selected symbol in the 'Value'
column, but it is not updated when the selected symbol is changed.
Set the MENU_CHANGED flag, so it is updated.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
|
|
The symbol names in the .modinfo section are never used and already
randomized by the __UNIQUE_ID() macro.
Therefore, the second parameter of __MODULE_INFO() is meaningless
and can be removed to simplify the code.
With this change, the symbol names in the .modinfo section will be
prefixed with __UNIQUE_ID_modinfo, making it clearer that they
originate from MODULE_INFO().
[Before]
$ objcopy -j .modinfo vmlinux.o modinfo.o
$ nm -n modinfo.o | head -n10
0000000000000000 r __UNIQUE_ID_license560
0000000000000011 r __UNIQUE_ID_file559
0000000000000030 r __UNIQUE_ID_description558
0000000000000074 r __UNIQUE_ID_license580
000000000000008e r __UNIQUE_ID_file579
00000000000000bd r __UNIQUE_ID_description578
00000000000000e6 r __UNIQUE_ID_license581
00000000000000ff r __UNIQUE_ID_file580
0000000000000134 r __UNIQUE_ID_description579
0000000000000179 r __UNIQUE_ID_uncore_no_discover578
[After]
$ objcopy -j .modinfo vmlinux.o modinfo.o
$ nm -n modinfo.o | head -n10
0000000000000000 r __UNIQUE_ID_modinfo560
0000000000000011 r __UNIQUE_ID_modinfo559
0000000000000030 r __UNIQUE_ID_modinfo558
0000000000000074 r __UNIQUE_ID_modinfo580
000000000000008e r __UNIQUE_ID_modinfo579
00000000000000bd r __UNIQUE_ID_modinfo578
00000000000000e6 r __UNIQUE_ID_modinfo581
00000000000000ff r __UNIQUE_ID_modinfo580
0000000000000134 r __UNIQUE_ID_modinfo579
0000000000000179 r __UNIQUE_ID_modinfo578
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
|
