convert edit modules dialog to .ui

Change-Id: Ic9d06ff7ae5c1f5f9b50732943c38b8666680b9d

cui/UIConfig_cui.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/cuiimapdlg \
 	cui/uiconfig/ui/dimensionlinestabpage \
 	cui/uiconfig/ui/editdictionarydialog \
+	cui/uiconfig/ui/editmodulesdialog \
 	cui/uiconfig/ui/embossdialog \
 	cui/uiconfig/ui/eventassigndialog \
 	cui/uiconfig/ui/eventassignpage \

cui/source/inc/cuires.hrc

@@ -151,7 +151,6 @@
 #define RID_SVXDLG_JAVA_CLASSPATH           (RID_SVX_START + 255)
 #define RID_SVXERR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
 #define RID_SVXERR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
-#define RID_SVXDLG_EDIT_MODULES             (RID_SVX_START +  831)
 #define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
 #define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
 #define RID_SVXSTR_READONLY_CONFIG_TIP      (RID_SVX_START + 1026)
@@ -441,6 +440,10 @@
 #define RID_SVXSTR_CHG_SMARTART                             (RID_SVX_START + 1251)
 
 #define RID_SVXSTR_PPI                                      (RID_SVX_START + 1252)
+#define RID_SVXSTR_SPELL                                    (RID_SVX_START + 1253)
+#define RID_SVXSTR_HYPH                                     (RID_SVX_START + 1254)
+#define RID_SVXSTR_THES                                     (RID_SVX_START + 1255)
+#define RID_SVXSTR_GRAMMAR                                  (RID_SVX_START + 1256)
 
 #endif
 

cui/source/inc/helpid.hrc

@@ -26,8 +26,6 @@
 
 #define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
 #define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
-#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
-#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
 #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
 #define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
 #define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"

cui/source/inc/optlingu.hxx

