Commit 780505e3 authored by Boris Barbulovski's avatar Boris Barbulovski Committed by Michal Marek
Browse files

Port xconfig to Qt5 - Make single/split/full actions checkable. 



Signed-off-by: default avatarBoris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent 9c86235a

scripts/kconfig/qconf.cc

+27 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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();
@@ -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;

scripts/kconfig/qconf.h

+3 −0
Original line number Diff line number Diff line
@@ -316,6 +316,9 @@ public slots: 
	ConfigInfoView *helpText;

	QToolBar *toolBar;

	QAction *backAction;

	QAction *singleViewAction;

	QAction *splitViewAction;

	QAction *fullViewAction;

	QSplitter* split1;

	QSplitter* split2;

};