modern .ui widgetlayout for editdictionarydialog

widget found at writer/tools/options/writing aid

Conflicts:
	cui/UIConfig_cui.mk

Change-Id: I1cd4ff5c85f373ccd8d7b808f6ef869fe4c2d312
Reviewed-on: https://gerrit.libreoffice.org/5228Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/UIConfig_cui.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/colorpage \
 	cui/uiconfig/ui/comment \
 	cui/uiconfig/ui/cuiimapdlg \
+	cui/uiconfig/ui/editdictionarydialog \
 	cui/uiconfig/ui/formatnumberdialog \
 	cui/uiconfig/ui/gradientpage \
 	cui/uiconfig/ui/colorconfigwin \

cui/source/inc/cuires.hrc

@@ -204,6 +204,7 @@
 // dialogs
 #define RID_SVX_WND_COMMON_LINGU            ( RID_SVX_START +  0 )
 #define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB    (RID_SVX_START + 337)
+#define STR_MODIFY                          (RID_SVX_START + 336)//from optdict.src
 #define RID_SVXDLG_SEARCHATTR               (RID_SVX_START +  22)
 
 // hyperlink dialog

cui/source/inc/optdict.hxx

@@ -82,6 +82,8 @@ class SvxDictEdit : public Edit
     public:
                     SvxDictEdit(Window* pParent, const ResId& rResId) :
                         Edit(pParent, rResId), bSpaces(sal_False){}
+                    SvxDictEdit(Window* pParent, WinBits aWB) :
+                        Edit(pParent, aWB), bSpaces(sal_False){}
 
     void            SetActionHdl( const Link& rLink )
                                 { aActionLink = rLink;}
@@ -98,22 +100,19 @@ class SvxEditDictionaryDialog : public ModalDialog
 {
 private:
 
-    FixedText               aBookFT;
-    ListBox                 aAllDictsLB;
-    FixedText               aLangFT;
-    SvxLanguageBox          aLangLB;
-
-    FixedText               aWordFT;
-    SvxDictEdit             aWordED;
-    FixedText               aReplaceFT;
-    SvxDictEdit             aReplaceED;
-    SvTabListBox            aWordsLB;
-    PushButton              aNewReplacePB;
-    PushButton              aDeletePB;
-    FixedLine                aEditDictsBox;
-
-    HelpButton              aHelpBtn;
-    CancelButton            aCloseBtn;
+    ListBox*                 pAllDictsLB;
+    FixedText*               pLangFT;
+    SvxLanguageBox*          pLangLB;
+
+    SvxDictEdit*             pWordED;
+    FixedText*               pReplaceFT;
+    SvxDictEdit*             pReplaceED;
+    SvTabListBox*            pWordsLB;
+    PushButton*              pNewReplacePB;
+    PushButton*              pDeletePB;
+
+    HelpButton*              pHelpBtn;
+    CancelButton*            pCloseBtn;
     String                  sModify;
     String                  sNew;
     DecorationView          aDecoView;
@@ -148,7 +147,7 @@ private:
 
 protected:
 
-    virtual void    Paint( const Rectangle& rRect );
+//    virtual void    Paint( const Rectangle& rRect );
 
 public:
     SvxEditDictionaryDialog( Window* pParent,
@@ -157,7 +156,7 @@ public:
                 ::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
     ~SvxEditDictionaryDialog();
 
-    sal_uInt16 GetSelectedDict() {return aAllDictsLB.GetSelectEntryPos();}
+    sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();}
 };
 
 #endif

cui/source/options/optdict.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 .
- */
-#ifndef _SVX_OPTDICT_HRC
-#define _SVX_OPTDICT_HRC
-
-// defines ------------------------------------------------------------------
-
-#define FT_DICTLANG     12
-#define LB_DICTLANG     13
-
-#define FT_BOOK             30
-#define FT_CONTENT          31
-#define LB_ALLDICTS         32
-#define GB_EDITDICTS        34
-#define FT_WORD             35
-#define ED_WORD             36
-#define FT_REPLACE          37
-#define ED_REPLACE          38
-#define PB_NEW_REPLACE      39
-#define PB_DELETE_REPLACE   40
-#define TLB_REPLACE         41
-#define STR_MODIFY          42
-
-#define BTN_EDITCLOSE   50
-#define BTN_EDITHELP    54
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/optdict.src

