convert acceleration config page to .ui

Change-Id: I0868b635d3aca4d368f32a0035b3f57a0da35ac7

cui/UIConfig_cui.mk

@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/aboutdialog \
 	cui/uiconfig/ui/aboutconfigdialog\
 	cui/uiconfig/ui/aboutconfigvaluedialog \
+	cui/uiconfig/ui/accelconfigpage \
 	cui/uiconfig/ui/agingdialog \
 	cui/uiconfig/ui/acorexceptpage \
 	cui/uiconfig/ui/acoroptionspage \

cui/source/customize/acccfg.hrc

@@ -34,8 +34,6 @@
 #define BTN_SAVE                41
 #define RB_OFFICE               44
 #define RB_MODULE               45
-#define STR_LOADACCELCONFIG     46
-#define STR_SAVEACCELCONFIG     47
 
 #define STR_GROUP_STYLES        58
 #define STR_PDF_EXPORT_SEND     59

cui/source/customize/acccfg.src

@@ -21,182 +21,6 @@
 #include "cuires.hrc"
 #include "acccfg.hrc"
 
-#define MASKCOLOR  MaskColor = \
-    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
-#define PUSHBUTTON_TEXT_SAVE \
-    Text [ en-US ] = "~Save..." ; \
-
-#define PUSHBUTTON_TEXT_RESET \
-    Text [ en-US ] = "R~eset" ; \
-
-#define PUSHBUTTON_TEXT_LOAD \
-    Text [ en-US ] = "~Load..." ; \
-
-#define PUSHBUTTON_TEXT_REMOVE \
-    Text [ en-US ] = "~Delete" ; \
-
-#define PUSHBUTTON_TEXT_CHANGE \
-    Text [ en-US ] = "~Modify" ; \
-
-#define PUSHBUTTON_TEXT_NEW \
-    Text [ en-US ] = "~New" ; \
-
-#define FIXEDTEXT_TEXT_GROUP \
-    Text [ en-US ] = "~Category" ; \
-
-#define FIXEDTEXT_TEXT_FUNCTION \
-    Text [ en-US ] = "Function" ; \
-
-#define GROUPBOX_TEXT_FUNCTIONS \
-    Text [ en-US ] = "Functions" ; \
-
- // TP_CONFIG_ACCEL -------------------------------------------------------
-TabPage RID_SVXPAGE_KEYBOARD
-{
-    HelpId = HID_CONFIG_ACCEL ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( 273 , 258 ) ;
-    RadioButton RB_OFFICE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
-        Pos = MAP_APPFONT ( 192 , 6 ) ;
-        Size = MAP_APPFONT ( 75 , 10 ) ;
-        Text = "%PRODUCTNAME" ;
-    };
-    RadioButton RB_MODULE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
-        Pos = MAP_APPFONT ( 192 , 19 ) ;
-        Size = MAP_APPFONT ( 75 , 10 ) ;
-        Text = "$(MODULE)" ;
-    };
-    PushButton BTN_ACC_CHANGE
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
-        Pos = MAP_APPFONT ( 192 , 35 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
-        TabStop = TRUE ;
-        PUSHBUTTON_TEXT_CHANGE
-    };
-    PushButton BTN_ACC_REMOVE
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
-        Pos = MAP_APPFONT ( 192 , 52 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        PUSHBUTTON_TEXT_REMOVE
-    };
-    FixedLine GRP_ACC_KEYBOARD
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 180 , 8 ) ;
-        Group = TRUE ;
-        Text [ en-US ] = "Shortcut keys";
-    };
-    Control BOX_ACC_ENTRIES
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 174 , 120 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        HelpId = HID_ACCELCONFIG_LISTBOX ;
-    };
-    FixedLine GRP_ACC_FUNCTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 140 ) ;
-        Size = MAP_APPFONT ( 258 , 8 ) ;
-        Group = TRUE ;
-        GROUPBOX_TEXT_FUNCTIONS
-    };
-    FixedText TXT_ACC_GROUP
-    {
-        Pos = MAP_APPFONT ( 12 , 151 ) ;
-        Size = MAP_APPFONT ( 78 , 8 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        FIXEDTEXT_TEXT_GROUP
-    };
-    Control BOX_ACC_GROUP
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 78 , 91 ) ;
-        TabStop = TRUE ;
-        HelpId = HID_CONFIGGROUP_ACC_LISTBOX ;
-    };
-    FixedText TXT_ACC_FUNCTION
-    {
-        Pos = MAP_APPFONT ( 93 , 151 ) ;
-        Size = MAP_APPFONT ( 88 , 8 ) ;
-        Left = TRUE ;
-        FIXEDTEXT_TEXT_FUNCTION
-    };
-    Control BOX_ACC_FUNCTION
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 93 , 161 ) ;
-        Size = MAP_APPFONT ( 88 , 91 ) ;
-        TabStop = TRUE ;
-        HelpId = HID_CONFIGFUNCTION_ACC_LISTBOX ;
-    };
-    FixedText TXT_ACC_KEY
-    {
-        Pos = MAP_APPFONT ( 184 , 151 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "~Keys" ;
-        Left = TRUE ;
-    };
-    Control BOX_ACC_KEY
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 184 , 161 ) ;
-        Size = MAP_APPFONT ( 80 , 91 ) ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_LOAD
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
-        Pos = MAP_APPFONT ( 192 , 86 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        PUSHBUTTON_TEXT_LOAD
-    };
-    PushButton BTN_SAVE
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
-        Pos = MAP_APPFONT ( 192 , 103 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        PUSHBUTTON_TEXT_SAVE
-    };
-    PushButton BTN_RESET
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
-        Pos = MAP_APPFONT ( 192 , 120 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        PUSHBUTTON_TEXT_RESET
-    };
-    String STR_LOADACCELCONFIG
-    {
-        Text [ en-US ] = "Load Keyboard Configuration" ;
-    };
-    String STR_SAVEACCELCONFIG
-    {
-        Text [ en-US ] = "Save Keyboard Configuration" ;
-    };
-    String STR_FILTERNAME_CFG
-    {
-        Text [ en-US ] = "Configuration (*.cfg)" ;
-    };
-};
-
 Resource RID_SVXPAGE_CONFIGGROUPBOX
 {
     String STR_BASICMACROS

cui/source/dialogs/cuires.src

@@ -92,4 +92,19 @@ Image RID_CUIIMG_DOC
     MASKCOLOR
 };
 
