--- a/Tools__CheckinInfoDialog.st Mon Dec 04 23:48:45 2017 +0100
+++ b/Tools__CheckinInfoDialog.st Mon Dec 04 23:49:01 2017 +0100
@@ -19,7 +19,7 @@
warningMessageHolder logHistory logHistoryHeadLineSelectionHolder
validateConsistencyHolder validateConsistencyVisibleHolder
checkinReasonHolder validateConsistencyEnabledHolder
- quickCheckInEnabledHolder'
+ quickCheckInEnabledHolder description2Holder'
classVariableNames:'RecentlyUsedTags LastReason'
poolDictionaries:''
category:'System-SourceCodeManagement'
@@ -188,10 +188,12 @@
^
#(FullSpec
name: windowSpec
+ uuid: '43687bc0-d941-11e7-8a1e-c42c033b4871'
window:
(WindowSpec
label: 'Enter Log Message'
name: 'Enter Log Message'
+ uuid: '35292892-d93d-11e7-8a1e-c42c033b4871'
min: (Point 538 387)
bounds: (Rectangle 0 0 592 558)
)
@@ -201,6 +203,7 @@
(HorizontalPanelViewSpec
name: 'HorizontalPanel2'
layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
+ uuid: '35292b58-d93d-11e7-8a1e-c42c033b4871'
horizontalLayout: left
verticalLayout: center
horizontalSpace: 0
@@ -211,12 +214,14 @@
(LabelSpec
label: 'Enter checkIn log-message for:'
name: 'Label1'
+ uuid: '35292da6-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
resizeForLabel: true
useDefaultExtent: true
)
(LabelSpec
name: 'Label2'
+ uuid: '35293008-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
labelChannel: descriptionHolder
useDefaultExtent: true
@@ -226,23 +231,36 @@
)
)
(LabelSpec
+ label: 'Enter checkIn log-message for:'
+ name: 'Label7'
+ layout: (LayoutFrame 0 0 37 0 0 1 63 0)
+ uuid: '35293166-d93d-11e7-8a1e-c42c033b4871'
+ translateLabel: true
+ labelChannel: description2Holder
+ resizeForLabel: true
+ adjust: right
+ )
+ (LabelSpec
label: 'Previous Log Messages:'
name: 'Label5'
- layout: (LayoutFrame 0 0 37 0 220 0 67 0)
+ layout: (LayoutFrame 0 0 73 0 220 0 103 0)
+ uuid: '3529329c-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
adjust: right
)
(ComboListSpec
name: 'ComboList1'
- layout: (LayoutFrame 220 0.0 37 0 0 1.0 67 0)
+ layout: (LayoutFrame 220 0.0 73 0 0 1.0 103 0)
+ uuid: '352933b4-d93d-11e7-8a1e-c42c033b4871'
model: logHistoryHeadLineSelectionHolder
comboList: logHistoryHeadLines
useIndex: true
)
(TextEditorSpec
name: 'TextEditor1'
- layout: (LayoutFrame 2 0.0 70 0 -2 1 -300 1)
+ layout: (LayoutFrame 2 0.0 105 0 -2 1 -300 1)
activeHelpKey: logMessage
+ uuid: '35293602-d93d-11e7-8a1e-c42c033b4871'
model: logMessageHolder
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
@@ -251,6 +269,7 @@
(LabelSpec
name: 'Label4'
layout: (LayoutFrame 0 0.0 -293 1 0 1.0 -271 1)
+ uuid: '35293828-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
labelChannel: warningMessageHolder
)
@@ -259,6 +278,7 @@
name: 'CheckInChangedOnlyCheckbox'
layout: (LayoutFrame 3 0 -268 1 -3 1 -246 1)
activeHelpKey: quickCheckin
+ uuid: '35293954-d93d-11e7-8a1e-c42c033b4871'
visibilityChannel: quickCheckInVisibleHolder
enableChannel: quickCheckInEnabledHolder
model: quickCheckInHolder
@@ -269,6 +289,7 @@
name: 'CheckBox1'
layout: (LayoutFrame 3 0 -241 1 -3 1 -219 1)
activeHelpKey: validateConsistency
+ uuid: '35293b70-d93d-11e7-8a1e-c42c033b4871'
visibilityChannel: validateConsistencyVisibleHolder
enableChannel: validateConsistencyEnabledHolder
model: validateConsistencyHolder
@@ -279,6 +300,7 @@
name: 'MarkStableCheckBox'
layout: (LayoutFrame 3 0 -214 1 -3 1 -192 1)
activeHelpKey: markAsStable
+ uuid: '35293c9c-d93d-11e7-8a1e-c42c033b4871'
model: isStableHolder
translateLabel: true
)
@@ -287,6 +309,7 @@
name: 'Label3'
layout: (LayoutFrame -40 0.5 -213 1 0 0.5 -191 1)
activeHelpKey: tag
+ uuid: '35293db4-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
adjust: right
)
@@ -294,6 +317,7 @@
name: 'ComboBox1'
layout: (LayoutFrame 0 0.5 -214 1 -3 1 -192 1)
activeHelpKey: tag
+ uuid: '35293ee0-d93d-11e7-8a1e-c42c033b4871'
enableChannel: notMarkAsStableHolder
model: tagHolder
acceptOnReturn: true
@@ -307,6 +331,7 @@
name: 'Label6'
layout: (LayoutOrigin 2 0 -179 1)
activeHelpKey: checkinReason
+ uuid: '35294232-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
resizeForLabel: true
adjust: right
@@ -316,6 +341,7 @@
name: 'RadioButton1'
layout: (LayoutFrame 20 0.0 -151 1 300 0 -129 1)
activeHelpKey: checkinReasonBugfix
+ uuid: '3529437c-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -326,6 +352,7 @@
name: 'RadioButton2'
layout: (LayoutFrame 20 0 -127 1 -279 1 -105 1)
activeHelpKey: checkinReasonFeature
+ uuid: '35294656-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -336,6 +363,7 @@
name: 'RadioButton3'
layout: (LayoutFrame 9 0.5 -151 1 0 1 -129 1)
activeHelpKey: checkinReasonRefactoring
+ uuid: '35294840-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -346,6 +374,7 @@
name: 'RadioButton6'
layout: (LayoutFrame 20 0 -103 1 -279 1 -81 1)
activeHelpKey: checkinReasonUIEnhancement
+ uuid: '35294a02-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -356,6 +385,7 @@
name: 'RadioButton5'
layout: (LayoutFrame 9 0.5 -103 1 0 1 -81 1)
activeHelpKey: checkinReasonDocumentation
+ uuid: '35294bb0-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -366,6 +396,7 @@
name: 'RadioButton4a'
layout: (LayoutFrame 20 0 -79 1 -279 1 -57 1)
activeHelpKey: checkinReasonTuning
+ uuid: '35294d5e-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -376,6 +407,7 @@
name: 'RadioButton4'
layout: (LayoutFrame 9 0.5 -127 1 0 1 -105 1)
activeHelpKey: checkinReasonQuality
+ uuid: '35294f0c-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -386,6 +418,7 @@
name: 'RadioButton7'
layout: (LayoutFrame 9 0.5 -79 1 0 1 -57 1)
activeHelpKey: checkinReasonOther
+ uuid: '352950ba-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: checkinReasonHolder
isTriggerOnDown: true
@@ -394,6 +427,7 @@
(HorizontalPanelViewSpec
name: 'ButtonPanel1'
layout: (LayoutFrame 0 0.0 -40 1 -16 1.0 0 1.0)
+ uuid: '35295268-d93d-11e7-8a1e-c42c033b4871'
horizontalLayout: fitSpace
verticalLayout: center
horizontalSpace: 3
@@ -405,17 +439,19 @@
(ActionButtonSpec
label: 'Cancel'
name: 'Button2'
+ uuid: '352953a8-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: doCancel
- extent: (Point 282 35)
+ extent: (Point 282 34)
usePreferredHeight: true
)
(ActionButtonSpec
label: 'OK'
name: 'Button1'
+ uuid: '35295560-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
model: doAccept
- extent: (Point 282 35)
+ extent: (Point 282 34)
usePreferredHeight: true
)
)
@@ -431,9 +467,9 @@
!CheckinInfoDialog class methodsFor:'opening'!
-getCheckinInfoFor:aString initialAnswer:initialAnswer
+getCheckinInfoFor:infoString initialAnswer:initialAnswer
^ self
- getCheckinInfoFor:aString
+ getCheckinInfoFor:infoString
initialAnswer:initialAnswer
withQuickOption:false
@@ -441,12 +477,12 @@
self getCheckinInfoFor:'hello' initialAnswer:'bla'
"
- "Modified (format): / 12-03-2012 / 12:38:48 / cg"
+ "Modified (format): / 04-12-2017 / 23:08:50 / cg"
!
-getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption
+getCheckinInfoFor:infoString initialAnswer:initialAnswer withQuickOption:withQuickOption
^ self
- getCheckinInfoFor:aClassNameOrPackageNameString
+ getCheckinInfoFor:infoString
initialAnswer:initialAnswer
withQuickOption:withQuickOption
logHistory:#()
@@ -456,11 +492,12 @@
"
"Modified: / 12-03-2012 / 12:39:00 / cg"
+ "Modified (format): / 04-12-2017 / 23:08:40 / cg"
!
-getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer withQuickOption:withQuickOption logHistory:logHistoryArg
+getCheckinInfoFor:infoString initialAnswer:initialAnswer withQuickOption:withQuickOption logHistory:logHistoryArg
^ self
- getCheckinInfoFor:aClassNameOrPackageNameString
+ getCheckinInfoFor:infoString
initialAnswer:initialAnswer
withQuickOption:withQuickOption
logHistory:logHistoryArg
@@ -473,14 +510,15 @@
"
"Created: / 12-03-2012 / 12:36:26 / cg"
+ "Modified (format): / 04-12-2017 / 23:08:35 / cg"
!
-getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer
+getCheckinInfoFor:infoString initialAnswer:initialAnswer
withQuickOption:withQuickOption
logHistory:logHistoryArg
withValidateConsistencyOption:withValidateConsistencyOption
^ self
- getCheckinInfoFor:aClassNameOrPackageNameString
+ getCheckinInfoFor:infoString
initialAnswer:initialAnswer
withQuickOption:withQuickOption
logHistory:logHistoryArg
@@ -492,9 +530,10 @@
"
"Created: / 12-03-2012 / 12:36:26 / cg"
+ "Modified (format): / 04-12-2017 / 23:07:46 / cg"
!
-getCheckinInfoFor:aClassNameOrPackageNameString initialAnswer:initialAnswer
+getCheckinInfoFor:infoString initialAnswer:initialAnswer
withQuickOption:withQuickOption
logHistory:logHistoryArg
withValidateConsistencyOption:withValidateConsistencyOption
@@ -504,9 +543,19 @@
warnMessage := nil.
[
+ |lines infoString1|
+
dialog := self new.
+
+ infoString1 := infoString.
+ lines := infoString asStringCollection.
+ lines size > 1 ifTrue:[
+ dialog description2:lines second string.
+ infoString1 := lines first.
+ ].
+
dialog
- description:aClassNameOrPackageNameString;
+ description:infoString1;
logMessage:initialAnswer;
withQuickOption:withQuickOption;
withValidateConsistencyOption:withValidateConsistencyOption;
@@ -536,6 +585,7 @@
"
"Created: / 12-03-2012 / 12:36:26 / cg"
+ "Modified: / 04-12-2017 / 23:18:31 / cg"
! !
!CheckinInfoDialog methodsFor:'accessing'!
@@ -569,6 +619,12 @@
^ self descriptionHolder value
!
+description2:aString
+ self description2Holder value:aString
+
+ "Created: / 04-12-2017 / 22:51:29 / cg"
+!
+
description:aString
self descriptionHolder value:aString allBold
!
@@ -640,6 +696,15 @@
^ checkinReasonHolder
!
+description2Holder
+ description2Holder isNil ifTrue:[
+ description2Holder := ValueHolder new.
+ ].
+ ^ description2Holder
+
+ "Created: / 04-12-2017 / 22:51:14 / cg"
+!
+
descriptionHolder
descriptionHolder isNil ifTrue:[
descriptionHolder := ValueHolder new.