Merge remote-tracking branch 'origin/textmate' into vNext

2 files changed, 257 insertions, 30 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget.cs
new file mode 100644
index 0000000000..bba735251a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget.cs
@@ -0,0 +1,123 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.Ide.Editor.TextMate
+{
+	public partial class TextMateBundleOptionsPanelWidget
+	{
+		private global::Gtk.VBox vbox4;
+
+		private global::Gtk.VBox vbox5;
+
+		private global::Gtk.TextView textview1;
+
+		private global::Gtk.HBox hbox1;
+
+		private global::Gtk.ScrolledWindow scrolledwindow1;
+
+		private global::Gtk.TreeView bundleTreeview;
+
+		private global::Gtk.VBox vbox1;
+
+		private global::Gtk.Button addButton;
+
+		private global::Gtk.Button removeButton;
+
+		protected virtual void Build()
+		{
+			global::Stetic.Gui.Initialize(this);
+			// Widget MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget
+			global::Stetic.BinContainer.Attach(this);
+			this.Name = "MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget";
+			// Container child MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget.Gtk.Container+ContainerChild
+			this.vbox4 = new global::Gtk.VBox();
+			this.vbox4.Name = "vbox4";
+			this.vbox4.Spacing = 6;
+			// Container child vbox4.Gtk.Box+BoxChild
+			this.vbox5 = new global::Gtk.VBox();
+			this.vbox5.Name = "vbox5";
+			this.vbox5.Spacing = 6;
+			// Container child vbox5.Gtk.Box+BoxChild
+			this.textview1 = new global::Gtk.TextView();
+			this.textview1.Buffer.Text = "Language bundles can provide new editor themes, code snippets, code completion items and other information to improve the editing experience of specific languages. Xamarin Studio supports: <b>TextMate (.tmBundle)</b> and <b>Sublime 3 (.sublime)</b> package files.";
+			this.textview1.Sensitive = false;
+			this.textview1.Name = "textview1";
+			this.textview1.Editable = false;
+			this.textview1.CursorVisible = false;
+			this.textview1.AcceptsTab = false;
+			this.textview1.WrapMode = ((global::Gtk.WrapMode)(2));
+			this.textview1.PixelsBelowLines = 6;
+			this.textview1.PixelsInsideWrap = 3;
+			this.vbox5.Add(this.textview1);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.textview1]));
+			w1.Position = 0;
+			w1.Expand = false;
+			// Container child vbox5.Gtk.Box+BoxChild
+			this.hbox1 = new global::Gtk.HBox();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
+			this.scrolledwindow1.CanFocus = true;
+			this.scrolledwindow1.Name = "scrolledwindow1";
+			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child scrolledwindow1.Gtk.Container+ContainerChild
+			global::Gtk.Viewport w2 = new global::Gtk.Viewport();
+			w2.ShadowType = ((global::Gtk.ShadowType)(0));
+			// Container child GtkViewport.Gtk.Container+ContainerChild
+			this.bundleTreeview = new global::Gtk.TreeView();
+			this.bundleTreeview.CanFocus = true;
+			this.bundleTreeview.Name = "bundleTreeview";
+			this.bundleTreeview.HeadersVisible = false;
+			w2.Add(this.bundleTreeview);
+			this.scrolledwindow1.Add(w2);
+			this.hbox1.Add(this.scrolledwindow1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
+			w5.Position = 0;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.vbox1 = new global::Gtk.VBox();
+			this.vbox1.Name = "vbox1";
+			this.vbox1.Spacing = 6;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.addButton = new global::Gtk.Button();
+			this.addButton.CanFocus = true;
+			this.addButton.Name = "addButton";
+			this.addButton.UseStock = true;
+			this.addButton.UseUnderline = true;
+			this.addButton.Label = "gtk-add";
+			this.vbox1.Add(this.addButton);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.addButton]));
+			w6.Position = 0;
+			w6.Expand = false;
+			w6.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.removeButton = new global::Gtk.Button();
+			this.removeButton.CanFocus = true;
+			this.removeButton.Name = "removeButton";
+			this.removeButton.UseStock = true;
+			this.removeButton.UseUnderline = true;
+			this.removeButton.Label = "gtk-remove";
+			this.vbox1.Add(this.removeButton);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.removeButton]));
+			w7.Position = 1;
+			w7.Expand = false;
+			w7.Fill = false;
+			this.hbox1.Add(this.vbox1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox1]));
+			w8.Position = 1;
+			w8.Expand = false;
+			w8.Fill = false;
+			this.vbox5.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox1]));
+			w9.Position = 1;
+			this.vbox4.Add(this.vbox5);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.vbox5]));
+			w10.Position = 0;
+			this.Add(this.vbox4);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
+			}
+			this.Hide();
+		}
+	}
+}
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index 75094ef7b6..711ad58b13 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -62,7 +62,6 @@
                 <child>
                   <widget class="MonoDevelop.Components.FolderEntry" id="folderEntry">
                     <property name="MemberName" />
