Added Update Action

Added recent files menu generation
Renamed FileEntry to RepoFile
Simplified most calls to runFossil


FossilOrigin-Name: d8730cff0d314fdb3f23cbaf61cfeb9d35145872

MainWindow.cpp

@@ -59,23 +59,42 @@ MainWindow::MainWindow(QWidget *parent) :
 	ui->tableView->addAction(ui->actionDelete);
 	ui->tableView->addAction(ui->actionRename);
 
+	// Locate a sequence of two separator actions in file menu
+	QList<QAction*> file_actions = ui->menuFile->actions();
+	QAction *recent_sep=0;
+	for(int i=0; i<file_actions.size(); ++i)
+	{
+		QAction *act = file_actions[i];
+		if(act->isSeparator() && i>0 && file_actions[i-1]->isSeparator())
+		{
+			recent_sep = act;
+			break;
+		}
+	}
+	Q_ASSERT(recent_sep);
+	for (int i = 0; i < MAX_RECENT; ++i)
+	{
+		recentWorkspaceActs[i] = new QAction(this);
+		recentWorkspaceActs[i]->setVisible(false);
+		connect(recentWorkspaceActs[i], SIGNAL(triggered()), this, SLOT(on_openRecent_triggered()));
+		ui->menuFile->insertAction(recent_sep, recentWorkspaceActs[i]);
+	}
+
 	statusLabel = new QLabel();
 	statusLabel->setMinimumSize( statusLabel->sizeHint() );
 	ui->statusBar->addWidget( statusLabel, 1 );
 
 	settingsFile = QDir::homePath() + QDir::separator() + ".fuelrc";
-	currentWorkspace = 0;
 
 #ifdef DEV_SETTINGS
-	if(workspaces.empty())
+	currentWorkspace = "/home/kostas/tmp/testfossil";
-		workspaces.append("/home/kostas/tmp/testfossil");
-
 	fossilPath = "fossil";
 #else
 	loadSettings();
 #endif
 
 	refresh();
+	rebuildRecent();
 }
 
 //------------------------------------------------------------------------------
@@ -89,9 +108,7 @@ MainWindow::~MainWindow()
 }
 const QString &MainWindow::getCurrentWorkspace()
 {
-	Q_ASSERT(currentWorkspace<workspaces.size());
+	return currentWorkspace;
-	Q_ASSERT(QDir(workspaces[currentWorkspace]).exists());
-	return workspaces[currentWorkspace];
 }
 
 //------------------------------------------------------------------------------
@@ -100,18 +117,55 @@ void MainWindow::on_actionRefresh_triggered()
 	refresh();
 }
 
+//------------------------------------------------------------------------------
+bool MainWindow::openWorkspace(const QString &dir)
+{
+	addWorkspace(dir);
+	currentWorkspace = dir;
+
+	on_actionClearLog_triggered();
+	stopUI();
+
+	bool ok = refresh();
+	if(ok)
+		rebuildRecent();
+
+	return ok;
+}
+
 //------------------------------------------------------------------------------
 void MainWindow::on_actionOpen_triggered()
 {
 	QString path = QFileDialog::getExistingDirectory(this, tr("Fossil Checkout"));
 	if(!path.isNull())
-	{
+		openWorkspace(path);
-		workspaces.append(path);
-		currentWorkspace = workspaces.size()-1;
-		on_actionClearLog_triggered();
-		stopUI();
-		refresh();
 }
+
+//------------------------------------------------------------------------------
+void MainWindow::rebuildRecent()
+{
+	for(int i = 0; i < MAX_RECENT; ++i)
+		recentWorkspaceActs[i]->setVisible(false);
+
+	int enabled_acts = qMin<int>(MAX_RECENT, workspaceHistory.size());
+
+	for(int i = 0; i < enabled_acts; ++i)
+	{
+		QString text = tr("&%1 %2").arg(i + 1).arg(workspaceHistory[i]);
+
+		recentWorkspaceActs[i]->setText(text);
+		recentWorkspaceActs[i]->setData(workspaceHistory[i]);
+		recentWorkspaceActs[i]->setVisible(true);
+	}
+
+}
+
+//------------------------------------------------------------------------------
+void MainWindow::on_openRecent_triggered()
+{
+	QAction *action = qobject_cast<QAction *>(sender());
+	if (action)
+		openWorkspace(action->data().toString());
 }
 
 //------------------------------------------------------------------------------
@@ -156,9 +210,11 @@ void MainWindow::enableActions(bool on)
 	ui->actionTimeline->setEnabled(on);
 	ui->actionOpenFile->setEnabled(on);
 	ui->actionOpenContaining->setEnabled(on);
+	ui->actionUndo->setEnabled(on);
+	ui->actionUpdate->setEnabled(on);
 }
 //------------------------------------------------------------------------------
