weld SfxCustomPropertiesPage

Change-Id: I1b1ba1c2b879d270eb3af486a4d006f170d1b92e
Reviewed-on: https://gerrit.libreoffice.org/73111
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/sfx2/strings.hrc

@@ -193,7 +193,6 @@
 
 #define STR_SFX_NEWOFFICEDOC                    NC_("STR_SFX_NEWOFFICEDOC", "%PRODUCTNAME document")
 #define SFX_ST_DURATION_FORMAT                  NC_("SFX_ST_DURATION_FORMAT", " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6")
-#define STR_SFX_REMOVE_PROPERTY                 NC_("STR_SFX_REMOVE_PROPERTY", "Remove Property")
 #define STR_SFX_QUERY_WRONG_TYPE                NC_("STR_SFX_QUERY_WRONG_TYPE", "The value entered does not match the specified type.\nThe value will be stored as text.")
 
 #define STR_QUERY_OVERWRITE                     NC_("STR_QUERY_OVERWRITE", "Style already exists. Overwrite?")

include/svtools/ctrlbox.hxx

@@ -305,6 +305,7 @@ public:
 
     void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
     bool get_sensitive() const { return m_xControl->get_sensitive(); }
+    void set_visible(bool bSensitive) { m_xControl->set_visible(bSensitive); }
     void grab_focus() { m_xControl->grab_focus(); }
 
     void connect_activated(const Link<SvtCalendarBox&, void>& rActivatedHdl) { m_aActivatedHdl = rActivatedHdl; }

include/vcl/weld.hxx

@@ -1511,6 +1511,7 @@ public:
 
     void set_sensitive(bool sensitive) { m_xSpinButton->set_sensitive(sensitive); }
     bool get_sensitive() const { return m_xSpinButton->get_sensitive(); }
+    void set_visible(bool bShow) { m_xSpinButton->set_visible(bShow); }
     bool get_visible() const { return m_xSpinButton->get_visible(); }
     void grab_focus() { m_xSpinButton->grab_focus(); }
     bool has_focus() const { return m_xSpinButton->has_focus(); }

sfx2/UIConfig_sfx.mk

@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/helpsearchpage \
 	sfx2/uiconfig/ui/inputdialog \
 	sfx2/uiconfig/ui/licensedialog \
+	sfx2/uiconfig/ui/linefragment \
 	sfx2/uiconfig/ui/linkeditdialog \
 	sfx2/uiconfig/ui/loadtemplatedialog \
 	sfx2/uiconfig/ui/managestylepage \

sfx2/inc/bitmaps.hlst

@@ -87,7 +87,6 @@
 #define BMP_128X128_MATH_DOC                "sfx2/res/128x128_math_doc-p.png"
 #define BMP_128X128_WRITER_DOC              "sfx2/res/128x128_writer_doc-p.png"
 
-#define SFX_BMP_PROPERTY_REMOVE             "sfx2/res/deleterow.png"
 #define SFX_BMP_CLOSE_DOC                   "sfx2/res/closedoc.png"
 
 #define RID_SFXBMP_WATERCAN                 "res/sc05554.png"

sfx2/inc/strings.hxx

@@ -45,8 +45,6 @@
 #define STR_TEMPLATE_NAME29_DEF "Modern business letter serif"
 #define STR_TEMPLATE_NAME30_DEF "Businesscard with logo"
 
-#define SFX_ST_EDIT             "..."
-
 #define CMIS_TYPE_STRING        "String"
 #define CMIS_TYPE_INTEGER       "Integer"
 #define CMIS_TYPE_DECIMAL       "Decimal"

sfx2/uiconfig/ui/custominfopage.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkGrid" id="CustomInfoPage">
@@ -24,29 +24,17 @@
       </packing>
     </child>
     <child>
-      <object class="sfxlo-CustomPropertiesControl" id="properties">
+      <object class="GtkBox" id="headerbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="can_focus">False</property>
-        <property name="no_show_all">True</property>
-        <property name="hexpand">True</property>
         <property name="spacing">12</property>
-        <property name="homogeneous">True</property>
         <child>
           <object class="GtkLabel" id="name">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes" context="custominfopage|name">Name</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -59,6 +47,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes" context="custominfopage|type">Type</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -71,6 +60,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes" context="custominfopage|value">Value</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -84,5 +74,50 @@
         <property name="top_attach">0</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkScrolledWindow" id="scroll">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="vscrollbar_policy">always</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox" id="box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="properties">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="border_width">3</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+      </packing>
+    </child>
   </object>
 </interface>

solenv/bin/native-code.py

@@ -439,7 +439,6 @@ custom_widgets = [
     'ContentListBox',
     'ContextVBox',
     'CustomAnimationList',
-    'CustomPropertiesControl',
     'DataTreeListBox',
     'DriverListControl',
     'DropdownBox',

solenv/sanitizers/ui/sfx.suppr

@@ -43,7 +43,7 @@ sfx2/uiconfig/ui/cmisline.ui://GtkLabel[@id='type'] orphan-label
 sfx2/uiconfig/ui/cmisline.ui://GtkEntry[@id='value'] no-labelled-by
 sfx2/uiconfig/ui/cmisline.ui://GtkSpinButton[@id='date:yy:mm:dd'] no-labelled-by
 sfx2/uiconfig/ui/cmisline.ui://GtkSpinButton[@id='time:hh:mm'] no-labelled-by
-sfx2/uiconfig/ui/custominfopage.ui://sfxlo-CustomPropertiesControl[@id='properties'] no-labelled-by
+sfx2/uiconfig/ui/custominfopage.ui://GtkTreeView[@id='properties'] no-labelled-by
 sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='name'] orphan-label
 sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='type'] orphan-label
 sfx2/uiconfig/ui/custominfopage.ui://GtkLabel[@id='value'] orphan-label
@@ -79,3 +79,7 @@ sfx2/uiconfig/ui/versioncommentdialog.ui://GtkTextView[@id='textview'] no-labell
 sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='datetime'] orphan-label
 sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='savedby'] orphan-label
 sfx2/uiconfig/ui/versionscmis.ui://GtkLabel[@id='comments'] orphan-label
+sfx2/uiconfig/ui/linefragment.ui://GtkEntry[@id='duration'] no-labelled-by
+sfx2/uiconfig/ui/linefragment.ui://GtkEntry[@id='valueedit'] no-labelled-by
+sfx2/uiconfig/ui/linefragment.ui://GtkMenuButton[@id='date'] button-no-label
+sfx2/uiconfig/ui/linefragment.ui://GtkSpinButton[@id='time'] no-labelled-by