convert gallery title dialog to .ui

Change-Id: I432b8c36e28576d016c58d972299aa804963829e

cui/UIConfig_cui.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/dbregisterpage \
 	cui/uiconfig/ui/effectspage \
 	cui/uiconfig/ui/formatcellsdialog \
+	cui/uiconfig/ui/gallerytitledialog \
 	cui/uiconfig/ui/hangulhanjaadddialog \
 	cui/uiconfig/ui/hatchpage \
 	cui/uiconfig/ui/hyphenate \

cui/source/dialogs/cuigaldlg.cxx

@@ -520,21 +520,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
     return 0;
 }
 
-// ---------------
+TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
-// - TitleDialog -
+    : ModalDialog (pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
-// ---------------
-
-TitleDialog::TitleDialog( Window* pParent, const OUString& rOldTitle ) :
-    ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
-    maOk        ( this, CUI_RES( BTN_OK ) ),
-    maCancel    ( this, CUI_RES( BTN_CANCEL ) ),
-    maHelp      ( this, CUI_RES( BTN_HELP ) ),
-    maFL       ( this, CUI_RES( FL_TITLE ) ),
-    maEdit      ( this, CUI_RES( EDT_TITLE ) )
 {
-    FreeResource();
+    get(m_pEdit, "entry");
-    maEdit.SetText( rOldTitle );
+    m_pEdit->SetText( rOldTitle );
-    maEdit.GrabFocus();
+    m_pEdit->GrabFocus();
 }
 
 // -------------------

cui/source/dialogs/gallery.src

@@ -219,53 +219,6 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
 
 /******************************************************************************/
 
-ModalDialog RID_SVXDLG_GALLERY_TITLE
-{
-    HelpId = HID_GALLERY_TITLE;
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 168 , 63 ) ;
-    Text [ en-US ] = "Enter Title" ;
-    Moveable = TRUE ;
-
-    OkButton BTN_OK
-    {
-        DefButton = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 112 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 112 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    FixedLine FL_TITLE
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Title" ;
-    };
-    Edit EDT_TITLE
-    {
-        HelpId = HID_GALLERY_TITLE_EDIT;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 18 ) ;
-        Size = MAP_APPFONT ( 88, 12 ) ;
-    };
-};
-
-/******************************************************************************/
-
 ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
 {
     HelpId = HID_GALLERY_SEARCH ;

cui/source/inc/cuigaldlg.hxx

@@ -176,17 +176,10 @@ public:
 class TitleDialog : public ModalDialog
 {
 private:
-
+    Edit* m_pEdit;
-    OKButton            maOk;
-    CancelButton        maCancel;
-    HelpButton          maHelp;
-    FixedLine           maFL;
-    Edit                maEdit;
-
 public:
-
     TitleDialog(Window* pParent, const OUString& rOldText);
-    OUString            GetTitle() const { return maEdit.GetText(); }
+    OUString GetTitle() const { return m_pEdit->GetText(); }
 };
 
 class GalleryIdDialog : public ModalDialog

cui/source/inc/gallery.hrc

@@ -20,7 +20,6 @@
 
 // Gallery TabDialogs/TabPages
 #define RID_SVXTABDLG_GALLERYTHEME              (RID_CUI_GALLERY_START + 2)
-#define RID_SVXDLG_GALLERY_TITLE                (RID_CUI_GALLERY_START + 82)
 
 #define RID_SVXTABPAGE_GALLERY_GENERAL          (RID_CUI_GALLERY_START + 1)
 #define RID_SVXTABPAGE_GALLERYTHEME_FILES       (RID_CUI_GALLERY_START + 4)
@@ -70,8 +69,6 @@
 #define FT_ACTUALIZE_FILE 1
 #define FL_ID                  1
 #define LB_RESNAME      1
-#define EDT_TITLE       20
-#define FL_TITLE               21
 
 // Gallery-TabDialog
 #define FI_MS_IMAGE 1

cui/source/inc/helpid.hrc

@@ -239,7 +239,6 @@
 #define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
 #define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
 #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
-#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
 
 #define HID_DLG_PASSWORD_TO_OPEN_MODIFY                             "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY"
 #define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN            "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN"

cui/uiconfig/ui/gallerytitledialog.ui

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">500</property>
+    <property name="value">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkDialog" id="GalleryTitleDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Enter Title</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">start</property>
+            <property name="hexpand">True</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Title</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">entry</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">●</property>
+                <property name="width_chars">32</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>