Fixed - Added overloaded AtenWindow::setSelectedMode() to take button…

… checked argument, and permitting button status to be corrected when using QShortcuts to access modes.
trisyoungs · Aug 26, 2016 · 029ac1b · 029ac1b
1 parent 8f0a82d
commit 029ac1b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -686,6 +686,8 @@ class AtenWindow : public QMainWindow
 	void useSelectedMode();
 	// Sets the currently selected interact mode
 	void setSelectedMode(UserAction::Action ua);
+	// Sets the currently selected interact mode, and corrects source button checked status
+	void setSelectedMode(UserAction::Action ua, bool buttonChecked);
 	// Return the currently selected mode
 	UserAction::Action selectedMode() const;
 	// Return the currently active mode

diff --git a/src/gui/mainwindow_interaction.cpp b/src/gui/mainwindow_interaction.cpp
@@ -81,6 +81,17 @@ void AtenWindow::setSelectedMode(UserAction::Action ua)
 	Messenger::exit("AtenWindow::setSelectedMode");
 }
 
+// Sets the currently selected interact mode, and corrects source button checked status
+void AtenWindow::setSelectedMode(UserAction::Action ua, bool buttonChecked)
+{
+	// If the button is checked, set the current mode to that suppled.
+	// Otherwise, set the button down status again (re-set the mode) if this mode is already selected.
+	// This is to overcome issues with QShortcuts connecting the 'click()' method of the TMenuButtons,
+	// which toggles the checked status instead of just keeping the button checked.
+	if (buttonChecked) setSelectedMode(ua);
+	else if (selectedMode_ == ua) setSelectedMode(ua);
+}
+
 // Set the active mode to the current user mode
 void AtenWindow::useSelectedMode()
 {

diff --git a/src/gui/mainwindow_panel_build.cpp b/src/gui/mainwindow_panel_build.cpp
@@ -35,17 +35,17 @@ void AtenWindow::updateBuildPanel(Model* sourceModel)
 
 void AtenWindow::on_BuildSelectAtomsButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::SelectAction);
+	setSelectedMode(UserAction::SelectAction, checked);
 }
 
 void AtenWindow::on_BuildSelectBoundButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::SelectBoundAction);
+	setSelectedMode(UserAction::SelectBoundAction, checked);
 }
 
 void AtenWindow::on_BuildSelectElementButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::SelectElementAction);
+	setSelectedMode(UserAction::SelectElementAction, checked);
 }
 
 /*
@@ -54,32 +54,32 @@ void AtenWindow::on_BuildSelectElementButton_clicked(bool checked)
 
 void AtenWindow::on_BuildDrawDrawButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawAtomsAction);
+	setSelectedMode(UserAction::DrawAtomsAction, checked);
 }
 
 void AtenWindow::on_BuildDrawFragmentButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawFragmentsAction);
+	setSelectedMode(UserAction::DrawFragmentsAction, checked);
 }
 
 void AtenWindow::on_BuildDrawDeleteButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawDeleteAction);
+	setSelectedMode(UserAction::DrawDeleteAction, checked);
 }
 
 void AtenWindow::on_BuildDrawTransmuteButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawTransmuteAction);
+	setSelectedMode(UserAction::DrawTransmuteAction, checked);
 }
 
 void AtenWindow::on_BuildDrawAddHButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawAddHydrogenAction);
+	setSelectedMode(UserAction::DrawAddHydrogenAction, checked);
 }
 
 void AtenWindow::on_BuildDrawGrowButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::DrawGrowAtomsAction);
+	setSelectedMode(UserAction::DrawGrowAtomsAction, checked);
 }
 
 /*

diff --git a/src/gui/mainwindow_panel_calculate.cpp b/src/gui/mainwindow_panel_calculate.cpp
@@ -36,17 +36,17 @@ void AtenWindow::updateCalculatePanel(Model* sourceModel)
 
 void AtenWindow::on_CalculateMeasureDistanceButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::MeasureDistanceAction);
+	setSelectedMode(UserAction::MeasureDistanceAction, checked);
 }
 
 void AtenWindow::on_CalculateMeasureAngleButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::MeasureAngleAction);
+	setSelectedMode(UserAction::MeasureAngleAction, checked);
 }
 
 void AtenWindow::on_CalculateMeasureTorsionButton_clicked(bool checked)
 {
-	if (checked) setSelectedMode(UserAction::MeasureTorsionAction);
+	setSelectedMode(UserAction::MeasureTorsionAction, checked);
 }
 
 void AtenWindow::on_CalculateMeasureClearButton_clicked(bool checked)