From patchwork Thu Apr 2 09:27:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470397 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 706AB14DD for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EFEC206D3 for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819714; bh=uW5gIy6Vwri4JjBZCqV2GhL39w/KMjWmxypGxq5SSDw=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=Tg9ZImaQ6SQd04MMMnZ2vcvtqaRNNFNE6uZfZpryfuEgknYcII/hpL7DZ24SlfHgD +I2/xpxibd4cJ9iBSRkUUkh+InFyor9qLdPevdSie93zmnFIxAKZIeGGKwvyCSZ0Qa MpgnveLR8NN7QuuhV6lSOGCaajbkPdoKJnwNNe3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387730AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:49206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728135AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 BD52D2073B; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819687; bh=uW5gIy6Vwri4JjBZCqV2GhL39w/KMjWmxypGxq5SSDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H580aSQR61YugH6s4MZW4GdgtvX8Nq0d54fqTDql8QtZ4i4D1B4T81ygOL76yEJyI fed4KFk+QNQ/4Flf5odrDQoOM57gUbLORUwELeFPRiggWb3+CvgvB8FoAMFlY+nqrf F1Zxx6ZyqlR5M4hi9q5eRq2u3fm1kzZXreumy7nc= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000Aa6-1a; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 1/6] kconfig: qconf: clean deprecated warnings Date: Thu, 2 Apr 2020 11:27:58 +0200 Message-Id: <9e939a9af7adbfc1e567ca13955788608aecddd3.1585819250.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The recommended way to initialize a null string is with QString(). This is there at least since Qt5.5, with is when qconf was ported to Qt5. Fix those warnings: scripts/kconfig/qconf.cc: In member function ‘void ConfigItem::updateMenu()’: scripts/kconfig/qconf.cc:158:31: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations] 158 | setText(noColIdx, QString::null); | ^~~~ In file included from /usr/include/qt5/QtCore/qobject.h:47, from /usr/include/qt5/QtWidgets/qwidget.h:45, from /usr/include/qt5/QtWidgets/qmainwindow.h:44, from /usr/include/qt5/QtWidgets/QMainWindow:1, from scripts/kconfig/qconf.cc:9: Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 82773cc35d35..daa3325c0a49 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -154,9 +154,9 @@ void ConfigItem::updateMenu(void) if (!sym_is_changeable(sym) && list->optMode == normalOpt) { setPixmap(promptColIdx, QIcon()); - setText(noColIdx, QString::null); - setText(modColIdx, QString::null); - setText(yesColIdx, QString::null); + setText(noColIdx, QString()); + setText(modColIdx, QString()); + setText(yesColIdx, QString()); break; } expr = sym_get_tristate_value(sym); @@ -276,7 +276,7 @@ void ConfigLineEdit::show(ConfigItem* i) if (sym_get_string_value(item->menu->sym)) setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym))); else - setText(QString::null); + setText(QString()); Parent::show(); setFocus(); } From patchwork Thu Apr 2 09:27:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470391 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB4A414DD for ; Thu, 2 Apr 2020 09:28:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A03B2082F for ; Thu, 2 Apr 2020 09:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819711; bh=cywDP6eNSmYYa3KeaQgosXJi4aqsO1zjpdq6I2/ZdSc=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=K8yJ1Il4mxgOspXVH5d9Oowd5S51KBBhQOG56PiHEfWirrcd+TlNztfBJUJQ8Qi9G 5lo2KgEyqrmw4sNpN0YdVUoQZ+YWQIMva19XIn470lcvYBEEYabZwU2S4402IJPwl3 Bd8eZ5Y8fy5+52H8QfJSwoXRR0tAdAFWnwXqoVro= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725965AbgDBJ2Y (ORCPT ); Thu, 2 Apr 2020 05:28:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:49230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387721AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 C6C492078C; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819687; bh=cywDP6eNSmYYa3KeaQgosXJi4aqsO1zjpdq6I2/ZdSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUZP7ipkni1ynrf/4zsRG4qpMiYSMcAxWfYuGiG75cP/GAEkg2z2j5rjYThRLCPR5 AMvxPEM3LHwFhhoscGrR9YYS8tGIZ0HH9PRuqf4ZsWzxH3nOJZv2b2StxdO35h9BuU 4e+WhgxrufovTdOWAYdoOIKJQq/YGQsAtibLreiY= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000AaA-2Y; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 2/6] kconfig: qconf: Change title for the item window Date: Thu, 2 Apr 2020 11:27:59 +0200 Message-Id: <39c72450d98fc16b735237df296b066c8eebb066.1585819250.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Both main config window and the item window have "Option" name. That sounds weird, and makes harder to debug issues of a window appearing at the wrong place. So, change the title to reflect the contents of each window. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index daa3325c0a49..2f4971906207 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -318,7 +318,10 @@ ConfigList::ConfigList(ConfigView* p, const char *name) setVerticalScrollMode(ScrollPerPixel); setHorizontalScrollMode(ScrollPerPixel); - setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value"); + if (mode == symbolMode) + setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value"); + else + setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value"); connect(this, SIGNAL(itemSelectionChanged(void)), SLOT(updateSelection(void))); @@ -399,6 +402,11 @@ void ConfigList::updateSelection(void) struct menu *menu; enum prop_type type; + if (mode == symbolMode) + setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value"); + else + setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value"); + if (selectedItems().count() == 0) return; From patchwork Thu Apr 2 09:28:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470393 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0251114B4 for ; Thu, 2 Apr 2020 09:28:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D577820787 for ; Thu, 2 Apr 2020 09:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819711; bh=GxD2mP2VPelWfZbCtWzT8FlS64HgoRgkaYW8jMe+pTM=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=nBkMa6GBRST08r9fBjtZQquhrcwSUYjsxPRah1XHV+l6d5ulsNTftfgutjmslLmN7 mzsFcVRseEiqlr+Pk6uiOl+o3HF5Z5M5B7oxQBPhYI7LpcW0J//StT8TzuM8qI+8Nl LZFsA0IhRW+07Ww0P/dSycsAez9pLBLc5rOW9DaU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387736AbgDBJ2Y (ORCPT ); Thu, 2 Apr 2020 05:28:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:49244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387723AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 CCC6E207FF; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819688; bh=GxD2mP2VPelWfZbCtWzT8FlS64HgoRgkaYW8jMe+pTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLC3SaPDWXGYceTPisq3HpJrpQw6Ks98LM3ZbWZYFtsLToL0c2fk7FuDEPGzZy/gT 8DOYh9nmoe8ywSUOwh/IY5wK6/kpx02gdAnTjpt0VRayhFPQKlP/tQu3M3EjaDub0p jqUpVXyFAVZC3rMzBtkXC3k+s7DgcoQTJXSLbjOM= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000AaF-3M; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 3/6] kconfig: qconf: fix the content of the main widget Date: Thu, 2 Apr 2020 11:28:00 +0200 Message-Id: <3f87c3c69b198ee3b42b92d5d230c3976115b60e.1585819250.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The port to Qt5 tried to preserve the same way as it used to work with Qt3 and Qt4. However, at least with newer versions of Qt5 (5.13), this doesn't work properly. Change the schema by adding a vertical layout, in order for it to start working properly again. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 2f4971906207..81ae6c059c1c 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1362,21 +1362,32 @@ ConfigMainWindow::ConfigMainWindow(void) if ((x.isValid())&&(y.isValid())) move(x.toInt(), y.toInt()); - split1 = new QSplitter(this); + QWidget *widget = new QWidget(this); + QVBoxLayout *layout = new QVBoxLayout(widget); + setCentralWidget(widget); + + split1 = new QSplitter(widget); split1->setOrientation(Qt::Horizontal); - setCentralWidget(split1); + split1->setChildrenCollapsible(false); - menuView = new ConfigView(split1, "menu"); + menuView = new ConfigView(widget, "menu"); menuList = menuView->list; - split2 = new QSplitter(split1); + split2 = new QSplitter(widget); + split2->setChildrenCollapsible(false); split2->setOrientation(Qt::Vertical); // create config tree - configView = new ConfigView(split2, "config"); + configView = new ConfigView(widget, "config"); configList = configView->list; - helpText = new ConfigInfoView(split2, "help"); + helpText = new ConfigInfoView(widget, "help"); + + layout->addWidget(split2); + split2->addWidget(split1); + split1->addWidget(configView); + split1->addWidget(menuView); + split2->addWidget(helpText); setTabOrder(configList, helpText); configList->setFocus(); From patchwork Thu Apr 2 09:28:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2D9317EA for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A140B20787 for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819714; bh=SE01dDEIKYFr3cs2t9tU2AzJYIDH7MNSWH3AJAO9c0Q=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=vChDek1SucVxHVcKvBJSuttcl18eFJm6rohTVuGjlp/JSIYXVSlb/WoCDM7aPwpNO ARr8NE076U7BsOCADzp4dunfpDhZG9OmmFv21QqcXzWMoGHvsVuin9YjJ6poNsry4I fnRw1RWu1A0D23myAy3BS5vmJ9oDZmPWcNSYOtmY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387721AbgDBJ2e (ORCPT ); Thu, 2 Apr 2020 05:28:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:49246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387726AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 CFB8F20787; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819688; bh=SE01dDEIKYFr3cs2t9tU2AzJYIDH7MNSWH3AJAO9c0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1CgWBnL5qmGwABehR2HJw2r9fvu96hO1NY+tIi760YBvqA0e4qQuyKdT2LTmi21KR SLQp7k1L06JA8nMK8HhJRkgrj7OIfnnPpTYrGQ0bZwmNkH2Cp5oxZlkAXjTfSgDRCP Cr/j0G1YOloZ25F5OP8HRfF3UsHPKMle3uYWEiyY= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000AaK-4L; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 4/6] kconfig: qconf: fix support for the split view mode Date: Thu, 2 Apr 2020 11:28:01 +0200 Message-Id: <2407b050c25b9bb53743f089b16e4611143d2239.1585819250.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org At least on my tests (building against Qt5.13), it seems to me that, since Kernel 3.14, the split view mode is broken. Maybe it was not a top priority during the conversion time. Anyway, this patch changes the logic in order to properly support the split view mode and the single view mode. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 33 ++++++++++++++++++++++++++------- scripts/kconfig/qconf.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 81ae6c059c1c..5a560c647321 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -744,7 +744,10 @@ void ConfigList::keyPressEvent(QKeyEvent* ev) type = menu->prompt ? menu->prompt->type : P_UNKNOWN; if (type == P_MENU && rootEntry != menu && mode != fullMode && mode != menuMode) { - emit menuSelected(menu); + if (mode == menuMode) + emit menuSelected(menu); + else + emit itemSelected(menu); break; } case Qt::Key_Space: @@ -851,9 +854,12 @@ void ConfigList::mouseDoubleClickEvent(QMouseEvent* e) if (!menu) goto skip; ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; - if (ptype == P_MENU && (mode == singleMode || mode == symbolMode)) - emit menuSelected(menu); - else if (menu->sym) + if (ptype == P_MENU) { + if (mode == singleMode) + emit itemSelected(menu); + else if (mode == symbolMode) + emit menuSelected(menu); + } else if (menu->sym) changeValue(item); skip: @@ -1505,6 +1511,8 @@ ConfigMainWindow::ConfigMainWindow(void) helpText, SLOT(setInfo(struct menu *))); connect(configList, SIGNAL(menuSelected(struct menu *)), SLOT(changeMenu(struct menu *))); + connect(configList, SIGNAL(itemSelected(struct menu *)), + SLOT(changeItens(struct menu *))); connect(configList, SIGNAL(parentSelected()), SLOT(goBack())); connect(menuList, SIGNAL(menuChanged(struct menu *)), @@ -1601,15 +1609,26 @@ void ConfigMainWindow::searchConfig(void) searchWindow->show(); } -void ConfigMainWindow::changeMenu(struct menu *menu) +void ConfigMainWindow::changeItens(struct menu *menu) { configList->setRootMenu(menu); + if (configList->rootEntry->parent == &rootmenu) backAction->setEnabled(false); else backAction->setEnabled(true); } +void ConfigMainWindow::changeMenu(struct menu *menu) +{ + menuList->setRootMenu(menu); + + if (menuList->rootEntry->parent == &rootmenu) + backAction->setEnabled(false); + else + backAction->setEnabled(true); +} + void ConfigMainWindow::setMenuLink(struct menu *menu) { struct menu *parent; @@ -1719,14 +1738,14 @@ void ConfigMainWindow::showSplitView(void) fullViewAction->setEnabled(true); fullViewAction->setChecked(false); - configList->mode = symbolMode; + configList->mode = menuMode; if (configList->rootEntry == &rootmenu) configList->updateListAll(); else configList->setRootMenu(&rootmenu); configList->setAllOpen(true); configApp->processEvents(); - menuList->mode = menuMode; + menuList->mode = symbolMode; menuList->setRootMenu(&rootmenu); menuList->setAllOpen(true); menuView->show(); diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index 45bfe9b2b966..c879d79ce817 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -71,6 +71,7 @@ public slots: signals: void menuChanged(struct menu *menu); void menuSelected(struct menu *menu); + void itemSelected(struct menu *menu); void parentSelected(void); void gotFocus(struct menu *); @@ -298,6 +299,7 @@ class ConfigMainWindow : public QMainWindow { ConfigMainWindow(void); public slots: void changeMenu(struct menu *); + void changeItens(struct menu *); void setMenuLink(struct menu *); void listFocusChanged(void); void goBack(void); From patchwork Thu Apr 2 09:28:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470389 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8665814B4 for ; Thu, 2 Apr 2020 09:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6495B206D3 for ; Thu, 2 Apr 2020 09:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819703; bh=Or/c+7Yz7rNaW586sekoMkfB7wAeHBOv0HFxS+7zG40=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=Z/SX/61SdcyE8o+IdsqKMnDSiDPeAymyZLlMJgLlBHiLMwD1LQakq/OJMyHV1MqY4 JeYAh3OwHwJ5zhz2GhYKxUWQT0ctr+ZVbahsXJLzTeC+gAmACa07xX9JzwQ0Z3d5VV i9DrGmiQHA/0A7jpx6cGEsdJTN0z8VqShZ3ey2aY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387707AbgDBJ2S (ORCPT ); Thu, 2 Apr 2020 05:28:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:49266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387736AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 DDE3C2082F; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819688; bh=Or/c+7Yz7rNaW586sekoMkfB7wAeHBOv0HFxS+7zG40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N0WI4+vcBSk8+E2ARSSPEU1XwovcM+dB83Jptmv+EGVvU62aA2N/XmomFXsdHwe0B wuEPUL7eIBqFi6RQHsbntYvK893NkrzfrpMtvD252I3I0qiHR7zXxmaUCoOLjpYszM fsuRgbeCMi16wbSXk11P59p409GHAZNuL9rnL+iw= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000AaP-5U; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 5/6] kconfig: qconf: remove some old bogus TODOs Date: Thu, 2 Apr 2020 11:28:02 +0200 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The items described on those TODOs are already solved. So, remove the comments. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 5a560c647321..f3eaeb2b70da 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -839,7 +839,7 @@ void ConfigList::mouseMoveEvent(QMouseEvent* e) void ConfigList::mouseDoubleClickEvent(QMouseEvent* e) { - QPoint p = e->pos(); // TODO: Check if this works(was contentsToViewport). + QPoint p = e->pos(); ConfigItem* item = (ConfigItem*)itemAt(p); struct menu *menu; enum prop_type ptype; @@ -1773,7 +1773,6 @@ void ConfigMainWindow::showFullView(void) /* * ask for saving configuration before quitting - * TODO ask only when something changed */ void ConfigMainWindow::closeEvent(QCloseEvent* e) { From patchwork Thu Apr 2 09:28:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470387 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC14917EA for ; Thu, 2 Apr 2020 09:28:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A10DC2074D for ; Thu, 2 Apr 2020 09:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819696; bh=arJuEu1VaCuRLLMtEVLbOj/nXcpJ/nIL0njuJu/AVCc=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=S60euGKfacwwdsS2XYySYh/CSalFQsRlRmrBNVIc9zqAYg3A3r0tt3PBhfzHBlmTS CRaC6L186ZQgTDrydgckg9EU6B8iNlEmE6F3KmwtjEtbrbbVykBscjNy58CfV1djbz i4WzRSokmky09iF0qdP6DPLpIfx9WkMygxQDdL0g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387858AbgDBJ2K (ORCPT ); Thu, 2 Apr 2020 05:28:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:49264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387734AbgDBJ2J (ORCPT ); Thu, 2 Apr 2020 05:28:09 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 DC66B2080C; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819688; bh=arJuEu1VaCuRLLMtEVLbOj/nXcpJ/nIL0njuJu/AVCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Js3TaHpbnk17qr53i8vzInaYB0+ldzlG0BFyxz8OL8ROt+5tUx3meQW6VGgLOFN3m Rj2ILK0L7r/1gZ9c5ewaQtH3bYB15D85m3rLnbyT5rdFoNNT1yo162mMvwz41DHlWl mPh35GJcX/v8DK/wwuL6mNkKrObpzNFleWfuAKKM= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000AaU-6S; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 6/6] kconfig: qconf: Fix a few alignment issues Date: Thu, 2 Apr 2020 11:28:03 +0200 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org There are a few items with wrong alignments. Solve them. Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index f3eaeb2b70da..84976b9d2174 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -635,7 +635,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) last = item; continue; } - hide: +hide: if (item && item->menu == child) { last = parent->firstChild(); if (last == item) @@ -700,7 +700,7 @@ void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu) last = item; continue; } - hide: +hide: if (item && item->menu == child) { last = (ConfigItem*)parent->topLevelItem(0); if (last == item) @@ -1239,10 +1239,11 @@ QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos) { QMenu* popup = Parent::createStandardContextMenu(pos); QAction* action = new QAction("Show Debug Info", popup); - action->setCheckable(true); - connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); - connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); - action->setChecked(showDebug()); + + action->setCheckable(true); + connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); + connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); + action->setChecked(showDebug()); popup->addSeparator(); popup->addAction(action); return popup;