No OneTemporary
Actions

Authored By

Unknown

Size

24 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 4ef98ce..549a183 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,389 +1,390 @@
	cmake_minimum_required(VERSION 3.2)

	project(Guitar
	VERSION 0.9.4
	LANGUAGES CXX C
	)

	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
	)

	add_compile_options(-std=c++11)

	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/FileUtil.cpp
	src/FileViewWidget.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/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/FileUtil.h
	src/FileViewWidget.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/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/InputNewTagDialog.ui
	src/JumpDialog.ui
	src/LineEditDialog.ui
	src/MainWindow.ui
	src/MergeBranchDialog.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 8907661..ecaf4f2 100644
	--- a/Guitar.pro
	+++ b/Guitar.pro
	@@ -1,400 +1,401 @@

	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
	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/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/MergeBranchDialog.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/ObjectBrowserDialog.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/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/MergeBranchDialog.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/ObjectBrowserDialog.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/JumpDialog.ui \
	src/MainWindow.ui \
	src/MergeBranchDialog.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

	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/SettingGeneralForm.cpp b/src/SettingGeneralForm.cpp
	index 981804c..d04e73d 100644
	--- a/src/SettingGeneralForm.cpp
	+++ b/src/SettingGeneralForm.cpp
	@@ -1,111 +1,112 @@
	#include "MySettings.h"
	#include "SelectItemDialog.h"
	#include "ApplicationGlobal.h"
	#include "SettingGeneralForm.h"
	#include "ui_SettingGeneralForm.h"
	#include "common/misc.h"

	#include <QFileDialog>

	SettingGeneralForm::SettingGeneralForm(QWidget *parent) :
	AbstractSettingForm(parent),
	ui(new Ui::SettingGeneralForm)
	{
	ui->setupUi(this);

	langs.push_back(SelectItemDialog::Item("en", tr("English")));
	langs.push_back(SelectItemDialog::Item("ja", tr("Japanese")));
	+ langs.push_back(SelectItemDialog::Item("ru", tr("Russian")));

	themes.push_back(SelectItemDialog::Item("standard", tr("Standard")));
	themes.push_back(SelectItemDialog::Item("dark", tr("Dark")));

	updateLanguage();
	updateTheme();
	}

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

	void SettingGeneralForm::exchange(bool save)
	{
	if (save) {
	settings()->remember_and_restore_window_position = ui->checkBox_save_window_pos->isChecked();
	settings()->enable_high_dpi_scaling = ui->checkBox_enable_high_dpi_scaling->isChecked();
	} else {
	ui->checkBox_save_window_pos->setChecked(settings()->remember_and_restore_window_position);
	ui->checkBox_enable_high_dpi_scaling->setChecked(settings()->enable_high_dpi_scaling);
	}
	}

	void SettingGeneralForm::on_pushButton_browse_default_working_dir_clicked()
	{
	}

	void SettingGeneralForm::updateLanguage()
	{
	QString id = global->language_id;
	if (id.isEmpty()) {
	id = "en";
	}
	for (SelectItemDialog::Item const &item : langs) {
	if (item.id == id) {
	ui->lineEdit_language->setText(item.text);
	return;
	}
	}
	}

	void SettingGeneralForm::updateTheme()
	{
	QString id = global->theme_id;
	if (id.isEmpty()) {
	id = "standard";
	}
	for (SelectItemDialog::Item const &item : themes) {
	if (item.id == id) {
	ui->lineEdit_theme->setText(item.text);
	return;
	}
	}
	}

	void SettingGeneralForm::on_pushButton_change_language_clicked()
	{

	SelectItemDialog dlg(this);
	dlg.setWindowTitle(tr("Select Language"));
	for (SelectItemDialog::Item const &item : langs) {
	dlg.addItem(item.id, item.text);
	}
	dlg.select(global->language_id.isEmpty() ? "en" : global->language_id);
	if (dlg.exec() == QDialog::Accepted) {
	SelectItemDialog::Item item = dlg.item();
	global->language_id = item.id;
	MySettings s;
	s.beginGroup("UI");
	s.setValue("Language", global->language_id);
	s.endGroup();
	updateLanguage();
	}
	}

	void SettingGeneralForm::on_pushButton_change_theme_clicked()
	{
	SelectItemDialog dlg(this);
	dlg.setWindowTitle(tr("Select Theme"));
	for (SelectItemDialog::Item const &item : themes) {
	dlg.addItem(item.id, item.text);
	}
	dlg.select(global->theme_id.isEmpty() ? "standard" : global->theme_id);
	if (dlg.exec() == QDialog::Accepted) {
	SelectItemDialog::Item item = dlg.item();
	global->theme_id = item.id;
	MySettings s;
	s.beginGroup("UI");
	s.setValue("Theme", global->theme_id);
	s.endGroup();
	updateTheme();
	}
	}

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions