diff options
| -rw-r--r-- | chart2/AllLangResTarget_chartcontroller.mk | 2 | ||||
| -rw-r--r-- | chart2/UIConfig_chart2.mk | 1 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/ResourceIds.hrc | 1 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_InsertTitle.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_InsertTitle.hrc | 25 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_InsertTitle.src | 35 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/res_Titles.cxx | 231 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/res_Titles.hxx | 30 | ||||
| -rw-r--r-- | chart2/source/controller/inc/dlg_InsertTitle.hxx | 4 | ||||
| -rw-r--r-- | chart2/uiconfig/ui/inserttitledlg.ui | 391 | ||||
| -rw-r--r-- | l10ntools/source/localize.cxx | 2 |
11 files changed, 497 insertions, 233 deletions
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index be89120e49c6..7376f1df8414 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -35,7 +35,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_InsertDataLabel.src \ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \ chart2/source/controller/dialogs/dlg_InsertLegend.src \ - chart2/source/controller/dialogs/dlg_InsertTitle.src \ chart2/source/controller/dialogs/dlg_ShapeFont.src \ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \ chart2/source/controller/dialogs/dlg_View3D.src \ @@ -68,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_templates,chart2/res,\ chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc \ chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc \ chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc \ - chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc \ )) # vim: set noet sw=4 ts=4: diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 1481b20bd2b2..e3d08d49db01 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/attributedialog \ chart2/uiconfig/ui/insertaxisdlg \ chart2/uiconfig/ui/insertgriddlg \ + chart2/uiconfig/ui/inserttitledlg \ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ chart2/uiconfig/ui/titlerotationtabpage \ diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index ddd03f4ffc39..b1cd82770e12 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -30,7 +30,6 @@ #define DLG_DATA_SOURCE 901 #define DLG_DATA_DESCR 836 #define DLG_LEGEND 835 -#define DLG_TITLE 834 #define DLG_3D_VIEW 752 #define DLG_SPLINE_PROPERTIES 904 #define DLG_DATA_YERRORBAR 842 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index 7b484ea18478..d2ec1674a24d 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -18,7 +18,6 @@ */ #include "dlg_InsertTitle.hxx" -#include "dlg_InsertTitle.hrc" #include "res_Titles.hxx" #include "ResId.hxx" #include "ObjectNameProvider.hxx" @@ -27,14 +26,9 @@ namespace chart { SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData& rInput ) - : ModalDialog(pWindow, SchResId(DLG_TITLE)) + : ModalDialog( pWindow, "InsertTitleDialog", "modules/schart/ui/inserttitledlg.ui" ) , m_apTitleResources( new TitleResources(this,true) ) - , aBtnOK(this, SchResId(BTN_OK)) - , aBtnCancel(this, SchResId(BTN_CANCEL)) - , aBtnHelp(this, SchResId(BTN_HELP)) { - FreeResource(); - this->SetText( ObjectNameProvider::getName(OBJECTTYPE_TITLE,true) ); m_apTitleResources->writeToResources( rInput ); } diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc deleted file mode 100644 index 26a4e69bce52..000000000000 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- 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 . - */ -#include "ResourceIds.hrc" - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src deleted file mode 100644 index 13c6408b6f53..000000000000 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- 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 . - */ - -#include "dlg_InsertTitle.hrc" -#include "res_Titlesx.hrc" -#include "CommonResources.hrc" - -ModalDialog DLG_TITLE -{ - HelpID = HID_INSERT_TITLE ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 220 , 156 ) ; - Moveable = TRUE ; - BUTTONS_OK_CANCEL_HELP_STACKED(164) - TITLES(6,6,152,6,10) -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 8d819ebda944..98a7f7cc1e8e 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -18,90 +18,39 @@ */ #include "res_Titles.hxx" -#include "res_Titles.hrc" #include "ResId.hxx" #include "TitleDialogData.hxx" #include <svtools/controldims.hrc> +// for ModalDialog +#include <vcl/dialog.hxx> namespace chart { TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) - : m_aFT_Main(pWindow, SchResId(FT_MAINTITLE)) - , m_aEd_Main(pWindow, SchResId(ED_MAINTITLE)) - , m_aFT_Sub(pWindow, SchResId(FT_SUBTITLE)) - , m_aEd_Sub(pWindow, SchResId(ED_SUBTITLE)) - , m_aFL_Axes(pWindow, SchResId(FL_AXES)) - , m_aFT_XAxis(pWindow, SchResId(FT_TITLE_X_AXIS)) - , m_aEd_XAxis(pWindow, SchResId(ED_X_AXIS)) - , m_aFT_YAxis(pWindow, SchResId(FT_TITLE_Y_AXIS)) - , m_aEd_YAxis(pWindow, SchResId(ED_Y_AXIS)) - , m_aFT_ZAxis(pWindow, SchResId(FT_TITLE_Z_AXIS)) - , m_aEd_ZAxis(pWindow, SchResId(ED_Z_AXIS)) - , m_aFL_SecondaryAxes(pWindow, SchResId(FL_SECONDARY_AXES)) - , m_aFT_SecondaryXAxis(pWindow, SchResId(FT_TITLE_SECONDARY_X_AXIS)) - , m_aEd_SecondaryXAxis(pWindow, SchResId(ED_SECONDARY_X_AXIS)) - , m_aFT_SecondaryYAxis(pWindow, SchResId(FT_TITLE_SECONDARY_Y_AXIS)) - , m_aEd_SecondaryYAxis(pWindow, SchResId(ED_SECONDARY_Y_AXIS)) { - long nMaxTextWidth = ::std::max( m_aFT_Main.CalcMinimumSize().Width(),m_aFT_Sub.CalcMinimumSize().Width() ) ; - nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_XAxis.CalcMinimumSize().Width() ) ; - nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_YAxis.CalcMinimumSize().Width() ) ; - nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_ZAxis.CalcMinimumSize().Width() ) ; - if( bShowSecondaryAxesTitle ) - { - nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryXAxis.CalcMinimumSize().Width() ) ; - nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryYAxis.CalcMinimumSize().Width() ) ; - } - - Size aControlDistance( m_aFT_Main.LogicToPixel( Size(RSC_SP_CTRL_DESC_X,RSC_SP_CTRL_GROUP_Y), MapMode(MAP_APPFONT) ) ); - long nEditFieldXPos = m_aFT_Main.GetPosPixel().X() + nMaxTextWidth + aControlDistance.Width(); - long nEditFieldWidth = m_aEd_Main.GetPosPixel().X() + m_aEd_Main.GetSizePixel().Width() - nEditFieldXPos; - - if( nEditFieldWidth > 10 ) - { - Size aFTSize( m_aFT_Main.GetSizePixel() ); - aFTSize.Width() = nMaxTextWidth; - m_aFT_Main.SetSizePixel(aFTSize); - m_aFT_Sub.SetSizePixel(aFTSize); - m_aFT_XAxis.SetSizePixel(aFTSize); - m_aFT_YAxis.SetSizePixel(aFTSize); - m_aFT_ZAxis.SetSizePixel(aFTSize); - if( bShowSecondaryAxesTitle ) - { - m_aFT_SecondaryXAxis.SetSizePixel(aFTSize); - m_aFT_SecondaryYAxis.SetSizePixel(aFTSize); - } - - m_aEd_Main.SetPosPixel( Point( nEditFieldXPos, m_aEd_Main.GetPosPixel().Y() ) ); - m_aEd_Sub.SetPosPixel( Point( nEditFieldXPos, m_aEd_Sub.GetPosPixel().Y() ) ); - m_aEd_XAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_XAxis.GetPosPixel().Y() ) ); - m_aEd_YAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_YAxis.GetPosPixel().Y() ) ); - m_aEd_ZAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_ZAxis.GetPosPixel().Y() ) ); - if(bShowSecondaryAxesTitle) - { - m_aEd_SecondaryXAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryXAxis.GetPosPixel().Y() ) ); - m_aEd_SecondaryYAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryYAxis.GetPosPixel().Y() ) ); - } - - Size aEditSize( m_aEd_Main.GetSizePixel() ); - aEditSize.Width() = nEditFieldWidth; - m_aEd_Main.SetSizePixel( aEditSize ); - m_aEd_Sub.SetSizePixel( aEditSize ); - m_aEd_XAxis.SetSizePixel( aEditSize ); - m_aEd_YAxis.SetSizePixel( aEditSize ); - m_aEd_ZAxis.SetSizePixel( aEditSize ); - if(bShowSecondaryAxesTitle) - { - m_aEd_SecondaryXAxis.SetSizePixel( aEditSize ); - m_aEd_SecondaryYAxis.SetSizePixel( aEditSize ); - } - } - - m_aFT_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); - m_aEd_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); - m_aFT_SecondaryYAxis.Show( bShowSecondaryAxesTitle ); - m_aEd_SecondaryYAxis.Show( bShowSecondaryAxesTitle ); + ModalDialog* pDialog = reinterpret_cast<ModalDialog*>(pWindow); + pDialog->get( m_pFT_Main, "labelMainTitle" ); + pDialog->get( m_pFT_Sub, "labelSubTitle" ); + pDialog->get( m_pEd_Main, "maintitle" ); + pDialog->get( m_pEd_Sub, "subtitle" ); + + pDialog->get( m_pFT_XAxis, "labelPrimaryXaxis" ); + pDialog->get( m_pFT_YAxis, "labelPrimaryYaxis" ); + pDialog->get( m_pFT_ZAxis, "labelPrimaryZaxis" ); + pDialog->get( m_pEd_XAxis, "primaryXaxis" ); + pDialog->get( m_pEd_YAxis, "primaryYaxis" ); + pDialog->get( m_pEd_ZAxis, "primaryZaxis" ); + + pDialog->get( m_pFT_SecondaryXAxis, "labelSecondaryXAxis" ); + pDialog->get( m_pFT_SecondaryYAxis, "labelSecondaryYAxis" ); + pDialog->get( m_pEd_SecondaryXAxis, "secondaryXaxis" ); + pDialog->get( m_pEd_SecondaryYAxis, "secondaryYaxis" ); + + m_pFT_SecondaryXAxis->Show( bShowSecondaryAxesTitle ); + m_pFT_SecondaryYAxis->Show( bShowSecondaryAxesTitle ); + m_pEd_SecondaryXAxis->Show( bShowSecondaryAxesTitle ); + m_pEd_SecondaryYAxis->Show( bShowSecondaryAxesTitle ); } TitleResources::~TitleResources() @@ -112,94 +61,94 @@ void TitleResources::SetUpdateDataHdl( const Link& rLink ) { sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT; - m_aEd_Main.EnableUpdateData( nTimeout ); - m_aEd_Main.SetUpdateDataHdl( rLink ); + m_pEd_Main->EnableUpdateData( nTimeout ); + m_pEd_Main->SetUpdateDataHdl( rLink ); - m_aEd_Sub.EnableUpdateData( nTimeout ); - m_aEd_Sub.SetUpdateDataHdl( rLink ); + m_pEd_Sub->EnableUpdateData( nTimeout ); + m_pEd_Sub->SetUpdateDataHdl( rLink ); - m_aEd_XAxis.EnableUpdateData( nTimeout ); - m_aEd_XAxis.SetUpdateDataHdl( rLink ); + m_pEd_XAxis->EnableUpdateData( nTimeout ); + m_pEd_XAxis->SetUpdateDataHdl( rLink ); - m_aEd_YAxis.EnableUpdateData( nTimeout ); - m_aEd_YAxis.SetUpdateDataHdl( rLink ); + m_pEd_YAxis->EnableUpdateData( nTimeout ); + m_pEd_YAxis->SetUpdateDataHdl( rLink ); - m_aEd_ZAxis.EnableUpdateData( nTimeout ); - m_aEd_ZAxis.SetUpdateDataHdl( rLink ); + m_pEd_ZAxis->EnableUpdateData( nTimeout ); + m_pEd_ZAxis->SetUpdateDataHdl( rLink ); - m_aEd_SecondaryXAxis.EnableUpdateData( nTimeout ); - m_aEd_SecondaryXAxis.SetUpdateDataHdl( rLink ); + m_pEd_SecondaryXAxis->EnableUpdateData( nTimeout ); + m_pEd_SecondaryXAxis->SetUpdateDataHdl( rLink ); - m_aEd_SecondaryYAxis.EnableUpdateData( nTimeout ); - m_aEd_SecondaryYAxis.SetUpdateDataHdl( rLink ); + m_pEd_SecondaryYAxis->EnableUpdateData( nTimeout ); + m_pEd_SecondaryYAxis->SetUpdateDataHdl( rLink ); } bool TitleResources::IsModified() { - return m_aEd_Main.IsModified() - || m_aEd_Sub.IsModified() - || m_aEd_XAxis.IsModified() - || m_aEd_YAxis.IsModified() - || m_aEd_ZAxis.IsModified() - || m_aEd_SecondaryXAxis.IsModified() - || m_aEd_SecondaryYAxis.IsModified(); + return m_pEd_Main->IsModified() + || m_pEd_Sub->IsModified() + || m_pEd_XAxis->IsModified() + || m_pEd_YAxis->IsModified() + || m_pEd_ZAxis->IsModified() + || m_pEd_SecondaryXAxis->IsModified() + || m_pEd_SecondaryYAxis->IsModified(); } void TitleResources::ClearModifyFlag() { - m_aEd_Main.ClearModifyFlag(); - m_aEd_Sub.ClearModifyFlag(); - m_aEd_XAxis.ClearModifyFlag(); - m_aEd_YAxis.ClearModifyFlag(); - m_aEd_ZAxis.ClearModifyFlag(); - m_aEd_SecondaryXAxis.ClearModifyFlag(); - m_aEd_SecondaryYAxis.ClearModifyFlag(); + m_pEd_Main->ClearModifyFlag(); + m_pEd_Sub->ClearModifyFlag(); + m_pEd_XAxis->ClearModifyFlag(); + m_pEd_YAxis->ClearModifyFlag(); + m_pEd_ZAxis->ClearModifyFlag(); + m_pEd_SecondaryXAxis->ClearModifyFlag(); + m_pEd_SecondaryYAxis->ClearModifyFlag(); } void TitleResources::writeToResources( const TitleDialogData& rInput ) { - m_aFT_Main.Enable( rInput.aPossibilityList[0] ); - m_aFT_Sub.Enable( rInput.aPossibilityList[1] ); - m_aFT_XAxis.Enable( rInput.aPossibilityList[2] ); - m_aFT_YAxis.Enable( rInput.aPossibilityList[3] ); - m_aFT_ZAxis.Enable( rInput.aPossibilityList[4] ); - m_aFT_SecondaryXAxis.Enable( rInput.aPossibilityList[5] ); - m_aFT_SecondaryYAxis.Enable( rInput.aPossibilityList[6] ); - - m_aEd_Main.Enable( rInput.aPossibilityList[0] ); - m_aEd_Sub.Enable( rInput.aPossibilityList[1] ); - m_aEd_XAxis.Enable( rInput.aPossibilityList[2] ); - m_aEd_YAxis.Enable( rInput.aPossibilityList[3] ); - m_aEd_ZAxis.Enable( rInput.aPossibilityList[4] ); - m_aEd_SecondaryXAxis.Enable( rInput.aPossibilityList[5] ); - m_aEd_SecondaryYAxis.Enable( rInput.aPossibilityList[6] ); - - m_aEd_Main.SetText(rInput.aTextList[0]); - m_aEd_Sub.SetText(rInput.aTextList[1]); - m_aEd_XAxis.SetText(rInput.aTextList[2]); - m_aEd_YAxis.SetText(rInput.aTextList[3]); - m_aEd_ZAxis.SetText(rInput.aTextList[4]); - m_aEd_SecondaryXAxis.SetText(rInput.aTextList[5]); - m_aEd_SecondaryYAxis.SetText(rInput.aTextList[6]); + m_pFT_Main->Enable( rInput.aPossibilityList[0] ); + m_pFT_Sub->Enable( rInput.aPossibilityList[1] ); + m_pFT_XAxis->Enable( rInput.aPossibilityList[2] ); + m_pFT_YAxis->Enable( rInput.aPossibilityList[3] ); + m_pFT_ZAxis->Enable( rInput.aPossibilityList[4] ); + m_pFT_SecondaryXAxis->Enable( rInput.aPossibilityList[5] ); + m_pFT_SecondaryYAxis->Enable( rInput.aPossibilityList[6] ); + + m_pEd_Main->Enable( rInput.aPossibilityList[0] ); + m_pEd_Sub->Enable( rInput.aPossibilityList[1] ); + m_pEd_XAxis->Enable( rInput.aPossibilityList[2] ); + m_pEd_YAxis->Enable( rInput.aPossibilityList[3] ); + m_pEd_ZAxis->Enable( rInput.aPossibilityList[4] ); + m_pEd_SecondaryXAxis->Enable( rInput.aPossibilityList[5] ); + m_pEd_SecondaryYAxis->Enable( rInput.aPossibilityList[6] ); + + m_pEd_Main->SetText(rInput.aTextList[0]); + m_pEd_Sub->SetText(rInput.aTextList[1]); + m_pEd_XAxis->SetText(rInput.aTextList[2]); + m_pEd_YAxis->SetText(rInput.aTextList[3]); + m_pEd_ZAxis->SetText(rInput.aTextList[4]); + m_pEd_SecondaryXAxis->SetText(rInput.aTextList[5]); + m_pEd_SecondaryYAxis->SetText(rInput.aTextList[6]); } void TitleResources::readFromResources( TitleDialogData& rOutput ) { - rOutput.aExistenceList[0] = static_cast<sal_Bool>(!m_aEd_Main.GetText().isEmpty()); - rOutput.aExistenceList[1] = static_cast<sal_Bool>(!m_aEd_Sub.GetText().isEmpty()); - rOutput.aExistenceList[2] = static_cast<sal_Bool>(!m_aEd_XAxis.GetText().isEmpty()); - rOutput.aExistenceList[3] = static_cast<sal_Bool>(!m_aEd_YAxis.GetText().isEmpty()); - rOutput.aExistenceList[4] = static_cast<sal_Bool>(!m_aEd_ZAxis.GetText().isEmpty()); - rOutput.aExistenceList[5] = static_cast<sal_Bool>(!m_aEd_SecondaryXAxis.GetText().isEmpty()); - rOutput.aExistenceList[6] = static_cast<sal_Bool>(!m_aEd_SecondaryYAxis.GetText().isEmpty()); - - rOutput.aTextList[0] = m_aEd_Main.GetText(); - rOutput.aTextList[1] = m_aEd_Sub.GetText(); - rOutput.aTextList[2] = m_aEd_XAxis.GetText(); - rOutput.aTextList[3] = m_aEd_YAxis.GetText(); - rOutput.aTextList[4] = m_aEd_ZAxis.GetText(); - rOutput.aTextList[5] = m_aEd_SecondaryXAxis.GetText(); - rOutput.aTextList[6] = m_aEd_SecondaryYAxis.GetText(); + rOutput.aExistenceList[0] = static_cast<sal_Bool>(!m_pEd_Main->GetText().isEmpty()); + rOutput.aExistenceList[1] = static_cast<sal_Bool>(!m_pEd_Sub->GetText().isEmpty()); + rOutput.aExistenceList[2] = static_cast<sal_Bool>(!m_pEd_XAxis->GetText().isEmpty()); + rOutput.aExistenceList[3] = static_cast<sal_Bool>(!m_pEd_YAxis->GetText().isEmpty()); + rOutput.aExistenceList[4] = static_cast<sal_Bool>(!m_pEd_ZAxis->GetText().isEmpty()); + rOutput.aExistenceList[5] = static_cast<sal_Bool>(!m_pEd_SecondaryXAxis->GetText().isEmpty()); + rOutput.aExistenceList[6] = static_cast<sal_Bool>(!m_pEd_SecondaryYAxis->GetText().isEmpty()); + + rOutput.aTextList[0] = m_pEd_Main->GetText(); + rOutput.aTextList[1] = m_pEd_Sub->GetText(); + rOutput.aTextList[2] = m_pEd_XAxis->GetText(); + rOutput.aTextList[3] = m_pEd_YAxis->GetText(); + rOutput.aTextList[4] = m_pEd_ZAxis->GetText(); + rOutput.aTextList[5] = m_pEd_SecondaryXAxis->GetText(); + rOutput.aTextList[6] = m_pEd_SecondaryYAxis->GetText(); } } //namespace chart diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx index 1ecf781d35bb..b69deebf1198 100644 --- a/chart2/source/controller/dialogs/res_Titles.hxx +++ b/chart2/source/controller/dialogs/res_Titles.hxx @@ -40,24 +40,22 @@ public: void ClearModifyFlag(); private: - FixedText m_aFT_Main; - Edit m_aEd_Main; - FixedText m_aFT_Sub; - Edit m_aEd_Sub; + FixedText* m_pFT_Main; + FixedText* m_pFT_Sub; + Edit* m_pEd_Main; + Edit* m_pEd_Sub; - FixedLine m_aFL_Axes; - FixedText m_aFT_XAxis; - Edit m_aEd_XAxis; - FixedText m_aFT_YAxis; - Edit m_aEd_YAxis; - FixedText m_aFT_ZAxis; - Edit m_aEd_ZAxis; + FixedText* m_pFT_XAxis; + FixedText* m_pFT_YAxis; + FixedText* m_pFT_ZAxis; + Edit* m_pEd_XAxis; + Edit* m_pEd_YAxis; + Edit* m_pEd_ZAxis; - FixedLine m_aFL_SecondaryAxes; - FixedText m_aFT_SecondaryXAxis; - Edit m_aEd_SecondaryXAxis; - FixedText m_aFT_SecondaryYAxis; - Edit m_aEd_SecondaryYAxis; + FixedText* m_pFT_SecondaryXAxis; + FixedText* m_pFT_SecondaryYAxis; + Edit* m_pEd_SecondaryXAxis; + Edit* m_pEd_SecondaryYAxis; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 8d184ce8777d..c0d05f14b64d 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -33,10 +33,6 @@ class SchTitleDlg : public ModalDialog private: ::std::auto_ptr< TitleResources > m_apTitleResources; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - public: SchTitleDlg( Window* pParent, const TitleDialogData& rInput ); virtual ~SchTitleDlg(); diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui new file mode 100644 index 000000000000..407cd6214f29 --- /dev/null +++ b/chart2/uiconfig/ui/inserttitledlg.ui @@ -0,0 +1,391 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="InsertTitleDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</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="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">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">12</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="labelMainTitle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Title</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">maintitle</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelSubTitle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Subtitle</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subtitle</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="maintitle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="subtitle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">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="GtkFrame" id="frameAxes"> + <property name="visible">True</property> + <property name="can_focus">False</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="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="labelPrimaryXaxis"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_X axis</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">primaryXaxis</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelPrimaryYaxis"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Y axis</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">primaryYaxis</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelPrimaryZaxis"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Z axis</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">primaryZaxis</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="primaryXaxis"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="primaryYaxis"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="primaryZaxis"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="Axe"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Axes</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">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frameSecondaryAxes"> + <property name="visible">True</property> + <property name="can_focus">False</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="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="labelSecondaryXAxis"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">X _axis</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">secondaryXaxis</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelSecondaryYAxis"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Y ax_is</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">secondaryYaxis</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="secondaryXaxis"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="secondaryYaxis"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</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">Secondary Axes</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">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</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> diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 5bd55b43d928..f5a153cfa86e 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -96,8 +96,6 @@ bool passesPositiveList(const OUString& rUrl) { "/chart2/source/controller/dialogs/" "res_SecondaryAxisCheckBoxes_tmpl.hrc") }, { RTL_CONSTASCII_STRINGPARAM( - "/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc") }, - { RTL_CONSTASCII_STRINGPARAM( "/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc") }, { RTL_CONSTASCII_STRINGPARAM( "/dbaccess/source/ui/inc/toolbox_tmpl.hrc") }, |