No OneTemporary
Actions

Size

241 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/BasicMainWindow.cpp b/src/BasicMainWindow.cpp
	index 87a5e51..8390fe2 100644
	--- a/src/BasicMainWindow.cpp
	+++ b/src/BasicMainWindow.cpp
	@@ -1,2935 +1,2940 @@

	#include "ApplicationGlobal.h"
	#include "BasicMainWindow.h"
	#include "CheckoutDialog.h"
	#include "CloneDialog.h"
	#include "CommitDialog.h"
	#include "CommitExploreWindow.h"
	#include "CommitViewWindow.h"
	#include "CreateRepositoryDialog.h"
	#include "DeleteBranchDialog.h"
	#include "DoYouWantToInitDialog.h"
	#include "FileHistoryWindow.h"
	#include "FilePropertyDialog.h"
	#include "FileUtil.h"
	#include "Git.h"
	#include "GitDiff.h"
	#include "MemoryReader.h"
	#include "MySettings.h"
	#include "PushDialog.h"
	#include "RepositoryPropertyDialog.h"
	#include "SelectCommandDialog.h"
	#include "SetGlobalUserDialog.h"
	#include "SetUserDialog.h"
	#include "SettingsDialog.h"
	#include "Terminal.h"
	#include "TextEditDialog.h"
	#include "UserEvent.h"
	#include "WelcomeWizardDialog.h"
	#include "common/joinpath.h"
	#include "common/misc.h"
	#include "gpg.h"
	#include "gunzip.h"
	#include "platform.h"
	#include "webclient.h"
	#include <QDesktopServices>
	#include <QDir>
	#include <QDirIterator>
	#include <QEvent>
	#include <QFileIconProvider>
	#include <QListWidget>
	#include <QMenu>
	#include <QMessageBox>
	#include <QStandardPaths>
	#include <QTreeWidgetItem>
	#include <functional>
	#include <memory>

	class AsyncExecGitThread_ : public QThread {
	private:
	GitPtr g;
	std::function<void(GitPtr g)> callback;
	public:
	AsyncExecGitThread_(GitPtr const &g, std::function<void(GitPtr const &g)> const &callback)
	: g(g)
	, callback(callback)
	{
	}
	protected:
	void run() override
	{
	callback(g);
	}
	};

	//

	struct BasicMainWindow::Private {
	ApplicationSettings appsettings;

	QIcon repository_icon;
	QIcon folder_icon;
	QIcon signature_good_icon;
	QIcon signature_dubious_icon;
	QIcon signature_bad_icon;
	QPixmap transparent_pixmap;

	QString starting_dir;
	Git::Context gcx;
	RepositoryItem current_repo;

	QList<RepositoryItem> repos;
	Git::CommitItemList logs;
	QList<Git::Diff> diff_result;

	QStringList added;
	QStringList remotes;
	QString current_remote_name;
	Git::Branch current_branch;
	unsigned int temp_file_counter = 0;

	std::string ssh_passphrase_user;
	std::string ssh_passphrase_pass;

	std::string http_uid;
	std::string http_pwd;

	std::map<QString, GitHubAPI::User> committer_map; // key is email

	PtyProcess pty_process;
	bool pty_process_ok = false;
	PtyCondition pty_condition = PtyCondition::None;

	WebContext webcx;

	AvatarLoader avatar_loader;
	int update_files_list_counter = 0;
	int update_commit_table_counter = 0;

	bool interaction_canceled = false;
	InteractionMode interaction_mode = InteractionMode::None;

	QString repository_filter_text;
	bool uncommited_changes = false;

	std::map<QString, QList<Git::Branch>> branch_map;
	std::map<QString, QList<Git::Tag>> tag_map;
	std::map<int, QList<Label>> label_map;
	std::map<QString, Git::Diff> diff_cache;
	GitObjectCache objcache;

	bool remote_changed = false;

	ServerType server_type = ServerType::Standard;
	GitHubRepositoryInfo github;

	QString head_id;
	bool force_fetch = false;

	RepositoryItem temp_repo_for_clone_complete;
	QVariant pty_process_completion_data;
	};

	BasicMainWindow::BasicMainWindow(QWidget *parent)
	: QMainWindow(parent)
	, m(new Private)
	{
	SettingsDialog::loadSettings(&m->appsettings);
	m->starting_dir = QDir::current().absolutePath();

	{ // load graphic resources
	QFileIconProvider icons;
	m->folder_icon = icons.icon(QFileIconProvider::Folder);
	m->repository_icon = QIcon(":/image/repository.png");
	m->signature_good_icon = QIcon(":/image/signature-good.png");
	m->signature_bad_icon = QIcon(":/image/signature-bad.png");
	m->signature_dubious_icon = QIcon(":/image/signature-dubious.png");
	m->transparent_pixmap = QPixmap(":/image/transparent.png");
	}
	}

	BasicMainWindow::~BasicMainWindow()
	{
	setRemoteMonitoringEnabled(false);
	deleteTempFiles();
	delete m;
	}

	ApplicationSettings *BasicMainWindow::appsettings()
	{
	return &m->appsettings;
	}

	const ApplicationSettings *BasicMainWindow::appsettings() const
	{
	return &m->appsettings;
	}

	WebContext *BasicMainWindow::webContext()
	{
	return &m->webcx;
	}

	QString BasicMainWindow::gitCommand() const
	{
	return m->gcx.git_command;
	}

	namespace {

	} // namespace

	bool BasicMainWindow::event(QEvent *event)
	{
	if (event->type() == (QEvent::Type)EventUserFunction) {
	if (auto e = (UserFunctionEvent )event) {
	e->func(e->var);
	return true;
	}
	}
	return QMainWindow::event(event);
	}

	void BasicMainWindow::postUserFunctionEvent(const std::function<void(QVariant const &)> &fn, QVariant const &v)
	{
	qApp->postEvent(this, new UserFunctionEvent(fn, v));
	}

	void BasicMainWindow::autoOpenRepository(QString dir)
	{
	auto Open = [&](RepositoryItem const &item){
	setCurrentRepository(item, true);
	openRepository(false, true);
	};

	RepositoryItem const *repo = findRegisteredRepository(&dir);
	if (repo) {
	Open(*repo);
	return;
	}

	RepositoryItem newitem;
	GitPtr g = git(dir);
	if (isValidWorkingCopy(g)) {
	ushort const *left = dir.utf16();
	ushort const *right = left + dir.size();
	if (right[-1] == '/' \|\| right[-1] == '\\') {
	right--;
	}
	ushort const *p = right;
	while (left + 1 < p && !(p[-1] == '/' \|\| p[-1] == '\\')) p--;
	if (p < right) {
	newitem.local_dir = dir;
	newitem.name = QString::fromUtf16(p, right - p);
	saveRepositoryBookmark(newitem);
	Open(newitem);
	return;
	}
	} else {
	DoYouWantToInitDialog dlg(this, dir);
	if (dlg.exec() == QDialog::Accepted) {
	createRepository(dir);
	}
	}
	}

	GitPtr BasicMainWindow::git(QString const &dir, QString const &sshkey) const
	{
	GitPtr g = std::make_shared<Git>(m->gcx, dir, sshkey);
	if (g && QFileInfo(g->gitCommand()).isExecutable()) {
	g->setLogCallback(git_callback, (void *)this);
	return g;
	} else {
	QString text = tr("git command not specified") + '\n';
	const_cast<BasicMainWindow *>(this)->writeLog(text);
	return GitPtr();
	}
	}

	GitPtr BasicMainWindow::git()
	{
	RepositoryItem const &item = currentRepository();
	// return git(currentWorkingCopyDir());
	return git(item.local_dir, item.ssh_key);
	}

	QPixmap BasicMainWindow::getTransparentPixmap()
	{
	return m->transparent_pixmap;
	}

	QIcon BasicMainWindow::committerIcon(int row) const
	{
	QIcon icon;
	if (isAvatarEnabled() && isOnlineMode()) {
	auto const &logs = getLogs();
	if (row >= 0 && row < (int)logs.size()) {
	Git::CommitItem const &commit = logs[row];
	if (commit.email.indexOf('@') > 0) {
	std::string email = commit.email.toStdString();
	icon = getAvatarLoader()->fetch(email, true); // from gavatar
	}
	}
	}
	return icon;
	}

	Git::CommitItem const *BasicMainWindow::commitItem(int row) const
	{
	auto const &logs = getLogs();
	if (row >= 0 && row < (int)logs.size()) {
	return &logs[row];
	}
	return nullptr;
	}

	QIcon BasicMainWindow::verifiedIcon(char s) const
	{
	Git::SignatureGrade g = Git::evaluateSignature(s);
	switch (g) {
	case Git::SignatureGrade::Good:
	return m->signature_good_icon;
	case Git::SignatureGrade::Bad:
	return m->signature_bad_icon;
	case Git::SignatureGrade::Unknown:
	case Git::SignatureGrade::Dubious:
	case Git::SignatureGrade::Missing:
	return m->signature_dubious_icon;
	}
	return QIcon();
	}

	QString BasicMainWindow::currentWorkingCopyDir() const
	{
	return m->current_repo.local_dir;
	}

	bool BasicMainWindow::isRepositoryOpened() const
	{
	return Git::isValidWorkingCopy(currentWorkingCopyDir());
	}

	QList<BasicMainWindow::Label> const *BasicMainWindow::label(int row) const
	{
	auto it = getLabelMap()->find(row);
	if (it != getLabelMap()->end()) {
	return &it->second;
	}
	return nullptr;
	}

	QList<BasicMainWindow::Label> BasicMainWindow::sortedLabels(int row) const
	{
	QList<BasicMainWindow::Label> list;
	auto const p = const_cast<BasicMainWindow >(this)->label(row);
	if (p && !p->empty()) {
	list = *p;
	std::sort(list.begin(), list.end(), [](BasicMainWindow::Label const &l, BasicMainWindow::Label const &r){
	auto Compare = [](BasicMainWindow::Label const &l, BasicMainWindow::Label const &r){
	if (l.kind < r.kind) return -1;
	if (l.kind > r.kind) return 1;
	if (l.text < r.text) return -1;
	if (l.text > r.text) return 1;
	return 0;
	};
	return Compare(l, r) < 0;
	});
	}
	return list;
	}

	bool BasicMainWindow::saveAs(QString const &id, QString const &dstpath)
	{
	if (id.startsWith(PATH_PREFIX)) {
	return saveFileAs(id.mid(1), dstpath);
	} else {
	return saveBlobAs(id, dstpath);
	}
	}

	bool BasicMainWindow::testRemoteRepositoryValidity(QString const &url, QString const &sshkey)
	{
	bool ok;
	{
	OverrideWaitCursor;
	ok = isValidRemoteURL(url, sshkey);
	}

	QString pass = tr("The URL is a valid repository");
	QString fail = tr("Failed to access the URL");

	QString text = "%1\n\n%2";
	text = text.arg(url).arg(ok ? pass : fail);

	QString title = tr("Remote Repository");

	if (ok) {
	QMessageBox::information(this, title, text);
	} else {
	QMessageBox::critical(this, title, text);
	}

	return ok;
	}

	void BasicMainWindow::addWorkingCopyDir(QString const &dir, bool open)
	{
	addWorkingCopyDir(dir, QString(), open);
	}

	bool BasicMainWindow::queryCommit(QString const &id, Git::CommitItem *out)
	{
	*out = Git::CommitItem();
	GitPtr g = git();
	return g->queryCommit(id, out);
	}

	QAction BasicMainWindow::addMenuActionProperty(QMenu menu)
	{
	return menu->addAction(tr("&Property"));
	}

	void BasicMainWindow::checkout(QWidget parent, Git::CommitItem const commit, std::function<void()> accepted_callback)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList tags;
	QStringList all_local_branches;
	QStringList local_branches;
	QStringList remote_branches;
	{
	NamedCommitList named_commits = namedCommitItems(Branches \| Tags \| Remotes);
	for (NamedCommitItem const &item : named_commits) {
	QString name = item.name;
	if (item.id == commit->commit_id) {
	if (item.type == NamedCommitItem::Type::Tag) {
	tags.push_back(name);
	} else if (item.type == NamedCommitItem::Type::BranchLocal \|\| item.type == NamedCommitItem::Type::BranchRemote) {
	int i = name.lastIndexOf('/');
	if (i < 0 && name == "HEAD") continue;
	if (i > 0 && name.mid(i + 1) == "HEAD") continue;
	if (item.type == NamedCommitItem::Type::BranchLocal) {
	local_branches.push_back(name);
	} else if (item.type == NamedCommitItem::Type::BranchRemote) {
	remote_branches.push_back(name);
	}
	}
	}
	if (item.type == NamedCommitItem::Type::BranchLocal) {
	all_local_branches.push_back(name);
	}
	}
	}

	CheckoutDialog dlg(parent, tags, all_local_branches, local_branches, remote_branches);
	if (dlg.exec() == QDialog::Accepted) {
	if (accepted_callback) {
	accepted_callback();
	}
	CheckoutDialog::Operation op = dlg.operation();
	QString name = dlg.branchName();
	QString id = commit->commit_id;
	if (id.isEmpty() && !commit->parent_ids.isEmpty()) {
	id = commit->parent_ids.front();
	}
	bool ok = false;
	setLogEnabled(g, true);
	if (op == CheckoutDialog::Operation::HeadDetached) {
	if (!id.isEmpty()) {
	ok = g->git(QString("checkout \"%1\"").arg(id), true);
	}
	} else if (op == CheckoutDialog::Operation::CreateLocalBranch) {
	if (!name.isEmpty() && !id.isEmpty()) {
	ok = g->git(QString("checkout -b \"%1\" \"%2\"").arg(name).arg(id), true);
	}
	} else if (op == CheckoutDialog::Operation::ExistingLocalBranch) {
	if (!name.isEmpty()) {
	ok = g->git(QString("checkout \"%1\"").arg(name), true);
	}
	}
	if (ok) {
	openRepository(true);
	}
	}
	}

	void BasicMainWindow::jumpToCommit(QString id)
	{
	GitPtr g = git();
	id = g->rev_parse(id);
	if (!id.isEmpty()) {
	int row = rowFromCommitId(id);
	setCurrentLogRow(row);
	}
	}

	void BasicMainWindow::execCommitViewWindow(Git::CommitItem const *commit)
	{
	CommitViewWindow win(this, commit);
	win.exec();
	}

	void BasicMainWindow::execCommitExploreWindow(QWidget parent, Git::CommitItem const commit)
	{
	CommitExploreWindow win(parent, this, getObjCache(), commit);
	win.exec();
	}

	void BasicMainWindow::execFileHistory(QString const &path)
	{
	if (path.isEmpty()) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	FileHistoryWindow dlg(this);
	dlg.prepare(g, path);
	dlg.exec();
	}

	void BasicMainWindow::execFilePropertyDialog(QListWidgetItem *item)
	{
	if (item) {
	QString path = getFilePath(item);
	QString id = getObjectID(item);
	FilePropertyDialog dlg(this);
	dlg.exec(this, path, id);
	}
	}

	QString BasicMainWindow::selectGitCommand(bool save)
	{
	char const *exe = GIT_COMMAND;

	QString path = gitCommand();

	auto fn = [&](QString const &path){
	setGitCommand(path, save);
	};

	QStringList list = whichCommand_(exe);
	#ifdef Q_OS_WIN
	{
	QStringList newlist;
	QString suffix1 = "\\bin\\" GIT_COMMAND;
	QString suffix2 = "\\cmd\\" GIT_COMMAND;
	for (QString const &s : list) {
	newlist.push_back(s);
	auto DoIt = [&](QString const &suffix){
	if (s.endsWith(suffix)) {
	QString t = s.mid(0, s.size() - suffix.size());
	QString t1 = t + "\\mingw64\\bin\\" GIT_COMMAND;
	if (misc::isExecutable(t1)) newlist.push_back(t1);
	QString t2 = t + "\\mingw\\bin\\" GIT_COMMAND;
	if (misc::isExecutable(t2)) newlist.push_back(t2);
	}
	};
	DoIt(suffix1);
	DoIt(suffix2);
	}
	std::sort(newlist.begin(), newlist.end());
	auto end = std::unique(newlist.begin(), newlist.end());
	list.clear();
	for (auto it = newlist.begin(); it != end; it++) {
	list.push_back(*it);
	}
	}
	#endif
	return selectCommand_("Git", exe, list, path, fn);
	}

	QString BasicMainWindow::selectFileCommand(bool save)
	{
	char const *exe = FILE_COMMAND;

	QString path = global->file_command;

	auto fn = [&](QString const &path){
	setFileCommand(path, save);
	};

	QStringList list = whichCommand_(exe);

	#ifdef Q_OS_WIN
	QString dir = misc::getApplicationDir();
	QString path1 = dir / FILE_COMMAND;
	QString path2;
	int i = dir.lastIndexOf('/');
	int j = dir.lastIndexOf('\\');
	if (i < j) i = j;
	if (i > 0) {
	path2 = dir.mid(0, i) / FILE_COMMAND;
	}
	path1 = misc::normalizePathSeparator(path1);
	path2 = misc::normalizePathSeparator(path2);
	if (misc::isExecutable(path1)) list.push_back(path1);
	if (misc::isExecutable(path2)) list.push_back(path2);
	#endif

	return selectCommand_("File", exe, list, path, fn);
	}

	QString BasicMainWindow::selectGpgCommand(bool save)
	{
	QString path = global->gpg_command;

	auto fn = [&](QString const &path){
	setGpgCommand(path, save);
	};

	QStringList list = whichCommand_(GPG_COMMAND, GPG2_COMMAND);

	QStringList cmdlist;
	cmdlist.push_back(GPG_COMMAND);
	cmdlist.push_back(GPG2_COMMAND);
	return selectCommand_("GPG", cmdlist, list, path, fn);
	}

	QString BasicMainWindow::selectSshCommand(bool save)
	{
	QString path = m->gcx.ssh_command;

	auto fn = [&](QString const &path){
	setSshCommand(path, save);
	};

	QStringList list = whichCommand_(SSH_COMMAND);

	QStringList cmdlist;
	cmdlist.push_back(SSH_COMMAND);
	return selectCommand_("ssh", cmdlist, list, path, fn);
	}

	Git::Branch const &BasicMainWindow::currentBranch() const
	{
	return m->current_branch;
	}

	void BasicMainWindow::setCurrentBranch(Git::Branch const &b)
	{
	m->current_branch = b;
	}

	RepositoryItem const &BasicMainWindow::currentRepository() const
	{
	return m->current_repo;
	}

	QString BasicMainWindow::currentRepositoryName() const
	{
	return currentRepository().name;
	}

	QString BasicMainWindow::currentRemoteName() const
	{
	return m->current_remote_name;
	}

	QString BasicMainWindow::currentBranchName() const
	{
	return currentBranch().name;
	}

	bool BasicMainWindow::isValidWorkingCopy(const GitPtr &g) const
	{
	return g && g->isValidWorkingCopy();
	}

	QString BasicMainWindow::determinFileType_(QString const &path, bool mime, std::function<void (QString const &, QByteArray *)> const &callback) const
	{
	const_cast<BasicMainWindow *>(this)->checkFileCommand();
	return misc::determinFileType(global->file_command, path, mime, callback);
	}

	QString BasicMainWindow::determinFileType(QString const &path, bool mime)
	{
	return determinFileType_(path, mime, [](QString const &cmd, QByteArray *ba){
	misc2::runCommand(cmd, ba);
	});
	}

	QString BasicMainWindow::determinFileType(QByteArray in, bool mime)
	{
	if (in.isEmpty()) return QString();

	if (in.size() > 10) {
	if (memcmp(in.data(), "\x1f\x8b\x08", 3) == 0) { // gzip
	QBuffer buf;
	MemoryReader reader(in.data(), in.size());
	reader.open(MemoryReader::ReadOnly);
	buf.open(QBuffer::WriteOnly);
	gunzip z;
	z.set_maximul_size(100000);
	z.decode(&reader, &buf);
	in = buf.buffer();
	}
	}

	// ファイル名を "-" にすると、リダイレクトで標準入力へ流し込める。
	return determinFileType_("-", mime, [&](QString const &cmd, QByteArray *ba){
	int r = misc2::runCommand(cmd, &in, ba);
	if (r != 0) {
	ba->clear();
	}
	});
	}

	QList<Git::Tag> BasicMainWindow::queryTagList()
	{
	QList<Git::Tag> list;
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && Git::isValidID(commit->commit_id)) {
	list = findTag(commit->commit_id);
	}
	return list;
	}

	int BasicMainWindow::limitLogCount() const
	{
	int n = appsettings()->maximum_number_of_commit_item_acquisitions;
	return (n >= 1 && n <= 100000) ? n : 10000;
	}

	TextEditorThemePtr BasicMainWindow::themeForTextEditor()
	{
	return global->theme->text_editor_theme;
	}

	Git::Object BasicMainWindow::cat_file_(GitPtr const &g, QString const &id)
	{
	if (isValidWorkingCopy(g)) {
	QString path_prefix = PATH_PREFIX;
	if (id.startsWith(path_prefix)) {
	QString path = g->workingRepositoryDir();
	path = path / id.mid(path_prefix.size());
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	Git::Object obj;
	obj.content = file.readAll();
	return obj;
	}
	} else if (Git::isValidID(id)) {
	return getObjCache()->catFile(id);;
	}
	}
	return Git::Object();
	}

	Git::Object BasicMainWindow::cat_file(QString const &id)
	{
	return cat_file_(git(), id);
	}

	QString BasicMainWindow::newTempFilePath()
	{
	QString tmpdir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
	QString path = tmpdir / tempfileHeader() + QString::number(m->temp_file_counter);
	m->temp_file_counter++;
	return path;
	}

	QString BasicMainWindow::findFileID(QString const &commit_id, QString const &file)
	{
	return lookupFileID(getObjCache(), commit_id, file);
	}

	void BasicMainWindow::updateFilesList(QString const &id, QList<Git::Diff> diff_list, QListWidget listwidget)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	listwidget->clear();

	auto AddItem = [&](QString const &filename, QString header, int idiff){
	if (header.isEmpty()) {
	header = "(??\?) "; // damn trigraph
	}
	QListWidgetItem *item = new QListWidgetItem(filename);
	item->setData(FilePathRole, filename);
	item->setData(DiffIndexRole, idiff);
	item->setData(HunkIndexRole, -1);
	item->setData(HeaderRole, header);
	listwidget->addItem(item);
	};

	GitDiff dm(getObjCache());
	if (!dm.diff(id, diff_list)) return;

	addDiffItems(diff_list, AddItem);
	}

	void BasicMainWindow::setAppSettings(const ApplicationSettings &appsettings)
	{
	m->appsettings = appsettings;
	}

	QPixmap BasicMainWindow::getTransparentPixmap() const
	{
	return m->transparent_pixmap;
	}

	QIcon BasicMainWindow::getSignatureBadIcon() const
	{
	return m->signature_bad_icon;
	}

	QIcon BasicMainWindow::getSignatureDubiousIcon() const
	{
	return m->signature_dubious_icon;
	}

	QIcon BasicMainWindow::getSignatureGoodIcon() const
	{
	return m->signature_good_icon;
	}

	QIcon BasicMainWindow::getFolderIcon() const
	{
	return m->folder_icon;
	}

	QIcon BasicMainWindow::getRepositoryIcon() const
	{
	return m->repository_icon;
	}

	const Git::CommitItemList &BasicMainWindow::getLogs() const
	{
	return m->logs;
	}

	Git::CommitItem const *BasicMainWindow::getLog(int index) const
	{
	return (index >= 0 && index < (int)m->logs.size()) ? &m->logs[index] : nullptr;
	}

	Git::CommitItemList *BasicMainWindow::getLogsPtr()
	{
	return &m->logs;
	}

	void BasicMainWindow::setLogs(const Git::CommitItemList &logs)
	{
	m->logs = logs;
	}

	void BasicMainWindow::clearLogs()
	{
	m->logs.clear();
	}

	BasicMainWindow::PtyCondition BasicMainWindow::getPtyCondition()
	{
	return m->pty_condition;
	}

	void BasicMainWindow::setPtyUserData(QVariant const &userdata)
	{
	m->pty_process.setVariant(userdata);
	}

	void BasicMainWindow::setPtyCondition(const PtyCondition &ptyCondition)
	{
	m->pty_condition = ptyCondition;
	}


	PtyProcess *BasicMainWindow::getPtyProcess()
	{
	return &m->pty_process;
	}

	bool BasicMainWindow::getPtyProcessOk() const
	{
	return m->pty_process_ok;
	}

	void BasicMainWindow::setPtyProcessOk(bool pty_process_ok)
	{
	m->pty_process_ok = pty_process_ok;
	}

	const QList<RepositoryItem> &BasicMainWindow::getRepos() const
	{
	return m->repos;
	}

	QList<RepositoryItem> *BasicMainWindow::getReposPtr()
	{
	return &m->repos;
	}

	void BasicMainWindow::setCurrentRemoteName(QString const &name)
	{
	m->current_remote_name = name;
	}

	AvatarLoader *BasicMainWindow::getAvatarLoader()
	{
	return &m->avatar_loader;
	}

	AvatarLoader const *BasicMainWindow::getAvatarLoader() const
	{
	return &m->avatar_loader;
	}

	int *BasicMainWindow::ptrUpdateFilesListCounter()
	{
	return &m->update_files_list_counter;
	}

	int *BasicMainWindow::ptrUpdateCommitTableCounter()
	{
	return &m->update_commit_table_counter;
	}

	bool BasicMainWindow::interactionCanceled() const
	{
	return m->interaction_canceled;
	}

	void BasicMainWindow::setInteractionCanceled(bool canceled)
	{
	m->interaction_canceled = canceled;
	}

	BasicMainWindow::InteractionMode BasicMainWindow::interactionMode() const
	{
	return m->interaction_mode;
	}

	void BasicMainWindow::setInteractionMode(const InteractionMode &im)
	{
	m->interaction_mode = im;
	}

	QString BasicMainWindow::getRepositoryFilterText() const
	{
	return m->repository_filter_text;
	}

	void BasicMainWindow::setRepositoryFilterText(QString const &text)
	{
	m->repository_filter_text = text;
	}

	void BasicMainWindow::setUncommitedChanges(bool uncommited_changes)
	{
	m->uncommited_changes = uncommited_changes;
	}

	QList<Git::Diff> *BasicMainWindow::diffResult()
	{
	return &m->diff_result;
	}

	std::map<QString, Git::Diff> *BasicMainWindow::getDiffCacheMap()
	{
	return &m->diff_cache;
	}

	bool BasicMainWindow::getRemoteChanged() const
	{
	return m->remote_changed;
	}

	void BasicMainWindow::setRemoteChanged(bool remote_changed)
	{
	m->remote_changed = remote_changed;
	}

	void BasicMainWindow::setServerType(const ServerType &server_type)
	{
	m->server_type = server_type;
	}

	GitHubRepositoryInfo *BasicMainWindow::ptrGitHub()
	{
	return &m->github;
	}

	std::map<int, QList<BasicMainWindow::Label>> *BasicMainWindow::getLabelMap()
	{
	return &m->label_map;
	}

	std::map<int, QList<BasicMainWindow::Label>> const *BasicMainWindow::getLabelMap() const
	{
	return &m->label_map;
	}

	void BasicMainWindow::clearLabelMap()
	{
	m->label_map.clear();
	}

	GitObjectCache *BasicMainWindow::getObjCache()
	{
	return &m->objcache;
	}

	bool BasicMainWindow::getForceFetch() const
	{
	return m->force_fetch;
	}

	void BasicMainWindow::setForceFetch(bool force_fetch)
	{
	m->force_fetch = force_fetch;
	}

	std::map<QString, QList<Git::Tag>> *BasicMainWindow::ptrTagMap()
	{
	return &m->tag_map;
	}

	QString BasicMainWindow::getHeadId() const
	{
	return m->head_id;
	}

	void BasicMainWindow::setHeadId(QString const &head_id)
	{
	m->head_id = head_id;
	}

	void BasicMainWindow::setPtyProcessCompletionData(QVariant const &value)
	{
	m->pty_process_completion_data = value;
	}

	QVariant const &BasicMainWindow::getTempRepoForCloneCompleteV() const
	{
	return m->pty_process_completion_data;
	}

	void BasicMainWindow::updateCommitGraph()
	{
	auto const &logs = getLogs();
	auto *logsp = getLogsPtr();


	const size_t LogCount = logs.size();
	// 樹形図情報を構築する
	if (LogCount > 0) {
	auto LogItem = [&](size_t i)->Git::CommitItem &{ return logsp->at(i); };
	enum { // 有向グラフを構築するあいだ CommitItem::marker_depth をフラグとして使用する
	UNKNOWN = 0,
	KNOWN = 1,
	};
	for (Git::CommitItem &item : *logsp) {
	item.marker_depth = UNKNOWN;
	}
	// コミットハッシュを検索して、親コミットのインデックスを求める
	for (size_t i = 0; i < LogCount; i++) {
	Git::CommitItem *item = &LogItem(i);
	item->parent_lines.clear();
	if (item->parent_ids.empty()) {
	item->resolved = true;
	} else {
	for (int j = 0; j < item->parent_ids.size(); j++) { // 親の数だけループ
	QString const &parent_id = item->parent_ids[j]; // 親のハッシュ値
	for (size_t k = i + 1; k < LogCount; k++) { // 親を探す
	if (LogItem(k).commit_id == parent_id) { // ハッシュ値が一致したらそれが親
	item->parent_lines.emplace_back(k); // インデックス値を記憶
	LogItem(k).has_child = true;
	LogItem(k).marker_depth = KNOWN;
	item->resolved = true;
	break;
	}
	}
	}
	}
	}
	std::vector<Element> elements; // 線分リスト
	{ // 線分リストを作成する
	std::deque<Task> tasks; // 未処理タスクリスト
	{
	for (size_t i = 0; i < LogCount; i++) {
	Git::CommitItem *item = &LogItem(i);
	if (item->marker_depth == UNKNOWN) {
	int n = item->parent_lines.size(); // 最初のコミットアイテム
	for (int j = 0; j < n; j++) {
	tasks.emplace_back(i, j); // タスクを追加
	}
	}
	item->marker_depth = UNKNOWN;
	}
	}
	while (!tasks.empty()) { // タスクが残っているならループ
	Element e;
	Task task;
	{ // 最初のタスクを取り出す
	task = tasks.front();
	tasks.pop_front();
	}
	e.indexes.push_back(task.index); // 先頭のインデックスを追加
	int index = LogItem(task.index).parent_lines[task.parent].index; // 開始インデックス
	while (index > 0 && (size_t)index < LogCount) { // 最後に到達するまでループ
	e.indexes.push_back(index); // インデックスを追加
	int n = LogItem(index).parent_lines.size(); // 親の数
	if (n == 0) break; // 親がないなら終了
	Git::CommitItem *item = &LogItem(index);
	if (item->marker_depth == KNOWN) break; // 既知のアイテムに到達したら終了
	item->marker_depth = KNOWN; // 既知のアイテムにする
	for (int i = 1; i < n; i++) {
	tasks.emplace_back(index, i); // タスク追加
	}
	index = LogItem(index).parent_lines[0].index; // 次の親（親リストの先頭の要素）
	}
	if (e.indexes.size() >= 2) {
	elements.push_back(e);
	}
	}
	}
	// 線情報をクリア
	for (Git::CommitItem &item : *logsp) {
	item.marker_depth = -1;
	item.parent_lines.clear();
	}
	// マークと線の深さを決める
	if (!elements.empty()) {
	{ // 優先順位を調整する
	std::sort(elements.begin(), elements.end(), [](Element const &left, Element const &right){
	int i = 0;
	{ // 長いものを優先して左へ
	int l = left.indexes.back() - left.indexes.front();
	int r = right.indexes.back() - right.indexes.front();
	i = r - l; // 降順
	}
	if (i == 0) {
	// コミットが新しいものを優先して左へ
	int l = left.indexes.front();
	int r = right.indexes.front();
	i = l - r; // 昇順
	}
	return i < 0;
	});
	// 子の無いブランチ（タグ等）が複数連続しているとき、古いコミットを右に寄せる
	{
	for (size_t i = 0; i + 1 < elements.size(); i++) {
	Element *e = &elements[i];
	int index1 = e->indexes.front();
	if (index1 > 0 && !LogItem(index1).has_child) { // 子がない
	// 新しいコミットを探す
	for (size_t j = i + 1; j < elements.size(); j++) { // 現在位置より後ろを探す
	Element *f = &elements[j];
	int index2 = f->indexes.front();
	if (index1 == index2 + 1) { // 一つだけ新しいコミット
	Element t = std::move(*f);
	elements.erase(elements.begin() + j); // 移動元を削除
	elements.insert(elements.begin() + i, std::move(t)); // 現在位置に挿入
	}
	}
	// 古いコミットを探す
	size_t j = 0;
	while (j < i) { // 現在位置より前を探す
	Element *f = &elements[j];
	int index2 = f->indexes.front();
	if (index1 + 1 == index2) { // 一つだけ古いコミット
	Element t = std::move(*f);
	elements.erase(elements.begin() + j); // 移動元を削除
	elements.insert(elements.begin() + i, std::move(t)); // 現在位置の次に挿入
	index1 = index2;
	f = e;
	} else {
	j++;
	}
	}
	}
	}
	}
	}
	{ // 最初の線は深さを0にする
	Element *e = &elements.front();
	for (size_t i = 0; i < e->indexes.size(); i++) {
	int index = e->indexes[i];
	LogItem(index).marker_depth = 0; // マークの深さを設定
	e->depth = 0; // 線の深さを設定
	}
	}
	// 最初以外の線分の深さを決める
	for (size_t i = 1; i < elements.size(); i++) { // 最初以外をループ
	Element *e = &elements[i];
	int depth = 1;
	while (1) { // 失敗したら繰り返し
	for (size_t j = 0; j < i; j++) { // 既に処理済みの線を調べる
	Element const *f = &elements[j]; // 検査対象
	if (e->indexes.size() == 2) { // 二つしかない場合
	int from = e->indexes[0]; // 始点
	int to = e->indexes[1]; // 終点
	if (LogItem(from).has_child) {
	for (size_t k = 0; k + 1 < f->indexes.size(); k++) { // 検査対象の全ての線分を調べる
	int curr = f->indexes[k];
	int next = f->indexes[k + 1];
	if (from > curr && to == next) { // 決定済みの線に直結できるか判定
	e->indexes.back() = from + 1; // 現在の一行下に直結する
	e->depth = elements[j].depth; // 接続先の深さ
	goto DONE; // 決定
	}
	}
	}
	}
	if (depth == f->depth) { // 同じ深さ
	if (e->indexes.back() > f->indexes.front() && e->indexes.front() < f->indexes.back()) { // 重なっている
	goto FAIL; // この深さには線を置けないのでやりなおし
	}
	}
	}
	for (size_t j = 0; j < e->indexes.size(); j++) {
	int index = e->indexes[j];
	Git::CommitItem *item = &LogItem(index);
	if (j == 0 && item->has_child) { // 最初のポイントで子がある場合
	// nop
	} else if ((j > 0 && j + 1 < e->indexes.size()) \|\| item->marker_depth < 0) { // 最初と最後以外、または、未確定の場合
	item->marker_depth = depth; // マークの深さを設定
	}
	}
	e->depth = depth; // 深さを決定
	goto DONE; // 決定
	FAIL:;
	depth++; // 一段深くして再挑戦
	}
	DONE:;
	}
	// 線情報を生成する
	for (auto &e : elements) {
	auto ColorNumber = [&](){ return e.depth; };
	size_t count = e.indexes.size();
	for (size_t i = 0; i + 1 < count; i++) {
	int curr = e.indexes[i];
	int next = e.indexes[i + 1];
	TreeLine line(next, e.depth);
	line.color_number = ColorNumber();
	line.bend_early = (i + 2 < count \|\| !LogItem(next).resolved);
	if (i + 2 == count) {
	int join = false;
	if (count > 2) { // 直結ではない
	join = true;
	} else if (!LogItem(curr).has_child) { // 子がない
	join = true;
	int d = LogItem(curr).marker_depth; // 開始点の深さ
	for (int j = curr + 1; j < next; j++) {
	Git::CommitItem *item = &LogItem(j);
	if (item->marker_depth == d) { // 衝突する
	join = false; // 迂回する
	break;
	}
	}
	}
	if (join) {
	line.depth = LogItem(next).marker_depth; // 合流する先のアイテムの深さと同じにする
	}
	}
	LogItem(curr).parent_lines.push_back(line); // 線を追加
	}
	}
	} else {
	if (LogCount == 1) { // コミットが一つだけ
	LogItem(0).marker_depth = 0;
	}
	}
	}
	}

	bool BasicMainWindow::fetch(GitPtr const &g, bool prune)
	{
	setPtyCondition(PtyCondition::Fetch);
	setPtyProcessOk(true);
	g->fetch(getPtyProcess(), prune);
	while (1) {
	if (getPtyProcess()->wait(1)) break;
	QApplication::processEvents();
	}
	return getPtyProcessOk();
	}

	bool BasicMainWindow::fetch_tags_f(GitPtr const &g)
	{
	setPtyCondition(PtyCondition::Fetch);
	setPtyProcessOk(true);
	g->fetch_tags_f(getPtyProcess());
	while (1) {
	if (getPtyProcess()->wait(1)) break;
	QApplication::processEvents();
	}
	return getPtyProcessOk();
	}

	bool BasicMainWindow::git_callback(void cookie, const char ptr, int len)
	{
	auto mw = (BasicMainWindow )cookie;
	mw->emitWriteLog(QByteArray(ptr, len));
	return true;
	}

	QString BasicMainWindow::selectCommand_(QString const &cmdname, QStringList const &cmdfiles, QStringList const &list, QString path, std::function<void (QString const &)> const &callback)
	{
	QString window_title = tr("Select %1 command");
	window_title = window_title.arg(cmdfiles.front());

	SelectCommandDialog dlg(this, cmdname, cmdfiles, path, list);
	dlg.setWindowTitle(window_title);
	if (dlg.exec() == QDialog::Accepted) {
	path = dlg.selectedFile();
	path = misc::normalizePathSeparator(path);
	QFileInfo info(path);
	if (info.isExecutable()) {
	callback(path);
	return path;
	}
	}
	return QString();
	}

	QString BasicMainWindow::selectCommand_(QString const &cmdname, QString const &cmdfile, QStringList const &list, QString const &path, std::function<void (QString const &)> const &callback)
	{
	QStringList cmdfiles;
	cmdfiles.push_back(cmdfile);
	return selectCommand_(cmdname, cmdfiles, list, path, callback);
	}

	bool BasicMainWindow::checkGitCommand()
	{
	while (1) {
	if (misc::isExecutable(gitCommand())) {
	return true;
	}
	if (selectGitCommand(true).isEmpty()) {
	close();
	return false;
	}
	}
	}

	bool BasicMainWindow::checkFileCommand()
	{
	while (1) {
	if (misc::isExecutable(global->file_command)) {
	return true;
	}
	if (selectFileCommand(true).isEmpty()) {
	close();
	return false;
	}
	}
	}

	bool BasicMainWindow::checkExecutable(QString const &path)
	{
	if (QFileInfo(path).isExecutable()) {
	return true;
	}
	QString text = "The specified program '%1' is not executable.\n";
	text = text.arg(path);
	writeLog(text);
	return false;
	}

	void BasicMainWindow::internalSetCommand(QString const &path, bool save, QString const &name, QString *out)
	{
	if (!path.isEmpty() && checkExecutable(path)) {
	if (save) {
	MySettings s;
	s.beginGroup("Global");
	s.setValue(name, path);
	s.endGroup();
	}
	*out = path;
	} else {
	*out = QString();
	}
	}

	QStringList BasicMainWindow::whichCommand_(QString const &cmdfile1, QString const &cmdfile2)
	{
	QStringList list;

	if (!cmdfile1.isEmpty()){
	std::vector<std::string> vec;
	FileUtil::qwhich(cmdfile1.toStdString(), &vec);
	for (std::string const &s : vec) {
	list.push_back(QString::fromStdString(s));
	}
	}
	if (!cmdfile2.isEmpty()){
	std::vector<std::string> vec;
	FileUtil::qwhich(cmdfile2.toStdString(), &vec);
	for (std::string const &s : vec) {
	list.push_back(QString::fromStdString(s));
	}
	}

	return list;
	}

	void BasicMainWindow::setWindowTitle_(Git::User const &user)
	{
	if (user.name.isEmpty() && user.email.isEmpty()) {
	setWindowTitle(qApp->applicationName());
	} else {
	setWindowTitle(QString("%1 : %2 <%3>")
	.arg(qApp->applicationName())
	.arg(user.name)
	.arg(user.email)
	);
	}
	}

	bool BasicMainWindow::execSetGlobalUserDialog()
	{
	SetGlobalUserDialog dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	GitPtr g = git();
	Git::User user = dlg.user();
	g->setUser(user, true);
	updateWindowTitle(g);
	return true;
	}
	return false;
	}

	bool BasicMainWindow::saveByteArrayAs(const QByteArray &ba, QString const &dstpath)
	{
	QFile file(dstpath);
	if (file.open(QFile::WriteOnly)) {
	file.write(ba);
	file.close();
	return true;
	}
	QString msg = "Failed to open the file '%1' for write";
	msg = msg.arg(dstpath);
	qDebug() << msg;
	return false;
	}

	bool BasicMainWindow::saveFileAs(QString const &srcpath, QString const &dstpath)
	{
	QFile f(srcpath);
	if (f.open(QFile::ReadOnly)) {
	QByteArray ba = f.readAll();
	if (saveByteArrayAs(ba, dstpath)) {
	return true;
	}
	} else {
	QString msg = "Failed to open the file '%1' for read";
	msg = msg.arg(srcpath);
	qDebug() << msg;
	}
	return false;
	}

	bool BasicMainWindow::saveBlobAs(QString const &id, QString const &dstpath)
	{
	Git::Object obj = cat_file(id);
	if (!obj.content.isEmpty()) {
	if (saveByteArrayAs(obj.content, dstpath)) {
	return true;
	}
	} else {
	QString msg = "Failed to get the content of the object '%1'";
	msg = msg.arg(id);
	qDebug() << msg;
	}
	return false;
	}

	void BasicMainWindow::revertAllFiles()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QString cmd = "git reset --hard HEAD";
	if (askAreYouSureYouWantToRun(tr("Revert all files"), "> " + cmd)) {
	g->resetAllFiles();
	openRepository(true);
	}
	}

	void BasicMainWindow::deleteTags(Git::CommitItem const &commit)
	{
	auto it = ptrTagMap()->find(commit.commit_id);
	if (it != ptrTagMap()->end()) {
	QStringList names;
	QList<Git::Tag> const &tags = it->second;
	for (Git::Tag const &tag : tags) {
	names.push_back(tag.name);
	}
	deleteTags(names);
	}
	}

	bool BasicMainWindow::isAvatarEnabled() const
	{
	return appsettings()->get_committer_icon;
	}

	bool BasicMainWindow::isGitHub() const
	{
	return m->server_type == ServerType::GitHub;
	}

	QStringList BasicMainWindow::remotes() const
	{
	return m->remotes;
	}

	QList<Git::Branch> BasicMainWindow::findBranch(QString const &id)
	{
	auto it = branchMapRef().find(id);
	if (it != branchMapRef().end()) {
	return it->second;
	}
	return QList<Git::Branch>();
	}

	QString BasicMainWindow::saveAsTemp(QString const &id)
	{
	QString path = newTempFilePath();
	saveAs(id, path);
	return path;
	}

	QString BasicMainWindow::tempfileHeader() const
	{
	QString name = "jp_soramimi_Guitar_%1_";
	return name.arg(QApplication::applicationPid());
	}

	void BasicMainWindow::deleteTempFiles()
	{
	QString dir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
	QString name = tempfileHeader();
	QDirIterator it(dir, { name + "*" });
	while (it.hasNext()) {
	QString path = it.next();
	QFile::remove(path);
	}
	}

	QString BasicMainWindow::getCommitIdFromTag(QString const &tag)
	{
	return getObjCache()->getCommitIdFromTag(tag);
	}

	bool BasicMainWindow::isValidRemoteURL(QString const &url, QString const &sshkey)
	{
	if (url.indexOf('\"') >= 0) {
	return false;
	}
	stopPtyProcess();
	GitPtr g = git(QString(), sshkey);
	QString cmd = "ls-remote \"%1\" HEAD";
	cmd = cmd.arg(url);
	bool f = g->git(cmd, false, false, getPtyProcess());
	{
	QTime time;
	time.start();
	while (!getPtyProcess()->wait(10)) {
	if (time.elapsed() > 10000) {
	f = false;
	break;
	}
	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
	}
	stopPtyProcess();
	}
	if (f) {
	f = (getPtyProcess()->getExitCode() == 0);
	}
	QString line;
	{
	std::vector<char> v;
	getPtyProcess()->readResult(&v);
	if (!v.empty()) {
	line = QString::fromUtf8(&v[0], v.size()).trimmed();
	}
	}
	if (f) {
	qDebug() << "This is a valid repository.";
	int i = -1;
	for (int j = 0; j < line.size(); j++) {
	ushort c = line.utf16()[j];
	if (QChar(c).isSpace()) {
	i = j;
	break;
	}
	}
	QString head;
	if (i == GIT_ID_LENGTH) {
	QString id = line.mid(0, i);
	QString name = line.mid(i + 1).trimmed();
	qDebug() << id << name;
	if (name == "HEAD" && Git::isValidID(id)) {
	head = id;
	}
	}
	if (head.isEmpty()) {
	qDebug() << "But HEAD not found";
	}
	return true;
	}
	qDebug() << "This is not a repository.";
	return false;
	}

	QString BasicMainWindow::getObjectID(QListWidgetItem *item)
	{
	int i = indexOfDiff(item);
	if (i >= 0 && i < diffResult()->size()) {
	Git::Diff const &diff = diffResult()->at(i);
	return diff.blob.a_id;
	}
	return QString();
	}

	void BasicMainWindow::addWorkingCopyDir(QString dir, QString name, bool open)
	{
	if (dir.endsWith(".git")) {
	int i = dir.size();
	if (i > 4) {
	ushort c = dir.utf16()[i - 5];
	if (c == '/' \|\| c == '\\') {
	dir = dir.mid(0, i - 5);
	}
	}
	}

	if (!Git::isValidWorkingCopy(dir)) {
	if (QFileInfo(dir).isDir()) {
	QString text;
	text += tr("The folder is not a valid git repository.") + '\n';
	text += '\n';
	text += dir + '\n';
	text += '\n';
	text += tr("Do you want to initialize it as a git repository ?") + '\n';
	int r = QMessageBox::information(this, tr("Initialize Repository") , text, QMessageBox::Yes, QMessageBox::No);
	if (r == QMessageBox::Yes) {
	createRepository(dir);
	}
	}
	return;
	}

	if (name.isEmpty()) {
	name = makeRepositoryName(dir);
	}

	RepositoryItem item;
	item.local_dir = dir;
	item.name = name;
	saveRepositoryBookmark(item);

	if (open) {
	setCurrentRepository(item, true);
	GitPtr g = git(item.local_dir);
	openRepository_(g);
	}
	}

	QString BasicMainWindow::makeRepositoryName(QString const &loc)
	{
	int i = loc.lastIndexOf('/');
	int j = loc.lastIndexOf('\\');
	if (i < j) i = j;
	if (i >= 0) {
	i++;
	j = loc.size();
	if (loc.endsWith(".git")) {
	j -= 4;
	}
	return loc.mid(i, j - i);
	}
	return QString();
	}

	void BasicMainWindow::clearAuthentication()
	{
	clearSshAuthentication();
	m->http_uid.clear();
	m->http_pwd.clear();
	}

	void BasicMainWindow::onAvatarUpdated()
	{
	updateCommitTableLater();
	}

	QStringList BasicMainWindow::findGitObject(const QString &id) const
	{
	QStringList list;
	std::set<QString> set;
	if (Git::isValidID(id)) {
	{
	QString a = id.mid(0, 2);
	QString b = id.mid(2);
	QString dir = m->current_repo.local_dir / ".git/objects" / a;
	QDirIterator it(dir);
	while (it.hasNext()) {
	it.next();
	QFileInfo info = it.fileInfo();
	if (info.isFile()) {
	QString c = info.fileName();
	if (c.startsWith(b)) {
	set.insert(set.end(), a + c);
	}
	}
	}
	}
	{
	QString dir = m->current_repo.local_dir / ".git/objects/pack";
	QDirIterator it(dir);
	while (it.hasNext()) {
	it.next();
	QFileInfo info = it.fileInfo();
	if (info.isFile() && info.fileName().startsWith("pack-") && info.fileName().endsWith(".idx")) {
	GitPackIdxV2 idx;
	idx.parse(info.absoluteFilePath());
	idx.each([&](GitPackIdxItem const *item){
	if (item->id.startsWith(id)) {
	set.insert(item->id);
	}
	return true;
	});
	}
	}
	}
	for (QString const &s : set) {
	list.push_back(s);
	}
	}
	return list;
	}

	void BasicMainWindow::writeLog(const char *ptr, int len)
	{
	internalWriteLog(ptr, len);
	}

	void BasicMainWindow::writeLog(const QString &str)
	{
	std::string s = str.toStdString();
	writeLog(s.c_str(), s.size());
	}

	void BasicMainWindow::emitWriteLog(QByteArray const &ba)
	{
	emit signalWriteLog(ba);
	}

	void BasicMainWindow::writeLog_(QByteArray ba)
	{
	if (!ba.isEmpty()) {
	writeLog(ba.data(), ba.size());
	}
	}

	void BasicMainWindow::queryRemotes(GitPtr const &g)
	{
	if (!g) return;
	m->remotes = g->getRemotes();
	std::sort(m->remotes.begin(), m->remotes.end());
	}

	void BasicMainWindow::msgNoRepositorySelected()
	{
	QMessageBox::warning(this, qApp->applicationName(), tr("No repository selected"));
	}

	bool BasicMainWindow::runOnRepositoryDir(std::function<void (QString)> const &callback, RepositoryItem const *repo)
	{
	if (!repo) {
	repo = &m->current_repo;
	}
	QString dir = repo->local_dir;
	dir.replace('\\', '/');
	if (QFileInfo(dir).isDir()) {
	callback(dir);
	return true;
	}
	msgNoRepositorySelected();
	return false;
	}

	void BasicMainWindow::clearSshAuthentication()
	{
	m->ssh_passphrase_user.clear();
	m->ssh_passphrase_pass.clear();
	}



	QString BasicMainWindow::getFilePath(QListWidgetItem *item)
	{
	if (!item) return QString();
	return item->data(FilePathRole).toString();
	}

	bool BasicMainWindow::isGroupItem(QTreeWidgetItem *item)
	{
	if (item) {
	int index = item->data(0, IndexRole).toInt();
	if (index == GroupItem) {
	return true;
	}
	}
	return false;
	}

	int BasicMainWindow::indexOfLog(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(IndexRole).toInt();
	}

	int BasicMainWindow::indexOfDiff(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(DiffIndexRole).toInt();
	}

	int BasicMainWindow::getHunkIndex(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(HunkIndexRole).toInt();
	}

	void BasicMainWindow::initNetworking()
	{
	std::string http_proxy;
	std::string https_proxy;
	if (appsettings()->proxy_type == "auto") {
	#ifdef Q_OS_WIN
	http_proxy = misc::makeProxyServerURL(getWin32HttpProxy().toStdString());
	#else
	auto getienv = [](std::string const &name)->char const *{
	char **p = environ;
	while (*p) {
	if (strncasecmp(*p, name.c_str(), name.size()) == 0) {
	char const e = p + name.size();
	if (*e == '=') {
	return e + 1;
	}
	}
	p++;
	}
	return nullptr;
	};
	char const *p;
	p = getienv("http_proxy");
	if (p) {
	http_proxy = misc::makeProxyServerURL(std::string(p));
	}
	p = getienv("https_proxy");
	if (p) {
	https_proxy = misc::makeProxyServerURL(std::string(p));
	}
	#endif
	} else if (appsettings()->proxy_type == "manual") {
	http_proxy = appsettings()->proxy_server.toStdString();
	}
	webContext()->set_http_proxy(http_proxy);
	webContext()->set_https_proxy(https_proxy);
	}

	QString BasicMainWindow::abbrevCommitID(Git::CommitItem const &commit)
	{
	return commit.commit_id.mid(0, 7);
	}

	bool BasicMainWindow::saveRepositoryBookmarks() const
	{
	QString path = getBookmarksFilePath();
	return RepositoryBookmark::save(path, &getRepos());
	}

	QString BasicMainWindow::getBookmarksFilePath() const
	{
	return global->app_config_dir / "bookmarks.xml";
	}

	void BasicMainWindow::stopPtyProcess()
	{
	getPtyProcess()->stop();
	QDir::setCurrent(m->starting_dir);
	}

	void BasicMainWindow::abortPtyProcess()
	{
	stopPtyProcess();
	setPtyProcessOk(false);
	setInteractionCanceled(true);
	}

	+void BasicMainWindow::saveApplicationSettings()
	+{
	+ SettingsDialog::saveSettings(&m->appsettings);
	+}
	+
	bool BasicMainWindow::execWelcomeWizardDialog()
	{
	WelcomeWizardDialog dlg(this);
	dlg.set_git_command_path(appsettings()->git_command);
	dlg.set_file_command_path(appsettings()->file_command);
	dlg.set_default_working_folder(appsettings()->default_working_dir);
	if (misc::isExecutable(appsettings()->git_command)) {
	gitCommand() = appsettings()->git_command;
	Git g(m->gcx, {}, {});
	Git::User user = g.getUser(Git::Source::Global);
	dlg.set_user_name(user.name);
	dlg.set_user_email(user.email);
	}
	if (dlg.exec() == QDialog::Accepted) {
	appsettings()->git_command = gitCommand() = dlg.git_command_path();
	appsettings()->file_command = global->file_command = dlg.file_command_path();
	appsettings()->default_working_dir = dlg.default_working_folder();
	- SettingsDialog::saveSettings(&m->appsettings);
	+ saveApplicationSettings();

	if (misc::isExecutable(appsettings()->git_command)) {
	GitPtr g = git();
	Git::User user;
	user.name = dlg.user_name();
	user.email = dlg.user_email();
	g->setUser(user, true);
	}

	return true;
	}
	return false;
	}

	void BasicMainWindow::execRepositoryPropertyDialog(RepositoryItem const &repo, bool open_repository_menu)
	{
	QString workdir = repo.local_dir;

	if (workdir.isEmpty()) {
	workdir = currentWorkingCopyDir();
	}
	QString name = repo.name;
	if (name.isEmpty()) {
	name = makeRepositoryName(workdir);
	}
	GitPtr g = git(workdir, repo.ssh_key);
	RepositoryPropertyDialog dlg(this, &m->gcx, g, repo, open_repository_menu);
	dlg.exec();
	if (dlg.isRemoteChanged()) {
	emit remoteInfoChanged();
	}
	}

	void BasicMainWindow::execSetUserDialog(Git::User const &global_user, Git::User const &repo_user, QString const &reponame)
	{
	SetUserDialog dlg(this, global_user, repo_user, reponame);
	if (dlg.exec() == QDialog::Accepted) {
	GitPtr g = git();
	Git::User user = dlg.user();
	if (dlg.isGlobalChecked()) {
	g->setUser(user, true);
	}
	if (dlg.isRepositoryChecked()) {
	g->setUser(user, false);
	}
	updateWindowTitle(g);
	}
	}

	void BasicMainWindow::setGitCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "GitCommand", &m->gcx.git_command);
	}

	void BasicMainWindow::setFileCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "FileCommand", &global->file_command);
	}

	void BasicMainWindow::setGpgCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "GpgCommand", &global->gpg_command);
	if (!global->gpg_command.isEmpty()) {
	GitPtr g = git();
	g->configGpgProgram(global->gpg_command, true);
	}
	}

	void BasicMainWindow::setSshCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "SshCommand", &m->gcx.ssh_command);
	}

	void BasicMainWindow::logGitVersion()
	{
	GitPtr g = git();
	QString s = g->version();
	if (!s.isEmpty()) {
	s += '\n';
	writeLog(s);
	}
	}

	void BasicMainWindow::setUnknownRepositoryInfo()
	{
	setRepositoryInfo("---", "");

	Git g(m->gcx, {}, {});
	Git::User user = g.getUser(Git::Source::Global);
	setWindowTitle_(user);
	}

	void BasicMainWindow::internalClearRepositoryInfo()
	{
	setHeadId(QString());
	setCurrentBranch(Git::Branch());
	setServerType(ServerType::Standard);
	m->github = GitHubRepositoryInfo();
	}

	void BasicMainWindow::checkUser()
	{
	Git g(m->gcx, {}, {});
	while (1) {
	Git::User user = g.getUser(Git::Source::Global);
	if (!user.name.isEmpty() && !user.email.isEmpty()) {
	return; // ok
	}
	if (!execSetGlobalUserDialog()) {
	return;
	}
	}
	}

	void BasicMainWindow::openRepository(bool validate, bool waitcursor, bool keep_selection)
	{
	if (validate) {
	QString dir = currentWorkingCopyDir();
	if (!QFileInfo(dir).isDir()) {
	int r = QMessageBox::warning(this, tr("Open Repository"), dir + "\n\n" + tr("No such folder") + "\n\n" + tr("Remove from bookmark ?"), QMessageBox::Ok, QMessageBox::Cancel);
	if (r == QMessageBox::Ok) {
	removeSelectedRepositoryFromBookmark(false);
	}
	return;
	}
	if (!Git::isValidWorkingCopy(dir)) {
	QMessageBox::warning(this, tr("Open Repository"), tr("Not a valid git repository") + "\n\n" + dir);
	return;
	}
	}

	if (waitcursor) {
	OverrideWaitCursor;
	openRepository(false, false, keep_selection);
	return;
	}

	GitPtr g = git(); // ポインタの有効性チェックはしない（nullptrでも続行）
	openRepository_(g, keep_selection);
	}

	void BasicMainWindow::updateRepository()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	OverrideWaitCursor;
	openRepository_(g);
	}

	void BasicMainWindow::reopenRepository(bool log, std::function<void(GitPtr const &)> const &callback)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	setRemoteMonitoringEnabled(false);

	OverrideWaitCursor;
	if (log) {
	setLogEnabled(g, true);
	AsyncExecGitThread_ th(g, callback);
	th.start();
	while (1) {
	if (th.wait(1)) break;
	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
	}
	setLogEnabled(g, false);
	} else {
	callback(g);
	}
	openRepository_(g);

	setRemoteMonitoringEnabled(true);
	}

	void BasicMainWindow::openSelectedRepository()
	{
	RepositoryItem const *repo = selectedRepositoryItem();
	if (repo) {
	setCurrentRepository(*repo, true);
	openRepository(true);
	}
	}

	//void BasicMainWindow::checkRemoteUpdate()
	//{
	// if (getPtyProcess()->isRunning()) return;

	// emit signalCheckRemoteUpdate();
	//}

	bool BasicMainWindow::isThereUncommitedChanges() const
	{
	return m->uncommited_changes;
	}

	bool BasicMainWindow::makeDiff(QString id, QList<Git::Diff> *out)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;

	Git::FileStatusList list = g->status_s();
	setUncommitedChanges(!list.empty());

	if (id.isEmpty() && !isThereUncommitedChanges()) {
	id = getObjCache()->revParse("HEAD");
	}

	bool uncommited = (id.isEmpty() && isThereUncommitedChanges());

	GitDiff dm(getObjCache());
	if (uncommited) {
	dm.diff_uncommited(out);
	} else {
	dm.diff(id, out);
	}

	return true; // success
	}

	void BasicMainWindow::addDiffItems(const QList<Git::Diff> *diff_list, const std::function<void (QString const &, QString, int)> &add_item)
	{
	for (int idiff = 0; idiff < diff_list->size(); idiff++) {
	Git::Diff const &diff = diff_list->at(idiff);
	QString header;

	switch (diff.type) {
	case Git::Diff::Type::Modify: header = "(chg) "; break;
	case Git::Diff::Type::Copy: header = "(cpy) "; break;
	case Git::Diff::Type::Rename: header = "(ren) "; break;
	case Git::Diff::Type::Create: header = "(add) "; break;
	case Git::Diff::Type::Delete: header = "(del) "; break;
	case Git::Diff::Type::ChType: header = "(chg) "; break;
	case Git::Diff::Type::Unmerged: header = "(unmerged) "; break;
	}

	add_item(diff.path, header, idiff);
	}
	}

	Git::CommitItemList BasicMainWindow::retrieveCommitLog(GitPtr const &g)
	{
	Git::CommitItemList list = g->log(limitLogCount());

	// 親子関係を調べて、順番が狂っていたら、修正する。

	std::set<QString> set;

	const size_t count = list.size();
	size_t limit = count;

	size_t i = 0;
	while (i < count) {
	size_t newpos = -1;
	for (QString const &parent : list[i].parent_ids) {
	if (set.find(parent) != set.end()) {
	for (size_t j = 0; j < i; j++) {
	if (parent == list[j].commit_id) {
	if (newpos == (size_t)-1 \|\| j < newpos) {
	newpos = j;
	}
	qDebug() << "fix commit order" << list[i].commit_id;
	break;
	}
	}
	}
	}
	set.insert(set.end(), list[i].commit_id);
	if (newpos != (size_t)-1) {
	if (limit == 0) break; // まず無いと思うが、もし、無限ループに陥ったら
	Git::CommitItem t = list[i];
	t.strange_date = true;
	list.erase(list.begin() + i);
	list.insert(list.begin() + newpos, t);
	i = newpos;
	limit--;
	}
	i++;
	}

	return list;
	}

	void BasicMainWindow::queryBranches(GitPtr const &g)
	{
	Q_ASSERT(g);
	m->branch_map.clear();
	QList<Git::Branch> branches = g->branches();
	for (Git::Branch const &b : branches) {
	if (b.isCurrent()) {
	setCurrentBranch(b);
	}
	branchMapRef()[b.id].append(b);
	}
	}

	std::map<QString, QList<Git::Branch>> &BasicMainWindow::branchMapRef()
	{
	return m->branch_map;
	}

	void BasicMainWindow::updateCommitTableLater()
	{
	*ptrUpdateCommitTableCounter() = 200;
	}

	void BasicMainWindow::updateRemoteInfo()
	{
	queryRemotes(git());

	m->current_remote_name = QString();
	{
	Git::Branch const &r = currentBranch();
	m->current_remote_name = r.remote;
	}
	if (m->current_remote_name.isEmpty()) {
	if (m->remotes.size() == 1) {
	m->current_remote_name = m->remotes[0];
	}
	}

	emit remoteInfoChanged();
	}

	void BasicMainWindow::updateWindowTitle(GitPtr const &g)
	{
	if (isValidWorkingCopy(g)) {
	Git::User user = g->getUser(Git::Source::Default);
	setWindowTitle_(user);
	} else {
	setUnknownRepositoryInfo();
	}
	}

	QString BasicMainWindow::makeCommitInfoText(int row, QList<BasicMainWindow::Label> *label_list)
	{
	QString message_ex;
	Git::CommitItem const *commit = &getLogs()[row];
	{ // branch
	if (label_list) {
	if (commit->commit_id == getHeadId()) {
	Label label(Label::Head);
	label.text = "HEAD";
	label_list->push_back(label);
	}
	}
	QList<Git::Branch> list = findBranch(commit->commit_id);
	for (Git::Branch const &b : list) {
	if (b.flags & Git::Branch::HeadDetachedAt) continue;
	if (b.flags & Git::Branch::HeadDetachedFrom) continue;
	Label label(Label::LocalBranch);
	label.text = b.name;
	if (!b.remote.isEmpty()) {
	label.kind = Label::RemoteBranch;
	label.text = "remotes" / b.remote / label.text;
	}
	if (b.ahead > 0) {
	label.info += tr(", %1 ahead").arg(b.ahead);
	}
	if (b.behind > 0) {
	label.info += tr(", %1 behind").arg(b.behind);
	}
	message_ex += " {" + label.text + label.info + '}';
	if (label_list) label_list->push_back(label);
	}
	}
	{ // tag
	QList<Git::Tag> list = findTag(commit->commit_id);
	for (Git::Tag const &t : list) {
	Label label(Label::Tag);
	label.text = t.name;
	message_ex += QString(" {#%1}").arg(label.text);
	if (label_list) label_list->push_back(label);
	}
	}
	return message_ex;
	}

	void BasicMainWindow::removeRepositoryFromBookmark(int index, bool ask)
	{
	if (ask) {
	int r = QMessageBox::warning(this, tr("Confirm Remove"), tr("Are you sure you want to remove the repository from bookmarks ?") + '\n' + tr("(Files will NOT be deleted)"), QMessageBox::Ok, QMessageBox::Cancel);
	if (r != QMessageBox::Ok) return;
	}
	auto *repos = getReposPtr();
	if (index >= 0 && index < repos->size()) {
	repos->erase(repos->begin() + index);
	saveRepositoryBookmarks();
	updateRepositoriesList();
	}
	}

	void BasicMainWindow::clone(QString url, QString dir)
	{
	if (!isOnlineMode()) return;

	while (1) {
	dir = defaultWorkingDir();
	CloneDialog dlg(this, url, dir, &m->gcx);
	if (dlg.exec() != QDialog::Accepted) {
	return;
	}

	url = dlg.url();
	dir = dlg.dir();

	if (dlg.action() == CloneDialog::Action::Clone) {
	// 既存チェック

	QFileInfo info(dir);
	if (info.isFile()) {
	QString msg = dir + "\n\n" + tr("A file with same name already exists");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}
	if (info.isDir()) {
	QString msg = dir + "\n\n" + tr("A folder with same name already exists");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}

	// クローン先ディレクトリを求める

	Git::CloneData clone_data = Git::preclone(url, dir);

	// クローン先ディレクトリの存在チェック

	QString basedir = misc::normalizePathSeparator(clone_data.basedir);
	if (!QFileInfo(basedir).isDir()) {
	int i = basedir.indexOf('/');
	int j = basedir.indexOf('\\');
	if (i < j) i = j;
	if (i < 0) {
	QString msg = basedir + "\n\n" + tr("Invalid folder");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}

	QString msg = basedir + "\n\n" + tr("No such folder. Create it now ?");
	if (QMessageBox::warning(this, tr("Clone"), msg, QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok) {
	continue;
	}

	// ディレクトリを作成

	QString base = basedir.mid(0, i + 1);
	QString sub = basedir.mid(i + 1);
	QDir(base).mkpath(sub);
	}

	RepositoryItem data;
	data.local_dir = dir;
	data.local_dir.replace('\\', '/');
	data.name = makeRepositoryName(dir);
	data.ssh_key = dlg.overridedSshKey();

	GitPtr g = git(QString(), data.ssh_key);
	setPtyUserData(QVariant::fromValue<RepositoryItem>(data));
	setPtyCondition(PtyCondition::Clone);
	setPtyProcessOk(true);
	g->clone(clone_data, getPtyProcess());
	} else if (dlg.action() == CloneDialog::Action::AddExisting) {
	addWorkingCopyDir(dir, true);
	}

	return; // done
	}
	}

	void BasicMainWindow::checkout()
	{
	checkout(this, selectedCommitItem());
	}

	void BasicMainWindow::commit(bool amend)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QString message;

	if (amend) {
	message = getLogs()[0].message;
	} else {
	QString id = g->getCherryPicking();
	if (Git::isValidID(id)) {
	message = g->getMessage(id);
	}
	}

	while (1) {
	Git::User user = g->getUser(Git::Source::Default);
	QString sign_id = g->signingKey(Git::Source::Default);
	gpg::Data key;
	{
	QList<gpg::Data> keys;
	gpg::listKeys(global->gpg_command, &keys);
	for (gpg::Data const &k : keys) {
	if (k.id == sign_id) {
	key = k;
	}
	}
	}
	CommitDialog dlg(this, currentRepositoryName(), user, key);
	dlg.setText(message);
	if (dlg.exec() == QDialog::Accepted) {
	QString text = dlg.text();
	if (text.isEmpty()) {
	QMessageBox::warning(this, tr("Commit"), tr("Commit message can not be omitted."));
	continue;
	}
	bool sign = dlg.isSigningEnabled();
	bool ok;
	if (amend) {
	ok = g->commit_amend_m(text, sign, getPtyProcess());
	} else {
	ok = g->commit(text, sign, getPtyProcess());
	}
	if (ok) {
	setForceFetch(true);
	updateStatusBarText();
	openRepository(true);
	} else {
	QString err = g->errorMessage().trimmed();
	err += "\n*** ";
	err += tr("Failed to commit");
	err += " ***\n";
	writeLog(err);
	}
	}
	break;
	}
	}

	void BasicMainWindow::commitAmend()
	{
	commit(true);
	}

	void BasicMainWindow::pushSetUpstream(QString const &remote, QString const &branch)
	{
	if (remote.isEmpty()) return;
	if (branch.isEmpty()) return;

	int exitcode = 0;
	QString errormsg;

	reopenRepository(true, [&](GitPtr g){
	g->push_u(remote, branch, getPtyProcess());
	while (1) {
	if (getPtyProcess()->wait(1)) break;
	QApplication::processEvents();
	}
	exitcode = getPtyProcess()->getExitCode();
	errormsg = getPtyProcess()->getMessage();
	});

	if (exitcode == 128) {
	if (errormsg.indexOf("Connection refused") >= 0) {
	QMessageBox::critical(this, qApp->applicationName(), tr("Connection refused."));
	return;
	}
	}

	updateRemoteInfo();
	}

	bool BasicMainWindow::pushSetUpstream(bool testonly)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;
	QStringList remotes = g->getRemotes();

	QString current_branch = currentBranchName();

	QStringList branches;
	for (Git::Branch const &b : g->branches()) {
	branches.push_back(b.name);
	}

	if (remotes.isEmpty() \|\| branches.isEmpty()) {
	return false;
	}

	if (testonly) {
	return true;
	}

	PushDialog dlg(this, remotes, branches, PushDialog::RemoteBranch(QString(), current_branch));
	if (dlg.exec() == QDialog::Accepted) {
	PushDialog::Action a = dlg.action();
	if (a == PushDialog::PushSimple) {
	push();
	} else if (a == PushDialog::PushSetUpstream) {
	QString remote = dlg.remote();
	QString branch = dlg.branch();
	pushSetUpstream(remote, branch);
	}
	return true;
	}

	return false;
	}

	void BasicMainWindow::push()
	{
	if (!isOnlineMode()) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (g->getRemotes().isEmpty()) {
	QMessageBox::warning(this, qApp->applicationName(), tr("No remote repository is registered."));
	RepositoryItem const &repo = currentRepository();
	execRepositoryPropertyDialog(repo, true);
	return;
	}

	int exitcode = 0;
	QString errormsg;

	reopenRepository(true, [&](GitPtr g){
	g->push(false, getPtyProcess());
	while (1) {
	if (getPtyProcess()->wait(1)) break;
	QApplication::processEvents();
	}
	exitcode = getPtyProcess()->getExitCode();
	errormsg = getPtyProcess()->getMessage();
	});

	if (exitcode == 128) {
	if (errormsg.indexOf("no upstream branch") >= 0) {
	QString brname = currentBranchName();

	QString msg = tr("The current branch %1 has no upstream branch.");
	msg = msg.arg(brname);
	msg += '\n';
	msg += tr("You try push --set-upstream");
	QMessageBox::warning(this, qApp->applicationName(), msg);
	pushSetUpstream(false);
	return;
	}
	if (errormsg.indexOf("Connection refused") >= 0) {
	QMessageBox::critical(this, qApp->applicationName(), tr("Connection refused."));
	return;
	}
	}
	}

	#ifdef Q_OS_MAC
	namespace {

	bool isValidDir(QString const &dir)
	{
	if (dir.indexOf('\"') >= 0 \|\| dir.indexOf('\\') >= 0) return false;
	return QFileInfo(dir).isDir();
	}

	}

	#include <QProcess>
	#endif

	void BasicMainWindow::openTerminal(RepositoryItem const *repo)
	{
	runOnRepositoryDir([](QString dir){
	#ifdef Q_OS_MAC
	if (!isValidDir(dir)) return;
	QString cmd = "open -n -a /Applications/Utilities/Terminal.app --args \"%1\"";
	cmd = cmd.arg(dir);
	QProcess::execute(cmd);
	#else
	Terminal::open(dir);
	#endif
	}, repo);
	}

	void BasicMainWindow::openExplorer(RepositoryItem const *repo)
	{
	runOnRepositoryDir([](QString dir){
	#ifdef Q_OS_MAC
	if (!isValidDir(dir)) return;
	QString cmd = "open \"%1\"";
	cmd = cmd.arg(dir);
	QProcess::execute(cmd);
	#else
	QDesktopServices::openUrl(dir);
	#endif
	}, repo);
	}

	Git::CommitItem const *BasicMainWindow::selectedCommitItem() const
	{
	int i = selectedLogIndex();
	return commitItem(i);
	}

	void BasicMainWindow::deleteBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList all_branch_names;
	QStringList current_local_branch_names;
	{
	NamedCommitList named_commits = namedCommitItems(Branches);
	for (NamedCommitItem const &item : named_commits) {
	if (item.name == "HEAD") continue;
	if (item.id == commit->commit_id) {
	current_local_branch_names.push_back(item.name);
	}
	all_branch_names.push_back(item.name);
	}
	}

	DeleteBranchDialog dlg(this, false, all_branch_names, current_local_branch_names);
	if (dlg.exec() == QDialog::Accepted) {
	setLogEnabled(g, true);
	QStringList names = dlg.selectedBranchNames();
	int count = 0;
	for (QString const &name : names) {
	if (g->git(QString("branch -D \"%1\"").arg(name))) {
	count++;
	} else {
	writeLog(tr("Failed to delete the branch '%1'").arg(name) + '\n');
	}
	}
	if (count > 0) {
	openRepository(true, true, true);
	}
	}
	}

	void BasicMainWindow::deleteBranch()
	{
	deleteBranch(selectedCommitItem());
	}

	QStringList MainWindow::remoteBranches(QString const &id, QStringList *all)
	{
	if (all) all->clear();

	QStringList list;

	GitPtr g = git();
	if (isValidWorkingCopy(g)) {
	NamedCommitList named_commits = namedCommitItems(Branches \| Remotes);
	for (NamedCommitItem const &item : named_commits) {
	if (item.id == id && !item.remote.isEmpty()) {
	list.push_back(item.remote / item.name);
	}
	if (all && !item.remote.isEmpty() && item.name != "HEAD") {
	all->push_back(item.remote / item.name);
	}
	}
	}

	return list;
	}

	void MainWindow::deleteRemoteBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList all_branches;
	QStringList remote_branches = remoteBranches(commit->commit_id, &all_branches);
	if (remote_branches.isEmpty()) return;

	DeleteBranchDialog dlg(this, true, all_branches, remote_branches);
	if (dlg.exec() == QDialog::Accepted) {
	setLogEnabled(g, true);
	QStringList names = dlg.selectedBranchNames();
	for (QString const &name : names) {
	int i = name.indexOf('/');
	if (i > 0) {
	QString remote = name.mid(0, i);
	QString branch = ':' + name.mid(i + 1);
	pushSetUpstream(remote, branch);
	}
	}
	}
	}

	bool BasicMainWindow::askAreYouSureYouWantToRun(QString const &title, QString const &command)
	{
	QString message = tr("Are you sure you want to run the following command ?");
	QString text = "%1\n\n%2";
	text = text.arg(message).arg(command);
	return QMessageBox::warning(this, title, text, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok;
	}

	bool BasicMainWindow::editFile(QString const &path, QString const &title)
	{
	return TextEditDialog::editFile(this, path, title);
	}

	void BasicMainWindow::resetFile(QStringList const &paths)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (paths.isEmpty()) {
	// nop
	} else {
	QString cmd = "git checkout -- \"%1\"";
	cmd = cmd.arg(paths[0]);
	if (askAreYouSureYouWantToRun(tr("Reset a file"), "> " + cmd)) {
	for (QString const &path : paths) {
	g->resetFile(path);
	}
	openRepository(true);
	}
	}
	}

	void BasicMainWindow::saveRepositoryBookmark(RepositoryItem item)
	{
	if (item.local_dir.isEmpty()) return;

	if (item.name.isEmpty()) {
	item.name = tr("Unnamed");
	}

	auto *repos = getReposPtr();

	bool done = false;
	for (auto &repo : *repos) {
	RepositoryItem *p = &repo;
	if (item.local_dir == p->local_dir) {
	*p = item;
	done = true;
	break;
	}
	}
	if (!done) {
	repos->push_back(item);
	}
	saveRepositoryBookmarks();
	updateRepositoriesList();
	}

	void BasicMainWindow::setCurrentRepository(RepositoryItem const &repo, bool clear_authentication)
	{
	if (clear_authentication) {
	clearAuthentication();
	}
	m->current_repo = repo;
	}

	void BasicMainWindow::internalDeleteTags(QStringList const &tagnames)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (!tagnames.isEmpty()) {
	reopenRepository(false, [&](GitPtr g){
	for (QString const &name : tagnames) {
	g->delete_tag(name, true);
	}
	});
	}
	}

	bool BasicMainWindow::internalAddTag(QString const &name)
	{
	if (name.isEmpty()) return false;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;

	QString commit_id;

	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && !commit->commit_id.isEmpty()) {
	commit_id = commit->commit_id;
	}

	if (!Git::isValidID(commit_id)) return false;

	bool ok = false;
	reopenRepository(false, [&](GitPtr g){
	ok = g->tag(name, commit_id);
	});

	return ok;
	}

	NamedCommitList BasicMainWindow::namedCommitItems(int flags)
	{
	NamedCommitList items;
	if (flags & Branches) {
	for (auto const &pair: branchMapRef()) {
	QList<Git::Branch> const &list = pair.second;
	for (Git::Branch const &b : list) {
	if (b.isHeadDetached()) continue;
	if (flags & NamedCommitFlag::Remotes) {
	// nop
	} else {
	if (!b.remote.isEmpty()) continue;
	}
	NamedCommitItem item;
	if (b.remote.isEmpty()) {
	if (b.name == "HEAD") {
	item.type = NamedCommitItem::Type::None;
	} else {
	item.type = NamedCommitItem::Type::BranchLocal;
	}
	} else {
	item.type = NamedCommitItem::Type::BranchRemote;
	item.remote = b.remote;
	}
	item.name = b.name;
	item.id = b.id;
	items.push_back(item);
	}
	}
	}
	if (flags & Tags) {
	for (auto const &pair: *ptrTagMap()) {
	QList<Git::Tag> const &list = pair.second;
	for (Git::Tag const &t : list) {
	NamedCommitItem item;
	item.type = NamedCommitItem::Type::Tag;
	item.name = t.name;
	item.id = t.id;
	if (item.name.startsWith("refs/tags/")) {
	item.name = item.name.mid(10);
	}
	items.push_back(item);
	}
	}
	}
	return items;
	}

	int BasicMainWindow::rowFromCommitId(QString const &id)
	{
	auto const &logs = getLogs();
	for (size_t i = 0; i < logs.size(); i++) {
	Git::CommitItem const &item = logs[i];
	if (item.commit_id == id) {
	return (int)i;
	}
	}
	return -1;
	}

	void BasicMainWindow::createRepository(QString const &dir)
	{
	CreateRepositoryDialog dlg(this, dir);
	if (dlg.exec() == QDialog::Accepted) {
	QString path = dlg.path();
	if (QFileInfo(path).isDir()) {
	if (Git::isValidWorkingCopy(path)) {
	// A valid git repository already exists there.
	} else {
	GitPtr g = git(path);
	if (g->init()) {
	QString name = dlg.name();
	if (!name.isEmpty()) {
	addWorkingCopyDir(path, name, true);
	}
	QString remote_name = dlg.remoteName();
	QString remote_url = dlg.remoteURL();
	if (!remote_name.isEmpty() && !remote_url.isEmpty()) {
	Git::Remote r;
	r.name = remote_name;
	r.url = remote_url;
	g->addRemoteURL(r);
	}
	}
	}
	} else {
	// not dir
	}
	}
	}

	void BasicMainWindow::setLogEnabled(GitPtr const &g, bool f)
	{
	if (f) {
	g->setLogCallback(git_callback, this);
	} else {
	g->setLogCallback(nullptr, nullptr);
	}
	}

	QList<Git::Tag> BasicMainWindow::findTag(QString const &id)
	{
	auto it = ptrTagMap()->find(id);
	if (it != ptrTagMap()->end()) {
	return it->second;
	}
	return QList<Git::Tag>();
	}

	void BasicMainWindow::sshSetPassphrase(std::string const &user, std::string const &pass)
	{
	m->ssh_passphrase_user = user;
	m->ssh_passphrase_pass = pass;
	}

	std::string BasicMainWindow::sshPassphraseUser() const
	{
	return m->ssh_passphrase_user;
	}

	std::string BasicMainWindow::sshPassphrasePass() const
	{
	return m->ssh_passphrase_pass;
	}

	void BasicMainWindow::httpSetAuthentication(std::string const &user, std::string const &pass)
	{
	m->http_uid = user;
	m->http_pwd = pass;
	}

	std::string BasicMainWindow::httpAuthenticationUser() const
	{
	return m->http_uid;
	}

	std::string BasicMainWindow::httpAuthenticationPass() const
	{
	return m->http_pwd;
	}

	void BasicMainWindow::doGitCommand(std::function<void(GitPtr g)> const &callback)
	{
	GitPtr g = git();
	if (isValidWorkingCopy(g)) {
	OverrideWaitCursor;
	callback(g);
	openRepository(false, false);
	}
	}







	diff --git a/src/BasicMainWindow.h b/src/BasicMainWindow.h
	index 455a5d4..4b0d67a 100644
	--- a/src/BasicMainWindow.h
	+++ b/src/BasicMainWindow.h
	@@ -1,391 +1,392 @@
	#ifndef BASICMAINWINDOW_H
	#define BASICMAINWINDOW_H

	#include "Git.h"
	#include "GitObjectManager.h"
	#include "MyProcess.h"
	#include "RepositoryData.h"
	#include "TextEditorTheme.h"
	#include <QMainWindow>
	#include <functional>

	class ApplicationSettings;
	class AvatarLoader;
	class QListWidget;
	class QListWidgetItem;
	class QTreeWidgetItem;
	class WebContext;

	struct GitHubRepositoryInfo {
	QString owner_account_name;
	QString repository_name;
	};

	#define PATH_PREFIX "*"

	class BasicMainWindow : public QMainWindow {
	Q_OBJECT
	friend class RepositoryPropertyDialog;
	public:
	struct Label {
	enum {
	Head,
	LocalBranch,
	RemoteBranch,
	Tag,
	};
	int kind;
	QString text;
	QString info;
	Label(int kind = LocalBranch)
	: kind(kind)
	{

	}
	};
	enum {
	IndexRole = Qt::UserRole,
	FilePathRole,
	DiffIndexRole,
	HunkIndexRole,
	HeaderRole,
	};
	protected:

	enum class PtyCondition {
	None,
	Clone,
	Fetch,
	Pull,
	Push,
	};

	enum InteractionMode {
	None,
	Busy,
	};

	enum NamedCommitFlag {
	Branches = 0x0001,
	Tags = 0x0002,
	Remotes = 0x0100,
	};

	enum class FilesListType {
	SingleList,
	SideBySide,
	};

	struct Task {
	int index = 0;
	int parent = 0;
	Task() = default;
	Task(int index, int parent)
	: index(index)
	, parent(parent)
	{
	}
	};

	struct Element {
	int depth = 0;
	std::vector<int> indexes;
	};


	enum {
	GroupItem = -1,
	};

	struct Private;
	Private *m;
	private:
	static bool git_callback(void cookie, const char ptr, int len);

	QString selectCommand_(QString const &cmdname, QStringList const &cmdfiles, QStringList const &list, QString path, std::function<void (QString const &)> const &callback);
	QString selectCommand_(QString const &cmdname, QString const &cmdfile, QStringList const &list, QString const &path, std::function<void (QString const &)> const &callback);

	bool checkGitCommand();
	bool checkFileCommand();
	bool checkExecutable(QString const &path);
	void internalSetCommand(QString const &path, bool save, QString const &name, QString *out);
	QStringList whichCommand_(QString const &cmdfile1, QString const &cmdfile2 = QString());

	void setWindowTitle_(Git::User const &user);
	bool execSetGlobalUserDialog();

	bool saveByteArrayAs(const QByteArray &ba, QString const &dstpath);
	bool saveFileAs(QString const &srcpath, QString const &dstpath);
	bool saveBlobAs(QString const &id, QString const &dstpath);

	void updateFilesList(Git::CommitItem const &commit, bool wait);

	void revertAllFiles();

	void setCurrentRemoteName(QString const &name);

	void deleteTags(Git::CommitItem const &commit);

	bool isAvatarEnabled() const;
	bool isGitHub() const;
	QStringList remotes() const;
	QList<Git::Branch> findBranch(QString const &id);
	QString saveAsTemp(QString const &id);
	QString tempfileHeader() const;
	void deleteTempFiles();
	QString getCommitIdFromTag(QString const &tag);
	bool isValidRemoteURL(QString const &url, const QString &sshkey);
	QString getObjectID(QListWidgetItem *item);
	void addWorkingCopyDir(QString dir, QString name, bool open);
	static QString makeRepositoryName(QString const &loc);
	void clearAuthentication();
	RepositoryItem const findRegisteredRepository(QString workdir) const;
	void queryRemotes(const GitPtr &g);
	bool runOnRepositoryDir(std::function<void (QString)> const &callback, RepositoryItem const *repo);
	void clearSshAuthentication();
	protected:
	static QString getFilePath(QListWidgetItem *item);
	static bool isGroupItem(QTreeWidgetItem *item);
	static int indexOfLog(QListWidgetItem *item);
	static int indexOfDiff(QListWidgetItem *item);
	static int getHunkIndex(QListWidgetItem *item);

	void initNetworking();
	bool saveRepositoryBookmarks() const;
	QString getBookmarksFilePath() const;

	void stopPtyProcess();
	void abortPtyProcess();

	bool execWelcomeWizardDialog();
	void execRepositoryPropertyDialog(const RepositoryItem &repo, bool open_repository_menu = false);
	void execSetUserDialog(Git::User const &global_user, Git::User const &repo_user, QString const &reponame);
	void setGitCommand(QString const &path, bool save);
	void setFileCommand(QString const &path, bool save);
	void setGpgCommand(QString const &path, bool save);
	void setSshCommand(QString const &path, bool save);
	void logGitVersion();
	void setUnknownRepositoryInfo();
	void internalClearRepositoryInfo();
	void checkUser();
	void openRepository(bool validate, bool waitcursor = true, bool keep_selection = false);
	void updateRepository();
	void reopenRepository(bool log, const std::function<void(GitPtr const &)> &callback);
	void openSelectedRepository();
	// void checkRemoteUpdate();
	bool isThereUncommitedChanges() const;
	bool makeDiff(QString id, QList<Git::Diff> *out);
	void addDiffItems(const QList<Git::Diff> *diff_list, const std::function<void (QString const &, QString, int)> &add_item);
	Git::CommitItemList retrieveCommitLog(const GitPtr &g);

	void queryBranches(const GitPtr &g);
	std::map<QString, QList<Git::Branch>> &branchMapRef();

	void updateCommitTableLater();
	void updateRemoteInfo();
	void updateWindowTitle(const GitPtr &g);
	QString makeCommitInfoText(int row, QList<Label> *label_list);
	void removeRepositoryFromBookmark(int index, bool ask);

	void clone(QString url = QString(), QString dir = QString());
	void checkout();
	void commit(bool amend = false);
	void commitAmend();
	void pushSetUpstream(QString const &remote, QString const &branch);
	bool pushSetUpstream(bool testonly);
	void push();

	void openTerminal(RepositoryItem const *repo);
	void openExplorer(RepositoryItem const *repo);
	Git::CommitItem const *selectedCommitItem() const;
	void deleteBranch(Git::CommitItem const *commit);
	void deleteBranch();
	bool askAreYouSureYouWantToRun(QString const &title, QString const &command);
	bool editFile(QString const &path, QString const &title);
	void resetFile(QStringList const &paths);
	void saveRepositoryBookmark(RepositoryItem item);
	void setCurrentRepository(RepositoryItem const &repo, bool clear_authentication);
	void internalDeleteTags(QStringList const &tagnames);
	bool internalAddTag(QString const &name);
	NamedCommitList namedCommitItems(int flags);
	int rowFromCommitId(QString const &id);
	void createRepository(QString const &dir);
	void setLogEnabled(const GitPtr &g, bool f);
	QList<Git::Tag> findTag(QString const &id);
	void sshSetPassphrase(std::string const &user, std::string const &pass);
	std::string sshPassphraseUser() const;
	std::string sshPassphrasePass() const;
	void httpSetAuthentication(std::string const &user, std::string const &pass);
	std::string httpAuthenticationUser() const;
	std::string httpAuthenticationPass() const;
	public:
	Git::CommitItemList const &getLogs() const;
	Git::CommitItem const *getLog(int index) const;
	protected:
	bool event(QEvent *event) override;
	void postUserFunctionEvent(const std::function<void(QVariant const &)> &fn, QVariant const &v = QVariant());

	void doGitCommand(std::function<void(GitPtr)> const &callback);

	Git::CommitItemList *getLogsPtr();
	void setLogs(const Git::CommitItemList &logs);
	void clearLogs();

	PtyProcess *getPtyProcess();
	PtyCondition getPtyCondition();
	bool getPtyProcessOk() const;
	void setPtyProcessOk(bool pty_process_ok);
	void setPtyUserData(QVariant const &userdata);
	void setPtyCondition(const PtyCondition &ptyCondition);

	QList<RepositoryItem> const &getRepos() const;
	QList<RepositoryItem> *getReposPtr();

	QString getCurrentRemoteName() const;

	AvatarLoader *getAvatarLoader();
	const AvatarLoader *getAvatarLoader() const;

	int *ptrUpdateFilesListCounter();
	int *ptrUpdateCommitTableCounter();

	bool interactionCanceled() const;
	void setInteractionCanceled(bool canceled);

	InteractionMode interactionMode() const;
	void setInteractionMode(const InteractionMode &im);

	QString getRepositoryFilterText() const;
	void setRepositoryFilterText(QString const &text);

	void setUncommitedChanges(bool uncommited_changes);

	QList<Git::Diff> *diffResult();
	std::map<QString, Git::Diff> *getDiffCacheMap();

	bool getRemoteChanged() const;
	void setRemoteChanged(bool remote_changed);

	void setServerType(const ServerType &server_type);

	GitHubRepositoryInfo *ptrGitHub();

	std::map<int, QList<Label>> *getLabelMap();
	const std::map<int, QList<Label>> *getLabelMap() const;
	void clearLabelMap();

	GitObjectCache *getObjCache();

	bool getForceFetch() const;
	void setForceFetch(bool force_fetch);

	std::map<QString, QList<Git::Tag>> *ptrTagMap();

	QString getHeadId() const;
	void setHeadId(QString const &head_id);

	void setPtyProcessCompletionData(QVariant const &value);
	QVariant const &getTempRepoForCloneCompleteV() const;

	void updateCommitGraph();
	bool fetch(const GitPtr &g, bool prune);
	bool fetch_tags_f(const GitPtr &g);

	protected:
	virtual void setCurrentLogRow(int row) = 0;
	virtual void updateFilesList(QString id, bool wait) = 0;
	virtual void setRepositoryInfo(QString const &reponame, QString const &brname) = 0;
	virtual void deleteTags(QStringList const &tagnames) = 0;
	virtual void internalWriteLog(const char *ptr, int len) = 0;
	virtual void removeSelectedRepositoryFromBookmark(bool ask) = 0;
	virtual void openRepository_(GitPtr g, bool keep_selection = false) = 0;
	virtual void updateRepositoriesList() = 0;
	virtual void clearFileList() = 0;
	virtual RepositoryItem const *selectedRepositoryItem() const = 0;
	virtual void setRemoteMonitoringEnabled(bool enable) { (void)enable; }
	virtual void updateStatusBarText() {}
	void msgNoRepositorySelected();
	bool isRepositoryOpened() const;
	public:
	explicit BasicMainWindow(QWidget *parent = nullptr);
	~BasicMainWindow() override;
	ApplicationSettings *appsettings();
	const ApplicationSettings *appsettings() const;
	WebContext *webContext();
	QString gitCommand() const;
	void autoOpenRepository(QString dir);
	GitPtr git(QString const &dir, const QString &sshkey = {}) const;
	GitPtr git();
	QPixmap getTransparentPixmap();
	QIcon committerIcon(int row) const;
	Git::CommitItem const *commitItem(int row) const;
	QIcon verifiedIcon(char s) const;
	virtual QString currentWorkingCopyDir() const;
	const QList<Label> *label(int row) const;
	bool saveAs(QString const &id, QString const &dstpath);
	bool testRemoteRepositoryValidity(QString const &url, const QString &sshkey);
	QString defaultWorkingDir() const;
	void addWorkingCopyDir(const QString &dir, bool open);
	bool queryCommit(QString const &id, Git::CommitItem *out);
	QAction addMenuActionProperty(QMenu menu);
	void checkout(QWidget parent, Git::CommitItem const commit, std::function<void()> accepted_callback = nullptr);
	void jumpToCommit(QString id);
	void execCommitViewWindow(Git::CommitItem const *commit);
	void execCommitExploreWindow(QWidget parent, Git::CommitItem const commit);
	void execCommitPropertyDialog(QWidget parent, Git::CommitItem const commit);
	void execFileHistory(QString const &path);
	void execFileHistory(QListWidgetItem *item);
	void execFilePropertyDialog(QListWidgetItem *item);
	QString selectGitCommand(bool save);
	QString selectFileCommand(bool save);
	QString selectGpgCommand(bool save);
	QString selectSshCommand(bool save);
	Git::Branch const &currentBranch() const;
	void setCurrentBranch(Git::Branch const &b);
	const RepositoryItem &currentRepository() const;
	QString currentRepositoryName() const;
	QString currentRemoteName() const;
	QString currentBranchName() const;
	bool isValidWorkingCopy(const GitPtr &g) const;
	QString determinFileType_(QString const &path, bool mime, std::function<void (QString const &, QByteArray *)> const &callback) const;
	QString determinFileType(QString const &path, bool mime);
	QString determinFileType(QByteArray in, bool mime);
	QList<Git::Tag> queryTagList();
	int limitLogCount() const;
	TextEditorThemePtr themeForTextEditor();
	Git::Object cat_file_(const GitPtr &g, QString const &id);
	Git::Object cat_file(QString const &id);
	QString newTempFilePath();
	QString findFileID(QString const &commit_id, QString const &file);
	void updateFilesList(QString const &id, QList<Git::Diff> diff_list, QListWidget listwidget);
	void setAppSettings(const ApplicationSettings &appsettings);

	QIcon getRepositoryIcon() const;
	QIcon getFolderIcon() const;
	QIcon getSignatureGoodIcon() const;
	QIcon getSignatureDubiousIcon() const;
	QIcon getSignatureBadIcon() const;
	QPixmap getTransparentPixmap() const;

	static QString abbrevCommitID(Git::CommitItem const &commit);
	QStringList findGitObject(const QString &id) const;

	void writeLog(const char *ptr, int len);
	void writeLog(QString const &str);
	void emitWriteLog(const QByteArray &ba);
	QList<Label> sortedLabels(int row) const;

	virtual bool isOnlineMode() const = 0;
	virtual int selectedLogIndex() const = 0;
	void changeSshKey(const QString &localdir, const QString &sshkey);
	+ void saveApplicationSettings();
	protected slots:
	void onAvatarUpdated();
	public slots:
	void writeLog_(QByteArray ba);
	signals:
	void signalWriteLog(QByteArray ba);
	void remoteInfoChanged();
	// void signalCheckRemoteUpdate();
	};

	#endif // BASICMAINWINDOW_H
	diff --git a/src/LogTableWidget.cpp b/src/LogTableWidget.cpp
	index 9b6e7f4..83aec97 100644
	--- a/src/LogTableWidget.cpp
	+++ b/src/LogTableWidget.cpp
	@@ -1,373 +1,378 @@
	#include "LogTableWidget.h"
	#include "MainWindow.h"
	#include "MyTableWidgetDelegate.h"
	#include "common/misc.h"
	#include <QApplication>
	#include <QDebug>
	#include <QEvent>
	#include <QPainter>
	#include <QProxyStyle>
	#include <cmath>
	#include <map>
	+#include "ApplicationGlobal.h"

	struct LogTableWidget::Private {
	};

	class LogTableWidgetDelegate : public MyTableWidgetDelegate {
	private:
	MainWindow *mainwindow() const
	{
	auto w = dynamic_cast<LogTableWidget >(QStyledItemDelegate::parent());
	Q_ASSERT(w);
	return w->mainwindow();
	}

	static QColor labelColor(int kind)
	{
	switch (kind) {
	case BasicMainWindow::Label::Head: return QColor(255, 192, 224); // blue
	case BasicMainWindow::Label::LocalBranch: return QColor(192, 224, 255); // blue
	case BasicMainWindow::Label::RemoteBranch: return QColor(192, 240, 224); // green
	case BasicMainWindow::Label::Tag: return QColor(255, 224, 192); // orange
	}
	return QColor(224, 224, 224); // gray
	}

	static QColor hiliteColor(QColor const &color)
	{
	int r = color.red();
	int g = color.green();
	int b = color.blue();
	r = 255 - (255 - r) / 2;
	g = 255 - (255 - g) / 2;
	b = 255 - (255 - b) / 2;
	return QColor(r, g, b);
	}

	static QColor shadowColor(QColor const &color)
	{
	return QColor(color.red() / 2, color.green() / 2, color.blue() / 2);
	}

	void drawSignatureIcon(QPainter *painter, const QStyleOptionViewItem &opt, QModelIndex const &index) const
	{
	if (!opt.widget->isEnabled()) return;

	Git::CommitItem const *commit = mainwindow()->commitItem(index.row());
	if (commit) {
	QIcon icon = mainwindow()->verifiedIcon(commit->signature);
	if (!icon.isNull()) {
	QRect r = opt.rect.adjusted(6, 3, 0, -3);
	int h = r.height();
	int w = h;
	int x = r.x() + r.width() - w;
	int y = r.y();
	icon.paint(painter, x, y, w, h);
	}
	}
	}

	void drawAvatar(QPainter *painter, const QStyleOptionViewItem &opt, QModelIndex const &index) const
	{
	if (!opt.widget->isEnabled()) return;

	int row = index.row();
	QIcon icon = mainwindow()->committerIcon(row);
	if (!icon.isNull()) {
	int h = opt.rect.height();
	int w = h;
	int x = opt.rect.x() + opt.rect.width() - w;
	int y = opt.rect.y();

	painter->save();
	painter->setOpacity(0.5); // 半透明で描画
	icon.paint(painter, x, y, w, h);
	painter->restore();
	}
	}

	void drawLabels(QPainter *painter, const QStyleOptionViewItem &opt, QModelIndex const &index) const
	{
	int row = index.row();
	QList<BasicMainWindow::Label> const *labels = mainwindow()->label(row);
	if (labels) {
	painter->save();
	+
	+ bool show = global->mainwindow->isLabelsVisible();
	+ painter->setOpacity(show ? 1.0 : 0.0625);
	+
	painter->setRenderHint(QPainter::Antialiasing);
	QFontMetrics fm = painter->fontMetrics();
	const int space = 8;
	int x = opt.rect.x() + opt.rect.width() - 3;
	int x1 = x;
	int y0 = opt.rect.y();
	int y1 = y0 + opt.rect.height() - 1;
	int i = labels->size();
	while (i > 0) {
	i--;
	BasicMainWindow::Label const &label = labels->at(i);
	QString text = misc::abbrevBranchName(label.text + label.info);
	int w = fm.size(0, text).width() + space * 2; // 幅
	int x0 = x1 - w;
	QRect r(x0, y0, x1 - x0, y1 - y0);
	painter->setPen(Qt::NoPen);
	auto DrawRect = [&](int dx, int dy, QColor color){
	painter->setBrush(color);
	painter->drawRoundedRect(r.adjusted(lround(dx + 3), lround(dy + 3), lround(dx - 3), lround(dy - 3)), 3, 3);
	};
	QColor color = labelColor(label.kind);
	QColor hilite = hiliteColor(color);
	QColor shadow = shadowColor(color);
	DrawRect(-1, -1, hilite);
	DrawRect(1, 1, shadow);
	DrawRect(0, 0, color);
	painter->setPen(Qt::black);
	painter->setBrush(Qt::NoBrush);
	QApplication::style()->drawItemText(painter, r.adjusted(space, 0, 0, 0), opt.displayAlignment, opt.palette, true, text);
	x1 = x0;
	}
	painter->restore();
	}
	}

	public:
	explicit LogTableWidgetDelegate(QObject *parent = Q_NULLPTR)
	: MyTableWidgetDelegate(parent)
	{
	}
	void paint(QPainter *painter, const QStyleOptionViewItem &option, QModelIndex const &index) const override
	{
	MyTableWidgetDelegate::paint(painter, option, index);

	enum {
	Graph,
	CommitId,
	Date,
	Author,
	Message,
	};

	// signatureの描画
	if (index.column() == CommitId) {
	drawSignatureIcon(painter, option, index);
	}

	// コミット日時
	if (index.column() == Date) {
	Git::CommitItem const *commit = mainwindow()->commitItem(index.row());
	if (commit && commit->strange_date) {
	QColor color(255, 0, 0, 128);
	QRect r = option.rect.adjusted(1, 1, -1, -2);
	misc::drawFrame(painter, r.x(), r.y(), r.width(), r.height(), color, color);
	}
	}

	// avatarの描画
	if (index.column() == Author) {
	drawAvatar(painter, option, index);
	}

	// ラベルの描画
	if (index.column() == Message) {
	drawLabels(painter, option, index);
	}
	}
	};

	LogTableWidget::LogTableWidget(QWidget *parent)
	: QTableWidget(parent)
	, m(new Private)
	{
	setItemDelegate(new LogTableWidgetDelegate(this));
	}

	LogTableWidget::~LogTableWidget()
	{
	delete m;
	}

	MainWindow *LogTableWidget::mainwindow()
	{
	auto mw = qobject_cast<MainWindow >(window());
	Q_ASSERT(mw);
	return mw;
	}

	void drawBranch(QPainterPath *path, double x0, double y0, double x1, double y1, double r, bool bend_early)
	{
	const double k = 0.55228475;
	if (x0 == x1) {
	path->moveTo(x0, y0);
	path->lineTo(x1, y1);
	} else {
	double ym = bend_early ? (y0 + r) : (y1 - r);
	double h = fabs(y1 - y0);
	double w = fabs(x1 - x0);
	if (r > h / 2) r = h / 2;
	if (r > w / 2) r = w / 2;
	double s = r;
	if (x0 > x1) r = -r;
	if (y0 > y1) s = -s;

	if (0) {
	path->moveTo(x0, y0);
	path->lineTo(x0, ym - s);
	path->cubicTo(x0, ym - s + s * k, x0 + r - r * k, ym, x0 + r, ym);
	path->lineTo(x1 - r, ym);
	path->cubicTo(x1 - r + r * k, ym, x1, ym + s - s * k, x1, ym + s);
	path->lineTo(x1, y1);
	} else {
	if (bend_early) {
	path->moveTo(x0, y0);
	path->cubicTo(x0, ym, x1, ym, x1, ym + ym - y0);
	path->lineTo(x1, y1);
	} else {
	path->moveTo(x0, y0);
	path->lineTo(x0, ym + ym - y1);
	path->cubicTo(x0, ym, x1, ym, x1, y1);
	}
	}
	}
	}

	void LogTableWidget::paintEvent(QPaintEvent *e)
	{
	if (rowCount() < 1) return;

	QTableWidget::paintEvent(e);

	QPainter pr(viewport());
	pr.setRenderHint(QPainter::Antialiasing);
	pr.setBrush(QBrush(QColor(255, 255, 255)));

	Git::CommitItemList const *list = &mainwindow()->getLogs();

	int indent_span = 16;

	int line_width = 2;
	int thick_line_width = 4;

	auto ItemRect = [&](int row){
	QRect r;
	QTableWidgetItem *p = item(row, 0);
	if (p) {
	r = visualItemRect(p);
	}
	return r;
	};

	auto IsAncestor = [&](Git::CommitItem const &item){
	return mainwindow()->isAncestorCommit(item.commit_id);
	};

	auto ItemPoint = [&](int depth, QRect const &rect){
	int h = rect.height();
	double n = h / 2.0;
	double x = floor(rect.x() + n + depth * indent_span);
	double y = floor(rect.y() + n);
	return QPointF(x, y);
	};

	auto SetPen = [&](QPainter *pr, int level, bool thick){
	QColor c = mainwindow()->color(level + 1);
	Qt::PenStyle s = Qt::SolidLine;
	pr->setPen(QPen(c, thick ? thick_line_width : line_width, s));
	};

	auto DrawLine = [&](size_t index, int itemrow){
	QRect rc1;
	if (index < list->size()) {
	Git::CommitItem const &item1 = list->at(index);
	rc1 = ItemRect(itemrow);
	QPointF pt1 = ItemPoint(item1.marker_depth, rc1);
	double halfheight = rc1.height() / 2.0;
	for (TreeLine const &line : item1.parent_lines) {
	if (line.depth >= 0) {
	QPainterPath *path = nullptr;
	Git::CommitItem const &item2 = list->at(line.index);
	QRect rc2 = ItemRect(line.index);
	if (index + 1 == (size_t)line.index \|\| line.depth == item1.marker_depth \|\| line.depth == item2.marker_depth) {
	QPointF pt2 = ItemPoint(line.depth, rc2);
	if (pt2.y() > 0) {
	path = new QPainterPath();
	drawBranch(path, pt1.x(), pt1.y(), pt2.x(), pt2.y(), halfheight, line.bend_early);
	}
	} else {
	QPointF pt3 = ItemPoint(item2.marker_depth, rc2);
	if (pt3.y() > 0) {
	path = new QPainterPath();
	QRect rc3 = ItemRect(itemrow + 1);
	QPointF pt2 = ItemPoint(line.depth, rc3);
	drawBranch(path, pt1.x(), pt1.y(), pt2.x(), pt2.y(), halfheight, true);
	drawBranch(path, pt2.x(), pt2.y(), pt3.x(), pt3.y(), halfheight, false);
	}
	}
	if (path) {
	SetPen(&pr, line.color_number, IsAncestor(item1));
	pr.drawPath(*path);
	delete path;
	}
	}
	}
	}
	return rc1.y();
	};

	auto DrawMark = [&](size_t index, int row){
	double x, y;
	y = 0;
	if (index < list->size()) {
	Git::CommitItem const &item = list->at(index);
	QRect rc = ItemRect(row);
	QPointF pt = ItemPoint(item.marker_depth, rc);
	double r = 4;
	x = pt.x() - r;
	y = pt.y() - r;
	if (item.resolved) {
	// ◯
	SetPen(&pr, item.marker_depth, IsAncestor(item));
	pr.drawEllipse((int)x, (int)y, int(r * 2), int(r * 2));
	} else {
	// ▽
	SetPen(&pr, item.marker_depth, false);
	QPainterPath path;
	path.moveTo(pt.x(), pt.y() + r);
	path.lineTo(pt.x() - r, pt.y() - r);
	path.lineTo(pt.x() + r, pt.y() - r);
	path.lineTo(pt.x(), pt.y() + r);
	pr.drawPath(path);
	}
	}
	return y;
	};

	// draw lines

	pr.setOpacity(0.5);
	pr.setBrush(Qt::NoBrush);

	for (size_t i = 0; i < list->size(); i++) {
	double y = DrawLine(i, i);
	if (y >= height()) break;
	}

	// draw marks

	pr.setOpacity(1);
	pr.setBrush(mainwindow()->color(0));

	for (size_t i = 0; i < list->size(); i++) {
	double y = DrawMark(i, i);
	if (y >= height()) break;
	}
	}

	void LogTableWidget::resizeEvent(QResizeEvent *e)
	{
	mainwindow()->updateAncestorCommitMap();
	QTableWidget::resizeEvent(e);
	}

	void LogTableWidget::verticalScrollbarValueChanged(int value)
	{
	(void)value;
	mainwindow()->updateAncestorCommitMap();
	}

	diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
	index 0159378..8b5f08e 100644
	--- a/src/MainWindow.cpp
	+++ b/src/MainWindow.cpp
	@@ -1,2982 +1,3011 @@
	#include "MainWindow.h"
	#include "ui_MainWindow.h"
	#include "AboutDialog.h"
	#include "ApplicationGlobal.h"
	#include "AreYouSureYouWantToContinueConnectingDialog.h"
	#include "AvatarLoader.h"
	#include "BlameWindow.h"
	#include "CloneFromGitHubDialog.h"
	#include "CommitPropertyDialog.h"
	#include "DeleteBranchDialog.h"
	#include "EditGitIgnoreDialog.h"
	#include "EditTagsDialog.h"
	#include "FileDiffWidget.h"
	#include "FindCommitDialog.h"
	#include "GitDiff.h"
	#include "JumpDialog.h"
	#include "LineEditDialog.h"
	#include "MySettings.h"
	#include "ObjectBrowserDialog.h"
	#include "ReflogWindow.h"
	#include "RemoteWatcher.h"
	#include "SetGpgSigningDialog.h"
	#include "SettingsDialog.h"
	#include "StatusLabel.h"
	#include "TextEditDialog.h"
	#include "UserEvent.h"
	#include "common/joinpath.h"
	#include "common/misc.h"
	#include "CherryPickDialog.h"
	#include "MergeDialog.h"
	#include "platform.h"
	#include "webclient.h"
	#include <QClipboard>
	#include <QDirIterator>
	#include <QElapsedTimer>
	#include <QFileDialog>
	#include <QFileIconProvider>
	#include <QMessageBox>
	#include <QMimeData>
	#include <QPainter>
	#include <QStandardPaths>
	#include <QTimer>


	FileDiffWidget::DrawData::DrawData()
	{
	bgcolor_text = QColor(255, 255, 255);
	bgcolor_gray = QColor(224, 224, 224);
	bgcolor_add = QColor(192, 240, 192);
	bgcolor_del = QColor(255, 224, 224);
	bgcolor_add_dark = QColor(64, 192, 64);
	bgcolor_del_dark = QColor(240, 64, 64);
	}

	struct MainWindow::Private {
	bool is_online_mode = true;
	QTimer interval_10ms_timer;
	QImage graph_color;
	QPixmap digits;
	StatusLabel *status_bar_label;

	QObject *last_focused_file_list = nullptr;

	QListWidgetItem *last_selected_file_item = nullptr;

	bool searching = false;
	QString search_text;

	RemoteWatcher remote_watcher;

	int repos_panel_width = 0;

	std::set<QString> ancestors;

	QWidget *focused_widget = nullptr;
	QList<int> splitter_h_sizes;
	};

	MainWindow::MainWindow(QWidget *parent)
	: BasicMainWindow(parent)
	, ui(new Ui::MainWindow)
	, m(new Private)
	{
	ui->setupUi(this);

	#ifdef Q_OS_MACX
	ui->action_about->setText("About Guitar...");
	ui->action_edit_settings->setText("Settings...");
	#endif

	ui->splitter_v->setSizes({100, 400});
	ui->splitter_h->setSizes({200, 100, 200});

	m->status_bar_label = new StatusLabel(this);
	ui->statusBar->addWidget(m->status_bar_label);

	ui->widget_diff_view->bind(this);

	qApp->installEventFilter(this);

	+ setShowLabels(appsettings()->show_labels, false);
	+
	ui->widget_log->setupForLogWidget(ui->verticalScrollBar_log, ui->horizontalScrollBar_log, themeForTextEditor());
	onLogVisibilityChanged();

	initNetworking();

	showFileList(FilesListType::SingleList);

	m->digits.load(":/image/digits.png");
	m->graph_color = global->theme->graphColorMap();

	prepareLogTableWidget();

	#ifdef Q_OS_WIN
	{
	QFont font;

	font = ui->label_repo_name->font();
	font.setFamily("Meiryo");
	ui->label_repo_name->setFont(font);

	font = ui->label_branch_name->font();
	font.setFamily("Meiryo");
	ui->label_branch_name->setFont(font);
	}
	#endif

	connect(this, &BasicMainWindow::signalWriteLog, this, &BasicMainWindow::writeLog_);

	connect(ui->dockWidget_log, &QDockWidget::visibilityChanged, this, &MainWindow::onLogVisibilityChanged);
	connect(ui->widget_log, &TextEditorWidget::idle, this, &MainWindow::onLogIdle);

	connect(ui->treeWidget_repos, &RepositoriesTreeWidget::dropped, this, &MainWindow::onRepositoriesTreeDropped);

	connect((AbstractPtyProcess *)getPtyProcess(), &AbstractPtyProcess::completed, this, &MainWindow::onPtyProcessCompleted);

	connect(this, &BasicMainWindow::remoteInfoChanged, [&](){
	ui->lineEdit_remote->setText(currentRemoteName());
	});

	connect(this, &MainWindow::signalSetRemoteChanged, [&](bool f){
	setRemoteChanged(f);
	updateButton();
	});

	//

	QString path = getBookmarksFilePath();
	*getReposPtr() = RepositoryBookmark::load(path);
	updateRepositoriesList();

	webContext()->set_keep_alive_enabled(true);
	getAvatarLoader()->start(this);
	connect(getAvatarLoader(), &AvatarLoader::updated, this, &MainWindow::onAvatarUpdated);

	*ptrUpdateFilesListCounter() = 0;

	connect(ui->widget_diff_view, &FileDiffWidget::textcodecChanged, [&](){ updateDiffView(); });

	if (!global->start_with_shift_key && appsettings()->remember_and_restore_window_position) {
	Qt::WindowStates state = windowState();
	MySettings settings;

	settings.beginGroup("MainWindow");
	bool maximized = settings.value("Maximized").toBool();
	restoreGeometry(settings.value("Geometry").toByteArray());
	settings.endGroup();
	if (maximized) {
	state \|= Qt::WindowMaximized;
	setWindowState(state);
	}
	}

	startTimers();
	}

	MainWindow::~MainWindow()
	{
	stopPtyProcess();

	getAvatarLoader()->stop();

	m->remote_watcher.quit();
	m->remote_watcher.wait();

	delete m;
	delete ui;
	}


	void MainWindow::notifyRemoteChanged(bool f)
	{
	postUserFunctionEvent([&](QVariant const &v){
	setRemoteChanged(v.toBool());
	updateButton();
	}, QVariant(f));
	}

	void MainWindow::postStartEvent()
	{
	QTimer::singleShot(100, [&](){
	QApplication::postEvent(this, new StartEvent);
	});
	}

	bool MainWindow::shown()
	{
	m->repos_panel_width = ui->stackedWidget_leftpanel->width();
	ui->stackedWidget_leftpanel->setCurrentWidget(ui->page_repos);
	ui->action_repositories_panel->setChecked(true);

	{
	MySettings settings;
	{
	settings.beginGroup("Remote");
	bool f = settings.value("Online", true).toBool();
	settings.endGroup();
	setRemoteOnline(f, false);
	}
	{
	settings.beginGroup("MainWindow");
	int n = settings.value("FirstColumnWidth", 50).toInt();
	if (n < 10) n = 50;
	ui->tableWidget_log->setColumnWidth(0, n);
	settings.endGroup();
	}
	}
	updateUI();

	postStartEvent(); // 開始イベント

	return true;
	}

	bool MainWindow::isUninitialized()
	{
	return !misc::isExecutable(appsettings()->git_command) \|\| !misc::isExecutable(appsettings()->file_command);
	}

	void MainWindow::onStartEvent()
	{
	if (isUninitialized()) { // gitコマンドの有効性チェック
	if (!execWelcomeWizardDialog()) { // ようこそダイアログを表示
	close(); // キャンセルされたらプログラム終了
	}
	}
	if (isUninitialized()) { // 正しく初期設定されたか
	postStartEvent(); // 初期設定されなかったら、もういちどようこそダイアログを出す。
	} else {
	// 外部コマンド登録
	setGitCommand(appsettings()->git_command, false);
	setFileCommand(appsettings()->file_command, false);
	setGpgCommand(appsettings()->gpg_command, false);
	setSshCommand(appsettings()->ssh_command, false);

	// メインウィンドウのタイトルを設定
	updateWindowTitle(git());

	// プログラムバーション表示
	writeLog(AboutDialog::appVersion() + '\n');
	// gitコマンドバージョン表示
	logGitVersion();
	}
	}

	void MainWindow::startTimers()
	{
	// interval 10ms

	connect(&m->interval_10ms_timer, &QTimer::timeout, [&](){
	const int ms = 10;
	auto *p1 = ptrUpdateCommitTableCounter();
	if (*p1 > 0) {
	if (*p1 > ms) {
	*p1 -= ms;
	} else {
	*p1 = 0;
	ui->tableWidget_log->viewport()->update();
	}
	}
	auto *p2 = ptrUpdateFilesListCounter();
	if (*p2 > 0) {
	if (*p2 > ms) {
	*p2 -= ms;
	} else {
	*p2 = 0;
	updateCurrentFilesList();
	}
	}
	});
	m->interval_10ms_timer.setInterval(10);
	m->interval_10ms_timer.start();

	startTimer(10);
	}

	void MainWindow::setCurrentLogRow(int row)
	{
	if (row >= 0 && row < ui->tableWidget_log->rowCount()) {
	ui->tableWidget_log->setCurrentCell(row, 2);
	ui->tableWidget_log->setFocus();
	updateStatusBarText();
	}
	}

	bool MainWindow::eventFilter(QObject watched, QEvent event)
	{
	QEvent::Type et = event->type();

	if (et == QEvent::KeyPress) {
	if (QApplication::activeModalWidget()) {
	// thru
	} else {
	auto e = dynamic_cast<QKeyEvent >(event);
	Q_ASSERT(e);
	int k = e->key();
	if (k == Qt::Key_Escape) {
	if (centralWidget()->isAncestorOf(qApp->focusWidget())) {
	ui->treeWidget_repos->setFocus();
	return true;
	}
	}
	if (e->modifiers() & Qt::ControlModifier) {
	if (k == Qt::Key_Up \|\| k == Qt::Key_Down) {
	int rows = ui->tableWidget_log->rowCount();
	int row = ui->tableWidget_log->currentRow();
	if (k == Qt::Key_Up) {
	if (row > 0) {
	row--;
	}
	} else if (k == Qt::Key_Down) {
	if (row + 1 < rows) {
	row++;
	}
	}
	ui->tableWidget_log->setCurrentCell(row, 0);
	return true;
	}
	}
	if (watched == ui->treeWidget_repos) {
	if (k == Qt::Key_Enter \|\| k == Qt::Key_Return) {
	openSelectedRepository();
	return true;
	}
	if (!(e->modifiers() & Qt::ControlModifier)) {
	if (k >= 0 && k < 128 && QChar((uchar)k).isLetterOrNumber()) {
	appendCharToRepoFilter(k);
	return true;
	}
	if (k == Qt::Key_Backspace) {
	backspaceRepoFilter();
	return true;
	}
	if (k == Qt::Key_Escape) {
	clearRepoFilter();
	return true;
	}
	}
	} else if (watched == ui->tableWidget_log) {
	if (k == Qt::Key_Home) {
	setCurrentLogRow(0);
	return true;
	}
	if (k == Qt::Key_Escape) {
	ui->treeWidget_repos->setFocus();
	return true;
	}
	} else if (watched == ui->listWidget_files \|\| watched == ui->listWidget_unstaged \|\| watched == ui->listWidget_staged) {
	if (k == Qt::Key_Escape) {
	ui->tableWidget_log->setFocus();
	return true;
	}
	}
	}
	} else if (et == QEvent::FocusIn) {
	auto SelectItem = [](QListWidget *w){
	int row = w->currentRow();
	if (row < 0) {
	row = 0;
	w->setCurrentRow(row);
	}
	w->setItemSelected(w->item(row), true);
	w->viewport()->update();
	};
	// ファイルリストがフォーカスを得たとき、diffビューを更新する。（コンテキストメニュー対応）
	if (watched == ui->listWidget_unstaged) {
	m->last_focused_file_list = watched;
	updateStatusBarText();
	updateUnstagedFileCurrentItem();
	SelectItem(ui->listWidget_unstaged);
	return true;
	}
	if (watched == ui->listWidget_staged) {
	m->last_focused_file_list = watched;
	updateStatusBarText();
	updateStagedFileCurrentItem();
	SelectItem(ui->listWidget_staged);
	return true;
	}
	if (watched == ui->listWidget_files) {
	m->last_focused_file_list = watched;
	SelectItem(ui->listWidget_files);
	return true;
	}
	}
	return false;
	}

	bool MainWindow::event(QEvent *event)
	{
	QEvent::Type et = event->type();
	if (et == QEvent::KeyPress) {
	auto e = dynamic_cast<QKeyEvent >(event);
	Q_ASSERT(e);
	int k = e->key();
	if (k == Qt::Key_Escape) {
	emit onEscapeKeyPressed();
	} else if (k == Qt::Key_Delete) {
	if (qApp->focusWidget() == ui->treeWidget_repos) {
	removeSelectedRepositoryFromBookmark(true);
	return true;
	}
	}
	}
	return BasicMainWindow::event(event);
	}

	void MainWindow::customEvent(QEvent *e)
	{
	if (e->type() == (QEvent::Type)UserEvent::Start) {
	onStartEvent();
	return;
	}
	}

	void MainWindow::closeEvent(QCloseEvent *event)
	{
	MySettings settings;

	if (appsettings()->remember_and_restore_window_position) {
	setWindowOpacity(0);
	Qt::WindowStates state = windowState();
	bool maximized = (state & Qt::WindowMaximized) != 0;
	if (maximized) {
	state &= ~Qt::WindowMaximized;
	setWindowState(state);
	}
	{
	settings.beginGroup("MainWindow");
	settings.setValue("Maximized", maximized);
	settings.setValue("Geometry", saveGeometry());
	settings.endGroup();
	}
	}

	{
	settings.beginGroup("MainWindow");
	settings.setValue("FirstColumnWidth", ui->tableWidget_log->columnWidth(0));
	settings.endGroup();
	}

	QMainWindow::closeEvent(event);
	}

	void MainWindow::setStatusBarText(QString const &text)
	{
	m->status_bar_label->setText(text);
	}

	void MainWindow::clearStatusBarText()
	{
	setStatusBarText(QString());
	}

	void MainWindow::onLogVisibilityChanged()
	{
	ui->action_window_log->setChecked(ui->dockWidget_log->isVisible());
	}

	void MainWindow::internalWriteLog(char const *ptr, int len)
	{
	ui->widget_log->logicalMoveToBottom();
	ui->widget_log->write(ptr, len, false);
	ui->widget_log->setChanged(false);
	setInteractionCanceled(false);
	}

	void MainWindow::buildRepoTree(QString const &group, QTreeWidgetItem item, QList<RepositoryItem> repos)
	{
	QString name = item->text(0);
	if (isGroupItem(item)) {
	int n = item->childCount();
	for (int i = 0; i < n; i++) {
	QTreeWidgetItem *child = item->child(i);
	QString sub = group / name;
	buildRepoTree(sub, child, repos);
	}
	} else {
	RepositoryItem const *repo = repositoryItem(item);
	if (repo) {
	RepositoryItem newrepo = *repo;
	newrepo.name = name;
	newrepo.group = group;
	item->setData(0, IndexRole, repos->size());
	repos->push_back(newrepo);
	}
	}
	}

	void MainWindow::refrectRepositories()
	{
	QList<RepositoryItem> newrepos;
	int n = ui->treeWidget_repos->topLevelItemCount();
	for (int i = 0; i < n; i++) {
	QTreeWidgetItem *item = ui->treeWidget_repos->topLevelItem(i);
	buildRepoTree(QString(), item, &newrepos);
	}
	*getReposPtr() = std::move(newrepos);
	saveRepositoryBookmarks();
	}

	void MainWindow::onRepositoriesTreeDropped()
	{
	refrectRepositories();
	QTreeWidgetItem *item = ui->treeWidget_repos->currentItem();
	if (item) item->setExpanded(true);
	}

	const QPixmap &MainWindow::digitsPixmap() const
	{
	return m->digits;
	}

	int MainWindow::digitWidth() const
	{
	return 5;
	}

	int MainWindow::digitHeight() const
	{
	return 7;
	}

	void MainWindow::drawDigit(QPainter *pr, int x, int y, int n) const
	{
	int w = digitWidth();
	int h = digitHeight();
	pr->drawPixmap(x, y, w, h, m->digits, n * w, 0, w, h);
	}

	QString BasicMainWindow::defaultWorkingDir() const
	{
	return appsettings()->default_working_dir;
	}

	QColor MainWindow::color(unsigned int i)
	{
	unsigned int n = m->graph_color.width();
	if (n > 0) {
	n--;
	if (i > n) i = n;
	QRgb const p = (QRgb const )m->graph_color.scanLine(0);
	return QColor(qRed(p[i]), qGreen(p[i]), qBlue(p[i]));
	}
	return Qt::black;
	}

	//QString MainWindow::currentWorkingCopyDir() const
	//{
	// QString workdir = BasicMainWindow::currentWorkingCopyDir();
	// if (workdir.isEmpty()) {
	// RepositoryItem const *repo = selectedRepositoryItem();
	// if (repo) {
	// workdir = repo->local_dir;
	// return workdir;
	// }
	// }
	// return workdir;
	//}

	RepositoryItem const BasicMainWindow::findRegisteredRepository(QString workdir) const
	{
	workdir = QDir(workdir).absolutePath();
	workdir->replace('\\', '/');

	if (Git::isValidWorkingCopy(*workdir)) {
	for (RepositoryItem const &item : getRepos()) {
	Qt::CaseSensitivity cs = Qt::CaseSensitive;
	#ifdef Q_OS_WIN
	cs = Qt::CaseInsensitive;
	#endif
	if (workdir->compare(item.local_dir, cs) == 0) {
	return &item;
	}
	}
	}
	return nullptr;
	}

	int MainWindow::repositoryIndex_(QTreeWidgetItem const *item) const
	{
	if (item) {
	int i = item->data(0, IndexRole).toInt();
	if (i >= 0 && i < getRepos().size()) {
	return i;
	}
	}
	return -1;
	}

	RepositoryItem const MainWindow::repositoryItem(QTreeWidgetItem const item) const
	{
	int row = repositoryIndex_(item);
	QList<RepositoryItem> const &repos = getRepos();
	return (row >= 0 && row < repos.size()) ? &repos[row] : nullptr;
	}

	RepositoryItem const *MainWindow::selectedRepositoryItem() const
	{
	return repositoryItem(ui->treeWidget_repos->currentItem());
	}

	static QTreeWidgetItem *newQTreeWidgetItem()
	{
	auto *item = new QTreeWidgetItem;
	item->setSizeHint(0, QSize(20, 20));
	return item;
	}

	QTreeWidgetItem *MainWindow::newQTreeWidgetFolderItem(QString const &name)
	{
	QTreeWidgetItem *item = newQTreeWidgetItem();
	item->setText(0, name);
	item->setData(0, IndexRole, GroupItem);
	item->setIcon(0, getFolderIcon());
	item->setFlags(item->flags() \| Qt::ItemIsEditable);
	return item;
	}

	void MainWindow::updateRepositoriesList()
	{
	QString path = getBookmarksFilePath();

	auto *repos = getReposPtr();
	*repos = RepositoryBookmark::load(path);

	QString filter = getRepositoryFilterText();

	ui->treeWidget_repos->clear();

	std::map<QString, QTreeWidgetItem *> parentmap;

	for (int i = 0; i < repos->size(); i++) {
	RepositoryItem const &repo = repos->at(i);
	if (!filter.isEmpty() && repo.name.indexOf(filter, 0, Qt::CaseInsensitive) < 0) {
	continue;
	}
	QTreeWidgetItem *parent = nullptr;
	{
	QString group = repo.group;
	if (group.startsWith('/')) {
	group = group.mid(1);
	}
	auto it = parentmap.find(group);
	if (it != parentmap.end()) {
	parent = it->second;
	}
	if (!parent) {
	QStringList list = group.split('/', QString::SkipEmptyParts);
	if (list.isEmpty()) {
	list.push_back(tr("Default"));
	}
	for (QString const &name : list) {
	if (name.isEmpty()) continue;
	if (!parent) {
	auto it = parentmap.find(name);
	if (it != parentmap.end()) {
	parent = it->second;
	} else {
	parent = newQTreeWidgetFolderItem(name);
	ui->treeWidget_repos->addTopLevelItem(parent);
	}
	} else {
	QTreeWidgetItem *child = newQTreeWidgetFolderItem(name);
	parent->addChild(child);
	parent = child;
	}
	parent->setExpanded(true);
	}
	Q_ASSERT(parent);
	parentmap[group] = parent;
	}
	parent->setData(0, FilePathRole, "");
	}
	QTreeWidgetItem *child = newQTreeWidgetItem();
	child->setText(0, repo.name);
	child->setData(0, IndexRole, i);
	child->setIcon(0, getRepositoryIcon());
	child->setFlags(child->flags() & ~Qt::ItemIsDropEnabled);
	parent->addChild(child);
	parent->setExpanded(true);
	}
	}

	void MainWindow::showFileList(FilesListType files_list_type)
	{
	switch (files_list_type) {
	case FilesListType::SingleList:
	ui->stackedWidget_filelist->setCurrentWidget(ui->page_files);
	break;
	case FilesListType::SideBySide:
	ui->stackedWidget_filelist->setCurrentWidget(ui->page_uncommited);
	break;
	}
	}

	void MainWindow::clearFileList()
	{
	showFileList(FilesListType::SingleList);
	ui->listWidget_unstaged->clear();
	ui->listWidget_staged->clear();
	ui->listWidget_files->clear();
	}

	void MainWindow::clearDiffView()
	{
	ui->widget_diff_view->clearDiffView();
	}

	void MainWindow::clearRepositoryInfo()
	{
	internalClearRepositoryInfo();
	ui->label_repo_name->setText(QString());
	ui->label_branch_name->setText(QString());
	}

	void MainWindow::setRepositoryInfo(QString const &reponame, QString const &brname)
	{
	ui->label_repo_name->setText(reponame);
	ui->label_branch_name->setText(brname);
	}

	void MainWindow::updateFilesList(QString id, bool wait)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (!wait) return;

	clearFileList();

	Git::FileStatusList stats = g->status_s();
	setUncommitedChanges(!stats.empty());

	FilesListType files_list_type = FilesListType::SingleList;

	bool staged = false;
	auto AddItem = [&](QString const &filename, QString header, int idiff){
	if (header.isEmpty()) {
	header = "(??\?) "; // damn trigraph
	}
	QListWidgetItem *item = new QListWidgetItem(filename);
	item->setSizeHint(QSize(item->sizeHint().width(), 18));
	item->setData(FilePathRole, filename);
	item->setData(DiffIndexRole, idiff);
	item->setData(HunkIndexRole, -1);
	item->setData(HeaderRole, header);
	switch (files_list_type) {
	case FilesListType::SingleList:
	ui->listWidget_files->addItem(item);
	break;
	case FilesListType::SideBySide:
	if (staged) {
	ui->listWidget_staged->addItem(item);
	} else {
	ui->listWidget_unstaged->addItem(item);
	}
	break;
	}
	};

	if (id.isEmpty()) {
	bool uncommited = isThereUncommitedChanges();
	if (uncommited) {
	files_list_type = FilesListType::SideBySide;
	}
	if (!makeDiff(uncommited ? QString() : id, diffResult())) {
	return;
	}

	std::map<QString, int> diffmap;

	for (int idiff = 0; idiff < diffResult()->size(); idiff++) {
	Git::Diff const &diff = diffResult()->at(idiff);
	QString filename = diff.path;
	if (!filename.isEmpty()) {
	diffmap[filename] = idiff;
	}
	}

	showFileList(files_list_type);

	for (Git::FileStatus const &s : stats) {
	staged = (s.isStaged() && s.code_y() == ' ');
	int idiff = -1;
	QString header;
	auto it = diffmap.find(s.path1());
	if (it != diffmap.end()) {
	idiff = it->second;
	}
	QString path = s.path1();
	if (s.code() == Git::FileStatusCode::Unknown) {
	qDebug() << "something wrong...";
	} else if (s.code() == Git::FileStatusCode::Untracked) {
	// nop
	} else if (s.isUnmerged()) {
	header += "(unmerged) ";
	} else if (s.code() == Git::FileStatusCode::AddedToIndex) {
	header = "(add) ";
	} else if (s.code_x() == 'D' \|\| s.code_y() == 'D' \|\| s.code() == Git::FileStatusCode::DeletedFromIndex) {
	header = "(del) ";
	} else if (s.code_x() == 'R' \|\| s.code() == Git::FileStatusCode::RenamedInIndex) {
	header = "(ren) ";
	path = s.path2(); // renamed newer path
	} else if (s.code_x() == 'M' \|\| s.code_y() == 'M') {
	header = "(chg) ";
	}
	AddItem(path, header, idiff);
	}
	} else {
	if (!makeDiff(id, diffResult())) {
	return;
	}
	showFileList(files_list_type);
	addDiffItems(diffResult(), AddItem);
	}

	for (Git::Diff const &diff : *diffResult()) {
	QString key = GitDiff::makeKey(diff);
	(*getDiffCacheMap())[key] = diff;
	}
	}

	void MainWindow::updateFilesList(Git::CommitItem const &commit, bool wait)
	{
	QString id;
	if (Git::isUncommited(commit)) {
	// empty id for uncommited changes
	} else {
	id = commit.commit_id;
	}
	updateFilesList(id, wait);
	}

	void MainWindow::updateCurrentFilesList()
	{
	auto logs = getLogs();
	QTableWidgetItem *item = ui->tableWidget_log->item(selectedLogIndex(), 0);
	if (!item) return;
	int row = item->data(IndexRole).toInt();
	int count = (int)logs.size();
	if (row < count) {
	updateFilesList(logs[row], true);
	}
	}

	void MainWindow::prepareLogTableWidget()
	{
	QStringList cols = {
	tr("Graph"),
	tr("Commit"),
	tr("Date"),
	tr("Author"),
	tr("Message"),
	};
	int n = cols.size();
	ui->tableWidget_log->setColumnCount(n);
	ui->tableWidget_log->setRowCount(0);
	for (int i = 0; i < n; i++) {
	QString const &text = cols[i];
	auto *item = new QTableWidgetItem(text);
	ui->tableWidget_log->setHorizontalHeaderItem(i, item);
	}

	updateCommitGraph(); // コミットグラフを更新
	}

	void MainWindow::detectGitServerType(GitPtr const &g)
	{
	setServerType(ServerType::Standard);
	*ptrGitHub() = GitHubRepositoryInfo();

	QString push_url;
	QList<Git::Remote> remotes;
	g->getRemoteURLs(&remotes);
	for (Git::Remote const &r : remotes) {
	if (r.purpose == "push") {
	push_url = r.url;
	}
	}

	auto Check = [&](QString const &s){
	int i = push_url.indexOf(s);
	if (i > 0) return i + s.size();
	return 0;
	};

	// check GitHub
	int pos = Check("@github.com:");
	if (pos == 0) {
	pos = Check("://github.com/");
	}
	if (pos > 0) {
	int end = push_url.size();
	{
	QString s = ".git";
	if (push_url.endsWith(s)) {
	end -= s.size();
	}
	}
	QString s = push_url.mid(pos, end - pos);
	int i = s.indexOf('/');
	if (i > 0) {
	auto *p = ptrGitHub();
	QString user = s.mid(0, i);
	QString repo = s.mid(i + 1);
	p->owner_account_name = user;
	p->repository_name = repo;
	}
	setServerType(ServerType::GitHub);
	}
	}

	void MainWindow::clearLog()
	{
	clearLogs();
	clearLabelMap();
	setUncommitedChanges(false);
	ui->tableWidget_log->clearContents();
	ui->tableWidget_log->scrollToTop();
	}

	void MainWindow::openRepository_(GitPtr g, bool keep_selection)
	{
	getObjCache()->setup(g);

	int scroll_pos = -1;
	int select_row = -1;

	if (keep_selection) {
	scroll_pos = ui->tableWidget_log->verticalScrollBar()->value();
	select_row = ui->tableWidget_log->currentRow();
	}

	if (isValidWorkingCopy(g)) {

	bool do_fetch = isOnlineMode() && (getForceFetch() \|\| appsettings()->automatically_fetch_when_opening_the_repository);
	setForceFetch(false);
	if (do_fetch) {
	if (!fetch(g, false)) {
	return;
	}
	}

	clearLog();
	clearRepositoryInfo();

	detectGitServerType(g);

	updateFilesList(QString(), true);

	bool canceled = false;
	ui->tableWidget_log->setEnabled(false);

	// ログを取得
	setLogs(retrieveCommitLog(g));
	// ブランチを取得
	queryBranches(g);
	// タグを取得
	ptrTagMap()->clear();
	QList<Git::Tag> tags = g->tags();
	for (Git::Tag const &tag : tags) {
	Git::Tag t = tag;
	t.id = getObjCache()->getCommitIdFromTag(t.id);
	(*ptrTagMap())[t.id].push_back(t);
	}

	ui->tableWidget_log->setEnabled(true);
	updateCommitTableLater();
	if (canceled) return;

	QString branch_name;
	if (currentBranch().flags & Git::Branch::HeadDetachedAt) {
	branch_name += QString("(HEAD detached at %1)").arg(currentBranchName());
	}
	if (currentBranch().flags & Git::Branch::HeadDetachedFrom) {
	branch_name += QString("(HEAD detached from %1)").arg(currentBranchName());
	}
	if (branch_name.isEmpty()) {
	branch_name = currentBranchName();
	}

	QString repo_name = currentRepositoryName();
	setRepositoryInfo(repo_name, branch_name);
	} else {
	clearLog();
	clearRepositoryInfo();
	}

	if (!g) return;

	updateRemoteInfo();

	updateWindowTitle(g);

	setHeadId(getObjCache()->revParse("HEAD"));

	if (isThereUncommitedChanges()) {
	Git::CommitItem item;
	item.parent_ids.push_back(currentBranch().id);
	item.message = tr("Uncommited changes");
	auto p = getLogsPtr();
	p->insert(p->begin(), item);
	}

	prepareLogTableWidget();

	auto const &logs = getLogs();
	const int count = logs.size();

	ui->tableWidget_log->setRowCount(count);

	int selrow = 0;

	for (int row = 0; row < count; row++) {
	Git::CommitItem const *commit = &logs[row];
	{
	auto *item = new QTableWidgetItem;
	item->setData(IndexRole, row);
	ui->tableWidget_log->setItem(row, 0, item);
	}
	int col = 1; // カラム0はコミットグラフなので、その次から
	auto AddColumn = [&](QString const &text, bool bold, QString const &tooltip){
	auto *item = new QTableWidgetItem(text);
	if (!tooltip.isEmpty()) {
	QString tt = tooltip;
	tt.replace('\n', ' ');
	tt = tt.toHtmlEscaped();
	tt = "<p style='white-space: pre'>" + tt + "</p>";
	item->setToolTip(tt);
	}
	if (bold) {
	QFont font = item->font();
	font.setBold(true);
	item->setFont(font);
	}
	ui->tableWidget_log->setItem(row, col, item);
	col++;
	};
	QString commit_id;
	QString datetime;
	QString author;
	QString message;
	QString message_ex;
	bool isHEAD = (commit->commit_id == getHeadId());
	bool bold = false;
	{
	if (Git::isUncommited(*commit)) { // 未コミットの時
	bold = true; // 太字
	selrow = row;
	} else {
	if (isHEAD && !isThereUncommitedChanges()) { // HEADで、未コミットがないとき
	bold = true; // 太字
	selrow = row;
	}
	commit_id = abbrevCommitID(*commit);
	}
	datetime = misc::makeDateTimeString(commit->commit_date);
	author = commit->author;
	message = commit->message;
	message_ex = makeCommitInfoText(row, &(*getLabelMap())[row]);
	}
	AddColumn(commit_id, false, QString());
	AddColumn(datetime, false, QString());
	AddColumn(author, false, QString());
	AddColumn(message, bold, message + message_ex);
	ui->tableWidget_log->setRowHeight(row, 24);
	}
	int t = ui->tableWidget_log->columnWidth(0);
	ui->tableWidget_log->resizeColumnsToContents();
	ui->tableWidget_log->setColumnWidth(0, t);
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(false);
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(true);

	m->last_focused_file_list = nullptr;

	ui->tableWidget_log->setFocus();

	if (select_row < 0) {
	setCurrentLogRow(selrow);
	} else {
	setCurrentLogRow(select_row);
	ui->tableWidget_log->verticalScrollBar()->setValue(scroll_pos >= 0 ? scroll_pos : 0);
	}

	m->remote_watcher.setCurrent(currentRemoteName(), currentBranchName());

	updateUI();
	}

	void MainWindow::removeSelectedRepositoryFromBookmark(bool ask)
	{
	int i = indexOfRepository(ui->treeWidget_repos->currentItem());
	removeRepositoryFromBookmark(i, ask);
	}

	void MainWindow::setNetworkingCommandsEnabled(bool enabled)
	{
	ui->action_clone->setEnabled(enabled);

	ui->toolButton_clone->setEnabled(enabled);

	if (!Git::isValidWorkingCopy(currentWorkingCopyDir())) {
	enabled = false;
	}

	bool opened = !currentRepository().name.isEmpty();
	ui->action_fetch->setEnabled(enabled \|\| opened);
	ui->toolButton_fetch->setEnabled(enabled \|\| opened);

	if (isOnlineMode()) {
	ui->action_fetch->setText(tr("Fetch"));
	ui->toolButton_fetch->setText(tr("Fetch"));
	} else {
	ui->action_fetch->setText(tr("Update"));
	ui->toolButton_fetch->setText(tr("Update"));
	}

	ui->action_fetch_prune->setEnabled(enabled);
	ui->action_pull->setEnabled(enabled);
	ui->action_push->setEnabled(enabled);
	ui->action_push_u->setEnabled(enabled);
	ui->action_push_all_tags->setEnabled(enabled);

	ui->toolButton_pull->setEnabled(enabled);
	ui->toolButton_push->setEnabled(enabled);
	}

	void MainWindow::updateUI()
	{
	setNetworkingCommandsEnabled(isOnlineMode());

	ui->toolButton_fetch->setDot(getRemoteChanged());

	Git::Branch b = currentBranch();
	ui->toolButton_push->setNumber(b.ahead > 0 ? b.ahead : -1);
	ui->toolButton_pull->setNumber(b.behind > 0 ? b.behind : -1);

	{
	bool f = isRepositoryOpened();
	ui->toolButton_status->setEnabled(f);
	ui->toolButton_terminal->setEnabled(f);
	ui->toolButton_explorer->setEnabled(f);
	ui->action_repository_status->setEnabled(f);
	ui->action_terminal->setEnabled(f);
	ui->action_explorer->setEnabled(f);
	}
	}

	void MainWindow::updateStatusBarText()
	{
	QString text;

	QWidget *w = qApp->focusWidget();
	if (w == ui->treeWidget_repos) {
	RepositoryItem const *repo = selectedRepositoryItem();
	if (repo) {
	text = QString("%1 : %2")
	.arg(repo->name)
	.arg(misc::normalizePathSeparator(repo->local_dir))
	;
	}
	} else if (w == ui->tableWidget_log) {
	QTableWidgetItem *item = ui->tableWidget_log->item(selectedLogIndex(), 0);
	if (item) {
	auto const &logs = getLogs();
	int row = item->data(IndexRole).toInt();
	if (row < (int)logs.size()) {
	Git::CommitItem const &commit = logs[row];
	if (Git::isUncommited(commit)) {
	text = tr("Uncommited changes");
	} else {
	QString id = commit.commit_id;
	text = QString("%1 : %2%3")
	.arg(id.mid(0, 7))
	.arg(commit.message)
	.arg(makeCommitInfoText(row, nullptr))
	;
	}
	}
	}
	}

	setStatusBarText(text);
	}

	void MainWindow::mergeBranch(QString const &commit, Git::MergeFastForward ff)
	{
	if (commit.isEmpty()) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->mergeBranch(commit, ff);
	openRepository(true);
	}

	void MainWindow::mergeBranch(Git::CommitItem const *commit, Git::MergeFastForward ff)
	{
	if (!commit) return;
	mergeBranch(commit->commit_id, ff);
	}

	void MainWindow::rebaseBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QString text = tr("Are you sure you want to rebase the commit ?");
	text += "\n\n";
	text += "> git rebase " + commit->commit_id;
	int r = QMessageBox::information(this, tr("Rebase"), text, QMessageBox::Ok, QMessageBox::Cancel);
	if (r == QMessageBox::Ok) {
	g->rebaseBranch(commit->commit_id);
	openRepository(true);
	}
	}

	void MainWindow::cherrypick(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;



	int n = commit->parent_ids.size();
	if (n == 1) {
	g->cherrypick(commit->commit_id);
	} else if (n > 1) {
	Git::CommitItem head;
	Git::CommitItem pick;
	g->queryCommit(g->rev_parse("HEAD"), &head);
	g->queryCommit(commit->commit_id, &pick);
	QList<Git::CommitItem> parents;
	for (int i = 0; i < n; i++) {
	QString id = commit->commit_id + QString("^%1").arg(i + 1);
	id = g->rev_parse(id);
	Git::CommitItem item;
	g->queryCommit(id, &item);
	parents.push_back(item);
	}
	CherryPickDialog dlg(this, head, pick, parents);
	if (dlg.exec() == QDialog::Accepted) {
	QString cmd = "-m %1 ";
	cmd = cmd.arg(dlg.number());
	if (dlg.allowEmpty()) {
	cmd += "--allow-empty ";
	}
	cmd += commit->commit_id;
	g->cherrypick(cmd);
	} else {
	return;
	}
	}

	openRepository(true);
	}

	void MainWindow::merge(Git::CommitItem const *commit)
	{
	if (isThereUncommitedChanges()) return;

	if (!commit) {
	int row = selectedLogIndex();
	commit = commitItem(row);
	if (!commit) return;
	}

	if (!Git::isValidID(commit->commit_id)) return;

	static const char MergeFastForward[] = "MergeFastForward";

	QString fastforward;
	{
	MySettings s;
	s.beginGroup("Behavior");
	fastforward = s.value(MergeFastForward).toString();
	s.endGroup();
	}

	std::vector<QString> labels;
	{
	int row = selectedLogIndex();
	QList<Label> const *v = label(row);
	for (Label const &label : *v) {
	if (label.kind == Label::LocalBranch \|\| label.kind == Label::Tag) {
	labels.push_back(label.text);
	}
	}
	std::sort(labels.begin(), labels.end());
	labels.erase(std::unique(labels.begin(), labels.end()), labels.end());
	}

	labels.push_back(commit->commit_id);

	QString branch_name = currentBranchName();

	MergeDialog dlg(fastforward, labels, branch_name, this);
	if (dlg.exec() == QDialog::Accepted) {
	fastforward = dlg.getFastForwardPolicy();
	{
	MySettings s;
	s.beginGroup("Behavior");
	s.setValue(MergeFastForward, fastforward);
	s.endGroup();
	}
	QString from = dlg.mergeFrom();
	mergeBranch(from, MergeDialog::ff(fastforward));
	}
	}

	void MainWindow::showStatus()
	{
	auto g = git();
	if (!g->isValidWorkingCopy()) {
	msgNoRepositorySelected();
	return;
	}
	QString s = g->status();
	TextEditDialog dlg(this);
	dlg.setWindowTitle(tr("Status"));
	dlg.setText(s, true);
	dlg.exec();
	}

	void MainWindow::on_action_commit_triggered()
	{
	commit();
	}

	void MainWindow::on_action_fetch_triggered()
	{
	if (isOnlineMode()) {
	reopenRepository(true, [&](GitPtr g){
	fetch(g, false);
	});
	} else {
	updateRepository();
	}
	}



	void MainWindow::on_action_fetch_prune_triggered()
	{
	if (!isOnlineMode()) return;

	reopenRepository(true, [&](GitPtr g){
	fetch(g, true);
	});
	}

	void MainWindow::on_action_push_triggered()
	{
	push();
	}

	void MainWindow::on_action_pull_triggered()
	{
	if (!isOnlineMode()) return;

	reopenRepository(true, [&](GitPtr g){
	setPtyCondition(PtyCondition::Pull);
	setPtyProcessOk(true);
	g->pull(getPtyProcess());
	while (1) {
	if (getPtyProcess()->wait(1)) break;
	QApplication::processEvents();
	}
	});
	}

	void MainWindow::on_toolButton_push_clicked()
	{
	ui->action_push->trigger();
	}

	void MainWindow::on_toolButton_pull_clicked()
	{
	ui->action_pull->trigger();
	}

	void MainWindow::on_toolButton_status_clicked()
	{
	showStatus();
	}

	void MainWindow::on_action_repository_status_triggered()
	{
	showStatus();
	}

	void MainWindow::on_treeWidget_repos_currentItemChanged(QTreeWidgetItem * /current/, QTreeWidgetItem * /previous/)
	{
	updateStatusBarText();
	}

	void MainWindow::on_treeWidget_repos_itemDoubleClicked(QTreeWidgetItem * /item/, int /column/)
	{
	openSelectedRepository();
	}

	void BasicMainWindow::execCommitPropertyDialog(QWidget parent, Git::CommitItem const commit)
	{
	CommitPropertyDialog dlg(parent, this, commit);
	dlg.exec();
	}

	int MainWindow::indexOfRepository(QTreeWidgetItem const *treeitem) const
	{
	if (!treeitem) return -1;
	return treeitem->data(0, IndexRole).toInt();
	}

	void MainWindow::on_treeWidget_repos_customContextMenuRequested(const QPoint &pos)
	{
	QTreeWidgetItem *treeitem = ui->treeWidget_repos->currentItem();
	if (!treeitem) return;

	RepositoryItem const *repo = repositoryItem(treeitem);

	int index = indexOfRepository(treeitem);
	if (isGroupItem(treeitem)) { // group item
	QMenu menu;
	QAction *a_add_new_group = menu.addAction(tr("&Add new group"));
	QAction *a_delete_group = menu.addAction(tr("&Delete group"));
	QAction *a_rename_group = menu.addAction(tr("&Rename group"));
	QPoint pt = ui->treeWidget_repos->mapToGlobal(pos);
	QAction *a = menu.exec(pt + QPoint(8, -8));
	if (a) {
	if (a == a_add_new_group) {
	QTreeWidgetItem *child = newQTreeWidgetFolderItem(tr("New group"));
	treeitem->addChild(child);
	child->setFlags(child->flags() \| Qt::ItemIsEditable);
	ui->treeWidget_repos->setCurrentItem(child);
	return;
	}
	if (a == a_delete_group) {
	QTreeWidgetItem *parent = treeitem->parent();
	if (parent) {
	int i = parent->indexOfChild(treeitem);
	delete parent->takeChild(i);
	} else {
	int i = ui->treeWidget_repos->indexOfTopLevelItem(treeitem);
	delete ui->treeWidget_repos->takeTopLevelItem(i);
	}
	refrectRepositories();
	return;
	}
	if (a == a_rename_group) {
	ui->treeWidget_repos->editItem(treeitem);
	return;
	}
	}
	} else if (repo) { // repository item
	QString open_terminal = tr("Open &terminal");
	QString open_commandprompt = tr("Open command promp&t");
	QMenu menu;
	QAction *a_open = menu.addAction(tr("&Open"));
	menu.addSeparator();
	#ifdef Q_OS_WIN
	QAction *a_open_terminal = menu.addAction(open_commandprompt);
	(void)open_terminal;
	#else
	QAction *a_open_terminal = menu.addAction(open_terminal);
	(void)open_commandprompt;
	#endif
	a_open_terminal->setIcon(QIcon(":/image/terminal.svg"));

	QAction *a_open_folder = menu.addAction(tr("Open &folder"));
	a_open_folder->setIcon(QIcon(":/image/explorer.svg"));

	menu.addSeparator();

	QAction *a_remove = menu.addAction(tr("&Remove"));

	menu.addSeparator();

	QAction *a_properties = addMenuActionProperty(&menu);

	QPoint pt = ui->treeWidget_repos->mapToGlobal(pos);
	QAction *a = menu.exec(pt + QPoint(8, -8));

	if (a) {
	if (a == a_open) {
	openSelectedRepository();
	return;
	}
	if (a == a_open_folder) {
	openExplorer(repo);
	return;
	}
	if (a == a_open_terminal) {
	openTerminal(repo);
	return;
	}
	if (a == a_remove) {
	removeRepositoryFromBookmark(index, true);
	return;
	}
	if (a == a_properties) {
	execRepositoryPropertyDialog(*repo);
	return;
	}
	}
	}
	}

	void MainWindow::on_tableWidget_log_customContextMenuRequested(const QPoint &pos)
	{
	int row = selectedLogIndex();
	Git::CommitItem const *commit = commitItem(row);
	if (commit) {
	bool is_valid_commit_id = Git::isValidID(commit->commit_id);

	QMenu menu;

	QAction *a_copy_id_7letters = is_valid_commit_id ? menu.addAction(tr("Copy commit id (7 letters)")) : nullptr;
	QAction *a_copy_id_complete = is_valid_commit_id ? menu.addAction(tr("Copy commit id (completely)")) : nullptr;

	std::set<QAction *> copy_label_actions;
	{
	QList<BasicMainWindow::Label> v = sortedLabels(row);
	if (!v.isEmpty()) {
	auto *copy_lebel_menu = menu.addMenu("Copy label");
	for (BasicMainWindow::Label const &l : v) {
	QAction *a = copy_lebel_menu->addAction(l.text);
	copy_label_actions.insert(copy_label_actions.end(), a);
	}
	}
	}

	menu.addSeparator();

	QAction *a_checkout = menu.addAction(tr("Checkout/Branch..."));

	menu.addSeparator();

	QAction *a_edit_message = nullptr;

	auto canEditMessage = [&](){
	if (commit->has_child) return false; // 子がないこと
	if (Git::isUncommited(*commit)) return false; // 未コミットがないこと
	bool is_head = false;
	bool has_remote_branch = false;
	QList<Label> const *labels = label(row);
	for (const Label &label : *labels) {
	if (label.kind == Label::Head) {
	is_head = true;
	} else if (label.kind == Label::RemoteBranch) {
	has_remote_branch = true;
	}
	}
	return is_head && !has_remote_branch; // HEAD && リモートブランチ無し
	};
	if (canEditMessage()) {
	a_edit_message = menu.addAction(tr("Edit message..."));
	}

	QAction *a_merge = is_valid_commit_id ? menu.addAction(tr("Merge")) : nullptr;
	QAction *a_rebase = is_valid_commit_id ? menu.addAction(tr("Rebase")) : nullptr;
	QAction *a_cherrypick = is_valid_commit_id ? menu.addAction(tr("Cherry-pick")) : nullptr;
	QAction *a_edit_tags = is_valid_commit_id ? menu.addAction(tr("Edit tags...")) : nullptr;
	QAction *a_revert = is_valid_commit_id ? menu.addAction(tr("Revert")) : nullptr;

	menu.addSeparator();

	QAction *a_delbranch = is_valid_commit_id ? menu.addAction(tr("Delete branch...")) : nullptr;
	QAction *a_delrembranch = remoteBranches(commit->commit_id, nullptr).isEmpty() ? nullptr : menu.addAction(tr("Delete remote branch..."));

	menu.addSeparator();

	QAction *a_explore = is_valid_commit_id ? menu.addAction(tr("Explore")) : nullptr;
	QAction *a_properties = addMenuActionProperty(&menu);

	QAction *a = menu.exec(ui->tableWidget_log->viewport()->mapToGlobal(pos) + QPoint(8, -8));
	if (a) {
	if (a == a_copy_id_7letters) {
	qApp->clipboard()->setText(commit->commit_id.mid(0, 7));
	return;
	}
	if (a == a_copy_id_complete) {
	qApp->clipboard()->setText(commit->commit_id);
	return;
	}
	if (a == a_properties) {
	execCommitPropertyDialog(this, commit);
	return;
	}
	if (a == a_edit_message) {
	commitAmend();
	return;
	}
	if (a == a_checkout) {
	checkout(this, commit);
	return;
	}
	if (a == a_delbranch) {
	deleteBranch(commit);
	return;
	}
	if (a == a_delrembranch) {
	deleteRemoteBranch(commit);
	return;
	}
	if (a == a_merge) {
	merge(commit);
	return;
	}
	if (a == a_rebase) {
	rebaseBranch(commit);
	return;
	}
	if (a == a_cherrypick) {
	cherrypick(commit);
	return;
	}
	if (a == a_edit_tags) {
	ui->action_edit_tags->trigger();
	return;
	}
	if (a == a_revert) {
	revertCommit();
	return;
	}
	if (a == a_explore) {
	execCommitExploreWindow(this, commit);
	return;
	}
	if (copy_label_actions.find(a) != copy_label_actions.end()) {
	QString text = a->text();
	QApplication::clipboard()->setText(text);
	return;
	}
	}
	}
	}

	void MainWindow::on_listWidget_files_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QMenu menu;
	QAction *a_delete = menu.addAction(tr("Delete"));
	QAction *a_untrack = menu.addAction(tr("Untrack"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);

	QPoint pt = ui->listWidget_files->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_files->currentItem();
	if (a == a_delete) {
	if (askAreYouSureYouWantToRun("Delete", tr("Delete selected files."))) {
	for_each_selected_files([&](QString const &path){
	g->removeFile(path);
	g->chdirexec([&](){
	QFile(path).remove();
	return true;
	});
	});
	openRepository(false);
	}
	} else if (a == a_untrack) {
	if (askAreYouSureYouWantToRun("Untrack", tr("rm --cached files"))) {
	for_each_selected_files([&](QString const &path){
	g->rm_cached(path);
	});
	openRepository(false);
	}
	} else if (a == a_history) {
	execFileHistory(item);
	} else if (a == a_blame) {
	blame(item);
	} else if (a == a_properties) {
	execFilePropertyDialog(item);
	}
	}
	}

	void MainWindow::on_listWidget_unstaged_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QList<QListWidgetItem *> items = ui->listWidget_unstaged->selectedItems();
	if (!items.isEmpty()) {
	QMenu menu;
	QAction *a_stage = menu.addAction(tr("Stage"));
	QAction *a_reset_file = menu.addAction(tr("Reset"));
	QAction *a_ignore = menu.addAction(tr("Ignore"));
	QAction *a_delete = menu.addAction(tr("Delete"));
	QAction *a_untrack = menu.addAction(tr("Untrack"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);
	QPoint pt = ui->listWidget_unstaged->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_unstaged->currentItem();
	if (a == a_stage) {
	for_each_selected_files([&](QString const &path){
	g->stage(path);
	});
	updateCurrentFilesList();
	return;
	}
	if (a == a_reset_file) {
	QStringList paths;
	for_each_selected_files([&](QString const &path){
	paths.push_back(path);
	});
	resetFile(paths);
	return;
	}
	if (a == a_ignore) {
	QString gitignore_path = currentWorkingCopyDir() / ".gitignore";
	if (items.size() == 1) {
	QString file = getFilePath(items[0]);
	EditGitIgnoreDialog dlg(this, gitignore_path, file);
	if (dlg.exec() == QDialog::Accepted) {
	QString appending = dlg.text();
	if (!appending.isEmpty()) {
	QString text;

	QString path = gitignore_path;
	path.replace('/', QDir::separator());

	{
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	text += QString::fromUtf8(file.readAll());
	}
	}

	size_t n = text.size();
	if (n > 0 && text[(int)n - 1] != '\n') {
	text += '\n'; // 最後に改行を追加
	}

	text += appending + '\n';

	{
	QFile file(path);
	if (file.open(QFile::WriteOnly)) {
	file.write(text.toUtf8());
	}
	}
	updateCurrentFilesList();
	return;
	}
	} else {
	return;
	}
	}

	QString append;
	for_each_selected_files([&](QString const &path){
	if (path == ".gitignore") {
	// skip
	} else {
	append += path + '\n';
	}
	});
	if (TextEditDialog::editFile(this, gitignore_path, ".gitignore", append)) {
	updateCurrentFilesList();
	}
	return;
	}
	if (a == a_delete) {
	if (askAreYouSureYouWantToRun("Delete", "Delete selected files.")) {
	for_each_selected_files([&](QString const &path){
	g->removeFile(path);
	g->chdirexec([&](){
	QFile(path).remove();
	return true;
	});
	});
	openRepository(false);
	}
	return;
	}
	if (a == a_untrack) {
	if (askAreYouSureYouWantToRun("Untrack", "rm --cached")) {
	for_each_selected_files([&](QString const &path){
	g->rm_cached(path);
	});
	openRepository(false);
	}
	return;
	}
	if (a == a_history) {
	execFileHistory(item);
	return;
	}
	if (a == a_blame) {
	blame(item);
	return;
	}
	if (a == a_properties) {
	execFilePropertyDialog(item);
	return;
	}
	}
	}
	}

	void MainWindow::on_listWidget_staged_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QListWidgetItem *item = ui->listWidget_staged->currentItem();
	if (item) {
	QString path = getFilePath(item);
	QString fullpath = currentWorkingCopyDir() / path;
	if (QFileInfo(fullpath).isFile()) {
	QMenu menu;
	QAction *a_unstage = menu.addAction(tr("Unstage"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);
	QPoint pt = ui->listWidget_staged->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_unstaged->currentItem();
	if (a == a_unstage) {
	g->unstage(path);
	openRepository(false);
	} else if (a == a_history) {
	execFileHistory(item);
	} else if (a == a_blame) {
	blame(item);
	} else if (a == a_properties) {
	execFilePropertyDialog(item);
	}
	}
	}
	}
	}

	QStringList MainWindow::selectedFiles_(QListWidget *listwidget) const
	{
	QStringList list;
	QList<QListWidgetItem *> items = listwidget->selectedItems();
	for (QListWidgetItem *item : items) {
	QString path = getFilePath(item);
	list.push_back(path);
	}
	return list;

	}

	QStringList MainWindow::selectedFiles() const
	{
	if (m->last_focused_file_list == ui->listWidget_files) return selectedFiles_(ui->listWidget_files);
	if (m->last_focused_file_list == ui->listWidget_staged) return selectedFiles_(ui->listWidget_staged);
	if (m->last_focused_file_list == ui->listWidget_unstaged) return selectedFiles_(ui->listWidget_unstaged);
	return QStringList();
	}

	void MainWindow::for_each_selected_files(std::function<void(QString const&)> const &fn)
	{
	for (QString const &path : selectedFiles()) {
	fn(path);
	}
	}

	void BasicMainWindow::execFileHistory(QListWidgetItem *item)
	{
	if (item) {
	QString path = getFilePath(item);
	if (!path.isEmpty()) {
	execFileHistory(path);
	}
	}
	}

	void MainWindow::doLogCurrentItemChanged()
	{
	clearFileList();

	int row = selectedLogIndex();
	QTableWidgetItem *item = ui->tableWidget_log->item(row, 0);
	if (item) {
	auto const &logs = getLogs();
	int row = item->data(IndexRole).toInt();
	if (row < (int)logs.size()) {
	updateStatusBarText();
	*ptrUpdateFilesListCounter() = 200;
	}
	} else {
	row = -1;
	}
	updateAncestorCommitMap();
	ui->tableWidget_log->viewport()->update();
	}

	void MainWindow::findNext()
	{
	if (m->search_text.isEmpty()) {
	return;
	}
	auto const &logs = getLogs();
	for (int pass = 0; pass < 2; pass++) {
	int row = 0;
	if (pass == 0) {
	row = selectedLogIndex();
	if (row < 0) {
	row = 0;
	} else if (m->searching) {
	row++;
	}
	}
	while (row < (int)logs.size()) {
	Git::CommitItem const commit = logs[row];
	if (!Git::isUncommited(commit)) {
	if (commit.message.indexOf(m->search_text, 0, Qt::CaseInsensitive) >= 0) {
	bool b = ui->tableWidget_log->blockSignals(true);
	setCurrentLogRow(row);
	ui->tableWidget_log->blockSignals(b);
	m->searching = true;
	return;
	}
	}
	row++;
	}
	}
	}

	void MainWindow::findText(QString const &text)
	{
	m->search_text = text;
	}

	bool MainWindow::isAncestorCommit(QString const &id)
	{
	auto it = m->ancestors.find(id);
	return it != m->ancestors.end();
	}

	void MainWindow::updateAncestorCommitMap()
	{
	m->ancestors.clear();

	auto const &logs = getLogs();
	const size_t LogCount = logs.size();
	const size_t index = selectedLogIndex();
	if (index < LogCount) {
	// ok
	} else {
	return;
	}

	auto *logsp = getLogsPtr();
	auto LogItem = [&](size_t i)->Git::CommitItem &{ return logsp->at(i); };

	std::map<QString, size_t> commit_to_index_map;

	size_t end = LogCount;

	if (index < end) {
	for (size_t i = index; i < end; i++) {
	Git::CommitItem const &commit = LogItem(i);
	commit_to_index_map[commit.commit_id] = i;
	auto *item = ui->tableWidget_log->item(i, 0);
	QRect r = ui->tableWidget_log->visualItemRect(item);
	if (r.y() >= ui->tableWidget_log->height()) {
	end = i + 1;
	break;
	}
	}
	}

	Git::CommitItem *item = &LogItem(index);
	if (item) {
	m->ancestors.insert(m->ancestors.end(), item->commit_id);
	}

	for (size_t i = index; i < end; i++) {
	Git::CommitItem *item = &LogItem(i);
	if (isAncestorCommit(item->commit_id)) {
	for (QString const &parent : item->parent_ids) {
	m->ancestors.insert(m->ancestors.end(), parent);
	}
	}
	}
	}

	void MainWindow::on_action_open_existing_working_copy_triggered()
	{
	QString dir = defaultWorkingDir();
	dir = QFileDialog::getExistingDirectory(this, tr("Add existing working copy"), dir);
	addWorkingCopyDir(dir, false);
	}

	void MainWindow::on_action_view_refresh_triggered()
	{
	openRepository(true);
	}

	void MainWindow::on_tableWidget_log_currentItemChanged(QTableWidgetItem * /current/, QTableWidgetItem * /previous/)
	{
	doLogCurrentItemChanged();
	m->searching = false;
	}

	void MainWindow::on_toolButton_stage_clicked()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->stage(selectedFiles());
	updateCurrentFilesList();
	}

	void MainWindow::on_toolButton_unstage_clicked()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->unstage(selectedFiles());
	updateCurrentFilesList();
	}

	void MainWindow::on_toolButton_select_all_clicked()
	{
	if (ui->listWidget_unstaged->count() > 0) {
	ui->listWidget_unstaged->setFocus();
	ui->listWidget_unstaged->selectAll();
	} else if (ui->listWidget_staged->count() > 0) {
	ui->listWidget_staged->setFocus();
	ui->listWidget_staged->selectAll();
	}
	}

	void MainWindow::on_toolButton_commit_clicked()
	{
	ui->action_commit->trigger();
	}



	void MainWindow::on_action_edit_global_gitconfig_triggered()
	{
	QString dir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
	QString path = dir / ".gitconfig";
	editFile(path, ".gitconfig");
	}

	void MainWindow::on_action_edit_git_config_triggered()
	{
	QString dir = currentWorkingCopyDir();
	QString path = dir / ".git/config";
	editFile(path, ".git/config");
	}

	void MainWindow::on_action_edit_gitignore_triggered()
	{
	QString dir = currentWorkingCopyDir();
	QString path = dir / ".gitignore";
	if (editFile(path, ".gitignore")) {
	updateCurrentFilesList();
	}
	}

	int MainWindow::selectedLogIndex() const
	{
	auto const &logs = getLogs();
	int i = ui->tableWidget_log->currentRow();
	if (i >= 0 && i < (int)logs.size()) {
	return i;
	}
	return -1;
	}

	void MainWindow::updateDiffView(QListWidgetItem *item)
	{
	clearDiffView();

	m->last_selected_file_item = item;

	if (!item) return;

	int idiff = indexOfDiff(item);
	if (idiff >= 0 && idiff < diffResult()->size()) {
	Git::Diff const &diff = diffResult()->at(idiff);
	QString key = GitDiff::makeKey(diff);
	auto it = getDiffCacheMap()->find(key);
	if (it != getDiffCacheMap()->end()) {
	auto const &logs = getLogs();
	int row = ui->tableWidget_log->currentRow();
	bool uncommited = (row >= 0 && row < (int)logs.size() && Git::isUncommited(logs[row]));
	ui->widget_diff_view->updateDiffView(it->second, uncommited);
	}
	}
	}

	void MainWindow::updateDiffView()
	{
	updateDiffView(m->last_selected_file_item);
	}

	void MainWindow::updateUnstagedFileCurrentItem()
	{
	updateDiffView(ui->listWidget_unstaged->currentItem());
	}

	void MainWindow::updateStagedFileCurrentItem()
	{
	updateDiffView(ui->listWidget_staged->currentItem());
	}

	void MainWindow::on_listWidget_unstaged_currentRowChanged(int /currentRow/)
	{
	updateUnstagedFileCurrentItem();
	}

	void MainWindow::on_listWidget_staged_currentRowChanged(int /currentRow/)
	{
	updateStagedFileCurrentItem();
	}

	void MainWindow::on_listWidget_files_currentRowChanged(int /currentRow/)
	{
	updateDiffView(ui->listWidget_files->currentItem());
	}

	void MainWindow::dragEnterEvent(QDragEnterEvent *event)
	{
	if (QApplication::modalWindow()) return;

	if (event->mimeData()->hasUrls()) {
	event->acceptProposedAction();
	event->accept();
	}
	}

	void MainWindow::timerEvent(QTimerEvent *)
	{
	bool running = getPtyProcess()->isRunning();
	if (ui->toolButton_stop_process->isEnabled() != running) {
	ui->toolButton_stop_process->setEnabled(running);
	ui->action_stop_process->setEnabled(running);
	setNetworkingCommandsEnabled(!running);
	}
	if (!running) {
	setInteractionMode(InteractionMode::None);
	}

	while (1) {
	char tmp[1024];
	int len = getPtyProcess()->readOutput(tmp, sizeof(tmp));
	if (len < 1) break;
	writeLog(tmp, len);
	}
	}

	void MainWindow::keyPressEvent(QKeyEvent *event)
	{
	int c = event->key();
	if (c == Qt::Key_T && (event->modifiers() & Qt::ControlModifier)) {
	test();
	return;
	}
	if (QApplication::focusWidget() == ui->widget_log) {

	auto write_char = [&](char c){
	if (getPtyProcess()->isRunning()) {
	getPtyProcess()->writeInput(&c, 1);
	}
	};

	auto write_text = [&](QString const &str){
	std::string s = str.toStdString();
	for (char i : s) {
	write_char(i);
	}
	};

	if (c == Qt::Key_Return \|\| c == Qt::Key_Enter) {
	write_char('\n');
	} else {
	QString text = event->text();
	write_text(text);
	}
	}
	}

	void MainWindow::on_action_edit_settings_triggered()
	{
	SettingsDialog dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	ApplicationSettings const &newsettings = dlg.settings();
	setAppSettings(newsettings);
	setGitCommand(appsettings()->git_command, false);
	setFileCommand(appsettings()->file_command, false);
	setGpgCommand(appsettings()->gpg_command, false);
	setRemoteMonitoringEnabled(true);
	}
	}

	void MainWindow::onCloneCompleted(bool success, QVariant const &userdata)
	{
	if (success) {
	RepositoryItem r = userdata.value<RepositoryItem>();
	saveRepositoryBookmark(r);
	setCurrentRepository(r, false);
	openRepository(true);
	}
	}

	void MainWindow::onPtyProcessCompleted(bool /ok/, QVariant const &userdata)
	{
	switch (getPtyCondition()) {
	case PtyCondition::Clone:
	onCloneCompleted(getPtyProcessOk(), userdata);
	break;
	}
	setPtyCondition(PtyCondition::None);
	}

	void MainWindow::on_action_clone_triggered()
	{
	clone();
	}

	void MainWindow::on_action_about_triggered()
	{
	AboutDialog dlg(this);
	dlg.exec();
	}

	void MainWindow::on_toolButton_clone_clicked()
	{
	ui->action_clone->trigger();
	}

	void MainWindow::on_toolButton_fetch_clicked()
	{
	ui->action_fetch->trigger();
	}

	void MainWindow::clearRepoFilter()
	{
	ui->lineEdit_filter->clear();
	}

	void MainWindow::appendCharToRepoFilter(ushort c)
	{
	if (QChar(c).isLetter()) {
	c = QChar(c).toLower().unicode();
	}
	ui->lineEdit_filter->setText(getRepositoryFilterText() + c);
	}

	void MainWindow::backspaceRepoFilter()
	{
	QString s = getRepositoryFilterText();
	int n = s.size();
	if (n > 0) {
	s = s.mid(0, n - 1);
	}
	ui->lineEdit_filter->setText(s);
	}

	void MainWindow::on_lineEdit_filter_textChanged(QString const &text)
	{
	setRepositoryFilterText(text);
	updateRepositoriesList();
	}

	void MainWindow::on_toolButton_erase_filter_clicked()
	{
	clearRepoFilter();
	ui->lineEdit_filter->setFocus();
	}

	void MainWindow::deleteTags(QStringList const &tagnames)
	{
	int row = ui->tableWidget_log->currentRow();

	internalDeleteTags(tagnames);

	ui->tableWidget_log->selectRow(row);
	}

	void MainWindow::revertCommit()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	g->revert(commit->commit_id);
	openRepository(false);
	}
	}

	bool MainWindow::addTag(QString const &name)
	{
	int row = ui->tableWidget_log->currentRow();

	bool ok = internalAddTag(name);

	ui->tableWidget_log->selectRow(row);
	return ok;
	}

	void MainWindow::on_action_push_all_tags_triggered()
	{
	reopenRepository(false, [&](GitPtr g){
	g->push(true);
	});
	}

	void MainWindow::on_tableWidget_log_itemDoubleClicked(QTableWidgetItem *)
	{
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	execCommitPropertyDialog(this, commit);
	}
	}

	void MainWindow::on_listWidget_unstaged_itemDoubleClicked(QListWidgetItem * item)
	{
	execFilePropertyDialog(item);
	}

	void MainWindow::on_listWidget_staged_itemDoubleClicked(QListWidgetItem *item)
	{
	execFilePropertyDialog(item);
	}

	void MainWindow::on_listWidget_files_itemDoubleClicked(QListWidgetItem *item)
	{
	execFilePropertyDialog(item);
	}

	QListWidgetItem *MainWindow::currentFileItem() const
	{
	QListWidget *listwidget = nullptr;
	if (ui->stackedWidget_filelist->currentWidget() == ui->page_uncommited) {
	QWidget *w = qApp->focusWidget();
	if (w == ui->listWidget_unstaged) {
	listwidget = ui->listWidget_unstaged;
	} else if (w == ui->listWidget_staged) {
	listwidget = ui->listWidget_staged;
	}
	} else {
	listwidget = ui->listWidget_files;
	}
	if (listwidget) {
	return listwidget->currentItem();
	}
	return nullptr;
	}

	void MainWindow::on_action_set_config_user_triggered()
	{
	Git::User global_user;
	Git::User repo_user;
	GitPtr g = git();
	if (isValidWorkingCopy(g)) {
	repo_user = g->getUser(Git::Source::Local);
	}
	global_user = g->getUser(Git::Source::Global);

	execSetUserDialog(global_user, repo_user, currentRepositoryName());
	}

	void MainWindow::showLogWindow(bool show)
	{
	ui->dockWidget_log->setVisible(show);
	}

	void MainWindow::on_action_window_log_triggered(bool checked)
	{
	showLogWindow(checked);
	}

	void MainWindow::on_action_repo_jump_triggered()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	NamedCommitList items = namedCommitItems(Branches \| Tags \| Remotes);
	{
	NamedCommitItem head;
	head.name = "HEAD";
	head.id = getHeadId();
	items.push_front(head);
	}
	JumpDialog dlg(this, items);
	if (dlg.exec() == QDialog::Accepted) {
	QString text = dlg.text();
	if (text.isEmpty()) return;
	QString id = g->rev_parse(text);
	if (id.isEmpty() && Git::isValidID(text)) {
	QStringList list = findGitObject(text);
	if (list.isEmpty()) {
	QMessageBox::warning(this, tr("Jump"), QString("%1\n\n").arg(text) + tr("No such commit"));
	return;
	}
	ObjectBrowserDialog dlg2(this, list);
	if (dlg2.exec() == QDialog::Accepted) {
	id = dlg2.text();
	if (id.isEmpty()) return;
	}
	}
	if (g->objectType(id) == "tag") {
	id = getObjCache()->getCommitIdFromTag(id);
	}
	int row = rowFromCommitId(id);
	if (row < 0) {
	QMessageBox::warning(this, tr("Jump"), QString("%1\n(%2)\n\n").arg(text).arg(id) + tr("No such commit"));
	} else {
	setCurrentLogRow(row);
	}
	}
	}

	void MainWindow::on_action_repo_checkout_triggered()
	{
	checkout();
	}

	void MainWindow::on_action_delete_branch_triggered()
	{
	deleteBranch();
	}

	void MainWindow::on_toolButton_terminal_clicked()
	{
	openTerminal(nullptr);
	}

	void MainWindow::on_toolButton_explorer_clicked()
	{
	openExplorer(nullptr);
	}

	void MainWindow::on_action_reset_HEAD_1_triggered()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->reset_head1();
	openRepository(false);
	}

	void MainWindow::on_action_create_a_repository_triggered()
	{
	createRepository(QString());
	}

	bool MainWindow::isOnlineMode() const
	{
	return m->is_online_mode;
	}

	void MainWindow::setRemoteOnline(bool f, bool save)
	{
	m->is_online_mode = f;

	{
	QRadioButton *rb = nullptr;
	rb = f ? ui->radioButton_remote_online : ui->radioButton_remote_offline;
	rb->blockSignals(true);
	rb->click();
	rb->blockSignals(false);

	ui->action_online->setCheckable(true);
	ui->action_offline->setCheckable(true);
	ui->action_online->setChecked(f);
	ui->action_offline->setChecked(!f);

	setNetworkingCommandsEnabled(f);
	}

	if (save) {
	MySettings s;
	s.beginGroup("Remote");
	s.setValue("Online", f);
	s.endGroup();
	}
	}

	void MainWindow::on_radioButton_remote_online_clicked()
	{
	setRemoteOnline(true, true);
	}

	void MainWindow::on_radioButton_remote_offline_clicked()
	{
	setRemoteOnline(false, true);
	}

	void MainWindow::on_verticalScrollBar_log_valueChanged(int)
	{
	ui->widget_log->refrectScrollBar();
	}

	void MainWindow::on_horizontalScrollBar_log_valueChanged(int)
	{
	ui->widget_log->refrectScrollBar();
	}

	void MainWindow::on_toolButton_stop_process_clicked()
	{
	abortPtyProcess();
	}

	void MainWindow::on_action_stop_process_triggered()
	{
	abortPtyProcess();
	}

	void MainWindow::on_action_exit_triggered()
	{
	close();
	}

	void MainWindow::on_action_reflog_triggered()
	{
	GitPtr g = git();
	Git::ReflogItemList reflog;
	g->reflog(&reflog);

	ReflogWindow dlg(this, this, reflog);
	dlg.exec();
	}

	void MainWindow::blame(QListWidgetItem *item)
	{
	QList<BlameItem> list;
	QString path = getFilePath(item);
	{
	GitPtr g = git();
	QByteArray ba = g->blame(path);
	if (!ba.isEmpty()) {
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	list = BlameWindow::parseBlame(begin, end);
	}
	}
	if (!list.isEmpty()) {
	qApp->setOverrideCursor(Qt::WaitCursor);
	BlameWindow win(this, path, list);
	qApp->restoreOverrideCursor();
	win.exec();
	}
	}

	void MainWindow::blame()
	{
	blame(currentFileItem());
	}

	void MainWindow::on_action_repository_property_triggered()
	{
	execRepositoryPropertyDialog(currentRepository());
	}

	void MainWindow::on_action_set_gpg_signing_triggered()
	{
	GitPtr g = git();
	QString global_key_id = g->signingKey(Git::Source::Global);
	QString repository_key_id;
	if (g->isValidWorkingCopy()) {
	repository_key_id = g->signingKey(Git::Source::Local);
	}
	SetGpgSigningDialog dlg(this, currentRepositoryName(), global_key_id, repository_key_id);
	if (dlg.exec() == QDialog::Accepted) {
	g->setSigningKey(dlg.id(), dlg.isGlobalChecked());
	}
	}

	void MainWindow::execAreYouSureYouWantToContinueConnectingDialog()
	{
	using TheDlg = AreYouSureYouWantToContinueConnectingDialog;

	setInteractionMode(InteractionMode::Busy);

	QApplication::restoreOverrideCursor();

	TheDlg dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	TheDlg::Result r = dlg.result();
	if (r == TheDlg::Result::Yes) {
	getPtyProcess()->writeInput("yes\n", 4);
	} else {
	setPtyProcessOk(false); // abort
	getPtyProcess()->writeInput("no\n", 3);
	QThread::msleep(300);
	stopPtyProcess();
	}
	} else {
	ui->widget_log->setFocus();
	setInteractionCanceled(true);
	}
	setInteractionMode(InteractionMode::Busy);
	}

	void MainWindow::onLogIdle()
	{
	if (interactionCanceled()) return;
	if (interactionMode() != InteractionMode::None) return;

	static char const are_you_sure_you_want_to_continue_connecting[] = "Are you sure you want to continue connecting (yes/no)?";
	static char const enter_passphrase[] = "Enter passphrase: ";
	static char const enter_passphrase_for_key[] = "Enter passphrase for key '";
	static char const fatal_authentication_failed_for[] = "fatal: Authentication failed for '";

	std::vector<char> vec;
	ui->widget_log->retrieveLastText(&vec, 100);
	if (!vec.empty()) {
	std::string line;
	int n = (int)vec.size();
	int i = n;
	while (i > 0) {
	i--;
	if (i + 1 < n && vec[i] == '\n') {
	i++;
	line.assign(&vec[i], n - i);
	break;
	}
	}
	if (!line.empty()) {
	auto ExecLineEditDialog = [&](QWidget *parent, QString const &title, QString const &prompt, QString const &val, bool password){
	LineEditDialog dlg(parent, title, prompt, val, password);
	if (dlg.exec() == QDialog::Accepted) {
	std::string ret = dlg.text().toStdString();
	std::string str = ret + '\n';
	getPtyProcess()->writeInput(str.c_str(), str.size());
	return ret;
	}
	abortPtyProcess();
	return std::string();
	};

	auto Match = [&](char const *str){
	int n = strlen(str);
	if (strncmp(line.c_str(), str, n) == 0) {
	char const *p = line.c_str() + n;
	while (1) {
	if (!*p) return true;
	if (!isspace((unsigned char)*p)) break;
	p++;
	}
	}
	return false;
	};

	auto StartsWith = [&](char const *str){
	char const *p = line.c_str();
	while (*str) {
	if (p != str) return false;
	str++;
	p++;
	}
	return true;
	};

	if (Match(are_you_sure_you_want_to_continue_connecting)) {
	execAreYouSureYouWantToContinueConnectingDialog();
	return;
	}

	if (line == enter_passphrase) {
	ExecLineEditDialog(this, "Passphrase", QString::fromStdString(line), QString(), true);
	return;
	}

	if (StartsWith(enter_passphrase_for_key)) {
	std::string keyfile;
	{
	int i = strlen(enter_passphrase_for_key);
	char const *p = line.c_str() + i;
	char const *q = strrchr(p, ':');
	if (q && p + 2 < q && q[-1] == '\'') {
	keyfile.assign(p, q - 1);
	}
	}
	if (!keyfile.empty()) {
	if (keyfile == sshPassphraseUser() && !sshPassphrasePass().empty()) {
	std::string text = sshPassphrasePass() + '\n';
	getPtyProcess()->writeInput(text.c_str(), text.size());
	} else {
	std::string secret = ExecLineEditDialog(this, "Passphrase for key", QString::fromStdString(line), QString(), true);
	sshSetPassphrase(keyfile, secret);
	}
	return;
	}
	}

	char const *begin = line.c_str();
	char const *end = line.c_str() + line.size();
	auto Input = [&](QString const &title, bool password, std::string *value){
	Q_ASSERT(value);
	std::string header = QString("%1 for '").arg(title).toStdString();
	if (strncmp(begin, header.c_str(), header.size()) == 0) {
	QString msg;
	if (memcmp(end - 2, "':", 2) == 0) {
	msg = QString::fromUtf8(begin, end - begin - 1);
	} else if (memcmp(end - 3, "': ", 3) == 0) {
	msg = QString::fromUtf8(begin, end - begin - 2);
	}
	if (!msg.isEmpty()) {
	std::string s = ExecLineEditDialog(this, title, msg, value ? QString::fromStdString(*value) : QString(), password);
	*value = s;
	return true;
	}
	}
	return false;
	};
	std::string uid = httpAuthenticationUser();
	std::string pwd = httpAuthenticationPass();
	bool ok = false;
	if (Input("Username", false, &uid)) ok = true;
	if (Input("Password", true, &pwd)) ok = true;
	if (ok) {
	httpSetAuthentication(uid, pwd);
	return;
	}

	if (StartsWith(fatal_authentication_failed_for)) {
	QMessageBox::critical(this, tr("Authentication Failed"), QString::fromStdString(line));
	abortPtyProcess();
	return;
	}
	}
	}
	}

	void MainWindow::on_action_edit_tags_triggered()
	{
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && Git::isValidID(commit->commit_id)) {
	EditTagsDialog dlg(this, commit);
	dlg.exec();
	}
	}

	void MainWindow::on_action_push_u_triggered()
	{
	pushSetUpstream(false);
	}

	void MainWindow::on_action_delete_remote_branch_triggered()
	{
	deleteRemoteBranch(selectedCommitItem());
	}

	void MainWindow::on_action_terminal_triggered()
	{
	auto const *repo = &currentRepository();
	openTerminal(repo);
	}

	void MainWindow::on_action_explorer_triggered()
	{
	auto const *repo = &currentRepository();
	openExplorer(repo);
	}

	void MainWindow::on_action_reset_hard_triggered()
	{
	doGitCommand([&](GitPtr g){
	g->reset_hard();
	});
	}

	void MainWindow::on_action_clean_df_triggered()
	{
	doGitCommand([&](GitPtr g){
	g->clean_df();
	});
	}

	void MainWindow::postOpenRepositoryFromGitHub(QString const &username, QString const &reponame)
	{
	QVariantList list;
	list.push_back(username);
	list.push_back(reponame);
	postUserFunctionEvent([&](QVariant const &v){
	QVariantList l = v.toList();
	QString uname = l[0].toString();
	QString rname = l[1].toString();
	CloneFromGitHubDialog dlg(this, uname, rname);
	if (dlg.exec() == QDialog::Accepted) {
	clone(dlg.url());
	}
	}, QVariant(list));
	}

	void MainWindow::on_action_stash_triggered()
	{
	doGitCommand([&](GitPtr g){
	g->stash();
	});
	}

	void MainWindow::on_action_stash_apply_triggered()
	{
	doGitCommand([&](GitPtr g){
	g->stash_apply();
	});
	}

	void MainWindow::on_action_stash_drop_triggered()
	{
	doGitCommand([&](GitPtr g){
	g->stash_drop();
	});
	}

	void MainWindow::on_action_online_triggered()
	{
	ui->radioButton_remote_online->click();
	}

	void MainWindow::on_action_offline_triggered()
	{
	ui->radioButton_remote_offline->click();
	}

	void MainWindow::on_action_repositories_panel_triggered()
	{
	bool checked = ui->action_repositories_panel->isChecked();
	ui->stackedWidget_leftpanel->setCurrentWidget(checked ? ui->page_repos : ui->page_collapsed);

	if (checked) {
	ui->stackedWidget_leftpanel->setFixedWidth(m->repos_panel_width);
	ui->stackedWidget_leftpanel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
	ui->stackedWidget_leftpanel->setMinimumWidth(QWIDGETSIZE_MAX);
	ui->stackedWidget_leftpanel->setMaximumWidth(QWIDGETSIZE_MAX);
	} else {
	m->repos_panel_width = ui->stackedWidget_leftpanel->width();
	ui->stackedWidget_leftpanel->setFixedWidth(24);
	}
	}

	void MainWindow::on_action_find_triggered()
	{
	m->searching = false;

	if (getLogs().empty()) {
	return;
	}

	FindCommitDialog dlg(this, m->search_text);
	if (dlg.exec() == QDialog::Accepted) {
	m->search_text = dlg.text();
	ui->tableWidget_log->setFocus();
	findNext();
	}
	}

	void MainWindow::on_action_find_next_triggered()
	{
	if (m->search_text.isEmpty()) {
	on_action_find_triggered();
	} else {
	findNext();
	}
	}

	void MainWindow::on_action_repo_jump_to_head_triggered()
	{
	QString name = "HEAD";
	GitPtr g = git();
	QString id = g->rev_parse(name);
	int row = rowFromCommitId(id);
	if (row < 0) {
	qDebug() << "No such commit";
	} else {
	setCurrentLogRow(row);
	}

	}

	void MainWindow::on_action_repo_merge_triggered()
	{
	merge();
	}

	void MainWindow::on_action_expand_commit_log_triggered()
	{
	ui->splitter_h->setSizes({10000, 1, 1});
	}

	void MainWindow::on_action_expand_file_list_triggered()
	{
	ui->splitter_h->setSizes({1, 10000, 1});
	}

	void MainWindow::on_action_expand_diff_view_triggered()
	{
	ui->splitter_h->setSizes({1, 1, 10000});
	}

	void MainWindow::on_action_sidebar_triggered()
	{
	bool f = ui->stackedWidget_leftpanel->isVisible();
	f = !f;
	ui->stackedWidget_leftpanel->setVisible(f);
	}



	void MainWindow::on_action_wide_triggered()
	{
	QWidget *w = focusWidget();

	if (w == m->focused_widget) {
	ui->splitter_h->setSizes(m->splitter_h_sizes);
	m->focused_widget = nullptr;
	} else {
	m->focused_widget = w;
	m->splitter_h_sizes = ui->splitter_h->sizes();

	if (w == ui->tableWidget_log) {
	ui->splitter_h->setSizes({10000, 1, 1});
	} else if (ui->stackedWidget_filelist->isAncestorOf(w)) {
	ui->splitter_h->setSizes({1, 10000, 1});
	} else if (ui->frame_diff_view->isAncestorOf(w)) {
	ui->splitter_h->setSizes({1, 1, 10000});
	}
	}
	}

	+void MainWindow::setShowLabels(bool show, bool save)
	+{
	+ ApplicationSettings *as = appsettings();
	+ as->show_labels = show;
	+
	+ bool b = ui->action_show_labels->blockSignals(true);
	+ ui->action_show_labels->setChecked(show);
	+ ui->action_show_labels->blockSignals(b);
	+
	+ if (save) {
	+ saveApplicationSettings();
	+ }
	+}
	+
	+bool MainWindow::isLabelsVisible() const
	+{
	+ return appsettings()->show_labels;
	+}
	+
	+void MainWindow::on_action_show_labels_triggered()
	+{
	+ bool f = ui->action_show_labels->isChecked();
	+ setShowLabels(f, true);
	+ ui->tableWidget_log->viewport()->update();
	+}
	+
	void MainWindow::test()
	{
	QElapsedTimer t;
	t.start();
	{
	QPixmap pm(1, 1);
	QPainter pr(&pm);
	pr.setFont(QFont("MS Gothic", 30));
	char tmp[2];
	for (int i = 0x20; i < 0x80; i++) {
	tmp[0] = i;
	tmp[1] = 0;
	QString s = tmp;
	int w = pr.fontMetrics().size(0, s).width();
	qDebug() << w;

	}

	}
	qDebug() << QString("%1ms").arg(t.elapsed());
	}




	+
	diff --git a/src/MainWindow.h b/src/MainWindow.h
	index 244bf29..035d27f 100644
	--- a/src/MainWindow.h
	+++ b/src/MainWindow.h
	@@ -1,233 +1,237 @@
	#ifndef MAINWINDOW_H
	#define MAINWINDOW_H

	#include "BasicMainWindow.h"

	namespace Ui {
	class MainWindow;
	}

	class QTableWidgetItem;

	class HunkItem {
	public:
	int hunk_number = -1;
	size_t pos, len;
	std::vector<std::string> lines;
	};

	class MainWindow : public BasicMainWindow {
	Q_OBJECT
	friend class ImageViewWidget;
	friend class FileDiffSliderWidget;
	friend class FileHistoryWindow;
	friend class FileDiffWidget;
	friend class AboutDialog;
	private:
	struct Private;
	Private *m;
	public:
	explicit MainWindow(QWidget *parent = nullptr);
	~MainWindow() override;

	QPixmap const &digitsPixmap() const;

	// QString currentWorkingCopyDir() const override;

	QColor color(unsigned int i);

	bool isOnlineMode() const override;
	private:
	Ui::MainWindow *ui;

	void updateFilesList(QString id, bool wait) override;
	void updateFilesList(Git::CommitItem const &commit, bool wait);
	void updateRepositoriesList() override;

	void openRepository_(GitPtr g, bool keep_selection = false) override;

	void prepareLogTableWidget();
	QStringList selectedFiles_(QListWidget *listwidget) const;
	QStringList selectedFiles() const;
	void for_each_selected_files(std::function<void (QString const &)> const &fn);
	void showFileList(FilesListType files_list_type);

	void clearLog();
	void clearFileList() override;
	void clearDiffView();
	void clearRepositoryInfo();

	int repositoryIndex_(const QTreeWidgetItem *item) const;
	RepositoryItem const repositoryItem(const QTreeWidgetItem item) const;

	QTreeWidgetItem *newQTreeWidgetFolderItem(QString const &name);
	void buildRepoTree(QString const &group, QTreeWidgetItem item, QList<RepositoryItem> repos);
	void refrectRepositories();

	void updateDiffView(QListWidgetItem *item);
	void updateDiffView();
	void updateUnstagedFileCurrentItem();
	void updateStagedFileCurrentItem();
	void updateStatusBarText() override;
	void setRepositoryInfo(QString const &reponame, QString const &brname) override;
	int indexOfRepository(const QTreeWidgetItem *treeitem) const;
	void clearRepoFilter();
	void appendCharToRepoFilter(ushort c);
	void backspaceRepoFilter();
	void revertCommit();
	void mergeBranch(const QString &commit, Git::MergeFastForward ff);
	void mergeBranch(Git::CommitItem const *commit, Git::MergeFastForward ff);
	void rebaseBranch(Git::CommitItem const *commit);
	void cherrypick(Git::CommitItem const *commit);
	void merge(const Git::CommitItem *commit = nullptr);
	void detectGitServerType(const GitPtr &g);
	void setRemoteOnline(bool f, bool save);
	void startTimers();
	void onCloneCompleted(bool success, const QVariant &userdata);
	void setNetworkingCommandsEnabled(bool enabled);
	void blame(QListWidgetItem *item);
	void blame();
	QListWidgetItem *currentFileItem() const;
	void execAreYouSureYouWantToContinueConnectingDialog();
	void deleteRemoteBranch(Git::CommitItem const *commit);
	QStringList remoteBranches(QString const &id, QStringList *all);
	bool isUninitialized();
	void doLogCurrentItemChanged();
	void findNext();
	void findText(const QString &text);
	void showStatus();
	void onStartEvent();
	void showLogWindow(bool show);
	protected:
	void customEvent(QEvent *);
	void dragEnterEvent(QDragEnterEvent *event) override;
	void timerEvent(QTimerEvent *) override;
	void keyPressEvent(QKeyEvent *event) override;
	bool event(QEvent *event) override;
	bool eventFilter(QObject watched, QEvent event) override;
	public:
	void drawDigit(QPainter *pr, int x, int y, int n) const;
	int digitWidth() const;
	int digitHeight() const;
	void setStatusBarText(QString const &text);
	void clearStatusBarText();
	void setCurrentLogRow(int row) override;
	bool shown();
	void deleteTags(QStringList const &tagnames) override;
	bool addTag(QString const &name);
	void updateCurrentFilesList();
	void notifyRemoteChanged(bool f);
	void postOpenRepositoryFromGitHub(const QString &username, const QString &reponame);
	int selectedLogIndex() const override;
	void updateAncestorCommitMap();
	bool isAncestorCommit(const QString &id);
	void test();
	void postStartEvent();
	+ void setShowLabels(bool show, bool save);
	+ bool isLabelsVisible() const;
	private slots:
	void updateUI();
	void onLogVisibilityChanged();
	void onPtyProcessCompleted(bool ok, const QVariant &userdata);
	void onRepositoriesTreeDropped();
	void on_action_about_triggered();
	void on_action_clean_df_triggered();
	void on_action_clone_triggered();
	void on_action_commit_triggered();
	void on_action_create_a_repository_triggered();
	void on_action_delete_branch_triggered();
	void on_action_delete_remote_branch_triggered();
	void on_action_edit_git_config_triggered();
	void on_action_edit_gitignore_triggered();
	void on_action_edit_global_gitconfig_triggered();
	void on_action_edit_settings_triggered();
	void on_action_edit_tags_triggered();
	void on_action_exit_triggered();
	void on_action_explorer_triggered();
	void on_action_fetch_triggered();
	void on_action_fetch_prune_triggered();
	void on_action_find_next_triggered();
	void on_action_find_triggered();
	void on_action_offline_triggered();
	void on_action_online_triggered();
	void on_action_open_existing_working_copy_triggered();
	void on_action_pull_triggered();
	void on_action_push_all_tags_triggered();
	void on_action_push_triggered();
	void on_action_push_u_triggered();
	void on_action_reflog_triggered();
	void on_action_repo_checkout_triggered();
	void on_action_repo_jump_to_head_triggered();
	void on_action_repo_jump_triggered();
	void on_action_repositories_panel_triggered();
	void on_action_repository_property_triggered();
	void on_action_repository_status_triggered();
	void on_action_reset_HEAD_1_triggered();
	void on_action_reset_hard_triggered();
	void on_action_set_config_user_triggered();
	void on_action_set_gpg_signing_triggered();
	void on_action_stash_apply_triggered();
	void on_action_stash_drop_triggered();
	void on_action_stash_triggered();
	void on_action_stop_process_triggered();
	void on_action_terminal_triggered();
	void on_action_view_refresh_triggered();
	void on_action_window_log_triggered(bool checked);
	void on_horizontalScrollBar_log_valueChanged(int);
	void on_lineEdit_filter_textChanged(QString const &text);
	void on_listWidget_files_currentRowChanged(int currentRow);
	void on_listWidget_files_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_files_itemDoubleClicked(QListWidgetItem *item);
	void on_listWidget_staged_currentRowChanged(int currentRow);
	void on_listWidget_staged_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_staged_itemDoubleClicked(QListWidgetItem *item);
	void on_listWidget_unstaged_currentRowChanged(int currentRow);
	void on_listWidget_unstaged_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_unstaged_itemDoubleClicked(QListWidgetItem *item);
	void on_radioButton_remote_offline_clicked();
	void on_radioButton_remote_online_clicked();
	void on_tableWidget_log_currentItemChanged(QTableWidgetItem current, QTableWidgetItem previous);
	void on_tableWidget_log_customContextMenuRequested(const QPoint &pos);
	void on_tableWidget_log_itemDoubleClicked(QTableWidgetItem *);
	void on_toolButton_clone_clicked();
	void on_toolButton_commit_clicked();
	void on_toolButton_erase_filter_clicked();
	void on_toolButton_explorer_clicked();
	void on_toolButton_fetch_clicked();
	void on_toolButton_pull_clicked();
	void on_toolButton_push_clicked();
	void on_toolButton_select_all_clicked();
	void on_toolButton_stage_clicked();
	void on_toolButton_status_clicked();
	void on_toolButton_stop_process_clicked();
	void on_toolButton_terminal_clicked();
	void on_toolButton_unstage_clicked();
	void on_treeWidget_repos_currentItemChanged(QTreeWidgetItem current, QTreeWidgetItem previous);
	void on_treeWidget_repos_customContextMenuRequested(const QPoint &pos);
	void on_treeWidget_repos_itemDoubleClicked(QTreeWidgetItem *item, int column);
	void on_verticalScrollBar_log_valueChanged(int);
	void on_action_repo_merge_triggered();

	void on_action_expand_commit_log_triggered();

	void on_action_expand_file_list_triggered();

	void on_action_expand_diff_view_triggered();

	void on_action_wide_triggered();

	void on_action_sidebar_triggered();


	+ void on_action_show_labels_triggered();
	+
	protected:
	void closeEvent(QCloseEvent *event) override;
	void internalWriteLog(const char *ptr, int len) override;
	RepositoryItem const *selectedRepositoryItem() const override;
	void removeSelectedRepositoryFromBookmark(bool ask) override;
	protected slots:
	void onLogIdle();
	signals:
	void signalSetRemoteChanged(bool f);
	void onEscapeKeyPressed();
	void updateButton();
	};

	#endif // MAINWINDOW_H
	diff --git a/src/MainWindow.ui b/src/MainWindow.ui
	index 9647615..922688d 100644
	--- a/src/MainWindow.ui
	+++ b/src/MainWindow.ui
	@@ -1,1753 +1,1765 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	<class>MainWindow</class>
	<widget class="QMainWindow" name="MainWindow">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	- <width>848</width>
	+ <width>854</width>
	<height>596</height>
	</rect>
	</property>
	<property name="windowTitle">
	<string>Guitar</string>
	</property>
	<property name="animated">
	<bool>false</bool>
	</property>
	<widget class="QWidget" name="centralWidget">
	<layout class="QVBoxLayout" name="verticalLayout_8">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="leftMargin">
	<number>4</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>4</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="QFrame" name="frame_4">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>56</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>56</height>
	</size>
	</property>
	<property name="frameShape">
	<enum>QFrame::NoFrame</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Plain</enum>
	</property>
	<layout class="QHBoxLayout" name="horizontalLayout_3">
	<property name="spacing">
	<number>1</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>2</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>2</number>
	</property>
	<item>
	<widget class="MyToolButton" name="toolButton_clone">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Clone</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/clone.svg</normaloff>:/image/clone.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_fetch">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Fetch</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/fetch.svg</normaloff>:/image/fetch.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_pull">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Pull</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/pull.svg</normaloff>:/image/pull.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_push">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Push</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/push.svg</normaloff>:/image/push.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_4">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>8</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_status">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Status</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/status.svg</normaloff>:/image/status.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_7">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>8</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_terminal">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Terminal</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/terminal.svg</normaloff>:/image/terminal.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="MyToolButton" name="toolButton_explorer">
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>48</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Explorer</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/explorer.svg</normaloff>:/image/explorer.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_6">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>8</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<spacer name="horizontalSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>503</width>
	<height>48</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="RepositoryInfoFrame" name="frame_3">
	<property name="maximumSize">
	<size>
	<width>16777215</width>
	<height>48</height>
	</size>
	</property>
	<property name="frameShape">
	<enum>QFrame::NoFrame</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Plain</enum>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_3">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="leftMargin">
	<number>6</number>
	</property>
	<property name="topMargin">
	<number>4</number>
	</property>
	<property name="rightMargin">
	<number>6</number>
	</property>
	<property name="bottomMargin">
	<number>4</number>
	</property>
	<item>
	<widget class="QLabel" name="label_repo_name">
	<property name="font">
	<font>
	<pointsize>14</pointsize>
	<weight>75</weight>
	<bold>true</bold>
	</font>
	</property>
	<property name="text">
	<string>Repository</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QLabel" name="label_branch_name">
	<property name="text">
	<string>Branch Name</string>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<spacer name="horizontalSpacer_5">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeType">
	<enum>QSizePolicy::Fixed</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>4</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<layout class="QVBoxLayout" name="verticalLayout_10">
	<property name="spacing">
	<number>1</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout_7">
	<property name="spacing">
	<number>4</number>
	</property>
	<item>
	<widget class="QRadioButton" name="radioButton_remote_online">
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Online</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QRadioButton" name="radioButton_remote_offline">
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string>Offline</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item>
	<widget class="ReadOnlyLineEdit" name="lineEdit_remote">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="focusPolicy">
	<enum>Qt::ClickFocus</enum>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QSplitter" name="splitter_v">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="childrenCollapsible">
	<bool>false</bool>
	</property>
	<widget class="QStackedWidget" name="stackedWidget_leftpanel">
	<property name="currentIndex">
	<number>0</number>
	</property>
	<widget class="QWidget" name="page_repos">
	<layout class="QVBoxLayout" name="verticalLayout_4">
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="RepositoriesTreeWidget" name="treeWidget_repos">
	<property name="contextMenuPolicy">
	<enum>Qt::CustomContextMenu</enum>
	</property>
	<property name="acceptDrops">
	<bool>true</bool>
	</property>
	<property name="editTriggers">
	<set>QAbstractItemView::EditKeyPressed\|QAbstractItemView::SelectedClicked</set>
	</property>
	<property name="dragEnabled">
	<bool>true</bool>
	</property>
	<property name="dragDropMode">
	<enum>QAbstractItemView::InternalMove</enum>
	</property>
	<property name="defaultDropAction">
	<enum>Qt::MoveAction</enum>
	</property>
	<property name="verticalScrollMode">
	<enum>QAbstractItemView::ScrollPerPixel</enum>
	</property>
	<property name="rootIsDecorated">
	<bool>false</bool>
	</property>
	<attribute name="headerVisible">
	<bool>false</bool>
	</attribute>
	<column>
	<property name="text">
	<string notr="true">1</string>
	</property>
	</column>
	</widget>
	</item>
	<item>
	<widget class="QFrame" name="frame_5">
	<property name="frameShape">
	<enum>QFrame::NoFrame</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Plain</enum>
	</property>
	<layout class="QHBoxLayout" name="horizontalLayout_4">
	<property name="spacing">
	<number>2</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="QLineEdit" name="lineEdit_filter">
	<property name="focusPolicy">
	<enum>Qt::ClickFocus</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="ClearButton" name="toolButton_erase_filter">
	<property name="minimumSize">
	<size>
	<width>22</width>
	<height>17</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::NoFocus</enum>
	</property>
	<property name="text">
	<string/>
	</property>
	<property name="iconSize">
	<size>
	<width>20</width>
	<height>15</height>
	</size>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QWidget" name="page_collapsed">
	<layout class="QVBoxLayout" name="verticalLayout_9">
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="QToolButton" name="toolButton">
	<property name="minimumSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="text">
	<string>...</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QWidget" name="widget" native="true"/>
	</item>
	</layout>
	</widget>
	</widget>
	<widget class="QSplitter" name="splitter_h">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	<property name="childrenCollapsible">
	<bool>false</bool>
	</property>
	<widget class="LogTableWidget" name="tableWidget_log">
	<property name="contextMenuPolicy">
	<enum>Qt::CustomContextMenu</enum>
	</property>
	<property name="editTriggers">
	<set>QAbstractItemView::NoEditTriggers</set>
	</property>
	<property name="tabKeyNavigation">
	<bool>false</bool>
	</property>
	<property name="selectionMode">
	<enum>QAbstractItemView::SingleSelection</enum>
	</property>
	<property name="selectionBehavior">
	<enum>QAbstractItemView::SelectRows</enum>
	</property>
	<property name="horizontalScrollMode">
	<enum>QAbstractItemView::ScrollPerPixel</enum>
	</property>
	<property name="wordWrap">
	<bool>false</bool>
	</property>
	<attribute name="horizontalHeaderHighlightSections">
	<bool>false</bool>
	</attribute>
	<attribute name="horizontalHeaderStretchLastSection">
	<bool>true</bool>
	</attribute>
	<attribute name="verticalHeaderVisible">
	<bool>false</bool>
	</attribute>
	</widget>
	<widget class="QStackedWidget" name="stackedWidget_filelist">
	<property name="currentIndex">
	<number>0</number>
	</property>
	<widget class="QWidget" name="page_uncommited">
	<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,1">
	<property name="spacing">
	<number>2</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="FilesListWidget" name="listWidget_unstaged">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="contextMenuPolicy">
	<enum>Qt::CustomContextMenu</enum>
	</property>
	<property name="selectionMode">
	<enum>QAbstractItemView::ExtendedSelection</enum>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QFrame" name="frame_2">
	<property name="frameShape">
	<enum>QFrame::NoFrame</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Raised</enum>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_2">
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<layout class="QGridLayout" name="gridLayout" columnstretch="1,1">
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<property name="spacing">
	<number>3</number>
	</property>
	<item row="2" column="0" colspan="2">
	<widget class="Line" name="line">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	</widget>
	</item>
	<item row="1" column="1">
	<widget class="MyToolButton" name="toolButton_unstage">
	<property name="sizePolicy">
	<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>0</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::StrongFocus</enum>
	</property>
	<property name="text">
	<string>Unstage</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/unstage.svg</normaloff>:/image/unstage.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item row="0" column="0" colspan="2">
	<widget class="MyToolButton" name="toolButton_select_all">
	<property name="sizePolicy">
	<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="focusPolicy">
	<enum>Qt::StrongFocus</enum>
	</property>
	<property name="text">
	<string>Select all</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/selall.svg</normaloff>:/image/selall.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>18</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item row="1" column="0">
	<widget class="MyToolButton" name="toolButton_stage">
	<property name="sizePolicy">
	<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="minimumSize">
	<size>
	<width>64</width>
	<height>0</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::StrongFocus</enum>
	</property>
	<property name="text">
	<string>Stage</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/stage.svg</normaloff>:/image/stage.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	<item row="3" column="0" colspan="2">
	<widget class="MyToolButton" name="toolButton_commit">
	<property name="sizePolicy">
	<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="focusPolicy">
	<enum>Qt::StrongFocus</enum>
	</property>
	<property name="text">
	<string>Commit</string>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/commit.svg</normaloff>:/image/commit.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>24</width>
	<height>24</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonTextUnderIcon</enum>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	<item>
	<spacer name="verticalSpacer">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>20</width>
	<height>0</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="FilesListWidget" name="listWidget_staged">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="contextMenuPolicy">
	<enum>Qt::CustomContextMenu</enum>
	</property>
	<property name="selectionMode">
	<enum>QAbstractItemView::ExtendedSelection</enum>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QWidget" name="page_files">
	<layout class="QVBoxLayout" name="verticalLayout">
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="FilesListWidget" name="listWidget_files">
	<property name="contextMenuPolicy">
	<enum>Qt::CustomContextMenu</enum>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	<widget class="QFrame" name="frame_diff_view">
	<property name="frameShape">
	<enum>QFrame::Panel</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Sunken</enum>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_6">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="FileDiffWidget" name="widget_diff_view" native="true">
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>100</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::ClickFocus</enum>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	</widget>
	</item>
	</layout>
	</widget>
	<widget class="QMenuBar" name="menuBar">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	- <width>848</width>
	- <height>21</height>
	+ <width>854</width>
	+ <height>25</height>
	</rect>
	</property>
	<widget class="QMenu" name="menu_File">
	<property name="title">
	<string>&File</string>
	</property>
	<addaction name="action_open_existing_working_copy"/>
	<addaction name="action_create_a_repository"/>
	<addaction name="separator"/>
	<addaction name="action_stop_process"/>
	<addaction name="separator"/>
	<addaction name="action_exit"/>
	</widget>
	<widget class="QMenu" name="menu_View">
	<property name="title">
	<string>&View</string>
	</property>
	<addaction name="action_view_refresh"/>
	+ <addaction name="action_show_labels"/>
	</widget>
	<widget class="QMenu" name="menu_Edit">
	<property name="title">
	<string>&Edit</string>
	</property>
	<addaction name="action_edit_gitignore"/>
	<addaction name="action_edit_git_config"/>
	<addaction name="action_edit_global_gitconfig"/>
	<addaction name="action_set_config_user"/>
	<addaction name="action_set_gpg_signing"/>
	<addaction name="separator"/>
	<addaction name="action_find"/>
	<addaction name="action_find_next"/>
	<addaction name="separator"/>
	<addaction name="action_edit_settings"/>
	</widget>
	<widget class="QMenu" name="menu_Help">
	<property name="title">
	<string>&Help</string>
	</property>
	<addaction name="action_about"/>
	</widget>
	<widget class="QMenu" name="menu_Window">
	<property name="title">
	<string>&Window</string>
	</property>
	<addaction name="action_window_log"/>
	</widget>
	<widget class="QMenu" name="menu_Repository">
	<property name="title">
	<string>&Repository</string>
	</property>
	<widget class="QMenu" name="menuStash">
	<property name="title">
	<string>Stash</string>
	</property>
	<addaction name="action_stash"/>
	<addaction name="action_stash_apply"/>
	<addaction name="separator"/>
	<addaction name="action_stash_drop"/>
	</widget>
	<addaction name="action_repository_status"/>
	<addaction name="action_repo_merge"/>
	<addaction name="action_commit"/>
	<addaction name="separator"/>
	<addaction name="action_repo_jump"/>
	<addaction name="action_repo_jump_to_head"/>
	<addaction name="action_repo_checkout"/>
	<addaction name="menuStash"/>
	<addaction name="action_delete_branch"/>
	<addaction name="action_delete_remote_branch"/>
	<addaction name="action_edit_tags"/>
	<addaction name="action_reflog"/>
	<addaction name="separator"/>
	<addaction name="action_terminal"/>
	<addaction name="action_explorer"/>
	<addaction name="separator"/>
	<addaction name="action_repository_property"/>
	</widget>
	<widget class="QMenu" name="menuRe_mote">
	<property name="title">
	<string>Re&mote</string>
	</property>
	<addaction name="action_fetch"/>
	<addaction name="action_pull"/>
	<addaction name="action_push"/>
	<addaction name="action_push_u"/>
	<addaction name="action_push_all_tags"/>
	<addaction name="separator"/>
	<addaction name="action_clone"/>
	<addaction name="separator"/>
	<addaction name="action_online"/>
	<addaction name="action_offline"/>
	</widget>
	<widget class="QMenu" name="menuDestructive_3">
	<property name="title">
	<string>&Destructive</string>
	</property>
	<addaction name="action_reset_HEAD_1"/>
	<addaction name="separator"/>
	<addaction name="action_reset_hard"/>
	<addaction name="separator"/>
	<addaction name="action_fetch_prune"/>
	<addaction name="separator"/>
	<addaction name="action_clean_df"/>
	</widget>
	<widget class="QMenu" name="menuExperimental">
	<property name="title">
	<string>Experimental</string>
	</property>
	<addaction name="action_expand_commit_log"/>
	<addaction name="action_expand_file_list"/>
	<addaction name="action_expand_diff_view"/>
	<addaction name="action_sidebar"/>
	<addaction name="action_wide"/>
	</widget>
	<addaction name="menu_File"/>
	<addaction name="menu_View"/>
	<addaction name="menu_Edit"/>
	<addaction name="menu_Repository"/>
	<addaction name="menuRe_mote"/>
	<addaction name="menuDestructive_3"/>
	<addaction name="menu_Window"/>
	<addaction name="menu_Help"/>
	<addaction name="menuExperimental"/>
	</widget>
	<widget class="QStatusBar" name="statusBar"/>
	<widget class="QDockWidget" name="dockWidget_log">
	<property name="floating">
	<bool>false</bool>
	</property>
	<property name="features">
	<set>QDockWidget::DockWidgetFeatureMask</set>
	</property>
	<property name="allowedAreas">
	<set>Qt::BottomDockWidgetArea\|Qt::TopDockWidgetArea</set>
	</property>
	<property name="windowTitle">
	<string>Log</string>
	</property>
	<attribute name="dockWidgetArea">
	<number>8</number>
	</attribute>
	<widget class="QWidget" name="dockWidgetContents">
	<layout class="QVBoxLayout" name="verticalLayout_7">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="QFrame" name="frame">
	<property name="frameShape">
	<enum>QFrame::Panel</enum>
	</property>
	<property name="frameShadow">
	<enum>QFrame::Sunken</enum>
	</property>
	<layout class="QHBoxLayout" name="horizontalLayout_6">
	<property name="spacing">
	<number>0</number>
	</property>
	<property name="leftMargin">
	<number>0</number>
	</property>
	<property name="topMargin">
	<number>0</number>
	</property>
	<property name="rightMargin">
	<number>0</number>
	</property>
	<property name="bottomMargin">
	<number>0</number>
	</property>
	<item>
	<widget class="QFrame" name="frame_8">
	<layout class="QVBoxLayout" name="verticalLayout_5">
	<property name="spacing">
	<number>1</number>
	</property>
	<property name="leftMargin">
	<number>1</number>
	</property>
	<property name="topMargin">
	<number>1</number>
	</property>
	<property name="rightMargin">
	<number>1</number>
	</property>
	<property name="bottomMargin">
	<number>1</number>
	</property>
	<item>
	<widget class="QToolButton" name="toolButton_stop_process">
	<property name="minimumSize">
	<size>
	<width>20</width>
	<height>20</height>
	</size>
	</property>
	<property name="maximumSize">
	<size>
	<width>20</width>
	<height>20</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::ClickFocus</enum>
	</property>
	<property name="text">
	<string/>
	</property>
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/redsquare.svg</normaloff>:/image/redsquare.svg</iconset>
	</property>
	<property name="iconSize">
	<size>
	<width>12</width>
	<height>12</height>
	</size>
	</property>
	<property name="toolButtonStyle">
	<enum>Qt::ToolButtonIconOnly</enum>
	</property>
	</widget>
	</item>
	<item>
	<spacer name="verticalSpacer_2">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>5</width>
	<height>45</height>
	</size>
	</property>
	</spacer>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="Line" name="line_2">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	</widget>
	</item>
	<item>
	<layout class="QGridLayout" name="gridLayout_2">
	<property name="spacing">
	<number>0</number>
	</property>
	<item row="0" column="1">
	<widget class="QScrollBar" name="verticalScrollBar_log">
	<property name="orientation">
	<enum>Qt::Vertical</enum>
	</property>
	</widget>
	</item>
	<item row="0" column="0">
	<widget class="TextEditorWidget" name="widget_log" native="true">
	<property name="sizePolicy">
	<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
	<horstretch>0</horstretch>
	<verstretch>0</verstretch>
	</sizepolicy>
	</property>
	<property name="minimumSize">
	<size>
	<width>0</width>
	<height>80</height>
	</size>
	</property>
	<property name="focusPolicy">
	<enum>Qt::ClickFocus</enum>
	</property>
	</widget>
	</item>
	<item row="1" column="0">
	<widget class="QScrollBar" name="horizontalScrollBar_log">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	</item>
	</layout>
	</widget>
	</widget>
	<action name="action_open_existing_working_copy">
	<property name="text">
	<string>&Open existing working copy...</string>
	</property>
	<property name="toolTip">
	<string>Add existing working copy</string>
	</property>
	</action>
	<action name="action_view_refresh">
	<property name="text">
	<string>Refresh</string>
	</property>
	<property name="toolTip">
	<string>Refresh</string>
	</property>
	<property name="shortcut">
	<string>F5</string>
	</property>
	</action>
	<action name="action_commit">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/commit.svg</normaloff>:/image/commit.svg</iconset>
	</property>
	<property name="text">
	<string>&Commit</string>
	</property>
	</action>
	<action name="action_push">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/push.svg</normaloff>:/image/push.svg</iconset>
	</property>
	<property name="text">
	<string>&Push</string>
	</property>
	<property name="autoRepeat">
	<bool>false</bool>
	</property>
	</action>
	<action name="action_test">
	<property name="text">
	<string>test</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+T</string>
	</property>
	</action>
	<action name="action_pull">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/pull.svg</normaloff>:/image/pull.svg</iconset>
	</property>
	<property name="text">
	<string>Pu&ll</string>
	</property>
	</action>
	<action name="action_fetch">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/fetch.svg</normaloff>:/image/fetch.svg</iconset>
	</property>
	<property name="text">
	<string>&Fetch</string>
	</property>
	</action>
	<action name="action_edit_global_gitconfig">
	<property name="text">
	<string>Edit global .gitconfig</string>
	</property>
	<property name="toolTip">
	<string>Edit global .gitconfig</string>
	</property>
	</action>
	<action name="action_edit_git_config">
	<property name="text">
	<string>Edit .git/config</string>
	</property>
	</action>
	<action name="action_edit_gitignore">
	<property name="text">
	<string>Edit .gitignore</string>
	</property>
	</action>
	<action name="action_edit_settings">
	<property name="text">
	<string>&Settings...</string>
	</property>
	<property name="toolTip">
	<string>Settings</string>
	</property>
	</action>
	<action name="action_clone">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/clone.svg</normaloff>:/image/clone.svg</iconset>
	</property>
	<property name="text">
	<string>Clone</string>
	</property>
	<property name="toolTip">
	<string>Clone</string>
	</property>
	</action>
	<action name="action_about">
	<property name="text">
	<string>&About</string>
	</property>
	</action>
	<action name="action_edit_tags">
	<property name="text">
	<string>Edit tags...</string>
	</property>
	<property name="toolTip">
	<string>Edit tags</string>
	</property>
	</action>
	<action name="action_push_all_tags">
	<property name="text">
	<string>Push all tags</string>
	</property>
	</action>
	<action name="action_set_config_user">
	<property name="text">
	<string>Set config user</string>
	</property>
	</action>
	<action name="action_window_log">
	<property name="checkable">
	<bool>true</bool>
	</property>
	<property name="text">
	<string>&Log</string>
	</property>
	<property name="shortcut">
	<string>F4</string>
	</property>
	</action>
	<action name="action_repo_jump">
	<property name="text">
	<string>&Jump...</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+J</string>
	</property>
	</action>
	<action name="action_repo_checkout">
	<property name="text">
	<string>Check&out...</string>
	</property>
	</action>
	<action name="action_delete_branch">
	<property name="text">
	<string>Delete branch...</string>
	</property>
	</action>
	<action name="action_push_u">
	<property name="text">
	<string>Push upstream</string>
	</property>
	</action>
	<action name="action_reset_HEAD_1">
	<property name="text">
	<string>Reset HEAD~1</string>
	</property>
	<property name="toolTip">
	<string>Reset HEAD~1</string>
	</property>
	</action>
	<action name="action_create_a_repository">
	<property name="text">
	<string>Create a repository</string>
	</property>
	</action>
	<action name="action_stop_process">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/redsquare.svg</normaloff>:/image/redsquare.svg</iconset>
	</property>
	<property name="text">
	<string>Stop process</string>
	</property>
	</action>
	<action name="action_exit">
	<property name="text">
	<string>E&xit</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+Q</string>
	</property>
	</action>
	<action name="action_reflog">
	<property name="text">
	<string>Reflog...</string>
	</property>
	</action>
	<action name="action_repository_property">
	<property name="text">
	<string>Property...</string>
	</property>
	</action>
	<action name="action_set_gpg_signing">
	<property name="text">
	<string>Set GPG signing</string>
	</property>
	<property name="toolTip">
	<string>Set GPG signing</string>
	</property>
	</action>
	<action name="action_delete_remote_branch">
	<property name="text">
	<string>Delete remote branch...</string>
	</property>
	</action>
	<action name="action_fetch_prune">
	<property name="text">
	<string>Fetch --prune</string>
	</property>
	</action>
	<action name="action_terminal">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/terminal.svg</normaloff>:/image/terminal.svg</iconset>
	</property>
	<property name="text">
	<string>Terminal</string>
	</property>
	</action>
	<action name="action_explorer">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/explorer.svg</normaloff>:/image/explorer.svg</iconset>
	</property>
	<property name="text">
	<string>Explorer</string>
	</property>
	</action>
	<action name="action_clean_df">
	<property name="text">
	<string>Clean -df</string>
	</property>
	</action>
	<action name="action_reset_hard">
	<property name="text">
	<string>Reset --hard</string>
	</property>
	</action>
	<action name="action_stash">
	<property name="text">
	<string>Stash</string>
	</property>
	</action>
	<action name="action_stash_apply">
	<property name="text">
	<string>Apply</string>
	</property>
	</action>
	<action name="action_stash_drop">
	<property name="text">
	<string>Drop</string>
	</property>
	</action>
	<action name="action_online">
	<property name="text">
	<string>Online</string>
	</property>
	</action>
	<action name="action_offline">
	<property name="text">
	<string>Offline</string>
	</property>
	</action>
	<action name="action_repositories_panel">
	<property name="checkable">
	<bool>true</bool>
	</property>
	<property name="text">
	<string>Repositories panel</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+R</string>
	</property>
	</action>
	<action name="action_find">
	<property name="text">
	<string>&Find...</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+F</string>
	</property>
	</action>
	<action name="action_find_next">
	<property name="text">
	<string>Find next</string>
	</property>
	<property name="shortcut">
	<string>F3</string>
	</property>
	</action>
	<action name="action_repository_status">
	<property name="icon">
	<iconset resource="resources/resources.qrc">
	<normaloff>:/image/status.svg</normaloff>:/image/status.svg</iconset>
	</property>
	<property name="text">
	<string>Status</string>
	</property>
	</action>
	<action name="action_repo_jump_to_head">
	<property name="text">
	<string>Jump to &HEAD</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+H</string>
	</property>
	</action>
	<action name="action_repo_merge">
	<property name="text">
	<string>Merge...</string>
	</property>
	</action>
	<action name="action_expand_commit_log">
	<property name="text">
	<string>Expand commit log</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+2</string>
	</property>
	</action>
	<action name="action_expand_file_list">
	<property name="text">
	<string>Expand file list</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+3</string>
	</property>
	</action>
	<action name="action_expand_diff_view">
	<property name="text">
	<string>Expand diff view</string>
	</property>
	<property name="shortcut">
	<string>Ctrl+4</string>
	</property>
	</action>
	<action name="action_sidebar">
	<property name="text">
	<string>Sidebar</string>
	</property>
	<property name="shortcut">
	<string>F1</string>
	</property>
	</action>
	<action name="action_wide">
	<property name="text">
	<string>Wide</string>
	</property>
	<property name="shortcut">
	<string>F2</string>
	</property>
	</action>
	+ <action name="action_show_labels">
	+ <property name="checkable">
	+ <bool>true</bool>
	+ </property>
	+ <property name="text">
	+ <string>Show labels</string>
	+ </property>
	+ <property name="shortcut">
	+ <string>Ctrl+L</string>
	+ </property>
	+ </action>
	</widget>
	<layoutdefault spacing="6" margin="11"/>
	<customwidgets>
	<customwidget>
	<class>FileDiffWidget</class>
	<extends>QWidget</extends>
	<header>FileDiffWidget.h</header>
	<container>1</container>
	</customwidget>
	<customwidget>
	<class>ReadOnlyLineEdit</class>
	<extends>QLineEdit</extends>
	<header>ReadOnlyLineEdit.h</header>
	</customwidget>
	<customwidget>
	<class>TextEditorWidget</class>
	<extends>QWidget</extends>
	<header>TextEditorWidget.h</header>
	<container>1</container>
	</customwidget>
	<customwidget>
	<class>ClearButton</class>
	<extends>QToolButton</extends>
	<header>ClearButton.h</header>
	</customwidget>
	<customwidget>
	<class>LogTableWidget</class>
	<extends>QTableWidget</extends>
	<header>LogTableWidget.h</header>
	</customwidget>
	<customwidget>
	<class>RepositoryInfoFrame</class>
	<extends>QFrame</extends>
	<header>RepositoryInfoFrame.h</header>
	<container>1</container>
	</customwidget>
	<customwidget>
	<class>MyToolButton</class>
	<extends>QToolButton</extends>
	<header>MyToolButton.h</header>
	</customwidget>
	<customwidget>
	<class>RepositoriesTreeWidget</class>
	<extends>QTreeWidget</extends>
	<header>RepositoriesTreeWidget.h</header>
	</customwidget>
	<customwidget>
	<class>FilesListWidget</class>
	<extends>QListWidget</extends>
	<header>FilesListWidget.h</header>
	</customwidget>
	</customwidgets>
	<tabstops>
	<tabstop>tableWidget_log</tabstop>
	<tabstop>listWidget_unstaged</tabstop>
	<tabstop>toolButton_select_all</tabstop>
	<tabstop>toolButton_stage</tabstop>
	<tabstop>toolButton_unstage</tabstop>
	<tabstop>toolButton_commit</tabstop>
	<tabstop>listWidget_staged</tabstop>
	<tabstop>listWidget_files</tabstop>
	<tabstop>widget_diff_view</tabstop>
	<tabstop>toolButton_stop_process</tabstop>
	<tabstop>widget_log</tabstop>
	</tabstops>
	<resources>
	<include location="resources/resources.qrc"/>
	</resources>
	<connections/>
	</ui>
	diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
	index 84f413d..178e207 100644
	--- a/src/SettingsDialog.cpp
	+++ b/src/SettingsDialog.cpp
	@@ -1,186 +1,188 @@
	#include "SettingsDialog.h"
	#include "ui_SettingsDialog.h"
	#include "MySettings.h"
	#include "common/misc.h"
	#include <QFileDialog>

	static int page_number = 0;

	SettingsDialog::SettingsDialog(MainWindow *parent) :
	QDialog(parent),
	ui(new Ui::SettingsDialog)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	mainwindow_ = parent;

	loadSettings();

	QTreeWidgetItem *item;

	auto AddPage = [&](QWidget *page){
	page->layout()->setMargin(0);
	QString name = page->windowTitle();
	item = new QTreeWidgetItem();
	item->setText(0, name);
	item->setData(0, Qt::UserRole, QVariant::fromValue((uintptr_t)(QWidget *)page));
	ui->treeWidget->addTopLevelItem(item);
	};
	AddPage(ui->page_general);
	AddPage(ui->page_programs);
	AddPage(ui->page_behavior);
	AddPage(ui->page_network);
	// AddPage(ui->page_example);

	ui->treeWidget->setCurrentItem(ui->treeWidget->topLevelItem(page_number));
	}

	SettingsDialog::~SettingsDialog()
	{
	delete ui;
	}

	namespace {

	template <typename T> class GetValue {
	private:
	public:
	MySettings &settings;
	QString name;
	GetValue(MySettings &s, QString const &name)
	: settings(s)
	, name(name)
	{
	}
	void operator >> (T &value)
	{
	value = settings.value(name, value).template value<T>();
	}
	};

	template <typename T> class SetValue {
	private:
	public:
	MySettings &settings;
	QString name;
	SetValue(MySettings &s, QString const &name)
	: settings(s)
	, name(name)
	{
	}
	void operator << (T const &value)
	{
	settings.setValue(name, value);
	}
	};

	} // namespace

	void SettingsDialog::loadSettings(ApplicationSettings *as)
	{
	MySettings s;

	*as = ApplicationSettings::defaultSettings();

	s.beginGroup("Global");
	GetValue<bool>(s, "SaveWindowPosition") >> as->remember_and_restore_window_position;
	GetValue<QString>(s, "DefaultWorkingDirectory") >> as->default_working_dir;
	GetValue<QString>(s, "GitCommand") >> as->git_command;
	GetValue<QString>(s, "FileCommand") >> as->file_command;
	GetValue<QString>(s, "GpgCommand") >> as->gpg_command;
	GetValue<QString>(s, "SshCommand") >> as->ssh_command;
	s.endGroup();

	s.beginGroup("UI");
	GetValue<bool>(s, "EnableHighDpiScaling") >> as->enable_high_dpi_scaling;
	+ GetValue<bool>(s, "ShowLabels") >> as->show_labels;
	s.endGroup();

	s.beginGroup("Network");
	GetValue<QString>(s, "ProxyType") >> as->proxy_type;
	GetValue<QString>(s, "ProxyServer") >> as->proxy_server;
	GetValue<bool>(s, "GetCommitterIcon") >> as->get_committer_icon;
	s.endGroup();
	as->proxy_server = misc::makeProxyServerURL(as->proxy_server);

	s.beginGroup("Behavior");
	GetValue<bool>(s, "AutomaticFetch") >> as->automatically_fetch_when_opening_the_repository;
	GetValue<unsigned int>(s, "MaxCommitItemAcquisitions") >> as->maximum_number_of_commit_item_acquisitions;
	s.endGroup();
	}

	void SettingsDialog::saveSettings(ApplicationSettings const *as)
	{
	MySettings s;

	s.beginGroup("Global");
	SetValue<bool>(s, "SaveWindowPosition") << as->remember_and_restore_window_position;
	SetValue<QString>(s, "DefaultWorkingDirectory") << as->default_working_dir;
	SetValue<QString>(s, "GitCommand") << as->git_command;
	SetValue<QString>(s, "FileCommand") << as->file_command;
	SetValue<QString>(s, "GpgCommand") << as->gpg_command;
	SetValue<QString>(s, "SshCommand") << as->ssh_command;
	s.endGroup();

	s.beginGroup("UI");
	SetValue<bool>(s, "EnableHighDpiScaling") << as->enable_high_dpi_scaling;
	+ SetValue<bool>(s, "ShowLabels") << as->show_labels;
	s.endGroup();

	s.beginGroup("Network");
	SetValue<QString>(s, "ProxyType") << as->proxy_type;
	SetValue<QString>(s, "ProxyServer") << misc::makeProxyServerURL(as->proxy_server);
	SetValue<bool>(s, "GetCommitterIcon") << as->get_committer_icon;
	s.endGroup();

	s.beginGroup("Behavior");
	SetValue<bool>(s, "AutomaticFetch") << as->automatically_fetch_when_opening_the_repository;
	SetValue<unsigned int>(s, "MaxCommitItemAcquisitions") << as->maximum_number_of_commit_item_acquisitions;
	s.endGroup();

	}

	void SettingsDialog::saveSettings()
	{
	saveSettings(&set);
	}

	void SettingsDialog::exchange(bool save)
	{
	QList<AbstractSettingForm > forms = ui->stackedWidget->findChildren<AbstractSettingForm >();
	for (AbstractSettingForm *form : forms) {
	form->exchange(save);
	}
	}

	void SettingsDialog::loadSettings()
	{
	loadSettings(&set);
	exchange(false);
	}

	void SettingsDialog::done(int r)
	{
	page_number = ui->treeWidget->currentIndex().row();
	QDialog::done(r);
	}

	void SettingsDialog::accept()
	{
	exchange(true);
	saveSettings();
	done(QDialog::Accepted);
	}

	void SettingsDialog::on_treeWidget_currentItemChanged(QTreeWidgetItem current, QTreeWidgetItem previous)
	{
	(void)previous;
	if (current) {
	uintptr_t p = current->data(0, Qt::UserRole).value<uintptr_t>();
	QWidget w = reinterpret_cast<QWidget >(p);
	Q_ASSERT(w);
	ui->stackedWidget->setCurrentWidget(w);
	}
	}

	diff --git a/src/main.h b/src/main.h
	index 8317055..f0f52e6 100644
	--- a/src/main.h
	+++ b/src/main.h
	@@ -1,26 +1,27 @@
	#ifndef MAIN_H
	#define MAIN_H

	#include <QString>

	#define ORGANIZATION_NAME "soramimi.jp"
	#define APPLICATION_NAME "Guitar"

	class ApplicationSettings {
	public:
	QString git_command;
	QString file_command;
	QString gpg_command;
	QString ssh_command;
	QString default_working_dir;
	QString proxy_type;
	QString proxy_server;
	bool get_committer_icon = true;
	bool remember_and_restore_window_position = false;
	bool enable_high_dpi_scaling = true;
	bool automatically_fetch_when_opening_the_repository = true;
	unsigned int maximum_number_of_commit_item_acquisitions = 10000;
	+ bool show_labels = true;
	static ApplicationSettings defaultSettings();
	};

	#endif // MAIN_H

File Metadata

Mime Type: text/x-diff
Expires: Sat, Feb 7, 7:29 AM (20 h, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 55885
Default Alt Text: (241 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions