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