Inheritance: GitExtensionsForm
示例#1
0
        public bool StartResolveConflictsDialog()
        {
            if (!InvokeEvent(PreResolveConflicts))
            {
                return(true);
            }

            var form = new FormResolveConflicts();

            form.ShowDialog();

            InvokeEvent(PostResolveConflicts);

            return(true);
        }
示例#2
0
        public bool StartResolveConflictsDialog(IWin32Window owner, bool offerCommit)
        {
            if (!RequiresValidWorkingDir(owner))
            {
                return(false);
            }

            if (!InvokeEvent(owner, PreResolveConflicts))
            {
                return(true);
            }

            using (var form = new FormResolveConflicts(offerCommit))
                form.ShowDialog(owner);

            InvokeEvent(owner, PostResolveConflicts);

            return(true);
        }
        public bool StartResolveConflictsDialog()
        {
            if (!RequiresValidWorkingDir())
            {
                return(false);
            }

            if (!InvokeEvent(PreResolveConflicts))
            {
                return(true);
            }

            var form = new FormResolveConflicts();

            form.ShowDialog();

            InvokeEvent(PostResolveConflicts);

            return(true);
        }
        public bool StartResolveConflictsDialog(IWin32Window owner, bool offerCommit)
        {
            if (!RequiresValidWorkingDir(owner))
                return false;

            if (!InvokeEvent(owner, PreResolveConflicts))
                return true;

            using (var form = new FormResolveConflicts(this, offerCommit))
                form.ShowDialog(owner);

            InvokeEvent(owner, PostResolveConflicts);

            return true;
        }
示例#5
0
        public bool StartResolveConflictsDialog(IWin32Window owner)
        {
            if (!RequiresValidWorkingDir())
                return false;

            if (!InvokeEvent(owner, PreResolveConflicts))
                return true;

            var form = new FormResolveConflicts();
            form.ShowDialog(owner);

            InvokeEvent(owner, PostResolveConflicts);

            return true;
        }
示例#6
0
        public bool StartResolveConflictsDialog()
        {
            if (!InvokeEvent(PreResolveConflicts))
                return true;

            FormResolveConflicts form = new FormResolveConflicts();
            form.ShowDialog();

            InvokeEvent(PostResolveConflicts);

            return true;
        }