[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kstars/bleeding] kstars/ekos/scheduler: Minor GUI change. Need to update to reflect guiding changes
From:       Jasem Mutlaq <mutlaqja () ikarustech ! com>
Date:       2016-09-30 20:38:34
Message-ID: E1bq4Zm-00030p-Va () code ! kde ! org
[Download RAW message or body]

Git commit c67acebdad5cdca7317249872659505d6ef7957b by Jasem Mutlaq.
Committed on 30/09/2016 at 20:36.
Pushed by mutlaqja into branch 'bleeding'.

Minor GUI change. Need to update to reflect guiding changes

M  +1    -1    kstars/ekos/scheduler/scheduler.cpp
M  +23   -16   kstars/ekos/scheduler/scheduler.ui

http://commits.kde.org/kstars/c67acebdad5cdca7317249872659505d6ef7957b

diff --git a/kstars/ekos/scheduler/scheduler.cpp \
b/kstars/ekos/scheduler/scheduler.cpp index 5c314f7..163bf1c 100644
--- a/kstars/ekos/scheduler/scheduler.cpp
+++ b/kstars/ekos/scheduler/scheduler.cpp
@@ -3691,7 +3691,7 @@ void Scheduler::stopGuiding()
 {
     if ( (currentJob->getStepPipeline() & SchedulerJob::USE_GUIDE) && \
(currentJob->getStage() == SchedulerJob::STAGE_GUIDING ||  currentJob->getStage() == \
SchedulerJob::STAGE_CAPTURING) )  {
-        guideInterface->call(QDBus::AutoDetect,"stopGuiding");
+        guideInterface->call(QDBus::AutoDetect,"stop");
         guideFailureCount=0;
     }
 }
diff --git a/kstars/ekos/scheduler/scheduler.ui b/kstars/ekos/scheduler/scheduler.ui
index fb6ace0..cb18fbe 100644
--- a/kstars/ekos/scheduler/scheduler.ui
+++ b/kstars/ekos/scheduler/scheduler.ui
@@ -6,11 +6,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>634</width>
-    <height>459</height>
+    <width>626</width>
+    <height>447</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_8">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -995,14 +1010,6 @@
      <zorder></zorder>
      <zorder>line</zorder>
      <zorder></zorder>
-     <zorder>groupBox_2</zorder>
-     <zorder>groupBox_10</zorder>
-     <zorder>startupGroup</zorder>
-     <zorder>contraintsGroup</zorder>
-     <zorder>completionGroup</zorder>
-     <zorder>line_2</zorder>
-     <zorder>groupBox_2</zorder>
-     <zorder>groupBox_10</zorder>
     </widget>
    </item>
    <item>
@@ -1441,24 +1448,24 @@
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="startupProcedureButtonGroup">
+  <buttongroup name="startupButtonGroup"/>
+  <buttongroup name="constraintButtonGroup">
    <property name="exclusive">
     <bool>false</bool>
    </property>
   </buttongroup>
-  <buttongroup name="startupButtonGroup"/>
-  <buttongroup name="completionButtonGroup"/>
-  <buttongroup name="constraintButtonGroup">
+  <buttongroup name="startupProcedureButtonGroup">
    <property name="exclusive">
     <bool>false</bool>
    </property>
   </buttongroup>
-  <buttongroup name="shutdownProcedureGroup">
+  <buttongroup name="completionButtonGroup"/>
+  <buttongroup name="stepsButtonGroup">
    <property name="exclusive">
     <bool>false</bool>
    </property>
   </buttongroup>
-  <buttongroup name="stepsButtonGroup">
+  <buttongroup name="shutdownProcedureGroup">
    <property name="exclusive">
     <bool>false</bool>
    </property>


[prev in list] [next in list] [prev in thread] [next in thread]