convert browser options to .ui

Change-Id: Ia3672c43b0e80e45ff3404fa84a11182cd6c03a0

6 files changed, 49 insertions, 40 deletions

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 3fbdb234c331..8f33c88560c7 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optaccessibilitypage \
 	cui/uiconfig/ui/optadvancedpage \
 	cui/uiconfig/ui/optappearancepage \
+	cui/uiconfig/ui/optbrowserpage \
 	cui/uiconfig/ui/optfltrpage \
 	cui/uiconfig/ui/optfontspage \
 	cui/uiconfig/ui/optgeneralpage \
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 668d35490d83..9e69a0ce64ba 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -953,11 +953,9 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
 }
 
 MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-    aMSWordGB       ( this, CUI_RES( GB_MOZPLUGIN       ) ),
-    aWBasicCodeCB   ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
+    : SfxTabPage(pParent, "OptBrowserPage", "cui/ui/optbrowserpage.ui", rSet)
 {
-    FreeResource();
+    get(m_pWBasicCodeCB, "display");
 }
 
 MozPluginTabPage::~MozPluginTabPage()
@@ -972,7 +970,7 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent,
 sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool hasInstall = isInstalled();
-    sal_Bool hasChecked = aWBasicCodeCB.IsChecked();
+    sal_Bool hasChecked = m_pWBasicCodeCB->IsChecked();
     if(hasInstall && (!hasChecked)){
         //try to uninstall
         uninstallPlugin();
@@ -988,8 +986,8 @@ sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
 }
 void MozPluginTabPage::Reset( const SfxItemSet& )
 {
-        aWBasicCodeCB.Check( isInstalled());
-        aWBasicCodeCB.SaveValue();
+        m_pWBasicCodeCB->Check( isInstalled());
+        m_pWBasicCodeCB->SaveValue();
 }
 
 #ifdef WNT
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index f61d424c6e12..6fe0a437f0b2 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -72,13 +72,6 @@
 #define PB_MAILERURL                5
 #define STR_DEFAULT_FILENAME        6
 
-// plugin
-#define GB_MOZPLUGIN    1
-#define CB_MOZPLUGIN_CODE   2
-
-
 #endif // #ifndef _SVX_OPTINET_HRC
 
-// ******************************************************************* EOF
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 1325c796883a..0d96cfff6282 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -193,8 +193,7 @@ public:
 
 class MozPluginTabPage : public SfxTabPage
 {
-    FixedLine       aMSWordGB;
-    CheckBox        aWBasicCodeCB;
+    CheckBox* m_pWBasicCodeCB;
 
     sal_Bool isInstalled(void);
     sal_Bool installPlugin(void);
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 632721ac51f7..5eecd852daef 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -28,30 +28,6 @@
 /*                                                                      */
 /************************************************************************/
 
-TabPage RID_SVXPAGE_INET_MOZPLUGIN
-{
-    HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-
-    FixedLine GB_MOZPLUGIN
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT (  248 , 8  ) ;
-        Text[ en-US ] = "Browser Plug-in";
-    };
-    CheckBox CB_MOZPLUGIN_CODE
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT (  236 , 10  ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Display documents in browser" ;
-    };
-};
-
 TabPage RID_SVXPAGE_INET_PROXY
 {
     HelpId = HID_OPTIONS_PROXY ;
diff --git a/cui/uiconfig/ui/optbrowserpage.ui b/cui/uiconfig/ui/optbrowserpage.ui
new file mode 100644
index 000000000000..279b3870a56d
--- /dev/null
+++ b/cui/uiconfig/ui/optbrowserpage.ui
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkFrame" id="OptBrowserPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="label_xalign">0</property>
+    <property name="shadow_type">none</property>
+    <child>
+      <object class="GtkAlignment" id="alignment1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
+        <child>
+          <object class="GtkCheckButton" id="display">
+            <property name="label" translatable="yes">_Display documents in browser</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="valign">start</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child type="label">
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Browser Plug-in</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+    </child>
+  </object>
+</interface>