-void MainWindow::refresh()
+bool MainWindow::refresh()
 {
 	// Load repository info
 	RepoStatus st = getRepoStatus();
@@ -168,14 +224,14 @@ void MainWindow::refresh()
 		setStatus(tr("No checkout detected."));
 		enableActions(false);
 		itemModel.removeRows(0, itemModel.rowCount());
-		return;
+		return false;
 	}
 	else if(st==REPO_OLD_SCHEMA)
 	{
 		setStatus(tr("Old fossil schema detected. Consider running rebuild."));
 		enableActions(false);
 		itemModel.removeRows(0, itemModel.rowCount());
-		return;
+		return true;
 	}
 
 	scanWorkspace();
@@ -187,6 +243,7 @@ void MainWindow::refresh()
 		title += " - "+projectName;
 
 	setWindowTitle(title);
+	return true;
 }
 
 //------------------------------------------------------------------------------
@@ -206,14 +263,14 @@ void MainWindow::scanWorkspace()
 		if(filename == "_FOSSIL_" || (!repositoryFile.isEmpty() && it->absoluteFilePath()==repositoryFile))
 			continue;
 
-		FileEntry e;
+		RepoFile e;
-		e.set(*it, FileEntry::TYPE_UNKNOWN, wkdir);
+		e.set(*it, RepoFile::TYPE_UNKNOWN, wkdir);
 		workspaceFiles.insert(e.getFilename(), e);
 	}
 
 	// Retrieve the status of files tracked by fossil
 	QStringList res;
-	if(!runFossil(res, QStringList() << "ls" << "-l", SILENT_STATUS))
+	if(!runFossil(QStringList() << "ls" << "-l", &res, SILENT_STATUS))
 		return;
 
 	for(QStringList::iterator it=res.begin(); it!=res.end(); ++it)
@@ -224,34 +281,34 @@ void MainWindow::scanWorkspace()
 
 		QString status_text = line.left(10).trimmed();
 		QString fname = line.right(line.length() - 10).trimmed();
-		FileEntry::EntryType type = FileEntry::TYPE_UNKNOWN;
+		RepoFile::EntryType type = RepoFile::TYPE_UNKNOWN;
 
 		bool add_missing = false;
 
 		if(status_text=="EDITED")
-			type = FileEntry::TYPE_EDITTED;
+			type = RepoFile::TYPE_EDITTED;
 		else if(status_text=="ADDED")
-			type = FileEntry::TYPE_ADDED;
+			type = RepoFile::TYPE_ADDED;
 		else if(status_text=="DELETED")
 		{
-			type = FileEntry::TYPE_DELETED;
+			type = RepoFile::TYPE_DELETED;
 			add_missing = true;
 		}
 		else if(status_text=="MISSING")
 		{
-			type = FileEntry::TYPE_MISSING;
+			type = RepoFile::TYPE_MISSING;
 			add_missing = true;
 		}
 		else if(status_text=="RENAMED")
-			type = FileEntry::TYPE_RENAMED;
+			type = RepoFile::TYPE_RENAMED;
 		else if(status_text=="UNCHANGED")
