[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/uiconfig

Muhammet Kara (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 10 14:46:34 UTC 2019


 chart2/uiconfig/ui/sidebartype.ui |   59 ++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 15 deletions(-)

New commits:
commit 5250d0dcf80b6d9fe34e3fc4bff5cb201dc0b1b9
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Nov 9 23:53:55 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Nov 10 15:45:57 2019 +0100

    ChartTypePanel: Add values for 3d chart shapes
    
    Make some small improvements in the ui file
    
    Change-Id: I5d73c460012d300a10603dab3c203c5f20954864
    Reviewed-on: https://gerrit.libreoffice.org/82362
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/chart2/uiconfig/ui/sidebartype.ui b/chart2/uiconfig/ui/sidebartype.ui
index dde4cbc64dd5..65568362a6db 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -3,6 +3,33 @@
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes" context="sidebartype|liststore1">Bar</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes" context="sidebartype|liststore1">Cylinder</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes" context="sidebartype|liststore1">Cone</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes" context="sidebartype|liststore1">Pyramid</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkGrid" id="ChartTypePanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -78,7 +105,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="3dlook">
-                    <property name="label" translatable="yes" context="tp_ChartType|3dlook">_3D Look</property>
+                    <property name="label" translatable="yes" context="sidebartype|3dlook">_3D Look</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -99,8 +126,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes" context="tp_ChartType|3dscheme">Simple</item>
-                      <item translatable="yes" context="tp_ChartType|3dscheme">Realistic</item>
+                      <item translatable="yes" context="sidebartype|3dscheme">Simple</item>
+                      <item translatable="yes" context="sidebartype|3dscheme">Realistic</item>
                     </items>
                     <accessibility>
                       <relation type="labelled-by" target="3dlook"/>
@@ -121,7 +148,7 @@
               <object class="GtkLabel" id="shapeft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="tp_ChartType|shapeft">Sh_ape</property>
+                <property name="label" translatable="yes" context="sidebartype|shapeft">Sh_ape</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">shape:border</property>
                 <property name="angle">0.02</property>
@@ -136,6 +163,7 @@
               <object class="GtkTreeView" id="shape:border">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="model">liststore1</property>
                 <property name="search_column">0</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection"/>
@@ -160,7 +188,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="stack">
-                <property name="label" translatable="yes" context="tp_ChartType|stack">_Stack series</property>
+                <property name="label" translatable="yes" context="sidebartype|stack">_Stack series</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -185,7 +213,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="ontop">
-                        <property name="label" translatable="yes" context="tp_ChartType|ontop">On top</property>
+                        <property name="label" translatable="yes" context="sidebartype|ontop">On top</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -201,7 +229,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="percent">
-                        <property name="label" translatable="yes" context="tp_ChartType|percent">Percent</property>
+                        <property name="label" translatable="yes" context="sidebartype|percent">Percent</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -217,7 +245,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="deep">
-                        <property name="label" translatable="yes" context="tp_ChartType|deep">Deep</property>
+                        <property name="label" translatable="yes" context="sidebartype|deep">Deep</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -248,7 +276,7 @@
                   <object class="GtkLabel" id="linetypeft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" context="tp_ChartType|linetypeft">_Line type</property>
+                    <property name="label" translatable="yes" context="sidebartype|linetypeft">_Line type</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">linetype</property>
                     <property name="ellipsize">end</property>
@@ -264,9 +292,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes" context="tp_ChartType|linetype">Straight</item>
-                      <item translatable="yes" context="tp_ChartType|linetype">Smooth</item>
-                      <item translatable="yes" context="tp_ChartType|linetype">Stepped</item>
+                      <item translatable="yes" context="sidebartype|linetype">Straight</item>
+                      <item translatable="yes" context="sidebartype|linetype">Smooth</item>
+                      <item translatable="yes" context="sidebartype|linetype">Stepped</item>
                     </items>
                   </object>
                   <packing>
@@ -276,7 +304,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="properties">
-                    <property name="label" translatable="yes" context="tp_ChartType|properties">Properties...</property>
+                    <property name="label" translatable="yes" context="sidebartype|properties">Properties...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -295,7 +323,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="sort">
-                <property name="label" translatable="yes" context="tp_ChartType|sort">_Sort by X values</property>
+                <property name="label" translatable="yes" context="sidebartype|sort">_Sort by X values</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -318,7 +346,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes" context="tp_ChartType|nolinesft">_Number of lines</property>
+                    <property name="label" translatable="yes" context="sidebartype|nolinesft">_Number of lines</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">nolines</property>
                     <property name="ellipsize">end</property>
@@ -334,6 +362,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="adjustment">adjustment1</property>
                     <property name="value">1</property>
                   </object>
                   <packing>


More information about the Libreoffice-commits mailing list