diff options
author | sk94 <eszkadev@gmail.com> | 2014-05-24 13:25:03 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-27 05:44:23 -0500 |
commit | 5249cf49edda23f3e051444959ac32d7069850a7 (patch) | |
tree | fccf477aef0a9155ecdd5dd7411e30246bd93d1d | |
parent | resolved rhbz#1101224 do not attempt to obtain names for NULL tabs (diff) | |
download | core-5249cf49edda23f3e051444959ac32d7069850a7.tar.gz core-5249cf49edda23f3e051444959ac32d7069850a7.zip |
RID_DLG_UPDATEINSTALL conversion to .ui
Change-Id: I02ead5dc934d0f9ae9e958cbe6592250f1aaf1a4
Reviewed-on: https://gerrit.libreoffice.org/9464
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | desktop/UIConfig_deployment.mk | 1 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui.hrc | 29 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx | 10 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 65 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 16 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.src | 178 | ||||
-rw-r--r-- | desktop/uiconfig/ui/updateinstalldialog.ui | 175 | ||||
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 |
9 files changed, 257 insertions, 222 deletions
diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk index fc1c48a942ae..208876cbd00d 100644 --- a/desktop/UIConfig_deployment.mk +++ b/desktop/UIConfig_deployment.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,desktop,\ desktop/uiconfig/ui/licensedialog \ desktop/uiconfig/ui/showlicensedialog \ desktop/uiconfig/ui/updatedialog \ + desktop/uiconfig/ui/updateinstalldialog \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index b6a8ca55ddb4..71b25df43df9 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -33,26 +33,6 @@ #define RID_EM_FT_PROGRESS 14 #define RID_EM_FT_MSG 15 -// local RIDs for "Download and Install" dialog - -#define RID_DLG_UPDATE_INSTALL_ABORT 2 -#define RID_DLG_UPDATE_INSTALL_OK 3 -#define RID_DLG_UPDATE_INSTALL_DOWNLOADING 4 -#define RID_DLG_UPDATE_INSTALL_INSTALLING 5 -#define RID_DLG_UPDATE_INSTALL_FINISHED 6 -#define RID_DLG_UPDATE_INSTALL_LINE 7 -#define RID_DLG_UPDATE_INSTALL_HELP 8 -#define RID_DLG_UPDATE_INSTALL_STATUSBAR 9 -#define RID_DLG_UPDATE_INSTALL_EXTENSION_NAME 10 -#define RID_DLG_UPDATE_INSTALL_RESULTS 11 -#define RID_DLG_UPDATE_INSTALL_INFO 12 -#define RID_DLG_UPDATE_INSTALL_NO_ERRORS 13 -#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED 14 -#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD 15 -#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION 16 -#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED 17 -#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL 18 - #define RID_DLG_DEPENDENCIES (RID_DEPLOYMENT_GUI_START + 1) #define RID_DLG_DEPENDENCIES_TEXT 1 #define RID_DLG_DEPENDENCIES_LIST 2 @@ -84,7 +64,14 @@ #define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) #define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) -#define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 37) +#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37) +#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38) +#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39) +#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40) +#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41) +#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42) +#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43) +#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44) #define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) #define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index d3a76d9513a1..2292472bf109 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx @@ -21,6 +21,7 @@ #include "svl/lstner.hxx" #include "vcl/xtextedt.hxx" #include "vcl/scrbar.hxx" +#include "vcl/builder.hxx" #include "dp_gui_autoscrolledit.hxx" @@ -28,8 +29,8 @@ namespace dp_gui { -AutoScrollEdit::AutoScrollEdit( Window* pParent, const ResId& rResId ) - : ExtMultiLineEdit( pParent, rResId ) +AutoScrollEdit::AutoScrollEdit( Window* pParent, WinBits nWinStyle ) + : ExtMultiLineEdit( pParent, nWinStyle ) { ScrollBar* pScroll = GetVScrollBar(); if (pScroll) @@ -59,4 +60,9 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint ) } // namespace dp_gui +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoScrollEdit(Window *pParent, VclBuilder::stringmap &) +{ + return new dp_gui::AutoScrollEdit(pParent, WB_BORDER); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index f39148f72288..8707bfaf932b 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -31,7 +31,7 @@ namespace dp_gui { class AutoScrollEdit : public ExtMultiLineEdit, public SfxListener { public: - AutoScrollEdit( Window* pParent, const ResId& rResId ); + AutoScrollEdit( Window* pParent, WinBits nWinStyle); virtual ~AutoScrollEdit(); using ExtMultiLineEdit::Notify; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 95b4de14c611..bf4b40ad2339 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -205,7 +205,7 @@ UpdateInstallDialog::UpdateInstallDialog( cssu::Reference< cssu::XComponentContext > const & xCtx): ModalDialog( parent, - DpGuiResId(RID_DLG_UPDATEINSTALL)), + "UpdateInstallDialog","desktop/ui/updateinstalldialog.ui"), m_thread(new Thread(xCtx, *this, aVecUpdateData)), m_xComponentContext(xCtx), @@ -219,25 +219,22 @@ UpdateInstallDialog::UpdateInstallDialog( m_sErrorInstallation(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)), m_sErrorLicenseDeclined(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)), m_sNoInstall(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)), - m_sThisErrorOccurred(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)), - m_ft_action(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_DOWNLOADING)), - m_statusbar(this,DpGuiResId(RID_DLG_UPDATE_INSTALL_STATUSBAR)), - m_ft_extension_name(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NAME)), - m_ft_results(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_RESULTS)), - m_mle_info(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_INFO)), - m_line(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_LINE)), - m_help(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_HELP)), - m_ok(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_OK)), - m_cancel(this, DpGuiResId(RID_DLG_UPDATE_INSTALL_ABORT)) + m_sThisErrorOccurred(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)) { - FreeResource(); + get(m_pFt_action, "DOWNLOADING"); + get(m_pStatusbar, "STATUSBAR"); + get(m_pFt_extension_name, "EXTENSION_NAME"); + get(m_pMle_info, "INFO"); + get(m_pHelp, "HELP"); + get(m_pOk, "OK"); + get(m_pCancel, "CANCEL"); m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx ); - m_cancel.SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler)); - m_mle_info.EnableCursor(false); + m_pCancel->SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler)); + m_pMle_info->EnableCursor(false); if ( ! dp_misc::office_is_running()) - m_help.Disable(); + m_pHelp->Disable(); } UpdateInstallDialog::~UpdateInstallDialog() {} @@ -258,10 +255,10 @@ short UpdateInstallDialog::Execute() void UpdateInstallDialog::updateDone() { if (!m_bError) - m_mle_info.InsertText(m_sNoErrors); - m_ok.Enable(); - m_ok.GrabFocus(); - m_cancel.Disable(); + m_pMle_info->InsertText(m_sNoErrors); + m_pOk->Enable(); + m_pOk->GrabFocus(); + m_pCancel->Disable(); } // make sure the solar mutex is locked before calling //sets an error message in the text area @@ -293,20 +290,20 @@ void UpdateInstallDialog::setError(INSTALL_ERROR err, OUString const & sExtensio if (m_bNoEntry) m_bNoEntry = false; else - m_mle_info.InsertText(OUString("\n")); - m_mle_info.InsertText(sError); + m_pMle_info->InsertText(OUString("\n")); + m_pMle_info->InsertText(sError); //Insert more information about the error if (!exceptionMessage.isEmpty()) - m_mle_info.InsertText(m_sThisErrorOccurred + exceptionMessage + "\n"); + m_pMle_info->InsertText(m_sThisErrorOccurred + exceptionMessage + "\n"); - m_mle_info.InsertText(m_sNoInstall); - m_mle_info.InsertText(OUString("\n")); + m_pMle_info->InsertText(m_sNoInstall); + m_pMle_info->InsertText(OUString("\n")); } void UpdateInstallDialog::setError(OUString const & exceptionMessage) { m_bError = true; - m_mle_info.InsertText(exceptionMessage + "\n"); + m_pMle_info->InsertText(exceptionMessage + "\n"); } IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler) @@ -363,10 +360,10 @@ void UpdateInstallDialog::Thread::downloadExtensions() if (m_stop) { return; } - m_dialog.m_ft_extension_name.SetText(curData.aInstalledPackage->getDisplayName()); + m_dialog.m_pFt_extension_name->SetText(curData.aInstalledPackage->getDisplayName()); sal_uInt16 prog = (sal::static_int_cast<sal_uInt16>(100) * ++count) / sal::static_int_cast<sal_uInt16>(m_aVecUpdateData.size()); - m_dialog.m_statusbar.SetValue(prog); + m_dialog.m_pStatusbar->SetValue(prog); } dp_misc::DescriptionInfoset info(m_xComponentContext, curData.aUpdateInfo); //remember occurring exceptions in case we need to print out error information @@ -436,8 +433,8 @@ void UpdateInstallDialog::Thread::installExtensions() if (m_stop) { return; } - m_dialog.m_ft_action.SetText(m_dialog.m_sInstalling); - m_dialog.m_statusbar.SetValue(0); + m_dialog.m_pFt_action->SetText(m_dialog.m_sInstalling); + m_dialog.m_pStatusbar->SetValue(0); } sal_uInt16 count = 0; @@ -452,11 +449,11 @@ void UpdateInstallDialog::Thread::installExtensions() } //we only show progress after an extension has been installed. if (count > 0) { - m_dialog.m_statusbar.SetValue( + m_dialog.m_pStatusbar->SetValue( (sal::static_int_cast<sal_uInt16>(100) * count) / sal::static_int_cast<sal_uInt16>(m_aVecUpdateData.size())); } - m_dialog.m_ft_extension_name.SetText(i->aInstalledPackage->getDisplayName()); + m_dialog.m_pFt_extension_name->SetText(i->aInstalledPackage->getDisplayName()); } bool bError = false; bool bLicenseDeclined = false; @@ -546,9 +543,9 @@ void UpdateInstallDialog::Thread::installExtensions() if (m_stop) { return; } - m_dialog.m_statusbar.SetValue(100); - m_dialog.m_ft_extension_name.SetText(OUString()); - m_dialog.m_ft_action.SetText(m_dialog.m_sFinished); + m_dialog.m_pStatusbar->SetValue(100); + m_dialog.m_pFt_extension_name->SetText(OUString()); + m_dialog.m_pFt_action->SetText(m_dialog.m_sFinished); } } diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 87f4cdfcbe4b..d7b68e2bf78b 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -106,15 +106,13 @@ private: OUString m_sNoInstall; OUString m_sThisErrorOccurred; - FixedText m_ft_action; - ProgressBar m_statusbar; - FixedText m_ft_extension_name; - FixedText m_ft_results; - AutoScrollEdit m_mle_info; - FixedLine m_line; - HelpButton m_help; - OKButton m_ok; - CancelButton m_cancel; + FixedText *m_pFt_action; + ProgressBar *m_pStatusbar; + FixedText *m_pFt_extension_name; + AutoScrollEdit *m_pMle_info; + HelpButton *m_pHelp; + OKButton *m_pOk; + CancelButton *m_pCancel; }; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src index ccb5c5334833..19ffa0d86375 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src @@ -25,169 +25,37 @@ #define LOCAL_LIST_HEIGHT (7 * RSC_BS_CHARHEIGHT) #define LOCAL_BUTTON_WIDTH 80 -ModalDialog RID_DLG_UPDATEINSTALL { - HelpId = HID_DEPLOYMENT_GUI_UPDATEINSTALL; - Size = MAP_APPFONT( - (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH + - RSC_SP_DLG_INNERBORDER_RIGHT), - (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_FLGR_SPACE_Y + LOCAL_LIST_HEIGHT + - RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + - RSC_SP_FLGR_SPACE_Y + RSC_CD_PUSHBUTTON_HEIGHT + - RSC_SP_DLG_INNERBORDER_BOTTOM)); - Text[en-US] = "Download and Installation"; - Moveable = TRUE; - Closeable = TRUE; - FixedText RID_DLG_UPDATE_INSTALL_DOWNLOADING { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP); - Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT); - Text[en-US] = "Downloading extensions..."; - NoLabel = TRUE; - }; - Window RID_DLG_UPDATE_INSTALL_STATUSBAR { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y)); - - Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT); - Border = TRUE; - }; - - FixedText RID_DLG_UPDATE_INSTALL_EXTENSION_NAME { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y); - Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT); - Text[en-US] = ""; - NoLabel = TRUE; - }; - - FixedText RID_DLG_UPDATE_INSTALL_RESULTS { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y); - Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT); - Text[en-US] = "Result"; - }; - - MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO { - HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO"; - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y); - - Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT); - Border = TRUE; - ReadOnly = TRUE; - VScroll = TRUE; - TabStop = FALSE; - }; - - FixedLine RID_DLG_UPDATE_INSTALL_LINE { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + - RSC_SP_FLGR_SPACE_Y); - - Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT); - }; - - OKButton RID_DLG_UPDATE_INSTALL_OK { - Disable = TRUE; - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH - - RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + - RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + - RSC_SP_FLGR_SPACE_Y); - - Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); - Text[en-US] = "OK"; - }; - - CancelButton RID_DLG_UPDATE_INSTALL_ABORT { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + - RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + - RSC_SP_FLGR_SPACE_Y); - - Size = MAP_APPFONT(LOCAL_BUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); - Text[en-US] = "Cancel Update"; - DefButton = TRUE; - }; - - HelpButton RID_DLG_UPDATE_INSTALL_HELP { - Pos = MAP_APPFONT( - RSC_SP_DLG_INNERBORDER_LEFT, - RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + - RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + - RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + - RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + - RSC_SP_FLGR_SPACE_Y); - Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); - }; - - String RID_DLG_UPDATE_INSTALL_INSTALLING { - Text[en-US] = "Installing extensions..."; - }; - - String RID_DLG_UPDATE_INSTALL_FINISHED { - Text[en-US] = "Installation finished"; - }; +String RID_DLG_UPDATE_INSTALL_INSTALLING { + Text[en-US] = "Installing extensions..."; +}; - String RID_DLG_UPDATE_INSTALL_NO_ERRORS { - Text[en-US] = "No errors."; - }; +String RID_DLG_UPDATE_INSTALL_FINISHED { + Text[en-US] = "Installation finished"; +}; - String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD { - Text[en-US] = "Error while downloading extension %NAME. "; - }; +String RID_DLG_UPDATE_INSTALL_NO_ERRORS { + Text[en-US] = "No errors."; +}; - String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED { - Text[en-US] = "The error message is: "; - }; +String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD { + Text[en-US] = "Error while downloading extension %NAME. "; +}; - String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { - Text[en-US] = "Error while installing extension %NAME. "; - }; +String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED { + Text[en-US] = "The error message is: "; +}; - String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED { - Text[en-US] = "The license agreement for extension %NAME was refused. "; - }; +String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { + Text[en-US] = "Error while installing extension %NAME. "; +}; - String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{ - Text[en-US] = "The extension will not be installed."; - }; +String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED { + Text[en-US] = "The license agreement for extension %NAME was refused. "; +}; +String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{ + Text[en-US] = "The extension will not be installed."; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui new file mode 100644 index 000000000000..079f0d85d195 --- /dev/null +++ b/desktop/uiconfig/ui/updateinstalldialog.ui @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires LibreOffice 1.0 --> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="UpdateInstallDialog"> + <property name="width_request">500</property> + <property name="height_request">250</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Download and Installation</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="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_action_appearance">False</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="OK"> + <property name="label">gtk-ok</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</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="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_action_appearance">False</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="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="DOWNLOADING"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Downloading extensions...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="STATUSBAR"> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="EXTENSION_NAME"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="RESULTS"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Result</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="deploymentgui-AutoScrollEdit" id="INFO"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="cursor_visible">False</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</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">HELP</action-widget> + <action-widget response="0">OK</action-widget> + <action-widget response="0">CANCEL</action-widget> + </action-widgets> + </object> +</interface> diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index fb120faa1064..01f9ba305db4 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -323,6 +323,9 @@ <glade-widget-class title="Cui Custom MultiLine Edit" name="cuilo-CuiCustomMultilineEdit" generic-name="CuiCustomMultiLineEdit" parent="GtkTextView" icon-name="widget-gtk-textview"/> + <glade-widget-class title="AutoScrollEdit" name="deploymentgui-AutoScrollEdit" + generic-name="AutoScrollEdit" parent="GtkTextView" + icon-name="widget-gtk-textview"/> <glade-widget-class title="LicenseView" name="deploymentgui-LicenseView" generic-name="LicenseView" parent="GtkTextView" icon-name="widget-gtk-textview"/> |