kconfig: move XPM icons to separate files
v2 cover kconfig: move XPM icons to separate files
Please review and approve this path. Version 2 of this patch fixes two accidentally broken icons.
Rostislav Krasny (1):
kconfig: move XPM icons to separate files
scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
Signature · 1 line
2.52.0
PATCH v2 1/1 kconfig: move XPM icons to separate files
Replace deprecated gdk_pixbuf_new_from_xpm_data() with gdk_pixbuf_new_from_file() and update both GTK and QT frontends to load XPM icons from separate files in scripts/kconfig/icons/ instead of from the code.
xpm_menu_inv and xpm_void were removed and not converted into xpm files because they are not used since 64285dc5c41fc7a031695c2c286a2bfef9eaf2c6
This eliminates the GTK deprecation warnings at compile time, improves memory usage and code organization.
--- scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
scripts/kconfig/Makefile +2 -2
@@ -201,7 +201,7 @@ $(addprefix $(obj)/, mconf.o $(lxdialog)): | $(obj)/mconf-cflags # qconf: Used for the xconfig target based on Qt hostprogs += qconf qconf-cxxobjs := qconf.o qconf-moc.o -qconf-objs := images.o $(common-objs) +qconf-objs := $(common-objs) HOSTLDLIBS_qconf = $(call read-file, $(obj)/qconf-libs) HOSTCXXFLAGS_qconf.o = -std=c++11 -fPIC $(call read-file, $(obj)/qconf-cflags)
@@ -219,7 +219,7 @@ targets += qconf-moc.cc # gconf: Used for the gconfig target based on GTK+ hostprogs += gconf -gconf-objs := gconf.o images.o $(common-objs) +gconf-objs := gconf.o $(common-objs) HOSTLDLIBS_gconf = $(call read-file, $(obj)/gconf-libs) HOSTCFLAGS_gconf.o = $(call read-file, $(obj)/gconf-cflags)
scripts/kconfig/gconf.c +28 -7
@@ -5,7 +5,6 @@#include <stdlib.h> #include "lkc.h" -#include "images.h" #include <gtk/gtk.h>
@@ -951,12 +950,24 @@ static void fixup_rootmenu(struct menu *menu) }/* Main Window Initialization */ -static void replace_button_icon (GtkWidget *widget,const char *const xpm[]) +static void replace_button_icon (GtkWidget *widget,const char *filename) {GdkPixbuf *pixbuf;GtkWidget *image; +GError *err =NULL ; + +char *env =getenv (SRCTREE ); +gchar *path =g_strconcat (env ? env :g_get_current_dir (),"/scripts/kconfig/icons/" , filename,NULL ); + + pixbuf =gdk_pixbuf_new_from_file (path, &err); +g_free (path); + +if (err) { +g_warning ("Failed to load icon %s: %s" , filename, err->message); +g_error_free (err); +return ; + } - pixbuf =gdk_pixbuf_new_from_xpm_data ((const char **)xpm); image =gtk_image_new_from_pixbuf (pixbuf);g_object_unref (pixbuf);
@@ -1078,17 +1089,17 @@ static void init_main_window(const gchar *glade_file) single_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button4" ));g_signal_connect (single_btn,"clicked" ,G_CALLBACK (on_single_clicked),NULL ); -replace_button_icon (single_btn, xpm_single_view); +replace_button_icon (single_btn,"single_view.xpm" ); split_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button5" ));g_signal_connect (split_btn,"clicked" ,G_CALLBACK (on_split_clicked),NULL ); -replace_button_icon (split_btn, xpm_split_view); +replace_button_icon (split_btn,"split_view.xpm" ); full_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button6" ));g_signal_connect (full_btn,"clicked" ,G_CALLBACK (on_full_clicked),NULL ); -replace_button_icon (full_btn, xpm_tree_view); +replace_button_icon (full_btn,"tree_view.xpm" ); widget =GTK_WIDGET (gtk_builder_get_object (builder,"button7" )); g_signal_connect(widget, "clicked",
@@ -1269,7 +1280,17 @@ static void init_right_tree(void)g_signal_connect (G_OBJECT (renderer),"edited" ,G_CALLBACK (renderer_edited), tree2_w); - pix_menu =gdk_pixbuf_new_from_xpm_data ((const char **)xpm_menu); +char *env =getenv (SRCTREE ); +gchar *path =g_strconcat (env ? env :g_get_current_dir (),"/scripts/kconfig/icons/menu.xpm" ,NULL ); +GError *err =NULL ; + + pix_menu =gdk_pixbuf_new_from_file (path, &err); +g_free (path); + +if (err) { +g_warning ("Failed to load menu icon: %s" , err->message); +g_error_free (err); + }for (i =0 ; i <COL_VALUE ; i++) { column =gtk_tree_view_get_column (view, i);
scripts/kconfig/icons/back.xpm new file +29 -0
@@ -0,0 +1,29 @@ +/* XPM */ +static char * back_xpm[] = { +"22 22 3 1", +". c None", +"# c #000083", +"a c #838183", +"......................", +"......................", +"......................", +"......................", +"......................", +"...........######a....", +"..#......##########...", +"..##...####......##a..", +"..###.###.........##..", +"..######..........##..", +"..#####...........##..", +"..######..........##..", +"..#######.........##..", +"..########.......##a..", +"...............a###...", +"...............###....", +"......................", +"......................", +"......................", +"......................", +"......................", +"......................" +};
scripts/kconfig/icons/choice_no.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * choice_no_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .... ", +" .. .. ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" .. .. ", +" .... ", +" " +};
scripts/kconfig/icons/choice_yes.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * choice_yes_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .... ", +" .. .. ", +" . . ", +" . .. . ", +" . .... . ", +" . .... . ", +" . .. . ", +" . . ", +" .. .. ", +" .... ", +" " +};
scripts/kconfig/icons/load.xpm new file +31 -0
@@ -0,0 +1,31 @@ +/* XPM */ +static char * load_xpm[] = { +"22 22 5 1", +". c None", +"# c #000000", +"c c #838100", +"a c #ffff00", +"b c #ffffff", +"......................", +"......................", +"......................", +"............####....#.", +"...........#....##.##.", +"..................###.", +".................####.", +".####...........#####.", +"#abab##########.......", +"#babababababab#.......", +"#ababababababa#.......", +"#babababababab#.......", +"#ababab###############", +"#babab##cccccccccccc##", +"#abab##cccccccccccc##.", +"#bab##cccccccccccc##..", +"#ab##cccccccccccc##...", +"#b##cccccccccccc##....", +"###cccccccccccc##.....", +"##cccccccccccc##......", +"###############.......", +"......................" +};
scripts/kconfig/icons/menu.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * menu_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/menuback.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * menuback_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/save.xpm new file +31 -0
@@ -0,0 +1,31 @@ +/* XPM */ +static char * save_xpm[] = { +"22 22 5 1", +". c None", +"# c #000000", +"a c #838100", +"b c #c5c2c5", +"c c #cdb6d5", +"......................", +".####################.", +".#aa#bbbbbbbbbbbb#bb#.", +".#aa#bbbbbbbbbbbb#bb#.", +".#aa#bbbbbbbbbcbb####.", +".#aa#bbbccbbbbbbb#aa#.", +".#aa#bbbccbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aaa############aaa#.", +".#aaaaaaaaaaaaaaaaaa#.", +".#aaaaaaaaaaaaaaaaaa#.", +".#aaa#############aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +"..##################..", +"......................" +};
scripts/kconfig/icons/single_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * single_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"......................", +"......................" +};
scripts/kconfig/icons/split_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * split_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......................", +"......................" +};
scripts/kconfig/icons/symbol_mod.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_mod_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . .. . ", +" . .... . ", +" . .... . ", +" . .. . ", +" . . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/symbol_no.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_no_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/symbol_yes.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_yes_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . . . ", +" . .. . ", +" . . .. . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/tree_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * tree_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......................", +"......................" +};
scripts/kconfig/images.c deleted +0 -328
328 lines not on this page · raw message
scripts/kconfig/images.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2002 Roman Zippel <[email protected]> -*/ - -#ifndef IMAGES_H -#define IMAGES_H - -#ifdef __cplusplus -extern "C" { -#endif - -extern const char *const xpm_load[]; -extern const char *const xpm_save[]; -extern const char *const xpm_back[]; -extern const char *const xpm_tree_view[]; -extern const char *const xpm_single_view[]; -extern const char *const xpm_split_view[]; -extern const char *const xpm_symbol_no[]; -extern const char *const xpm_symbol_mod[]; -extern const char *const xpm_symbol_yes[]; -extern const char *const xpm_choice_no[]; -extern const char *const xpm_choice_yes[]; -extern const char *const xpm_menu[]; -extern const char *const xpm_menu_inv[]; -extern const char *const xpm_menuback[]; -extern const char *const xpm_void[]; - -#ifdef __cplusplus -} -#endif - -#endif /* IMAGES_H */
scripts/kconfig/qconf.cc +14 -15
@@ -26,8 +26,6 @@ #include "lkc.h" #include "qconf.h" -#include "images.h" - static QApplication *configApp; static ConfigSettings *configSettings;
@@ -1283,13 +1281,14 @@ ConfigMainWindow::ConfigMainWindow(void) move(x.toInt(), y.toInt()); // set up icons - ConfigItem::symbolYesIcon = QIcon(QPixmap(xpm_symbol_yes)); - ConfigItem::symbolModIcon = QIcon(QPixmap(xpm_symbol_mod)); - ConfigItem::symbolNoIcon = QIcon(QPixmap(xpm_symbol_no)); - ConfigItem::choiceYesIcon = QIcon(QPixmap(xpm_choice_yes)); - ConfigItem::choiceNoIcon = QIcon(QPixmap(xpm_choice_no)); - ConfigItem::menuIcon = QIcon(QPixmap(xpm_menu)); - ConfigItem::menubackIcon = QIcon(QPixmap(xpm_menuback)); + QString iconsDir = QString(getenv("SRCTREE") ? getenv("SRCTREE") : QDir::currentPath()) + "/scripts/kconfig/icons/"; + ConfigItem::symbolYesIcon = QIcon(QPixmap(iconsDir + "symbol_yes.xpm")); + ConfigItem::symbolModIcon = QIcon(QPixmap(iconsDir + "symbol_mod.xpm")); + ConfigItem::symbolNoIcon = QIcon(QPixmap(iconsDir + "symbol_no.xpm")); + ConfigItem::choiceYesIcon = QIcon(QPixmap(iconsDir + "choice_yes.xpm")); + ConfigItem::choiceNoIcon = QIcon(QPixmap(iconsDir + "choice_no.xpm")); + ConfigItem::menuIcon = QIcon(QPixmap(iconsDir + "menu.xpm")); + ConfigItem::menubackIcon = QIcon(QPixmap(iconsDir + "menuback.xpm")); QWidget *widget = new QWidget(this); setCentralWidget(widget);
@@ -1312,7 +1311,7 @@ ConfigMainWindow::ConfigMainWindow(void) configList->setFocus(); - backAction = new QAction(QPixmap(xpm_back), "Back", this); + backAction = new QAction(QPixmap(iconsDir + "back.xpm"), "Back", this); backAction->setShortcut(QKeySequence::Back); connect(backAction, &QAction::triggered, this, &ConfigMainWindow::goBack);
@@ -1322,12 +1321,12 @@ ConfigMainWindow::ConfigMainWindow(void) connect(quitAction, &QAction::triggered, this, &ConfigMainWindow::close); - QAction *loadAction = new QAction(QPixmap(xpm_load), "&Open", this); + QAction *loadAction = new QAction(QPixmap(iconsDir + "load.xpm"), "&Open", this); loadAction->setShortcut(QKeySequence::Open); connect(loadAction, &QAction::triggered, this, &ConfigMainWindow::loadConfig); - saveAction = new QAction(QPixmap(xpm_save), "&Save", this); + saveAction = new QAction(QPixmap(iconsDir + "save.xpm"), "&Save", this); saveAction->setShortcut(QKeySequence::Save); connect(saveAction, &QAction::triggered, this, &ConfigMainWindow::saveConfig);
@@ -1344,15 +1343,15 @@ ConfigMainWindow::ConfigMainWindow(void) searchAction->setShortcut(QKeySequence::Find); connect(searchAction, &QAction::triggered, this, &ConfigMainWindow::searchConfig); - singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this); + singleViewAction = new QAction(QPixmap(iconsDir + "single_view.xpm"), "Single View", this); singleViewAction->setCheckable(true); connect(singleViewAction, &QAction::triggered, this, &ConfigMainWindow::showSingleView); - splitViewAction = new QAction(QPixmap(xpm_split_view), "Split View", this); + splitViewAction = new QAction(QPixmap(iconsDir + "split_view.xpm"), "Split View", this); splitViewAction->setCheckable(true); connect(splitViewAction, &QAction::triggered, this, &ConfigMainWindow::showSplitView); - fullViewAction = new QAction(QPixmap(xpm_tree_view), "Full View", this); + fullViewAction = new QAction(QPixmap(iconsDir + "tree_view.xpm"), "Full View", this); fullViewAction->setCheckable(true); connect(fullViewAction, &QAction::triggered, this, &ConfigMainWindow::showFullView);
Signature · 1 line
2.52.0
Hi,
Quoted 9 lines · Rostislav Krasny
Replace deprecated
gdk_pixbuf_new_from_xpm_data()withgdk_pixbuf_new_from_file()and update both GTK and QT frontends to load XPM icons from separate files inscripts/kconfig/icons/instead of from the code.
xpm_menu_invandxpm_voidwere removed and not converted into xpm files because they are not used since64285dc5c41fc7a031695c2c286a2bfef9eaf2c6This eliminates the GTK deprecation warnings at compile time, improves memory usage and code organization.
Yes, it does that.
This worked well for me when I ran 'make gconfig'. However, when I tested 'make xconfig', instead of having icons/symbols for
Back, Open, Save, Single View, Split View, Full View
I have words as listed above.
Quoted 36 lines
Signed-off-by Rostislav Krasny <[email protected]>--- scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
Signature · 1 line
~Randy
Quoted 4 lines · Randy Dunlap
This worked well for me when I ran 'make gconfig'. However, when I tested 'make xconfig', instead of having icons/symbols for
Back, Open, Save, Single View, Split View, Full View
I have words as listed above.
I've double checked my patch again with the latest master branch of Linux and "make xconfig" works properly on my machine. Here you can see the screenshot: https://ibb.co/Q2jX9tQ
I use Fedora 43 with Cinnamon DE. The Qt development package that I installed is qt5-qtbase-devel version 5.15.18-1.fc43 plus its dependencies.
What version of Qt do you use? Did "make xconfig" work properly before you applied my patch?
BTW if I install qt6-qtbase-devel (currently version 6.10.1-2.fc43) instead of qt5-qtbase-devel it fails on compilation, but this is a completely different problem that existed even before my changes. I will try to fix it later, it seems like a wrong include path.
$ make xconfig
HOSTCXX scripts/kconfig/qconf.o
scripts/kconfig/qconf.cc:7:10: fatal error: QAction: No such file or directory
7 | #include <QAction>
| ^~~~~~~~~
compilation terminated.
make[2]: *** [scripts/Makefile.host:148: scripts/kconfig/qconf.o] Error 1
make[1]: *** [/home/huligan/develop/linux/Makefile:742: xconfig] Error 2
make: *** [Makefile:248: __sub-make] Error 2Hi,
Quoted 10 lines · Rostislav Krasny
Quoted 4 lines · Randy Dunlap
This worked well for me when I ran 'make gconfig'. However, when I tested 'make xconfig', instead of having icons/symbols for
Back, Open, Save, Single View, Split View, Full View
I have words as listed above.I've double checked my patch again with the latest master branch of Linux and "make xconfig" works properly on my machine. Here you can see the screenshot: https://ibb.co/Q2jX9tQ
Quoted 6 lines
I use Fedora 43 with Cinnamon DE. The Qt development package that I installed is qt5-qtbase-devel version 5.15.18-1.fc43 plus its dependencies.
What version of Qt do you use? Did "make xconfig" work properly before you applied my patch?
Yes, "make xconfig" worked properly before applying this patch.
.qconf.cmd (generated by build) tells me I am using Qt6. I don't see any build errors/warnings.
qt-core-devel & qt-base-common-devel are v6.10.1-1.2 from openSUSE Tumbleweed.
Quoted 15 lines
BTW if I install qt6-qtbase-devel (currently version 6.10.1-2.fc43) instead of qt5-qtbase-devel it fails on compilation, but this is a completely different problem that existed even before my changes. I will try to fix it later, it seems like a wrong include path.
$ make xconfig HOSTCXX scripts/kconfig/qconf.o scripts/kconfig/qconf.cc:7:10: fatal error: QAction: No such file or directory 7 | #include <QAction> | ^~~~~~~~~ compilation terminated. make[2]: *** [scripts/Makefile.host:148: scripts/kconfig/qconf.o] Error 1 make[1]: *** [/home/huligan/develop/linux/Makefile:742: xconfig] Error 2 make: *** [Makefile:248: __sub-make] Error 2
Signature · 1 line
~Randy
v3 cover kconfig: move XPM icons to separate files
Quoted 8 lines · Randy Dunlap
Yes, "make xconfig" worked properly before applying this patch.
.qconf.cmd (generated by build) tells me I am using Qt6. I don't see any build errors/warnings.
qt-core-devel & qt-base-common-devel are v6.10.1-1.2 from openSUSE Tumbleweed.
Finally I figured out why "make xconfig" was failing with Qt6 on my machine. Because I didn't clean properly between trying it with Qt5 and Qt6. After I ran "make distclean", "make xconfig" runs properly with qt6-qtbase-devel too.
Then I've noticed that I inconsistently used two different versions of the "srctree" environment variable - lowercased (right) from lkc.h in GTK code and uppercased (wrong) literal in Qt code. There is a fallback to QDir::currentPath() in the Qt code code and it seems like it works differently in my Fedora 43 and in your openSUSE Tumbleweed.
In this version of my patch I've fixed that inconsistenly. Hope now it works properly in all systems with Qt.
Rostislav Krasny (1):
kconfig: move XPM icons to separate files
scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
Signature · 1 line
2.52.0
PATCH v3 1/1 kconfig: move XPM icons to separate files
Replace deprecated gdk_pixbuf_new_from_xpm_data() with gdk_pixbuf_new_from_file() and update both GTK and QT frontends to load XPM icons from separate files in scripts/kconfig/icons/ instead of from the code.
xpm_menu_inv and xpm_void were removed and not converted into xpm files because they are not used since 64285dc5c41fc7a031695c2c286a2bfef9eaf2c6
This eliminates the GTK deprecation warnings at compile time, improves memory usage and code organization.
--- scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
scripts/kconfig/Makefile +2 -2
@@ -201,7 +201,7 @@ $(addprefix $(obj)/, mconf.o $(lxdialog)): | $(obj)/mconf-cflags # qconf: Used for the xconfig target based on Qt hostprogs += qconf qconf-cxxobjs := qconf.o qconf-moc.o -qconf-objs := images.o $(common-objs) +qconf-objs := $(common-objs) HOSTLDLIBS_qconf = $(call read-file, $(obj)/qconf-libs) HOSTCXXFLAGS_qconf.o = -std=c++11 -fPIC $(call read-file, $(obj)/qconf-cflags)
@@ -219,7 +219,7 @@ targets += qconf-moc.cc # gconf: Used for the gconfig target based on GTK+ hostprogs += gconf -gconf-objs := gconf.o images.o $(common-objs) +gconf-objs := gconf.o $(common-objs) HOSTLDLIBS_gconf = $(call read-file, $(obj)/gconf-libs) HOSTCFLAGS_gconf.o = $(call read-file, $(obj)/gconf-cflags)
scripts/kconfig/gconf.c +28 -7
@@ -5,7 +5,6 @@#include <stdlib.h> #include "lkc.h" -#include "images.h" #include <gtk/gtk.h>
@@ -951,12 +950,24 @@ static void fixup_rootmenu(struct menu *menu) }/* Main Window Initialization */ -static void replace_button_icon (GtkWidget *widget,const char *const xpm[]) +static void replace_button_icon (GtkWidget *widget,const char *filename) {GdkPixbuf *pixbuf;GtkWidget *image; +GError *err =NULL ; + +char *env =getenv (SRCTREE ); +gchar *path =g_strconcat (env ? env :g_get_current_dir (),"/scripts/kconfig/icons/" , filename,NULL ); + + pixbuf =gdk_pixbuf_new_from_file (path, &err); +g_free (path); + +if (err) { +g_warning ("Failed to load icon %s: %s" , filename, err->message); +g_error_free (err); +return ; + } - pixbuf =gdk_pixbuf_new_from_xpm_data ((const char **)xpm); image =gtk_image_new_from_pixbuf (pixbuf);g_object_unref (pixbuf);
@@ -1078,17 +1089,17 @@ static void init_main_window(const gchar *glade_file) single_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button4" ));g_signal_connect (single_btn,"clicked" ,G_CALLBACK (on_single_clicked),NULL ); -replace_button_icon (single_btn, xpm_single_view); +replace_button_icon (single_btn,"single_view.xpm" ); split_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button5" ));g_signal_connect (split_btn,"clicked" ,G_CALLBACK (on_split_clicked),NULL ); -replace_button_icon (split_btn, xpm_split_view); +replace_button_icon (split_btn,"split_view.xpm" ); full_btn =GTK_WIDGET (gtk_builder_get_object (builder,"button6" ));g_signal_connect (full_btn,"clicked" ,G_CALLBACK (on_full_clicked),NULL ); -replace_button_icon (full_btn, xpm_tree_view); +replace_button_icon (full_btn,"tree_view.xpm" ); widget =GTK_WIDGET (gtk_builder_get_object (builder,"button7" )); g_signal_connect(widget, "clicked",
@@ -1269,7 +1280,17 @@ static void init_right_tree(void)g_signal_connect (G_OBJECT (renderer),"edited" ,G_CALLBACK (renderer_edited), tree2_w); - pix_menu =gdk_pixbuf_new_from_xpm_data ((const char **)xpm_menu); +char *env =getenv (SRCTREE ); +gchar *path =g_strconcat (env ? env :g_get_current_dir (),"/scripts/kconfig/icons/menu.xpm" ,NULL ); +GError *err =NULL ; + + pix_menu =gdk_pixbuf_new_from_file (path, &err); +g_free (path); + +if (err) { +g_warning ("Failed to load menu icon: %s" , err->message); +g_error_free (err); + }for (i =0 ; i <COL_VALUE ; i++) { column =gtk_tree_view_get_column (view, i);
scripts/kconfig/icons/back.xpm new file +29 -0
@@ -0,0 +1,29 @@ +/* XPM */ +static char * back_xpm[] = { +"22 22 3 1", +". c None", +"# c #000083", +"a c #838183", +"......................", +"......................", +"......................", +"......................", +"......................", +"...........######a....", +"..#......##########...", +"..##...####......##a..", +"..###.###.........##..", +"..######..........##..", +"..#####...........##..", +"..######..........##..", +"..#######.........##..", +"..########.......##a..", +"...............a###...", +"...............###....", +"......................", +"......................", +"......................", +"......................", +"......................", +"......................" +};
scripts/kconfig/icons/choice_no.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * choice_no_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .... ", +" .. .. ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" .. .. ", +" .... ", +" " +};
scripts/kconfig/icons/choice_yes.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * choice_yes_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .... ", +" .. .. ", +" . . ", +" . .. . ", +" . .... . ", +" . .... . ", +" . .. . ", +" . . ", +" .. .. ", +" .... ", +" " +};
scripts/kconfig/icons/load.xpm new file +31 -0
@@ -0,0 +1,31 @@ +/* XPM */ +static char * load_xpm[] = { +"22 22 5 1", +". c None", +"# c #000000", +"c c #838100", +"a c #ffff00", +"b c #ffffff", +"......................", +"......................", +"......................", +"............####....#.", +"...........#....##.##.", +"..................###.", +".................####.", +".####...........#####.", +"#abab##########.......", +"#babababababab#.......", +"#ababababababa#.......", +"#babababababab#.......", +"#ababab###############", +"#babab##cccccccccccc##", +"#abab##cccccccccccc##.", +"#bab##cccccccccccc##..", +"#ab##cccccccccccc##...", +"#b##cccccccccccc##....", +"###cccccccccccc##.....", +"##cccccccccccc##......", +"###############.......", +"......................" +};
scripts/kconfig/icons/menu.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * menu_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/menuback.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * menuback_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/save.xpm new file +31 -0
@@ -0,0 +1,31 @@ +/* XPM */ +static char * save_xpm[] = { +"22 22 5 1", +". c None", +"# c #000000", +"a c #838100", +"b c #c5c2c5", +"c c #cdb6d5", +"......................", +".####################.", +".#aa#bbbbbbbbbbbb#bb#.", +".#aa#bbbbbbbbbbbb#bb#.", +".#aa#bbbbbbbbbcbb####.", +".#aa#bbbccbbbbbbb#aa#.", +".#aa#bbbccbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aa#bbbbbbbbbbbb#aa#.", +".#aaa############aaa#.", +".#aaaaaaaaaaaaaaaaaa#.", +".#aaaaaaaaaaaaaaaaaa#.", +".#aaa#############aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +".#aaa#########bbb#aa#.", +"..##################..", +"......................" +};
scripts/kconfig/icons/single_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * single_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"......................", +"......................" +};
scripts/kconfig/icons/split_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * split_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......................", +"......................" +};
scripts/kconfig/icons/symbol_mod.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_mod_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . .. . ", +" . .... . ", +" . .... . ", +" . .. . ", +" . . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/symbol_no.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_no_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/symbol_yes.xpm new file +18 -0
@@ -0,0 +1,18 @@ +/* XPM */ +static char * symbol_yes_xpm[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . . ", +" . . . ", +" . .. . ", +" . . .. . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" " +};
scripts/kconfig/icons/tree_view.xpm new file +28 -0
@@ -0,0 +1,28 @@ +/* XPM */ +static char * tree_view_xpm[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......................", +"......................" +};
scripts/kconfig/images.c deleted +0 -328
328 lines not on this page · raw message
scripts/kconfig/images.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2002 Roman Zippel <[email protected]> -*/ - -#ifndef IMAGES_H -#define IMAGES_H - -#ifdef __cplusplus -extern "C" { -#endif - -extern const char *const xpm_load[]; -extern const char *const xpm_save[]; -extern const char *const xpm_back[]; -extern const char *const xpm_tree_view[]; -extern const char *const xpm_single_view[]; -extern const char *const xpm_split_view[]; -extern const char *const xpm_symbol_no[]; -extern const char *const xpm_symbol_mod[]; -extern const char *const xpm_symbol_yes[]; -extern const char *const xpm_choice_no[]; -extern const char *const xpm_choice_yes[]; -extern const char *const xpm_menu[]; -extern const char *const xpm_menu_inv[]; -extern const char *const xpm_menuback[]; -extern const char *const xpm_void[]; - -#ifdef __cplusplus -} -#endif - -#endif /* IMAGES_H */
scripts/kconfig/qconf.cc +14 -15
@@ -26,8 +26,6 @@ #include "lkc.h" #include "qconf.h" -#include "images.h" - static QApplication *configApp; static ConfigSettings *configSettings;
@@ -1283,13 +1281,14 @@ ConfigMainWindow::ConfigMainWindow(void) move(x.toInt(), y.toInt()); // set up icons - ConfigItem::symbolYesIcon = QIcon(QPixmap(xpm_symbol_yes)); - ConfigItem::symbolModIcon = QIcon(QPixmap(xpm_symbol_mod)); - ConfigItem::symbolNoIcon = QIcon(QPixmap(xpm_symbol_no)); - ConfigItem::choiceYesIcon = QIcon(QPixmap(xpm_choice_yes)); - ConfigItem::choiceNoIcon = QIcon(QPixmap(xpm_choice_no)); - ConfigItem::menuIcon = QIcon(QPixmap(xpm_menu)); - ConfigItem::menubackIcon = QIcon(QPixmap(xpm_menuback)); + QString iconsDir = QString(getenv(SRCTREE) ? getenv(SRCTREE) : QDir::currentPath()) + "/scripts/kconfig/icons/"; + ConfigItem::symbolYesIcon = QIcon(QPixmap(iconsDir + "symbol_yes.xpm")); + ConfigItem::symbolModIcon = QIcon(QPixmap(iconsDir + "symbol_mod.xpm")); + ConfigItem::symbolNoIcon = QIcon(QPixmap(iconsDir + "symbol_no.xpm")); + ConfigItem::choiceYesIcon = QIcon(QPixmap(iconsDir + "choice_yes.xpm")); + ConfigItem::choiceNoIcon = QIcon(QPixmap(iconsDir + "choice_no.xpm")); + ConfigItem::menuIcon = QIcon(QPixmap(iconsDir + "menu.xpm")); + ConfigItem::menubackIcon = QIcon(QPixmap(iconsDir + "menuback.xpm")); QWidget *widget = new QWidget(this); setCentralWidget(widget);
@@ -1312,7 +1311,7 @@ ConfigMainWindow::ConfigMainWindow(void) configList->setFocus(); - backAction = new QAction(QPixmap(xpm_back), "Back", this); + backAction = new QAction(QPixmap(iconsDir + "back.xpm"), "Back", this); backAction->setShortcut(QKeySequence::Back); connect(backAction, &QAction::triggered, this, &ConfigMainWindow::goBack);
@@ -1322,12 +1321,12 @@ ConfigMainWindow::ConfigMainWindow(void) connect(quitAction, &QAction::triggered, this, &ConfigMainWindow::close); - QAction *loadAction = new QAction(QPixmap(xpm_load), "&Open", this); + QAction *loadAction = new QAction(QPixmap(iconsDir + "load.xpm"), "&Open", this); loadAction->setShortcut(QKeySequence::Open); connect(loadAction, &QAction::triggered, this, &ConfigMainWindow::loadConfig); - saveAction = new QAction(QPixmap(xpm_save), "&Save", this); + saveAction = new QAction(QPixmap(iconsDir + "save.xpm"), "&Save", this); saveAction->setShortcut(QKeySequence::Save); connect(saveAction, &QAction::triggered, this, &ConfigMainWindow::saveConfig);
@@ -1344,15 +1343,15 @@ ConfigMainWindow::ConfigMainWindow(void) searchAction->setShortcut(QKeySequence::Find); connect(searchAction, &QAction::triggered, this, &ConfigMainWindow::searchConfig); - singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this); + singleViewAction = new QAction(QPixmap(iconsDir + "single_view.xpm"), "Single View", this); singleViewAction->setCheckable(true); connect(singleViewAction, &QAction::triggered, this, &ConfigMainWindow::showSingleView); - splitViewAction = new QAction(QPixmap(xpm_split_view), "Split View", this); + splitViewAction = new QAction(QPixmap(iconsDir + "split_view.xpm"), "Split View", this); splitViewAction->setCheckable(true); connect(splitViewAction, &QAction::triggered, this, &ConfigMainWindow::showSplitView); - fullViewAction = new QAction(QPixmap(xpm_tree_view), "Full View", this); + fullViewAction = new QAction(QPixmap(iconsDir + "tree_view.xpm"), "Full View", this); fullViewAction->setCheckable(true); connect(fullViewAction, &QAction::triggered, this, &ConfigMainWindow::showFullView);
Signature · 1 line
2.52.0
Quoted 11 lines · Rostislav Krasny
Replace deprecated
gdk_pixbuf_new_from_xpm_data()withgdk_pixbuf_new_from_file()and update both GTK and QT frontends to load XPM icons from separate files inscripts/kconfig/icons/instead of from the code.
xpm_menu_invandxpm_voidwere removed and not converted into xpm files because they are not used since64285dc5c41fc7a031695c2c286a2bfef9eaf2c6This eliminates the GTK deprecation warnings at compile time, improves memory usage and code organization.
Signed-off-by Rostislav Krasny <[email protected]>
OK, this v3 patch works for me with both gconfig and xconfig. Thanks.
Quoted 35 lines
--- scripts/kconfig/Makefile | 4 +- scripts/kconfig/gconf.c | 35 ++- scripts/kconfig/icons/back.xpm | 29 +++ scripts/kconfig/icons/choice_no.xpm | 18 ++ scripts/kconfig/icons/choice_yes.xpm | 18 ++ scripts/kconfig/icons/load.xpm | 31 +++ scripts/kconfig/icons/menu.xpm | 18 ++ scripts/kconfig/icons/menuback.xpm | 18 ++ scripts/kconfig/icons/save.xpm | 31 +++ scripts/kconfig/icons/single_view.xpm | 28 +++ scripts/kconfig/icons/split_view.xpm | 28 +++ scripts/kconfig/icons/symbol_mod.xpm | 18 ++ scripts/kconfig/icons/symbol_no.xpm | 18 ++ scripts/kconfig/icons/symbol_yes.xpm | 18 ++ scripts/kconfig/icons/tree_view.xpm | 28 +++ scripts/kconfig/images.c | 328 -------------------------- scripts/kconfig/images.h | 33 --- scripts/kconfig/qconf.cc | 29 ++- 18 files changed, 345 insertions(+), 385 deletions(-) create mode 100644 scripts/kconfig/icons/back.xpm create mode 100644 scripts/kconfig/icons/choice_no.xpm create mode 100644 scripts/kconfig/icons/choice_yes.xpm create mode 100644 scripts/kconfig/icons/load.xpm create mode 100644 scripts/kconfig/icons/menu.xpm create mode 100644 scripts/kconfig/icons/menuback.xpm create mode 100644 scripts/kconfig/icons/save.xpm create mode 100644 scripts/kconfig/icons/single_view.xpm create mode 100644 scripts/kconfig/icons/split_view.xpm create mode 100644 scripts/kconfig/icons/symbol_mod.xpm create mode 100644 scripts/kconfig/icons/symbol_no.xpm create mode 100644 scripts/kconfig/icons/symbol_yes.xpm create mode 100644 scripts/kconfig/icons/tree_view.xpm delete mode 100644 scripts/kconfig/images.c delete mode 100644 scripts/kconfig/images.h
Signature · 1 line
~Randy
Quoted 1 line · Rostislav Krasny
On Wed, 17 Dec 2025 at 00:39, Randy Dunlap <[email protected]> wrote:
BTW, in the future, please start a new thread for new versions of patches. Don't just reply to the previous version's thread.
I think that's documented somewhere, but there is a lot of process documentation to digest.
Thanks.
Signature · 1 line
~Randy
Nathan Chancellor
maintainerQuoted 11 lines · Rostislav Krasny
Quoted 8 lines · Randy Dunlap
Yes, "make xconfig" worked properly before applying this patch.
.qconf.cmd (generated by build) tells me I am using Qt6. I don't see any build errors/warnings.
qt-core-devel & qt-base-common-devel are v6.10.1-1.2 from openSUSE Tumbleweed.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-next
Thanks!
[1/1] kconfig: move XPM icons to separate files
https://git.kernel.org/kbuild/c/18e2d526bf245
Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped or reverted.
Best regards,
Signature · 1 line
Nathan Chancellor <[email protected]>