aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@iglu.org.il>2007-02-14 03:32:58 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:51 -0500
commit66e7c7230fed159e138fc1292ee662b8bbdb74d6 (patch)
tree33dd89d8bea56888f5a0a20a5fb814cad685a8a5
parent49e5646d6538f3a1c6697770f0bec2b2a0b7f30e (diff)
[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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--scripts/kconfig/qconf.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 52a03670e0db..83a270347c25 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1317,7 +1317,7 @@ ConfigMainWindow::ConfigMainWindow(void)
1317 conf_changed(); 1317 conf_changed();
1318 QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this); 1318 QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this);
1319 connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs())); 1319 connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
1320 QAction *searchAction = new QAction("Search", "&Search", CTRL+Key_F, this); 1320 QAction *searchAction = new QAction("Find", "&Find", CTRL+Key_F, this);
1321 connect(searchAction, SIGNAL(activated()), SLOT(searchConfig())); 1321 connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
1322 QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), "Split View", 0, this); 1322 QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), "Split View", 0, this);
1323 connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView())); 1323 connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
@@ -1374,10 +1374,13 @@ ConfigMainWindow::ConfigMainWindow(void)
1374 saveAction->addTo(config); 1374 saveAction->addTo(config);
1375 saveAsAction->addTo(config); 1375 saveAsAction->addTo(config);
1376 config->insertSeparator(); 1376 config->insertSeparator();
1377 searchAction->addTo(config);
1378 config->insertSeparator();
1379 quitAction->addTo(config); 1377 quitAction->addTo(config);
1380 1378
1379 // create edit menu
1380 QPopupMenu* editMenu = new QPopupMenu(this);
1381 menu->insertItem("&Edit", editMenu);
1382 searchAction->addTo(editMenu);
1383
1381 // create options menu 1384 // create options menu
1382 QPopupMenu* optionMenu = new QPopupMenu(this); 1385 QPopupMenu* optionMenu = new QPopupMenu(this);
1383 menu->insertItem("&Option", optionMenu); 1386 menu->insertItem("&Option", optionMenu);