Attachment 67246 Details for Bug 28020 – patch

[patch] patch

0001-Add-application-x-gtk-builder-type.patch (text/plain), 13.95 KB, created by william.jon.mccann on 2012-09-16 15:42:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: william.jon.mccann

Created: 2012-09-16 15:42:17 UTC

Size: 13.95 KB

patch

obsolete

>From 2137a366783c6fad9d470e5fa89af68623aac123 Mon Sep 17 00:00:00 2001
>From: William Jon McCann <jmccann@redhat.com>
>Date: Sun, 16 Sep 2012 11:30:02 -0400
>Subject: [PATCH] Add application/x-gtk-builder type
>
>https://bugs.freedesktop.org/show_bug.cgi?id=28020
>---
> freedesktop.org.xml.in |   9 ++
> tests/gtk-builder.ui   | 266 +++++++++++++++++++++++++++++++++++++++++++++++++
> tests/list             |   1 +
> 3 files changed, 276 insertions(+)
> create mode 100644 tests/gtk-builder.ui
>
>diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
>index e074869..0a0d3bd 100644
>--- a/freedesktop.org.xml.in
>+++ b/freedesktop.org.xml.in
>@@ -1906,6 +1906,15 @@ command to generate the output files.
>     <glob pattern="*.gmo"/>
>     <glob pattern="*.mo"/>
>   </mime-type>
>+  <mime-type type="application/x-gtk-builder">
>+    <_comment>GTK+ Builder</_comment>
>+    <sub-class-of type="application/xml"/>
>+    <generic-icon name="x-office-document"/>
>+    <glob pattern="*.ui"/>
>+    <magic priority="50">
>+      <match type="string" value="&lt;interface" offset="0:256"/>
>+    </magic>
>+  </mime-type>
>   <mime-type type="application/x-glade">
>     <_comment>Glade project</_comment>
>     <sub-class-of type="application/xml"/>
>diff --git a/tests/gtk-builder.ui b/tests/gtk-builder.ui
>new file mode 100644
>index 0000000..e5d9235
>--- /dev/null
>+++ b/tests/gtk-builder.ui
>@@ -0,0 +1,266 @@
>+<?xml version="1.0" standalone="no"?> 
>+<interface domain="gtk20">
>+    <object class="GtkListStore" id="liststore1">
>+      <columns>
>+        <column type="gchararray"/>
>+        <column type="gchararray"/>
>+        <column type="gint"/>
>+        <column type="gchararray"/>
>+      </columns>
>+      <data>
>+        <row>
>+          <col id="0">John</col>
>+          <col id="1">Doe</col>
>+          <col id="2">25</col>
>+          <col id="3">This is the John Doe row</col>
>+        </row>
>+        <row>
>+          <col id="0">Mary</col>
>+          <col id="1">Unknown</col>
>+          <col id="2">50</col>
>+          <col id="3">This is the Mary Unknown row</col>
>+        </row>
>+      </data>
>+    </object>
>+    <object class="GtkUIManager" id="uimanager">
>+        <child>
>+            <object class="GtkActionGroup" id="DefaultActions">
>+                <child>
>+                    <object class="GtkAction" id="Copy">
>+                        <property name="name">Copy</property>
>+                        <property name="tooltip">Copy selected object into the clipboard</property>
>+                        <property name="stock_id">gtk-copy</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Cut">
>+                        <property name="name">Cut</property>
>+                        <property name="tooltip">Cut selected object into the clipboard</property>
>+                        <property name="stock_id">gtk-cut</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="EditMenu">
>+                        <property name="name">EditMenu</property>
>+                        <property name="label">_Edit</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="FileMenu">
>+                        <property name="name">FileMenu</property>
>+                        <property name="label">_File</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="New">
>+                        <property name="name">New</property>
>+                        <property name="tooltip">Create a new file</property>
>+                        <property name="stock_id">gtk-new</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Open">
>+                        <property name="name">Open</property>
>+                        <property name="tooltip">Open a file</property>
>+                        <property name="stock_id">gtk-open</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Paste">
>+                        <property name="name">Paste</property>
>+                        <property name="tooltip">Paste object from the Clipboard</property>
>+                        <property name="stock_id">gtk-paste</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Quit">
>+                        <property name="name">Quit</property>
>+                        <property name="tooltip">Quit the program</property>
>+                        <property name="stock_id">gtk-quit</property>
>+                        <signal handler="quit_activate" name="activate"/>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Save">
>+                        <property name="name">Save</property>
>+                        <property name="is_important">True</property>
>+                        <property name="tooltip">Save a file</property>
>+                        <property name="stock_id">gtk-save</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="SaveAs">
>+                        <property name="name">SaveAs</property>
>+                        <property name="tooltip">Save with a different name</property>
>+                        <property name="stock_id">gtk-save-as</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="HelpMenu">
>+                        <property name="name">HelpMenu</property>
>+                        <property name="label">_Help</property>
>+                    </object>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="About">
>+                        <property name="name">About</property>
>+                        <property name="stock_id">gtk-about</property>
>+                        <signal handler="about_activate" name="activate"/>
>+                    </object>
>+                    <accelerator key="F7"/>
>+                </child>
>+                <child>
>+                    <object class="GtkAction" id="Help">
>+                        <property name="name">Help</property>
>+                        <property name="stock_id">gtk-help</property>
>+                        <signal handler="help_activate" name="activate"/>
>+                    </object>
>+                </child>
>+            </object>
>+        </child>
>+        <ui>
>+          <menubar name="menubar1">
>+            <menu action="FileMenu" name="FileMenu">
>+              <menuitem action="New" name="New"/>
>+              <menuitem action="Open" name="Open"/>
>+              <menuitem action="Save" name="Save"/>
>+              <menuitem action="SaveAs" name="SaveAs"/>
>+              <separator/>
>+              <menuitem action="Quit" name="Quit"/>
>+            </menu>
>+            <menu action="EditMenu">
>+              <menuitem action="Copy" name="Copy"/>
>+              <menuitem action="Cut" name="Cut"/>
>+              <menuitem action="Paste" name="Paste"/>
>+            </menu>
>+            <menu action="HelpMenu" name="HelpMenu">
>+              <menuitem action="Help" name="Help"/>
>+              <menuitem action="About" name="About"/>
>+            </menu>
>+          </menubar>
>+          <toolbar name="toolbar1">
>+            <toolitem action="New" name="New"/>
>+            <toolitem action="Open" name="Open"/>
>+            <toolitem action="Save" name="Save"/>
>+            <separator/>
>+            <toolitem action="Copy" name="Copy"/>
>+            <toolitem action="Cut" name="Cut"/>
>+            <toolitem action="Paste" name="Paste"/>
>+          </toolbar>
>+        </ui>
>+    </object>
>+    <object class="GtkAboutDialog" id="aboutdialog1">
>+        <property name="program-name">GtkBuilder demo</property>
>+         <accessibility>
>+	     <relation target="window1" type="subwindow-of"/>
>+	 </accessibility>
>+    </object>
>+    <object class="GtkWindow" id="window1">
>+        <property name="default_height">250</property>
>+        <property name="default_width">440</property>
>+        <property name="title">GtkBuilder demo</property>
>+        <child>
>+            <object class="GtkVBox" id="vbox1">
>+                <property name="visible">True</property>
>+                <child>
>+                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
>+                        <property name="visible">True</property>
>+	            	<child internal-child="accessible">
>+	            	    <object class="AtkObject" id="a11y-menubar">
>+	            	        <property name="AtkObject::accessible-name">The menubar</property>
>+	            	    </object>
>+	            	</child>
>+	            </object>
>+                    <packing>
>+                        <property name="expand">False</property>
>+                    </packing>
>+                </child>
>+                <child>
>+                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
>+                        <property name="visible">True</property>
>+	            	<child internal-child="accessible">
>+	            	    <object class="AtkObject" id="a11y-toolbar">
>+	            	        <property name="AtkObject::accessible-name">The toolbar</property>
>+	            	    </object>
>+	            	</child>
>+                    </object>
>+                    <packing>
>+                        <property name="expand">False</property>
>+                        <property name="position">1</property>
>+                    </packing>
>+                </child>
>+                <child>
>+                    <object class="GtkScrolledWindow" id="scrolledwindow1">
>+                      <property name="hscrollbar_policy">automatic</property>
>+                      <property name="shadow_type">in</property>
>+                      <property name="visible">True</property>
>+                      <property name="vscrollbar_policy">automatic</property>
>+                      <child>
>+                        <object class="GtkTreeView" id="treeview1">
>+                          <property name="visible">True</property>
>+                          <property name="model">liststore1</property>
>+                          <property name="tooltip-column">3</property>
>+	            	  <child internal-child="accessible">
>+	            	      <object class="AtkObject" id="a11y-treeview">
>+	            	          <property name="AtkObject::accessible-name">Name list</property>
>+                                  <property name="AtkObject::accessible-description">
>+                                    A list of person with name, surname and age columns
>+                                  </property>
>+	            	      </object>
>+	            	  </child>
>+                          <child>
>+                            <object class="GtkTreeViewColumn" id="column1">
>+                              <property name="title">Name</property>
>+                              <child>
>+                                <object class="GtkCellRendererText" id="renderer1"/>
>+                                <attributes>
>+                                  <attribute name="text">0</attribute>
>+                                </attributes>
>+                              </child>
>+                            </object>
>+                          </child>
>+                          <child>
>+                            <object class="GtkTreeViewColumn" id="column2">
>+                              <property name="title">Surname</property>
>+                              <child>
>+                                <object class="GtkCellRendererText" id="renderer2"/>
>+                                <attributes>
>+                                  <attribute name="text">1</attribute>
>+                                </attributes>
>+                              </child>
>+                            </object>
>+                          </child>
>+                          <child>
>+                            <object class="GtkTreeViewColumn" id="column3">
>+                              <property name="title">Age</property>
>+                              <child>
>+                                <object class="GtkCellRendererText" id="renderer3"/>
>+                                <attributes>
>+                                  <attribute name="text">2</attribute>
>+                                </attributes>
>+                              </child>
>+                            </object>
>+                          </child>
>+                        </object>
>+                      </child>
>+		    <accessibility>
>+		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
>+		    </accessibility>
>+                    </object>
>+                    <packing>
>+                        <property name="position">2</property>
>+                    </packing>
>+                </child>
>+                <child>
>+                    <object class="GtkStatusbar" id="statusbar1">
>+                        <property name="visible">True</property>
>+                    </object>
>+                    <packing>
>+                        <property name="expand">False</property>
>+                        <property name="position">3</property>
>+                    </packing>
>+                </child>
>+            </object>
>+        </child>
>+    </object>
>+</interface>
>diff --git a/tests/list b/tests/list
>index 618b7a3..5e5e21d 100644
>--- a/tests/list
>+++ b/tests/list
>@@ -247,6 +247,7 @@ test.scala text/x-scala ox
> 
> # xml subtypes
> test.ttx application/x-font-ttx
>+gtk-builder.ui application/x-gtk-builder
> project.glade application/x-glade
> # Copied from http://bugs.freedesktop.org/show_bug.cgi?id=14085
> ISOcyr1.ent application/xml-external-parsed-entity ox
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 28020: 67246

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.