Skip to content

C
core
Kaydet (Commit) 0df2b61e authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert DLG_MAILMERGECHILD floating window to .ui 

Change-Id: I0ab16d3f5d86004b63f9a1baa454b18b7948f86a
üst a261bac7
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 103 deletions
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 0df2b61e
......@@ -112,6 +112,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/fldfuncpage \
sw/uiconfig/swriter/ui/fldrefpage \
sw/uiconfig/swriter/ui/fldvarpage \
sw/uiconfig/swriter/ui/floatingmmchild \
sw/uiconfig/swriter/ui/floatingsync \
sw/uiconfig/swriter/ui/formatsectiondialog \
sw/uiconfig/swriter/ui/formattablepage \
......
sw/inc/dbui.hrc
Dosyayı görüntüle @ 0df2b61e
......@@ -22,7 +22,6 @@
#include "rcid.hrc"
#define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26)
// Strings ------------------------------------------------------------------
#define SA_ADDRESS_HEADER (RC_DBUI_BEGIN + 1)
......
sw/inc/helpid.h
Dosyayı görüntüle @ 0df2b61e
......@@ -363,8 +363,6 @@
#define HID_MODULE_TOOLBOX "SW_HID_MODULE_TOOLBOX"
#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG"
#define HID_MAILMERGECHILD "SW_HID_MAILMERGECHILD"
#define HID_RETURN_TO_MAILMERGE "SW_HID_RETURN_TO_MAILMERGE"
#define HID_NID_TBL "SW_HID_NID_TBL"
#define HID_NID_FRM "SW_HID_NID_FRM"
......
sw/source/ui/dbui/mmoutputtypepage.cxx
Dosyayı görüntüle @ 0df2b61e
......@@ -67,7 +67,6 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl)
#include <helpid.h>
#include <cmdid.h>
#include <../../uibase/dbui/mailmergechildwindow.hrc>
#include <swunohelper.hxx>
#include <mmoutputpage.hxx>
#include <maildispatcher.hxx>
......
sw/source/uibase/dbui/mailmergechildwindow.cxx
Dosyayı görüntüle @ 0df2b61e
......@@ -30,7 +30,6 @@
#include <svtools/svmedit.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/image.hxx>
#include <mailmergechildwindow.hrc>
#include <dbui.hrc>
#include <helpid.h>
......@@ -64,28 +63,14 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
pWindow->Show();
}
SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
SfxChildWindow* pChild,
Window *pParent) :
SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_MAILMERGECHILD)),
m_aBackTB(this, SW_RES( TB_BACK ))
{
m_aBackTB.SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
sal_uInt16 nIResId = ILIST_TBX;
ResId aResId( nIResId, *pSwResMgr );
ImageList aIList(aResId);
FreeResource();
m_aBackTB.SetItemImage( 1, aIList.GetImage(FN_SHOW_ROOT) );
m_aBackTB.SetButtonType( BUTTON_SYMBOLTEXT );
Size aSz = m_aBackTB.CalcWindowSizePixel(1);
m_aBackTB.SetPosSizePixel( Point(), aSz );
SetOutputSizePixel(aSz);
m_aBackTB.Show();
}
SwMailMergeChildWin::~SwMailMergeChildWin()
SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,
SfxChildWindow* pChild, Window *pParent)
: SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild",
"modules/swriter/ui/floatingmmchild.ui")
{
get(m_pBackTB, "back");
m_pBackTB->SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
m_pBackTB->SetButtonType( BUTTON_SYMBOLTEXT );
}
IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
......
sw/source/uibase/dbui/mailmergechildwindow.hrc deleted 100644 → 0
Dosyayı görüntüle @ a261bac7
/* -*- 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 TB_BACK 1
#define ILIST_TBX 90
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/dbui/mailmergechildwindow.src
Dosyayı görüntüle @ 0df2b61e
......@@ -16,60 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "mailmergechildwindow.hrc"
#include "dbui.hrc"
#include "helpid.h"
#include <cmdid.h>
#define WIDTH 100
#define HEIGHT 16
#define WORKAROUND \
Text [ en-US ] = "Return to Mail Merge Wizard" ; \
FloatingWindow DLG_MAILMERGECHILD\
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( WIDTH , HEIGHT ) ;
Moveable = TRUE ;
Closeable = FALSE ;
Sizeable = FALSE ;
Zoomable = TRUE ;
HelpID = HID_MAILMERGECHILD ;
Hide = TRUE ;
Text [ en-US ] = "Mail Merge Wizard";\
ToolBox TB_BACK\
{
MenuStrings = TRUE ;
SVLook = TRUE ;
ItemList =
{
ToolBoxItem\
{
Identifier = 1;
HelpID = HID_RETURN_TO_MAILMERGE ;
Left = TRUE;
WORKAROUND
};
};
};
#define IMGLIST1_IDS\
IdList = \
{ \
FN_SHOW_ROOT; \
}; \
IdCount = 1
ImageList ILIST_TBX
{
Prefix = "sc";
MaskColor = IMAGE_MASK_COLOR;
IMGLIST1_IDS;
};
};
String ST_SEND
{
Text[ en-US ] = "Sending e-mails...";
......
sw/source/uibase/inc/mailmergechildwindow.hxx
Dosyayı görüntüle @ 0df2b61e
......@@ -25,15 +25,13 @@
class SwMailMergeChildWin : public SfxFloatingWindow
{
ToolBox m_aBackTB;
ToolBox* m_pBackTB;
DECL_LINK( BackHdl, void* );
public:
SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent);
virtual ~SwMailMergeChildWin();
virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
};
class SwMailMergeChildWindow : public SfxChildWindow
......
sw/uiconfig/swriter/ui/floatingmmchild.ui 0 → 100644
Dosyayı görüntüle @ 0df2b61e
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="FloatingMMChild">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Mail Merge Wizard</property>
<property name="resizable">False</property>
<property name="type_hint">utility</property>
<property name="deletable">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkToolbar" id="back">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="return">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label" translatable="yes">Return to Mail Merge Wizard</property>
<property name="use_underline">True</property>
<property name="icon_name">sw/imglst/sc20234.png</property>
</object>
<packing>
<property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</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