No OneTemporary
Actions

Authored By

Unknown

Size

115 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 37a1326..b399886 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,393 +1,393 @@
	cmake_minimum_required(VERSION 3.2)

	project(Guitar
	VERSION 1.0.0
	LANGUAGES CXX C
	)

	add_definitions(-DAPP_GUITAR)

	set(CMAKE_INCLUDE_CURRENT_DIR ON)
	set(CMAKE_AUTOMOC ON)
	set(CMAKE_AUTOUIC ON)
	set(CMAKE_AUTORCC ON)

	list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")

	find_package(Qt5 COMPONENTS Core Widgets Network Svg REQUIRED)
	find_package(zlib REQUIRED )
	find_package(OpenSSL REQUIRED )
	find_package(Qt5LinguistTools REQUIRED)
	if(WIN32)
	# check package at
	# https://github.com/rprichard/winpty
	find_package(winpty REQUIRED )
	endif()

	# extract version information
	string(TIMESTAMP Guitar_copyright_year "%Y")
	execute_process(
	COMMAND git rev-parse --short=7 HEAD
	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
	OUTPUT_VARIABLE Guitar_git_hash
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)

	configure_file(version.h.in version.h)
	configure_file(win.rc.in win.rc.h)
	configure_file(Info.plist.in Info.plist)

	set(Guitar_SOURCES
	src/AboutDialog.cpp
	src/AbstractProcess.cpp
	src/AbstractSettingForm.cpp
	src/ApplicationGlobal.cpp
	src/AreYouSureYouWantToContinueConnectingDialog.cpp
	src/AvatarLoader.cpp
	src/BasicMainWindow.cpp
	src/BasicRepositoryDialog.cpp
	src/BigDiffWindow.cpp
	src/BlameWindow.cpp
	src/CheckoutDialog.cpp
	src/ClearButton.cpp
	src/CloneDialog.cpp
	src/CloneFromGitHubDialog.cpp
	src/CommitDialog.cpp
	src/CommitExploreWindow.cpp
	src/CommitPropertyDialog.cpp
	src/CommitViewWindow.cpp
	src/ConfigCredentialHelperDialog.cpp
	src/ConfigSigningDialog.cpp
	src/CreateRepositoryDialog.cpp
	src/DeleteBranchDialog.cpp
	src/DeleteTagsDialog.cpp
	src/DialogHeaderFrame.cpp
	src/DirectoryLineEdit.cpp
	src/DoYouWantToInitDialog.cpp
	src/EditGitIgnoreDialog.cpp
	src/EditRemoteDialog.cpp
	src/EditTagsDialog.cpp
	src/ExperimentDialog.cpp
	src/FileDiffSliderWidget.cpp
	src/FileDiffWidget.cpp
	src/FileHistoryWindow.cpp
	src/FilePropertyDialog.cpp
	src/FilesListWidget.cpp
	src/FileUtil.cpp
	src/FileViewWidget.cpp
	src/FindCommitDialog.cpp
	src/Git.cpp
	src/GitDiff.cpp
	src/GitHubAPI.cpp
	src/GitObjectManager.cpp
	src/GitPack.cpp
	src/GitPackIdxV2.cpp
	src/HyperLinkLabel.cpp
	src/ImageViewWidget.cpp
	src/InputNewTagDialog.cpp
	src/JumpDialog.cpp
	src/LineEditDialog.cpp
	src/LocalSocketReader.cpp
	src/LogTableWidget.cpp
	src/MainWindow.cpp
	src/MaximizeButton.cpp
	src/MemoryReader.cpp
	src/MenuButton.cpp
	- src/MergeBranchDialog.cpp
	+ src/MergeDialog.cpp
	src/MyImageViewWidget.cpp
	src/MyProcess.cpp
	src/MySettings.cpp
	src/MyTableWidgetDelegate.cpp
	src/MyTextEditorWidget.cpp
	src/MyToolButton.cpp
	src/ObjectBrowserDialog.cpp
	src/Photoshop.cpp
	src/PushDialog.cpp
	src/ReadOnlyLineEdit.cpp
	src/ReadOnlyPlainTextEdit.cpp
	src/ReflogWindow.cpp
	src/RemoteRepositoriesTableWidget.cpp
	src/RemoteWatcher.cpp
	src/RepositoriesTreeWidget.cpp
	src/RepositoryData.cpp
	src/RepositoryInfoFrame.cpp
	src/RepositoryLineEdit.cpp
	src/RepositoryPropertyDialog.cpp
	src/SearchFromGitHubDialog.cpp
	src/SelectCommandDialog.cpp
	src/SelectGpgKeyDialog.cpp
	src/SelectItemDialog.cpp
	src/SetGlobalUserDialog.cpp
	src/SetGpgSigningDialog.cpp
	src/SetRemoteUrlDialog.cpp
	src/SetUserDialog.cpp
	src/SettingBehaviorForm.cpp
	src/SettingExampleForm.cpp
	src/SettingGeneralForm.cpp
	src/SettingNetworkForm.cpp
	src/SettingProgramsForm.cpp
	src/SettingsDialog.cpp
	src/StatusLabel.cpp
	src/Terminal.cpp
	src/TextEditDialog.cpp
	src/Theme.cpp
	src/WelcomeWizardDialog.cpp
	src/charvec.cpp
	src/common/joinpath.cpp
	src/common/misc.cpp
	src/darktheme/DarkStyle.cpp
	src/darktheme/NinePatch.cpp
	src/darktheme/StandardStyle.cpp
	src/darktheme/TraditionalWindowsStyleTreeControl.cpp
	src/gpg.cpp
	src/gunzip.cpp
	src/main.cpp
	src/texteditor/AbstractCharacterBasedApplication.cpp
	src/texteditor/InputMethodPopup.cpp
	src/texteditor/TextEditorTheme.cpp
	src/texteditor/TextEditorWidget.cpp
	src/texteditor/UnicodeWidth.cpp
	src/texteditor/unicode.cpp
	src/urlencode.cpp
	src/webclient.cpp
	)

	set(Guitar_HEADERS
	src/AboutDialog.h
	src/AbstractProcess.h
	src/AbstractSettingForm.h
	src/ApplicationGlobal.h
	src/AreYouSureYouWantToContinueConnectingDialog.h
	src/AvatarLoader.h
	src/BasicMainWindow.h
	src/BasicRepositoryDialog.h
	src/BigDiffWindow.h
	src/BlameWindow.h
	src/CheckoutDialog.h
	src/ClearButton.h
	src/CloneDialog.h
	src/CloneFromGitHubDialog.h
	src/CommitDialog.h
	src/CommitExploreWindow.h
	src/CommitPropertyDialog.h
	src/CommitViewWindow.h
	src/ConfigCredentialHelperDialog.h
	src/ConfigSigningDialog.h
	src/CreateRepositoryDialog.h
	src/Debug.h
	src/DeleteBranchDialog.h
	src/DeleteTagsDialog.h
	src/DialogHeaderFrame.h
	src/DirectoryLineEdit.h
	src/DoYouWantToInitDialog.h
	src/EditGitIgnoreDialog.h
	src/EditRemoteDialog.h
	src/EditTagsDialog.h
	src/ExperimentDialog.h
	src/FileDiffSliderWidget.h
	src/FileDiffWidget.h
	src/FileHistoryWindow.h
	src/FilePropertyDialog.h
	src/FilesListWidget.h
	src/FileUtil.h
	src/FileViewWidget.h
	src/FindCommitDialog.h
	src/Git.h
	src/GitDiff.h
	src/GitHubAPI.h
	src/GitObjectManager.h
	src/GitPack.h
	src/GitPackIdxV2.h
	src/HyperLinkLabel.h
	src/ImageViewWidget.h
	src/InputNewTagDialog.h
	src/JumpDialog.h
	src/LineEditDialog.h
	src/LocalSocketReader.h
	src/LogTableWidget.h
	src/MainWindow.h
	src/MaximizeButton.h
	src/MemoryReader.h
	src/MenuButton.h
	- src/MergeBranchDialog.h
	+ src/MergeDialog.h
	src/MyImageViewWidget.h
	src/MyProcess.h
	src/MySettings.h
	src/MyTableWidgetDelegate.h
	src/MyTextEditorWidget.h
	src/MyToolButton.h
	src/ObjectBrowserDialog.h
	src/Photoshop.h
	src/PushDialog.h
	src/ReadOnlyLineEdit.h
	src/ReadOnlyPlainTextEdit.h
	src/ReflogWindow.h
	src/RemoteRepositoriesTableWidget.h
	src/RemoteWatcher.h
	src/RepositoriesTreeWidget.h
	src/RepositoryData.h
	src/RepositoryInfoFrame.h
	src/RepositoryLineEdit.h
	src/RepositoryPropertyDialog.h
	src/SearchFromGitHubDialog.h
	src/SelectCommandDialog.h
	src/SelectGpgKeyDialog.h
	src/SelectItemDialog.h
	src/SetGlobalUserDialog.h
	src/SetGpgSigningDialog.h
	src/SetRemoteUrlDialog.h
	src/SetUserDialog.h
	src/SettingBehaviorForm.h
	src/SettingExampleForm.h
	src/SettingGeneralForm.h
	src/SettingNetworkForm.h
	src/SettingProgramsForm.h
	src/SettingsDialog.h
	src/StatusLabel.h
	src/Terminal.h
	src/TextEditDialog.h
	src/Theme.h
	src/WelcomeWizardDialog.h
	src/charvec.h
	src/common/joinpath.h
	src/common/misc.h
	src/darktheme/DarkStyle.h
	src/darktheme/NinePatch.h
	src/darktheme/StandardStyle.h
	src/darktheme/TraditionalWindowsStyleTreeControl.h
	src/gpg.h
	src/gunzip.h
	src/main.h
	src/texteditor/AbstractCharacterBasedApplication.h
	src/texteditor/InputMethodPopup.h
	src/texteditor/TextEditorTheme.h
	src/texteditor/TextEditorWidget.h
	src/texteditor/UnicodeWidth.h
	src/texteditor/unicode.h
	src/urlencode.h
	src/webclient.h
	)

	if(UNIX)
	list(APPEND Guitar_SOURCES
	src/unix/UnixProcess.cpp
	src/unix/UnixPtyProcess.cpp
	)
	list(APPEND Guitar_HEADERS
	src/unix/UnixProcess.h
	src/unix/UnixPtyProcess.h
	)
	elseif(WIN32)
	list(APPEND Guitar_SOURCES
	src/win32/Win32Process.cpp
	src/win32/Win32PtyProcess.cpp
	src/win32/event.cpp
	src/win32/thread.cpp
	src/win32/win32.cpp
	)
	list(APPEND Guitar_HEADERS
	src/win32/Win32Process.h
	src/win32/Win32PtyProcess.h
	src/win32/event.h
	src/win32/mutex.h
	src/win32/thread.h
	src/win32/win32.h
	)
	endif()

	set(Guitar_UIS
	src/AboutDialog.ui
	src/AreYouSureYouWantToContinueConnectingDialog.ui
	src/BigDiffWindow.ui
	src/BlameWindow.ui
	src/CheckoutDialog.ui
	src/CloneDialog.ui
	src/CloneFromGitHubDialog.ui
	src/CommitDialog.ui
	src/CommitExploreWindow.ui
	src/CommitPropertyDialog.ui
	src/CommitViewWindow.ui
	src/ConfigCredentialHelperDialog.ui
	src/ConfigSigningDialog.ui
	src/CreateRepositoryDialog.ui
	src/DeleteBranchDialog.ui
	src/DeleteTagsDialog.ui
	src/DoYouWantToInitDialog.ui
	src/EditGitIgnoreDialog.ui
	src/EditRemoteDialog.ui
	src/EditTagsDialog.ui
	src/ExperimentDialog.ui
	src/FileDiffWidget.ui
	src/FileHistoryWindow.ui
	src/FilePropertyDialog.ui
	src/FindCommitDialog.ui
	src/InputNewTagDialog.ui
	src/JumpDialog.ui
	src/LineEditDialog.ui
	src/MainWindow.ui
	- src/MergeBranchDialog.ui
	+ src/MergeDialog.ui
	src/ObjectBrowserDialog.ui
	src/PushDialog.ui
	src/ReflogWindow.ui
	src/RepositoryPropertyDialog.ui
	src/SearchFromGitHubDialog.ui
	src/SelectCommandDialog.ui
	src/SelectGpgKeyDialog.ui
	src/SelectItemDialog.ui
	src/SetGlobalUserDialog.ui
	src/SetGpgSigningDialog.ui
	src/SetRemoteUrlDialog.ui
	src/SetUserDialog.ui
	src/SettingBehaviorForm.ui
	src/SettingExampleForm.ui
	src/SettingGeneralForm.ui
	src/SettingNetworkForm.ui
	src/SettingProgramsForm.ui
	src/SettingsDialog.ui
	src/TextEditDialog.ui
	src/WelcomeWizardDialog.ui
	)

	set(Guitar_RESOURCES
	src/resources/resources.qrc
	)

	set(Guitar_TRANSLATIONS
	src/resources/translations/Guitar_ja.ts
	src/resources/translations/Guitar_ru.ts
	)

	qt5_add_translation(Guitar_QM_FILES ${Guitar_TRANSLATIONS})
	configure_file(${Guitar_RESOURCES} ${CMAKE_BINARY_DIR} COPYONLY)

	add_custom_target(translations ALL DEPENDS ${Guitar_QM_FILES})

	add_custom_target(resources ALL DEPENDS ${Guitar_RESOURCES})

	add_dependencies(resources translations)

	include_directories(src)
	include_directories(src/texteditor)

	add_executable(${PROJECT_NAME}
	${Guitar_SOURCES}
	${Guitar_HEADERS}
	${Guitar_UIS}
	${Guitar_RESOURCES}
	${Guitar_QM_FILES}
	)

	set_target_properties(${PROJECT_NAME} PROPERTIES
	CXX_STANDARD 11
	CXX_EXTENSIONS OFF
	)

	target_link_libraries(${PROJECT_NAME}
	Qt5::Widgets
	Qt5::Network
	Qt5::Svg
	zlib
	OpenSSL::SSL OpenSSL::Crypto
	)

	# add_subdirectory(extra)
	diff --git a/Guitar.pro b/Guitar.pro
	index 50de8ff..5239f81 100644
	--- a/Guitar.pro
	+++ b/Guitar.pro
	@@ -1,406 +1,406 @@

	QT += core gui widgets svg network
	win32:QT += winextras

	CONFIG(debug,debug\|release):TARGET = Guitard
	CONFIG(release,debug\|release):TARGET = Guitar
	TEMPLATE = app

	CONFIG += c++11

	DESTDIR = $$PWD/_bin

	TRANSLATIONS = $$PWD/src/resources/translations/Guitar_ja.ts
	TRANSLATIONS += $$PWD/src/resources/translations/Guitar_ru.ts

	DEFINES += APP_GUITAR

	DEFINES += HAVE_POSIX_OPENPT
	macx:DEFINES += HAVE_SYS_TIME_H
	macx:DEFINES += HAVE_UTMPX

	gcc:QMAKE_CXXFLAGS += -Wall -Wextra -Werror=return-type -Werror=trigraphs -Wno-switch -Wno-reorder
	linux:QMAKE_RPATHDIR += $ORIGIN
	macx:QMAKE_RPATHDIR += @executable_path/../Frameworks

	linux:QTPLUGIN += ibusplatforminputcontextplugin
	#linux:QTPLUGIN += fcitxplatforminputcontextplugin

	INCLUDEPATH += $$PWD/src
	INCLUDEPATH += $$PWD/src/texteditor
	win32:INCLUDEPATH += $$PWD/misc/winpty
	win32:LIBS += $$PWD/misc/winpty/winpty.lib

	# OpenSSL

	linux:LIBS += -lssl -lcrypto
	haiku:LIBS += -lssl -lcrypto -lnetwork
	macx:INCLUDEPATH += /usr/local/include
	macx:LIBS += /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a

	win32:msvc {
	INCLUDEPATH += C:\openssl\include
	INCLUDEPATH += $$PWD/../zlib
	LIBS += -LC:\openssl\lib
	}

	win32:gcc {
	INCLUDEPATH += C:\Qt\Tools\mingw530_32\opt\include
	LIBS += -LC:\Qt\Tools\mingw530_32\opt\lib
	LIBS += -lcrypto -lssl
	}

	# execute 'ruby prepare.rb' automatically

	prepare.target = prepare
	prepare.commands = cd $$PWD && ruby -W0 prepare.rb
	QMAKE_EXTRA_TARGETS += prepare
	PRE_TARGETDEPS += prepare


	# zlib

	win32:msvc {
	CONFIG(debug, debug\|release):LIBS += $$PWD/_bin/libz.lib
	CONFIG(release, debug\|release):LIBS += $$PWD/_bin/libz.lib
	}

	win32:gcc {
	CONFIG(debug, debug\|release):LIBS += $$PWD/_bin/liblibz.a
	CONFIG(release, debug\|release):LIBS += $$PWD/_bin/liblibz.a
	}

	!haiku {
	unix:CONFIG(debug, debug\|release):LIBS += $$PWD/_bin/libzd.a
	unix:CONFIG(release, debug\|release):LIBS += $$PWD/_bin/libz.a
	#unix:LIBS += -lz
	}

	haiku:LIBS += -lz

	win32 {
	LIBS += -ladvapi32 -lshell32 -luser32 -lws2_32
	RC_FILE = win.rc
	QMAKE_SUBSYSTEM_SUFFIX=,5.01
	}

	macx {
	QMAKE_INFO_PLIST = Info.plist
	- ICON += src/resources/Guitar.icns
	+ ICON += src/resources/Guitar.icns
	t.path=Contents/Resources
	QMAKE_BUNDLE_DATA += t
	}

	SOURCES += \
	- src/AboutDialog.cpp \
	- src/AbstractProcess.cpp \
	- src/AbstractSettingForm.cpp \
	- src/ApplicationGlobal.cpp \
	- src/AvatarLoader.cpp \
	- src/BasicRepositoryDialog.cpp \
	- src/BigDiffWindow.cpp \
	- src/CheckoutDialog.cpp \
	- src/ClearButton.cpp \
	- src/CloneDialog.cpp \
	- src/CommitExploreWindow.cpp \
	- src/CommitPropertyDialog.cpp \
	- src/ConfigCredentialHelperDialog.cpp \
	- src/CreateRepositoryDialog.cpp \
	- src/DeleteBranchDialog.cpp \
	- src/DeleteTagsDialog.cpp \
	- src/DirectoryLineEdit.cpp \
	- src/ExperimentDialog.cpp \
	- src/FileDiffSliderWidget.cpp \
	- src/FileDiffWidget.cpp \
	- src/FileHistoryWindow.cpp \
	- src/FilePropertyDialog.cpp \
	- src/FileUtil.cpp \
	- src/FileViewWidget.cpp \
	+ src/AboutDialog.cpp \
	+ src/AbstractProcess.cpp \
	+ src/AbstractSettingForm.cpp \
	+ src/ApplicationGlobal.cpp \
	+ src/AreYouSureYouWantToContinueConnectingDialog.cpp \
	+ src/AvatarLoader.cpp \
	+ src/BasicMainWindow.cpp \
	+ src/BasicRepositoryDialog.cpp \
	+ src/BigDiffWindow.cpp \
	+ src/BlameWindow.cpp \
	+ src/CheckoutDialog.cpp \
	+ src/ClearButton.cpp \
	+ src/CloneDialog.cpp \
	+ src/CloneFromGitHubDialog.cpp \
	+ src/CommitDialog.cpp \
	+ src/CommitExploreWindow.cpp \
	+ src/CommitPropertyDialog.cpp \
	+ src/CommitViewWindow.cpp \
	+ src/ConfigCredentialHelperDialog.cpp \
	+ src/ConfigSigningDialog.cpp \
	+ src/CreateRepositoryDialog.cpp \
	+ src/DeleteBranchDialog.cpp \
	+ src/DeleteTagsDialog.cpp \
	+ src/DialogHeaderFrame.cpp \
	+ src/DirectoryLineEdit.cpp \
	+ src/DoYouWantToInitDialog.cpp \
	+ src/EditGitIgnoreDialog.cpp \
	+ src/EditRemoteDialog.cpp \
	+ src/EditTagsDialog.cpp \
	+ src/ExperimentDialog.cpp \
	+ src/FileDiffSliderWidget.cpp \
	+ src/FileDiffWidget.cpp \
	+ src/FileHistoryWindow.cpp \
	+ src/FilePropertyDialog.cpp \
	+ src/FileUtil.cpp \
	+ src/FileViewWidget.cpp \
	src/FilesListWidget.cpp \
	src/FindCommitDialog.cpp \
	- src/Git.cpp \
	- src/GitDiff.cpp \
	- src/GitHubAPI.cpp \
	- src/GitObjectManager.cpp \
	- src/GitPack.cpp \
	- src/GitPackIdxV2.cpp \
	- src/HyperLinkLabel.cpp \
	- src/ImageViewWidget.cpp \
	- src/JumpDialog.cpp \
	- src/LocalSocketReader.cpp \
	- src/LogTableWidget.cpp \
	- src/MainWindow.cpp \
	- src/MaximizeButton.cpp \
	- src/MemoryReader.cpp \
	- src/MyImageViewWidget.cpp \
	- src/MyProcess.cpp \
	- src/MySettings.cpp \
	- src/MyTableWidgetDelegate.cpp \
	- src/MyTextEditorWidget.cpp \
	- src/MyToolButton.cpp \
	- src/Photoshop.cpp \
	- src/PushDialog.cpp \
	- src/ReadOnlyLineEdit.cpp \
	- src/ReadOnlyPlainTextEdit.cpp \
	- src/ReflogWindow.cpp \
	- src/RemoteRepositoriesTableWidget.cpp \
	- src/RepositoriesTreeWidget.cpp \
	- src/RepositoryData.cpp \
	- src/RepositoryInfoFrame.cpp \
	- src/RepositoryLineEdit.cpp \
	- src/RepositoryPropertyDialog.cpp \
	- src/SearchFromGitHubDialog.cpp \
	- src/SelectCommandDialog.cpp \
	- src/SetGlobalUserDialog.cpp \
	- src/SetRemoteUrlDialog.cpp \
	- src/SetUserDialog.cpp \
	- src/SettingBehaviorForm.cpp \
	- src/SettingExampleForm.cpp \
	- src/SettingNetworkForm.cpp \
	- src/SettingsDialog.cpp \
	- src/StatusLabel.cpp \
	- src/Terminal.cpp \
	- src/TextEditDialog.cpp \
	- src/Theme.cpp \
	- src/charvec.cpp \
	- src/common/joinpath.cpp \
	- src/common/misc.cpp \
	- src/gunzip.cpp \
	- src/main.cpp\
	- src/texteditor/AbstractCharacterBasedApplication.cpp \
	- src/texteditor/InputMethodPopup.cpp \
	- src/texteditor/TextEditorTheme.cpp \
	- src/texteditor/TextEditorWidget.cpp \
	- src/texteditor/UnicodeWidth.cpp \
	- src/texteditor/unicode.cpp \
	- src/urlencode.cpp \
	- src/webclient.cpp \
	- src/AreYouSureYouWantToContinueConnectingDialog.cpp \
	- src/BasicMainWindow.cpp \
	- src/BlameWindow.cpp \
	- src/CommitDialog.cpp \
	- src/CommitViewWindow.cpp \
	- src/ConfigSigningDialog.cpp \
	- src/DialogHeaderFrame.cpp \
	- src/DoYouWantToInitDialog.cpp \
	- src/EditGitIgnoreDialog.cpp \
	- src/EditRemoteDialog.cpp \
	- src/EditTagsDialog.cpp \
	- src/InputNewTagDialog.cpp \
	- src/LineEditDialog.cpp \
	- src/MenuButton.cpp \
	- src/RemoteWatcher.cpp \
	- src/SelectGpgKeyDialog.cpp \
	- src/SelectItemDialog.cpp \
	- src/SetGpgSigningDialog.cpp \
	- src/SettingGeneralForm.cpp \
	- src/SettingProgramsForm.cpp \
	- src/WelcomeWizardDialog.cpp \
	- src/darktheme/DarkStyle.cpp \
	- src/darktheme/NinePatch.cpp \
	- src/darktheme/StandardStyle.cpp \
	- src/darktheme/TraditionalWindowsStyleTreeControl.cpp \
	- src/gpg.cpp \
	- src/CloneFromGitHubDialog.cpp \
	+ src/Git.cpp \
	+ src/GitDiff.cpp \
	+ src/GitHubAPI.cpp \
	+ src/GitObjectManager.cpp \
	+ src/GitPack.cpp \
	+ src/GitPackIdxV2.cpp \
	+ src/HyperLinkLabel.cpp \
	+ src/ImageViewWidget.cpp \
	+ src/InputNewTagDialog.cpp \
	+ src/JumpDialog.cpp \
	+ src/LineEditDialog.cpp \
	+ src/LocalSocketReader.cpp \
	+ src/LogTableWidget.cpp \
	+ src/MainWindow.cpp \
	+ src/MaximizeButton.cpp \
	+ src/MemoryReader.cpp \
	+ src/MenuButton.cpp \
	+ src/MergeDialog.cpp \
	+ src/MyImageViewWidget.cpp \
	+ src/MyProcess.cpp \
	+ src/MySettings.cpp \
	+ src/MyTableWidgetDelegate.cpp \
	+ src/MyTextEditorWidget.cpp \
	+ src/MyToolButton.cpp \
	src/ObjectBrowserDialog.cpp \
	- src/MergeBranchDialog.cpp
	+ src/Photoshop.cpp \
	+ src/PushDialog.cpp \
	+ src/ReadOnlyLineEdit.cpp \
	+ src/ReadOnlyPlainTextEdit.cpp \
	+ src/ReflogWindow.cpp \
	+ src/RemoteRepositoriesTableWidget.cpp \
	+ src/RemoteWatcher.cpp \
	+ src/RepositoriesTreeWidget.cpp \
	+ src/RepositoryData.cpp \
	+ src/RepositoryInfoFrame.cpp \
	+ src/RepositoryLineEdit.cpp \
	+ src/RepositoryPropertyDialog.cpp \
	+ src/SearchFromGitHubDialog.cpp \
	+ src/SelectCommandDialog.cpp \
	+ src/SelectGpgKeyDialog.cpp \
	+ src/SelectItemDialog.cpp \
	+ src/SetGlobalUserDialog.cpp \
	+ src/SetGpgSigningDialog.cpp \
	+ src/SetRemoteUrlDialog.cpp \
	+ src/SetUserDialog.cpp \
	+ src/SettingBehaviorForm.cpp \
	+ src/SettingExampleForm.cpp \
	+ src/SettingGeneralForm.cpp \
	+ src/SettingNetworkForm.cpp \
	+ src/SettingProgramsForm.cpp \
	+ src/SettingsDialog.cpp \
	+ src/StatusLabel.cpp \
	+ src/Terminal.cpp \
	+ src/TextEditDialog.cpp \
	+ src/Theme.cpp \
	+ src/WelcomeWizardDialog.cpp \
	+ src/charvec.cpp \
	+ src/common/joinpath.cpp \
	+ src/common/misc.cpp \
	+ src/darktheme/DarkStyle.cpp \
	+ src/darktheme/NinePatch.cpp \
	+ src/darktheme/StandardStyle.cpp \
	+ src/darktheme/TraditionalWindowsStyleTreeControl.cpp \
	+ src/gpg.cpp \
	+ src/gunzip.cpp \
	+ src/main.cpp\
	+ src/texteditor/AbstractCharacterBasedApplication.cpp \
	+ src/texteditor/InputMethodPopup.cpp \
	+ src/texteditor/TextEditorTheme.cpp \
	+ src/texteditor/TextEditorWidget.cpp \
	+ src/texteditor/UnicodeWidth.cpp \
	+ src/texteditor/unicode.cpp \
	+ src/urlencode.cpp \
	+ src/webclient.cpp \

	HEADERS += \
	- src/AboutDialog.h \
	- src/AbstractProcess.h \
	- src/AbstractSettingForm.h \
	- src/ApplicationGlobal.h \
	- src/AvatarLoader.h \
	- src/BasicRepositoryDialog.h \
	- src/BigDiffWindow.h \
	- src/CheckoutDialog.h \
	- src/ClearButton.h \
	- src/CloneDialog.h \
	- src/CommitExploreWindow.h \
	- src/CommitPropertyDialog.h \
	- src/ConfigCredentialHelperDialog.h \
	- src/CreateRepositoryDialog.h \
	- src/Debug.h \
	- src/DeleteBranchDialog.h \
	- src/DeleteTagsDialog.h \
	- src/DirectoryLineEdit.h \
	- src/ExperimentDialog.h \
	- src/FileDiffSliderWidget.h \
	- src/FileDiffWidget.h \
	- src/FileHistoryWindow.h \
	- src/FilePropertyDialog.h \
	- src/FileUtil.h \
	+ src/AboutDialog.h \
	+ src/AbstractProcess.h \
	+ src/AbstractSettingForm.h \
	+ src/ApplicationGlobal.h \
	+ src/AreYouSureYouWantToContinueConnectingDialog.h \
	+ src/AvatarLoader.h \
	+ src/BasicMainWindow.h \
	+ src/BasicRepositoryDialog.h \
	+ src/BigDiffWindow.h \
	+ src/BlameWindow.h \
	+ src/CheckoutDialog.h \
	+ src/ClearButton.h \
	+ src/CloneDialog.h \
	+ src/CloneFromGitHubDialog.h \
	+ src/CommitDialog.h \
	+ src/CommitExploreWindow.h \
	+ src/CommitPropertyDialog.h \
	+ src/CommitViewWindow.h \
	+ src/ConfigCredentialHelperDialog.h \
	+ src/ConfigSigningDialog.h \
	+ src/CreateRepositoryDialog.h \
	+ src/Debug.h \
	+ src/DeleteBranchDialog.h \
	+ src/DeleteTagsDialog.h \
	+ src/DialogHeaderFrame.h \
	+ src/DirectoryLineEdit.h \
	+ src/DoYouWantToInitDialog.h \
	+ src/EditGitIgnoreDialog.h \
	+ src/EditRemoteDialog.h \
	+ src/EditTagsDialog.h \
	+ src/ExperimentDialog.h \
	+ src/FileDiffSliderWidget.h \
	+ src/FileDiffWidget.h \
	+ src/FileHistoryWindow.h \
	+ src/FilePropertyDialog.h \
	+ src/FileUtil.h \
	src/FilesListWidget.h \
	src/FindCommitDialog.h \
	- src/Git.h \
	- src/GitDiff.h \
	- src/GitHubAPI.h \
	- src/GitObjectManager.h \
	- src/GitPack.h \
	- src/GitPackIdxV2.h \
	- src/HyperLinkLabel.h \
	- src/ImageViewWidget.h \
	- src/JumpDialog.h \
	- src/LocalSocketReader.h \
	- src/LogTableWidget.h \
	- src/MainWindow.h \
	- src/MaximizeButton.h \
	- src/MemoryReader.h \
	- src/MyImageViewWidget.h \
	- src/MyProcess.h \
	- src/MySettings.h \
	- src/MyTableWidgetDelegate.h \
	- src/MyTextEditorWidget.h \
	- src/MyToolButton.h \
	- src/Photoshop.h \
	- src/PushDialog.h \
	- src/ReadOnlyLineEdit.h \
	- src/ReadOnlyPlainTextEdit.h \
	- src/ReflogWindow.h \
	- src/RemoteRepositoriesTableWidget.h \
	- src/RepositoriesTreeWidget.h \
	- src/RepositoryData.h \
	- src/RepositoryInfoFrame.h \
	- src/RepositoryLineEdit.h \
	- src/RepositoryPropertyDialog.h \
	- src/SearchFromGitHubDialog.h \
	- src/SelectCommandDialog.h \
	- src/SetGlobalUserDialog.h \
	- src/SetRemoteUrlDialog.h \
	- src/SetUserDialog.h \
	- src/SettingBehaviorForm.h \
	- src/SettingExampleForm.h \
	- src/SettingNetworkForm.h \
	- src/SettingsDialog.h \
	- src/StatusLabel.h \
	- src/Terminal.h \
	- src/TextEditDialog.h \
	- src/Theme.h \
	- src/charvec.h \
	- src/common/joinpath.h \
	- src/common/misc.h \
	- src/gunzip.h \
	- src/main.h \
	- src/texteditor/AbstractCharacterBasedApplication.h \
	- src/texteditor/InputMethodPopup.h \
	- src/texteditor/TextEditorTheme.h \
	- src/texteditor/TextEditorWidget.h \
	- src/texteditor/UnicodeWidth.h \
	- src/texteditor/unicode.h \
	- src/urlencode.h \
	- src/webclient.h \
	- src/AreYouSureYouWantToContinueConnectingDialog.h \
	- src/BasicMainWindow.h \
	- src/BlameWindow.h \
	- src/CommitDialog.h \
	- src/CommitViewWindow.h \
	- src/ConfigSigningDialog.h \
	- src/DialogHeaderFrame.h \
	- src/DoYouWantToInitDialog.h \
	- src/EditGitIgnoreDialog.h \
	- src/EditRemoteDialog.h \
	- src/EditTagsDialog.h \
	- src/InputNewTagDialog.h \
	- src/LineEditDialog.h \
	- src/MenuButton.h \
	- src/RemoteWatcher.h \
	- src/SelectGpgKeyDialog.h \
	- src/SelectItemDialog.h \
	- src/SetGpgSigningDialog.h \
	- src/SettingGeneralForm.h \
	- src/SettingProgramsForm.h \
	- src/WelcomeWizardDialog.h \
	- src/darktheme/DarkStyle.h \
	- src/darktheme/NinePatch.h \
	- src/darktheme/StandardStyle.h \
	- src/darktheme/TraditionalWindowsStyleTreeControl.h \
	- src/gpg.h \
	- src/platform.h \
	- src/CloneFromGitHubDialog.h \
	+ src/Git.h \
	+ src/GitDiff.h \
	+ src/GitHubAPI.h \
	+ src/GitObjectManager.h \
	+ src/GitPack.h \
	+ src/GitPackIdxV2.h \
	+ src/HyperLinkLabel.h \
	+ src/ImageViewWidget.h \
	+ src/InputNewTagDialog.h \
	+ src/JumpDialog.h \
	+ src/LineEditDialog.h \
	+ src/LocalSocketReader.h \
	+ src/LogTableWidget.h \
	+ src/MainWindow.h \
	+ src/MaximizeButton.h \
	+ src/MemoryReader.h \
	+ src/MenuButton.h \
	+ src/MergeDialog.h \
	+ src/MyImageViewWidget.h \
	+ src/MyProcess.h \
	+ src/MySettings.h \
	+ src/MyTableWidgetDelegate.h \
	+ src/MyTextEditorWidget.h \
	+ src/MyToolButton.h \
	src/ObjectBrowserDialog.h \
	- src/MergeBranchDialog.h
	+ src/Photoshop.h \
	+ src/PushDialog.h \
	+ src/ReadOnlyLineEdit.h \
	+ src/ReadOnlyPlainTextEdit.h \
	+ src/ReflogWindow.h \
	+ src/RemoteRepositoriesTableWidget.h \
	+ src/RemoteWatcher.h \
	+ src/RepositoriesTreeWidget.h \
	+ src/RepositoryData.h \
	+ src/RepositoryInfoFrame.h \
	+ src/RepositoryLineEdit.h \
	+ src/RepositoryPropertyDialog.h \
	+ src/SearchFromGitHubDialog.h \
	+ src/SelectCommandDialog.h \
	+ src/SelectGpgKeyDialog.h \
	+ src/SelectItemDialog.h \
	+ src/SetGlobalUserDialog.h \
	+ src/SetGpgSigningDialog.h \
	+ src/SetRemoteUrlDialog.h \
	+ src/SetUserDialog.h \
	+ src/SettingBehaviorForm.h \
	+ src/SettingExampleForm.h \
	+ src/SettingGeneralForm.h \
	+ src/SettingNetworkForm.h \
	+ src/SettingProgramsForm.h \
	+ src/SettingsDialog.h \
	+ src/StatusLabel.h \
	+ src/Terminal.h \
	+ src/TextEditDialog.h \
	+ src/Theme.h \
	+ src/WelcomeWizardDialog.h \
	+ src/charvec.h \
	+ src/common/joinpath.h \
	+ src/common/misc.h \
	+ src/darktheme/DarkStyle.h \
	+ src/darktheme/NinePatch.h \
	+ src/darktheme/StandardStyle.h \
	+ src/darktheme/TraditionalWindowsStyleTreeControl.h \
	+ src/gpg.h \
	+ src/gunzip.h \
	+ src/main.h \
	+ src/platform.h \
	+ src/texteditor/AbstractCharacterBasedApplication.h \
	+ src/texteditor/InputMethodPopup.h \
	+ src/texteditor/TextEditorTheme.h \
	+ src/texteditor/TextEditorWidget.h \
	+ src/texteditor/UnicodeWidth.h \
	+ src/texteditor/unicode.h \
	+ src/urlencode.h \
	+ src/webclient.h

	HEADERS += src/version.h

	FORMS += \
	- src/AboutDialog.ui \
	- src/BigDiffWindow.ui \
	- src/CheckoutDialog.ui \
	- src/CloneDialog.ui \
	- src/CommitExploreWindow.ui \
	- src/CommitPropertyDialog.ui \
	- src/ConfigCredentialHelperDialog.ui \
	- src/CreateRepositoryDialog.ui \
	- src/DeleteBranchDialog.ui \
	- src/DeleteTagsDialog.ui \
	- src/ExperimentDialog.ui \
	- src/FileDiffWidget.ui \
	- src/FileHistoryWindow.ui \
	- src/FilePropertyDialog.ui \
	- src/FindCommitDialog.ui \
	- src/JumpDialog.ui \
	- src/MainWindow.ui \
	- src/PushDialog.ui \
	- src/RepositoryPropertyDialog.ui \
	- src/SearchFromGitHubDialog.ui \
	- src/SelectCommandDialog.ui \
	- src/SetRemoteUrlDialog.ui \
	- src/SetUserDialog.ui \
	- src/SettingBehaviorForm.ui \
	- src/SettingExampleForm.ui \
	- src/SettingNetworkForm.ui \
	- src/SettingsDialog.ui \
	- src/TextEditDialog.ui \
	- src/AreYouSureYouWantToContinueConnectingDialog.ui \
	- src/BlameWindow.ui \
	- src/CommitDialog.ui \
	- src/CommitViewWindow.ui \
	- src/ConfigSigningDialog.ui \
	- src/DoYouWantToInitDialog.ui \
	- src/EditGitIgnoreDialog.ui \
	- src/EditRemoteDialog.ui \
	- src/EditTagsDialog.ui \
	- src/InputNewTagDialog.ui \
	- src/LineEditDialog.ui \
	- src/ReflogWindow.ui \
	- src/SelectGpgKeyDialog.ui \
	- src/SelectItemDialog.ui \
	- src/SetGlobalUserDialog.ui \
	- src/SetGpgSigningDialog.ui \
	- src/SettingGeneralForm.ui \
	- src/SettingProgramsForm.ui \
	- src/WelcomeWizardDialog.ui \
	- src/CloneFromGitHubDialog.ui \
	- src/ObjectBrowserDialog.ui \
	- src/MergeBranchDialog.ui
	+ src/AboutDialog.ui \
	+ src/AreYouSureYouWantToContinueConnectingDialog.ui \
	+ src/BigDiffWindow.ui \
	+ src/BlameWindow.ui \
	+ src/CheckoutDialog.ui \
	+ src/CloneDialog.ui \
	+ src/CloneFromGitHubDialog.ui \
	+ src/CommitDialog.ui \
	+ src/CommitExploreWindow.ui \
	+ src/CommitPropertyDialog.ui \
	+ src/CommitViewWindow.ui \
	+ src/ConfigCredentialHelperDialog.ui \
	+ src/ConfigSigningDialog.ui \
	+ src/CreateRepositoryDialog.ui \
	+ src/DeleteBranchDialog.ui \
	+ src/DeleteTagsDialog.ui \
	+ src/DoYouWantToInitDialog.ui \
	+ src/EditGitIgnoreDialog.ui \
	+ src/EditRemoteDialog.ui \
	+ src/EditTagsDialog.ui \
	+ src/ExperimentDialog.ui \
	+ src/FileDiffWidget.ui \
	+ src/FileHistoryWindow.ui \
	+ src/FilePropertyDialog.ui \
	+ src/FindCommitDialog.ui \
	+ src/InputNewTagDialog.ui \
	+ src/JumpDialog.ui \
	+ src/LineEditDialog.ui \
	+ src/MainWindow.ui \
	+ src/MergeDialog.ui \
	+ src/ObjectBrowserDialog.ui \
	+ src/PushDialog.ui \
	+ src/ReflogWindow.ui \
	+ src/RepositoryPropertyDialog.ui \
	+ src/SearchFromGitHubDialog.ui \
	+ src/SelectCommandDialog.ui \
	+ src/SelectGpgKeyDialog.ui \
	+ src/SelectItemDialog.ui \
	+ src/SetGlobalUserDialog.ui \
	+ src/SetGpgSigningDialog.ui \
	+ src/SetRemoteUrlDialog.ui \
	+ src/SetUserDialog.ui \
	+ src/SettingBehaviorForm.ui \
	+ src/SettingExampleForm.ui \
	+ src/SettingGeneralForm.ui \
	+ src/SettingNetworkForm.ui \
	+ src/SettingProgramsForm.ui \
	+ src/SettingsDialog.ui \
	+ src/TextEditDialog.ui \
	+ src/WelcomeWizardDialog.ui

	RESOURCES += \
	src/resources/resources.qrc

	unix {
	SOURCES += \
	src/unix/UnixProcess.cpp \
	src/unix/UnixPtyProcess.cpp
	HEADERS += \
	src/unix/UnixProcess.h \
	src/unix/UnixPtyProcess.h
	}

	win32 {
	SOURCES += \
	src/win32/Win32Process.cpp \
	src/win32/Win32PtyProcess.cpp \
	src/win32/event.cpp \
	src/win32/thread.cpp \
	src/win32/win32.cpp

	HEADERS += \
	src/win32/Win32Process.h \
	src/win32/Win32PtyProcess.h \
	src/win32/event.h \
	src/win32/mutex.h \
	src/win32/thread.h \
	src/win32/win32.h
	}


	diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
	index b6e48a2..a250d4e 100644
	--- a/src/MainWindow.cpp
	+++ b/src/MainWindow.cpp
	@@ -1,2854 +1,2867 @@
	#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 "common/joinpath.h"
	#include "common/misc.h"
	-#include "MergeBranchDialog.h"
	+#include "MergeDialog.h"
	#include "platform.h"
	#include "webclient.h"
	#include <QClipboard>
	#include <QDirIterator>
	#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;
	};

	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);

	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));
	}

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

	bool MainWindow::shown()
	{
	while (isUninitialized()) {
	if (!execWelcomeWizardDialog()) {
	return false;
	}
	}

	m->repos_panel_width = ui->stackedWidget_leftpanel->width();
	ui->stackedWidget_leftpanel->setCurrentWidget(ui->page_repos);
	ui->action_repositories_panel->setChecked(true);

	setGitCommand(appsettings()->git_command, false);
	setFileCommand(appsettings()->file_command, false);

	writeLog(AboutDialog::appVersion() + '\n'); // print application version
	logGitVersion(); // print git command version

	setGpgCommand(appsettings()->gpg_command, false);

	{
	MySettings settings;
	{
	settings.beginGroup("Remote");
	bool f = settings.value("Online", true).toBool();
	settings.endGroup();
	setRemoteOnline(f, false, 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();

	setUnknownRepositoryInfo();

	checkUser();

	return true;
	}

	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::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);
	}

	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;
	}

	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);
	auto 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();
	}


	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::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_tags_f_triggered()
	{
	if (isOnlineMode()) {
	reopenRepository(true, [&](GitPtr g){
	fetch_tags_f(g);
	});
	} 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::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_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->local_dir);
	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;

	QAction *a_reset_head = nullptr;
	#if 0 // 下手に使うと危険なので、とりあえず無効にしておく
	if (is_valid_commit_id && commit->commit_id == head_id_) {
	a_reset_head = menu.addAction(tr("Reset HEAD"));
	}
	#endif

	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) {
	mergeBranch(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 (a == a_reset_head) {
	reopenRepository(false, [](GitPtr g){
	g->reset_head1();
	});
	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::on_action_window_log_triggered(bool checked)
	{
	ui->dockWidget_log->setVisible(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::mergeBranch(Git::CommitItem const *commit)
	+void MainWindow::mergeBranch(QString const &commit)
	{
	- if (!commit) return;
	+ if (commit.isEmpty()) return;

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

	- g->mergeBranch(commit->commit_id);
	+ g->mergeBranch(commit);
	openRepository(true);
	}

	+void MainWindow::mergeBranch(Git::CommitItem const *commit)
	+{
	+ if (!commit) return;
	+ mergeBranch(commit->commit_id);
	+}
	+
	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;

	g->cherrypick(commit->commit_id);
	openRepository(true);
	}

	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 update_ui, bool save)
	{
	m->is_online_mode = f;

	if (update_ui) {
	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, true);
	}

	void MainWindow::on_radioButton_remote_offline_clicked()
	{
	setRemoteOnline(false, true, 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(currentWorkingCopyDir());
	}

	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::test()
	{
	+ // wip: MergeDialog
	+
	+ if (isThereUncommitedChanges()) return;
	+
	int row = selectedLogIndex();
	Git::CommitItem const *commit = commitItem(row);
	if (commit && Git::isValidID(commit->commit_id)) {

	+ static const char MergeFastForward[] = "MergeFastForward";
	+
	QString fastforward;
	{
	MySettings s;
	s.beginGroup("Behavior");
	- fastforward = s.value("FastForward").toString();
	+ fastforward = s.value(MergeFastForward).toString();
	s.endGroup();
	}

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

	labels.push_back(commit->commit_id);

	QString branch_name = currentBranchName();

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








	diff --git a/src/MainWindow.h b/src/MainWindow.h
	index 3db1ba7..0ac0df6 100644
	--- a/src/MainWindow.h
	+++ b/src/MainWindow.h
	@@ -1,215 +1,216 @@
	#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 cherrypick(Git::CommitItem const *commit);
	+ void mergeBranch(const QString &commit);
	void mergeBranch(Git::CommitItem const *commit);
	void rebaseBranch(Git::CommitItem const *commit);
	+ void cherrypick(Git::CommitItem const *commit);
	void detectGitServerType(const GitPtr &g);
	void setRemoteOnline(bool f, bool update_ui, 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);
	void test();
	bool isUninitialized();
	void doLogCurrentItemChanged();
	void findNext();
	void findText(const QString &text);
	void showStatus();
	protected:
	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);
	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_tags_f_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);
	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/MergeBranchDialog.h b/src/MergeBranchDialog.h
	deleted file mode 100644
	index 571ff80..0000000
	--- a/src/MergeBranchDialog.h
	+++ /dev/null
	@@ -1,23 +0,0 @@
	-#ifndef MERGEBRANCHDIALOG_H
	-#define MERGEBRANCHDIALOG_H
	-
	-#include <QDialog>
	-
	-namespace Ui {
	-class MergeBranchDialog;
	-}
	-
	-class MergeBranchDialog : public QDialog {
	- Q_OBJECT
	-public:
	- explicit MergeBranchDialog(const QString &fastforward, std::vector<QString> const &labels, QString const curr_branch_name, QWidget *parent = nullptr);
	- ~MergeBranchDialog();
	-
	- QString getFastForwardPolicy() const;
	- void setFastForwardPolicy(const QString &ff);
	- QString mergeFrom() const;
	-private:
	- Ui::MergeBranchDialog *ui;
	-};
	-
	-#endif // MERGEBRANCHDIALOG_H
	diff --git a/src/MergeBranchDialog.cpp b/src/MergeDialog.cpp
	similarity index 65%
	rename from src/MergeBranchDialog.cpp
	rename to src/MergeDialog.cpp
	index af50c1c..734b138 100644
	--- a/src/MergeBranchDialog.cpp
	+++ b/src/MergeDialog.cpp
	@@ -1,54 +1,54 @@
	-#include "MergeBranchDialog.h"
	-#include "ui_MergeBranchDialog.h"
	+#include "MergeDialog.h"
	+#include "ui_MergeDialog.h"

	-MergeBranchDialog::MergeBranchDialog(QString const &fastforward, const std::vector<QString> &labels, const QString curr_branch_name, QWidget *parent)
	+MergeDialog::MergeDialog(QString const &fastforward, const std::vector<QString> &labels, const QString curr_branch_name, QWidget *parent)
	: QDialog(parent)
	- , ui(new Ui::MergeBranchDialog)
	+ , ui(new Ui::MergeDialog)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	setFastForwardPolicy(fastforward);

	for (int i = 0; i < labels.size(); i++) {
	QString const &label = labels[i];
	ui->listWidget_from->addItem(label);
	if (label == curr_branch_name) {
	ui->listWidget_from->setCurrentRow(i);
	}
	}
	}

	-MergeBranchDialog::~MergeBranchDialog()
	+MergeDialog::~MergeDialog()
	{
	delete ui;
	}

	-QString MergeBranchDialog::getFastForwardPolicy() const
	+QString MergeDialog::getFastForwardPolicy() const
	{
	if (ui->radioButton_force_ff) return "yes";
	if (ui->radioButton_force_no_ff) return "no";
	return "default";
	}

	-void MergeBranchDialog::setFastForwardPolicy(QString const &ff)
	+void MergeDialog::setFastForwardPolicy(QString const &ff)
	{
	if (ff.compare("yes", Qt::CaseInsensitive) == 0) {
	ui->radioButton_force_ff->click();
	return;
	}
	if (ff.compare("no", Qt::CaseInsensitive) == 0) {
	ui->radioButton_force_no_ff->click();
	return;
	}
	ui->radioButton_ff_default->click();
	}

	-QString MergeBranchDialog::mergeFrom() const
	+QString MergeDialog::mergeFrom() const
	{
	QListWidgetItem *p = ui->listWidget_from->currentItem();
	return p ? p->text() : QString();
	}

	diff --git a/src/MergeDialog.h b/src/MergeDialog.h
	new file mode 100644
	index 0000000..5acc68a
	--- /dev/null
	+++ b/src/MergeDialog.h
	@@ -0,0 +1,23 @@
	+#ifndef MERGEDIALOG_H
	+#define MERGEDIALOG_H
	+
	+#include <QDialog>
	+
	+namespace Ui {
	+class MergeDialog;
	+}
	+
	+class MergeDialog : public QDialog {
	+ Q_OBJECT
	+public:
	+ explicit MergeDialog(const QString &fastforward, std::vector<QString> const &labels, QString const curr_branch_name, QWidget *parent = nullptr);
	+ ~MergeDialog();
	+
	+ QString getFastForwardPolicy() const;
	+ void setFastForwardPolicy(const QString &ff);
	+ QString mergeFrom() const;
	+private:
	+ Ui::MergeDialog *ui;
	+};
	+
	+#endif // MERGEDIALOG_H
	diff --git a/src/MergeBranchDialog.ui b/src/MergeDialog.ui
	similarity index 93%
	rename from src/MergeBranchDialog.ui
	rename to src/MergeDialog.ui
	index 743595c..8be0d7c 100644
	--- a/src/MergeBranchDialog.ui
	+++ b/src/MergeDialog.ui
	@@ -1,127 +1,127 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<ui version="4.0">
	- <class>MergeBranchDialog</class>
	- <widget class="QDialog" name="MergeBranchDialog">
	+ <class>MergeDialog</class>
	+ <widget class="QDialog" name="MergeDialog">
	<property name="geometry">
	<rect>
	<x>0</x>
	<y>0</y>
	<width>430</width>
	- <height>252</height>
	+ <height>274</height>
	</rect>
	</property>
	<property name="windowTitle">
	<string>Merge</string>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_3">
	<item>
	<widget class="QGroupBox" name="groupBox">
	<property name="title">
	<string>Fast Forwarding</string>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout">
	<item>
	<widget class="QRadioButton" name="radioButton_ff_default">
	<property name="text">
	<string>Default</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QRadioButton" name="radioButton_force_ff">
	<property name="text">
	<string>Force fast forward</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QRadioButton" name="radioButton_force_no_ff">
	<property name="text">
	<string>Force no fast forward</string>
	</property>
	</widget>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<widget class="QGroupBox" name="groupBox_2">
	<property name="title">
	<string>From</string>
	</property>
	<layout class="QVBoxLayout" name="verticalLayout_2">
	<item>
	<widget class="QListWidget" name="listWidget_from"/>
	</item>
	</layout>
	</widget>
	</item>
	<item>
	<layout class="QHBoxLayout" name="horizontalLayout">
	<item>
	<spacer name="horizontalSpacer">
	<property name="orientation">
	<enum>Qt::Horizontal</enum>
	</property>
	<property name="sizeHint" stdset="0">
	<size>
	<width>40</width>
	<height>20</height>
	</size>
	</property>
	</spacer>
	</item>
	<item>
	<widget class="QPushButton" name="pushButton">
	<property name="text">
	<string>OK</string>
	</property>
	</widget>
	</item>
	<item>
	<widget class="QPushButton" name="pushButton_2">
	<property name="text">
	<string>Cancel</string>
	</property>
	</widget>
	</item>
	</layout>
	</item>
	</layout>
	</widget>
	<resources/>
	<connections>
	<connection>
	<sender>pushButton</sender>
	<signal>clicked()</signal>
	- <receiver>MergeBranchDialog</receiver>
	+ <receiver>MergeDialog</receiver>
	<slot>accept()</slot>
	<hints>
	<hint type="sourcelabel">
	<x>174</x>
	<y>229</y>
	</hint>
	<hint type="destinationlabel">
	<x>153</x>
	<y>228</y>
	</hint>
	</hints>
	</connection>
	<connection>
	<sender>pushButton_2</sender>
	<signal>clicked()</signal>
	- <receiver>MergeBranchDialog</receiver>
	+ <receiver>MergeDialog</receiver>
	<slot>reject()</slot>
	<hints>
	<hint type="sourcelabel">
	<x>287</x>
	<y>229</y>
	</hint>
	<hint type="destinationlabel">
	<x>327</x>
	<y>233</y>
	</hint>
	</hints>
	</connection>
	</connections>
	</ui>

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 16, 12:23 AM (2 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 70810
Default Alt Text: (115 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions