Switched the positions of step-over and step-into buttons.

OpenModelica · Nov 4, 2016 · 9298f3a · 9298f3a
1 parent 74b8f7b
commit 9298f3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp b/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp
@@ -342,16 +342,7 @@ StackFramesWidget::StackFramesWidget(MainWindow *pMainWindow)
   pControlButtonsHorizontalLayout->addWidget(mpInterruptToolButton);
   pControlButtonsHorizontalLayout->addWidget(mpExitToolButton);
   pControlButtonsFrame->setLayout(pControlButtonsHorizontalLayout);
-  /* continue tool button */
-  mpStepOverToolButton = new QToolButton;
-  mpStepOverToolButton->setEnabled(false);
-  mpStepOverToolButton->setText(Helper::stepOver);
-  mpStepOverToolButton->setIcon(QIcon(":/Resources/icons/step-over.svg"));
-  mpStepOverToolButton->setIconSize(Helper::buttonIconSize);
-  mpStepOverToolButton->setToolTip(Helper::stepOver);
-  mpStepOverToolButton->setAutoRaise(true);
-  connect(mpStepOverToolButton, SIGNAL(clicked()), SLOT(stepOverButtonClicked()));
-  /* continue tool button */
+  /* step-into tool button */
   mpStepIntoToolButton = new QToolButton;
   mpStepIntoToolButton->setEnabled(false);
   mpStepIntoToolButton->setText(Helper::stepInto);
@@ -360,7 +351,16 @@ StackFramesWidget::StackFramesWidget(MainWindow *pMainWindow)
   mpStepIntoToolButton->setToolTip(Helper::stepInto);
   mpStepIntoToolButton->setAutoRaise(true);
   connect(mpStepIntoToolButton, SIGNAL(clicked()), SLOT(stepIntoButtonClicked()));
-  /* continue tool button */
+  /* step-over tool button */
+  mpStepOverToolButton = new QToolButton;
+  mpStepOverToolButton->setEnabled(false);
+  mpStepOverToolButton->setText(Helper::stepOver);
+  mpStepOverToolButton->setIcon(QIcon(":/Resources/icons/step-over.svg"));
+  mpStepOverToolButton->setIconSize(Helper::buttonIconSize);
+  mpStepOverToolButton->setToolTip(Helper::stepOver);
+  mpStepOverToolButton->setAutoRaise(true);
+  connect(mpStepOverToolButton, SIGNAL(clicked()), SLOT(stepOverButtonClicked()));
+  /* step-return tool button */
   mpStepReturnToolButton = new QToolButton;
   mpStepReturnToolButton->setEnabled(false);
   mpStepReturnToolButton->setText(Helper::stepReturn);
@@ -374,8 +374,8 @@ StackFramesWidget::StackFramesWidget(MainWindow *pMainWindow)
   QHBoxLayout *pFlowButtonsHorizontalLayout = new QHBoxLayout;
   pFlowButtonsHorizontalLayout->setContentsMargins(0, 0, 0, 0);
   pFlowButtonsHorizontalLayout->setSpacing(0);
-  pFlowButtonsHorizontalLayout->addWidget(mpStepOverToolButton);
   pFlowButtonsHorizontalLayout->addWidget(mpStepIntoToolButton);
+  pFlowButtonsHorizontalLayout->addWidget(mpStepOverToolButton);
   pFlowButtonsHorizontalLayout->addWidget(mpStepReturnToolButton);
   pFlowButtonsFrame->setLayout(pFlowButtonsHorizontalLayout);
   /* Threads Label */

diff --git a/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.h b/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.h
@@ -104,8 +104,8 @@ class StackFramesWidget : public QWidget
   QToolButton *mpResumeToolButton;
   QToolButton *mpInterruptToolButton;
   QToolButton *mpExitToolButton;
-  QToolButton *mpStepOverToolButton;
   QToolButton *mpStepIntoToolButton;
+  QToolButton *mpStepOverToolButton;
   QToolButton *mpStepReturnToolButton;
   Label *mpThreadsLabel;
   QComboBox *mpThreadsComboBox;