Skip to content

C
core
Kaydet (Commit) de726996 authored tarafından abdulmajeed ahmed's avatar abdulmajeed ahmed
Dosyalara gözat
Seçenekler

Convert Changes tab page to .ui 

Change-Id: I9d1ff420730ec9ec17e1b33f6b7180b9b89a33c4
üst e6af366e
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 189 deletions
sc/AllLangResTarget_sc.mk
Dosyayı görüntüle @ de726996
......@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/tabopdlg.src \
sc/source/ui/src/scstring.src \
sc/source/ui/src/dbnamdlg.src \
sc/source/ui/src/opredlin.src \
sc/source/ui/src/sortdlg.src \
sc/source/ui/src/filter.src \
sc/source/ui/src/colorformat.src \
......
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ de726996
......@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
......
sc/inc/helpids.h
Dosyayı görüntüle @ de726996
......@@ -109,7 +109,6 @@
#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES"
#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX"
#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE"
#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR"
// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) -----------------------
......
sc/inc/sc.hrc
Dosyayı görüntüle @ de726996
......@@ -829,6 +829,7 @@
#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110)
#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
#define SCSTR_ORIENTATION_STANDARD (STR_START + 112)
#define SCSTR_AUTHOR (STR_START + 113)
// accessibility
......
sc/source/ui/inc/opredlin.hrc deleted 100644 → 0
Dosyayı görüntüle @ e6af366e
/* -*- 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_SCPAGE_OPREDLINE
#define FT_CONTENT 1
#define FT_REMOVE 2
#define FT_INSERT 3
#define FT_MOVE 4
#define GB_COLORCHGS 1
#define CLB_CONTENT 1
#define CLB_REMOVE 2
#define CLB_INSERT 3
#define CLB_MOVE 4
#define STR_AUTHOR 1
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/opredlin.hxx
Dosyayı görüntüle @ de726996
......@@ -36,15 +36,10 @@
class ScRedlineOptionsTabPage : public SfxTabPage
{
FixedText aContentFT;
ColorListBox aContentColorLB;
FixedText aRemoveFT;
ColorListBox aRemoveColorLB;
FixedText aInsertFT;
ColorListBox aInsertColorLB;
FixedText aMoveFT;
ColorListBox aMoveColorLB;
FixedLine aChangedGB;
ColorListBox* m_pContentColorLB;
ColorListBox* m_pRemoveColorLB;
ColorListBox* m_pInsertColorLB;
ColorListBox* m_pMoveColorLB;
String aAuthorStr;
DECL_LINK(ColorHdl, void *);
......
sc/source/ui/optdlg/opredlin.cxx
Dosyayı görüntüle @ de726996
......@@ -43,31 +43,24 @@
#include "globstr.hrc"
#include "opredlin.hxx"
#include "opredlin.hrc"
//------------------------------------------------------------------
ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, ScResId(RID_SCPAGE_OPREDLINE), rSet),
aContentFT ( this, ScResId(FT_CONTENT )),
aContentColorLB ( this, ScResId(CLB_CONTENT )),
aRemoveFT ( this, ScResId(FT_REMOVE )),
aRemoveColorLB ( this, ScResId(CLB_REMOVE )),
aInsertFT ( this, ScResId(FT_INSERT )),
aInsertColorLB ( this, ScResId(CLB_INSERT )),
aMoveFT ( this, ScResId(FT_MOVE )),
aMoveColorLB ( this, ScResId(CLB_MOVE )),
aChangedGB ( this, ScResId(GB_COLORCHGS)),
aAuthorStr (ScResId(STR_AUTHOR))
: SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", rSet),
aAuthorStr (ScResId(SCSTR_AUTHOR))
{
FreeResource();
get(m_pContentColorLB, "changes");
get(m_pRemoveColorLB, "deletions");
get(m_pInsertColorLB, "entries");
get(m_pMoveColorLB, "insertions");
Link aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl);
aContentColorLB.SetSelectHdl( aLk );
aMoveColorLB.SetSelectHdl( aLk );
aInsertColorLB.SetSelectHdl( aLk );
aRemoveColorLB.SetSelectHdl( aLk );
m_pContentColorLB->SetSelectHdl( aLk );
m_pMoveColorLB->SetSelectHdl( aLk );
m_pInsertColorLB->SetSelectHdl( aLk );
m_pRemoveColorLB->SetSelectHdl( aLk );
}
ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
......@@ -86,44 +79,44 @@ sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
sal_uLong nNew=0;
sal_uInt16 nPos=0;
nPos = aContentColorLB.GetSelectEntryPos();
nPos = m_pContentColorLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
if (nPos!=0)
nNew= aContentColorLB.GetEntryColor(nPos).GetColor();
nNew= m_pContentColorLB->GetEntryColor(nPos).GetColor();
else
nNew= COL_TRANSPARENT;
aAppOptions.SetTrackContentColor(nNew);
}
nPos = aMoveColorLB.GetSelectEntryPos();
nPos = m_pMoveColorLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
if (nPos!=0)
nNew= aMoveColorLB.GetEntryColor(nPos).GetColor();
nNew= m_pMoveColorLB->GetEntryColor(nPos).GetColor();
else
nNew= COL_TRANSPARENT;
aAppOptions.SetTrackMoveColor(nNew);
}
nPos = aInsertColorLB.GetSelectEntryPos();
nPos = m_pInsertColorLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
if (nPos!=0)
nNew= aInsertColorLB.GetEntryColor(nPos).GetColor();
nNew= m_pInsertColorLB->GetEntryColor(nPos).GetColor();
else
nNew= COL_TRANSPARENT;
aAppOptions.SetTrackInsertColor(nNew);
}
nPos = aRemoveColorLB.GetSelectEntryPos();
nPos = m_pRemoveColorLB->GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
if (nPos!=0)
nNew= aRemoveColorLB.GetEntryColor(nPos).GetColor();
nNew= m_pRemoveColorLB->GetEntryColor(nPos).GetColor();
else
nNew= COL_TRANSPARENT;
......@@ -144,15 +137,15 @@ sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
{
aContentColorLB.InsertEntry(aAuthorStr);
aMoveColorLB.InsertEntry(aAuthorStr);
aInsertColorLB.InsertEntry(aAuthorStr);
aRemoveColorLB.InsertEntry(aAuthorStr);
m_pContentColorLB->InsertEntry(aAuthorStr);
m_pMoveColorLB->InsertEntry(aAuthorStr);
m_pInsertColorLB->InsertEntry(aAuthorStr);
m_pRemoveColorLB->InsertEntry(aAuthorStr);
aContentColorLB.SetUpdateMode( false);
aMoveColorLB.SetUpdateMode( false);
aInsertColorLB.SetUpdateMode( false);
aRemoveColorLB.SetUpdateMode( false);
m_pContentColorLB->SetUpdateMode( false);
m_pMoveColorLB->SetUpdateMode( false);
m_pInsertColorLB->SetUpdateMode( false);
m_pRemoveColorLB->SetUpdateMode( false);
XColorListRef xColorLst = XColorList::GetStdColorList();
for( sal_uInt16 i = 0; i < xColorLst->Count(); ++i )
......@@ -161,44 +154,44 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
Color aColor = pEntry->GetColor();
String sName = pEntry->GetName();
aContentColorLB.InsertEntry( aColor, sName );
aMoveColorLB.InsertEntry( aColor, sName );
aInsertColorLB.InsertEntry( aColor, sName );
aRemoveColorLB.InsertEntry( aColor, sName );
m_pContentColorLB->InsertEntry( aColor, sName );
m_pMoveColorLB->InsertEntry( aColor, sName );
m_pInsertColorLB->InsertEntry( aColor, sName );
m_pRemoveColorLB->InsertEntry( aColor, sName );
}
aContentColorLB.SetUpdateMode( sal_True );
aMoveColorLB.SetUpdateMode( sal_True );
aInsertColorLB.SetUpdateMode( sal_True );
aRemoveColorLB.SetUpdateMode( sal_True );
m_pContentColorLB->SetUpdateMode( sal_True );
m_pMoveColorLB->SetUpdateMode( sal_True );
m_pInsertColorLB->SetUpdateMode( sal_True );
m_pRemoveColorLB->SetUpdateMode( sal_True );
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
sal_uLong nColor = aAppOptions.GetTrackContentColor();
if (nColor == COL_TRANSPARENT)
aContentColorLB.SelectEntryPos(0);
m_pContentColorLB->SelectEntryPos(0);
else
aContentColorLB.SelectEntry(Color(nColor));
m_pContentColorLB->SelectEntry(Color(nColor));
nColor = aAppOptions.GetTrackMoveColor();
if (nColor == COL_TRANSPARENT)
aMoveColorLB.SelectEntryPos(0);
m_pMoveColorLB->SelectEntryPos(0);
else
aMoveColorLB.SelectEntry(Color(nColor));
m_pMoveColorLB->SelectEntry(Color(nColor));
nColor = aAppOptions.GetTrackInsertColor();
if (nColor == COL_TRANSPARENT)
aInsertColorLB.SelectEntryPos(0);
m_pInsertColorLB->SelectEntryPos(0);
else
aInsertColorLB.SelectEntry(Color(nColor));
m_pInsertColorLB->SelectEntry(Color(nColor));
nColor = aAppOptions.GetTrackDeleteColor();
if (nColor == COL_TRANSPARENT)
aRemoveColorLB.SelectEntryPos(0);
m_pRemoveColorLB->SelectEntryPos(0);
else
aRemoveColorLB.SelectEntry(Color(nColor));
m_pRemoveColorLB->SelectEntry(Color(nColor));
}
......
sc/source/ui/src/opredlin.src deleted 100644 → 0
Dosyayı görüntüle @ e6af366e
/* -*- 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 "opredlin.hrc"
TabPage RID_SCPAGE_OPREDLINE
{
HelpId = HID_SCPAGE_OPREDLINE ;
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_CONTENT
{
HelpID = HID_SCPAGE_OPREDLINBE_FT_CONTENT ;
Pos = MAP_APPFONT ( 12 , 15 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Chan~ges" ;
};
FixedText FT_REMOVE
{
Pos = MAP_APPFONT ( 12 , 31 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Deletions" ;
};
FixedText FT_INSERT
{
Pos = MAP_APPFONT ( 12 , 47 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Insertions" ;
};
FixedText FT_MOVE
{
Pos = MAP_APPFONT ( 12 , 63 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Moved entries" ;
};
FixedLine GB_COLORCHGS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Colors for changes" ;
};
ListBox CLB_CONTENT
{
HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_CONTENT";
Pos = MAP_APPFONT ( 90 , 14 ) ;
Size = MAP_APPFONT ( 120 , 86 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
ListBox CLB_REMOVE
{
HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_REMOVE";
Pos = MAP_APPFONT ( 90 , 30 ) ;
Size = MAP_APPFONT ( 120 , 86 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
ListBox CLB_INSERT
{
HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_INSERT";
Pos = MAP_APPFONT ( 90 , 46 ) ;
Size = MAP_APPFONT ( 120 , 86 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
ListBox CLB_MOVE
{
HelpID = "sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_MOVE";
Pos = MAP_APPFONT ( 90 , 62 ) ;
Size = MAP_APPFONT ( 120 , 86 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
String STR_AUTHOR
{
Text [ en-US ] = "By author" ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/src/scstring.src
Dosyayı görüntüle @ de726996
......@@ -849,4 +849,9 @@ String SCSTR_ROW_LABEL
Text [ en-US ] = "Range contains ~row labels" ;
};
String SCSTR_AUTHOR
{
Text [ en-US ] = "By author" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/uiconfig/scalc/ui/optchangespage.ui 0 → 100644
Dosyayı görüntüle @ de726996
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="OptChangesPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</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="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Chan_ges</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changeslb</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="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Deletions</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deletionslb</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="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Insertions</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insertionslb</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="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Moved entries</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entrieslb</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svxlo-ColorLB" id="changes">
<property name="visible">True</property>
<property name="can_focus">False</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="svxlo-ColorLB" id="deletions">
<property name="visible">True</property>
<property name="can_focus">False</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="svxlo-ColorLB" id="entries">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svxlo-ColorLB" id="insertions">
<property name="visible">True</property>
<property name="can_focus">False</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="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Colors for changes</property>
<attributes>
<attribute name="weight" value="semibold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface>
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