@@ -20,135 +20,15 @@
 #include <sfx2/sfx.hrc>
 #include "helpid.hrc"
 #include <cuires.hrc>
-#include "optdict.hrc"
-
- // RID_SFXDLG_EDITDICT ---------------------------------------------------
-ModalDialog RID_SFXDLG_EDITDICT
-{
-    HelpId = HID_OPTIONS_DICT_EDIT ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT( 270, 161 );
-
-    Text [ en-US ] = "Edit Custom Dictionary" ;
-
-    Moveable = TRUE ;
-    FixedText FT_BOOK
-    {
-        Pos = MAP_APPFONT ( 12 , 10 ) ;
-        Size = MAP_APPFONT ( 86 , 10 ) ;
-        Text [ en-US ] = "~Book" ;
-    };
-    ListBox LB_ALLDICTS
-    {
-        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 9 ) ;
-        Size = MAP_APPFONT ( 103 , 62 ) ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_DICTLANG
-    {
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 86 , 10 ) ;
-        Text [ en-US ] = "~Language" ;
-    };
-    ListBox LB_DICTLANG
-    {
-        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 25 ) ;
-        Size = MAP_APPFONT ( 103 , 66 ) ;
-        DropDown = TRUE ;
-    };
-
-    FixedLine GB_EDITDICTS
-    {
-        Pos = MAP_APPFONT( 1, 1 );
-        Size = MAP_APPFONT( 268, 138 );
-        Hide=TRUE;
-    };
-
-    FixedText FT_WORD
-    {
-        Pos = MAP_APPFONT ( 13 , 46 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Text [ en-US ] = "~Word";
-    };
-    Edit ED_WORD
-    {
-        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD";
-        Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 71 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_REPLACE
-    {
-        Pos = MAP_APPFONT ( 84 , 46 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Replace ~By:";
-    };
-
-    Edit ED_REPLACE
-    {
-        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE";
-        Pos = MAP_APPFONT ( 83 , 56 ) ;
-        Size = MAP_APPFONT ( 120 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-
-    PushButton PB_NEW_REPLACE
-    {
-        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE";
-        Pos = MAP_APPFONT ( 209 , 56 ) ;
-        Size = MAP_APPFONT ( 55 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~New" ;
-    };
-    PushButton PB_DELETE_REPLACE
-    {
-        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE";
-        Pos = MAP_APPFONT ( 209 , 71 ) ;
-        Size = MAP_APPFONT ( 55 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Delete" ;
-    };
-    Control TLB_REPLACE
-    {
-        HelpId = HID_OPTIONS_DICT_EDIT_ENTRIES_LIST;
-        Pos = MAP_APPFONT ( 12 , 71 ) ;
-        Size = MAP_APPFONT ( 191 , 58 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    String STR_MODIFY
-    {
-        Text [ en-US ] = "~Replace" ;
-    };
-
-
-
-    HelpButton BTN_EDITHELP
-    {
-        Pos = MAP_APPFONT( 145, 143 );
-        Size = MAP_APPFONT( 55, 14 );
-    };
-
-    CancelButton BTN_EDITCLOSE
-    {
-        Pos = MAP_APPFONT ( 209 , 143 ) ;
-        Size = MAP_APPFONT ( 55 , 14 ) ;
-
-        Text [ en-US ] = "~Close" ;
-    };
-};
 
  // Strings ---------------------------------------------------------------
 String RID_SVXSTR_OPT_DOUBLE_DICTS
 {
     Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ;
+};
+String STR_MODIFY
+{
+    Text [ en-US ] = "~Replace" ;
 };
  // RID_SFXQB_SET_LANGUAGE ------------------------------------------------
 QueryBox RID_SFXQB_SET_LANGUAGE

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

@@ -305,6 +305,9 @@
     <glade-widget-class title="Ruby Edit" name="svxlo-RubyEdit"
                         generic-name="RubyEdit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>
+    <glade-widget-class title="Dictionary Edit" name="cuilo-SvxDictEdit"
+                        generic-name="SvxDictEdit" parent="GtkEntry"
+                        icon-name="widget-gtk-textentry"/>
     <glade-widget-class title="AutoCorrect Edit" name="cuilo-AutoCorrEdit"
                         generic-name="AutoCorrEdit" parent="GtkEntry"
                         icon-name="widget-gtk-textentry"/>