From 2f5f9c1907e37b467aaadaec5e18eae73f80ba03 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 18 May 2012 15:47:39 +0200 Subject: [PATCH] added "Create Library" button to settings dialog Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 8 ++++++++ src/Resources/TortoiseProcENG.rc | 23 +++++++++++++---------- src/TortoiseProc/Settings/SetMainPage.cpp | 12 ++++++++++++ src/TortoiseProc/Settings/SetMainPage.h | 1 + src/TortoiseProc/resource.h | 4 +++- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index dcfe399d1..d4af9bf16 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -2691,6 +2691,10 @@ msgstr "" msgid "Could not start thread!" msgstr "" +#. Resource IDs: (1683) +msgid "Create &Library" +msgstr "" + #. Resource IDs: (1641) msgid "Create .gitignore file" msgstr "" @@ -2751,6 +2755,10 @@ msgstr "" msgid "Creates a branch or tag" msgstr "" +#. Resource IDs: (76) +msgid "Creates a library folder with special settings for Git working trees" +msgstr "" + #. Resource IDs: (2052) msgid "Creates a patch file from the differences of the two files\nCreate patch file" msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index c233f570f..8f17aeec9 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -286,7 +286,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "TortoiseGit",IDC_STATIC,7,7,286,76 + GROUPBOX "TortoiseGit",IDC_STATIC,7,7,286,92 LTEXT "&Language:",IDC_STATIC,14,20,86,8 COMBOBOX IDC_LANGUAGECOMBO,108,18,176,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Automatically check for &newer versions every week",IDC_CHECKNEWERVERSION, @@ -294,15 +294,16 @@ BEGIN PUSHBUTTON "C&heck now",IDC_CHECKNEWERBUTTON,212,38,72,14 LTEXT "System &sounds",IDC_SOUNDS_TEXT,14,62,192,8 PUSHBUTTON "&Configure",IDC_SOUNDS,212,59,72,14 - GROUPBOX "MSysGit",IDC_STATIC,7,92,286,118 - LTEXT "Git.exe Path:",IDC_STATIC,16,111,58,8 - EDITTEXT IDC_MSYSGIT_PATH,78,108,178,14,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_MSYSGIT_BROWSE,265,108,19,14 - LTEXT "Extern DLL Path:",IDC_STATIC,15,134,58,8 - EDITTEXT IDC_MSYSGIT_EXTERN_PATH,78,131,178,14,ES_AUTOHSCROLL - LTEXT "Version:",IDC_MSYSGIT_VER,15,155,141,8 - PUSHBUTTON "C&heck now",IDC_MSYSGIT_CHECK,212,152,72,14 - PUSHBUTTON "Show Environment Variables",IDC_BUTTON_SHOW_ENV,14,171,129,14 + PUSHBUTTON "Create &Library",IDC_CREATELIB,212,79,72,14 + GROUPBOX "MSysGit",IDC_STATIC,7,113,286,98 + LTEXT "Git.exe Path:",IDC_STATIC,16,132,58,8 + EDITTEXT IDC_MSYSGIT_PATH,78,129,178,14,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_MSYSGIT_BROWSE,265,129,19,14 + LTEXT "Extern DLL Path:",IDC_STATIC,15,155,58,8 + EDITTEXT IDC_MSYSGIT_EXTERN_PATH,78,152,178,14,ES_AUTOHSCROLL + LTEXT "Version:",IDC_MSYSGIT_VER,15,176,141,8 + PUSHBUTTON "C&heck now",IDC_MSYSGIT_CHECK,212,173,72,14 + PUSHBUTTON "Show Environment Variables",IDC_BUTTON_SHOW_ENV,14,192,129,14 END IDD_SETTINGSOVERLAY DIALOGEX 0, 0, 300, 217 @@ -2369,6 +2370,8 @@ BEGIN IDS_PROC_LOG_STATS "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n" IDS_PROC_LOG_ALLBRANCHES "" IDS_PROC_LOG_NOBRANCH "" + IDS_SETTINGS_CREATELIB_TT + "Creates a library folder with special settings for Git working trees" IDS_IMPORT_DEFAULTMSG "Initial import" IDS_PROC_SYNC_PUSHTAGS "Push ta&gs" IDS_PROC_SYNC_PULL "&Pull" diff --git a/src/TortoiseProc/Settings/SetMainPage.cpp b/src/TortoiseProc/Settings/SetMainPage.cpp index fd69b4985..118f4ac9e 100644 --- a/src/TortoiseProc/Settings/SetMainPage.cpp +++ b/src/TortoiseProc/Settings/SetMainPage.cpp @@ -31,6 +31,7 @@ #include "GitConfig.h" #include "BrowseFolder.h" #include "SysInfo.h" +#include "Libraries.h" IMPLEMENT_DYNAMIC(CSetMainPage, ISettingsPropPage) CSetMainPage::CSetMainPage() @@ -79,6 +80,7 @@ BEGIN_MESSAGE_MAP(CSetMainPage, ISettingsPropPage) ON_EN_CHANGE(IDC_MSYSGIT_PATH, OnMsysGitPathModify) ON_EN_CHANGE(IDC_MSYSGIT_EXTERN_PATH, OnModified) ON_BN_CLICKED(IDC_BUTTON_SHOW_ENV, &CSetMainPage::OnBnClickedButtonShowEnv) + ON_BN_CLICKED(IDC_CREATELIB, &CSetMainPage::OnBnClickedCreatelib) END_MESSAGE_MAP() BOOL CSetMainPage::OnInitDialog() @@ -98,6 +100,9 @@ BOOL CSetMainPage::OnInitDialog() m_tooltips.Create(this); m_tooltips.AddTool(IDC_MSYSGIT_PATH,IDS_MSYSGIT_PATH_TT); m_tooltips.AddTool(IDC_CHECKNEWERVERSION, IDS_SETTINGS_CHECKNEWER_TT); + m_tooltips.AddTool(IDC_CREATELIB, IDS_SETTINGS_CREATELIB_TT); + + GetDlgItem(IDC_CREATELIB)->EnableWindow(SysInfo::Instance().IsWin7OrLater()); SHAutoComplete(GetDlgItem(IDC_MSYSGIT_PATH)->m_hWnd, SHACF_FILESYSTEM); @@ -298,3 +303,10 @@ void CSetMainPage::OnBnClickedButtonShowEnv() g_Git.RunLogFile(cmd,tempfile); CAppUtils::LaunchAlternativeEditor(tempfile); } + +void CSetMainPage::OnBnClickedCreatelib() +{ + CoInitialize(NULL); + EnsureGitLibrary(); + CoUninitialize(); +} diff --git a/src/TortoiseProc/Settings/SetMainPage.h b/src/TortoiseProc/Settings/SetMainPage.h index d242bfe98..1df13b6ce 100644 --- a/src/TortoiseProc/Settings/SetMainPage.h +++ b/src/TortoiseProc/Settings/SetMainPage.h @@ -56,6 +56,7 @@ protected: afx_msg void OnBrowseDir(); afx_msg void OnCheck(); afx_msg void OnBnClickedButtonShowEnv(); + afx_msg void OnBnClickedCreatelib(); CString GetVersionFromFile(const CString & p_strDateiname); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 5b9fbaf14..34db49f13 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -523,6 +523,7 @@ #define IDS_PROC_LOG_ALLBRANCHES 1201 #define IDS_PROC_LOG_NOBRANCH 1202 #define IDC_WHOLE_PROJECT 1203 +#define IDS_SETTINGS_CREATELIB_TT 1203 #define IDS_IMPORT_DEFAULTMSG 1205 #define IDC_CHECKBOX 1207 #define IDS_PROC_SYNC_PUSHTAGS 1207 @@ -1103,6 +1104,7 @@ #define IDC_TOSUBJECT 1680 #define IDC_CHECK_NEWBRANCH 1681 #define IDC_CHECK_CHERRYPICKED_FROM 1682 +#define IDC_CREATELIB 1683 #define IDS_ABOUTVERSION 1700 #define IDS_ABOUTVERSIONBOX 1701 #define IDS_DLGTITLE_ADD_DIFF_TOOL 1750 @@ -1485,7 +1487,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 343 #define _APS_NEXT_COMMAND_VALUE 32840 -#define _APS_NEXT_CONTROL_VALUE 1683 +#define _APS_NEXT_CONTROL_VALUE 1684 #define _APS_NEXT_SYMED_VALUE 201 #endif #endif -- 2.11.4.GIT