-			type = FileEntry::TYPE_UNCHANGED;
+			type = RepoFile::TYPE_UNCHANGED;
 
 		filemap_t::iterator it = workspaceFiles.find(fname);
 
 		if(add_missing && it==workspaceFiles.end())
 		{
-			FileEntry e;
+			RepoFile e;
 			QFileInfo info(wkdir+QDir::separator()+fname);
 			e.set(info, type, wkdir);
 			workspaceFiles.insert(e.getFilename(), e);
@@ -267,20 +324,20 @@ void MainWindow::scanWorkspace()
 	// Clear all rows (except header)
 	itemModel.removeRows(0, itemModel.rowCount());
 
-	struct { FileEntry::EntryType type; const char *tag; const char *tooltip; const char *icon; }
+	struct { RepoFile::EntryType type; const char *tag; const char *tooltip; const char *icon; }
 	stats[] = {
-		{	FileEntry::TYPE_EDITTED, "E", "Editted", ":icons/icons/Button Blank Yellow-01.png" },
+		{	RepoFile::TYPE_EDITTED, "E", "Editted", ":icons/icons/Button Blank Yellow-01.png" },
-		{	FileEntry::TYPE_UNCHANGED, "U", "Unchanged", ":icons/icons/Button Blank Green-01.png" },
+		{	RepoFile::TYPE_UNCHANGED, "U", "Unchanged", ":icons/icons/Button Blank Green-01.png" },
-		{	FileEntry::TYPE_ADDED, "A", "Added", ":icons/icons/Button Add-01.png" },
+		{	RepoFile::TYPE_ADDED, "A", "Added", ":icons/icons/Button Add-01.png" },
-		{	FileEntry::TYPE_DELETED, "D", "Deleted", ":icons/icons/Button Close-01.png" },
+		{	RepoFile::TYPE_DELETED, "D", "Deleted", ":icons/icons/Button Close-01.png" },
-		{	FileEntry::TYPE_RENAMED, "R", "Renamed", ":icons/icons/Button Reload-01.png" },
+		{	RepoFile::TYPE_RENAMED, "R", "Renamed", ":icons/icons/Button Reload-01.png" },
-		{	FileEntry::TYPE_MISSING, "M", "Missing", ":icons/icons/Button Help-01.png" },
+		{	RepoFile::TYPE_MISSING, "M", "Missing", ":icons/icons/Button Help-01.png" },
 	};
 
 	size_t i=0;
 	for(filemap_t::iterator it = workspaceFiles.begin(); it!=workspaceFiles.end(); ++it, ++i)
 	{
-		const FileEntry &e = it.value();
+		const RepoFile &e = it.value();
 
 		// Status Column
 		const char *tag = "?"; // Default Tag
@@ -324,7 +381,7 @@ MainWindow::RepoStatus MainWindow::getRepoStatus()
 
 	// We need to differentiate the reason why fossil has failed
 	// so we delay processing of the exit_code
-	if(!runFossil(res, QStringList() << "info", exit_code, SILENT_STATUS))
+	if(!runFossilRaw(QStringList() << "info", &res, &exit_code, SILENT_STATUS))
 		return REPO_NOT_FOUND;
 
 	bool run_ok = exit_code == EXIT_SUCCESS;
@@ -379,10 +436,10 @@ void MainWindow::on_actionClearLog_triggered()
 }
 
 //------------------------------------------------------------------------------
-bool MainWindow::runFossil(QStringList &result, const QStringList &args, bool silent, bool detached)
+bool MainWindow::runFossil(const QStringList &args, QStringList *output, bool silent, bool detached)
 {
 	int exit_code = EXIT_FAILURE;
-	if(!runFossil(result, args, exit_code, silent, detached))
+	if(!runFossilRaw(args, output, &exit_code, silent, detached))
 		return false;
 
 	return exit_code == EXIT_SUCCESS;
@@ -390,7 +447,7 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, bool si
 //------------------------------------------------------------------------------
 // Run fossil. Returns true if execution was succesfull regardless if fossil
 // issued an error
-bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent, bool detached)
+bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, bool silent, bool detached)
 {
 	if(!silent)
 		log("> fossil "+args.join(" ")+"\n");
@@ -414,14 +471,17 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &ex
 	}
 
 	process.waitForFinished();
-	QString output = process.readAllStandardOutput();
+	QString std_output = process.readAllStandardOutput();
 
