summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-06 08:43:52 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-06 08:43:52 (GMT)
commitb6c7370087936461364518a18ed80c1a8641866d (patch)
treee17e5cf8ae85daf499c5f47731753fbaebd840fb
parent3de1e6f807975a823a582a957c9b88efc2170de8 (diff)
Reset buttons fixes
-rw-r--r--kstars/ekos/focus/focus.cpp34
-rw-r--r--kstars/ekos/focus/focus.ui6
2 files changed, 13 insertions, 27 deletions
diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
index 98f5c73..5c93d24 100644
--- a/kstars/ekos/focus/focus.cpp
+++ b/kstars/ekos/focus/focus.cpp
@@ -1994,7 +1994,6 @@ void Focus::startFraming()
void Focus::resetButtons()
{
-
if (inFocusLoop)
{
startFocusB->setEnabled(false);
@@ -2002,8 +2001,6 @@ void Focus::resetButtons()
stopFocusB->setEnabled(true);
captureB->setEnabled(false);
- focusOutB->setEnabled(true);
- focusInB->setEnabled(true);
return;
}
@@ -2017,34 +2014,23 @@ void Focus::resetButtons()
captureB->setEnabled(false);
focusOutB->setEnabled(false);
focusInB->setEnabled(false);
+ setAbsTicksB->setEnabled(false);
return;
}
- if (focusType == FOCUS_AUTO && currentFocuser)
- startFocusB->setEnabled(true);
- else
- startFocusB->setEnabled(false);
-
- stopFocusB->setEnabled(false);
- startLoopB->setEnabled(true);
-
-
- /*if (focusType == FOCUS_MANUAL)
+ if (currentFocuser)
{
- if (currentFocuser)
- {
- focusOutB->setEnabled(true);
- focusInB->setEnabled(true);
- }
+ focusOutB->setEnabled(true);
+ focusInB->setEnabled(true);
+
+ startFocusB->setEnabled(focusType == FOCUS_AUTO);
+ setAbsTicksB->setEnabled(canAbsMove || canRelMove);
- startLoopB->setEnabled(true);
}
- else
- {
- focusOutB->setEnabled(false);
- focusInB->setEnabled(false);
- }*/
+
+ stopFocusB->setEnabled(false);
+ startLoopB->setEnabled(true);
captureB->setEnabled(true);
}
diff --git a/kstars/ekos/focus/focus.ui b/kstars/ekos/focus/focus.ui
index 2f50e7b..50fdafa 100644
--- a/kstars/ekos/focus/focus.ui
+++ b/kstars/ekos/focus/focus.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>647</width>
+ <width>646</width>
<height>579</height>
</rect>
</property>
@@ -91,7 +91,7 @@
<item row="0" column="2">
<widget class="QPushButton" name="focusInB">
<property name="enabled">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="text">
<string>Focus In</string>
@@ -144,7 +144,7 @@
<item row="0" column="3">
<widget class="QPushButton" name="focusOutB">
<property name="enabled">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="text">
<string>Focus Out</string>