author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 15 Jan 2015 10:06:16 +0000 | |
changeset 509 | f92210d4585b |
parent 436 | 58c7b3b23cd2 |
child 514 | 7a1a8fa59edd |
child 625 | 60ea838d1b2d |
permissions | -rw-r--r-- |
211 | 1 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
2 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
436
diff
changeset
|
3 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
4 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
5 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
6 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
7 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
8 |
version 2.1 of the License. |
211 | 9 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
10 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
11 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
12 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
13 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
14 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
15 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
16 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
211 | 18 |
" |
44 | 19 |
"{ Package: 'stx:libscm/common' }" |
20 |
||
21 |
SCMAbstractDialog subclass:#SCMAbstractCommitDialog |
|
22 |
instanceVariableNames:'task messageView messageModifiedHolder fileSelectionHolder |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
23 |
fileListShowOnlyModifiedHolder fileListHolder fileListView |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
24 |
enabledHolder' |
44 | 25 |
classVariableNames:'' |
26 |
poolDictionaries:'' |
|
27 |
category:'SCM-Common-StX-Interface' |
|
28 |
! |
|
29 |
||
30 |
Object subclass:#FileEntry |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
31 |
instanceVariableNames:'application entry include includeEditable name icon' |
44 | 32 |
classVariableNames:'' |
33 |
poolDictionaries:'' |
|
34 |
privateIn:SCMAbstractCommitDialog |
|
35 |
! |
|
36 |
||
211 | 37 |
!SCMAbstractCommitDialog class methodsFor:'documentation'! |
38 |
||
39 |
copyright |
|
40 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
41 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
436
diff
changeset
|
42 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
43 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
44 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
45 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
46 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
47 |
version 2.1 of the License. |
211 | 48 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
49 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
50 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
51 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
52 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
53 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
54 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
55 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
333
diff
changeset
|
56 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
211 | 57 |
" |
58 |
! ! |
|
44 | 59 |
|
60 |
!SCMAbstractCommitDialog class methodsFor:'interface specs'! |
|
61 |
||
62 |
contentSpec |
|
63 |
"This resource specification was automatically generated |
|
64 |
by the UIPainter of ST/X." |
|
65 |
||
66 |
"Do not manually edit this!! If it is corrupted, |
|
67 |
the UIPainter may not be able to read the specification." |
|
68 |
||
69 |
" |
|
70 |
UIPainter new openOnClass:SVN::CommitDialog2 andSelector:#contentSpec |
|
71 |
SVN::CommitDialog2 new openInterface:#contentSpec |
|
72 |
" |
|
73 |
||
74 |
<resource: #canvas> |
|
75 |
||
76 |
^ |
|
77 |
#(FullSpec |
|
78 |
name: contentSpec |
|
79 |
window: |
|
80 |
(WindowSpec |
|
81 |
label: 'Commit...' |
|
82 |
name: 'Commit...' |
|
83 |
min: (Point 10 10) |
|
84 |
bounds: (Rectangle 0 0 698 529) |
|
85 |
) |
|
86 |
component: |
|
87 |
(SpecCollection |
|
88 |
collection: ( |
|
89 |
(VariableVerticalPanelSpec |
|
90 |
name: 'VariablePanel' |
|
91 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
92 |
component: |
|
93 |
(SpecCollection |
|
94 |
collection: ( |
|
95 |
(ViewSpec |
|
96 |
name: 'MessageAndInfoPane' |
|
97 |
component: |
|
98 |
(SpecCollection |
|
99 |
collection: ( |
|
100 |
(SubCanvasSpec |
|
101 |
name: 'InfoPanel' |
|
102 |
layout: (LayoutFrame 0 0 0 0 0 1 40 0) |
|
103 |
level: 0 |
|
104 |
initiallyInvisible: true |
|
105 |
hasHorizontalScrollBar: false |
|
106 |
hasVerticalScrollBar: false |
|
107 |
clientKey: infoPanel |
|
108 |
createNewBuilder: false |
|
109 |
) |
|
110 |
(ViewSpec |
|
111 |
name: 'MessagePane' |
|
112 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
113 |
component: |
|
114 |
(SpecCollection |
|
115 |
collection: ( |
|
116 |
(LabelSpec |
|
117 |
label: 'Commit message:' |
|
118 |
name: 'MessageLabel' |
|
119 |
layout: (LayoutFrame 0 0 0 0 0 1 25 0) |
|
120 |
translateLabel: true |
|
121 |
adjust: left |
|
122 |
) |
|
123 |
(TextEditorSpec |
|
124 |
name: 'Message' |
|
125 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
126 |
enableChannel: enabledHolder |
|
127 |
hasHorizontalScrollBar: true |
|
128 |
hasVerticalScrollBar: true |
|
129 |
modifiedChannel: messageModifiedHolder |
|
130 |
hasKeyboardFocusInitially: false |
|
131 |
postBuildCallback: messageView: |
|
132 |
) |
|
133 |
) |
|
134 |
||
135 |
) |
|
136 |
) |
|
137 |
) |
|
138 |
||
139 |
) |
|
140 |
) |
|
141 |
(ViewSpec |
|
142 |
name: 'FilePane' |
|
143 |
component: |
|
144 |
(SpecCollection |
|
145 |
collection: ( |
|
146 |
(UISubSpecification |
|
147 |
name: 'FilePaneSpec' |
|
148 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
149 |
minorKey: filePaneSpec |
|
150 |
) |
|
151 |
) |
|
152 |
||
153 |
) |
|
154 |
) |
|
155 |
) |
|
156 |
||
157 |
) |
|
158 |
handles: (Any 0.5 1.0) |
|
159 |
) |
|
160 |
) |
|
161 |
||
162 |
) |
|
163 |
) |
|
164 |
! |
|
165 |
||
166 |
fileListColumnSpec |
|
167 |
"This resource specification was automatically generated |
|
168 |
by the DataSetBuilder of ST/X." |
|
169 |
||
170 |
"Do not manually edit this!! If it is corrupted, |
|
171 |
the DataSetBuilder may not be able to read the specification." |
|
172 |
||
173 |
" |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
174 |
DataSetBuilder new openOnClass:SCMAbstractCommitDialog andSelector:#fileListColumnSpec |
44 | 175 |
" |
176 |
||
177 |
<resource: #tableColumns> |
|
178 |
||
179 |
^#( |
|
180 |
(DataSetColumnSpec |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
181 |
label: 'Icon' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
182 |
activeHelpKey: '' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
183 |
activeHelpKeyForLabel: '' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
184 |
labelButtonType: Button |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
185 |
width: 22 |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
186 |
minWidth: 22 |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
187 |
height: heightOfFirstRow |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
188 |
menuFromApplication: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
189 |
printSelector: icon |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
190 |
canSelect: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
191 |
showRowSeparator: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
192 |
showColSeparator: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
193 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
194 |
(DataSetColumnSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
195 |
label: 'Check' |
44 | 196 |
activeHelpKey: '' |
197 |
activeHelpKeyForLabel: '' |
|
198 |
labelButtonType: None |
|
199 |
width: 22 |
|
200 |
minWidth: 22 |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
201 |
height: heightOfFirstRow |
44 | 202 |
editorType: CheckToggle |
203 |
rendererType: CheckToggle |
|
204 |
model: include |
|
205 |
menuFromApplication: false |
|
206 |
printSelector: include |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
207 |
selectSelector: includeEditable |
44 | 208 |
showRowSeparator: false |
209 |
showColSeparator: false |
|
210 |
) |
|
211 |
(DataSetColumnSpec |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
212 |
label: 'File' |
44 | 213 |
labelAlignment: left |
214 |
activeHelpKey: '' |
|
215 |
activeHelpKeyForLabel: '' |
|
216 |
labelButtonType: Button |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
217 |
height: heightOfFirstRow |
44 | 218 |
menuFromApplication: false |
219 |
printSelector: pathText |
|
220 |
canSelect: false |
|
221 |
showRowSeparator: false |
|
222 |
showColSeparator: false |
|
223 |
) |
|
224 |
) |
|
225 |
||
226 |
! |
|
227 |
||
228 |
filePaneSpec |
|
229 |
"This resource specification was automatically generated |
|
230 |
by the UIPainter of ST/X." |
|
231 |
||
232 |
"Do not manually edit this!! If it is corrupted, |
|
233 |
the UIPainter may not be able to read the specification." |
|
234 |
||
235 |
" |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
236 |
UIPainter new openOnClass:SCMAbstractCommitDialog andSelector:#filePaneSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
237 |
SCMAbstractCommitDialog new openInterface:#filePaneSpec |
44 | 238 |
" |
239 |
||
240 |
<resource: #canvas> |
|
241 |
||
242 |
^ |
|
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
243 |
#(FullSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
244 |
name: filePaneSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
245 |
window: |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
246 |
(WindowSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
247 |
label: 'File List' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
248 |
name: 'File List' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
249 |
min: (Point 10 10) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
250 |
bounds: (Rectangle 0 0 586 403) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
251 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
252 |
component: |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
253 |
(SpecCollection |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
254 |
collection: ( |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
255 |
(LabelSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
256 |
label: 'Checked files will be commited to repository.' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
257 |
name: 'FileListLabel' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
258 |
layout: (LayoutFrame 0 0 10 0 0 1 35 0) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
259 |
translateLabel: true |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
260 |
adjust: left |
44 | 261 |
) |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
262 |
(DataSetSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
263 |
name: 'WCEntryTable' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
264 |
layout: (LayoutFrame 0 0 35 0 0 1 -30 1) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
265 |
enableChannel: enabledHolder |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
266 |
model: fileSelectionHolder |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
267 |
menu: fileListMenu |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
268 |
hasHorizontalScrollBar: true |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
269 |
hasVerticalScrollBar: true |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
270 |
dataList: fileListHolder |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
271 |
useIndex: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
272 |
columnHolder: fileListColumnSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
273 |
showLabels: false |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
274 |
postBuildCallback: postBuildFileListView: |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
275 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
276 |
(CheckBoxSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
277 |
label: 'Show only modified entries' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
278 |
name: 'ShowOnlyChanged' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
279 |
layout: (LayoutFrame 0 0 -30 1 -170 1 0 1) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
280 |
enableChannel: enabledHolder |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
281 |
model: fileListShowOnlyModifiedHolder |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
282 |
translateLabel: true |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
283 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
284 |
(LinkButtonSpec |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
285 |
label: 'Browse working copy' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
286 |
name: 'BrowseWC' |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
287 |
layout: (LayoutFrame -170 1 -30 1 0 1 0 1) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
288 |
translateLabel: true |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
289 |
labelChannel: browseWorkingCopyLabel |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
290 |
adjust: right |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
291 |
model: doBrowseWorkingCopy |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
292 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
293 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
294 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
295 |
) |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
296 |
) |
44 | 297 |
! |
298 |
||
299 |
windowSpec |
|
300 |
"This resource specification was automatically generated |
|
301 |
by the UIPainter of ST/X." |
|
302 |
||
303 |
"Do not manually edit this!! If it is corrupted, |
|
304 |
the UIPainter may not be able to read the specification." |
|
305 |
||
306 |
" |
|
66
4a4af79eb019
SCMAbstractPackageModel: fixed initialization of working copy
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
60
diff
changeset
|
307 |
UIPainter new openOnClass:SCMAbstractCommitDialog andSelector:#windowSpec |
4a4af79eb019
SCMAbstractPackageModel: fixed initialization of working copy
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
60
diff
changeset
|
308 |
SCMAbstractCommitDialog new openInterface:#windowSpec |
4a4af79eb019
SCMAbstractPackageModel: fixed initialization of working copy
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
60
diff
changeset
|
309 |
SCMAbstractCommitDialog open |
44 | 310 |
" |
311 |
||
312 |
<resource: #canvas> |
|
313 |
||
314 |
^ |
|
315 |
#(FullSpec |
|
316 |
name: windowSpec |
|
317 |
window: |
|
318 |
(WindowSpec |
|
319 |
label: 'SubVersion: Dialog ' |
|
320 |
name: 'SubVersion: Dialog ' |
|
321 |
labelChannel: titleHolder |
|
322 |
min: (Point 10 10) |
|
323 |
bounds: (Rectangle 0 0 648 451) |
|
324 |
) |
|
325 |
component: |
|
326 |
(SpecCollection |
|
327 |
collection: ( |
|
328 |
(ViewSpec |
|
329 |
name: 'TitleBox' |
|
330 |
layout: (LayoutFrame 0 0 0 0 0 1 66 0) |
|
331 |
backgroundColor: (Color 100.0 100.0 100.0) |
|
332 |
component: |
|
333 |
(SpecCollection |
|
334 |
collection: ( |
|
335 |
(LabelSpec |
|
336 |
label: 'DialogTitle' |
|
337 |
name: 'DialogTitle' |
|
338 |
layout: (LayoutFrame 10 0 0 0 -75 1 40 0) |
|
339 |
style: (FontDescription helvetica medium roman 18 #'iso10646-1') |
|
340 |
backgroundColor: (Color 100.0 100.0 100.0) |
|
341 |
translateLabel: true |
|
342 |
labelChannel: titleHolder |
|
343 |
adjust: left |
|
344 |
) |
|
345 |
(LabelSpec |
|
346 |
label: 'DialogSubtitle' |
|
347 |
name: 'DialogSubtitle' |
|
348 |
layout: (LayoutFrame 30 0 40 0 -75 1 66 0) |
|
349 |
backgroundColor: (Color 100.0 100.0 100.0) |
|
350 |
translateLabel: true |
|
351 |
labelChannel: subtitleHolder |
|
352 |
resizeForLabel: false |
|
353 |
adjust: left |
|
354 |
) |
|
355 |
(LabelSpec |
|
356 |
label: 'Icon' |
|
357 |
name: 'DialogIcon' |
|
358 |
layout: (LayoutFrame -157 1 0 0 0 1 66 0) |
|
359 |
hasCharacterOrientedLabel: false |
|
360 |
backgroundColor: (Color 100.0 100.0 100.0) |
|
361 |
translateLabel: true |
|
362 |
labelChannel: dialogIconAspect |
|
66
4a4af79eb019
SCMAbstractPackageModel: fixed initialization of working copy
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
60
diff
changeset
|
363 |
adjust: right |
44 | 364 |
) |
365 |
) |
|
366 |
||
367 |
) |
|
368 |
) |
|
369 |
(ViewSpec |
|
370 |
name: 'ContentBox' |
|
371 |
layout: (LayoutFrame 5 0 70 0 -5 1 -50 1) |
|
372 |
component: |
|
373 |
(SpecCollection |
|
374 |
collection: ( |
|
375 |
(SubCanvasSpec |
|
376 |
name: 'Content' |
|
377 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
378 |
hasHorizontalScrollBar: false |
|
379 |
hasVerticalScrollBar: false |
|
380 |
specHolder: contentSpecHolder |
|
381 |
createNewBuilder: false |
|
382 |
) |
|
383 |
) |
|
384 |
||
385 |
) |
|
386 |
) |
|
387 |
(DividerSpec |
|
388 |
name: 'Separator' |
|
389 |
layout: (LayoutFrame 5 0 -50 1 -5 1 -30 1) |
|
390 |
) |
|
391 |
(UISubSpecification |
|
392 |
name: 'Buttons' |
|
393 |
layout: (LayoutFrame 130 0 -30 1 0 1 0 1) |
|
394 |
minorKey: buttonsSpec |
|
395 |
) |
|
396 |
(LinkButtonSpec |
|
397 |
label: 'Help' |
|
398 |
name: 'Help' |
|
399 |
layout: (LayoutFrame 30 0 -30 1 130 0 0 1) |
|
400 |
style: (FontDescription helvetica medium roman 12 #'iso10646-1') |
|
401 |
initiallyInvisible: true |
|
402 |
foregroundColor: (Color 0.0 0.0 86.9993133440147) |
|
403 |
translateLabel: true |
|
404 |
model: doHelp |
|
405 |
) |
|
406 |
(MenuPanelSpec |
|
407 |
name: 'More' |
|
408 |
layout: (LayoutFrame 0 0 -30 1 30 0 -50 1) |
|
409 |
level: 0 |
|
410 |
model: doInspect |
|
411 |
menu: actionsMenu |
|
412 |
) |
|
413 |
) |
|
414 |
||
415 |
) |
|
416 |
) |
|
417 |
! ! |
|
418 |
||
419 |
!SCMAbstractCommitDialog class methodsFor:'menu specs'! |
|
420 |
||
421 |
fileListMenu |
|
422 |
"This resource specification was automatically generated |
|
423 |
by the MenuEditor of ST/X." |
|
424 |
||
425 |
"Do not manually edit this!! If it is corrupted, |
|
426 |
the MenuEditor may not be able to read the specification." |
|
427 |
||
428 |
||
429 |
" |
|
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
430 |
MenuEditor new openOnClass:SCMAbstractCommitDialog andSelector:#fileListMenu |
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
431 |
(Menu new fromLiteralArrayEncoding:(SCMAbstractCommitDialog fileListMenu)) startUp |
44 | 432 |
" |
433 |
||
434 |
<resource: #menu> |
|
435 |
||
436 |
^ |
|
437 |
#(Menu |
|
438 |
( |
|
439 |
(MenuItem |
|
333 | 440 |
enabled: canShowDiffsForEntry |
44 | 441 |
label: 'Show differences' |
442 |
itemValue: doShowDiffsForEntry |
|
443 |
) |
|
444 |
(MenuItem |
|
333 | 445 |
enabled: canShowDiffsForEntry |
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
446 |
label: 'Show differences (against newest)' |
44 | 447 |
itemValue: doShowDiffsForEntryAgainstHEAD |
448 |
) |
|
449 |
) |
|
450 |
nil |
|
451 |
nil |
|
452 |
) |
|
453 |
! ! |
|
454 |
||
455 |
!SCMAbstractCommitDialog methodsFor:'accessing'! |
|
456 |
||
457 |
defaultSubtitle |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
458 |
| t packages| |
44 | 459 |
|
460 |
t := self task. |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
461 |
packages := t packages. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
462 |
^packages notEmptyOrNil ifTrue:[ |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
463 |
packages size == 1 ifTrue:[ |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
464 |
'Package: ' , packages anElement name asText allItalic |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
465 |
] ifFalse:[ |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
466 |
'Packages: ' , ((packages collect:[:e | e name ]) asStringWith: ', ') |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
467 |
]. |
44 | 468 |
] ifFalse:[ |
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
469 |
| title | |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
470 |
|
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
471 |
title := t temporaryWorkingCopy root pathName , ' [' , t temporaryWorkingCopy branch name , ']'. |
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
472 |
title size > 70 ifTrue:[ |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
473 |
title := '...' , (title copyFrom: title size - 67). |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
474 |
]. |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
475 |
title. |
44 | 476 |
] |
477 |
||
478 |
"Created: / 28-10-2008 / 09:14:45 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
479 |
"Modified: / 22-02-2014 / 23:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 480 |
! |
481 |
||
482 |
fileListToCommit |
|
483 |
^(self fileListHolder value ? #()) |
|
484 |
select:[:entry|entry include] |
|
485 |
thenCollect:[:entry|entry path]. |
|
486 |
||
487 |
"Created: / 08-02-2012 / 18:16:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
488 |
! |
|
489 |
||
490 |
message |
|
491 |
||
492 |
^messageView notNil |
|
493 |
ifTrue:[messageView contents] |
|
494 |
ifFalse:[nil] |
|
495 |
||
496 |
"Created: / 31-03-2008 / 21:06:28 / janfrog" |
|
497 |
"Modified: / 09-04-2009 / 08:50:55 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
498 |
"Modified: / 08-02-2012 / 18:07:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
499 |
! |
|
500 |
||
501 |
message: aString |
|
502 |
||
503 |
^messageView contents: aString |
|
504 |
||
505 |
"Created: / 08-04-2009 / 23:27:09 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
506 |
"Modified: / 08-02-2012 / 18:08:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
507 |
! |
|
508 |
||
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
509 |
model |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
510 |
<resource: #obsolete> |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
511 |
|
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
512 |
self breakPoint: #jv. |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
513 |
^self task |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
514 |
|
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
515 |
"Created: / 12-01-2013 / 11:59:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
516 |
! |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
517 |
|
44 | 518 |
task |
519 |
||
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
520 |
^task |
44 | 521 |
|
522 |
"Created: / 23-03-2009 / 11:49:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
523 |
"Modified: / 12-01-2013 / 11:57:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 524 |
! |
525 |
||
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
526 |
task: t |
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
527 |
task := t. |
44 | 528 |
|
529 |
"Created: / 23-03-2009 / 11:49:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
171
771ae4f01925
Changes to support standalone commit (without package model).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
144
diff
changeset
|
530 |
"Modified: / 12-01-2013 / 12:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 531 |
! |
532 |
||
533 |
workingCopy |
|
534 |
||
535 |
^self task workingCopy |
|
536 |
||
537 |
"Created: / 08-02-2012 / 18:07:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
538 |
! ! |
|
539 |
||
540 |
!SCMAbstractCommitDialog methodsFor:'acessing-views'! |
|
541 |
||
542 |
messageView: aView |
|
543 |
||
544 |
messageView := aView scrolledView. |
|
545 |
"/ messageView model: |
|
546 |
"/ (self class messages |
|
547 |
"/ at: self task package |
|
548 |
"/ ifAbsent:[self task message]) |
|
549 |
||
550 |
"Created: / 08-02-2012 / 17:58:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
551 |
! ! |
|
552 |
||
553 |
!SCMAbstractCommitDialog methodsFor:'actions'! |
|
554 |
||
555 |
doAccept |
|
556 |
||
557 |
self showProgressWhile:[ |
|
58
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
558 |
self acceptEnabled:false. |
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
559 |
(self task) |
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
560 |
message:self message; |
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
561 |
paths: self fileListToCommit; |
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
562 |
doCommit. |
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
563 |
self accept value:true |
44 | 564 |
] |
565 |
||
566 |
"Created: / 01-04-2008 / 18:59:12 / janfrog" |
|
567 |
"Modified: / 19-08-2009 / 14:26:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
568 |
"Modified: / 08-02-2012 / 18:17:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
58
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
569 |
"Modified (format): / 15-11-2012 / 10:12:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 570 |
! |
571 |
||
572 |
doBrowseWorkingCopy |
|
172
ca0b1a930b87
Fix: use temporaryWorkingCopy in SCMAbstractCommitDialog>>doBrowseWorkingCopy.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
171
diff
changeset
|
573 |
self task temporaryWorkingCopyRoot browse |
44 | 574 |
|
172
ca0b1a930b87
Fix: use temporaryWorkingCopy in SCMAbstractCommitDialog>>doBrowseWorkingCopy.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
171
diff
changeset
|
575 |
"Modified: / 12-01-2013 / 14:03:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 576 |
! |
577 |
||
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
578 |
doCommitAllChangedPackages |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
579 |
| revision packages | |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
580 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
581 |
"/ Collect all changed packages at given revision... |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
582 |
revision := task packages revision. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
583 |
packages := task packages class new. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
584 |
task packages anElement root yourselfAndAllChildrenDo:[:each| |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
585 |
(each isVirtual not and:[each revision = revision and:[ each hasChanges ]]) ifTrue:[ |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
586 |
packages add: each. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
587 |
]. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
588 |
]. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
589 |
task packages: packages. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
590 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
591 |
"Created: / 03-03-2014 / 10:08:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
436
58c7b3b23cd2
Fixed commit warning when not all modified packages are about to commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
407
diff
changeset
|
592 |
"Modified: / 27-05-2014 / 16:03:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
593 |
! |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
594 |
|
44 | 595 |
doShowDiffsForEntry |
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
596 |
"raise an error: must be redefined in concrete subclass(es)" |
44 | 597 |
|
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
598 |
^ self subclassResponsibility |
44 | 599 |
! |
600 |
||
601 |
doShowDiffsForEntryAgainstHEAD |
|
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
602 |
"raise an error: must be redefined in concrete subclass(es)" |
44 | 603 |
|
144
36273f5f4f52
SCM-specific methods pushed down to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
119
diff
changeset
|
604 |
^ self subclassResponsibility |
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
605 |
! |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
606 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
607 |
postBuildFileListView: aScrolledView |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
608 |
<resource: #uiCallback> |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
609 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
610 |
fileListView := aScrolledView scrolledView. |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
611 |
"/ Ugly hack to make it working on 6.2.2, sigh. |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
612 |
"/ (ListModelView::TableRenderer canUnderstand: #showItemInAdditionToColumns:) ifTrue:[ |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
613 |
"/ fileListView setupTableRenderer |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
614 |
"/ showItemInAdditionToColumns: false; |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
615 |
"/ columnDescriptors: self class fileListColumnSpec. |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
616 |
"/ ]. |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
617 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
618 |
"Modified: / 29-11-2013 / 15:35:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 619 |
! ! |
620 |
||
621 |
!SCMAbstractCommitDialog methodsFor:'aspects'! |
|
622 |
||
623 |
acceptButtonTitleAspect |
|
624 |
||
625 |
^'Commit' |
|
626 |
||
627 |
"Created: / 08-02-2012 / 17:46:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
628 |
! |
|
629 |
||
630 |
browseWorkingCopyLabel |
|
631 |
||
632 |
^'Browse working copy...' asText |
|
633 |
colorizeAllWith: Color blue; |
|
634 |
actionForAll:[ self doBrowseWorkingCopy ]; |
|
635 |
yourself |
|
636 |
||
637 |
"Created: / 05-02-2012 / 01:28:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
638 |
! |
|
639 |
||
640 |
enabledHolder |
|
641 |
<resource: #uiAspect> |
|
642 |
||
643 |
enabledHolder isNil ifTrue:[ |
|
644 |
enabledHolder := true asValue. |
|
645 |
]. |
|
646 |
^ enabledHolder. |
|
647 |
||
648 |
"Modified (comment): / 11-02-2012 / 23:28:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
649 |
! |
|
650 |
||
651 |
fileListHolder |
|
652 |
<resource: #uiAspect> |
|
653 |
||
654 |
"automatically generated by UIPainter ..." |
|
655 |
||
656 |
"*** the code below creates a default model when invoked." |
|
657 |
"*** (which may not be the one you wanted)" |
|
658 |
"*** Please change as required and accept it in the browser." |
|
659 |
"*** (and replace this comment by something more useful ;-)" |
|
660 |
||
661 |
fileListHolder isNil ifTrue:[ |
|
662 |
fileListHolder := ValueHolder new. |
|
663 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
|
664 |
"/ fileListHolder addDependent:self. |
|
665 |
"/ fileListHolder onChangeSend:#fileListHolderChanged to:self. |
|
666 |
]. |
|
667 |
^ fileListHolder. |
|
668 |
||
669 |
"Modified: / 08-02-2012 / 18:27:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
670 |
! |
|
671 |
||
672 |
fileListShowOnlyModifiedHolder |
|
673 |
<resource: #uiAspect> |
|
674 |
||
675 |
"automatically generated by UIPainter ..." |
|
676 |
||
677 |
"*** the code below creates a default model when invoked." |
|
678 |
"*** (which may not be the one you wanted)" |
|
679 |
"*** Please change as required and accept it in the browser." |
|
680 |
"*** (and replace this comment by something more useful ;-)" |
|
681 |
||
682 |
fileListShowOnlyModifiedHolder isNil ifTrue:[ |
|
683 |
fileListShowOnlyModifiedHolder := true asValue. |
|
684 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
|
685 |
"/ fileListShowOnlyModifiedHolder addDependent:self. |
|
686 |
fileListShowOnlyModifiedHolder onChangeSend:#updateFileList to:self. |
|
687 |
]. |
|
688 |
^ fileListShowOnlyModifiedHolder. |
|
689 |
||
690 |
"Modified: / 08-02-2012 / 18:04:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
691 |
! |
|
692 |
||
693 |
fileSelectionHolder |
|
694 |
<resource: #uiAspect> |
|
695 |
||
696 |
"automatically generated by UIPainter ..." |
|
697 |
||
698 |
"*** the code below creates a default model when invoked." |
|
699 |
"*** (which may not be the one you wanted)" |
|
700 |
"*** Please change as required and accept it in the browser." |
|
701 |
"*** (and replace this comment by something more useful ;-)" |
|
702 |
||
703 |
fileSelectionHolder isNil ifTrue:[ |
|
704 |
fileSelectionHolder := ValueHolder new. |
|
705 |
"/ if your app needs to be notified of changes, uncomment one of the lines below: |
|
706 |
"/ fileSelectionHolder addDependent:self. |
|
707 |
"/ fileSelectionHolder onChangeSend:#fileSelectionHolderChanged to:self. |
|
708 |
]. |
|
709 |
^ fileSelectionHolder. |
|
710 |
! |
|
711 |
||
712 |
infoPanel |
|
713 |
infoPanel isNil ifTrue:[ |
|
714 |
infoPanel := Tools::InlineMessageDialog new. |
|
715 |
infoPanel panelHiddenHolder: self enabledHolder. |
|
716 |
]. |
|
717 |
^ infoPanel |
|
718 |
||
719 |
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
720 |
! |
|
721 |
||
722 |
messageModifiedHolder |
|
723 |
"return/create the 'messageModifiedHolder' value holder (automatically generated)" |
|
724 |
||
725 |
messageModifiedHolder isNil ifTrue:[ |
|
726 |
messageModifiedHolder := ValueHolder with: false. |
|
727 |
messageModifiedHolder onChangeEvaluate:[ |
|
728 |
self acceptEnabled: (self message indexOfNonSeparator ~~ 0). |
|
729 |
messageModifiedHolder setValue: false. |
|
730 |
] |
|
731 |
]. |
|
732 |
^ messageModifiedHolder |
|
733 |
||
734 |
"Modified: / 08-02-2012 / 18:46:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
735 |
! ! |
|
736 |
||
737 |
!SCMAbstractCommitDialog methodsFor:'change & update'! |
|
738 |
||
739 |
updateFileList |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
740 |
"raise an error: must be redefined in concrete subclass(es)" |
44 | 741 |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
742 |
^ self subclassResponsibility |
44 | 743 |
! ! |
744 |
||
745 |
!SCMAbstractCommitDialog methodsFor:'hooks'! |
|
746 |
||
747 |
commonPostBuild |
|
748 |
||
749 |
self window extent: 640@640 |
|
750 |
||
751 |
"Created: / 08-02-2012 / 18:30:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
752 |
! |
|
753 |
||
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
754 |
postOpenWith1: anUIBuilder |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
755 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
756 |
(self task isPackageCommit |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
757 |
and:[ self task isSelectiveFileoutTask not |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
758 |
and:[ self task isCommitingAllChangedPackages not ]]) ifTrue:[ |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
759 |
self infoPanel |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
760 |
reset; |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
761 |
beInformation; |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
762 |
message:(resources string: 'There are more changed packages...'); |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
763 |
addButtonWithLabel: (resources string:'Commit all changed') |
436
58c7b3b23cd2
Fixed commit warning when not all modified packages are about to commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
407
diff
changeset
|
764 |
action: [ self doCommitAllChangedPackages. self infoPanel hide. self postOpenWith2: anUIBuilder]; |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
765 |
addButtonWithLabel: (resources string:'Continue') |
436
58c7b3b23cd2
Fixed commit warning when not all modified packages are about to commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
407
diff
changeset
|
766 |
action: [ self infoPanel hide. self postOpenWith2: anUIBuilder]; |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
767 |
show. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
768 |
^ false. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
769 |
]. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
770 |
^ true. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
771 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
772 |
"Created: / 03-03-2014 / 10:00:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
436
58c7b3b23cd2
Fixed commit warning when not all modified packages are about to commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
407
diff
changeset
|
773 |
"Modified: / 27-05-2014 / 16:03:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
774 |
! |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
775 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
776 |
postOpenWith2: anUIBuilder |
44 | 777 |
|
778 |
self showProgressWhile:[ |
|
779 |
self doUpdateCode. |
|
407
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
780 |
self doRunSanityChecks. |
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
781 |
self doUpdateButtonEnablements. |
44 | 782 |
]. |
783 |
||
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
784 |
"Created: / 03-03-2014 / 09:59:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
407
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
785 |
"Modified: / 26-03-2014 / 15:06:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
786 |
! |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
787 |
|
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
788 |
postOpenWith: anUIBuilder |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
789 |
(self postOpenWith1: anUIBuilder) ifTrue:[ |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
790 |
self postOpenWith2: anUIBuilder |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
791 |
]. |
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
792 |
|
44 | 793 |
"Created: / 09-02-2012 / 15:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
794 |
"Modified: / 03-03-2014 / 10:01:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 795 |
! ! |
796 |
||
797 |
!SCMAbstractCommitDialog methodsFor:'private'! |
|
798 |
||
799 |
doRunSanityChecks |
|
800 |
||
801 |
| checker problems anyError | |
|
802 |
||
803 |
self task isPackageCommit ifFalse:[ |
|
804 |
^self. |
|
805 |
]. |
|
806 |
||
807 |
ActivityNotification notify: (self resources string:'Checking code...'). |
|
302
e078bdcef149
Fixes for Smalltalk/X 6.2.2 (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
808 |
checker := self task doSanityChecks. |
e078bdcef149
Fixes for Smalltalk/X 6.2.2 (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
809 |
"/ #doSanityChecks may return nil if the ProjectChecker is not available |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
810 |
"/ (like in St/X 6.2.2) |
302
e078bdcef149
Fixes for Smalltalk/X 6.2.2 (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
811 |
(checker isNil or:[(problems := checker problems) isEmptyOrNil]) ifTrue:[ |
44 | 812 |
self doUpdateWorkingCopy. |
813 |
^self. |
|
814 |
]. |
|
815 |
||
816 |
anyError := problems anySatisfy:[:problem|problem severity == #error]. |
|
817 |
self infoPanel |
|
818 |
reset; |
|
819 |
beWarning; |
|
820 |
message: |
|
821 |
(problems size == 1 |
|
822 |
ifTrue:[self resources string:'A problem has been found in the code'] |
|
823 |
ifFalse:[problems size printString , (self resources string:' problems has been found in the code')]); |
|
824 |
||
825 |
addButtonWithLabel: (self resources string:'Show') |
|
826 |
action: [ |
|
827 |
Tools::ProjectCheckerBrowser new projectChecker: checker; open. self doCancel |
|
828 |
]; |
|
829 |
||
830 |
addButton:((Button label: (self resources string:'OK') |
|
831 |
action: [ |
|
832 |
self infoPanel beProgress. |
|
833 |
self doUpdateWorkingCopy. |
|
834 |
self infoPanel hide |
|
835 |
]) enabled: anyError not; yourself); |
|
836 |
||
837 |
addButtonWithLabel: (self resources string:'Cancel') |
|
838 |
action:[self doCancel]; |
|
839 |
||
840 |
show. |
|
841 |
^anyError not |
|
842 |
||
843 |
"Created: / 10-05-2012 / 17:24:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
302
e078bdcef149
Fixes for Smalltalk/X 6.2.2 (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
844 |
"Modified: / 30-06-2013 / 12:50:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
359
diff
changeset
|
845 |
"Modified (comment): / 21-02-2014 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 846 |
! |
847 |
||
407
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
848 |
doUpdateButtonEnablements |
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
849 |
self messageModifiedHolder changed:#value. |
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
850 |
|
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
851 |
"Created: / 26-03-2014 / 15:06:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
852 |
! |
c3470898ba5f
Fix for issue #30 - Commit button is disabled even if commit message is not empty (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
389
diff
changeset
|
853 |
|
44 | 854 |
doUpdateCode |
855 |
self task doPrepareWorkingCopy1 |
|
856 |
||
857 |
"Created: / 10-05-2012 / 17:24:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
858 |
! |
|
859 |
||
860 |
doUpdateWorkingCopy |
|
861 |
||
862 |
self task doPrepareWorkingCopy2. |
|
863 |
self message: self task message. |
|
864 |
self messageModifiedHolder changed:#value. |
|
865 |
self updateFileList. |
|
866 |
||
867 |
"Created: / 10-05-2012 / 17:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
868 |
! ! |
|
869 |
||
333 | 870 |
!SCMAbstractCommitDialog methodsFor:'queries'! |
871 |
||
872 |
canShowDiffsForEntry |
|
873 |
^self fileSelectionHolder value notEmptyOrNil |
|
874 |
||
875 |
"Created: / 11-07-2013 / 01:57:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
876 |
! ! |
|
877 |
||
44 | 878 |
!SCMAbstractCommitDialog::FileEntry class methodsFor:'instance creation'! |
879 |
||
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
880 |
application:applicationArg entry:entryArg name: nameArg |
44 | 881 |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
882 |
^self new application:applicationArg entry:entryArg name: nameArg |
44 | 883 |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
884 |
"Created: / 15-11-2012 / 01:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 885 |
! ! |
886 |
||
887 |
!SCMAbstractCommitDialog::FileEntry methodsFor:'accessing'! |
|
888 |
||
889 |
author |
|
890 |
^entry author |
|
891 |
||
892 |
"Created: / 09-02-2012 / 14:36:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
893 |
! |
|
894 |
||
895 |
date |
|
896 |
^entry date |
|
897 |
||
898 |
"Created: / 09-02-2012 / 14:36:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
899 |
! |
|
900 |
||
901 |
entry |
|
902 |
^ entry |
|
903 |
! |
|
904 |
||
359
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
905 |
icon |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
906 |
^ icon |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
907 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
908 |
"Created: / 29-11-2013 / 14:20:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
909 |
! |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
910 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
911 |
icon: anImage |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
912 |
icon := anImage |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
913 |
|
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
914 |
"Created: / 29-11-2013 / 14:20:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
915 |
! |
b6516e783b2d
Added status icon to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
916 |
|
44 | 917 |
include |
918 |
^ include |
|
919 |
! |
|
920 |
||
921 |
include:aBoolean |
|
922 |
include := aBoolean. |
|
923 |
! |
|
924 |
||
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
925 |
includeEditable |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
926 |
^ includeEditable |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
927 |
! |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
928 |
|
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
929 |
includeEditable:something |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
930 |
includeEditable := something. |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
931 |
! |
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
932 |
|
44 | 933 |
path |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
934 |
^entry pathName |
44 | 935 |
|
936 |
"Created: / 09-02-2012 / 14:39:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
937 |
"Modified: / 15-11-2012 / 01:36:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 938 |
! |
939 |
||
940 |
pathText |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
941 |
^name |
44 | 942 |
|
943 |
"Created: / 09-02-2012 / 14:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
944 |
"Modified: / 15-11-2012 / 01:36:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 945 |
! |
946 |
||
947 |
revision |
|
948 |
^entry revision |
|
949 |
||
950 |
"Created: / 09-02-2012 / 14:36:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
951 |
! |
|
952 |
||
953 |
statusIcon |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
954 |
^nil |
44 | 955 |
|
956 |
"Created: / 09-02-2012 / 14:36:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
957 |
"Modified: / 15-11-2012 / 01:30:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 958 |
! ! |
959 |
||
960 |
!SCMAbstractCommitDialog::FileEntry methodsFor:'initialization'! |
|
961 |
||
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
962 |
application:applicationArg entry:entryArg name: nameArg |
44 | 963 |
application := applicationArg. |
964 |
entry := entryArg. |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
965 |
include := true. |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
966 |
includeEditable := true. |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
967 |
name := nameArg. |
44 | 968 |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
969 |
"Created: / 15-11-2012 / 01:36:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
211
diff
changeset
|
970 |
"Modified: / 01-04-2013 / 13:33:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 971 |
! ! |
972 |
||
973 |
!SCMAbstractCommitDialog class methodsFor:'documentation'! |
|
974 |
||
975 |
version_GIT |
|
976 |
"Never, ever change this method. Ask JV or CG why" |
|
977 |
^thisContext method mclass theNonMetaclass instVarNamed: #revision |
|
978 |
! |
|
979 |
||
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
980 |
version_HG |
114
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
66
diff
changeset
|
981 |
|
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
66
diff
changeset
|
982 |
^ '$Changeset: <not expanded> $' |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
983 |
! |
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
984 |
|
44 | 985 |
version_SVN |
58
057693eae3c7
- SCMAbstractCommitDialog
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
53
diff
changeset
|
986 |
^ '§Id:: §' |
44 | 987 |
! ! |
333 | 988 |