-	QStringList lines = output.split('\n');
+	QStringList lines = std_output.split('\n');
 
 	for(QStringList::iterator it=lines.begin(); it!=lines.end(); ++it)
 	{
 		QString line = it->trimmed();
-		result.append(line);
+		if(line.isEmpty())
+			continue;
+		if(output)
+			output->append(line);
 		if(!silent)
 			log(line+"\n");
 	}
@@ -431,7 +491,9 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &ex
 	if(es!=QProcess::NormalExit)
 		return false;
 
-	exitCode = process.exitCode();
+	if(exitCode)
+		*exitCode = process.exitCode();
+
 	return true;
 }
 
@@ -439,8 +501,13 @@ bool MainWindow::runFossil(QStringList &result, const QStringList &args, int &ex
 void MainWindow::addWorkspace(const QString &dir)
 {
 	QDir d(dir);
-	workspaces.append(d.absolutePath());
+	QString new_workspace = QDir(dir).absolutePath();
-	currentWorkspace = workspaces.size()-1;
+
+	// Do not add the workspace if it exists already
+	if(workspaceHistory.indexOf(new_workspace)!=-1)
+		return;
+
+	workspaceHistory.append(new_workspace);
 }
 //------------------------------------------------------------------------------
 void MainWindow::loadSettings()
@@ -462,13 +529,15 @@ void MainWindow::loadSettings()
 		QString key = "Workspace_" + QString::number(i);
 		QString wk = settings.value(key).toString();
 		if(!wk.isEmpty())
-			workspaces.append(wk);
+			addWorkspace(wk);
 	}
 
+	int curr_wkspace = -1;
 	if(settings.contains("LastWorkspace"))
