Merge jv
authorMerge Script
Thu, 17 Sep 2015 06:36:19 +0200
branchjv
changeset 15850 b23c2ebcf7ae
parent 15848 0da39ff1f725 (current diff)
parent 15849 9e9179e9f829 (diff)
child 15854 2a3fc1ba9489
Merge
Tools__CheckinInfoDialog.st
--- a/Tools__CheckinInfoDialog.st	Sun Sep 13 05:59:12 2015 +0100
+++ b/Tools__CheckinInfoDialog.st	Thu Sep 17 06:36:19 2015 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2005 eXept Software AG
               All Rights Reserved
@@ -233,6 +231,55 @@
              acceptOnPointerLeave: false
              comboList: recentTagsList
            )
+          (LabelSpec
+             label: 'Reason for Checkin:'
+             name: 'Label6'
+             layout: (AlignmentOrigin -126 0.5 -122 1 1 0.5)
+             activeHelpKey: checkinReason
+             translateLabel: true
+             resizeForLabel: true
+             adjust: right
+           )
+          (RadioButtonSpec
+             label: 'Bugfix'
+             name: 'RadioButton1'
+             layout: (LayoutFrame -123 0.5 -133 1 -126 1 -111 1)
+             activeHelpKey: checkinReason
+             translateLabel: true
+             model: checkinReasonHolder
+             isTriggerOnDown: true
+             select: 'reasonBugfix'
+           )
+          (RadioButtonSpec
+             label: 'Feature / Enhancement'
+             name: 'RadioButton2'
+             layout: (LayoutFrame -123 0.5 -109 1 -126 1 -87 1)
+             activeHelpKey: checkinReason
+             translateLabel: true
+             model: checkinReasonHolder
+             isTriggerOnDown: true
+             select: reasonFeature
+           )
+          (RadioButtonSpec
+             label: 'Refactoring / Code Cleanup'
+             name: 'RadioButton3'
+             layout: (LayoutFrame -123 0.5 -85 1 -126 1 -63 1)
+             activeHelpKey: checkinReason
+             translateLabel: true
+             model: checkinReasonHolder
+             isTriggerOnDown: true
+             select: reasonRefactoring
+           )
+          (RadioButtonSpec
+             label: 'None of the Above'
+             name: 'RadioButton4'
+             layout: (LayoutFrame -123 0.5 -61 1 -126 1 -39 1)
+             activeHelpKey: checkinReason
+             translateLabel: true
+             model: checkinReasonHolder
+             isTriggerOnDown: true
+             select: reasonOther
+           )
           (HorizontalPanelViewSpec
              name: 'ButtonPanel1'
              layout: (LayoutFrame 0 0.0 -40 1 -16 1.0 0 1.0)
@@ -263,55 +310,6 @@
              )
              keepSpaceForOSXResizeHandleH: true
            )
-          (LabelSpec
-             label: 'Reason for Checkin:'
-             name: 'Label6'
-             layout: (AlignmentOrigin -126 0.5 -122 1 1 0.5)
-             activeHelpKey: checkinReason
-             translateLabel: true
-             resizeForLabel: true
-             adjust: right
-           )
-          (RadioButtonSpec
-             activeHelpKey: checkinReason
-             label: 'Bugfix'
-             name: 'RadioButton1'
-             layout: (LayoutFrame -123 0.5 323 0 -126 1 345 0)
-             translateLabel: true
-             model: checkinReasonHolder
-             isTriggerOnDown: true
-             select: 'reasonBugfix'
-           )
-          (RadioButtonSpec
-             activeHelpKey: checkinReason
-             label: 'Feature / Enhancement'
-             name: 'RadioButton2'
-             layout: (LayoutFrame -123 0.5 347 0 -126 1 369 0)
-             translateLabel: true
-             model: checkinReasonHolder
-             isTriggerOnDown: true
-             select: reasonFeature
-           )
-          (RadioButtonSpec
-             activeHelpKey: checkinReason
-             label: 'Refactoring / Code Cleanup'
-             name: 'RadioButton3'
-             layout: (LayoutFrame -123 0.5 371 0 -126 1 393 0)
-             translateLabel: true
-             model: checkinReasonHolder
-             isTriggerOnDown: true
-             select: reasonRefactoring
-           )
-          (RadioButtonSpec
-             activeHelpKey: checkinReason
-             label: 'None of the Above'
-             name: 'RadioButton4'
-             layout: (LayoutFrame -123 0.5 395 0 -126 1 417 0)
-             translateLabel: true
-             model: checkinReasonHolder
-             isTriggerOnDown: true
-             select: reasonOther
-           )
           )
         
        )