Fuel

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

Differences From Artifact [44316f743a]:

To Artifact [1ae55ca0a7]:

︙
85
86
87
88
89
90
91
92

93
94
95
96
97
98
99

85
86
87
88
89
90
91

92
93
94
95
96
97
98
99








-
+








		res.insert(key, value);
	}
	return res;
}


///////////////////////////////////////////////////////////////////////////////
MainWindow::MainWindow(QWidget *parent, QString *workspacePath) :
MainWindow::MainWindow(QWidget *parent, QString *workspacePath, bool portableMode) :
	QMainWindow(parent),
	ui(new Ui::MainWindow)
{
	ui->setupUi(this);

	QAction *separator = new QAction(this);
	separator->setSeparator(true);
︙
169
170
171
172
173
174
175












176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195

196
197
198
199
200
201
202

169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215








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




















+








	foreach(QAction *a, ui->menuBar->actions())
		a->setIconVisibleInMenu(false);
	foreach(QAction *a, ui->menuFile->actions())
		a->setIconVisibleInMenu(false);
#endif

	viewMode = VIEWMODE_TREE;

	// Go into portable mode when explicitly requested or if a config file exists next to the executable
	QString ini_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini");
	if(portableMode || QFile::exists(ini_path))
		qsettings = new QSettings(ini_path, QSettings::IniFormat);
	else
	{
		// Linux: ~/.config/organizationName/applicationName.conf
		// Windows: HKEY_CURRENT_USER\Software\organizationName\Fuel
		qsettings = new QSettings(QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());
	}
	
	loadSettings();

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

	refresh();
	rebuildRecent();

	// Select the Root of the tree to update the file view
	selectRootDir();

	fossilAbort = false;
}

//------------------------------------------------------------------------------
MainWindow::~MainWindow()
{
	stopUI();
	saveSettings();
	delete qsettings;

	// Dispose RepoFiles
	for(filemap_t::iterator it = workspaceFiles.begin(); it!=workspaceFiles.end(); ++it)
		delete *it;

	delete ui;
}
︙
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230


1231
1232
1233


1234
1235
1236


1237
1238

1239
1240
1241
1242


1243
1244
1245
1246
1247
1248
1249
1250

1251
1252
1253

1254
1255
1256

1257
1258
1259
1260


1261
1262
1263
1264

1265
1266
1267
1268


1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280









1281
1282
1283


1284
1285
1286
1287
1288


1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301



1302
1303

1304
1305
1306
1307


1308
1309

1310
1311

1312
1313

1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324










1325
1326
1327
1328
1329
1330
1331

1231
1232
1233
1234
1235
1236
1237






1238
1239
1240


1241
1242
1243


1244
1245
1246

1247
1248
1249


1250
1251
1252
1253
1254
1255
1256
1257
1258

1259
1260
1261

1262
1263
1264

1265
1266
1267


1268
1269
1270
1271
1272

1273
1274
1275


1276
1277
1278
1279
1280









1281
1282
1283
1284
1285
1286
1287
1288
1289
1290


1291
1292
1293
1294
1295


1296
1297
1298
1299
1300
1301
1302
1303


1304
1305



1306
1307
1308
1309

1310
1311
1312


1313
1314
1315

1316
1317

1318
1319

1320
1321










1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338








-
-
-
-
-
-
+
+

-
-
+
+

-
-
+
+

-
+


-
-
+
+







-
+


-
+


-
+


-
-
+
+



-
+


-
-
+
+



-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

-
-
+
+



-
-
+
+






-
-


-
-
-
+
+
+

-
+


-
-
+
+

-
+

-
+

-
+