-                    <property name="DisplayAsRelativePath">False</property>
                   </widget>
                   <packing>
                     <property name="TopAttach">2</property>
@@ -559,7 +558,6 @@
             <child>
               <widget class="MonoDevelop.Components.FolderEntry" id="folderEntry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="Position">3</property>
@@ -1295,7 +1293,6 @@ Diagnostic</property>
             <child>
               <widget class="MonoDevelop.Components.FileEntry" id="browseButton">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="TopAttach">1</property>
@@ -2595,8 +2592,8 @@ Diagnostic</property>
                     <child>
                       <widget class="MonoDevelop.Components.ImageView" id="imageAdd">
                         <property name="MemberName" />
-                        <property name="IconSize">Button</property>
                         <property name="IconId">gtk-add</property>
+                        <property name="IconSize">Button</property>
                       </widget>
                     </child>
                   </widget>
@@ -2615,8 +2612,8 @@ Diagnostic</property>
                     <child>
                       <widget class="MonoDevelop.Components.ImageView" id="imageRemove">
                         <property name="MemberName" />
-                        <property name="IconSize">Button</property>
                         <property name="IconId">gtk-remove</property>
+                        <property name="IconSize">Button</property>
                       </widget>
                     </child>
                   </widget>
@@ -2667,8 +2664,8 @@ Diagnostic</property>
                     <child>
                       <widget class="MonoDevelop.Components.ImageView" id="imageUp">
                         <property name="MemberName" />
-                        <property name="IconSize">Button</property>
                         <property name="IconId">gtk-go-up</property>
+                        <property name="IconSize">Button</property>
                       </widget>
                     </child>
                   </widget>
@@ -2687,8 +2684,8 @@ Diagnostic</property>
                     <child>
                       <widget class="MonoDevelop.Components.ImageView" id="imageDown">
                         <property name="MemberName" />
-                        <property name="IconSize">Button</property>
                         <property name="IconId">gtk-go-down</property>
+                        <property name="IconSize">Button</property>
                       </widget>
                     </child>
                   </widget>
@@ -3161,7 +3158,6 @@ Diagnostic</property>
                     <child>
                       <widget class="MonoDevelop.Components.FolderEntry" id="projectFolderEntry">
                         <property name="MemberName" />
-                        <property name="DisplayAsRelativePath">False</property>
                       </widget>
                       <packing>
                         <property name="Position">1</property>
@@ -3236,8 +3232,8 @@ Diagnostic</property>
     </child>
   </widget>
   <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget" design-size="315 285">
-    <property name="GeneratePublic">False</property>
     <property name="MemberName" />
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox13">
         <property name="MemberName" />
@@ -5478,7 +5474,6 @@ Diagnostic</property>
             <child>
               <widget class="MonoDevelop.Components.FolderEntry" id="folderEntry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="TopAttach">1</property>
@@ -7464,7 +7459,6 @@ All solutions</property>
             <child>
               <widget class="MonoDevelop.Components.FileEntry" id="strongNameFileEntry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="Position">1</property>
@@ -7538,7 +7532,6 @@ All solutions</property>
             <child>
               <widget class="MonoDevelop.Components.FolderEntry" id="folderEntry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="Position">1</property>
@@ -7672,7 +7665,6 @@ All solutions</property>
                         <child>
                           <widget class="MonoDevelop.Components.FolderEntry" id="outputPathEntry">
                             <property name="MemberName" />
-                            <property name="DisplayAsRelativePath">False</property>
                           </widget>
                           <packing>
                             <property name="TopAttach">1</property>
@@ -8068,8 +8060,8 @@ All solutions</property>
               <widget class="MonoDevelop.Components.ImageView" id="imageQuestion">
                 <property name="MemberName" />
                 <property name="Yalign">0</property>
-                <property name="IconSize">Dialog</property>
                 <property name="IconId">gtk-dialog-question</property>
