From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18CB2C433E0 for ; Mon, 29 Jun 2020 21:37:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB8AA206A1 for ; Mon, 29 Jun 2020 21:37:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593466631; bh=JxS7qG1TBN6E09S+KrZbuW/QoJaZC8vZAevnWONK0Vo=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=CrUSPjXTcx+LKcnvJSeJ69jHmNhOlY69hNQk5zen0P6QOr+JNBEQJ3QMPOT6GrR2K QtGdPC+I7RMzxoTOyQ0ZoTvaknRIZvdVEPFNLW3JMFiC21ZFKoPGY08//Vs+Ic9PLV rc3tdpHsf0Z6mwjpR8La+CU1df0GnGdySQYLt8vQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388554AbgF2VhJ (ORCPT ); Mon, 29 Jun 2020 17:37:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:60596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728425AbgF2Skj (ORCPT ); Mon, 29 Jun 2020 14:40:39 -0400 Received: from mail.kernel.org (ip5f5ad5c5.dynamic.kabel-deutschland.de [95.90.213.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D543F233F9; Mon, 29 Jun 2020 09:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593423343; bh=JxS7qG1TBN6E09S+KrZbuW/QoJaZC8vZAevnWONK0Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yap008obp4KXXBTi7vzlQ84ybSpi0OZY1NOtylkU/7C4HW0pvvZ8SNDpKlW3/DYzu p6unDyDIPAtgfVloBtlGC2t1HarckC+bgB1MNZiDt6rkPEKR1uiDcd3iYuHZLCZPS1 745yr1hXLGK2ih1KsHSEd2AhJRSF9ENhLhBX4Dc4= Received: from mchehab by mail.kernel.org with local (Exim 4.93) (envelope-from ) id 1jpqCS-006cAV-Jc; Mon, 29 Jun 2020 11:35:40 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Maxim Levitsky , Masahiro Yamada , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] kconfig: qconf: navigate menus on hyperlinks Date: Mon, 29 Jun 2020 11:35:39 +0200 Message-Id: <45fa5ad583de1766de6169366df1df5837c5dc7c.1593423060.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of just changing the helper window to show a dependency, also navigate to it at the config and menu widgets. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 49f0688fceb8..d8870b15a178 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1232,7 +1232,6 @@ void ConfigInfoView::clicked(const QUrl &url) char *data = new char[count + 1]; struct symbol **result; struct menu *m = NULL; - char type; if (count < 1) { qInfo() << "Clicked link is empty"; @@ -1242,7 +1241,6 @@ void ConfigInfoView::clicked(const QUrl &url) memcpy(data, str.constData(), count); data[count] = '\0'; - type = data[0]; /* Seek for exact match */ data[0] = '^'; @@ -1255,15 +1253,8 @@ void ConfigInfoView::clicked(const QUrl &url) } sym = *result; - if (type == 's') { - symbolInfo(); - emit showDebugChanged(true); - free(result); - delete data; - return; - } - /* URL is a menu */ + /* Seek for the menu which holds the symbol */ for (struct property *prop = sym->prop; prop; prop = prop->next) { if (prop->type != P_PROMPT && prop->type != P_MENU) continue; @@ -1271,17 +1262,11 @@ void ConfigInfoView::clicked(const QUrl &url) break; } - if (!m) { + if (!m) qInfo() << "Clicked menu is invalid:" << data; - free(result); - delete data; - return; - } + else + emit menuSelected(m); - _menu = m; - menuInfo(); - - emit showDebugChanged(true); free(result); delete data; } @@ -1750,6 +1735,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) item->setSelected(true); list->scrollToItem(item); list->setFocus(); + helpText->setInfo(menu); } } } -- 2.26.2