-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+









	// Otherwise assume there is a "fossil" executable in the path
	return fossil_exe;
}
//------------------------------------------------------------------------------
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(FUEL_SETTING_FOSSIL_PATH))
		settings.Mappings[FUEL_SETTING_FOSSIL_PATH].Value = qsettings.value(FUEL_SETTING_FOSSIL_PATH);
	if(qsettings->contains(FUEL_SETTING_FOSSIL_PATH))
		settings.Mappings[FUEL_SETTING_FOSSIL_PATH].Value = qsettings->value(FUEL_SETTING_FOSSIL_PATH);

	if(qsettings.contains(FUEL_SETTING_COMMIT_MSG))
		settings.Mappings[FUEL_SETTING_COMMIT_MSG].Value = qsettings.value(FUEL_SETTING_COMMIT_MSG);
	if(qsettings->contains(FUEL_SETTING_COMMIT_MSG))
		settings.Mappings[FUEL_SETTING_COMMIT_MSG].Value = qsettings->value(FUEL_SETTING_COMMIT_MSG);

	if(qsettings.contains(FUEL_SETTING_FILE_DBLCLICK))
		settings.Mappings[FUEL_SETTING_FILE_DBLCLICK].Value = qsettings.value(FUEL_SETTING_FILE_DBLCLICK);
	if(qsettings->contains(FUEL_SETTING_FILE_DBLCLICK))
		settings.Mappings[FUEL_SETTING_FILE_DBLCLICK].Value = qsettings->value(FUEL_SETTING_FILE_DBLCLICK);

	int num_wks = qsettings.beginReadArray("Workspaces");
	int num_wks = qsettings->beginReadArray("Workspaces");
	for(int i=0; i<num_wks; ++i)
	{
		qsettings.setArrayIndex(i);
		QString wk = qsettings.value("Path").toString();
		qsettings->setArrayIndex(i);
		QString wk = qsettings->value("Path").toString();

		// Skip invalid workspaces
		if(wk.isEmpty() || !QDir(wk).exists())
			continue;

		addWorkspace(wk);

		if(qsettings.contains("Active") && qsettings.value("Active").toBool())
		if(qsettings->contains("Active") && qsettings->value("Active").toBool())
			setCurrentWorkspace(wk);
	}
	qsettings.endArray();
	qsettings->endArray();


	if(qsettings.contains("WindowX") && qsettings.contains("WindowY"))
	if(qsettings->contains("WindowX") && qsettings->contains("WindowY"))
	{
		QPoint _pos;
		_pos.setX(qsettings.value("WindowX").toInt());
		_pos.setY(qsettings.value("WindowY").toInt());
		_pos.setX(qsettings->value("WindowX").toInt());
		_pos.setY(qsettings->value("WindowY").toInt());
		move(_pos);
	}

	if(qsettings.contains("WindowWidth") && qsettings.contains("WindowHeight"))
	if(qsettings->contains("WindowWidth") && qsettings->contains("WindowHeight"))
	{
		QSize _size;
		_size.setWidth(qsettings.value("WindowWidth").toInt());
		_size.setHeight(qsettings.value("WindowHeight").toInt());
		_size.setWidth(qsettings->value("WindowWidth").toInt());
		_size.setHeight(qsettings->value("WindowHeight").toInt());
		resize(_size);
	}

	if(qsettings.contains("ViewUnknown"))
		ui->actionViewUnknown->setChecked(qsettings.value("ViewUnknown").toBool());
	if(qsettings.contains("ViewModified"))
		ui->actionViewModified->setChecked(qsettings.value("ViewModified").toBool());
	if(qsettings.contains("ViewUnchanged"))
		ui->actionViewUnchanged->setChecked(qsettings.value("ViewUnchanged").toBool());
	if(qsettings.contains("ViewIgnored"))
		ui->actionViewIgnored->setChecked(qsettings.value("ViewIgnored").toBool());
	if(qsettings.contains("ViewAsList"))
	if(qsettings->contains("ViewUnknown"))
		ui->actionViewUnknown->setChecked(qsettings->value("ViewUnknown").toBool());
	if(qsettings->contains("ViewModified"))
		ui->actionViewModified->setChecked(qsettings->value("ViewModified").toBool());
	if(qsettings->contains("ViewUnchanged"))
		ui->actionViewUnchanged->setChecked(qsettings->value("ViewUnchanged").toBool());
	if(qsettings->contains("ViewIgnored"))
		ui->actionViewIgnored->setChecked(qsettings->value("ViewIgnored").toBool());
	if(qsettings->contains("ViewAsList"))
	{
		ui->actionViewAsList->setChecked(qsettings.value("ViewAsList").toBool());
		viewMode = qsettings.value("ViewAsList").toBool()? VIEWMODE_LIST : VIEWMODE_TREE;
		ui->actionViewAsList->setChecked(qsettings->value("ViewAsList").toBool());
		viewMode = qsettings->value("ViewAsList").toBool()? VIEWMODE_LIST : VIEWMODE_TREE;
	}
	ui->treeView->setVisible(viewMode == VIEWMODE_TREE);

	if(qsettings.contains("ViewStash"))
		ui->actionViewStash->setChecked(qsettings.value("ViewStash").toBool());
	if(qsettings->contains("ViewStash"))
		ui->actionViewStash->setChecked(qsettings->value("ViewStash").toBool());
	ui->tableViewStash->setVisible(ui->actionViewStash->isChecked());
}

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

	// If we have a customize fossil path, save it
	QString fossil_path = settings.Mappings[FUEL_SETTING_FOSSIL_PATH].Value.toString();
	qsettings.setValue(FUEL_SETTING_FOSSIL_PATH, fossil_path);
	qsettings.setValue(FUEL_SETTING_COMMIT_MSG, settings.Mappings[FUEL_SETTING_COMMIT_MSG].Value);
	qsettings.setValue(FUEL_SETTING_FILE_DBLCLICK, settings.Mappings[FUEL_SETTING_FILE_DBLCLICK].Value);
	qsettings->setValue(FUEL_SETTING_FOSSIL_PATH, fossil_path);
	qsettings->setValue(FUEL_SETTING_COMMIT_MSG, settings.Mappings[FUEL_SETTING_COMMIT_MSG].Value);
	qsettings->setValue(FUEL_SETTING_FILE_DBLCLICK, settings.Mappings[FUEL_SETTING_FILE_DBLCLICK].Value);

	qsettings.beginWriteArray("Workspaces", workspaceHistory.size());
	qsettings->beginWriteArray("Workspaces", workspaceHistory.size());
	for(int i=0; i<workspaceHistory.size(); ++i)
	{
		qsettings.setArrayIndex(i);
		qsettings.setValue("Path", workspaceHistory[i]);
		qsettings->setArrayIndex(i);
		qsettings->setValue("Path", workspaceHistory[i]);
		if(getCurrentWorkspace() == workspaceHistory[i])
			qsettings.setValue("Active", true);
			qsettings->setValue("Active", true);
		else
			qsettings.remove("Active");
			qsettings->remove("Active");
	}
	qsettings.endArray();
	qsettings->endArray();

	qsettings.setValue("WindowX", x());
	qsettings.setValue("WindowY", y());
	qsettings.setValue("WindowWidth", width());
	qsettings.setValue("WindowHeight", height());
	qsettings.setValue("ViewUnknown", ui->actionViewUnknown->isChecked());
	qsettings.setValue("ViewModified", ui->actionViewModified->isChecked());
	qsettings.setValue("ViewUnchanged", ui->actionViewUnchanged->isChecked());
	qsettings.setValue("ViewIgnored", ui->actionViewIgnored->isChecked());
	qsettings.setValue("ViewAsList", ui->actionViewAsList->isChecked());
	qsettings.setValue("ViewStash", ui->actionViewStash->isChecked());
	qsettings->setValue("WindowX", x());
	qsettings->setValue("WindowY", y());
	qsettings->setValue("WindowWidth", width());
	qsettings->setValue("WindowHeight", height());
	qsettings->setValue("ViewUnknown", ui->actionViewUnknown->isChecked());
	qsettings->setValue("ViewModified", ui->actionViewModified->isChecked());
	qsettings->setValue("ViewUnchanged", ui->actionViewUnchanged->isChecked());
	qsettings->setValue("ViewIgnored", ui->actionViewIgnored->isChecked());
	qsettings->setValue("ViewAsList", ui->actionViewAsList->isChecked());
	qsettings->setValue("ViewStash", ui->actionViewStash->isChecked());
}

