Fuel

Diff
Login
Home Timeline Downloads Forums Branches Tags Tickets Wiki
Annotate Patch Side-by-side Diff

Differences From Artifact [7bc9f5ce1d]:

To Artifact [1f54b516ab]:

︙
228
229
230
231
232
233
234
235
236
237

238
239


240
241
242
243
244
245
246

228
229
230
231
232
233
234


235
236
237
238
239
240
241
242
243
244
245
246
247








-
-

+


+
+








	abortShortcut = new QShortcut(QKeySequence("Escape"), this);
	abortShortcut->setContext(Qt::ApplicationShortcut);
	abortShortcut->setEnabled(false);
	connect(abortShortcut, SIGNAL(activated()), this, SLOT(onAbort()));

	viewMode = VIEWMODE_TREE;

	applySettings();

#ifdef BRIDGE_ENABLED
	// Need to be before applySettings which sets the last workspace
	bridge.Init(this, &log, ui->textBrowser, "", "");
#endif

	applySettings();

	// Apply any explicit workspace path if available
	if(workspacePath && !workspacePath->isEmpty())
		openWorkspace(*workspacePath);

	abortOperation = false;
︙
669
670
671
672
673
674
675

676
677


678
679
680
681
682
683
684

670
671
672
673
674
675
676
677


678
679
680
681
682
683
684
685
686








+
-
-
+
+









	loadFossilSettings();
	scanWorkspace();
	setStatus("");
	enableActions(true);

	QString title = "Fuel";

	if(!projectName.isEmpty())
		title += " - "+projectName;
	if(!getProjectName().isEmpty())
		title += " - " + getProjectName();

	setWindowTitle(title);
	return true;
}

//------------------------------------------------------------------------------
void MainWindow::scanWorkspace()
︙
899
900
901
902
903
904
905
906

907
908
909
910
911
912
913

901
902
903
904
905
906
907

908
909
910
911
912
913
914
915








-
+








	// Directory View
	repoDirModel.clear();

	QStringList header;
	header << tr("Folders");
	repoDirModel.setHorizontalHeaderLabels(header);

	QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), projectName);
	QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), getProjectName());
	root->setData(""); // Empty Path
	root->setEditable(false);

	repoDirModel.appendRow(root);
	for(stringset_t::iterator it = pathSet.begin(); it!=pathSet.end(); ++it)
	{
		const QString &dir = *it;
︙