Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. e8e93f99cd69f39d122dbfc6ba2d1e3b7eb0f2ac
|
From: Eran I. <no...@so...> - 2013-12-21 07:34:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via e8e93f99cd69f39d122dbfc6ba2d1e3b7eb0f2ac (commit)
via 8d89533ee730ea3f7b69affe72357b69a06d1820 (commit)
from db8ed36b58368334f148517fd625d23d3ba3b457 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/e8e93f99cd69f39d122dbfc6ba2d1e3b7eb0f2ac
commit e8e93f99cd69f39d122dbfc6ba2d1e3b7eb0f2ac
Merge: 8d89533 db8ed36
Author: Eran <era...@gm...>
Date: Sat Dec 21 09:28:52 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Multiple bookmark types are now correctly serialised
Multiple bookmark types: These are now taken into account when a file is being reformatted
Multiple bookmark types: It's now possible to set individual colours for each bookmark type
Bookmarks now have a tooltip
Multiple bookmark types: Add menuitems and implementation
Multiple bookmark types: Create the underlying mechanism and use it for 'Find' bookmarks
https://sourceforge.net/p/codelite/codelitegit/ci/8d89533ee730ea3f7b69affe72357b69a06d1820
commit 8d89533ee730ea3f7b69affe72357b69a06d1820
Author: Eran <era...@gm...>
Date: Sat Dec 21 09:28:43 2013 +0200
Git: allow user an option to set/edit the global/local email and username
diff --git a/git/git.cpp b/git/git.cpp
index a001150..4236dab 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -29,6 +29,7 @@
#include "project.h"
#include "environmentconfig.h"
#include "dirsaver.h"
+#include <wx/sstream.h>
static GitPlugin* thePlugin = NULL;
#define GIT_MESSAGE(...) m_console->AddText(wxString::Format(__VA_ARGS__));
@@ -104,9 +105,9 @@ GitPlugin::GitPlugin(IManager *manager)
/*******************************************************************************/
GitPlugin::~GitPlugin()
{
- delete m_progressDialog;
- m_progressDialog = NULL;
+ wxDELETE(m_progressDialog);
}
+
/*******************************************************************************/
clToolBar *GitPlugin::CreateToolBar(wxWindow *parent)
{
@@ -352,7 +353,7 @@ void GitPlugin::OnSetGitRepoPath(wxCommandEvent& e)
/*******************************************************************************/
void GitPlugin::OnSettings(wxCommandEvent &e)
{
- GitSettingsDlg dlg(m_topWindow);
+ GitSettingsDlg dlg(m_topWindow, m_repositoryDirectory);
if ( dlg.ShowModal() == wxID_OK ) {
// update the paths
diff --git a/git/git.h b/git/git.h
index f16c5bd..b9077ba 100644
--- a/git/git.h
+++ b/git/git.h
@@ -35,10 +35,10 @@ public:
};
class GitConsole;
class GitCommitListDlg;
+
class GitPlugin : public IPlugin
{
typedef std::map<int, int> IntMap_t;
-
enum {
gitNone = 0,
gitUpdateRemotes,
diff --git a/git/gitSettingsDlg.cpp b/git/gitSettingsDlg.cpp
index 406c293..7f8203a 100644
--- a/git/gitSettingsDlg.cpp
+++ b/git/gitSettingsDlg.cpp
@@ -4,8 +4,9 @@
#include "gitentry.h"
#include "event_notifier.h"
-GitSettingsDlg::GitSettingsDlg(wxWindow* parent)
- :GitSettingsDlgBase(parent)
+GitSettingsDlg::GitSettingsDlg(wxWindow* parent, const wxString& localRepoPath)
+ : GitSettingsDlgBase(parent)
+ , m_localRepoPath(localRepoPath)
{
clConfig conf("git.conf");
GitEntry data;
@@ -16,7 +17,14 @@ GitSettingsDlg::GitSettingsDlg(wxWindow* parent)
m_checkBoxLog->SetValue( data.GetFlags() & GitEntry::Git_Verbose_Log );
m_checkBoxTerminal->SetValue( data.GetFlags() & GitEntry::Git_Show_Terminal );
m_checkBoxTrackTree->SetValue( data.GetFlags() & GitEntry::Git_Colour_Tree_View );
-
+
+ GitEntry::GitProperties props = GitEntry::ReadGitProperties( m_localRepoPath );
+
+ m_textCtrlGlobalEmail->ChangeValue( props.global_email );
+ m_textCtrlGlobalName->ChangeValue( props.global_username );
+ m_textCtrlLocalEmail->ChangeValue( props.local_email );
+ m_textCtrlLocalName->ChangeValue( props.local_username );
+
WindowAttrManager::Load(this, wxT("GitSettingsDlg"), NULL);
}
@@ -32,23 +40,35 @@ void GitSettingsDlg::OnOK(wxCommandEvent& event)
conf.ReadItem(&data);
data.SetGITExecutablePath( m_pathGIT->GetPath() );
data.SetGITKExecutablePath( m_pathGITK->GetPath() );
-
+
size_t flags = 0;
if ( m_checkBoxLog->IsChecked() )
flags |= GitEntry::Git_Verbose_Log;
-
+
if ( m_checkBoxTerminal->IsChecked() )
flags |= GitEntry::Git_Show_Terminal;
-
- if ( m_checkBoxTrackTree->IsChecked())
+
+ if ( m_checkBoxTrackTree->IsChecked())
flags |= GitEntry::Git_Colour_Tree_View;
-
+
data.SetFlags( flags );
conf.WriteItem(&data);
-
+
+ GitEntry::GitProperties props;
+ props.global_email = m_textCtrlGlobalEmail->GetValue();
+ props.global_username = m_textCtrlGlobalName->GetValue();
+ props.local_email = m_textCtrlLocalEmail->GetValue();
+ props.local_username = m_textCtrlLocalName->GetValue();
+ GitEntry::WriteGitProperties(m_localRepoPath, props);
+
// Notify about configuration changed
wxCommandEvent evt(wxEVT_GIT_CONFIG_CHANGED);
EventNotifier::Get()->AddPendingEvent( evt );
-
+
EndModal(wxID_OK);
+}
+
+void GitSettingsDlg::OnLocalRepoUI(wxUpdateUIEvent& event)
+{
+ event.Enable( !m_localRepoPath.IsEmpty() );
}
diff --git a/git/gitSettingsDlg.h b/git/gitSettingsDlg.h
index 4508202..fa9f056 100644
--- a/git/gitSettingsDlg.h
+++ b/git/gitSettingsDlg.h
@@ -9,14 +9,17 @@
#define __gitSettingsDlg__
#include "gitui.h"
+#include "git.h"
class GitSettingsDlg : public GitSettingsDlgBase
{
+ wxString m_localRepoPath;
public:
- GitSettingsDlg(wxWindow* parent);
+ GitSettingsDlg(wxWindow* parent, const wxString& localRepoPath);
virtual ~GitSettingsDlg();
protected:
+ virtual void OnLocalRepoUI(wxUpdateUIEvent& event);
virtual void OnOK(wxCommandEvent& event);
};
diff --git a/git/gitentry.cpp b/git/gitentry.cpp
index 6269d2a..7acc44b 100644
--- a/git/gitentry.cpp
+++ b/git/gitentry.cpp
@@ -2,6 +2,7 @@
//////////////////////////////////////////////////////////////////////////////
#include "gitentry.h"
+#include <wx/sstream.h>
const wxEventType wxEVT_GIT_CONFIG_CHANGED = ::wxNewEventType();
@@ -101,3 +102,108 @@ wxString GitEntry::GetGITKExecutablePath() const
return m_pathGITK;
}
}
+
+GitEntry::GitProperties GitEntry::ReadGitProperties(const wxString& localRepoPath)
+{
+ GitEntry::GitProperties props;
+ // Read the global name/email
+ // ~/.gitconfig | %USERPROFILE%\.gitconfig
+ {
+ wxFileName globalConfig( ::wxGetHomeDir(), ".gitconfig" );
+ if ( globalConfig.Exists() ) {
+ wxFFile fp( globalConfig.GetFullPath(), "rb" );
+ if ( fp.IsOpened() ) {
+ wxString content;
+ fp.ReadAll( &content, wxConvUTF8 );
+ wxStringInputStream sis( content );
+
+ wxFileConfig conf(sis);
+ conf.Read("user/email", &props.global_email);
+ conf.Read("user/name", &props.global_username);
+
+ fp.Close();
+ }
+ }
+ }
+
+ // Read the repo config file
+ if ( !localRepoPath.IsEmpty() ) {
+ wxFileName localConfig( localRepoPath, "config" );
+ localConfig.AppendDir(".git");
+ wxFFile fp( localConfig.GetFullPath(), "rb" );
+ if ( fp.IsOpened() ) {
+ wxString content;
+ fp.ReadAll( &content, wxConvUTF8 );
+ wxStringInputStream sis( content );
+
+ wxFileConfig conf(sis);
+ conf.Read("user/email", &props.local_email);
+ conf.Read("user/name", &props.local_username);
+
+ fp.Close();
+ }
+ }
+ return props;
+}
+
+void GitEntry::WriteGitProperties(const wxString& localRepoPath, const GitEntry::GitProperties &props)
+{
+ // Read the global name/email
+ // ~/.gitconfig | %USERPROFILE%\.gitconfig
+ {
+ wxFileName globalConfig( ::wxGetHomeDir(), ".gitconfig" );
+ if ( globalConfig.Exists() ) {
+ wxFFile fp( globalConfig.GetFullPath(), "rb" );
+ if ( fp.IsOpened() ) {
+ wxString content;
+ fp.ReadAll( &content, wxConvUTF8 );
+ fp.Close();
+ wxStringInputStream sis( content );
+ wxFileConfig conf(sis);
+ conf.Write("user/email", props.global_email);
+ conf.Write("user/name", props.global_username);
+
+ // Write the content
+ content.Clear();
+ wxStringOutputStream sos( &content );
+ if ( conf.Save( sos, wxConvUTF8 ) ) {
+ wxFFile fpo(globalConfig.GetFullPath(), "w+b");
+ if ( fpo.IsOpened() ) {
+ fpo.Write( content, wxConvUTF8 );
+ fpo.Close();
+ }
+ } else {
+ ::wxMessageBox("Could not save GIT global configuration. Configuration is unmodified", "git", wxICON_WARNING|wxOK|wxCENTER);
+ }
+ }
+ }
+ }
+
+ // Read the repo config file
+ if ( !localRepoPath.IsEmpty() ) {
+ wxFileName localConfig( localRepoPath, "config" );
+ localConfig.AppendDir(".git");
+ wxFFile fp( localConfig.GetFullPath(), "rb" );
+ if ( fp.IsOpened() ) {
+ wxString content;
+ fp.ReadAll( &content, wxConvUTF8 );
+ fp.Close();
+ wxStringInputStream sis( content );
+ wxFileConfig conf(sis);
+ conf.Write("user/email", props.local_email);
+ conf.Write("user/name", props.local_username);
+
+ content.Clear();
+ wxStringOutputStream sos( &content );
+ if ( conf.Save( sos, wxConvUTF8 ) ) {
+ wxFFile fpo(localConfig.GetFullPath(), "w+b");
+ if ( fpo.IsOpened() ) {
+ fpo.Write( content, wxConvUTF8 );
+ fpo.Close();
+ }
+ } else {
+ ::wxMessageBox("Could not save GIT local configuration. Configuration is unmodified", "git", wxICON_WARNING|wxOK|wxCENTER);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/git/gitentry.h b/git/gitentry.h
index 5f66042..5a4a036 100644
--- a/git/gitentry.h
+++ b/git/gitentry.h
@@ -32,12 +32,21 @@ public:
Git_Show_Terminal = 0x00000002,
Git_Colour_Tree_View = 0x00000004
};
-
+
+ struct GitProperties {
+ wxString global_username;
+ wxString global_email;
+ wxString local_username;
+ wxString local_email;
+ };
+
public:
GitEntry();
virtual ~GitEntry();
public:
-
+ static GitEntry::GitProperties ReadGitProperties(const wxString& localRepoPath = "" );
+ static void WriteGitProperties(const wxString& localRepoPath, const GitEntry::GitProperties &props);
+
void EnableFlag( size_t flag, bool b ) {
if ( b ) {
m_flags |= flag;
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 20b619a..b8f4d9e 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -25,61 +25,112 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
- staticBoxSizer78 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Files:")), wxVERTICAL);
+ m_treebook230 = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT);
- mainSizer->Add(staticBoxSizer78, 0, wxALL|wxEXPAND, 5);
+ mainSizer->Add(m_treebook230, 1, wxALL|wxEXPAND, 5);
+
+ m_panel232 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_treebook230->AddPage(m_panel232, _("Tools"), true, wxNOT_FOUND);
+
+ boxSizer240 = new wxBoxSizer(wxVERTICAL);
+ m_panel232->SetSizer(boxSizer240);
fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer11->SetFlexibleDirection( wxBOTH );
fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer11->AddGrowableCol(1);
- staticBoxSizer78->Add(fgSizer11, 0, wxALL|wxEXPAND, 5);
+ boxSizer240->Add(fgSizer11, 0, wxALL|wxEXPAND, 5);
- m_staticText42 = new wxStaticText(this, wxID_ANY, _("Path to git executable:"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText42 = new wxStaticText(m_panel232, wxID_ANY, _("Path to git executable:"), wxDefaultPosition, wxSize(-1, -1), 0);
fgSizer11->Add(m_staticText42, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
- m_pathGIT = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE);
+ m_pathGIT = new wxFilePickerCtrl(m_panel232, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE);
fgSizer11->Add(m_pathGIT, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
- m_staticText54 = new wxStaticText(this, wxID_ANY, _("Path to gitk executable:"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText54 = new wxStaticText(m_panel232, wxID_ANY, _("Path to gitk executable:"), wxDefaultPosition, wxSize(-1, -1), 0);
fgSizer11->Add(m_staticText54, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
- m_pathGITK = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE);
+ m_pathGITK = new wxFilePickerCtrl(m_panel232, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE);
fgSizer11->Add(m_pathGITK, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
- staticBoxSizer85 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Options")), wxVERTICAL);
+ m_panel234 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_treebook230->AddPage(m_panel234, _("Configuration"), false, wxNOT_FOUND);
- mainSizer->Add(staticBoxSizer85, 0, wxALL|wxEXPAND, 5);
+ boxSizer242 = new wxBoxSizer(wxVERTICAL);
+ m_panel234->SetSizer(boxSizer242);
- boxSizer766 = new wxBoxSizer(wxVERTICAL);
+ flexGridSizer244 = new wxFlexGridSizer( 0, 2, 0, 0);
+ flexGridSizer244->SetFlexibleDirection( wxBOTH );
+ flexGridSizer244->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ flexGridSizer244->AddGrowableCol(1);
+
+ boxSizer242->Add(flexGridSizer244, 1, wxALL|wxEXPAND, 5);
+
+ m_staticText246 = new wxStaticText(m_panel234, wxID_ANY, _("Global user name:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer244->Add(m_staticText246, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlGlobalName = new wxTextCtrl(m_panel234, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_textCtrlGlobalName->SetToolTip(_("Set the global user name (this name will tell git who you are)"));
+
+ flexGridSizer244->Add(m_textCtrlGlobalName, 0, wxALL|wxEXPAND, 5);
+
+ m_staticText250 = new wxStaticText(m_panel234, wxID_ANY, _("Global email:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer244->Add(m_staticText250, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlGlobalEmail = new wxTextCtrl(m_panel234, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_textCtrlGlobalEmail->SetToolTip(_("Set the current repository email"));
+
+ flexGridSizer244->Add(m_textCtrlGlobalEmail, 0, wxALL|wxEXPAND, 5);
- staticBoxSizer85->Add(boxSizer766, 0, wxALL, 5);
+ m_staticText254 = new wxStaticText(m_panel234, wxID_ANY, _("Local repository user name:"), wxDefaultPosition, wxSize(-1,-1), 0);
- m_checkBoxTerminal = new wxCheckBox(this, wxID_ANY, _("Show Terminal"), wxDefaultPosition, wxSize(-1,-1), 0);
+ flexGridSizer244->Add(m_staticText254, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlLocalName = new wxTextCtrl(m_panel234, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_textCtrlLocalName->SetToolTip(_("Set the current repository user name (this name will tell git who you are).\nIf this field letf empty, the global one is used"));
+
+ flexGridSizer244->Add(m_textCtrlLocalName, 0, wxALL|wxEXPAND, 5);
+
+ m_staticText258 = new wxStaticText(m_panel234, wxID_ANY, _("Local repository email:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer244->Add(m_staticText258, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlLocalEmail = new wxTextCtrl(m_panel234, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_textCtrlLocalEmail->SetToolTip(_("Set the current repository email\nIf this field letf empty, the global one is used"));
+
+ flexGridSizer244->Add(m_textCtrlLocalEmail, 0, wxALL|wxEXPAND, 5);
+
+ m_panel236 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_treebook230->AddPage(m_panel236, _("Misc"), false, wxNOT_FOUND);
+
+ boxSizer766 = new wxBoxSizer(wxVERTICAL);
+ m_panel236->SetSizer(boxSizer766);
+
+ m_checkBoxTerminal = new wxCheckBox(m_panel236, wxID_ANY, _("Show Terminal"), wxDefaultPosition, wxSize(-1,-1), 0);
m_checkBoxTerminal->SetValue(false);
m_checkBoxTerminal->SetToolTip(_("Mainly useful for Windows when the password\nprompt is not accessible via the UI"));
boxSizer766->Add(m_checkBoxTerminal, 0, wxALL, 5);
- m_checkBoxLog = new wxCheckBox(this, wxID_ANY, _("Verbose Logging"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_checkBoxLog = new wxCheckBox(m_panel236, wxID_ANY, _("Verbose Logging"), wxDefaultPosition, wxSize(-1,-1), 0);
m_checkBoxLog->SetValue(false);
m_checkBoxLog->SetToolTip(_("Tick this option to enable a verbose logging of git"));
boxSizer766->Add(m_checkBoxLog, 0, wxALL, 5);
- m_checkBoxTrackTree = new wxCheckBox(this, wxID_ANY, _("Colour modified items in the workspace view"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_checkBoxTrackTree = new wxCheckBox(m_panel236, wxID_ANY, _("Colour modified items in the workspace view"), wxDefaultPosition, wxSize(-1,-1), 0);
m_checkBoxTrackTree->SetValue(false);
m_checkBoxTrackTree->SetToolTip(_("Colour modified items in the workspace view tree"));
boxSizer766->Add(m_checkBoxTrackTree, 0, wxALL, 5);
- mainSizer->Add(0, 0, 1, wxALL, 5);
-
bSizer3 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -93,18 +144,30 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
bSizer3->Add(m_buttonCancel, 0, wxALL, 5);
+ m_treebook230->ExpandNode( 0, true );
+ m_treebook230->ExpandNode( 1, true );
+ m_treebook230->ExpandNode( 2, true );
+
SetSizeHints(-1,-1);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
Centre(wxBOTH);
// Connect events
+ m_staticText254->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_textCtrlLocalName->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_staticText258->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_textCtrlLocalEmail->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_buttonOk->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitSettingsDlgBase::OnOK), NULL, this);
}
GitSettingsDlgBase::~GitSettingsDlgBase()
{
+ m_staticText254->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_textCtrlLocalName->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_staticText258->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
+ m_textCtrlLocalEmail->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_buttonOk->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitSettingsDlgBase::OnOK), NULL, this);
}
diff --git a/git/gitui.h b/git/gitui.h
index 1f0cb17..f9bc3dd 100644
... 2359 lines suppressed ...
hooks/post-receive
--
codelite
|