//------------------------------------------------------------------------------
void MainWindow::selectRootDir()
{
	if(viewMode==VIEWMODE_TREE)
	{
︙
1475
1476
1477
1478
1479
1480
1481
1482

1483
1484
1485
1486
1487
1488
1489
1490
1491

1492
1493
1494
1495
1496
1497

1498
1499
1500
1501
1502
1503
1504

1482
1483
1484
1485
1486
1487
1488

1489
1490
1491
1492
1493
1494
1495
1496
1497

1498
1499
1500
1501
1502
1503

1504
1505
1506
1507
1508
1509
1510
1511








-
+








-
+





-
+








}

//------------------------------------------------------------------------------
bool MainWindow::startUI()
{
	if(uiRunning())
	{
		log("Fossil UI is already running\n");
		log(tr("Fossil UI is already running\n"));
		return true;
	}

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

	log("<b>&gt; fossil ui</b><br>", true);
	log("Starting Fossil UI. Please wait.\n");
	log(tr("Starting Fossil UI. Please wait.\n"));
	QString fossil = getFossilPath();

	fossilUI.start(fossil, QStringList() << "ui");
	if(!fossilUI.waitForStarted() || fossilUI.state()!=QProcess::Running)
	{
		log(fossil+ tr(" does not exist") +"\n");
		log(tr("%0 does not exist\n").arg(fossil));
		ui->actionFossilUI->setChecked(false);
		return false;
	}

#if 0
	QString buffer;
	while(buffer.indexOf(EOL_MARK)==-1)
︙
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629

1622
1623
1624
1625
1626
1627
1628

1629
1630
1631
1632
1633
1634
1635








-








}

//------------------------------------------------------------------------------
void MainWindow::on_actionPull_triggered()
{
	runFossil(QStringList() << "pull");
}


//------------------------------------------------------------------------------
void MainWindow::on_actionCommit_triggered()
{
	QStringList modified_files;
	getSelectionFilenames(modified_files, RepoFile::TYPE_MODIFIED, true);
︙
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811

1802
1803
1804
1805
1806
1807
1808


1809
1810
1811
1812
1813
1814
1815








-
-









	// Also rename the file
	QFile::rename( wkdir+fi_before.filePath(), wkdir+fi_after.filePath());

	refresh();
}



//------------------------------------------------------------------------------
void MainWindow::on_actionOpenContaining_triggered()
{
	QStringList selection;
	getSelectionFilenames(selection);

	QString target;
︙
1852
1853
1854
1855
1856
1857
1858
1859

1860
1861
1862
1863
1864
1865
1866

1856
1857
1858
1859
1860
1861
1862

1863
1864
1865
1866
1867
1868
1869
1870








-
+








	if(runFossil(QStringList() << "version", &res, RUNGLAGS_SILENT_ALL) && res.length()==1)
	{
		int off = res[0].indexOf("version ");
		if(off!=-1)
			fossil_ver = tr("Fossil version ")+res[0].mid(off) + "\n\n";
	}

	QMessageBox::about(this, "About Fuel...",
	QMessageBox::about(this, tr("About Fuel..."),
					   QCoreApplication::applicationName() + " "+ QCoreApplication::applicationVersion() + " " +
						tr("a GUI frontend to the Fossil SCM\n"
							"by Kostas Karanikolas\n"
							"Released under the GNU GPL\n\n")
					   + fossil_ver +
						tr("Icon-set by Deleket - Jojo Mendoza\n"
							"Available under the CC Attribution Noncommercial No Derivate 3.0 License"));
︙