Skip to content

C
core
Kaydet (Commit) cc464d66 authored tarafından Csikós Tamás's avatar Csikós Tamás Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

modern .ui widgetlayout for crnrdlg 

Change-Id: If7e7e18339d50af4a677fcd8ad7d88c5820f6bab
Reviewed-on: https://gerrit.libreoffice.org/5064Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ff51a2b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 195 deletions
sc/AllLangResTarget_sc.mk
Dosyayı görüntüle @ cc464d66
......@@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/sc.src \
sc/source/ui/src/pseudo.src \
sc/source/ui/src/subtdlg.src \
sc/source/ui/src/crnrdlg.src \
sc/source/ui/src/hdrcont.src \
sc/source/ui/src/scerrors.src \
sc/source/ui/src/simpref.src \
......
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ cc464d66
......@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/leftfooterdialog \
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
......
sc/inc/sc.hrc
Dosyayı görüntüle @ cc464d66
......@@ -1057,8 +1057,6 @@
#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109)
#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112)
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
......
sc/source/ui/inc/crnrdlg.hrc deleted 100644 → 0
Dosyayı görüntüle @ ff51a2b6
/* -*- 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" // -> RID_SCDLG_COLROWNAMERANGES
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_ADD 3
#define BTN_REMOVE 4
#define BTN_HELP 5
#define LB_RANGE 11
#define FL_ASSIGN 12
#define ED_AREA 13
#define RB_AREA 14
#define BTN_COLHEAD 15
#define BTN_ROWHEAD 16
#define ED_DATA 17
#define RB_DATA 18
#define FT_DATA_LABEL 19
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/crnrdlg.hxx
Dosyayı görüntüle @ cc464d66
......@@ -47,22 +47,20 @@ public:
virtual sal_Bool Close();
private:
FixedLine aFlAssign;
ListBox aLbRange;
formula::RefEdit aEdAssign;
formula::RefButton aRbAssign;
RadioButton aBtnColHead;
RadioButton aBtnRowHead;
FixedText aFtAssign2;
formula::RefEdit aEdAssign2;
formula::RefButton aRbAssign2;
OKButton aBtnOk;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
PushButton aBtnAdd;
PushButton aBtnRemove;
ListBox* pLbRange;
formula::RefEdit* pEdAssign;
formula::RefButton* pRbAssign;
RadioButton* pBtnColHead;
RadioButton* pBtnRowHead;
formula::RefEdit* pEdAssign2;
formula::RefButton* pRbAssign2;
OKButton* pBtnOk;
CancelButton* pBtnCancel;
HelpButton* pBtnHelp;
PushButton* pBtnAdd;
PushButton* pBtnRemove;
ScRange theCurArea;
ScRange theCurData;
......
sc/source/ui/src/crnrdlg.src deleted 100644 → 0
Dosyayı görüntüle @ ff51a2b6
/* -*- 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 "crnrdlg.hrc"
ModelessDialog RID_SCDLG_COLROWNAMERANGES
{
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 256 , 181 ) ;
HelpId = HID_COLROWNAMERANGES ;
Moveable = TRUE ;
// Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
FixedLine FL_ASSIGN
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 188 , 8 ) ;
Text [ en-US ] = "Range" ;
};
ListBox LB_RANGE
{
HelpID = "sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 179 , 85 ) ;
TabStop = TRUE ;
VScroll = TRUE ;
Border = TRUE ;
};
Edit ED_AREA
{
HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 105 ) ;
Size = MAP_APPFONT ( 165 , 12 ) ;
TabStop = TRUE ;
};
ImageButton RB_AREA
{
HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA";
Pos = MAP_APPFONT ( 179 , 104 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
RadioButton BTN_COLHEAD
{
HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD";
Pos = MAP_APPFONT ( 20 , 121 ) ;
Size = MAP_APPFONT ( 171 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Contains ~column labels" ;
};
RadioButton BTN_ROWHEAD
{
HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD";
Pos = MAP_APPFONT ( 20 , 135 ) ;
Size = MAP_APPFONT ( 171 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Contains ~row labels" ;
};
FixedText FT_DATA_LABEL
{
Pos = MAP_APPFONT ( 12 , 151 ) ;
Size = MAP_APPFONT ( 179 , 8 ) ;
Text [ en-US ] = "For ~data range" ;
};
Edit ED_DATA
{
HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_DATA";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 162 ) ;
Size = MAP_APPFONT ( 165 , 12 ) ;
TabStop = TRUE ;
};
ImageButton RB_DATA
{
HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA";
Pos = MAP_APPFONT ( 179 , 161 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 200 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 200 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_ADD
{
HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD";
Pos = MAP_APPFONT ( 200 , 104 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add" ;
TabStop = TRUE ;
DefButton = TRUE ;
};
PushButton BTN_REMOVE
{
HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE";
Pos = MAP_APPFONT ( 200 , 122 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete" ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 200 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
Text [ en-US ] = "Define Label Range" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/uiconfig/scalc/ui/namerangesdialog.ui 0 → 100644
Dosyayı görüntüle @ cc464d66
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