Kaydet (Commit) 27ad211c authored tarafından Caolán McNamara's avatar Caolán McNamara

convert show changes dialog to .ui

Change-Id: I29397e454e30bff98644f0c9e0f3a8e00547af1b
üst 91f509fd
...@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ ...@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/drawfunc/drformsh.src \ sc/source/ui/drawfunc/drformsh.src \
sc/source/ui/drawfunc/objdraw.src \ sc/source/ui/drawfunc/objdraw.src \
sc/source/ui/miscdlgs/retypepassdlg.src \ sc/source/ui/miscdlgs/retypepassdlg.src \
sc/source/ui/miscdlgs/highred.src \
sc/source/ui/miscdlgs/conflictsdlg.src \ sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/acredlin.src \ sc/source/ui/miscdlgs/acredlin.src \
sc/source/ui/formdlg/dwfunctr.src \ sc/source/ui/formdlg/dwfunctr.src \
......
...@@ -143,6 +143,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -143,6 +143,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedocumentdlg \ sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/sharedfooterdialog \ sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \ sc/uiconfig/scalc/ui/sharedheaderdialog \
sc/uiconfig/scalc/ui/showchangesdialog \
sc/uiconfig/scalc/ui/showsheetdialog \ sc/uiconfig/scalc/ui/showsheetdialog \
sc/uiconfig/scalc/ui/sidebaralignment \ sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \ sc/uiconfig/scalc/ui/sidebarnumberformat \
......
...@@ -1063,7 +1063,6 @@ ...@@ -1063,7 +1063,6 @@
#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) #define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121)
#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) #define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122)
#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123)
#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124) #define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124)
#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) #define WID_SIMPLE_REF (SC_DIALOGS_START + 126)
......
/* -*- 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 "sc.hrc"
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 5
#define CB_HIGHLIGHT_ACCEPT 6
#define CB_HIGHLIGHT_REJECT 7
#define FL_FILTER 10
#define CB_HIGHLIGHT 13
#define FT_ASSIGN 14
#define ED_ASSIGN 15
#define RB_ASSIGN 16
#define STR_INSERT_COLS 20
#define STR_INSERT_ROWS 21
#define STR_INSERT_TABS 22
#define STR_DELETE_COLS 23
#define STR_DELETE_ROWS 24
#define STR_DELETE_TABS 25
#define STR_MOVE 26
#define STR_CONTENT 27
#define STR_REJECT 28
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -53,25 +53,19 @@ class ScDocument; ...@@ -53,25 +53,19 @@ class ScDocument;
class ScHighlightChgDlg : public ScAnyRefDlg class ScHighlightChgDlg : public ScAnyRefDlg
{ {
private: private:
CheckBox* m_pHighlightBox;
SvxTPFilter* m_pFilterCtr;
CheckBox* m_pCbAccept;
CheckBox* m_pCbReject;
OKButton* m_pOkButton;
CheckBox aHighlightBox; formula::RefEdit* m_pEdAssign;
FixedLine aFlFilter; formula::RefButton* m_pRbAssign;
SvxTPFilter aFilterCtr;
CheckBox aCbAccept;
CheckBox aCbReject;
OKButton aOkButton;
CancelButton aCancelButton;
HelpButton aHelpButton;
formula::RefEdit aEdAssign;
formula::RefButton aRbAssign;
ScViewData* pViewData; ScViewData* pViewData;
ScDocument* pDoc; ScDocument* pDoc;
ScRangeName aLocalRangeName; ScRangeName aLocalRangeName;
Selection theCurSel; Selection theCurSel;
Size MinSize;
ScRangeList aRangeList; ScRangeList aRangeList;
ScChangeViewSettings aChangeViewSet; ScChangeViewSettings aChangeViewSet;
......
/* -*- 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 "highred.hrc"
ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
{
OutputSize = TRUE ;
HelpId = CMD_FID_CHG_ACCEPT ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 318 , 148 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
// Dieser Dialog hat einen Cancel-Button !
CheckBox CB_HIGHLIGHT
{
HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Show changes in spreadsheet" ;
};
FixedLine FL_FILTER
{
Pos = MAP_APPFONT ( 6 , 22 ) ;
Size = MAP_APPFONT ( 255 , 8 ) ;
Text [ en-US ] = "Filter settings";
};
CheckBox CB_HIGHLIGHT_ACCEPT
{
HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT";
Pos = MAP_APPFONT ( 12 , 118 ) ;
Size = MAP_APPFONT ( 246 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Show ~accepted changes" ;
};
CheckBox CB_HIGHLIGHT_REJECT
{
HelpID = "sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT";
Pos = MAP_APPFONT ( 12 , 132 ) ;
Size = MAP_APPFONT ( 246 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Show ~rejected changes" ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 267 , 6 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 267 , 23 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 267 , 43 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
};
Edit ED_ASSIGN
{
HelpID = "sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 119 ) ;
Size = MAP_APPFONT ( 128 , 12 ) ;
TabStop = TRUE ;
};
ImageButton RB_ASSIGN
{
HelpID = "sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN";
Hide = TRUE ;
Pos = MAP_APPFONT ( 142 , 118 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE;
QuickHelpText [ en-US ] = "Minimize/Maximize" ;
};
Text [ en-US ] = "Show Changes" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
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