Skip to content

C
core
Kaydet (Commit) 8e6eb6fb authored tarafından sk94's avatar sk94 Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

DLG_MM_ASSIGNFIELDS conversion to .ui 

Change-Id: Ia625de9edd46c185c2712c0c5a7154ba1abb2894
Reviewed-on: https://gerrit.libreoffice.org/9726Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 25526046
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 145 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 8e6eb6fb
......@@ -432,6 +432,9 @@
<glade-widget-class title="Address Preview" name="swlo-SwAddressPreview"
generic-name="Address Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Assign Fields Control" name="swuilo-SwAssignFieldsControl"
generic-name="Assign Fields Control" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Rectangle Control" name="svxlo-SvxRectCtl"
generic-name="Rectangle Control" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 8e6eb6fb
......@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/addressblockdialog \
sw/uiconfig/swriter/ui/alreadyexistsdialog \
sw/uiconfig/swriter/ui/asciifilterdialog \
sw/uiconfig/swriter/ui/assignfieldsdialog \
sw/uiconfig/swriter/ui/assignstylesdialog \
sw/uiconfig/swriter/ui/attachnamedialog \
sw/uiconfig/swriter/ui/authenticationsettingsdialog \
......
sw/inc/dbui.hrc
Dosyayı görüntüle @ 8e6eb6fb
......@@ -28,8 +28,6 @@
#define DLG_MM_SELECTDBTABLEDDIALOG (RC_DBUI_BEGIN + 12)
#define DLG_MM_DBTABLEPREVIEWDIALOG (RC_DBUI_BEGIN + 13)
#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26)
......
sw/source/ui/app/app.src
Dosyayı görüntüle @ 8e6eb6fb
......@@ -722,9 +722,4 @@ String STR_CAPTION_OLE
Text [ en-US ] = "Other OLE Objects";
};
String STR_CATEGORY_NONE
{
Text [ en-US ] = "<None>" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/config/optload.cxx
Dosyayı görüntüle @ 8e6eb6fb
......@@ -420,7 +420,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
, m_sEnd(SW_RESSTR(STR_CAPTION_END))
, m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE))
, m_sBelow(SW_RESSTR(STR_CAPTION_BELOW))
, m_sNone(SW_RESSTR(STR_CATEGORY_NONE))
, m_sNone(SW_RESSTR(SW_STR_NONE))
, pMgr(new SwFldMgr())
, bHTMLMode(false)
{
......
sw/source/ui/dbui/mmaddressblockpage.hrc
Dosyayı görüntüle @ 8e6eb6fb
......@@ -19,31 +19,18 @@
#ifndef _MAILMERGEADDRESSBLOCKPAGE_HRC
#define _MAILMERGEADDRESSBLOCKPAGE_HRC
#define FI_PREVIEW 7
#define WIN_PREVIEW 8
#define STR_DOCUMENT 13
#define STR_CHANGEADDRESS 16
#define FL_SEPARATOR 29
#define PB_OK 30
#define PB_CANCEL 31
#define PB_HELP 32
#define FI_MATCHING 70
#define CT_FIELDS 71
#define ST_SALUTATIONPREVIEW 72
#define ST_SALUTATIONMATCHING 73
#define ST_SALUTATIONELEMENT 74
#define SCR_1 1
#define ST_ADDRESSELEMENT 2
#define ST_MATCHESTO 3
#define ST_PREVIEW 4
#define FT_FIELDS 5
#define LB_FIELDS 6
#define FT_PREVIEW 7
#define WIN_DATA 9
#endif
......
sw/source/ui/dbui/mmaddressblockpage.hxx
Dosyayı görüntüle @ 8e6eb6fb
......@@ -252,17 +252,15 @@ public:
class SwAssignFieldsControl;
class SwAssignFieldsDialog : public SfxModalDialog
{
FixedInfo m_aMatchingFI;
SwAssignFieldsControl* m_pFieldsControl;
FixedText *m_pMatchingFI;
SwAssignFieldsControl *m_pFieldsControl;
FixedInfo m_aPreviewFI;
SwAddressPreview m_aPreviewWIN;
FixedText *m_pPreviewFI;
SwAddressPreview *m_pPreviewWIN;
FixedLine m_aSeparatorFL;
OKButton m_aOK;
CancelButton m_aCancel;
HelpButton m_aHelp;
OKButton *m_pOK;
CancelButton *m_pCancel;
OUString m_sNone;
OUString m_rPreviewString;
......
sw/source/ui/dbui/mmaddressblockpage.src
Dosyayı görüntüle @ 8e6eb6fb
......@@ -20,12 +20,6 @@
#include <dbui.hrc>
#include <helpid.h>
#define _ST_NONE_LIST \
StringList [en-US]= \
{ \
< "< none >" ; > ; \
};
#define WORKAROUND\
Text [ en-US ] = "New Address Block";
......@@ -90,117 +84,34 @@ StringArray RA_PUNCTUATION
};
};
ModalDialog DLG_MM_ASSIGNFIELDS
String ST_SALUTATIONMATCHING
{
OutputSize = TRUE ;
SVLook = TRUE ;
HelpID = HID_MM_ASSIGNFIELDS;
Size = MAP_APPFONT ( 260 , 245 ) ;
Moveable = TRUE ;
Text[ en-US ] = "Assign the fields from your data source to match the salutation elements." ;
};
Text [ en-US ] = "Match Fields";
String ST_SALUTATIONPREVIEW
{
Text[ en-US ] = "Salutation preview";
};
FixedText FI_MATCHING
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 240 , 20 ) ;
WordBreak = TRUE;
Text[ en-US ] = "Assign the fields from your data source to match the address elements." ;
};
String ST_SALUTATIONMATCHING
{
Text[ en-US ] = "Assign the fields from your data source to match the salutation elements." ;
};
Control CT_FIELDS
{
Pos = MAP_APPFONT ( 6 , 26 ) ;
Size = MAP_APPFONT ( 248 , 120 ) ;
Border = TRUE;
DialogControl = TRUE;
ScrollBar SCR_1
{
Pos = MAP_APPFONT ( 238 , 10 ) ;
Size = MAP_APPFONT ( 10 , 110 ) ;
};
FixedText FT_FIELDS
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
};
Window WIN_DATA
{
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 248 , 120 ) ;
DialogControl = TRUE;
};
ListBox LB_FIELDS
{
HelpID = "sw:ListBox:DLG_MM_ASSIGNFIELDS:LB_FIELDS";
Pos = MAP_APPFONT ( 83 , 4 ) ;
Size = MAP_APPFONT ( 74 , 50 ) ;
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
_ST_NONE_LIST
};
FixedText FT_PREVIEW
{
Pos = MAP_APPFONT ( 165 , 6 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
};
};
FixedText FI_PREVIEW
{
Pos = MAP_APPFONT ( 6 , 152 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text[ en-US ] = "Address block preview";
};
String ST_SALUTATIONPREVIEW
{
Text[ en-US ] = "Salutation preview";
};
Window WIN_PREVIEW
{
Pos = MAP_APPFONT ( 6 , 163 ) ;
Size = MAP_APPFONT ( 248 , 45 ) ;
Border = TRUE;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( 0 , 214 ) ;
Size = MAP_APPFONT ( 260 , 8 ) ;
};
OKButton PB_OK
{
Pos = MAP_APPFONT ( 95 , 225 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
CancelButton PB_CANCEL
{
Pos = MAP_APPFONT ( 148 , 225 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
HelpButton PB_HELP
{
Pos = MAP_APPFONT ( 204 , 225 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
String ST_ADDRESSELEMENT
{
Text[ en-US ] = "Address elements" ;
};
String ST_SALUTATIONELEMENT
{
Text[ en-US ] = "Salutation elements" ;
};
String ST_MATCHESTO
{
Text[ en-US ] = "Matches to field:" ;
};
String ST_PREVIEW
{
Text[ en-US ] = "Preview" ;
};
String ST_ADDRESSELEMENT
{
Text[ en-US ] = "Address elements" ;
};
String ST_SALUTATIONELEMENT
{
Text[ en-US ] = "Salutation elements" ;
};
String ST_MATCHESTO
{
Text[ en-US ] = "Matches to field:" ;
};
String ST_PREVIEW
{
Text[ en-US ] = "Preview" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/inc/app.hrc
Dosyayı görüntüle @ 8e6eb6fb
......@@ -103,9 +103,8 @@
#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134)
#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135)
#define STR_CAPTION_OLE (RC_APP_BEGIN + 136)
#define STR_CATEGORY_NONE (RC_APP_BEGIN + 137)
#define APP_ACT_END STR_CATEGORY_NONE
#define APP_ACT_END STR_CAPTION_OLE
#if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line
......
sw/uiconfig/swriter/ui/assignfieldsdialog.ui 0 → 100644
Dosyayı görüntüle @ 8e6eb6fb
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="AssignFieldsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Match Fields</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 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="use_action_appearance">False</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">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</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="use_action_appearance">False</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">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="MATCHING_LABEL">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Assign the fields from your data source to match the address elements.</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">FIELDS:border</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="swuilo-SwAssignFieldsControl" id="FIELDS:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PREVIEW_LABEL">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Address block preview</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">PREVIEW:border</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="swlo-SwAddressPreview" id="PREVIEW:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment