[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Szymon KÅ‚os
eszkadev at gmail.com
Wed Jul 23 01:39:08 PDT 2014
sw/UIConfig_swriter.mk | 1
sw/inc/dbui.hrc | 13 +
sw/source/ui/dbui/mmoutputpage.hxx | 31 +-
sw/source/ui/dbui/mmoutputtypepage.cxx | 133 ++++-------
sw/source/uibase/dbui/mailmergechildwindow.hrc | 24 --
sw/source/uibase/dbui/mailmergechildwindow.src | 183 ++++-----------
sw/uiconfig/swriter/ui/mmsendmails.ui | 289 +++++++++++++++++++++++++
7 files changed, 424 insertions(+), 250 deletions(-)
New commits:
commit fcf0b9f2381e69e0ed50b99cf9b682efbc4d3263
Author: Szymon KÅ‚os <eszkadev at gmail.com>
Date: Tue Jul 22 15:31:28 2014 +0200
DLG_MM_SENDMAILS conversion to .ui
Change-Id: I5611508e9024032e9213636be94410280618f9e5
Reviewed-on: https://gerrit.libreoffice.org/10459
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c0be4e1..2fa2e70 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -174,6 +174,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmpreparepage \
sw/uiconfig/swriter/ui/mmselectpage \
+ sw/uiconfig/swriter/ui/mmsendmails \
sw/uiconfig/swriter/ui/mmsalutationpage \
sw/uiconfig/swriter/ui/paradialog \
sw/uiconfig/swriter/ui/picturedialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index b9f9089..4e42d95 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -26,7 +26,6 @@
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
-#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26)
// Strings ------------------------------------------------------------------
@@ -72,6 +71,18 @@
#define ST_ADDRESSELEMENT (RC_DBUI_BEGIN + 41)
#define ST_MATCHESTO (RC_DBUI_BEGIN + 42)
#define ST_PREVIEW (RC_DBUI_BEGIN + 43)
+#define ST_CONTINUE (RC_DBUI_BEGIN + 44)
+#define ST_LESS (RC_DBUI_BEGIN + 45)
+#define ST_TASK (RC_DBUI_BEGIN + 46)
+#define ST_STATUS (RC_DBUI_BEGIN + 47)
+#define ST_SEND (RC_DBUI_BEGIN + 48)
+#define ST_SENDINGTO (RC_DBUI_BEGIN + 49)
+#define ST_COMPLETED (RC_DBUI_BEGIN + 50)
+#define ST_FAILED (RC_DBUI_BEGIN + 51)
+#define ST_TERMINATEQUERY (RC_DBUI_BEGIN + 52)
+
+// ImageList
+#define ILIST (RC_DBUI_BEGIN + 53)
// Elements -----------------------------------------------------------------
#define MM_PART_TITLE 0
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index a18445d..fef10e9 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -28,6 +28,7 @@
#include <vcl/prgsbar.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/basedlgs.hxx>
+#include <svtools/simptabl.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include "mailmergehelper.hxx"
@@ -141,23 +142,19 @@ struct SwSendMailDialog_Impl;
class SwMailMergeConfigItem;
class SwSendMailDialog : public ModelessDialog //SfxModalDialog
{
- FixedLine m_aStatusFL;
- FixedText m_aStatusFT;
-
- FixedLine m_aTransferStatusFL;
- FixedText m_aTransferStatusFT;
- FixedInfo m_PausedFI;
- ProgressBar m_aProgressBar;
- FixedText m_aErrorStatusFT;
-
- PushButton m_aDetailsPB;
- HeaderBar m_aStatusHB;
- SvTabListBox m_aStatusLB;
-
- FixedLine m_aSeparatorFL;
-
- PushButton m_aStopPB;
- PushButton m_aClosePB;
+ FixedText *m_pTransferStatus;
+ FixedText *m_pPaused;
+ ProgressBar *m_pProgressBar;
+ FixedText *m_pErrorStatus;
+
+ PushButton *m_pDetails;
+ SvSimpleTableContainer *m_pContainer;
+ HeaderBar *m_pStatusHB;
+ SvTabListBox *m_pStatusLB;
+ SvSimpleTable *m_pStatus;
+
+ PushButton *m_pStop;
+ PushButton *m_pClose;
OUString m_sMore;
OUString m_sLess;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index b23aa92..514d77c 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -227,27 +227,22 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rD
#define ITEMID_STATUS 2
SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) :
- ModelessDialog /*SfxModalDialog*/(pParent, SW_RES(DLG_MM_SENDMAILS)),
- m_aStatusFL( this, SW_RES( FL_STATUS )),
- m_aStatusFT( this, SW_RES( FT_STATUS1 )),
- m_aTransferStatusFL( this, SW_RES( FL_TRANSFERSTATUS )),
- m_aTransferStatusFT( this, SW_RES( FT_TRANSFERSTATUS )),
- m_PausedFI(this, SW_RES( FI_PAUSED )),
- m_aProgressBar( this, SW_RES( PB_PROGRESS )),
- m_aErrorStatusFT( this, SW_RES( FT_ERRORSTATUS )),
- m_aDetailsPB( this, SW_RES( PB_DETAILS )),
- m_aStatusHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
- m_aStatusLB( this, SW_RES( LB_STATUS )),
- m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
- m_aStopPB( this, SW_RES( PB_STOP )),
- m_aClosePB( this, SW_RES( PB_CLOSE )),
- m_sMore(m_aDetailsPB.GetText()),
+ ModelessDialog /*SfxModalDialog*/(pParent, "SendMailsDialog", "modules/swriter/ui/mmsendmails.ui"),
+ m_pTransferStatus(get<FixedText>("transferstatus")),
+ m_pPaused(get<FixedText>("paused")),
+ m_pProgressBar(get<ProgressBar>("progress")),
+ m_pErrorStatus(get<FixedText>("errorstatus")),
+ m_pDetails(get<PushButton>("details")),
+ m_pContainer(get<SvSimpleTableContainer>("container")),
+ m_pStop(get<PushButton>("stop")),
+ m_pClose(get<PushButton>("close")),
+ m_sMore(m_pDetails->GetText()),
m_sLess(SW_RES(ST_LESS)),
m_sContinue(SW_RES( ST_CONTINUE )),
- m_sStop(m_aStopPB.GetText()),
+ m_sStop(m_pStop->GetText()),
m_sSend(SW_RES(ST_SEND)),
- m_sTransferStatus(m_aTransferStatusFT.GetText()),
- m_sErrorStatus( m_aErrorStatusFT.GetText()),
+ m_sTransferStatus(m_pTransferStatus->GetText()),
+ m_sErrorStatus( m_pErrorStatus->GetText()),
m_sSendingTo( SW_RES(ST_SENDINGTO )),
m_sCompleted( SW_RES(ST_COMPLETED )),
m_sFailed( SW_RES(ST_FAILED )),
@@ -260,47 +255,38 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
m_nSendCount(0),
m_nErrorCount(0)
{
- m_nStatusHeight = m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y();
+ Size aSize = m_pContainer->LogicToPixel(Size(226, 80), MAP_APPFONT);
+ m_pContainer->set_width_request(aSize.Width());
+ m_pContainer->set_height_request(aSize.Height());
+ m_pStatus = new SvSimpleTable(*m_pContainer);
+ m_pStatusHB = &(m_pStatus->GetTheHeaderBar());
+
+ m_nStatusHeight = m_pContainer->get_height_request();
OUString sTask(SW_RES(ST_TASK));
OUString sStatus(SW_RES(ST_STATUS));
- m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB);
-
- FreeResource();
-
- m_aDetailsPB.SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
- m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
- m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
-
- Size aLBSize(m_aStatusLB.GetSizePixel());
- m_aStatusHB.SetSizePixel(aLBSize);
- Size aHeadSize(m_aStatusHB.CalcWindowSizePixel());
- aHeadSize.Width() = aLBSize.Width();
- m_aStatusHB.SetSizePixel(aHeadSize);
- Point aLBPos(m_aStatusLB.GetPosPixel());
- m_aStatusHB.SetPosPixel(aLBPos);
- aLBPos.Y() += aHeadSize.Height();
- aLBSize.Height() -= aHeadSize.Height();
- m_aStatusLB.SetPosSizePixel(aLBPos, aLBSize);
-
- Size aSz(m_aStatusHB.GetOutputSizePixel());
- long nPos1 = aSz.Width()/3 * 2;
- long nPos2 = aSz.Width()/3;
- m_aStatusHB.InsertItem( ITEMID_TASK, sTask,
+ m_pStatus->SetHelpId(HID_MM_SENDMAILS_STATUSLB);
+
+ m_pDetails->SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
+ m_pStop->SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
+ m_pClose->SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
+
+ long nPos1 = aSize.Width()/3 * 2;
+ long nPos2 = aSize.Width()/3;
+ m_pStatusHB->InsertItem( ITEMID_TASK, sTask,
nPos1,
HIB_LEFT | HIB_VCENTER );
- m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus,
+ m_pStatusHB->InsertItem( ITEMID_STATUS, sStatus,
nPos2,
HIB_LEFT | HIB_VCENTER );
- m_aStatusHB.Show();
- m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB);
- static long nTabs[] = {3, 0, nPos1, aSz.Width() };
- m_aStatusLB.SetStyle( m_aStatusLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
- m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
- m_aStatusLB.SetTabs(&nTabs[0], MAP_PIXEL);
- m_aStatusLB.SetSpaceBetweenEntries(3);
+ m_pStatus->SetHelpId(HID_MM_MAILSTATUS_TLB);
+ static long nTabs[] = {2, 0, nPos1};
+ m_pStatus->SetStyle( m_pStatus->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+ m_pStatus->SetSelectionMode( SINGLE_SELECTION );
+ m_pStatus->SetTabs(&nTabs[0], MAP_PIXEL);
+ m_pStatus->SetSpaceBetweenEntries(3);
- DetailsHdl_Impl( &m_aDetailsPB );
+ DetailsHdl_Impl( m_pDetails );
UpdateTransferStatus();
}
@@ -329,6 +315,7 @@ SwSendMailDialog::~SwSendMailDialog()
{
}
}
+ delete m_pStatus;
delete m_pImpl;
}
@@ -350,33 +337,21 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments )
UpdateTransferStatus();
}
-static void lcl_Move(Control& rCtrl, long nYOffset)
-{
- Point aPos(rCtrl.GetPosPixel());
- aPos.Y() += nYOffset;
- rCtrl.SetPosPixel(aPos);
-}
-
IMPL_LINK_NOARG(SwSendMailDialog, DetailsHdl_Impl)
{
long nMove = 0;
- if(m_aStatusLB.IsVisible())
+ if(m_pContainer->IsVisible())
{
- m_aStatusLB.Hide();
- m_aStatusHB.Hide();
+ m_pContainer->Hide();
nMove = - m_nStatusHeight;
- m_aDetailsPB.SetText(m_sMore);
+ m_pDetails->SetText(m_sMore);
}
else
{
- m_aStatusLB.Show();
- m_aStatusHB.Show();
+ m_pContainer->Show();
nMove = m_nStatusHeight;
- m_aDetailsPB.SetText(m_sLess);
+ m_pDetails->SetText(m_sLess);
}
- lcl_Move(m_aSeparatorFL, nMove);
- lcl_Move(m_aStopPB, nMove);
- lcl_Move(m_aClosePB, nMove);
Size aDlgSize = GetSizePixel(); aDlgSize.Height() += nMove; SetSizePixel(aDlgSize);
return 0;
@@ -391,13 +366,13 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
{
m_pImpl->xMailDispatcher->stop();
pButton->SetText(m_sContinue);
- m_PausedFI.Show();
+ m_pPaused->Show();
}
else
{
m_pImpl->xMailDispatcher->start();
pButton->SetText(m_sStop);
- m_PausedFI.Show(false);
+ m_pPaused->Show(false);
}
}
return 0;
@@ -444,8 +419,8 @@ IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*,
pDialog->m_pImpl->xMailDispatcher->isStarted())
{
pDialog->m_pImpl->xMailDispatcher->stop();
- pDialog->m_aStopPB.SetText(pDialog->m_sContinue);
- pDialog->m_PausedFI.Show();
+ pDialog->m_pStop->SetText(pDialog->m_sContinue);
+ pDialog->m_pPaused->Show();
}
return 0;
}
@@ -493,7 +468,7 @@ void SwSendMailDialog::IterateMails()
OUString sTmp(pCurrentMailDescriptor->sEMail);
sTmp += "\t";
sTmp += m_sFailed;
- m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
+ m_pStatus->InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
++m_nSendCount;
++m_nErrorCount;
UpdateTransferStatus( );
@@ -591,7 +566,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag
OUString sTmp(xMessage->getRecipients()[0]);
sTmp += "\t";
sTmp += bResult ? m_sCompleted : m_sFailed;
- m_aStatusLB.InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
+ m_pStatus->InsertEntry( sMessage.replaceFirst("%1", sTmp), aInsertImg, aInsertImg);
++m_nSendCount;
if(!bResult)
++m_nErrorCount;
@@ -610,20 +585,20 @@ void SwSendMailDialog::UpdateTransferStatus()
OUString sStatus( m_sTransferStatus );
sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
sStatus = sStatus.replaceFirst("%2", OUString::number(m_pImpl->aDescriptors.size()));
- m_aTransferStatusFT.SetText(sStatus);
+ m_pTransferStatus->SetText(sStatus);
sStatus = m_sErrorStatus.replaceFirst("%1", OUString::number(m_nErrorCount) );
- m_aErrorStatusFT.SetText(sStatus);
+ m_pErrorStatus->SetText(sStatus);
if(m_pImpl->aDescriptors.size())
- m_aProgressBar.SetValue((sal_uInt16)(m_nSendCount * 100 / m_pImpl->aDescriptors.size()));
+ m_pProgressBar->SetValue((sal_uInt16)(m_nSendCount * 100 / m_pImpl->aDescriptors.size()));
else
- m_aProgressBar.SetValue(0);
+ m_pProgressBar->SetValue(0);
}
void SwSendMailDialog::AllMailsSent()
{
- m_aStopPB.Enable(false);
+ m_pStop->Enable(false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.hrc b/sw/source/uibase/dbui/mailmergechildwindow.hrc
index 1ba778b..84fe175 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.hrc
+++ b/sw/source/uibase/dbui/mailmergechildwindow.hrc
@@ -20,28 +20,4 @@
#define TB_BACK 1
#define ILIST_TBX 90
-#define FL_SEPARATOR 7
-
-#define FL_STATUS 60
-#define FT_STATUS1 61
-#define FL_TRANSFERSTATUS 62
-#define FT_TRANSFERSTATUS 63
-#define PB_PROGRESS 64
-#define FT_ERRORSTATUS 65
-#define PB_DETAILS 66
-#define LB_STATUS 67
-#define FI_PAUSED 68
-#define PB_STOP 69
-#define PB_CLOSE 70
-#define ST_CONTINUE 71
-#define ST_LESS 72
-#define ST_TASK 73
-#define ST_STATUS 74
-#define ILIST 75
-#define ST_SEND 77
-#define ST_SENDINGTO 78
-#define ST_COMPLETED 79
-#define ST_FAILED 80
-#define ST_TERMINATEQUERY 81
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index 780c0d3..6facac8 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -69,140 +69,65 @@ FloatingWindow DLG_MAILMERGECHILD\
};
};
-ModelessDialog DLG_MM_SENDMAILS
+
+String ST_SEND
{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- HelpID = HID_MM_SENDMAILS;
- Size = MAP_APPFONT ( 250 , 221 ) ;
- Moveable = TRUE ;
- Closeable = TRUE;
+ Text[ en-US ] = "Sending e-mails...";
+};
- Text [ en-US ] = "Sending E-mail messages";
+String ST_LESS
+{
+ Text[ en-US ] = "<< Less";
+};
- FixedLine FL_STATUS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 238 , 8 ) ;
- Text[ en-US ] = "Connection status";
- };
- FixedText FT_STATUS1
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 226 , 8 ) ;
- Text[ en-US ] = "The connection to the outgoing mail server has been established";
- };
- String ST_SEND
- {
- Text[ en-US ] = "Sending e-mails...";
- };
- FixedLine FL_TRANSFERSTATUS
- {
- Pos = MAP_APPFONT ( 6 , 28 ) ;
- Size = MAP_APPFONT ( 238 , 8 ) ;
- Text[ en-US ] = "Transfer status";
- };
- FixedText FT_TRANSFERSTATUS
- {
- Pos = MAP_APPFONT ( 12, 39 ) ;
- Size = MAP_APPFONT ( 110 , 8 ) ;
- Text[ en-US ] = "%1 of %2 e-mails sent";
- };
- FixedText FI_PAUSED
- {
- Pos = MAP_APPFONT ( 125, 39 ) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
- Hide = TRUE;
- Text[ en-US ] = "Sending paused";
- };
- Window PB_PROGRESS
- {
- Pos = MAP_APPFONT ( 12 , 50 ) ;
- Size = MAP_APPFONT ( 226 , 14 ) ;
- Border = TRUE;
- };
- FixedText FT_ERRORSTATUS
- {
- Pos = MAP_APPFONT ( 12 , 67 ) ;
- Size = MAP_APPFONT ( 226 , 8 ) ;
- Text[ en-US ] = "E-mails not sent: %1";
- };
- PushButton PB_DETAILS
- {
- Pos = MAP_APPFONT ( 188 , 81 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text[ en-US ] = "More >>";
- };
- String ST_LESS
- {
- Text[ en-US ] = "<< Less";
- };
+String ST_CONTINUE
+{
+ Text[ en-US ] = "~Continue";
+};
- Control LB_STATUS
- {
- Pos = MAP_APPFONT ( 12 , 101 ) ;
- Size = MAP_APPFONT ( 226 , 80 ) ;
- Border = TRUE;
- };
- FixedLine FL_SEPARATOR
- {
- Pos = MAP_APPFONT ( 0 , 187 ) ;
- Size = MAP_APPFONT ( 250 , 8 ) ;
- };
- PushButton PB_STOP
- {
- Pos = MAP_APPFONT ( 141 , 201 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text[ en-US ] = "~Stop";
- };
- PushButton PB_CLOSE
- {
- Pos = MAP_APPFONT ( 194 , 201 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text[ en-US ] = "C~lose";
- };
- String ST_CONTINUE
- {
- Text[ en-US ] = "~Continue";
- };
- #define IMGLIST2_IDS\
- IdList = \
- { \
- FN_FORMULA_CANCEL ;\
- FN_FORMULA_APPLY ;\
- }; \
- IdCount = 2
+#define IMGLIST2_IDS\
+ IdList = \
+ { \
+ FN_FORMULA_CANCEL ;\
+ FN_FORMULA_APPLY ;\
+ }; \
+ IdCount = 2
- ImageList ILIST
- {
- Prefix = "sc";
- MaskColor = IMAGE_MASK_COLOR;
- IMGLIST2_IDS;
- };
- String ST_TASK
- {
- Text[ en-US ] = "Task";
- };
- String ST_STATUS
- {
- Text[ en-US ] = "Status";
- };
- String ST_SENDINGTO
- {
- Text[ en-US ] = "Sending to: %1";
- };
- String ST_COMPLETED
- {
- Text[ en-US ] = "Successfully sent";
- };
- String ST_FAILED
- {
- Text[ en-US ] = "Sending failed";
- };
- String ST_TERMINATEQUERY
- {
- Text[ en-US ] = "There are still e-mail messages in your %PRODUCTNAME Outbox.\nWould you like to exit anyway?";
- };
+ImageList ILIST
+{
+ Prefix = "sc";
+ MaskColor = IMAGE_MASK_COLOR;
+ IMGLIST2_IDS;
+};
+
+String ST_TASK
+{
+ Text[ en-US ] = "Task";
+};
+
+String ST_STATUS
+{
+ Text[ en-US ] = "Status";
+};
+
+String ST_SENDINGTO
+{
+ Text[ en-US ] = "Sending to: %1";
+};
+
+String ST_COMPLETED
+{
+ Text[ en-US ] = "Successfully sent";
+};
+
+String ST_FAILED
+{
+ Text[ en-US ] = "Sending failed";
+};
+
+String ST_TERMINATEQUERY
+{
+ Text[ en-US ] = "There are still e-mail messages in your %PRODUCTNAME Outbox.\nWould you like to exit anyway?";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui
new file mode 100644
index 0000000..4debcfa
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/mmsendmails.ui
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="SendMailsDialog">
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Sending E-mail messages</property>
+ <property name="type_hint">dock</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</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="stop">
+ <property name="label" translatable="yes">_Stop</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_underline">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="close">
+ <property name="label">gtk-close</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>
+ </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="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">The connection to the outgoing mail server has been established</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Connection status</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <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>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="transferstatus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">%1 of %2 e-mails sent</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="paused">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Sending paused</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>
+ <object class="GtkProgressBar" id="progress">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="errorstatus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">E-mails not sent: %1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="details">
+ <property name="label" translatable="yes">More >></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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-SvSimpleTableContainer" id="container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Simple Table Container-selection1"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Transfer status</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</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">stop</action-widget>
+ <action-widget response="0">close</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list