[Libreoffice-commits] core.git: Branch 'feature/cmis' - include/sfx2 sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

Cao Cuong Ngo cao.cuong.ngo at gmail.com
Thu May 30 07:16:36 PDT 2013


 include/sfx2/dinfdlg.hxx                     |   19 ++++++
 sfx2/UIConfig_sfx.mk                         |    1 
 sfx2/source/dialog/dinfdlg.cxx               |   31 ++++++++++
 sfx2/uiconfig/ui/cmisinfopage.ui             |   78 +++++++++++++++++++++++++++
 sfx2/uiconfig/ui/documentpropertiesdialog.ui |   14 ++++
 5 files changed, 143 insertions(+)

New commits:
commit cf17ad002d01418ac5517189da0f193dac9c32df
Author: Cao Cuong Ngo <cao.cuong.ngo at gmail.com>
Date:   Thu May 30 15:40:55 2013 +0200

    CMIS properties dialog initialize
    
    Change-Id: I1bdc2a9e8d2ee916fa37f836baf750385c820da4

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index c0758b5..2994819 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -496,6 +496,25 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& );
 };
 
+// class SfxCmisPropertiesPage -------------------------------------------------
+
+class SfxCmisPropertiesPage : public SfxTabPage
+{
+private:
+
+    using TabPage::DeactivatePage;
+
+protected:
+    SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& );
+
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual void        Reset( const SfxItemSet& );
+    virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
+
+public:
+    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& );
+};
+
 #endif // #ifndef _SFX_DINFDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 2adb858..4123f16 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/securityinfopage \
 	sfx2/uiconfig/ui/singletabdialog \
 	sfx2/uiconfig/ui/documentfontspage \
+	sfx2/uiconfig/ui/cmisinfopage \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e13e557..cad2b91 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1148,6 +1148,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
     AddTabPage("description", SfxDocumentDescPage::Create, 0);
     AddTabPage("customprops", SfxCustomPropertiesPage::Create, 0);
     AddTabPage("security", SfxSecurityPage::Create, 0);
+    AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, 0);
 }
 
 // -----------------------------------------------------------------------
@@ -2079,4 +2080,34 @@ SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet&
     return new SfxCustomPropertiesPage( pParent, rItemSet );
 }
 
+// class SfxCmisPropertiesPage -----------------------------------------
+SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& rItemSet )
+    : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", rItemSet)
+{
+}
+
+sal_Bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& /*rSet*/ )
+{
+    sal_Bool bModified = sal_False;
+    return bModified;
+}
+
+void SfxCmisPropertiesPage::Reset( const SfxItemSet& /*rItemSet*/ )
+{
+
+}
+
+int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ )
+{
+    int nRet = LEAVE_PAGE;
+
+    return nRet;
+}
+
+SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet& rItemSet )
+{
+    return new SfxCmisPropertiesPage( pParent, rItemSet );
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/uiconfig/ui/cmisinfopage.ui b/sfx2/uiconfig/ui/cmisinfopage.ui
new file mode 100644
index 0000000..f393441
--- /dev/null
+++ b/sfx2/uiconfig/ui/cmisinfopage.ui
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkGrid" id="CmisInfoPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">12</property>
+    <child>
+      <object class="GtkLabel" id="label56">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="label" translatable="yes">_CMIS Properties</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">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">Name</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="type">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Type</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="value">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Value</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index bb2375e..876e9ec 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -140,6 +140,20 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="cmisprops">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">CMIS Properties</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>


More information about the Libreoffice-commits mailing list