Chris@88
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
Chris@88
|
2
|
Chris@88
|
3 /*
|
Chris@88
|
4 EasyMercurial
|
Chris@88
|
5
|
Chris@88
|
6 Based on HgExplorer by Jari Korhonen
|
Chris@88
|
7 Copyright (c) 2010 Jari Korhonen
|
Chris@244
|
8 Copyright (c) 2011 Chris Cannam
|
Chris@244
|
9 Copyright (c) 2011 Queen Mary, University of London
|
Chris@88
|
10
|
Chris@88
|
11 This program is free software; you can redistribute it and/or
|
Chris@88
|
12 modify it under the terms of the GNU General Public License as
|
Chris@88
|
13 published by the Free Software Foundation; either version 2 of the
|
Chris@88
|
14 License, or (at your option) any later version. See the file
|
Chris@88
|
15 COPYING included with this distribution for more information.
|
Chris@88
|
16 */
|
Chris@88
|
17
|
Chris@88
|
18 #include "filestatuswidget.h"
|
Chris@115
|
19 #include "debug.h"
|
Chris@115
|
20 #include "multichoicedialog.h"
|
Chris@88
|
21
|
Chris@88
|
22 #include <QLabel>
|
Chris@88
|
23 #include <QListWidget>
|
Chris@88
|
24 #include <QGridLayout>
|
Chris@93
|
25 #include <QFileInfo>
|
Chris@93
|
26 #include <QApplication>
|
Chris@93
|
27 #include <QDateTime>
|
Chris@115
|
28 #include <QPushButton>
|
Chris@186
|
29 #include <QToolButton>
|
Chris@186
|
30 #include <QDir>
|
Chris@186
|
31 #include <QProcess>
|
Chris@199
|
32 #include <QCheckBox>
|
Chris@230
|
33 #include <QSettings>
|
Chris@323
|
34 #include <QAction>
|
Chris@88
|
35
|
Chris@88
|
36 FileStatusWidget::FileStatusWidget(QWidget *parent) :
|
Chris@93
|
37 QWidget(parent),
|
Chris@93
|
38 m_dateReference(0)
|
Chris@88
|
39 {
|
Chris@88
|
40 QGridLayout *layout = new QGridLayout;
|
Chris@215
|
41 layout->setMargin(10);
|
Chris@88
|
42 setLayout(layout);
|
Chris@88
|
43
|
Chris@88
|
44 int row = 0;
|
Chris@211
|
45
|
Chris@230
|
46 m_noModificationsLabel = new QLabel;
|
Chris@230
|
47 setNoModificationsLabelText();
|
Chris@297
|
48 layout->addWidget(m_noModificationsLabel, row, 0);
|
Chris@202
|
49 m_noModificationsLabel->hide();
|
Chris@106
|
50
|
Chris@100
|
51 m_simpleLabels[FileStates::Clean] = tr("Unmodified:");
|
Chris@100
|
52 m_simpleLabels[FileStates::Modified] = tr("Modified:");
|
Chris@100
|
53 m_simpleLabels[FileStates::Added] = tr("Added:");
|
Chris@100
|
54 m_simpleLabels[FileStates::Removed] = tr("Removed:");
|
Chris@100
|
55 m_simpleLabels[FileStates::Missing] = tr("Missing:");
|
Chris@163
|
56 m_simpleLabels[FileStates::InConflict] = tr("In Conflict:");
|
Chris@100
|
57 m_simpleLabels[FileStates::Unknown] = tr("Untracked:");
|
Chris@199
|
58 m_simpleLabels[FileStates::Ignored] = tr("Ignored:");
|
Chris@99
|
59
|
Chris@326
|
60 m_actionLabels[FileStates::Annotate] = tr("Show annotated version");
|
Chris@326
|
61 m_actionLabels[FileStates::Diff] = tr("Diff to parent");
|
Chris@325
|
62 m_actionLabels[FileStates::Commit] = tr("Commit...");
|
Chris@328
|
63 m_actionLabels[FileStates::Revert] = tr("Revert to last committed state");
|
Chris@361
|
64 m_actionLabels[FileStates::Rename] = tr("Rename...");
|
Chris@361
|
65 m_actionLabels[FileStates::Copy] = tr("Copy...");
|
Chris@326
|
66 m_actionLabels[FileStates::Add] = tr("Add to version control");
|
Chris@326
|
67 m_actionLabels[FileStates::Remove] = tr("Remove from version control");
|
Chris@326
|
68 m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
|
Chris@328
|
69 m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
|
Chris@413
|
70 m_actionLabels[FileStates::Ignore] = tr("Ignore...");
|
Chris@413
|
71 m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring...");
|
Chris@325
|
72
|
Chris@100
|
73 m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
|
Chris@100
|
74 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");
|
Chris@225
|
75 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them.");
|
Chris@225
|
76 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>"
|
Chris@100
|
77 "They will not be deleted from the local folder.");
|
Chris@109
|
78 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
|
Chris@153
|
79 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"
|
Chris@153
|
80 "If you deleted them by accident, select them and use Revert to restore their previous contents.");
|
Chris@163
|
81 m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again.");
|
Chris@100
|
82 m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>"
|
Chris@186
|
83 // "Select a file and use Add to place it under version control or Ignore to remove it from this list.");
|
Chris@186
|
84 "Select a file and use Add to place it under version control.");
|
Chris@199
|
85 m_descriptions[FileStates::Ignored] = tr("These files have names that match entries in the working folder's .hgignore file,<br>"
|
Chris@199
|
86 "and so will be ignored by the version control system.");
|
Chris@100
|
87
|
Chris@118
|
88 m_highlightExplanation = tr("Files highlighted <font color=#d40000>in red</font> "
|
Chris@100
|
89 "have appeared since your most recent commit or update.");
|
Chris@89
|
90
|
Chris@230
|
91 m_boxesParent = new QWidget(this);
|
Chris@297
|
92 layout->addWidget(m_boxesParent, ++row, 0);
|
Chris@230
|
93
|
Chris@230
|
94 QGridLayout *boxesLayout = new QGridLayout;
|
Chris@230
|
95 boxesLayout->setMargin(0);
|
Chris@230
|
96 m_boxesParent->setLayout(boxesLayout);
|
Chris@230
|
97 int boxRow = 0;
|
Chris@230
|
98
|
Chris@94
|
99 for (int i = int(FileStates::FirstState);
|
Chris@163
|
100 i <= int(FileStates::LastState); ++i) {
|
Chris@89
|
101
|
Chris@94
|
102 FileStates::State s = FileStates::State(i);
|
Chris@89
|
103
|
Chris@230
|
104 QWidget *box = new QWidget(m_boxesParent);
|
Chris@89
|
105 QGridLayout *boxlayout = new QGridLayout;
|
Chris@99
|
106 boxlayout->setMargin(0);
|
Chris@89
|
107 box->setLayout(boxlayout);
|
Chris@89
|
108
|
Chris@211
|
109 boxlayout->addItem(new QSpacerItem(3, 3), 0, 0);
|
Chris@101
|
110
|
Chris@230
|
111 QLabel *label = new QLabel(labelFor(s));
|
Chris@230
|
112 label->setWordWrap(true);
|
Chris@230
|
113 boxlayout->addWidget(label, 1, 0);
|
Chris@89
|
114
|
Chris@94
|
115 QListWidget *w = new QListWidget;
|
Chris@94
|
116 m_stateListMap[s] = w;
|
Chris@94
|
117 w->setSelectionMode(QListWidget::ExtendedSelection);
|
Chris@101
|
118 boxlayout->addWidget(w, 2, 0);
|
Chris@89
|
119
|
Chris@95
|
120 connect(w, SIGNAL(itemSelectionChanged()),
|
Chris@95
|
121 this, SLOT(itemSelectionChanged()));
|
Chris@331
|
122 connect(w, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
|
Chris@331
|
123 this, SLOT(itemDoubleClicked(QListWidgetItem *)));
|
Chris@95
|
124
|
Chris@325
|
125 FileStates::Activities activities = m_fileStates.activitiesSupportedBy(s);
|
Chris@325
|
126 int prevGroup = -1;
|
Chris@325
|
127 foreach (FileStates::Activity a, activities) {
|
Chris@325
|
128 int group = FileStates::activityGroup(a);
|
Chris@325
|
129 if (group != prevGroup && prevGroup != -1) {
|
Chris@325
|
130 QAction *sep = new QAction("", w);
|
Chris@325
|
131 sep->setSeparator(true);
|
Chris@325
|
132 w->insertAction(0, sep);
|
Chris@325
|
133 }
|
Chris@325
|
134 prevGroup = group;
|
Chris@325
|
135 QAction *act = new QAction(m_actionLabels[a], w);
|
Chris@326
|
136 act->setProperty("state", s);
|
Chris@326
|
137 act->setProperty("activity", a);
|
Chris@326
|
138 connect(act, SIGNAL(triggered()), this, SLOT(menuActionActivated()));
|
Chris@325
|
139 w->insertAction(0, act);
|
Chris@325
|
140 }
|
Chris@323
|
141 w->setContextMenuPolicy(Qt::ActionsContextMenu);
|
Chris@323
|
142
|
Chris@211
|
143 boxlayout->addItem(new QSpacerItem(2, 2), 3, 0);
|
Chris@211
|
144
|
Chris@230
|
145 boxesLayout->addWidget(box, ++boxRow, 0);
|
Chris@230
|
146 m_boxes.push_back(box);
|
Chris@89
|
147 box->hide();
|
Chris@89
|
148 }
|
Chris@89
|
149
|
Chris@230
|
150 m_gridlyLayout = false;
|
Chris@230
|
151
|
Chris@89
|
152 layout->setRowStretch(++row, 20);
|
Chris@186
|
153
|
Chris@211
|
154 layout->addItem(new QSpacerItem(8, 8), ++row, 0);
|
Chris@199
|
155
|
Chris@199
|
156 m_showAllFiles = new QCheckBox(tr("Show all files"), this);
|
Chris@340
|
157 m_showAllFiles->setEnabled(false);
|
Chris@297
|
158 layout->addWidget(m_showAllFiles, ++row, 0, Qt::AlignLeft);
|
Chris@199
|
159 connect(m_showAllFiles, SIGNAL(toggled(bool)),
|
Chris@199
|
160 this, SIGNAL(showAllChanged(bool)));
|
Chris@88
|
161 }
|
Chris@88
|
162
|
Chris@93
|
163 FileStatusWidget::~FileStatusWidget()
|
Chris@93
|
164 {
|
Chris@93
|
165 delete m_dateReference;
|
Chris@93
|
166 }
|
Chris@93
|
167
|
Chris@100
|
168 QString FileStatusWidget::labelFor(FileStates::State s, bool addHighlightExplanation)
|
Chris@100
|
169 {
|
Chris@230
|
170 QSettings settings;
|
Chris@230
|
171 settings.beginGroup("Presentation");
|
Chris@230
|
172 if (settings.value("showhelpfultext", true).toBool()) {
|
Chris@230
|
173 if (addHighlightExplanation) {
|
Chris@230
|
174 return QString("<qt><b>%1</b><br>%2<br>%3</qt>")
|
Chris@230
|
175 .arg(m_simpleLabels[s])
|
Chris@230
|
176 .arg(m_descriptions[s])
|
Chris@230
|
177 .arg(m_highlightExplanation);
|
Chris@230
|
178 } else {
|
Chris@230
|
179 return QString("<qt><b>%1</b><br>%2</qt>")
|
Chris@230
|
180 .arg(m_simpleLabels[s])
|
Chris@230
|
181 .arg(m_descriptions[s]);
|
Chris@230
|
182 }
|
Chris@100
|
183 } else {
|
Chris@230
|
184 return QString("<qt><b>%1</b></qt>")
|
Chris@230
|
185 .arg(m_simpleLabels[s]);
|
Chris@230
|
186 }
|
Chris@230
|
187 settings.endGroup();
|
Chris@230
|
188 }
|
Chris@230
|
189
|
Chris@230
|
190 void FileStatusWidget::setNoModificationsLabelText()
|
Chris@230
|
191 {
|
Chris@230
|
192 QSettings settings;
|
Chris@230
|
193 settings.beginGroup("Presentation");
|
Chris@230
|
194 if (settings.value("showhelpfultext", true).toBool()) {
|
Chris@230
|
195 m_noModificationsLabel->setText
|
Chris@230
|
196 (tr("<qt>This area will list files in your working folder that you have changed.<br><br>At the moment you have no uncommitted changes.<br><br>To see changes previously made to the repository,<br>switch to the History tab.<br><br>%1</qt>")
|
Chris@230
|
197 #if defined Q_OS_MAC
|
Chris@230
|
198 .arg(tr("To open the working folder in Finder,<br>click on the “Local” folder path shown above."))
|
Chris@230
|
199 #elif defined Q_OS_WIN32
|
Chris@230
|
200 .arg(tr("To open the working folder in Windows Explorer,<br>click on the “Local” folder path shown above."))
|
Chris@230
|
201 #else
|
Chris@230
|
202 .arg(tr("To open the working folder in your system file manager,<br>click the “Local” folder path shown above."))
|
Chris@230
|
203 #endif
|
Chris@230
|
204 );
|
Chris@230
|
205 } else {
|
Chris@230
|
206 m_noModificationsLabel->setText
|
Chris@230
|
207 (tr("<qt>You have no uncommitted changes.</qt>"));
|
Chris@100
|
208 }
|
Chris@100
|
209 }
|
Chris@100
|
210
|
Chris@319
|
211
|
Chris@326
|
212 void FileStatusWidget::menuActionActivated()
|
Chris@326
|
213 {
|
Chris@326
|
214 QAction *act = qobject_cast<QAction *>(sender());
|
Chris@326
|
215 if (!act) return;
|
Chris@326
|
216
|
Chris@326
|
217 FileStates::State state = (FileStates::State)
|
Chris@326
|
218 act->property("state").toUInt();
|
Chris@326
|
219 FileStates::Activity activity = (FileStates::Activity)
|
Chris@326
|
220 act->property("activity").toUInt();
|
Chris@319
|
221
|
Chris@326
|
222 DEBUG << "menuActionActivated: state = " << state << ", activity = "
|
Chris@326
|
223 << activity << endl;
|
Chris@319
|
224
|
Chris@326
|
225 if (!FileStates::supportsActivity(state, activity)) {
|
Chris@326
|
226 std::cerr << "WARNING: FileStatusWidget::menuActionActivated: "
|
Chris@326
|
227 << "Action state " << state << " does not support activity "
|
Chris@326
|
228 << activity << std::endl;
|
Chris@326
|
229 return;
|
Chris@326
|
230 }
|
Chris@326
|
231
|
Chris@326
|
232 QStringList files = getSelectedFilesInState(state);
|
Chris@326
|
233
|
Chris@326
|
234 switch (activity) {
|
Chris@326
|
235 case FileStates::Annotate: emit annotateFiles(files); break;
|
Chris@326
|
236 case FileStates::Diff: emit diffFiles(files); break;
|
Chris@326
|
237 case FileStates::Commit: emit commitFiles(files); break;
|
Chris@326
|
238 case FileStates::Revert: emit revertFiles(files); break;
|
Chris@361
|
239 case FileStates::Rename: emit renameFiles(files); break;
|
Chris@361
|
240 case FileStates::Copy: emit copyFiles(files); break;
|
Chris@326
|
241 case FileStates::Add: emit addFiles(files); break;
|
Chris@326
|
242 case FileStates::Remove: emit removeFiles(files); break;
|
Chris@326
|
243 case FileStates::RedoMerge: emit redoFileMerges(files); break;
|
Chris@326
|
244 case FileStates::MarkResolved: emit markFilesResolved(files); break;
|
Chris@326
|
245 case FileStates::Ignore: emit ignoreFiles(files); break;
|
Chris@326
|
246 case FileStates::UnIgnore: emit unIgnoreFiles(files); break;
|
Chris@326
|
247 }
|
Chris@326
|
248 }
|
Chris@319
|
249
|
Chris@331
|
250 void FileStatusWidget::itemDoubleClicked(QListWidgetItem *item)
|
Chris@331
|
251 {
|
Chris@331
|
252 QStringList files;
|
Chris@350
|
253 QString file = item->text();
|
Chris@350
|
254 files << file;
|
Chris@350
|
255
|
Chris@350
|
256 switch (m_fileStates.stateOf(file)) {
|
Chris@350
|
257
|
Chris@350
|
258 case FileStates::Modified:
|
Chris@350
|
259 case FileStates::InConflict:
|
Chris@350
|
260 emit diffFiles(files);
|
Chris@350
|
261 break;
|
Chris@350
|
262
|
Chris@350
|
263 case FileStates::Clean:
|
Chris@350
|
264 case FileStates::Missing:
|
Chris@350
|
265 emit annotateFiles(files);
|
Chris@350
|
266 break;
|
Chris@373
|
267
|
Chris@373
|
268 default:
|
Chris@373
|
269 break;
|
Chris@350
|
270 }
|
Chris@331
|
271 }
|
Chris@319
|
272
|
Chris@95
|
273 void FileStatusWidget::itemSelectionChanged()
|
Chris@95
|
274 {
|
Chris@135
|
275 DEBUG << "FileStatusWidget::itemSelectionChanged" << endl;
|
Chris@135
|
276
|
Chris@135
|
277 QListWidget *list = qobject_cast<QListWidget *>(sender());
|
Chris@135
|
278
|
Chris@135
|
279 if (list) {
|
Chris@135
|
280 foreach (QListWidget *w, m_stateListMap) {
|
Chris@135
|
281 if (w != list) {
|
Chris@135
|
282 w->blockSignals(true);
|
Chris@135
|
283 w->clearSelection();
|
Chris@135
|
284 w->blockSignals(false);
|
Chris@135
|
285 }
|
Chris@135
|
286 }
|
Chris@135
|
287 }
|
Chris@135
|
288
|
Chris@95
|
289 m_selectedFiles.clear();
|
Chris@95
|
290
|
Chris@95
|
291 foreach (QListWidget *w, m_stateListMap) {
|
Chris@95
|
292 QList<QListWidgetItem *> sel = w->selectedItems();
|
Chris@95
|
293 foreach (QListWidgetItem *i, sel) {
|
Chris@95
|
294 m_selectedFiles.push_back(i->text());
|
Chris@95
|
295 DEBUG << "file " << i->text() << " is selected" << endl;
|
Chris@95
|
296 }
|
Chris@95
|
297 }
|
Chris@95
|
298
|
Chris@95
|
299 emit selectionChanged();
|
Chris@95
|
300 }
|
Chris@95
|
301
|
Chris@94
|
302 void FileStatusWidget::clearSelections()
|
Chris@94
|
303 {
|
Chris@95
|
304 m_selectedFiles.clear();
|
Chris@94
|
305 foreach (QListWidget *w, m_stateListMap) {
|
Chris@94
|
306 w->clearSelection();
|
Chris@94
|
307 }
|
Chris@94
|
308 }
|
Chris@94
|
309
|
Chris@95
|
310 bool FileStatusWidget::haveChangesToCommit() const
|
Chris@95
|
311 {
|
Chris@326
|
312 return !getAllCommittableFiles().empty();
|
Chris@95
|
313 }
|
Chris@95
|
314
|
Chris@95
|
315 bool FileStatusWidget::haveSelection() const
|
Chris@95
|
316 {
|
Chris@95
|
317 return !m_selectedFiles.empty();
|
Chris@95
|
318 }
|
Chris@95
|
319
|
Chris@326
|
320 QStringList FileStatusWidget::getSelectedFilesInState(FileStates::State s) const
|
Chris@95
|
321 {
|
Chris@95
|
322 QStringList files;
|
Chris@95
|
323 foreach (QString f, m_selectedFiles) {
|
Chris@326
|
324 if (m_fileStates.stateOf(f) == s) files.push_back(f);
|
Chris@95
|
325 }
|
Chris@95
|
326 return files;
|
Chris@326
|
327 }
|
Chris@326
|
328
|
Chris@326
|
329 QStringList FileStatusWidget::getSelectedFilesSupportingActivity(FileStates::Activity a) const
|
Chris@326
|
330 {
|
Chris@326
|
331 QStringList files;
|
Chris@326
|
332 foreach (QString f, m_selectedFiles) {
|
Chris@326
|
333 if (m_fileStates.supportsActivity(f, a)) files.push_back(f);
|
Chris@326
|
334 }
|
Chris@326
|
335 return files;
|
Chris@326
|
336 }
|
Chris@95
|
337
|
Chris@103
|
338 QStringList FileStatusWidget::getAllCommittableFiles() const
|
Chris@103
|
339 {
|
Chris@326
|
340 return m_fileStates.filesSupportingActivity(FileStates::Commit);
|
Chris@109
|
341 }
|
Chris@109
|
342
|
Chris@109
|
343 QStringList FileStatusWidget::getAllRevertableFiles() const
|
Chris@109
|
344 {
|
Chris@326
|
345 return m_fileStates.filesSupportingActivity(FileStates::Revert);
|
Chris@163
|
346 }
|
Chris@163
|
347
|
Chris@163
|
348 QStringList FileStatusWidget::getAllUnresolvedFiles() const
|
Chris@163
|
349 {
|
Chris@326
|
350 return m_fileStates.filesInState(FileStates::InConflict);
|
Chris@109
|
351 }
|
Chris@109
|
352
|
Chris@95
|
353 QStringList FileStatusWidget::getSelectedAddableFiles() const
|
Chris@95
|
354 {
|
Chris@326
|
355 return getSelectedFilesSupportingActivity(FileStates::Add);
|
Chris@103
|
356 }
|
Chris@103
|
357
|
Chris@95
|
358 QStringList FileStatusWidget::getSelectedRemovableFiles() const
|
Chris@95
|
359 {
|
Chris@326
|
360 return getSelectedFilesSupportingActivity(FileStates::Remove);
|
Chris@103
|
361 }
|
Chris@103
|
362
|
Chris@283
|
363 QString
|
Chris@283
|
364 FileStatusWidget::localPath() const
|
Chris@283
|
365 {
|
Chris@287
|
366 return m_localPath;
|
Chris@283
|
367 }
|
Chris@283
|
368
|
Chris@88
|
369 void
|
Chris@88
|
370 FileStatusWidget::setLocalPath(QString p)
|
Chris@88
|
371 {
|
Chris@287
|
372 m_localPath = p;
|
Chris@93
|
373 delete m_dateReference;
|
Chris@93
|
374 m_dateReference = new QFileInfo(p + "/.hg/dirstate");
|
Chris@93
|
375 if (!m_dateReference->exists() ||
|
Chris@93
|
376 !m_dateReference->isFile() ||
|
Chris@93
|
377 !m_dateReference->isReadable()) {
|
Chris@93
|
378 DEBUG << "FileStatusWidget::setLocalPath: date reference file "
|
Chris@93
|
379 << m_dateReference->absoluteFilePath()
|
Chris@93
|
380 << " does not exist, is not a file, or cannot be read"
|
Chris@93
|
381 << endl;
|
Chris@93
|
382 delete m_dateReference;
|
Chris@93
|
383 m_dateReference = 0;
|
Chris@340
|
384 m_showAllFiles->setEnabled(false);
|
Chris@340
|
385 } else {
|
Chris@340
|
386 m_showAllFiles->setEnabled(true);
|
Chris@93
|
387 }
|
Chris@283
|
388 }
|
Chris@283
|
389
|
Chris@88
|
390 void
|
Chris@92
|
391 FileStatusWidget::setFileStates(FileStates p)
|
Chris@88
|
392 {
|
Chris@92
|
393 m_fileStates = p;
|
Chris@88
|
394 updateWidgets();
|
Chris@88
|
395 }
|
Chris@88
|
396
|
Chris@88
|
397 void
|
Chris@88
|
398 FileStatusWidget::updateWidgets()
|
Chris@88
|
399 {
|
Chris@95
|
400 QDateTime lastInteractionTime;
|
Chris@95
|
401 if (m_dateReference) {
|
Chris@95
|
402 lastInteractionTime = m_dateReference->lastModified();
|
Chris@95
|
403 DEBUG << "reference time: " << lastInteractionTime << endl;
|
Chris@95
|
404 }
|
Chris@95
|
405
|
Chris@95
|
406 QSet<QString> selectedFiles;
|
Chris@95
|
407 foreach (QString f, m_selectedFiles) selectedFiles.insert(f);
|
Chris@95
|
408
|
Chris@230
|
409 int visibleCount = 0;
|
Chris@115
|
410
|
Chris@94
|
411 foreach (FileStates::State s, m_stateListMap.keys()) {
|
Chris@95
|
412
|
Chris@94
|
413 QListWidget *w = m_stateListMap[s];
|
Chris@94
|
414 w->clear();
|
Chris@324
|
415 QStringList files = m_fileStates.filesInState(s);
|
Chris@93
|
416
|
Chris@95
|
417 QStringList highPriority, lowPriority;
|
Chris@95
|
418
|
Chris@95
|
419 foreach (QString file, files) {
|
Chris@95
|
420
|
Chris@95
|
421 bool highlighted = false;
|
Chris@95
|
422
|
Chris@95
|
423 if (s == FileStates::Unknown) {
|
Chris@95
|
424 // We want to highlight untracked files that have appeared
|
Chris@95
|
425 // since the last interaction with the repo
|
Chris@287
|
426 QString fn(m_localPath + "/" + file);
|
Chris@95
|
427 DEBUG << "comparing with " << fn << endl;
|
Chris@95
|
428 QFileInfo fi(fn);
|
Chris@100
|
429 if (fi.exists() && fi.created() > lastInteractionTime) {
|
Chris@95
|
430 DEBUG << "file " << fn << " is newer (" << fi.lastModified()
|
Chris@95
|
431 << ") than reference" << endl;
|
Chris@95
|
432 highlighted = true;
|
Chris@95
|
433 }
|
Chris@95
|
434 }
|
Chris@95
|
435
|
Chris@95
|
436 if (highlighted) {
|
Chris@95
|
437 highPriority.push_back(file);
|
Chris@95
|
438 } else {
|
Chris@95
|
439 lowPriority.push_back(file);
|
Chris@93
|
440 }
|
Chris@93
|
441 }
|
Chris@95
|
442
|
Chris@95
|
443 foreach (QString file, highPriority) {
|
Chris@95
|
444 QListWidgetItem *item = new QListWidgetItem(file);
|
Chris@95
|
445 w->addItem(item);
|
Chris@326
|
446 item->setForeground(QColor("#d40000"));
|
Chris@95
|
447 item->setSelected(selectedFiles.contains(file));
|
Chris@95
|
448 }
|
Chris@95
|
449
|
Chris@95
|
450 foreach (QString file, lowPriority) {
|
Chris@95
|
451 QListWidgetItem *item = new QListWidgetItem(file);
|
Chris@95
|
452 w->addItem(item);
|
Chris@95
|
453 item->setSelected(selectedFiles.contains(file));
|
Chris@95
|
454 }
|
Chris@95
|
455
|
Chris@100
|
456 setLabelFor(w, s, !highPriority.empty());
|
Chris@100
|
457
|
Chris@115
|
458 if (files.empty()) {
|
Chris@115
|
459 w->parentWidget()->hide();
|
Chris@115
|
460 } else {
|
Chris@115
|
461 w->parentWidget()->show();
|
Chris@230
|
462 ++visibleCount;
|
Chris@115
|
463 }
|
Chris@93
|
464 }
|
Chris@115
|
465
|
Chris@230
|
466 m_noModificationsLabel->setVisible(visibleCount == 0);
|
Chris@230
|
467
|
Chris@230
|
468 if (visibleCount > 3) {
|
Chris@230
|
469 layoutBoxesGridly(visibleCount);
|
Chris@230
|
470 } else {
|
Chris@230
|
471 layoutBoxesLinearly();
|
Chris@230
|
472 }
|
Chris@115
|
473
|
Chris@230
|
474 setNoModificationsLabelText();
|
Chris@230
|
475 }
|
Chris@230
|
476
|
Chris@230
|
477 void FileStatusWidget::layoutBoxesGridly(int visibleCount)
|
Chris@230
|
478 {
|
Chris@230
|
479 if (m_gridlyLayout && m_lastGridlyCount == visibleCount) return;
|
Chris@230
|
480
|
Chris@230
|
481 delete m_boxesParent->layout();
|
Chris@230
|
482
|
Chris@230
|
483 QGridLayout *layout = new QGridLayout;
|
Chris@230
|
484 layout->setMargin(0);
|
Chris@230
|
485 m_boxesParent->setLayout(layout);
|
Chris@230
|
486
|
Chris@230
|
487 int row = 0;
|
Chris@230
|
488 int col = 0;
|
Chris@230
|
489
|
Chris@230
|
490 DEBUG << "FileStatusWidget::layoutBoxesGridly: visibleCount = "
|
Chris@230
|
491 << visibleCount << endl;
|
Chris@230
|
492
|
Chris@230
|
493 for (int i = 0; i < m_boxes.size(); ++i) {
|
Chris@230
|
494
|
Chris@230
|
495 if (!m_boxes[i]->isVisible()) continue;
|
Chris@230
|
496
|
Chris@230
|
497 if (col == 0 && row >= (visibleCount+1)/2) {
|
Chris@230
|
498 layout->addItem(new QSpacerItem(10, 5), 0, 1);
|
Chris@230
|
499 col = 2;
|
Chris@230
|
500 row = 0;
|
Chris@230
|
501 }
|
Chris@230
|
502
|
Chris@230
|
503 layout->addWidget(m_boxes[i], row, col);
|
Chris@230
|
504
|
Chris@230
|
505 ++row;
|
Chris@230
|
506 }
|
Chris@230
|
507
|
Chris@230
|
508 m_gridlyLayout = true;
|
Chris@230
|
509 m_lastGridlyCount = visibleCount;
|
Chris@230
|
510 }
|
Chris@230
|
511
|
Chris@230
|
512 void FileStatusWidget::layoutBoxesLinearly()
|
Chris@230
|
513 {
|
Chris@230
|
514 if (!m_gridlyLayout) return;
|
Chris@230
|
515
|
Chris@230
|
516 delete m_boxesParent->layout();
|
Chris@230
|
517
|
Chris@230
|
518 QGridLayout *layout = new QGridLayout;
|
Chris@230
|
519 layout->setMargin(0);
|
Chris@230
|
520 m_boxesParent->setLayout(layout);
|
Chris@230
|
521
|
Chris@230
|
522 for (int i = 0; i < m_boxes.size(); ++i) {
|
Chris@230
|
523 layout->addWidget(m_boxes[i], i, 0);
|
Chris@230
|
524 }
|
Chris@230
|
525
|
Chris@230
|
526 m_gridlyLayout = false;
|
Chris@88
|
527 }
|
Chris@88
|
528
|
Chris@100
|
529 void FileStatusWidget::setLabelFor(QWidget *w, FileStates::State s, bool addHighlight)
|
Chris@100
|
530 {
|
Chris@100
|
531 QString text = labelFor(s, addHighlight);
|
Chris@100
|
532 QWidget *p = w->parentWidget();
|
Chris@100
|
533 QList<QLabel *> ql = p->findChildren<QLabel *>();
|
Chris@100
|
534 if (!ql.empty()) ql[0]->setText(text);
|
Chris@100
|
535 }
|
Chris@115
|
536
|