+                <property name="IconSize">Dialog</property>
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -8681,7 +8673,6 @@ All solutions</property>
             <child>
               <widget class="MonoDevelop.Components.FolderEntry" id="folderentry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
               </widget>
               <packing>
                 <property name="Position">2</property>
@@ -9389,16 +9380,15 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
                         <property name="Tooltip" translatable="yes">Add existing files to the project</property>
                         <property name="CanFocus">True</property>
                         <property name="Type">Custom</property>
-                        <property name="UseUnderline">True</property>
                         <property name="Relief">None</property>
                         <signal name="Clicked" handler="OnAddFileButtonClicked" />
-	                    <child>
-	                      <widget class="MonoDevelop.Components.ImageView" id="imageAdd">
-	                        <property name="MemberName" />
-	                        <property name="IconSize">Menu</property>
-	                        <property name="IconId">gtk-add</property>
-	                      </widget>
-	                    </child>
+                        <child>
+                          <widget class="MonoDevelop.Components.ImageView" id="imageAdd">
+                            <property name="MemberName" />
+                            <property name="IconId">gtk-add</property>
+                            <property name="IconSize">Menu</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
@@ -9655,8 +9645,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
             <child>
               <widget class="MonoDevelop.Components.FolderEntry" id="folderentry">
                 <property name="MemberName" />
-                <property name="DisplayAsRelativePath">False</property>
-                <signal name="PathChanged" handler="OnFolderentryPathChanged" />
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -10661,7 +10649,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
                         <child>
                           <widget class="MonoDevelop.Components.FileEntry" id="fileEntry">
                             <property name="MemberName" />
-                            <property name="DisplayAsRelativePath">False</property>
                           </widget>
                           <packing>
                             <property name="Position">1</property>
@@ -10903,9 +10890,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
                         <child>
                           <widget class="MonoDevelop.Components.FileEntry" id="fileEntry">
                             <property name="MemberName" />
-                            <property name="BrowserTitle">Select Policy Set File</property>
-                            <property name="DisplayAsRelativePath">False</property>
-                            <signal name="PathChanged" handler="OnFileEntryPathChanged" />
                           </widget>
                           <packing>
                             <property name="Position">1</property>
@@ -12103,4 +12087,124 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
       </widget>
     </child>
   </widget>
-</stetic-interface>
+  <widget class="Gtk.Bin" id="MonoDevelop.Ide.Editor.TextMate.TextMateBundleOptionsPanelWidget" design-size="884 413">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <child>
+      <widget class="Gtk.VBox" id="vbox4">
+        <property name="MemberName" />
+        <property name="Spacing">6</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox5">
+            <property name="MemberName" />
+            <property name="Spacing">6</property>
+            <child>
+              <widget class="Gtk.TextView" id="textview1">
+                <property name="MemberName" />
+                <property name="Sensitive">False</property>
+                <property name="Editable">False</property>
+                <property name="CursorVisible">False</property>
+                <property name="AcceptsTab">False</property>
+                <property name="Text" translatable="yes">Language bundles can provide new editor themes, code snippets, code completion items and other information to improve the editing experience of specific languages. Xamarin Studio supports: &lt;b&gt;TextMate (.tmBundle)&lt;/b&gt; and &lt;b&gt;Sublime 3 (.sublime)&lt;/b&gt; package files.</property>
+                <property name="WrapMode">Word</property>
+                <property name="PixelsBelowLines">6</property>
+                <property name="PixelsInsideWrap">3</property>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">False</property>
+                <property name="Expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.HBox" id="hbox1">
+                <property name="MemberName" />
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
+                    <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="ShadowType">In</property>
+                    <child>
+                      <widget class="Gtk.Viewport" id="GtkViewport">
+                        <property name="MemberName" />
+                        <property name="ShadowType">None</property>
+                        <child>
+                          <widget class="Gtk.TreeView" id="bundleTreeview">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="ShowScrollbars">True</property>
+                            <property name="HeadersVisible">False</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.VBox" id="vbox1">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Button" id="addButton">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="UseStock">True</property>
+                        <property name="Type">StockItem</property>
+                        <property name="StockId">gtk-add</property>
+                        <property name="label">gtk-add</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Button" id="removeButton">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="UseStock">True</property>
+                        <property name="Type">StockItem</property>
+                        <property name="StockId">gtk-remove</property>
+                        <property name="label">gtk-remove</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">True</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</stetic-interface>
\ No newline at end of file