ldforge: comparison src/configDialog.cpp

-:d3373bc7ca3b
+:2b5adb45aaa5
 	connect (ui->findDownloadPath, SIGNAL (clicked (bool)), this, SLOT (slot_findDownloadFolder()));
 	ui->m_profileName->setText (ld_defaultname);
 	ui->m_profileUsername->setText (ld_defaultuser);
 	ui->m_profileLicense->setCurrentIndex (ld_defaultlicense);
-	ui->tabs->setCurrentIndex (deftab);
 	initGrids();
 	initExtProgs();
+	selectPage (deftab);
 	connect (ui->buttonBox, SIGNAL (clicked (QAbstractButton*)),
-			 this, SLOT (buttonClicked (QAbstractButton*)));
+		this, SLOT (buttonClicked (QAbstractButton*)));
+	connect (ui->m_pages, SIGNAL (currentChanged (int)),
+		this, SLOT (selectPage (int)));
+	connect (ui->m_pagelist, SIGNAL (currentRowChanged (int)),
+		this, SLOT (selectPage (int)));
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 ConfigDialog::~ConfigDialog()
 {	delete ui;
+}
+// =============================================================================
+// -----------------------------------------------------------------------------
+void ConfigDialog::selectPage (int row)
+{	ui->m_pagelist->setCurrentRow (row);
+	ui->m_pages->setCurrentIndex (row);
 }
 // =============================================================================
 // Adds a shortcut entry to the list of shortcuts.
 // -----------------------------------------------------------------------------
 	*ylabel = new QLabel ("Y"),
 	*zlabel = new QLabel ("Z"),
 	*anglabel = new QLabel ("Angle");
 	short i = 1;
-for (QLabel * label : initlist<QLabel*> ( { xlabel, ylabel, zlabel, anglabel }))
+	for (QLabel* label : initlist<QLabel*> ({xlabel, ylabel, zlabel, anglabel}))
 	{	label->setAlignment (Qt::AlignCenter);
 		gridlayout->addWidget (label, 0, i++);
 	}
 	for (int i = 0; i < g_NumGrids; ++i)
 	if (button == dbb->button (QDDB::Ok))
 	{	applySettings();
 		accept();
 	} elif (button == dbb->button (QDDB::Apply))
 	{	applySettings();
 	} elif (button == dbb->button (QDDB::Cancel))
 	{	reject();
 	}
 }
 		delete item;
 	quickColorItems.clear();
 	// Init table items
-for (LDQuickColor & entry : quickColors)
+	for (LDQuickColor& entry : quickColors)
 	{	QListWidgetItem* item = new QListWidgetItem;
 		if (entry.isSeparator())
 		{	item->setText ("--------");
 			item->setIcon (getIcon ("empty"));
 // Finds the given list widget item in the list of widget items given.
 // -----------------------------------------------------------------------------
 int ConfigDialog::getItemRow (QListWidgetItem* item, QList<QListWidgetItem*>& haystack)
 {	int i = 0;
-for (QListWidgetItem * it : haystack)
+	for (QListWidgetItem* it : haystack)
 	{	if (it == item)
 			return i;
 		++i;
 	}
 // Get the list of shortcuts selected
 // -----------------------------------------------------------------------------
 QList<ShortcutListItem*> ConfigDialog::getShortcutSelection()
 {	QList<ShortcutListItem*> out;
-for (QListWidgetItem * entry : ui->shortcutsList->selectedItems())
+	for (QListWidgetItem* entry : ui->shortcutsList->selectedItems())
 		out << static_cast<ShortcutListItem*> (entry);
 	return out;
 }
 // Reset a shortcut to defaults
 // -----------------------------------------------------------------------------
 void ConfigDialog::slot_resetShortcut()
 {	QList<ShortcutListItem*> sel = getShortcutSelection();
-for (ShortcutListItem * item : sel)
+	for (ShortcutListItem* item : sel)
 	{	item->keyConfig()->reset();
 		setShortcutText (item);
 	}
 }
 // Remove the shortcut of an action.
 // -----------------------------------------------------------------------------
 void ConfigDialog::slot_clearShortcut()
 {	QList<ShortcutListItem*> sel = getShortcutSelection();
-for (ShortcutListItem * item : sel)
+	for (ShortcutListItem* item : sel)
 	{	item->keyConfig()->value = QKeySequence();
 		setShortcutText (item);
 	}
 }
 // Set the path of an external program
 // -----------------------------------------------------------------------------
 void ConfigDialog::slot_setExtProgPath()
 {	const LDExtProgInfo* info = null;
-for (const LDExtProgInfo & it : g_LDExtProgInfo)
+	for (const LDExtProgInfo& it : g_LDExtProgInfo)
 	{	if (it.setPathButton == sender())
 		{	info = &it;
 			break;
 		}
 	}
 // Gets the configuration string of the quick color toolbar
 // -----------------------------------------------------------------------------
 str ConfigDialog::quickColorString()
 {	str val;
-for (const LDQuickColor & entry : quickColors)
+	for (const LDQuickColor& entry : quickColors)
 	{	if (val.length() > 0)
 			val += ':';
 		if (entry.isSeparator())
 			val += '|';

Mercurial > ldforge / file comparison

comparison: src/configDialog.cpp

src/configDialog.cpp