sc/uiconfig/scalc/ui/notebookbar.ui    |   25 +++++++++++++++++++++++++
 sd/uiconfig/simpress/ui/notebookbar.ui |   18 +++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 9162c483bcc6288cc2a92503b6ec34d58496327b
Author: Szymon Kłos <eszka...@gmail.com>
Date:   Tue Aug 2 13:03:21 2016 +0200

    GSoC notebookbar: Calc, Impress placeholder icons
    
    Change-Id: I2a18c4d610ab1dac2627284c008207a3dbaab406

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index a774e98..632bdc2 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -123,6 +123,11 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/lc_paste.png</property>
   </object>
+  <object class="GtkImage" id="PlaceholderImg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">sfx2/res/placeholder.png</property>
+  </object>
   <object class="GtkImage" id="PrintImg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -352,6 +357,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Signature</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -453,6 +459,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="vcllo-SmallButton" id="FormatPaintbrush">
+                        <property name="label" 
translatable="yes">Clone</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1735,6 +1742,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="tooltip_text" 
translatable="yes">Insert Audio or Video</property>
                             <property 
name="action_name">.uno:InsertAVMedia</property>
                             <property name="image">InsertAVMediaImg</property>
                             <property name="relief">none</property>
@@ -1785,6 +1793,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:FunctionDialog</property>
+                    <property name="image">PlaceholderImg</property>
                     <property name="relief">none</property>
                     <property name="image_position">top</property>
                   </object>
@@ -2057,6 +2066,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="ToggleSheetGrid">
+                            <property name="label" translatable="yes">Toggle 
Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -2238,6 +2248,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:ManageXMLSource</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2253,6 +2264,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:DataStreams</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2297,6 +2309,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Calculate</property>
+                    <property name="image">PlaceholderImg</property>
                     <property name="relief">none</property>
                     <property name="image_position">top</property>
                   </object>
@@ -2517,6 +2530,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:TextToColumns</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2532,6 +2546,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:Validation</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2572,6 +2587,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:DataConsolidate</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2587,6 +2603,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:DataSubTotals</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2627,6 +2644,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:DataForm</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2642,6 +2660,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:TableOperationDialog</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -2951,6 +2970,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:ShareDocument</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -3008,6 +3028,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:NormalViewMode</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -3023,6 +3044,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:PagebreakMode</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -3061,6 +3083,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="ToggleSheetGrid2">
+                            <property name="label" translatable="yes">Toggle 
Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -3081,6 +3104,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:ViewValueHighlighting</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
@@ -3096,6 +3120,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property 
name="action_name">.uno:ViewRowColumnHeaders</property>
+                            <property name="image">PlaceholderImg</property>
                             <property name="relief">none</property>
                             <property name="image_position">top</property>
                           </object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index bd081e6..65551d4 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -93,6 +93,11 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">cmd/lc_paste.png</property>
   </object>
+  <object class="GtkImage" id="PlaceholderImg">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">sfx2/res/placeholder.png</property>
+  </object>
   <object class="GtkImage" id="PresentationCurrentSlideImg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -101,7 +106,7 @@
   <object class="GtkImage" id="PresentationDialogImg">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_presentationdialog.png</property>
+    <property name="pixbuf">cmd/lc_presentation.png</property>
   </object>
   <object class="GtkImage" id="PresentationImg">
     <property name="visible">True</property>
@@ -310,6 +315,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Signature</property>
+                    <property name="image">PlaceholderImg</property>
                     <property name="relief">none</property>
                     <property name="image_position">top</property>
                   </object>
@@ -406,6 +412,7 @@
                         </child>
                         <child>
                           <object class="vcllo-SmallButton" 
id="FormatPaintbrush">
+                            <property name="label" 
translatable="yes">Clone</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1592,6 +1599,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="tooltip_text" 
translatable="yes">Insert Audio or Video</property>
                             <property 
name="action_name">.uno:InsertAVMedia</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
@@ -2114,6 +2122,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:CustomShowDialog</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2129,6 +2138,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Remote</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2338,6 +2348,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:NormalMultiPaneGUI</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2353,6 +2364,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:OutlineMode</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2452,6 +2464,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:HandoutMode</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2631,6 +2644,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:OutputQualityColor</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2646,6 +2660,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:OutputQualityGrayscale</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
@@ -2661,6 +2676,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property 
name="action_name">.uno:OutputQualityBlackWhite</property>
+                        <property name="image">PlaceholderImg</property>
                         <property name="relief">none</property>
                         <property name="image_position">top</property>
                       </object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to