@@ -52,19 +52,15 @@ class SvxLinguData_Impl;
 
 class SvxEditModulesDlg : public ModalDialog
 {
-    FixedLine           aModulesFL;
-    FixedText           aLanguageFT;
-    SvxLanguageBox      aLanguageLB;
+    SvxLanguageBox*     m_pLanguageLB;
 
-    SvxCheckListBox     aModulesCLB;
-    PushButton          aPrioUpPB;
-    PushButton          aPrioDownPB;
-    PushButton          aBackPB;
-    FixedHyperlink      aMoreDictsLink;
+    SvxCheckListBox*    m_pModulesCLB;
+    PushButton*         m_pPrioUpPB;
+    PushButton*         m_pPrioDownPB;
+    PushButton*         m_pBackPB;
+    FixedHyperlink*     m_pMoreDictsLink;
 
-    FixedLine           aButtonsFL;
-    HelpButton          aHelpPB;
-    OKButton            aClosePB;
+    CloseButton*        m_pClosePB;
 
     OUString            sSpell;
     OUString            sHyph;
@@ -78,9 +74,9 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvTreeListEntry*    CreateEntry(OUString& rTxt, sal_uInt16 nCol);
 
-    DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
-    DECL_LINK( UpDownHdl_Impl, PushButton * );
-    DECL_LINK( ClickHdl_Impl, PushButton * );
+    DECL_LINK(SelectHdl_Impl, SvxCheckListBox *);
+    DECL_LINK(UpDownHdl_Impl, PushButton *);
+    DECL_LINK(ClickHdl_Impl, void *);
     DECL_LINK(BackHdl_Impl, void *);
     DECL_LINK( SelectHdlLB_Impl, ListBox * );
     DECL_LINK( LangSelectHdl_Impl, ListBox* );

cui/source/options/optlingu.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#define PB_OK                               70
-#define PB_HELP                             72
-
-#define ST_SPELL                            82
-#define ST_HYPH                             83
-#define ST_THES                             84
-#define ST_GRAMMAR                          85
-
-#define PB_EDIT_MODULES_PRIO_UP             309
-#define PB_EDIT_MODULES_PRIO_DOWN           310
-#define PB_EDIT_MODULES_PRIO_BACK           311
-
-#define FT_LINGU_DICS                       312
-#define CLB_LINGU_DICS                      313
-#define PB_LINGU_DICS_NEW_DIC               314
-#define PB_LINGU_DICS_EDIT_DIC              315
-#define PB_LINGU_DICS_DEL_DIC               316
-
-#define FL_EDIT_MODULES_OPTIONS             317
-#define FT_EDIT_MODULES_LANGUAGE            318
-#define LB_EDIT_MODULES_LANGUAGE            319
-#define CLB_EDIT_MODULES_MODULES            320
-#define FT_EDIT_MODULES_NEWDICTSLINK        321
-#define FL_EDIT_MODULES_BUTTONS             322
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/optlingu.src

@@ -17,116 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "optlingu.hrc"
 #include "helpid.hrc"
 
 #include <svtools/controldims.hrc>
 #include <sfx2/sfx.hrc>
 #include <cuires.hrc>
 
-// RID_SVXDLG_EDIT_MODULES ---------------------------------------------------
+String RID_SVXSTR_SPELL
+{
+    Text [ en-US ] = "Spelling";
+};
 
-ModalDialog RID_SVXDLG_EDIT_MODULES
+String RID_SVXSTR_HYPH
 {
-    HelpID = HID_EDIT_MODULES ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Size = MAP_APPFONT ( 240 , 197 ) ;
-    Text [ en-US ] = "Edit Modules";
+    Text [ en-US ] = "Hyphenation";
+};
 
-    FixedLine FL_EDIT_MODULES_OPTIONS
-    {
-        Pos = MAP_APPFONT ( RSC_SP_FLGR_INNERBORDER_LEFT , RSC_SP_FLGR_INNERBORDER_TOP ) ;
-        Size = MAP_APPFONT ( 240 - 2*RSC_SP_FLGR_INNERBORDER_LEFT , RSC_CD_FIXEDLINE_HEIGHT ) ;
-        Text [ en-US ] = "Options";
-    };
-    FixedText FT_EDIT_MODULES_LANGUAGE
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 68 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-        Text [ en-US ] = "Language";
-    };
-    ListBox LB_EDIT_MODULES_LANGUAGE
-    {
-        HelpID = "cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 83 , 14 ) ;
-        Size = MAP_APPFONT ( 95 , 80 ) ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    Control CLB_EDIT_MODULES_MODULES
-    {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT ( 166 , 120 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_EDIT_MODULES_PRIO_UP
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP";
-        Pos = MAP_APPFONT ( 184 , 32 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Move Up";
-    };
-    PushButton PB_EDIT_MODULES_PRIO_DOWN
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN";
-        Pos = MAP_APPFONT ( 184 , 49 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Move Down";
-    };
-    PushButton PB_EDIT_MODULES_PRIO_BACK
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK";
-        Pos = MAP_APPFONT ( 184 , 66 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Back";
-    };
-    FixedText FT_EDIT_MODULES_NEWDICTSLINK
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 155 ) ;
-        Size = MAP_APPFONT ( 169 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-        Text [ en-US ] = "~Get more dictionaries online...";
-    };
-    FixedLine FL_EDIT_MODULES_BUTTONS
-    {
-        Pos = MAP_APPFONT ( 0 , 166 ) ;
-        Size = MAP_APPFONT ( 240 , RSC_CD_FIXEDLINE_HEIGHT ) ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( 12, 177 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-    };
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 184 , 177 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        Text [ en-US ] = "Close";
-    };
+String RID_SVXSTR_THES
+{
+    Text [ en-US ] = "Thesaurus";
+};
 
-    String ST_SPELL
-    {
-        Text [ en-US ] = "Spelling";
-    };
-    String ST_HYPH
-    {
-        Text [ en-US ] = "Hyphenation";
-    };
-    String ST_THES
-    {
-        Text [ en-US ] = "Thesaurus";
-    };
-    String ST_GRAMMAR
-    {
-        Text [ en-US ] = "Grammar";
-    };
+String RID_SVXSTR_GRAMMAR
+{
+    Text [ en-US ] = "Grammar";
 };
 
 String RID_SVXSTR_CAPITAL_WORDS