adapt zoom dialog code to layout widgets

Change-Id: I7da387db88b8a4449dc1dc7099527f786b0d565e

cui/AllLangResTarget_cui.mk

@@ -82,7 +82,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/dialogs/svuidlg.src \
     cui/source/dialogs/tbxform.src \
     cui/source/dialogs/thesdlg.src \
-    cui/source/dialogs/zoom.src \
     cui/source/options/certpath.src \
     cui/source/options/connpooloptions.src \
     cui/source/options/dbregister.src \

cui/UI_cui.mk

@@ -10,11 +10,11 @@
 $(eval $(call gb_UI_UI,cui))
 
 $(eval $(call gb_UI_add_uifiles,cui,\
-	cui/uiconfig/ui/10000 \
-	cui/uiconfig/ui/effectspage \
 	cui/uiconfig/ui/charnamepage \
+	cui/uiconfig/ui/effectspage \
 	cui/uiconfig/ui/positionpage \
 	cui/uiconfig/ui/twolinespage \
+	cui/uiconfig/ui/zoomdialog \
 ))
 
 # vim: set noet sw=4 ts=4:

cui/source/dialogs/zoom.src

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "zoom.hrc"
-#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
-#include "helpid.hrc"
-
- // RID_SVXDLG_ZOOM -------------------------------------------------------
-ModalDialog RID_SVXDLG_ZOOM
-{
-    HelpId = CMD_SID_ATTR_ZOOM;
-    OutputSize = TRUE ;
-    SvLook = TRUE ;
-    Size = MAP_APPFONT ( 242 , 112 ) ;
-    Moveable = TRUE ;
-    Text [ en-US ] = "Zoom & View Layout";
-    FixedLine FL_ZOOM
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "Zoom factor";
-    };
-    RadioButton BTN_OPTIMAL
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 105 , 10 ) ;
-        Text [ en-US ] = "~Optimal" ;
-    };
-    RadioButton BTN_WHOLE_PAGE
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE";
-        Pos = MAP_APPFONT ( 12 , 27 ) ;
-        Size = MAP_APPFONT ( 105 , 10 ) ;
-        Text [ en-US ] = "~Fit width and height" ;
-    };
-    RadioButton BTN_PAGE_WIDTH
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH";
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 105, 10 ) ;
-        Text [ en-US ] = "Fit ~width" ;
-    };
-    RadioButton BTN_100
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
-        Size = MAP_APPFONT ( 105, 10 ) ;
-        Text = "~100%" ;
-    };
-    RadioButton BTN_USER
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER";
-        Pos = MAP_APPFONT ( 12 , 67 ) ;
-        Size = MAP_APPFONT ( 72 , 10 ) ;
-        Text [ en-US ] = "~Variable" ;
-    };
-    MetricField ED_USER
-    {
-        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER";
-        Pos = MAP_APPFONT ( 86 , 66 ) ;
-        Size = MAP_APPFONT ( 32 , 12 ) ;
-        Border = TRUE ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        SpinSize = 1 ;
-    };
-    FixedLine FL_VIEWLAYOUT
-    {
-        Pos = MAP_APPFONT ( 124 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 8 ) ;
-        Text [ en-US ] = "View layout";
-    };
-    RadioButton BTN_AUTOMATIC
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC";
-        Pos = MAP_APPFONT ( 130 , 14 ) ;
-        Size = MAP_APPFONT ( 106 , 10 ) ;
-        Text [ en-US ] = "~Automatic" ;
-    };
-    RadioButton BTN_SINGLE
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE";
-        Pos = MAP_APPFONT ( 130, 27 ) ;
-        Size = MAP_APPFONT ( 106, 10 ) ;
-        Text [ en-US ] = "~Single page" ;
-    };
-    RadioButton BTN_COLUMNS
-    {
-        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS";
-        Pos = MAP_APPFONT ( 130, 41 ) ;
-        Size = MAP_APPFONT ( 75 , 10 ) ;
-        Text [ en-US ] = "~Columns" ;
-    };
-    MetricField ED_COLUMNS
-    {
-        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS";
-        Pos = MAP_APPFONT ( 209 , 40 ) ;
-        Size = MAP_APPFONT ( 24 , 12 ) ;
-        Border = TRUE ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        SpinSize = 1 ;
-        Minimum = 1;
-        Maximum = 999;
-    };
-    CheckBox CHK_BOOK
-    {
-        HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK";
-        Pos = MAP_APPFONT ( 136 , 55 ) ;
-        Size = MAP_APPFONT ( 85 , 10 ) ;
-        Text [ en-US ] = "~Book mode" ;
-    };
-    FixedLine FL_BOTTOM
-    {
-        Pos = MAP_APPFONT ( 6 , 81 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-    };
-    OKButton BTN_ZOOM_OK
-    {
-        Pos = MAP_APPFONT ( 77 , 92 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_ZOOM_CANCEL
-    {
-        Pos = MAP_APPFONT ( 130 , 92 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_ZOOM_HELP
-    {
-        Pos = MAP_APPFONT ( 186 , 92 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-};
-
-// ********************************************************************** EOF

cui/source/inc/zoom.hxx

@@ -36,29 +36,25 @@
 class SvxZoomDialog : public SfxModalDialog
 {
 private:
-    FixedLine           aZoomFl;
-    RadioButton         aOptimalBtn;
-    RadioButton         aWholePageBtn;
-    RadioButton         aPageWidthBtn;
-    RadioButton         a100Btn;
-    RadioButton         aUserBtn;
-    MetricField         aUserEdit;
+    RadioButton*        m_pOptimalBtn;
+    RadioButton*        m_pWholePageBtn;
+    RadioButton*        m_pPageWidthBtn;
+    RadioButton*        m_p100Btn;
+    RadioButton*        m_pUserBtn;
+    MetricField*        m_pUserEdit;
 
-    FixedLine           aViewLayoutFl;
-    RadioButton         aAutomaticBtn;
-    RadioButton         aSingleBtn;
-    RadioButton         aColumnsBtn;
-    MetricField         aColumnsEdit;
-    CheckBox            aBookModeChk;
+    VclContainer*       m_pViewFrame;
+    RadioButton*        m_pAutomaticBtn;
+    RadioButton*        m_pSingleBtn;
+    RadioButton*        m_pColumnsBtn;
+    MetricField*        m_pColumnsEdit;
+    CheckBox*           m_pBookModeChk;
 
-    FixedLine           aBottomFl;
-    OKButton            aOKBtn;
-    CancelButton        aCancelBtn;
-    HelpButton          aHelpBtn;
+    OKButton*           m_pOKBtn;
 
     const SfxItemSet&   rSet;
     SfxItemSet*         pOutSet;
-    sal_Bool                bModified;
+    sal_Bool            bModified;
 
 #ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );

svx/inc/svx/dialogs.hrc

@@ -121,9 +121,6 @@
 #define RID_SVXDLG_CHARMAP                  ( RID_SVX_START +  10 )
 #define RID_SVXDLG_POSTIT                   ( RID_SVX_START +   8 )
 
-// only needed for layout:
-#define RID_SVXDLG_ZOOM                     ( RID_SVX_START +  0 )
-
 // IDs of options pages of applications
 #define RID_SW_TP_MAILCONFIG            (RID_OFA_START + 102)
 #define RID_SW_TP_STD_FONT_CJK          (RID_OFA_START + 247)

sw/uiconfig/swriter/ui/autoformattable.ui

@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="AutoFormatTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">AutoFormat</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -147,6 +148,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="vexpand">True</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection1"/>
+                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>

vcl/source/window/builder.cxx

@@ -1353,7 +1353,7 @@ void VclBuilder::mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustm
         }
         else
         {
-            SAL_WARN("vcl.layout", "unhandled property :" << rKey.getStr());
+            SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
         }
     }
 }

vcl/source/window/window2.cxx

@@ -2032,7 +2032,7 @@ bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
         set_margin_bottom(rValue.toInt32());
     else
     {
-        SAL_WARN("vcl.layout", "unhandled property: " << rKey.getStr());
+        SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());
         return false;
     }
     return true;