Commit 3b354c55 authored by Karsten Wiese's avatar Karsten Wiese Committed by Linus Torvalds
Browse files

[PATCH] kconfig: add "void conf_set_changed_callback(void (*fn)(void))", use it in qconf.cc 



Added function sets "void (*conf_changed_callback)(void)".  Call it, if
.config's changed state changes.  Use above in qconf.cc to set gui's
save-widget's sensitvity.

Signed-off-by: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bfc10001

scripts/kconfig/confdata.c

+11 −1
Original line number Diff line number Diff line
@@ -767,18 +767,28 @@ int conf_write_autoconf(void) 
}



static int sym_change_count;

static void (*conf_changed_callback)(void);



void sym_set_change_count(int count)

{

	int _sym_change_count = sym_change_count;

	sym_change_count = count;

	if (conf_changed_callback &&

	    (bool)_sym_change_count != (bool)count)

		conf_changed_callback();

}



void sym_add_change_count(int count)

{

	sym_change_count += count;

	sym_set_change_count(count + sym_change_count);

}



bool conf_get_changed(void)

{

	return sym_change_count;

}



void conf_set_changed_callback(void (*fn)(void))

{

	conf_changed_callback = fn;

}

scripts/kconfig/lkc_proto.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ P(conf_read_simple,int,(const char *name, int)); 
P(conf_write,int,(const char *name));

P(conf_write_autoconf,int,(void));

P(conf_get_changed,bool,(void));

P(conf_set_changed_callback, void,(void (*fn)(void)));



/* menu.c */

P(rootmenu,struct menu,);

scripts/kconfig/qconf.cc

+12 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
static QApplication *configApp;

static ConfigSettings *configSettings;



QAction *ConfigMainWindow::saveAction;



static inline QString qgettext(const char* str)

{

	return QString::fromLocal8Bit(gettext(str));
@@ -1306,8 +1308,11 @@ ConfigMainWindow::ConfigMainWindow(void) 
	  connect(quitAction, SIGNAL(activated()), SLOT(close()));

	QAction *loadAction = new QAction("Load", QPixmap(xpm_load), "&Load", CTRL+Key_L, this);

	  connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));

	QAction *saveAction = new QAction("Save", QPixmap(xpm_save), "&Save", CTRL+Key_S, this);

	saveAction = new QAction("Save", QPixmap(xpm_save), "&Save", CTRL+Key_S, this);

	  connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));

	conf_set_changed_callback(conf_changed);

	// Set saveAction's initial state

	conf_changed();

	QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this);

	  connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));

	QAction *searchAction = new QAction("Search", "&Search", CTRL+Key_F, this);
@@ -1658,6 +1663,12 @@ void ConfigMainWindow::saveSettings(void) 
	configSettings->writeSizes("/split2", split2->sizes());

}



void ConfigMainWindow::conf_changed(void)

{

	if (saveAction)

		saveAction->setEnabled(conf_get_changed());

}



void fixup_rootmenu(struct menu *menu)

{

	struct menu *child;

scripts/kconfig/qconf.h

+3 −0
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ protected: 


class ConfigMainWindow : public QMainWindow {

	Q_OBJECT



	static QAction *saveAction;

	static void conf_changed(void);

public:

	ConfigMainWindow(void);

public slots:

CRA Git | Maintained and supported by SUSTech CRA and CCSE