Skip to content

Commit

Permalink
Port xconfig to Qt5 - Make single/split/full actions checkable.
Browse files Browse the repository at this point in the history
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
  • Loading branch information
Boris Barbulovski authored and Michal Marek committed Oct 14, 2015
1 parent 9c86235 commit 780505e
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
30 changes: 27 additions & 3 deletions scripts/kconfig/qconf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1329,11 +1329,14 @@ ConfigMainWindow::ConfigMainWindow(void)
QAction *searchAction = new QAction(_("&Find"), this);
searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
QAction *singleViewAction = new QAction(QPixmap(xpm_single_view), _("Single View"), this);
singleViewAction = new QAction(QPixmap(xpm_single_view), _("Single View"), this);
singleViewAction->setCheckable(TRUE);
connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
QAction *splitViewAction = new QAction(QPixmap(xpm_split_view), _("Split View"), this);
splitViewAction = new QAction(QPixmap(xpm_split_view), _("Split View"), this);
splitViewAction->setCheckable(TRUE);
connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()));
QAction *fullViewAction = new QAction(QPixmap(xpm_tree_view), _("Full View"), this);
fullViewAction = new QAction(QPixmap(xpm_tree_view), _("Full View"), this);
fullViewAction->setCheckable(TRUE);
connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView()));

QAction *showNameAction = new QAction(_("Show Name"), this);
Expand Down Expand Up @@ -1579,6 +1582,13 @@ void ConfigMainWindow::goBack(void)

void ConfigMainWindow::showSingleView(void)
{
singleViewAction->setEnabled(false);
singleViewAction->setChecked(true);
splitViewAction->setEnabled(true);
splitViewAction->setChecked(false);
fullViewAction->setEnabled(true);
fullViewAction->setChecked(false);

menuView->hide();
menuList->setRootMenu(0);
configList->mode = singleMode;
Expand All @@ -1592,6 +1602,13 @@ void ConfigMainWindow::showSingleView(void)

void ConfigMainWindow::showSplitView(void)
{
singleViewAction->setEnabled(true);
singleViewAction->setChecked(false);
splitViewAction->setEnabled(false);
splitViewAction->setChecked(true);
fullViewAction->setEnabled(true);
fullViewAction->setChecked(false);

configList->mode = symbolMode;
if (configList->rootEntry == &rootmenu)
configList->updateListAll();
Expand All @@ -1608,6 +1625,13 @@ void ConfigMainWindow::showSplitView(void)

void ConfigMainWindow::showFullView(void)
{
singleViewAction->setEnabled(true);
singleViewAction->setChecked(false);
splitViewAction->setEnabled(true);
splitViewAction->setChecked(false);
fullViewAction->setEnabled(false);
fullViewAction->setChecked(true);

menuView->hide();
menuList->setRootMenu(0);
configList->mode = fullMode;
Expand Down
3 changes: 3 additions & 0 deletions scripts/kconfig/qconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@ public slots:
ConfigInfoView *helpText;
QToolBar *toolBar;
QAction *backAction;
QAction *singleViewAction;
QAction *splitViewAction;
QAction *fullViewAction;
QSplitter* split1;
QSplitter* split2;
};

0 comments on commit 780505e

Please sign in to comment.