Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66e7c723 authored by Shlomi Fish's avatar Shlomi Fish Committed by Linus Torvalds
Browse files

[PATCH] qconf: relocate Search Command 



Relocate the qconf search command to the "Edit"->"Find" menu option.

This is per the discussion on my qconf search dialog patch.

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49e5646d

scripts/kconfig/qconf.cc

+6 −3
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ ConfigMainWindow::ConfigMainWindow(void) 
	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);

	QAction *searchAction = new QAction("Find", "&Find", CTRL+Key_F, this);

	  connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));

	QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), "Split View", 0, this);

	  connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
@@ -1374,10 +1374,13 @@ ConfigMainWindow::ConfigMainWindow(void) 
	saveAction->addTo(config);

	saveAsAction->addTo(config);

	config->insertSeparator();

	searchAction->addTo(config);

	config->insertSeparator();

	quitAction->addTo(config);



	// create edit menu

	QPopupMenu* editMenu = new QPopupMenu(this);

	menu->insertItem("&Edit", editMenu);

	searchAction->addTo(editMenu);



	// create options menu

	QPopupMenu* optionMenu = new QPopupMenu(this);

	menu->insertItem("&Option", optionMenu);