← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.ConflictResolutionDialog.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.ConflictResolutionDialog.cs
 
1
 
 
2
// This file has been generated by the GUI designer. Do not modify.
 
3
namespace MonoDevelop.VersionControl.Git
 
4
{
 
5
        internal partial class ConflictResolutionDialog
 
6
        {
 
7
                private global::Gtk.VBox vbox2;
 
8
                private global::Gtk.Label labelTop;
 
9
                private global::MonoDevelop.VersionControl.Views.MergeWidget mergeWidget;
 
10
                private global::Gtk.Button buttonCancel;
 
11
                private global::Gtk.Button buttonOk;
 
12
                private global::Gtk.Button button24;
 
13
                
 
14
                protected virtual void Build ()
 
15
                {
 
16
                        global::Stetic.Gui.Initialize (this);
 
17
                        // Widget MonoDevelop.VersionControl.Git.ConflictResolutionDialog
 
18
                        this.Name = "MonoDevelop.VersionControl.Git.ConflictResolutionDialog";
 
19
                        this.Title = global::Mono.Unix.Catalog.GetString ("Merge Conflict Resolution");
 
20
                        this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 
21
                        // Internal child MonoDevelop.VersionControl.Git.ConflictResolutionDialog.VBox
 
22
                        global::Gtk.VBox w1 = this.VBox;
 
23
                        w1.Name = "dialog1_VBox";
 
24
                        w1.BorderWidth = ((uint)(2));
 
25
                        // Container child dialog1_VBox.Gtk.Box+BoxChild
 
26
                        this.vbox2 = new global::Gtk.VBox ();
 
27
                        this.vbox2.Name = "vbox2";
 
28
                        this.vbox2.Spacing = 6;
 
29
                        this.vbox2.BorderWidth = ((uint)(9));
 
30
                        // Container child vbox2.Gtk.Box+BoxChild
 
31
                        this.labelTop = new global::Gtk.Label ();
 
32
                        this.labelTop.Name = "labelTop";
 
33
                        this.labelTop.Xalign = 0F;
 
34
                        this.labelTop.LabelProp = "A merge conflict has been detected in file <b>SomeFile.txt</b>";
 
35
                        this.labelTop.UseMarkup = true;
 
36
                        this.vbox2.Add (this.labelTop);
 
37
                        global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelTop]));
 
38
                        w2.Position = 0;
 
39
                        w2.Expand = false;
 
40
                        w2.Fill = false;
 
41
                        // Container child vbox2.Gtk.Box+BoxChild
 
42
                        this.mergeWidget = new global::MonoDevelop.VersionControl.Views.MergeWidget ();
 
43
                        this.mergeWidget.Events = ((global::Gdk.EventMask)(256));
 
44
                        this.mergeWidget.Name = "mergeWidget";
 
45
                        this.vbox2.Add (this.mergeWidget);
 
46
                        global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.mergeWidget]));
 
47
                        w3.Position = 1;
 
48
                        w1.Add (this.vbox2);
 
49
                        global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
 
50
                        w4.Position = 0;
 
51
                        // Internal child MonoDevelop.VersionControl.Git.ConflictResolutionDialog.ActionArea
 
52
                        global::Gtk.HButtonBox w5 = this.ActionArea;
 
53
                        w5.Name = "dialog1_ActionArea";
 
54
                        w5.Spacing = 10;
 
55
                        w5.BorderWidth = ((uint)(5));
 
56
                        w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 
57
                        // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 
58
                        this.buttonCancel = new global::Gtk.Button ();
 
59
                        this.buttonCancel.CanDefault = true;
 
60
                        this.buttonCancel.CanFocus = true;
 
61
                        this.buttonCancel.Name = "buttonCancel";
 
62
                        this.buttonCancel.UseUnderline = true;
 
63
                        this.buttonCancel.Label = global::Mono.Unix.Catalog.GetString ("Abort Update");
 
64
                        this.AddActionWidget (this.buttonCancel, -6);
 
65
                        global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonCancel]));
 
66
                        w6.Expand = false;
 
67
                        w6.Fill = false;
 
68
                        // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 
69
                        this.buttonOk = new global::Gtk.Button ();
 
70
                        this.buttonOk.CanDefault = true;
 
71
                        this.buttonOk.CanFocus = true;
 
72
                        this.buttonOk.Name = "buttonOk";
 
73
                        this.buttonOk.UseUnderline = true;
 
74
                        this.buttonOk.Label = global::Mono.Unix.Catalog.GetString ("Skip Patch");
 
75
                        this.AddActionWidget (this.buttonOk, -7);
 
76
                        global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonOk]));
 
77
                        w7.Position = 1;
 
78
                        w7.Expand = false;
 
79
                        w7.Fill = false;
 
80
                        // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 
81
                        this.button24 = new global::Gtk.Button ();
 
82
                        this.button24.CanFocus = true;
 
83
                        this.button24.Name = "button24";
 
84
                        this.button24.UseUnderline = true;
 
85
                        this.button24.Label = global::Mono.Unix.Catalog.GetString ("Accept Merge");
 
86
                        this.AddActionWidget (this.button24, -5);
 
87
                        global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.button24]));
 
88
                        w8.Position = 2;
 
89
                        w8.Expand = false;
 
90
                        w8.Fill = false;
 
91
                        if ((this.Child != null)) {
 
92
                                this.Child.ShowAll ();
 
93
                        }
 
94
                        this.DefaultWidth = 991;
 
95
                        this.DefaultHeight = 534;
 
96
                        this.Hide ();
 
97
                }
 
98
        }
 
99
}