-		currentWorkspace = settings.value("LastWorkspace").toInt();
+		curr_wkspace = settings.value("LastWorkspace").toInt();
-	else
+
-		currentWorkspace = 0;
+	if(curr_wkspace!=-1 && curr_wkspace< workspaceHistory.size())
+		currentWorkspace = workspaceHistory[curr_wkspace];
 
 	if(settings.contains("WindowX") && settings.contains("WindowY"))
 	{
@@ -492,15 +561,18 @@ void MainWindow::saveSettings()
 {
 	QSettings settings(settingsFile, QSettings::NativeFormat);
 	settings.setValue("FossilPath", fossilPath);
-	settings.setValue("NumWorkspaces", workspaces.size());
+	settings.setValue("NumWorkspaces", workspaceHistory.size());
 
-	for(int i=0; i<workspaces.size(); ++i)
+	for(int i=0; i<workspaceHistory.size(); ++i)
 	{
 		QString key = "Workspace_" + QString::number(i);
-		settings.setValue(key, workspaces[i]);
+		settings.setValue(key, workspaceHistory[i]);
 	}
 
-	settings.setValue("LastWorkspace", currentWorkspace);
+	int curr_wkspace = workspaceHistory.indexOf(currentWorkspace);
+	if(curr_wkspace>-1)
+		settings.setValue("LastWorkspace", curr_wkspace);
+
 	settings.setValue("WindowX", x());
 	settings.setValue("WindowY", y());
 	settings.setValue("WindowWidth", width());
@@ -532,7 +604,7 @@ void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask,
 		QString filename = data.toString();
 		filemap_t::iterator e_it = workspaceFiles.find(filename);
 		Q_ASSERT(e_it!=workspaceFiles.end());
-		const FileEntry &e = e_it.value();
+		const RepoFile &e = e_it.value();
 
 		// Skip unwanted files
 		if(!(includeMask & e.getType()))
@@ -544,17 +616,15 @@ void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask,
 //------------------------------------------------------------------------------
 bool MainWindow::diffFile(QString repoFile)
 {
-	QStringList res;
-	int exitcode;
 	// Run the diff detached
-	return runFossil(res, QStringList() << "gdiff" << QuotePath(repoFile), exitcode, false, true);
+	return runFossil(QStringList() << "gdiff" << QuotePath(repoFile), 0, false, true);
 }
 
 //------------------------------------------------------------------------------
 void MainWindow::on_actionDiff_triggered()
 {
 	QStringList selection;
-	getSelectionFilenames(selection, FileEntry::TYPE_REPO);
+	getSelectionFilenames(selection, RepoFile::TYPE_REPO);
 
 	for(QStringList::iterator it = selection.begin(); it!=selection.end(); ++it)
 		if(!diffFile(*it))
@@ -654,15 +724,13 @@ void MainWindow::on_actionOpenFile_triggered()
 //------------------------------------------------------------------------------
 void MainWindow::on_actionPush_triggered()
 {
-	QStringList res;
+	runFossil(QStringList() << "push");
-	runFossil(res, QStringList() << "push");
 }
 
 //------------------------------------------------------------------------------
 void MainWindow::on_actionPull_triggered()
 {
-	QStringList res;
+	runFossil(QStringList() << "pull");
-	runFossil(res, QStringList() << "pull");
 }
 
 
@@ -670,7 +738,7 @@ void MainWindow::on_actionPull_triggered()
 void MainWindow::on_actionCommit_triggered()
 {
 	QStringList modified_files;
-	getSelectionFilenames(modified_files, FileEntry::TYPE_REPO_MODIFIED, true);
+	getSelectionFilenames(modified_files, RepoFile::TYPE_REPO_MODIFIED, true);
 
 	if(modified_files.empty())
 		return;
@@ -688,8 +756,7 @@ void MainWindow::on_actionCommit_triggered()
 		comment_file.write(msg.toUtf8());
 		comment_file.close();
 
-		QStringList res;
+		runFossil(QStringList() << "commit" << "--message-file" << QuotePath(comment_file.fileName()) << QuotePaths(modified_files) );
-		runFossil(res, QStringList() << "commit" << "--message-file" << QuotePath(comment_file.fileName()) << QuotePaths(modified_files) );
 	}
 
 	refresh();
@@ -700,7 +767,7 @@ void MainWindow::on_actionAdd_triggered()
 {
 	// Get unknown files only
 	QStringList selection;
-	getSelectionFilenames(selection, FileEntry::TYPE_UNKNOWN);
+	getSelectionFilenames(selection, RepoFile::TYPE_UNKNOWN);
 
 	if(selection.empty())
 		return;
@@ -709,8 +776,7 @@ void MainWindow::on_actionAdd_triggered()
 		return;
 
 	// Do Add
-	QStringList res;
+	runFossil(QStringList() << "add" << QuotePaths(selection) );
-	runFossil(res, QStringList() << "add" << QuotePaths(selection) );
 
 	refresh();
 }
@@ -719,10 +785,10 @@ void MainWindow::on_actionAdd_triggered()
 void MainWindow::on_actionDelete_triggered()
 {
 	QStringList repo_files;
-	getSelectionFilenames(repo_files, FileEntry::TYPE_REPO);
+	getSelectionFilenames(repo_files, RepoFile::TYPE_REPO);
 
 	QStringList unknown_files;
-	getSelectionFilenames(unknown_files, FileEntry::TYPE_UNKNOWN);
+	getSelectionFilenames(unknown_files, RepoFile::TYPE_UNKNOWN);
 
 	QStringList all_files = repo_files+unknown_files;
 
@@ -737,8 +803,7 @@ void MainWindow::on_actionDelete_triggered()
 	if(!repo_files.empty())
 	{
 		// Do Delete
-		QStringList res;
+		if(!runFossil(QStringList() << "delete" << QuotePaths(repo_files)))
-		if(!runFossil(res, QStringList() << "delete" << QuotePaths(repo_files)))
 			return;
 	}
 
@@ -759,7 +824,7 @@ void MainWindow::on_actionDelete_triggered()
 void MainWindow::on_actionRevert_triggered()
 {
 	QStringList modified_files;
-	getSelectionFilenames(modified_files, FileEntry::TYPE_EDITTED|FileEntry::TYPE_DELETED|FileEntry::TYPE_MISSING);
+	getSelectionFilenames(modified_files, RepoFile::TYPE_EDITTED|RepoFile::TYPE_DELETED|RepoFile::TYPE_MISSING);
 
 	if(modified_files.empty())
 		return;
@@ -768,8 +833,7 @@ void MainWindow::on_actionRevert_triggered()
 		return;
 
 	// Do Revert
-	QStringList res;
+	runFossil(QStringList() << "revert" << QuotePaths(modified_files) );
-	runFossil(res, QStringList() << "revert" << QuotePaths(modified_files) );
 
 	refresh();
 }
@@ -778,7 +842,7 @@ void MainWindow::on_actionRevert_triggered()
 void MainWindow::on_actionRename_triggered()
 {
 	QStringList repo_files;
-	getSelectionFilenames(repo_files, FileEntry::TYPE_REPO);
+	getSelectionFilenames(repo_files, RepoFile::TYPE_REPO);
 
 	if(repo_files.length()!=1)
 		return;
@@ -799,8 +863,7 @@ void MainWindow::on_actionRename_triggered()
 	}
 
 	// Do Rename
-	QStringList res;
+	runFossil(QStringList() << "mv" << QuotePath(fi_before.filePath()) << QuotePath(fi_after.filePath()) );
-	runFossil(res, QStringList() << "mv" << QuotePath(fi_before.filePath()) << QuotePath(fi_after.filePath()) );
 
 	QString wkdir = getCurrentWorkspace() + QDir::separator();
 
@@ -839,15 +902,14 @@ void MainWindow::on_actionNew_triggered()
 	repositoryFile = path_info.absoluteFilePath();
 
 	// Create repo
-	QStringList res;
+	if(!runFossil(QStringList() << "new" << QuotePath(repositoryFile), 0, false))
-	if(!runFossil(res, QStringList() << "new" << QuotePath(repositoryFile), false))
 	{
 		QMessageBox::critical(this, tr("Error"), tr("Repository creation failed."), QMessageBox::Ok );
 		return;
 	}
 
 	// Open repo
-	if(!runFossil(res, QStringList() << "open" << QuotePath(repositoryFile), false))
+	if(!runFossil(QStringList() << "open" << QuotePath(repositoryFile), 0, false))
 	{
 		QMessageBox::critical(this, tr("Error"), tr("Repository checkout failed."), QMessageBox::Ok );
 		return;
@@ -887,7 +949,7 @@ void MainWindow::on_actionUndo_triggered()
 	// Gather Undo actions
 	QStringList res;
 
-	if(!runFossil(res, QStringList() << "undo" << "--explain" ))
+	if(!runFossil(QStringList() << "undo" << "--explain", &res ))
 		return;
 
 	if(res.length()>0 && res[0]=="No undo or redo is available")
@@ -897,7 +959,7 @@ void MainWindow::on_actionUndo_triggered()
 		return;
 
 	// Do Undo
-	runFossil(res, QStringList() << "undo" );
+	runFossil(QStringList() << "undo" );
 
 	refresh();
 }
@@ -913,3 +975,22 @@ void MainWindow::on_actionAbout_triggered()
 						   "Available under the CC Attribution-Noncommercial-No Derivate 3.0 License"));
 }
 
+//------------------------------------------------------------------------------
+void MainWindow::on_actionUpdate_triggered()
+{
+	QStringList res;
+
+	if(!runFossil(QStringList() << "update" << "--nochange", &res ))
+		return;
+
+	if(res.length()==0)
+		return;
+
+	if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be update. Are you sure?"), res))
+		return;
+
+	// Do Update
+	runFossil(QStringList() << "update" );
+
+	refresh();
+}

MainWindow.h

@@ -15,7 +15,7 @@ namespace Ui {
 
 class QStringList;
 
-struct FileEntry
+struct RepoFile
 {
 	enum EntryType
 	{
@@ -98,21 +98,23 @@ public:
 	bool diffFile(QString repoFile);
 
 private:
-	void refresh();
+	bool refresh();
 	void scanWorkspace();
-	bool runFossil(QStringList &result, const QStringList &args, bool silent=false, bool detached=false);
+	bool runFossil(const QStringList &args, QStringList *output=0, bool silent=false, bool detached=false);
-	bool runFossil(QStringList &result, const QStringList &args, int &exitCode, bool silent=false, bool detached=false);
+	bool runFossilRaw(const QStringList &args, QStringList *output=0, int *exitCode=0, bool silent=false, bool detached=false);
 	void loadSettings();
 	void saveSettings();
 	const QString &getCurrentWorkspace();
 	void log(const QString &text);
 	void setStatus(const QString &text);
 	bool uiRunning() const { return fossilUI.state() == QProcess::Running; }
-	void getSelectionFilenames(QStringList &filenames, int includeMask=FileEntry::TYPE_ALL, bool allIfEmpty=false);
+	void getSelectionFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
 	bool startUI();
 	void stopUI();
 	void enableActions(bool on);
 	void addWorkspace(const QString &dir);
+	void rebuildRecent();
+	bool openWorkspace(const QString &dir);
 
 	enum RepoStatus
 	{
@@ -146,21 +148,35 @@ private slots:
 	void on_actionRename_triggered();
 	void on_actionUndo_triggered();
 	void on_actionAbout_triggered();
+	void on_actionUpdate_triggered();
+	void on_openRecent_triggered();
+
 private:
+	enum
+	{
+		MAX_RECENT=5
+	};
+
+
 	Ui::MainWindow		*ui;
 	QStandardItemModel	itemModel;
 	QProcess			fossilUI;
+	class QAction		*recentWorkspaceActs[MAX_RECENT];
+	class QLabel		*statusLabel;
+
 	QString				settingsFile;
 
+	// Settings
 	QString				projectName;
 	QString				repositoryFile;
 	QString				fossilPath;
-	QStringList			workspaces;
+	QStringList			workspaceHistory;
-	typedef QMap<QString, FileEntry> filemap_t;
+	QString				currentWorkspace;
-	filemap_t			workspaceFiles;
-	int					currentWorkspace;
 	QStringList			commitMessages;
-	class QLabel		*statusLabel;
+
+	// Repo State
+	typedef QMap<QString, RepoFile> filemap_t;
+	filemap_t			workspaceFiles;
 };
 
 #endif // MAINWINDOW_H

MainWindow.ui

@@ -133,6 +133,7 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionCommit"/>
+   <addaction name="actionUpdate"/>
    <addaction name="separator"/>
    <addaction name="actionRefresh"/>
    <addaction name="separator"/>
@@ -164,6 +165,9 @@
    <property name="text">
     <string>Refresh</string>
    </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
   </action>
   <action name="actionCommit">
    <property name="icon">
@@ -173,6 +177,9 @@
    <property name="text">
     <string>Commit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+M</string>
+   </property>
   </action>
   <action name="actionDiff">
    <property name="icon">
@@ -182,6 +189,9 @@
    <property name="text">
     <string>Diff</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+D</string>
+   </property>
   </action>
   <action name="actionAdd">
    <property name="icon">
@@ -191,6 +201,9 @@
    <property name="text">
     <string>Add</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl++</string>
+   </property>
   </action>
   <action name="actionDelete">
    <property name="icon">
@@ -200,6 +213,9 @@
    <property name="text">
     <string>Delete</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+-</string>
+   </property>
   </action>
   <action name="actionOpen">
    <property name="icon">
@@ -212,6 +228,9 @@
    <property name="toolTip">
     <string>Open a fossil checkout folder</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
    <property name="iconVisibleInMenu">
     <bool>true</bool>
    </property>
@@ -224,6 +243,9 @@
    <property name="text">
     <string>Push</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+P</string>
+   </property>
   </action>
   <action name="actionPull">
    <property name="icon">
@@ -233,6 +255,9 @@
    <property name="text">
     <string>Pull</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
   </action>
   <action name="actionRename">
    <property name="icon">
@@ -245,6 +270,9 @@
    <property name="toolTip">
     <string>Rename</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
   </action>
   <action name="actionQuit">
    <property name="icon">
@@ -254,6 +282,9 @@
    <property name="text">
     <string>Quit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
    <property name="iconVisibleInMenu">
     <bool>true</bool>
    </property>
@@ -269,6 +300,9 @@
    <property name="toolTip">
     <string>History</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+H</string>
+   </property>
   </action>
   <action name="actionFossilUI">
    <property name="checkable">
@@ -308,6 +342,9 @@
    <property name="toolTip">
     <string>Clear Log</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+K</string>
+   </property>
   </action>
   <action name="actionTimeline">
    <property name="icon">
@@ -326,6 +363,9 @@
    <property name="text">
     <string>Open file</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Return</string>
+   </property>
   </action>
   <action name="actionNew">
    <property name="icon">
@@ -335,6 +375,9 @@
    <property name="text">
     <string>New Repository...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
   </action>
   <action name="actionClone">
    <property name="icon">
@@ -353,6 +396,9 @@
    <property name="text">
     <string>Open Containing Folder</string>
    </property>
+   <property name="shortcut">
+    <string>Alt+Return</string>
+   </property>
   </action>
   <action name="actionUndo">
    <property name="icon">
@@ -362,12 +408,31 @@
    <property name="text">
     <string>undo</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Z</string>
+   </property>
   </action>
   <action name="actionAbout">
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
+   </property>
    <property name="text">
     <string>About...</string>
    </property>
   </action>
+  <action name="actionUpdate">
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
+   </property>
+   <property name="text">
+    <string>update</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+U</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

manifest

@@ -1,18 +1,18 @@
-C Renamed\sqmake\sproject
+C Added\sUpdate\sAction\nAdded\srecent\sfiles\smenu\sgeneration\nRenamed\sFileEntry\sto\sRepoFile\nSimplified\smost\scalls\sto\srunFossil\n
-D 2011-08-05T15:41:11.050
+D 2011-08-06T03:54:43.951
 F CommitDialog.cpp c2a14598f42d252d847d05b3bb33ae040f1a31ae
 F CommitDialog.h 0550b1b652924ae54b6f6c9274cad2d4c491808a
 F CommitDialog.ui 4a641325b8645f07672ffb9f19e7134ab753e6bb
 F FileActionDialog.cpp 6410dc7a65209df1839f871b3b66c0a78a4fe733
 F FileActionDialog.h 873a9f720753a37d67071563ed7954f91b0d4699
 F FileActionDialog.ui 2d7a0fa47f9555f4a4a7485feacd5bce504415a0
-F MainWindow.cpp 2f50d5da6f0d118271683bf61911ef11de3452d7
+F MainWindow.cpp 20e81f039ca183879c26336ade940c050f6cd771
-F MainWindow.h 0d6d8fb35f3a8763f7d4b78f809a39ad47e80047
+F MainWindow.h d335311e596eab2b9cd7139e09dda7ca9e35de4c
-F MainWindow.ui b67ecc597e26810ee56f7726707d82fad87ede23
+F MainWindow.ui 3e2be4d8eb2b89b3fdd63fc31355d98354e6ea9e
 F RepoDialog.cpp 8f20e1511526973555c774350ec413dcecf51c9e
 F RepoDialog.h a958c5f98f1e6882bf41dbdd2e4df3cb89700802
 F RepoDialog.ui 8fe9b7f7528332ca9a45e919cf116aaf144a3286
-F fuel.pro ab8c399de80717d4c55ba8866ae65ee754649fbb w qtfossil.pro
+F fuel.pro ab8c399de80717d4c55ba8866ae65ee754649fbb
 F icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8
 F icons/Adobe\sIllustrator\sCS3\sDocument-01.png 2e44e933d58eefee7ccfa1650fed4ceadcf3c2be
 F icons/Adobe\sPDF\sDocument-01.png 8a0bc3ba633d08debde748d64b5a9675e30447a3
@@ -167,7 +167,7 @@ F icons/Zoom\sOut-01.png 8eda092100d9e00c9097f43a80d1e26695947448
 F icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
 F main.cpp f53e9e1e34f65565f06b2d37d7be5c38e2113a03
 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
-P 3d20801ad81d4e3d797cb8b7f9088686ae41ee58
+P ac732f689426b87eae201397cddfc91ea476efc1
-R 788201ddd38de8b8ed8b97286b6ae015
+R 43f0366285b13dade5c4db496050c8ea
 U kostas
-Z e3c6373a1d7ef471cc073c29e0e244ef
+Z 4c47958735054e969645f9183040c7d5

manifest.uuid

@@ -1 +1 @@
-ac732f689426b87eae201397cddfc91ea476efc1
+d8730cff0d314fdb3f23cbaf61cfeb9d35145872