[Libreoffice-commits] core.git: cui/uiconfig

Adolfo Jayme Barrientos fitojb at ubuntu.com
Fri May 15 20:17:21 PDT 2015


 cui/uiconfig/ui/blackorwhitelistentrydialog.ui |  182 ++++++++++++-------------
 1 file changed, 91 insertions(+), 91 deletions(-)

New commits:
commit 6664859e1e8b3f8b7db8c931b8d0335510c20ce0
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Fri May 15 22:13:28 2015 -0500

    tdf#91280 Fix capitalization in OpenCL white/blacklist dialog
    
    Remember: Title case for headings and command buttons & menus,
    and sentence case for labels, tooltips, etc.
    
    Change-Id: Iec0f56798ec3ea0cc3b31252e9dd0a83c206f035

diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
index 266f364..ecd1028 100644
--- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
+++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
@@ -2,6 +2,32 @@
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="os-liststore">
+    <columns>
+      <!-- column-name value -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Any</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0">Linux</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0">OS X</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0">Windows</col>
+        <col id="1">3</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="BlackOrWhiteListEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -12,6 +38,63 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
@@ -36,7 +119,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkComboBox" id="os">
                             <property name="visible">True</property>
@@ -101,8 +184,8 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Operating System:</property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">Operating system:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -114,7 +197,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">end</property>
                             <property name="label" translatable="yes">Version:</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -127,7 +210,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">end</property>
                             <property name="label" translatable="yes">OpenCL vendor:</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -140,7 +223,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
+                            <property name="halign">end</property>
                             <property name="label" translatable="yes">Device:</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -153,8 +236,8 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Driver Version:</property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">Driver version:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -233,63 +316,6 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -298,30 +324,4 @@
       <action-widget response="0">help</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="os-liststore">
-    <columns>
-      <!-- column-name value -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Any</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0">Linux</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0">OS X</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0">Windows</col>
-        <col id="1">3</col>
-      </row>
-    </data>
-  </object>
 </interface>


More information about the Libreoffice-commits mailing list