+String RID_SVXSTR_LOADACCELCONFIG
+{
+    Text [ en-US ] = "Load Keyboard Configuration" ;
+};
+
+String RID_SVXSTR_SAVEACCELCONFIG
+{
+    Text [ en-US ] = "Save Keyboard Configuration" ;
+};
+
+String RID_SVXSTR_FILTERNAME_CFG
+{
+    Text [ en-US ] = "Configuration (*.cfg)" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/acccfg.hxx

@@ -62,15 +62,18 @@ protected:
                                           const Image&, SvLBoxButtonKind eButtonKind);
 
 public:
-                                SfxAccCfgTabListBox_Impl(
-                                        SfxAcceleratorConfigPage* pAccelConfigPage,
-                                        Window *pParent,
-                                        const ResId &rResId ) :
-                                     SvTabListBox( pParent, rResId ),
-                                    m_pAccelConfigPage( pAccelConfigPage )
-                                {}
-
-    void                        ReplaceEntry( sal_uInt16 nPos, const OUString &rStr );
+    SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle)
+        : SvTabListBox(pParent, nStyle)
+        , m_pAccelConfigPage(NULL)
+    {
+    }
+
+    void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage)
+    {
+        m_pAccelConfigPage = pAccelConfigPage;
+    }
+
+    void ReplaceEntry( sal_uInt16 nPos, const OUString &rStr );
 };
 
 // class SfxAcceleratorConfigPage ----------------------------------------
@@ -115,22 +118,17 @@ private:
     const SfxStringItem*            m_pFontItem;
     sfx2::FileDialogHelper*         m_pFileDlg;
 
-    SfxAccCfgTabListBox_Impl        aEntriesBox;
-    FixedLine                       aKeyboardGroup;
-     RadioButton                        aOfficeButton;
-    RadioButton                     aModuleButton;
-    PushButton                      aChangeButton;
-    PushButton                      aRemoveButton;
-    FixedText                       aGroupText;
-    SfxConfigGroupListBox*     pGroupLBox;
-    FixedText                       aFunctionText;
-    SfxConfigFunctionListBox*  pFunctionBox;
-    FixedText                       aKeyText;
-    SvTreeListBox                   aKeyBox;
-    FixedLine                       aFunctionsGroup;
-    PushButton                      aLoadButton;
-    PushButton                      aSaveButton;
-    PushButton                      aResetButton;
+    SfxAccCfgTabListBox_Impl*       m_pEntriesBox;
+    RadioButton*                    m_pOfficeButton;
+    RadioButton*                    m_pModuleButton;
+    PushButton*                     m_pChangeButton;
+    PushButton*                     m_pRemoveButton;
+    SfxConfigGroupListBox*          m_pGroupLBox;
+    SfxConfigFunctionListBox*       m_pFunctionBox;
+    SvTreeListBox*                  m_pKeyBox;
+    PushButton*                     m_pLoadButton;
+    PushButton*                     m_pSaveButton;
+    PushButton*                     m_pResetButton;
     OUString                        aLoadAccelConfigStr;
     OUString                        aSaveAccelConfigStr;
     OUString                        aFilterAllStr;

cui/source/inc/cuires.hrc

@@ -262,7 +262,6 @@
 // customize
 #define RID_SVXDLG_CUSTOMIZE                (RID_SVX_START + 291)
 #define RID_SVXPAGE_MENUS                   (RID_SVX_START + 292)
-#define RID_SVXPAGE_KEYBOARD                (RID_SVX_START + 293)
 #define RID_SVXPAGE_TOOLBARS                (RID_SVX_START + 294)
 #define RID_SVXPAGE_EVENTS                  (RID_SVX_START + 295)
 #define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
@@ -444,6 +443,10 @@
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON              (RID_SVX_START + 1260)
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2           (RID_SVX_START + 1261)
 
+#define RID_SVXSTR_LOADACCELCONFIG                          (RID_SVX_START + 1262)
+#define RID_SVXSTR_SAVEACCELCONFIG                          (RID_SVX_START + 1263)
+#define RID_SVXSTR_FILTERNAME_CFG                           (RID_SVX_START + 1264)
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/helpid.hrc

@@ -182,10 +182,6 @@
 #define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
 #define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER"
 #define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY"
-#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL"
-#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX"
-#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX"
-#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX"
 #define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
 #define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
 #define HID_MULTIPATH "CUI_HID_MULTIPATH"

extras/source/glade/libreoffice-catalog.xml.in

@@ -344,6 +344,9 @@
     <glade-widget-class title="ConfigGroup ListBox" name="cuilo-SfxConfigGroupListBox"
                         generic-name="ConfigGroup ListBox" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
+    <glade-widget-class title="SfxAccCfgTabListBox" name="cuilo-SfxAccCfgTabListBox"
+                        generic-name="AccCfgTabListBox" parent="GtkTreeView"
+                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="ConfigGroupFunction ListBox" name="cuilo-SfxConfigFunctionListBox"
                         generic-name="ConfigGroupFunction ListBox" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>