Fuel

Diff
Login

Differences From Artifact [18c298a5cc]:

To Artifact [809b27413c]:


349
350
351
352
353
354
355
356

357
358
359
360
361
362
363
349
350
351
352
353
354
355

356
357
358
359
360
361
362
363







-
+







				tag = stats[t].tag;
				tooltip = stats[t].tooltip;
				icon = stats[t].icon;
				break;
			}
		}

		QStandardItem *status = new QStandardItem(QIcon(icon), "");
		QStandardItem *status = new QStandardItem(QIcon(icon), tag);
		status->setToolTip(tooltip);
		itemModel.setItem(i, COLUMN_STATUS, status);

		QString path = e.getFilename();
		path = path.left(path.indexOf(e.getFileInfo().fileName()));
		QFileInfo finfo = e.getFileInfo();

464
465
466
467
468
469
470


471
472
473

474
475
476
477
478
479
480

481
482
483

484
485
486
487
488
489
490
464
465
466
467
468
469
470
471
472
473
474

475
476
477
478
479
480
481

482
483
484

485
486
487
488
489
490
491
492







+
+


-
+






-
+


-
+







bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, bool silent, bool detached)
{
	if(!silent)
		log("> fossil "+args.join(" ")+"\n");

	QString wkdir = getCurrentWorkspace();

	QString fossil = getFossilPath();

	if(detached)
	{
		return QProcess::startDetached(settings.fossilPath, args, wkdir);
		return QProcess::startDetached(fossil, args, wkdir);
	}

	QProcess process(this);
	process.setProcessChannelMode(QProcess::MergedChannels);
	process.setWorkingDirectory(wkdir);

	process.start(settings.fossilPath, args);
	process.start(fossil, args);
	if(!process.waitForStarted())
	{
		log("Could not start fossil executable '"+settings.fossilPath + "''\n");
		log("Could not start fossil executable '" + fossil + "''\n");
		return false;
	}

	const char *ans_yes = "y" EOL_MARK;
	const char *ans_no = "n" EOL_MARK;
	const char *ans_always = "a" EOL_MARK;

606
607
608
609
610
611
612

















613
614
615


616
617
618
619
620
621
622
623

624
625
626
627
628
629
630
631


632
633
634
635




636
637

638
639
640
641
642
643
644
645
646
647
648
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640


641

642




643
644


645
646
647
648


649
650
651
652


653

654


655
656
657
658
659
660
661







+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



+
+




-
-

-
+
-
-
-
-


-
-
+
+


-
-
+
+
+
+
-
-
+
-

-
-








	// Do not add the workspace if it exists already
	if(workspaceHistory.indexOf(new_workspace)!=-1)
		return;

	workspaceHistory.append(new_workspace);
}

//------------------------------------------------------------------------------
QString MainWindow::getFossilPath()
{
	// Use the user-specified fossil if available
	if(!settings.fossilPath.isEmpty())
		return settings.fossilPath;

	// Use our fossil if available
	QString fuel_fossil = QCoreApplication::applicationDirPath() + QDir::separator() + "fossil";

	if(QFile::exists(fuel_fossil))
		return fuel_fossil;

	// Otherwise assume there is a "fossil" executable in the path
	return "fossil";
}
//------------------------------------------------------------------------------
void MainWindow::loadSettings()
{
	// Linux: ~/.config/organizationName/applicationName.conf
	// Windows: HKEY_CURRENT_USER\Software\organizationName\Fuel
	QSettings qsettings(QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());

	if(qsettings.contains("FossilPath"))
		settings.fossilPath = qsettings.value("FossilPath").toString();
	else
		settings.fossilPath = "fossil";

	int num_wks = 0;
	int num_wks = qsettings.beginReadArray("Workspaces");

	if(qsettings.contains("NumWorkspaces"))
		num_wks = qsettings.value("NumWorkspaces").toInt();

	for(int i=0; i<num_wks; ++i)
	{
		QString key = "Workspace_" + QString::number(i);
		QString wk = qsettings.value(key).toString();
		qsettings.setArrayIndex(i);
		QString wk = qsettings.value("Path").toString();
		if(!wk.isEmpty())
			addWorkspace(wk);
	}


		if(qsettings.contains("Active") && qsettings.value("Active").toBool())
			currentWorkspace = wk;
	}
	int curr_wkspace = -1;
	if(qsettings.contains("LastWorkspace"))
	qsettings.endArray();
		curr_wkspace = qsettings.value("LastWorkspace").toInt();

	if(curr_wkspace!=-1 && curr_wkspace< workspaceHistory.size())
		currentWorkspace = workspaceHistory[curr_wkspace];

	if(qsettings.contains("WindowX") && qsettings.contains("WindowY"))
	{
		QPoint _pos;
		_pos.setX(qsettings.value("WindowX").toInt());
		_pos.setY(qsettings.value("WindowY").toInt());
		move(_pos);
657
658
659
660
661
662
663



664

665
666

667
668


669
670


671
672

673
674
675
676
677
678
679
680
681
682
670
671
672
673
674
675
676
677
678
679

680

681
682
683
684
685
686


687
688
689

690



691
692
693
694
695
696
697







+
+
+
-
+
-

+


+
+
-
-
+
+

-
+
-
-
-







	}
}

//------------------------------------------------------------------------------
void MainWindow::saveSettings()
{
	QSettings qsettings(QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());

	// If we have a customize fossil path, save it
	if(!settings.fossilPath.isEmpty())
	qsettings.setValue("FossilPath", settings.fossilPath);
		qsettings.setValue("FossilPath", settings.fossilPath);
	qsettings.setValue("NumWorkspaces", workspaceHistory.size());

	qsettings.beginWriteArray("Workspaces", workspaceHistory.size());
	for(int i=0; i<workspaceHistory.size(); ++i)
	{
		qsettings.setArrayIndex(i);
		qsettings.setValue("Path", workspaceHistory[i]);
		QString key = "Workspace_" + QString::number(i);
		qsettings.setValue(key, workspaceHistory[i]);
		if(currentWorkspace == workspaceHistory[i])
			qsettings.setValue("Active", true);
	}

	qsettings.endArray();
	int curr_wkspace = workspaceHistory.indexOf(currentWorkspace);
	if(curr_wkspace>-1)
		qsettings.setValue("LastWorkspace", curr_wkspace);

	qsettings.setValue("WindowX", x());
	qsettings.setValue("WindowY", y());
	qsettings.setValue("WindowWidth", width());
	qsettings.setValue("WindowHeight", height());

}
738
739
740
741
742
743
744

745
746

747
748
749

750
751
752
753
754
755
756
753
754
755
756
757
758
759
760
761

762
763
764

765
766
767
768
769
770
771
772







+

-
+


-
+







	if(uiRunning())
		return true;

	fossilUI.setProcessChannelMode(QProcess::MergedChannels);
	fossilUI.setWorkingDirectory(getCurrentWorkspace());

	log("> fossil ui\n");
	QString fossil = getFossilPath();

	fossilUI.start(settings.fossilPath, QStringList() << "ui");
	fossilUI.start(fossil, QStringList() << "ui");
	if(!fossilUI.waitForStarted())
	{
		log(settings.fossilPath + tr(" does not exist") +"\n");
		log(fossil+ tr(" does not exist") +"\n");
		return false;
	}

	return true;
}

//------------------------------------------------------------------------------
1098
1099
1100
1101
1102
1103
1104

1114
1115
1116
1117
1118
1119
1120
1121







+
}

//------------------------------------------------------------------------------
void MainWindow::on_actionSettings_triggered()
{
	SettingsDialog::run(this, settings);
}