summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx55
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx3
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx28
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx6
-rw-r--r--sc/uiconfig/scalc/ui/sidebaralignment.ui179
-rw-r--r--sc/uiconfig/scalc/ui/sidebarcellappearance.ui47
-rw-r--r--sc/uiconfig/scalc/ui/sidebarnumberformat.ui187
8 files changed, 167 insertions, 340 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index c27d0e994f79..d572ffd61a75 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -45,7 +45,6 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
maMergeCellControl(FID_MERGE_TOGGLE, *pBindings, *this),
maWrapTextControl(SID_ATTR_ALIGN_LINEBREAK, *pBindings, *this),
maAngleControl(SID_ATTR_ALIGN_DEGREES, *pBindings, *this),
- maStackControl(SID_ATTR_ALIGN_STACKED, *pBindings, *this),
mbMultiDisable(false),
mxFrame(rxFrame),
maContext(),
@@ -56,9 +55,7 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
get(mpCBXWrapText, "wraptext");
get(mpCBXMergeCell, "mergecells");
get(mpFtRotate, "orientationlabel");
- get(mpCtrlDial, "orientationcontrol");
get(mpMtrAngle, "orientationdegrees");
- get(mpCbStacked, "verticallystacked");
Initialize();
@@ -78,16 +75,13 @@ void AlignmentPropertyPanel::dispose()
mpCBXWrapText.clear();
mpCBXMergeCell.clear();
mpFtRotate.clear();
- mpCtrlDial.clear();
mpMtrAngle.clear();
- mpCbStacked.clear();
maAlignHorControl.dispose();
maLeftIndentControl.dispose();
maMergeCellControl.dispose();
maWrapTextControl.dispose();
maAngleControl.dispose();
- maStackControl.dispose();
PanelLayout::dispose();
}
@@ -107,8 +101,6 @@ void AlignmentPropertyPanel::Initialize()
mpCBXWrapText->SetClickHdl ( aLink );
//rotation control
- mpCtrlDial->SetAccessibleName(OUString( "Text Orientation")); //wj acc
- mpCtrlDial->SetModifyHdl(LINK( this, AlignmentPropertyPanel, RotationHdl));
//rotation
mpMtrAngle->SetAccessibleName(OUString( "Text Orientation")); //wj acc
@@ -116,7 +108,6 @@ void AlignmentPropertyPanel::Initialize()
mpMtrAngle->EnableAutocomplete( false );
//Vertical stacked
- mpCbStacked->SetClickHdl( LINK( this, AlignmentPropertyPanel, ClickStackHdl ) );
mpMtrAngle->InsertValue(0, FUNIT_CUSTOM);
mpMtrAngle->InsertValue(45, FUNIT_CUSTOM);
@@ -170,27 +161,6 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl )
SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
return 0;
}
-
-IMPL_LINK_NOARG( AlignmentPropertyPanel, RotationHdl )
-{
- sal_Int32 nTmp = mpCtrlDial->GetRotation();
- SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp);
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
-
- return 0;
-}
-
-IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl )
-{
- bool bVertical = mpCbStacked->IsChecked();
- SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L );
- return 0;
-}
-
IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl)
{
mpCBXWrapText->EnableTriState(false);
@@ -282,17 +252,14 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
if( meHorAlignState == SVX_HOR_JUSTIFY_REPEAT )
{
mpFtRotate->Disable();
- mpCtrlDial->Disable();
mpMtrAngle->Disable();
}
else
{
mpFtRotate->Enable(!mbMultiDisable);
- mpCtrlDial->Enable(!mbMultiDisable);
mpMtrAngle->Enable(!mbMultiDisable);
}
- mpCbStacked->Enable( meHorAlignState != SVX_HOR_JUSTIFY_REPEAT );
mpFTLeftIndent->Enable( meHorAlignState == SVX_HOR_JUSTIFY_LEFT );
mpMFLeftIndent->Enable( meHorAlignState == SVX_HOR_JUSTIFY_LEFT );
}
@@ -352,7 +319,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
{
long nTmp = static_cast<const SfxInt32Item*>(pState)->GetValue();
mpMtrAngle->SetValue( nTmp / 100); //wj
- mpCtrlDial->SetRotation( nTmp );
switch(nTmp)
{
case 0:
@@ -383,29 +349,8 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
else
{
mpMtrAngle->SetText( OUString() );
- mpCtrlDial->SetRotation( 0 );
}
break;
- case SID_ATTR_ALIGN_STACKED:
- if (eState >= SfxItemState::DEFAULT)
- {
- mpCbStacked->EnableTriState(false);
- const SfxBoolItem* aStackItem = static_cast<const SfxBoolItem*>(pState);
- mbMultiDisable = aStackItem->GetValue();
- mpCbStacked->Check(mbMultiDisable);
- mpFtRotate->Enable(!mbMultiDisable);
- mpMtrAngle->Enable(!mbMultiDisable);
- mpCtrlDial->Enable(!mbMultiDisable);
- }
- else
- {
- mbMultiDisable = true;
- mpFtRotate->Disable();
- mpMtrAngle->Disable();
- mpCtrlDial->Disable();
- mpCbStacked->EnableTriState(true);
- mpCbStacked->SetState(TRISTATE_INDET);
- }
}
}
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 9296c25d4936..d268effd556c 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -73,16 +73,13 @@ private:
VclPtr<CheckBox> mpCBXWrapText;
VclPtr<CheckBox> mpCBXMergeCell;
VclPtr<FixedText> mpFtRotate;
- VclPtr<svx::sidebar::SidebarDialControl> mpCtrlDial;
VclPtr<MetricBox> mpMtrAngle;
- VclPtr<CheckBox> mpCbStacked;
::sfx2::sidebar::ControllerItem maAlignHorControl;
::sfx2::sidebar::ControllerItem maLeftIndentControl;
::sfx2::sidebar::ControllerItem maMergeCellControl;
::sfx2::sidebar::ControllerItem maWrapTextControl;
::sfx2::sidebar::ControllerItem maAngleControl;
- ::sfx2::sidebar::ControllerItem maStackControl;
/// bitfield
bool mbMultiDisable : 1;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 5c7ade47726f..d557584ab7fd 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -132,7 +132,6 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
get(mpTBCellBorder, "cellbordertype");
get(mpTBLineStyle, "borderlinestyle");
get(mpTBLineColor, "borderlinecolor");
- get(mpCBXShowGrid, "cellgridlines");
mpCellBorderUpdater.reset( new CellBorderUpdater(
mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE ), *mpTBCellBorder) );
@@ -150,7 +149,6 @@ void CellAppearancePropertyPanel::dispose()
mpTBCellBorder.clear();
mpTBLineStyle.clear();
mpTBLineColor.clear();
- mpCBXShowGrid.clear();
maLineStyleControl.dispose();
maBorderOuterControl.dispose();
@@ -181,8 +179,6 @@ void CellAppearancePropertyPanel::Initialize()
mpTBLineColor->Disable();
- mpCBXShowGrid->SetClickHdl ( LINK(this, CellAppearancePropertyPanel, CBOXGridShowClkHdl) );
-
mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor);
mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle);
}
@@ -232,14 +228,6 @@ IMPL_LINK_TYPED(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pT
}
}
-IMPL_LINK_NOARG(CellAppearancePropertyPanel, CBOXGridShowClkHdl)
-{
- bool bState = mpCBXShowGrid->IsChecked();
- SfxBoolItem aItem( FID_TAB_TOGGLE_GRID , bState);
- GetBindings()->GetDispatcher()->Execute(FID_TAB_TOGGLE_GRID, SfxCallMode::RECORD, &aItem, 0L);
- return 0;
-}
-
VclPtr<vcl::Window> CellAppearancePropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -476,22 +464,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
mbBLTR = false;
UpdateControlState();
break;
- case FID_TAB_TOGGLE_GRID:
- if(eState >= SfxItemState::DEFAULT)
- {
- const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState);
-
- if(pItem)
- {
- const bool bVal = pItem->GetValue();
-
- if(bVal)
- mpCBXShowGrid->Check(true);
- else
- mpCBXShowGrid->Check(false);
- }
- }
- break;
}
}
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index bddce6488cac..fba7cc26c311 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -84,7 +84,6 @@ private:
VclPtr<ToolBox> mpTBLineStyle;
VclPtr<ToolBox> mpTBLineColor;
::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
- VclPtr<CheckBox> mpCBXShowGrid;
::sfx2::sidebar::ControllerItem maLineStyleControl;
::sfx2::sidebar::ControllerItem maBorderOuterControl;
@@ -143,7 +142,6 @@ private:
DECL_LINK_TYPED(TbxCellBorderSelectHdl, ToolBox*, void);
DECL_LINK_TYPED(TbxLineStyleSelectHdl, ToolBox*, void);
- DECL_LINK(CBOXGridShowClkHdl, void*);
// for CellLineStyle popup
svx::sidebar::PopupControl* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent);
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 137643b36685..b832400f231e 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -41,8 +41,6 @@ using ::sfx2::sidebar::Theme;
const char UNO_NUMERICFIELD[] = ".uno:NumericField";
const char UNO_NUMBERFORMATPERCENT[] = ".uno:NumberFormatPercent";
const char UNO_NUMBERFORMATCURRENCY[] = ".uno:NumberFormatCurrency";
-const char UNO_NUMBERFORMATDATE[] = ".uno:NumberFormatDate";
-const char UNO_INSERTFIXEDTEXT[] = ".uno:InsertFixedText";
namespace sc { namespace sidebar {
@@ -125,10 +123,6 @@ IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatHdl, ToolBox*, pBox, void )
nId = 2;
else if(aCommand == UNO_NUMBERFORMATCURRENCY)
nId = 3;
- else if(aCommand == UNO_NUMBERFORMATDATE)
- nId = 4;
- else if(aCommand == UNO_INSERTFIXEDTEXT)
- nId = 9;
if( nId != mnCategorySelected )
{
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index 590897f73bf0..9f51829aa583 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -13,7 +13,7 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">10</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
@@ -85,44 +85,6 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="writedirection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="lefttoright">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:ParaLeftToRight</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="righttoleft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:ParaRightToLeft</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="sfxlo-SidebarToolBox" id="verticalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -170,7 +132,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -192,13 +154,60 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="leftindentlabel">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Left _indent:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">leftindent:0pt</property>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="indentbuttons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="incrementindent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:IncrementIndent</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogenous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="decrementindent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:DecrementIndent</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogenous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="leftindentlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Indent:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">leftindent:0pt</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -289,90 +298,82 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="orientationlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Text _orientation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">orientationcontrol</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="svxlo-SidebarDialControl" id="orientationcontrol">
+ <object class="GtkLabel" id="orientationlabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="vexpand">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Text _orientation:</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="VclComboBoxNumeric" id="orientationdegrees:0degrees">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the angle for rotation.</property>
+ <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="writedirection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkCheckButton" id="verticallystacked">
- <property name="label" translatable="yes">Vertically stacked</property>
+ <object class="GtkToolButton" id="lefttoright">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Aligns text vertically.</property>
- <property name="tooltip_text" translatable="yes">Aligns text vertically.</property>
- <property name="xalign">0</property>
- <property name="image_position">bottom</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:ParaLeftToRight</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="VclComboBoxNumeric" id="orientationdegrees:0degrees">
+ <object class="GtkToolButton" id="righttoleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the angle for rotation.</property>
- <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:ParaRightToLeft</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index f82f4b628672..86e0224ce189 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="CellAppearancePropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -22,7 +23,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Cell background:</property>
+ <property name="label" translatable="yes">_Background:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -70,20 +71,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="cellborderlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Cell _border:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -102,9 +89,8 @@
<property name="tooltip_markup" translatable="yes">Specify the borders of the selected cells.</property>
<property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
<property name="halign">start</property>
- <property name="use_action_appearance">False</property>
<property name="action_name">.uno:SetBorderStyle</property>
- <property name="label" translatable="no">toolbutton1</property>
+ <property name="label">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -139,9 +125,8 @@
<property name="tooltip_markup" translatable="yes">Select the line style of the borders.</property>
<property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
<property name="halign">end</property>
- <property name="use_action_appearance">False</property>
<property name="action_name">.uno:LineStyle</property>
- <property name="label" translatable="no">toolbutton2</property>
+ <property name="label">toolbutton2</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -204,32 +189,10 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="cellgridlines">
- <property name="label" translatable="yes">Show cell _grid lines</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Show the grid lines of the cells.</property>
- <property name="action_name">.uno:ToggleSheetGrid</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</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>
</object>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index a90fe61b7209..79fb1ca1f06a 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="NumberFormatPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14,133 +15,95 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="categorylabel">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Category:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">category</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="category">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
- <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">General</item>
- <item translatable="yes">Number</item>
- <item translatable="yes">Percent</item>
- <item translatable="yes">Currency</item>
- <item translatable="yes">Date </item>
- <item translatable="yes">Time</item>
- <item translatable="yes">Scientific</item>
- <item translatable="yes">Fraction</item>
- <item translatable="yes">Boolean Value</item>
- <item translatable="yes">Text</item>
- </items>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="numberformat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="numericfield">
- <property name="use_action_appearance">False</property>
- <property name="width_request">30</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.uno:NumericField</property>
- <property name="label" translatable="no">toolbutton1</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="percent">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.uno:NumberFormatPercent</property>
- <property name="label" translatable="no">toolbutton2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="currency">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.uno:NumberFormatCurrency</property>
- <property name="label" translatable="no">toolbutton3</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkToolButton" id="date">
- <property name="use_action_appearance">False</property>
+ <object class="GtkComboBoxText" id="category">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.uno:NumberFormatDate</property>
- <property name="label" translatable="no">toolbutton4</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
+ <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">General</item>
+ <item translatable="yes">Number</item>
+ <item translatable="yes">Percent</item>
+ <item translatable="yes">Currency</item>
+ <item translatable="yes">Date </item>
+ <item translatable="yes">Time</item>
+ <item translatable="yes">Scientific</item>
+ <item translatable="yes">Fraction</item>
+ <item translatable="yes">Boolean Value</item>
+ <item translatable="yes">Text</item>
+ </items>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="insertfixedtext">
- <property name="use_action_appearance">False</property>
+ <object class="GtkToolbar" id="numberformat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="action_name">.uno:InsertFixedText</property>
- <property name="label" translatable="no">toolbutton5</property>
- <property name="use_underline">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="currency">
+ <property name="use_action_appearance">False</property>
+ <property name="width_request">30</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NumberFormatCurrency</property>
+ <property name="label">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="percent">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NumberFormatPercent</property>
+ <property name="label">toolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="numericfield">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:NumericField</property>
+ <property name="label">toolbutton3</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -176,7 +139,6 @@
<property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property>
<property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -220,7 +182,6 @@
<property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
<property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -245,7 +206,7 @@
</child>
<child>
<object class="GtkCheckButton" id="negativenumbersred">
- <property name="label" translatable="yes">_Negative numbers red</property>
+ <property name="label" translatable="yes">_Negative numbers in red</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -253,7 +214,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Changes the font color of negative numbers to red.</property>
<property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -274,7 +234,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Inserts a separator between thousands.</property>
<property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -289,8 +248,6 @@
<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>
</object>
generated by cgit (git 2.34.1) at 2025-02-01 23:48:56 +0000