subject:"core.git\: svx\/source svx\/uiconfig"

core.git: svx/source svx/uiconfig

2024-06-21 Thread Jim Raykowski (via logerrit)

 svx/source/form/filtnav.cxx|2 +-
 svx/uiconfig/ui/filternavigator.ui |   13 +
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit c5bbbe987321d8f9e101fab9d67ddbf3d4f8dfca
Author: Jim Raykowski 
AuthorDate: Thu Jun 20 17:04:11 2024 -0800
Commit: Jim Raykowski 
CommitDate: Fri Jun 21 18:29:40 2024 +0200

tdf#161537 fix Filter Navigator no longer shows the name of the field

Change-Id: I3dae3458ac5795b217743b1e6897345a22f1bf61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169310
Reviewed-by: Jim Raykowski 
Tested-by: Jenkins

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 722deefaca35..fe633e9fdd20 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1061,7 +1061,7 @@ FmFilterNavigator::FmFilterNavigator(vcl::Window* 
pTopLevel, std::unique_ptrconnect_custom_get_size(LINK(this, FmFilterNavigator, 
CustomGetSizeHdl));
 m_xTreeView->connect_custom_render(LINK(this, FmFilterNavigator, 
CustomRenderHdl));
-m_xTreeView->set_column_custom_renderer(0, true);
+m_xTreeView->set_column_custom_renderer(1, true);
 
 m_xTreeView->connect_changed(LINK(this, FmFilterNavigator, SelectHdl));
 m_xTreeView->connect_key_press(LINK(this, FmFilterNavigator, KeyInputHdl));
diff --git a/svx/uiconfig/ui/filternavigator.ui 
b/svx/uiconfig/ui/filternavigator.ui
index 46820867f42e..8999be58f37b 100644
--- a/svx/uiconfig/ui/filternavigator.ui
+++ b/svx/uiconfig/ui/filternavigator.ui
@@ -4,7 +4,7 @@
   
   
 
-  
+  
   
   
   
@@ -43,16 +43,21 @@
   
 
 
-  
+  
+False
+  
+
+
+  
 6
 
-  
+  
   
 0
   
 
 
-  
+  
 True

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2023-11-28 Thread Heiko Tietze (via logerrit)

 svx/source/dialog/srchdlg.cxx|1 +
 svx/source/form/labelitemwindow.cxx  |1 +
 svx/uiconfig/ui/findreplacedialog.ui |   11 ++-
 svx/uiconfig/ui/labelbox.ui  |2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 5a622f1a29d249a512cc24f99d189f748623c678
Author: Heiko Tietze 
AuthorDate: Tue Nov 28 11:10:58 2023 +0100
Commit: Heiko Tietze 
CommitDate: Tue Nov 28 14:33:18 2023 +0100

Related tdf#156227 - Find/quickfind design

Themed icons look bad when drawn white on light blue;
using the same icon as on the infobar makes more sense

Change-Id: I6b4fd2bac7dce41b8196c702e0f0dc87712e2b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160017
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b5cf7bcf34fd..b1c87a6db7c8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -344,6 +344,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 
 m_xSearchLabel->set_font_color(Color(0x00, 0x47, 0x85));
 this->SetSearchLabel(""); // hide the message but keep the box height
+m_xSearchIcon->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 - 
too large here
 
 m_xReplaceTmplLB->make_sorted();
 m_xReplaceAttrText->hide();
diff --git a/svx/source/form/labelitemwindow.cxx 
b/svx/source/form/labelitemwindow.cxx
index bdff03e060f2..1ccbe6c5d156 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -19,6 +19,7 @@ LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const 
OUString& rLabel)
 
 m_xLabel->set_label(rLabel);
 m_xImage->hide();
+m_xImage->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 - too 
large here
 
 SetOptimalSize();
 
diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index 57a16e666a2f..e915a647f710 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -290,15 +290,16 @@
   
 True
 False
+center
 6
 3
 3
 3
-res/info.png
+vcl/res/infobox.png
 
-
-Search icon
-
+  
+Search icon
+  
 
   
   
@@ -323,7 +324,7 @@
 0
 
   
-  notification
+notification
   
 
   
diff --git a/svx/uiconfig/ui/labelbox.ui b/svx/uiconfig/ui/labelbox.ui
index f77cd5da7f4e..29210661b91c 100644
--- a/svx/uiconfig/ui/labelbox.ui
+++ b/svx/uiconfig/ui/labelbox.ui
@@ -15,7 +15,7 @@
 6
 3
 3
-res/info.png
+vcl/res/infobox.png
   
   
 False

[Libreoffice-commits] core.git: svx/source svx/uiconfig sw/uiconfig

2023-07-05 Thread Maxim Monastirsky (via logerrit)

 svx/source/sidebar/text/TextPropertyPanel.cxx |8 --
 svx/source/sidebar/text/TextPropertyPanel.hxx |2 -
 svx/uiconfig/ui/sidebartextpanel.ui   |   32 +++---
 sw/uiconfig/sglobal/toolbar/textstylebar.xml  |2 -
 sw/uiconfig/swriter/toolbar/textstylebar.xml  |2 -
 sw/uiconfig/swriter/ui/notebookbar_groups.ui  |2 -
 6 files changed, 8 insertions(+), 40 deletions(-)

New commits:
commit c0f1f67bfd2853554b58127e91443526c44163d7
Author: Maxim Monastirsky 
AuthorDate: Wed Jul 5 01:28:05 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Wed Jul 5 08:14:20 2023 +0200

Swap .uno:FontColor for .uno:Color

Following tdf#105293, which left some UI elements unchanged.
This also simplifies the sidebar, as .uno:Color is universal
while .uno:FontColor works only with Writer text. It also
benefits tdf#154270, as using the same command in the toolbar
and the sidebar will keep their color in sync.

Change-Id: Ia6e1ffef4012b6f8db4c9079d0b0c99a59887670
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154012
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index d5bfc2a480df..5b4e907cd86b 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -49,9 +49,7 @@ TextPropertyPanel::TextPropertyPanel(weld::Widget* pParent, 
const css::uno::Refe
 , mxFontEffectsDispatch(new ToolbarUnoDispatcher(*mxFontEffects, 
*m_xBuilder, rxFrame))
 , mxFontAdjust(m_xBuilder->weld_toolbar("fontadjust"))
 , mxFontAdjustDispatch(new ToolbarUnoDispatcher(*mxFontAdjust, 
*m_xBuilder, rxFrame))
-, mxToolBoxFontColorSw(m_xBuilder->weld_toolbar("colorbar_writer"))
-, mxToolBoxFontColorSwDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxFontColorSw, *m_xBuilder, rxFrame))
-, mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar_others"))
+, mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar"))
 , mxToolBoxFontColorDispatch(new ToolbarUnoDispatcher(*mxToolBoxFontColor, 
*m_xBuilder, rxFrame))
 , mxToolBoxBackgroundColor(m_xBuilder->weld_toolbar("colorbar_background"))
 , mxToolBoxBackgroundColorDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
@@ -78,7 +76,6 @@ TextPropertyPanel::~TextPropertyPanel()
 mxDefaultBarDispatch.reset();
 mxPositionBarDispatch.reset();
 mxSpacingBarDispatch.reset();
-mxToolBoxFontColorSwDispatch.reset();
 mxToolBoxFontColorDispatch.reset();
 mxToolBoxBackgroundColorDispatch.reset();
 mxFontAdjustDispatch.reset();
@@ -90,7 +87,6 @@ TextPropertyPanel::~TextPropertyPanel()
 mxDefaultBar.reset();
 mxPositionBar.reset();
 mxSpacingBar.reset();
-mxToolBoxFontColorSw.reset();
 mxToolBoxFontColor.reset();
 mxToolBoxBackgroundColor.reset();
 mxFontAdjust.reset();
@@ -143,8 +139,6 @@ void TextPropertyPanel::HandleContextChange (
 break;
 }
 
-mxToolBoxFontColor->set_visible(!bWriterText);
-mxToolBoxFontColorSw->set_visible(bWriterText);
 mxToolBoxBackgroundColor->set_visible(bWriterText || bDrawText);
 mxResetBar->set_visible(bWriterText || bCalcText);
 mxDefaultBar->set_visible(bDrawText);
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx 
b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 3ad44bde78ac..c383ef1bd891 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -53,8 +53,6 @@ private:
 std::unique_ptr mxFontEffectsDispatch;
 std::unique_ptr mxFontAdjust;
 std::unique_ptr mxFontAdjustDispatch;
-std::unique_ptr mxToolBoxFontColorSw;
-std::unique_ptr mxToolBoxFontColorSwDispatch;
 std::unique_ptr mxToolBoxFontColor;
 std::unique_ptr mxToolBoxFontColorDispatch;
 std::unique_ptr mxToolBoxBackgroundColor;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 732c3ee421ed..97a92d97a0f5 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -161,31 +161,7 @@
 False
 6
 
-  
-True
-True
-icons
-False
-2
-
-  
-True
-True
-  
-  
-False
-False
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
+  
 True
 True
 icons
@@ -205,7 +181,7 @@
   
 False
 True
-1
+0

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2023-04-28 Thread Tomaž Vajngerl (via logerrit)

 svx/source/dialog/ThemeDialog.cxx |4 +++-
 svx/uiconfig/ui/themedialog.ui|2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dcb8f373d7bcd328e69e0bea85b76874923ce0dd
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 27 20:31:05 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Apr 28 14:11:51 2023 +0200

disable dbl-click in ThemeDialog in LOK, remove the dialog size

The double click in THemeDialog exits the dialog automatically,
but this causes a crash in online, so disable it there.

No need to set the theme dialog size to a certain fixed value so
we don't add white space.

Change-Id: I555a631b7d0c515ec326c3654138982c59d3f021
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151106
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/svx/source/dialog/ThemeDialog.cxx 
b/svx/source/dialog/ThemeDialog.cxx
index c440292b723d..01f88fa036ed 100644
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace svx
 {
@@ -65,7 +66,8 @@ void ThemeDialog::initColorSets()
 IMPL_LINK_NOARG(ThemeDialog, DoubleClickValueSetHdl, ValueSet*, void)
 {
 SelectItem(nullptr);
-m_xDialog->response(RET_OK);
+if (!comphelper::LibreOfficeKit::isActive())
+m_xDialog->response(RET_OK);
 }
 
 IMPL_LINK_NOARG(ThemeDialog, SelectItem, ValueSet*, void)
diff --git a/svx/uiconfig/ui/themedialog.ui b/svx/uiconfig/ui/themedialog.ui
index 80bbcc5fca67..6895f51dff24 100644
--- a/svx/uiconfig/ui/themedialog.ui
+++ b/svx/uiconfig/ui/themedialog.ui
@@ -3,8 +3,6 @@
 
   
   
-640
-480
 False
 True
 True

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2023-01-02 Thread Szymon Kłos (via logerrit)

 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx |2 +-
 svx/uiconfig/ui/sidebarshadow.ui  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 36de236836ee01f971744540688daad603583998
Author: Szymon Kłos 
AuthorDate: Tue Nov 29 19:59:57 2022 +0100
Commit: Szymon Kłos 
CommitDate: Tue Jan 3 06:06:24 2023 +

jsdialogs: fix generic color label name

update event was triggering other widget change:
when opened calc and selected shape first time
we saw color text next to other color label

Change-Id: I71670ac1273ce96fafc8d20126d9f32151e96d89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143471
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144950
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx 
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 93259adc27f0..914d13de695d 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -50,7 +50,7 @@ ShadowPropertyPanel::ShadowPropertyPanel(
 mxFTDistance(m_xBuilder->weld_label("distance")),
 mxFTTransparency(m_xBuilder->weld_label("transparency_label")),
 mxFTBlur(m_xBuilder->weld_label("blur_label")),
-mxFTColor(m_xBuilder->weld_label("color")),
+mxFTColor(m_xBuilder->weld_label("shadowcolorlabel")),
 mxShadowTransSlider(m_xBuilder->weld_scale("transparency_slider")),
 
mxShadowTransMetric(m_xBuilder->weld_metric_spin_button("FIELD_TRANSPARENCY", 
FieldUnit::PERCENT)),
 mxShadowBlurMetric(m_xBuilder->weld_metric_spin_button("LB_SHADOW_BLUR", 
FieldUnit::POINT))
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index a2b170ffa792..26e2263134cc 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -89,10 +89,10 @@
   
 
 
-  
+  
 True
 False
-Color:
+Color:
 True
 LB_SHADOW_COLOR
 0

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2022-04-27 Thread Mike Kaganski (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   18 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |6 +++---
 svx/uiconfig/ui/sidebarpossize.ui   |4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 42eeddb2e634f70418b2aaba7ba9fb479a58ac0e
Author: Mike Kaganski 
AuthorDate: Tue Apr 26 09:21:24 2022 +0300
Commit: Mike Kaganski 
CommitDate: Wed Apr 27 11:39:25 2022 +0200

[ Edit Chart ] -> [ Edit Object ]

This button was introduced in commit 
376cd2ceaeedd12a8050c5acd142cd9b9d5e731a
  Author Muhammet Kara 
  Date   Wed Nov 20 15:30:01 2019 +0300
Add Edit Chart button for online's mobile view

It is shown for any kind of OLE object, including Math. So make its text
more neutral.

Possibly it could make sense to construct the name from the OLE object's
proper name in a follow-up.

Change-Id: Ied2e9b10db3bcbfab4328a1f65f812cd52f85004
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133426
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5afedbf01868..833113b1293b 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -85,7 +85,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 mxAlignDispatch(new ToolbarUnoDispatcher(*mxAlignTbx, *m_xBuilder, 
rxFrame)),
 mxAlignTbx2(m_xBuilder->weld_toolbar("aligntoolbar2")),
 mxAlignDispatch2(new ToolbarUnoDispatcher(*mxAlignTbx2, *m_xBuilder, 
rxFrame)),
-mxBtnEditChart(m_xBuilder->weld_button("btnEditChart")),
+mxBtnEditOLEObject(m_xBuilder->weld_button("btnEditObject")),
 mpView(nullptr),
 mlOldWidth(1),
 mlOldHeight(1),
@@ -157,7 +157,7 @@ PosSizePropertyPanel::~PosSizePropertyPanel()
 mxArrangeDispatch2.reset();
 mxArrangeTbx.reset();
 mxArrangeTbx2.reset();
-mxBtnEditChart.reset();
+mxBtnEditOLEObject.reset();
 
 maTransfPosXControl.dispose();
 maTransfPosYControl.dispose();
@@ -226,7 +226,7 @@ void PosSizePropertyPanel::Initialize()
 pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
 mxCtrlDial->Init(aSize);
 
-mxBtnEditChart->connect_clicked( LINK( this, PosSizePropertyPanel, 
ClickChartEditHdl ) );
+mxBtnEditOLEObject->connect_clicked( LINK( this, PosSizePropertyPanel, 
ClickObjectEditHdl ) );
 
 SfxViewShell* pCurSh = SfxViewShell::Current();
 if ( pCurSh )
@@ -273,7 +273,7 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowPosition = false;
 bool bShowAngle = false;
 bool bShowFlip = false;
-bool bShowEditChart = false;
+bool bShowEditObject = false;
 bool bShowArrangeTbx2 = false;
 
 switch (maContext.GetCombinedContext_DI())
@@ -302,13 +302,13 @@ void PosSizePropertyPanel::HandleContextChange(
 break;
 
 case CombinedEnumContext(Application::WriterVariants, Context::OLE):
-bShowEditChart = true;
+bShowEditObject = true;
 break;
 
 case CombinedEnumContext(Application::Calc, Context::OLE):
 case CombinedEnumContext(Application::DrawImpress, Context::OLE):
 bShowPosition = true;
-bShowEditChart = true;
+bShowEditObject = true;
 break;
 
 case CombinedEnumContext(Application::Calc, Context::Chart):
@@ -338,8 +338,8 @@ void PosSizePropertyPanel::HandleContextChange(
 mxFtFlip->set_visible(bShowFlip);
 mxFlipTbx->set_visible(bShowFlip);
 
-// Edit Chart
-mxBtnEditChart->set_visible(bShowEditChart);
+// Edit Object
+mxBtnEditOLEObject->set_visible(bShowEditObject);
 
 // Arrange tool bar 2
 mxArrangeTbx2->set_visible(bShowArrangeTbx2);
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, 
DialControl&, void )
 SfxCallMode::RECORD, { , ,  });
 }
 
-IMPL_STATIC_LINK_NOARG( PosSizePropertyPanel, ClickChartEditHdl, 
weld::Button&, void )
+IMPL_STATIC_LINK_NOARG( PosSizePropertyPanel, ClickObjectEditHdl, 
weld::Button&, void )
 {
 SfxViewShell* pCurSh = SfxViewShell::Current();
 if ( pCurSh)
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 088290557d9a..ede3d3e44315 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -114,8 +114,8 @@ private:
 std::unique_ptr mxAlignTbx2;
 std::unique_ptr mxAlignDispatch2;
 
-//edit charts button for online's mobile view
-std::unique_ptr mxBtnEditChart;
+//edit objects button for online's mobile view
+std::unique_ptr mxBtnEditOLEObject;
 
 // Internal variables
 basegfx::B2DRange   maRect;
@@ -161,7 +161,7 @@ private:
 DECL_LINK( ChangeHeightHdl,

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2022-02-14 Thread 4k5h1t (via logerrit)

 svx/source/tbxctrls/fontworkgallery.cxx |   13 ++---
 svx/uiconfig/ui/fontworkalignmentcontrol.ui |   24 +---
 2 files changed, 7 insertions(+), 30 deletions(-)

New commits:
commit 31180cc24f8ff66895c52a2d4aa828ee0dcb34f3
Author: 4k5h1t 
AuthorDate: Sun Feb 13 00:17:13 2022 +0530
Commit: Heiko Tietze 
CommitDate: Tue Feb 15 06:18:29 2022 +0100

tdf#145092 - Remove option "Word justify" from FontWork toolbar

Change-Id: Id36f7b1b8313868e730018737b353d92adbde33e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124337
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index de42c5f639c4..39c3b0af240e 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -286,7 +286,6 @@ private:
 std::unique_ptr mxLeft;
 std::unique_ptr mxCenter;
 std::unique_ptr mxRight;
-std::unique_ptr mxWord;
 std::unique_ptr mxStretch;
 bool mbSettingValue;
 
@@ -305,14 +304,12 @@ 
FontworkAlignmentWindow::FontworkAlignmentWindow(svt::PopupWindowController* pCo
 , mxLeft(m_xBuilder->weld_radio_button("left"))
 , mxCenter(m_xBuilder->weld_radio_button("center"))
 , mxRight(m_xBuilder->weld_radio_button("right"))
-, mxWord(m_xBuilder->weld_radio_button("word"))
 , mxStretch(m_xBuilder->weld_radio_button("stretch"))
 , mbSettingValue(false)
 {
 mxLeft->connect_toggled(LINK(this, FontworkAlignmentWindow, SelectHdl));
 mxCenter->connect_toggled(LINK(this, FontworkAlignmentWindow, SelectHdl));
 mxRight->connect_toggled(LINK(this, FontworkAlignmentWindow, SelectHdl));
-mxWord->connect_toggled(LINK(this, FontworkAlignmentWindow, SelectHdl));
 mxStretch->connect_toggled(LINK(this, FontworkAlignmentWindow, SelectHdl));
 
 AddStatusListener( gsFontworkAlignment );
@@ -328,8 +325,9 @@ void FontworkAlignmentWindow::implSetAlignment( int 
nSurface, bool bEnabled )
 mxCenter->set_sensitive(bEnabled);
 mxRight->set_active(nSurface == 2 && bEnabled);
 mxRight->set_sensitive(bEnabled);
-mxWord->set_active(nSurface == 3 && bEnabled);
-mxWord->set_sensitive(bEnabled);
+//Refer https://bugs.documentfoundation.org/show_bug.cgi?id=145092 for why 
following lines are commented
+//mxWord->set_active(nSurface == 3 && bEnabled);
+//mxWord->set_sensitive(bEnabled);
 mxStretch->set_active(nSurface == 4 && bEnabled);
 mxStretch->set_sensitive(bEnabled);
 mbSettingValue = bSettingValue;
@@ -364,8 +362,9 @@ IMPL_LINK(FontworkAlignmentWindow, SelectHdl, 
weld::Toggleable&, rButton, void)
 nAlignment = 1;
 else if (mxRight->get_active())
 nAlignment = 2;
-else if (mxWord->get_active())
-nAlignment = 3;
+//Refer https://bugs.documentfoundation.org/show_bug.cgi?id=145092 for why 
following lines are commented
+//else if (mxWord->get_active())
+//nAlignment = 3;
 else
 nAlignment = 4;
 
diff --git a/svx/uiconfig/ui/fontworkalignmentcontrol.ui 
b/svx/uiconfig/ui/fontworkalignmentcontrol.ui
index 13abbb71ec3b..2a8e1c8288b8 100644
--- a/svx/uiconfig/ui/fontworkalignmentcontrol.ui
+++ b/svx/uiconfig/ui/fontworkalignmentcontrol.ui
@@ -17,11 +17,6 @@
 False
 svx/res/fontworkalignright_16.png
   
-  
-True
-False
-svx/res/fontworkalignjustified_16.png
-  
   
 True
 False
@@ -91,23 +86,6 @@
 2
   
 
-
-  
-_Word 
Justify
-True
-True
-False
-image4
-True
-True
-True
-left
-  
-  
-0
-3
-  
-
 
   
 S_tretch 
Justify
@@ -122,7 +100,7 @@
   
   
 0
-4
+3

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2021-06-18 Thread Katarina Behrens (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |2 +-
 svx/uiconfig/ui/sidebarpossize.ui   |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7a717c8b9319edcc12e50ab78554b8e0e7049cbf
Author: Katarina Behrens 
AuthorDate: Fri Jun 18 09:48:25 2021 +0200
Commit: Katarina Behrens 
CommitDate: Fri Jun 18 13:34:38 2021 +0200

tdf#141311: Rotation spinbox in sidebar used to have 2 decimal places

regression from weld-ing (c85fcc6e1994eb8e079aaca85066ab4d67149c15)

Change-Id: Iad0725fd4542ecdddb65092846dbf9d103016d9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117408
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 8139b3dc4d69..943117f9a57d 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -218,7 +218,7 @@ void PosSizePropertyPanel::Initialize()
 mxCbxScale->connect_toggled( LINK( this, PosSizePropertyPanel, 
ClickAutoHdl ) );
 
 //rotation control
-mxCtrlDial->SetLinkedField(mxMtrAngle.get());
+mxCtrlDial->SetLinkedField(mxMtrAngle.get(), 2);
 mxCtrlDial->SetModifyHdl(LINK( this, PosSizePropertyPanel, RotationHdl));
 
 //use same logic as DialControl_Impl::SetSize
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index f608be61a963..f6d92e15c7e6 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -388,6 +388,7 @@
 True
 Select the angle for 
rotation.
 True
+2
 adjustmentSpinDegrees
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2021-02-10 Thread Tomaž Vajngerl (via logerrit)

 svx/source/devtools/DevelopmentToolDockingWindow.cxx |  195 +--
 svx/uiconfig/ui/developmenttool.ui   |   24 +-
 2 files changed, 203 insertions(+), 16 deletions(-)

New commits:
commit e71350e037dcd49f24c939395ab6436051382c83
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 1 15:42:54 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Feb 10 14:15:04 2021 +0100

devtools: add values for properties in object inspector tree view

Change-Id: Ia53ea2cbc9797cd787d1ea3d841f947a515055e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110251
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx 
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index 40e5bcc76857..da3b8d5896b5 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -21,6 +21,10 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
+#include 
 #include 
 
 #include 
@@ -193,6 +197,156 @@ void DevelopmentToolDockingWindow::selectionChanged(
 updateSelection();
 }
 
+namespace
+{
+uno::Reference
+TypeToIdlClass(const uno::Type& rType, const 
uno::Reference& xContext)
+{
+auto xReflection = reflection::theCoreReflection::get(xContext);
+
+uno::Reference xRetClass;
+typelib_TypeDescription* pTD = nullptr;
+rType.getDescription();
+if (pTD)
+{
+OUString sOWName(pTD->pTypeName);
+xRetClass = xReflection->forName(sOWName);
+}
+return xRetClass;
+}
+
+OUString AnyToString(const uno::Any& aValue, const 
uno::Reference& xContext)
+{
+uno::Type aValType = aValue.getValueType();
+uno::TypeClass eType = aValType.getTypeClass();
+
+OUString aRetStr;
+switch (eType)
+{
+case uno::TypeClass_TYPE:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_INTERFACE:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_SERVICE:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_STRUCT:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_TYPEDEF:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_ENUM:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_EXCEPTION:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_SEQUENCE:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_VOID:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_ANY:
+{
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+aRetStr = xIdlClass->getName() + " ";
+break;
+}
+case uno::TypeClass_UNKNOWN:
+aRetStr = "";
+break;
+case uno::TypeClass_BOOLEAN:
+{
+bool bBool = aValue.get();
+aRetStr = bBool ? u"True" : u"False";
+break;
+}
+case uno::TypeClass_CHAR:
+{
+sal_Unicode aChar = aValue.get();
+aRetStr = OUString::number(aChar);
+break;
+}
+case uno::TypeClass_STRING:
+{
+aRetStr = "\"" + aValue.get() + "\"";
+break;
+}
+case uno::TypeClass_FLOAT:
+{
+auto aNumber = aValue.get();
+aRetStr = OUString::number(aNumber);
+break;
+}
+case uno::TypeClass_DOUBLE:
+{
+auto aNumber = aValue.get();
+aRetStr = OUString::number(aNumber);
+break;
+}
+case uno::TypeClass_BYTE:
+{
+auto aNumber = aValue.get();
+aRetStr = OUString::number(aNumber);
+break;
+}
+case uno::TypeClass_SHORT:
+{
+auto aNumber = aValue.get();
+aRetStr = OUString::number(aNumber);
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2021-01-26 Thread Caolán McNamara (via logerrit)

 svx/source/devtools/DevelopmentToolDockingWindow.cxx |3 +++
 svx/uiconfig/ui/developmenttool.ui   |   13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 0bbb834a2d21597697333ee88573b2b8e5d43664
Author: Caolán McNamara 
AuthorDate: Tue Jan 26 15:29:20 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 26 18:33:09 2021 +0100

fix gtk warning about missing 'weight' property

Change-Id: Ifada66e27955c23eefb41852204fd99f6711a7bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109962
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx 
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index c09bc4035c6e..65e4d140cf0e 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -177,6 +177,7 @@ void 
DevelopmentToolDockingWindow::introspect(uno::Reference co
 {
 mpClassListBox->insert(pParent.get(), -1, , nullptr, 
nullptr, nullptr, false,
pResult.get());
+mpClassListBox->set_text_emphasis(*pResult, false, 0);
 }
 
 uno::Reference xIntrospection;
@@ -196,6 +197,7 @@ void 
DevelopmentToolDockingWindow::introspect(uno::Reference co
 {
 mpClassListBox->insert(pParent.get(), -1, , nullptr, 
nullptr, nullptr, false,
pResult.get());
+mpClassListBox->set_text_emphasis(*pResult, false, 0);
 }
 
 OUString aMethodsString("Methods");
@@ -209,6 +211,7 @@ void 
DevelopmentToolDockingWindow::introspect(uno::Reference co
 OUString aMethodName = xMethod->getName();
 mpClassListBox->insert(pParent.get(), -1, , nullptr, 
nullptr, nullptr, false,
pResult.get());
+mpClassListBox->set_text_emphasis(*pResult, false, 0);
 }
 
 mpClassListBox->thaw();
diff --git a/svx/uiconfig/ui/developmenttool.ui 
b/svx/uiconfig/ui/developmenttool.ui
index 948fe76386ae..2b00a83f5142 100644
--- a/svx/uiconfig/ui/developmenttool.ui
+++ b/svx/uiconfig/ui/developmenttool.ui
@@ -4,13 +4,19 @@
   
   
 
-  
+  
   
+  
+  
+  
+  
+  
+  
 
   
   
 
-  
+  
   
   
   
@@ -157,9 +163,8 @@
 end
   
   
-5
 0
-3
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig sw/qa

2021-01-14 Thread Julien Nabet (via logerrit)

 svx/source/dialog/rubydialog.cxx |2 +-
 svx/uiconfig/ui/asianphoneticguidedialog.ui  |4 ++--
 sw/qa/uitest/writer_tests2/asianPhoneticGuide.py |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6a80183743d71b1a03a67e6dc4657dea6d56e6fe
Author: Julien Nabet 
AuthorDate: Wed Jan 13 23:00:22 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jan 14 16:55:44 2021 +0100

Asian phonetic guide dialog uses "close" widget

and not cancel one.
widget response = -7 corresponds to GTK_RESPONSE_CLOSE
See https://gtk.developpez.com/doc/en/gtk/GtkDialog.html
label is "gtk-close" and the variable name is "m_xClosePB"

Change-Id: I6ac8e1814ff3c594498d81e99e864939b6a2c23a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 2c74895c0bb1..4302d4f6b41d 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -205,7 +205,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, 
SfxChildWindow* pCW, weld::Wind
 , m_xCharStyleLB(m_xBuilder->weld_combo_box("stylelb"))
 , m_xStylistPB(m_xBuilder->weld_button("styles"))
 , m_xApplyPB(m_xBuilder->weld_button("ok"))
-, m_xClosePB(m_xBuilder->weld_button("cancel"))
+, m_xClosePB(m_xBuilder->weld_button("close"))
 , m_xContentArea(m_xDialog->weld_content_area())
 , m_xGrid(m_xBuilder->weld_widget("grid"))
 , m_xPreviewWin(new RubyPreview)
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui 
b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 8c4e4c9237bf..96d2dc04cb65 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui
@@ -35,7 +35,7 @@
   
 
 
-  
+  
 gtk-close
 True
 True
@@ -487,7 +487,7 @@
 
 
   ok
-  cancel
+  close
   help
 
 
diff --git a/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py 
b/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
index 4722541e6e66..1af2bfe94933 100644
--- a/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
+++ b/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
@@ -42,7 +42,7 @@ class asianPhoneticGuide(UITestCase):
 xApplyBtn = xDialog.getChild("ok")
 xApplyBtn.executeAction("CLICK", tuple())
 
-xCloseBtn = xDialog.getChild("cancel")
+xCloseBtn = xDialog.getChild("close")
 self.ui_test.close_dialog_through_button(xCloseBtn)
 
 self.assertEqual(document.Text.String[0:1], "a")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig sw/uiconfig

2020-10-29 Thread andreas kainz (via logerrit)

 svx/source/inc/StylesPreviewWindow.hxx  |4 -
 svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx |6 +-
 svx/source/tbxctrls/StylesPreviewWindow.cxx |6 +-
 svx/source/tbxctrls/tbcontrl.cxx|4 +
 svx/uiconfig/ui/stylespreview.ui|   57 
 sw/uiconfig/swriter/ui/notebookbar.ui   |1 
 6 files changed, 47 insertions(+), 31 deletions(-)

New commits:
commit 55e0a9f5506ca95238b3b70cb9beb33d089577f4
Author: andreas kainz 
AuthorDate: Thu Oct 29 14:31:35 2020 +0100
Commit: Andreas Kainz 
CommitDate: Thu Oct 29 23:09:49 2020 +0100

StylesPreview in Writer NB arrangement in two rows

Change-Id: I05e0b903e7d51cb2487f18f5bbeb6228ba7c945f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105008
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/svx/source/inc/StylesPreviewWindow.hxx 
b/svx/source/inc/StylesPreviewWindow.hxx
index 2b930672d23f..8381f3b72c49 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -74,7 +74,7 @@ private:
 class StylesPreviewWindow_Base
 {
 protected:
-static constexpr unsigned STYLES_COUNT = 4;
+static constexpr unsigned STYLES_COUNT = 6;
 
 std::unique_ptr m_xStyleControllers[STYLES_COUNT];
 std::unique_ptr m_xStyleControllersWeld[STYLES_COUNT];
@@ -124,4 +124,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx 
b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
index 9b78a0e7aaf0..47995067ae03 100644
--- a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
+++ b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
@@ -68,8 +68,8 @@ void StylesPreviewToolBoxControl::InitializeStyles(
 css::uno::Reference xParaStyles;
 xStylesSupplier->getStyleFamilies()->getByName("ParagraphStyles") 
>>= xParaStyles;
 static const std::vector aWriterStyles
-= { "Standard",  "Text body", "Title", "Subtitle",
-"Heading 1", "Heading 2", "Heading 3", "Quotations" };
+= { "Standard",  "Text body", "Heading 1", "Heading 2",  
"Heading 3",
+"Heading 4", "Title", "Subtitle",  "Quotations", 
"Preformatted Text" };
 for (const OUString& aStyle : aWriterStyles)
 {
 try
@@ -185,4 +185,4 @@ 
com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation(
 return cppu::acquire(new StylesPreviewToolBoxControl());
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx 
b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 7448592f2162..265fea39b956 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -369,7 +369,7 @@ StylesPreviewWindow_Base::StylesPreviewWindow_Base(
 
 m_xStyleControllersWeld[i].reset(
 new weld::CustomWeld(xBuilder, sId, *m_xStyleControllers[i]));
-m_xStyleControllersWeld[i]->set_size_request(100, 60);
+m_xStyleControllersWeld[i]->set_size_request(128, 28);
 }
 
 m_xUp->connect_clicked(LINK(this, StylesPreviewWindow_Base, GoUp));
@@ -477,14 +477,14 @@ IMPL_LINK(StylesPreviewWindow_Base, GoUp, const OString&, 
/*rItem*/, void)
 if (m_nStyleIterator == 0)
 m_nStyleIterator = m_aAllStyles.size();
 else
-m_nStyleIterator--;
+m_nStyleIterator = m_nStyleIterator - 2;
 
 Update();
 }
 
 IMPL_LINK(StylesPreviewWindow_Base, GoDown, const OString&, /*rItem*/, void)
 {
-m_nStyleIterator++;
+m_nStyleIterator = m_nStyleIterator + 2;
 Update();
 }
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index af2eea072998..548aced8073c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2560,7 +2560,9 @@ struct SvxStyleToolBoxControl::Impl
 "Heading 1",
 "Heading 2",
 "Heading 3",
-"Quotations"
+"Heading 4",
+"Quotations",
+"Preformatted Text"
 };
 for( const OUString& aStyle: aWriterStyles )
 {
diff --git a/svx/uiconfig/ui/stylespreview.ui b/svx/uiconfig/ui/stylespreview.ui
index fd3edce9cc20..389860619859 100644
--- a/svx/uiconfig/ui/stylespreview.ui
+++ b/svx/uiconfig/ui/stylespreview.ui
@@ -1,32 +1,39 @@
 
-
+
 
   
   
 True
 False
 True
-6

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-09-25 Thread andreas kainz (via logerrit)

 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |  147 
 svx/uiconfig/ui/sidebargraphic.ui   |  231 +---
 2 files changed, 20 insertions(+), 358 deletions(-)

New commits:
commit a10585b209c1542ebd2cd0bce6407b8a1c992c48
Author: andreas kainz 
AuthorDate: Fri Sep 25 14:59:49 2020 +0200
Commit: Andreas Kainz 
CommitDate: Fri Sep 25 18:03:02 2020 +0200

tdf#137014 Sidebar: Image section remove red/green/blue/gamma

Change-Id: Ia726ef0edbed9ee536c9df7b08901ff60e318b02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103397
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx 
b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 5ab60aff01ae..b42509639ffd 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -52,11 +52,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
 mxMtrBrightness(m_xBuilder->weld_metric_spin_button("setbrightness", 
FieldUnit::PERCENT)),
 mxMtrContrast(m_xBuilder->weld_metric_spin_button("setcontrast", 
FieldUnit::PERCENT)),
 mxLBColorMode(m_xBuilder->weld_combo_box("setcolormode")),
-mxMtrTrans(m_xBuilder->weld_metric_spin_button("setgraphtransparency", 
FieldUnit::PERCENT)),
-mxMtrRed(m_xBuilder->weld_metric_spin_button("setred", 
FieldUnit::PERCENT)),
-mxMtrGreen(m_xBuilder->weld_metric_spin_button("setgreen", 
FieldUnit::PERCENT)),
-mxMtrBlue(m_xBuilder->weld_metric_spin_button("setblue", 
FieldUnit::PERCENT)),
-mxMtrGamma(m_xBuilder->weld_spin_button("setgamma"))
+mxMtrTrans(m_xBuilder->weld_metric_spin_button("setgraphtransparency", 
FieldUnit::PERCENT))
 {
 
mxLBColorMode->set_size_request(mxLBColorMode->get_preferred_size().Width(), 
-1);
 Initialize();
@@ -73,10 +69,6 @@ void GraphicPropertyPanel::dispose()
 mxMtrContrast.reset();
 mxLBColorMode.reset();
 mxMtrTrans.reset();
-mxMtrRed.reset();
-mxMtrGreen.reset();
-mxMtrBlue.reset();
-mxMtrGamma.reset();
 
 maBrightControl.dispose();
 maContrastControl.dispose();
@@ -101,11 +93,6 @@ void GraphicPropertyPanel::Initialize()
 mxLBColorMode->append_text(SvxResId(RID_SVXSTR_GRAFMODE_MONO));
 mxLBColorMode->append_text(SvxResId(RID_SVXSTR_GRAFMODE_WATERMARK));
 mxLBColorMode->connect_changed( LINK( this, GraphicPropertyPanel, 
ClickColorModeHdl ));
-
-mxMtrRed->connect_value_changed( LINK( this, GraphicPropertyPanel, RedHdl 
) );
-mxMtrGreen->connect_value_changed( LINK( this, GraphicPropertyPanel, 
GreenHdl ) );
-mxMtrBlue->connect_value_changed( LINK( this, GraphicPropertyPanel, 
BlueHdl ) );
-mxMtrGamma->connect_value_changed( LINK( this, GraphicPropertyPanel, 
GammaHdl ) );
 }
 
 IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyBrightnessHdl, 
weld::MetricSpinButton&, void )
@@ -144,42 +131,6 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl, 
weld::ComboBox&, void
 }
 
 
-IMPL_LINK_NOARG( GraphicPropertyPanel, RedHdl, weld::MetricSpinButton&, void )
-{
-const sal_Int16 nRed = mxMtrRed->get_value(FieldUnit::PERCENT);
-const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
-GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_RED,
-SfxCallMode::RECORD, {  });
-}
-
-
-IMPL_LINK_NOARG( GraphicPropertyPanel, GreenHdl, weld::MetricSpinButton&, void 
)
-{
-const sal_Int16 nGreen = mxMtrGreen->get_value(FieldUnit::PERCENT);
-const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
-GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_GREEN,
-SfxCallMode::RECORD, {  });
-}
-
-
-IMPL_LINK_NOARG(GraphicPropertyPanel, BlueHdl, weld::MetricSpinButton&, void)
-{
-const sal_Int16 nBlue = mxMtrBlue->get_value(FieldUnit::PERCENT);
-const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
-GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_BLUE,
-SfxCallMode::RECORD, {  });
-}
-
-
-IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl, weld::SpinButton&, void)
-{
-const sal_Int32 nGamma = mxMtrGamma->get_value();
-const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
-GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_GAMMA,
-SfxCallMode::RECORD, {  });
-}
-
-
 VclPtr GraphicPropertyPanel::Create (
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
@@ -308,102 +259,6 @@ void GraphicPropertyPanel::NotifyItemUpdate(
 }
 break;
 }
-case SID_ATTR_GRAF_RED:
-{
-if(eState >= SfxItemState::DEFAULT)
-{
-mxMtrRed->set_sensitive(true);
-const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* 
>(pState);
-
-if(pItem)
-{
-const sal_Int64 nRed = pItem->GetValue();
-mxMtrRed->set_value(nRed,

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-07-23 Thread Caolán McNamara (via logerrit)

 svx/source/form/recorditemwindow.cxx |6 +-
 svx/uiconfig/ui/absrecbox.ui |2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6afd1e3c06e476a01c25032d3d95ed7e624b58e0
Author: Caolán McNamara 
AuthorDate: Thu Jul 23 11:26:16 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 23 20:44:41 2020 +0200

let record field shrink in width

and expand to fill available space

Change-Id: Idc12efb37ce1b3a6a51bb3469e2d886a52cc5047
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99310
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/form/recorditemwindow.cxx 
b/svx/source/form/recorditemwindow.cxx
index 26920ee2a42f..efb07343ecfc 100644
--- a/svx/source/form/recorditemwindow.cxx
+++ b/svx/source/form/recorditemwindow.cxx
@@ -30,7 +30,11 @@ RecordItemWindow::RecordItemWindow(vcl::Window* pParent)
 m_xWidget->connect_activate(LINK(this, RecordItemWindow, ActivatedHdl));
 m_xWidget->connect_focus_out(LINK(this, RecordItemWindow, FocusOutHdl));
 
-SetSizePixel(m_xWidget->get_preferred_size());
+auto aPrefSize(m_xWidget->get_preferred_size());
+
+m_xWidget->set_width_chars(1); // so a smaller than default width can be 
used later
+
+SetSizePixel(aPrefSize);
 }
 
 void RecordItemWindow::dispose()
diff --git a/svx/uiconfig/ui/absrecbox.ui b/svx/uiconfig/ui/absrecbox.ui
index 5b06bc879578..a91603f505f6 100644
--- a/svx/uiconfig/ui/absrecbox.ui
+++ b/svx/uiconfig/ui/absrecbox.ui
@@ -6,12 +6,14 @@
 True
 False
 True
+True
 4
 
   
 True
 True
 True
+True
 4
 none
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-07-23 Thread Shivam Kumar Singh (via logerrit)

 svx/source/sidebar/inspector/InspectorTextPanel.cxx |2 +-
 svx/uiconfig/ui/inspectortextpanel.ui   |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 27c1a7fbcd3e236d4eee7ee3e1a7acdaa47510eb
Author: Shivam Kumar Singh 
AuthorDate: Thu Jul 23 12:12:21 2020 +0530
Commit: Mike Kaganski 
CommitDate: Thu Jul 23 16:40:10 2020 +0200

Added headers to Inspector Panel

Change-Id: Id44d42a9a1495b74ce7f75be28aa2e39403e9f4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99265
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx 
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index ddbee7f51624..d9a389aefab9 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -51,7 +51,7 @@ InspectorTextPanel::InspectorTextPanel(vcl::Window* pParent,
 float fWidth = mpListBoxStyles->get_approximate_digit_width();
 std::vector aWidths;
 aWidths.push_back(fWidth * 34);
-aWidths.push_back(fWidth * 15);
+aWidths.push_back(fWidth * 34);
 mpListBoxStyles->set_column_fixed_widths(aWidths);
 }
 
diff --git a/svx/uiconfig/ui/inspectortextpanel.ui 
b/svx/uiconfig/ui/inspectortextpanel.ui
index 71199a8e449d..0b2de5a225f4 100644
--- a/svx/uiconfig/ui/inspectortextpanel.ui
+++ b/svx/uiconfig/ui/inspectortextpanel.ui
@@ -54,8 +54,6 @@
 True
 True
 liststore
-False
-False
 0
 True
 
@@ -63,6 +61,8 @@
 
 
   
+True
+Properties
 
   
   
@@ -75,6 +75,8 @@
 
 
   
+True
+Values
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-06-30 Thread Caolán McNamara (via logerrit)

 svx/source/dialog/dlgctrl.cxx  |8 ++--
 svx/uiconfig/ui/measurewidthbar.ui |   62 +
 2 files changed, 54 insertions(+), 16 deletions(-)

New commits:
commit 9bef09cb2f0c9c9e6819f28ed8e83c0edd6eadb6
Author: Caolán McNamara 
AuthorDate: Tue Jun 30 17:13:24 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jul 1 01:36:34 2020 +0200

tdf#134357 we can reduce the min toolbar sidebar width

since,

commit 754bea8c6a17889f9d4d23bf98847b6b67253220
Date:   Wed Apr 29 15:06:42 2020 +0100

remove the padding around the dropdown button of GtkMenuToolButtons

the GtkMenuToolButton aren't as wide anymore so we don't need a min of 5
GtkToolButtons widths for tdf#130197, now the max of either 4 
GtkToolButtons or
that of 1 GtkToolButtons + 2 GtkMenuToolButton is sufficient

Change-Id: I7296805b4b3c0d86ce3d08cadc8c2659104af619
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97544
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index f63196c37e2a..75f9319fce5f 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1446,9 +1446,11 @@ void padWidthForSidebar(weld::Toolbar& rToolbar, const 
css::uno::Reference 
xBuilder(Application::CreateBuilder(, "svx/ui/measurewidthbar.ui"));
-std::unique_ptr 
xToolbar(xBuilder->weld_toolbar("measurewidth"));
-std::unique_ptr xDispatcher(new 
ToolbarUnoDispatcher(*xToolbar, *xBuilder, rFrame));
-nColumnWidth = xToolbar->get_preferred_size().Width();
+std::unique_ptr 
xToolbar1(xBuilder->weld_toolbar("measurewidth1"));
+std::unique_ptr xDispatcher1(new 
ToolbarUnoDispatcher(*xToolbar1, *xBuilder, rFrame));
+std::unique_ptr 
xToolbar2(xBuilder->weld_toolbar("measurewidth2"));
+std::unique_ptr xDispatcher2(new 
ToolbarUnoDispatcher(*xToolbar2, *xBuilder, rFrame));
+nColumnWidth = std::max(xToolbar1->get_preferred_size().Width(), 
xToolbar2->get_preferred_size().Width());
 eSize = rToolbar.get_icon_size();
 }
 rToolbar.set_size_request(nColumnWidth, -1);
diff --git a/svx/uiconfig/ui/measurewidthbar.ui 
b/svx/uiconfig/ui/measurewidthbar.ui
index ad96cc7b2339..b9019635f4a3 100644
--- a/svx/uiconfig/ui/measurewidthbar.ui
+++ b/svx/uiconfig/ui/measurewidthbar.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,72 +7,108 @@
 False
 vertical
 
-  
+  
 True
 False
 icons
 False
 2
 
-  
+  
 True
 False
 True
   
   
 False
-True
+False
   
 
 
-  
+  
 True
 False
 True
   
   
 False
-True
+False
   
 
 
-  
+  
 True
 False
 True
   
   
 False
-True
+False
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+True
+  
+  
+False
+False
   
 
 
-  
+  
 True
 False
 True
   
   
 False
-True
+False
   
 
 
-  
+  
 True
 False
 True
   
   
 False
-True
+False
   
 
   
   
 False
 True
-0
+1
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-06-02 Thread Shivam Kumar Singh (via logerrit)

 svx/source/sidebar/inspector/InspectorTextPanel.cxx |   12 -
 svx/source/sidebar/inspector/InspectorTextPanel.hxx |5 
 svx/uiconfig/ui/inspectortextpanel.ui   |  158 +---
 3 files changed, 45 insertions(+), 130 deletions(-)

New commits:
commit a9b47360c2af2514b1064fb179f9fb9f0b8ad225
Author: Shivam Kumar Singh 
AuthorDate: Sun May 31 22:55:40 2020 +0530
Commit: Mike Kaganski 
CommitDate: Tue Jun 2 12:00:32 2020 +0200

Removed the "Font.." things from the Inspector

Removed all the font related stuff and added a common property listing box
for the 'Character' Properties.
Another patch coming up for 'Paragraph' properties.

Change-Id: I71de4d4fe6536f49e0e700c850e2e714287c5e04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95228
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Mike Kaganski 

diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx 
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 0c719dfccb2f..6eaa6f992573 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -44,22 +44,16 @@ InspectorTextPanel::Create(vcl::Window* pParent,
 InspectorTextPanel::InspectorTextPanel(vcl::Window* pParent,
const 
css::uno::Reference& rxFrame)
 : PanelLayout(pParent, "InspectorTextPanel", 
"svx/ui/inspectortextpanel.ui", rxFrame)
-, mxFont(m_xBuilder->weld_toolbar("font"))
-, mxFontDispatch(new ToolbarUnoDispatcher(*mxFont, *m_xBuilder, rxFrame))
-, mxFontHeight(m_xBuilder->weld_toolbar("fontheight"))
-, mxFontHeightDispatch(new ToolbarUnoDispatcher(*mxFontHeight, 
*m_xBuilder, rxFrame))
+, mxListBoxStyles(m_xBuilder->weld_tree_view("liststore"))
 {
+mxListBoxStyles->set_size_request(-1, 
mxListBoxStyles->get_height_rows(10));
 }
 
 InspectorTextPanel::~InspectorTextPanel() { disposeOnce(); }
 
 void InspectorTextPanel::dispose()
 {
-mxFontHeightDispatch.reset();
-mxFontDispatch.reset();
-
-mxFontHeight.reset();
-mxFont.reset();
+mxListBoxStyles.reset();
 
 PanelLayout::dispose();
 }
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.hxx 
b/svx/source/sidebar/inspector/InspectorTextPanel.hxx
index ed8b24a52d48..0d6160dfe75e 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.hxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.hxx
@@ -42,10 +42,7 @@ public:
const css::uno::Reference& rxFrame);
 
 private:
-std::unique_ptr mxFont;
-std::unique_ptr mxFontDispatch;
-std::unique_ptr mxFontHeight;
-std::unique_ptr mxFontHeightDispatch;
+std::unique_ptr mxListBoxStyles; // To dump all the 
properties
 
 vcl::EnumContext maContext;
 };
diff --git a/svx/uiconfig/ui/inspectortextpanel.ui 
b/svx/uiconfig/ui/inspectortextpanel.ui
index f3966cc687fd..1ebd98403eb5 100644
--- a/svx/uiconfig/ui/inspectortextpanel.ui
+++ b/svx/uiconfig/ui/inspectortextpanel.ui
@@ -1,150 +1,74 @@
 
-
-
+
+
   
+  
+
+  
+  
+  
+  
+
+  
   
 True
 False
-True
+6
+6
 
-  
+  
 True
 False
 True
-6
-vertical
-3
+True
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-10
-Font Name
-True
-font
-  
-  
-False
-True
-0
-  
-
+True
+True
+6
+6
 
-  
+  
 True
-False
+True
 True
-icons
-False
-2
+True
+in
 
-  
+  
 True
-False
+True
 True
-
-  
-True
-False
-True
-True
-False
-
-  
-True
-  
-
-  
+True
+liststore
+False
+False
+0
+False
+
+  
 
-  
-  
-True
-False
-  
-
-  
-  
-True
-True
-1
-  
-
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-05-11 Thread Pranam Lashkari (via logerrit)

 svx/source/sidebar/text/TextPropertyPanel.cxx |6 ++
 svx/source/sidebar/text/TextPropertyPanel.hxx |2 ++
 svx/uiconfig/ui/sidebartextpanel.ui   |   25 +
 3 files changed, 33 insertions(+)

New commits:
commit a0e45956ce90401be01918f4712ae187beccf248
Author: Pranam Lashkari 
AuthorDate: Thu May 7 19:21:04 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 11 23:00:28 2020 +0200

fixed clear Direct Formatting button to sidebar in impress

Change-Id: I81cd30b3ce7087122c260dca99e86a3c857447b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93813
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 6c3b20cedef6..642f41800718 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -57,6 +57,8 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, 
const css::uno::Ref
 , mxToolBoxBackgroundColorDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
 , mxResetBar(m_xBuilder->weld_toolbar("resetattr"))
 , mxResetBarDispatch(new ToolbarUnoDispatcher(*mxResetBar, *m_xBuilder, 
rxFrame))
+, mxDefaultBar(m_xBuilder->weld_toolbar("defaultattr"))
+, mxDefaultBarDispatch(new ToolbarUnoDispatcher(*mxDefaultBar, 
*m_xBuilder, rxFrame))
 , mxPositionBar(m_xBuilder->weld_toolbar("position"))
 , mxPositionBarDispatch(new ToolbarUnoDispatcher(*mxPositionBar, 
*m_xBuilder, rxFrame))
 , mxSpacingBar(m_xBuilder->weld_toolbar("spacingbar"))
@@ -78,6 +80,7 @@ TextPropertyPanel::~TextPropertyPanel()
 void TextPropertyPanel::dispose()
 {
 mxResetBarDispatch.reset();
+mxDefaultBarDispatch.reset();
 mxPositionBarDispatch.reset();
 mxSpacingBarDispatch.reset();
 mxToolBoxFontColorSwDispatch.reset();
@@ -89,6 +92,7 @@ void TextPropertyPanel::dispose()
 mxFontDispatch.reset();
 
 mxResetBar.reset();
+mxDefaultBar.reset();
 mxPositionBar.reset();
 mxSpacingBar.reset();
 mxToolBoxFontColorSw.reset();
@@ -140,6 +144,8 @@ void TextPropertyPanel::HandleContextChange (
 mxToolBoxFontColor->set_visible(!bWriterText);
 mxToolBoxFontColorSw->set_visible(bWriterText);
 mxToolBoxBackgroundColor->set_visible(bDrawText);
+mxResetBar->set_visible(bWriterText);
+mxDefaultBar->set_visible(bDrawText);
 }
 
 } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx 
b/svx/source/sidebar/text/TextPropertyPanel.hxx
index baea3468f9de..437596145584 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -62,6 +62,8 @@ private:
 std::unique_ptr mxToolBoxBackgroundColorDispatch;
 std::unique_ptr mxResetBar;
 std::unique_ptr mxResetBarDispatch;
+std::unique_ptr mxDefaultBar;
+std::unique_ptr mxDefaultBarDispatch;
 std::unique_ptr mxPositionBar;
 std::unique_ptr mxPositionBarDispatch;
 std::unique_ptr mxSpacingBar;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 14584cdc63d1..943cf41b1165 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -337,6 +337,31 @@
 3
   
 
+
+  
+True
+True
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+3
+  
+
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-04-27 Thread Pranam Lashkari (via logerrit)

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |2 +-
 svx/uiconfig/ui/sidebararea.ui|8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f94caa1ad48a0aad061cf3aa41ba45c5348ecfe4
Author: Pranam Lashkari 
AuthorDate: Mon Apr 27 18:17:44 2020 +0530
Commit: Andras Timar 
CommitDate: Tue Apr 28 07:57:34 2020 +0200

resolved clashing of two ids

Multiple SvxFillAttrBox objects having the same ID 'fillattr' caused
the problem in online making it hard to distinguish for different function

Change-Id: Ic5a29ea75fb442d7e495761faf4a10d6ab212829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92977
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index c51ae522792c..76eb6c29e845 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -75,7 +75,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
   maGradientRect(),
   mxColorTextFT(m_xBuilder->weld_label("filllabel")),
   mxLbFillType(m_xBuilder->weld_combo_box("fillstylearea")),
-  mxLbFillAttr(m_xBuilder->weld_combo_box("fillattr")),
+  mxLbFillAttr(m_xBuilder->weld_combo_box("fillattrhb")),
   mxLbFillGradFrom(new 
ColorListBox(m_xBuilder->weld_menu_button("fillgrad1"), GetFrameWeld())),
   mxLbFillGradTo(new 
ColorListBox(m_xBuilder->weld_menu_button("fillgrad2"), GetFrameWeld())),
   mxToolBoxColor(m_xBuilder->weld_toolbar("selectcolor")),
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 18728d255743..feae68d20fa1 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -198,10 +198,10 @@
   
 
 
-  
+  
 True
 False
-Select the effect to 
apply.
+Select the effect to 
apply.
 True
 liststore4
 0
@@ -219,8 +219,8 @@
   
 
 
-  
-Hatching/Bitmap
+  
+Hatching/Bitmap
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-04-23 Thread Pranam Lashkari (via logerrit)

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |2 +-
 svx/uiconfig/ui/sidebararea.ui|8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9ed61699760544b780bd3eb5820d92233cd5fb4d
Author: Pranam Lashkari 
AuthorDate: Wed Apr 22 16:59:11 2020 +0530
Commit: Szymon Kłos 
CommitDate: Thu Apr 23 13:18:09 2020 +0200

resolved: Impress mobile Choosing a different type of shape fill crashes

Change-Id: Idd8dbba866b64089055880ffad9b5cbd9b12ca85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92688
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 270b29be96a2..4a09525fa158 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -74,7 +74,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
   maGradientSquare(),
   maGradientRect(),
   mxColorTextFT(m_xBuilder->weld_label("filllabel")),
-  mxLbFillType(m_xBuilder->weld_combo_box("fillstyle")),
+  mxLbFillType(m_xBuilder->weld_combo_box("fillstylearea")),
   mxLbFillAttr(m_xBuilder->weld_combo_box("fillattr")),
   mxLbFillGradFrom(new 
ColorListBox(m_xBuilder->weld_menu_button("fillgrad1"), GetFrameWeld())),
   mxLbFillGradTo(new 
ColorListBox(m_xBuilder->weld_menu_button("fillgrad2"), GetFrameWeld())),
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 91e81ab60482..18728d255743 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -101,13 +101,13 @@
   
 
 
-  
+  
 True
 False
-Select the fill type to 
apply.
+Select the fill type to 
apply.
 
-  
-Fill Type
+  
+Fill Type
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-04-22 Thread andreas kainz (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |8 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |5 
 svx/uiconfig/ui/sidebarpossize.ui   |  227 +++-
 3 files changed, 189 insertions(+), 51 deletions(-)

New commits:
commit 90e73c8cb949e2ef96e9a77b2208f53e5feab3ab
Author: andreas kainz 
AuthorDate: Tue Apr 21 15:02:42 2020 +0200
Commit: andreas_kainz 
CommitDate: Wed Apr 22 17:57:12 2020 +0200

tdf#130156 add alignment commands to the sidebar

Change-Id: I302acc25b65ef20a0338401e763d400076f6e36d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92634
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 24e7b8b205b2..0ca21527d89e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -76,6 +76,10 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 mxArrangeDispatch(new ToolbarUnoDispatcher(*mxArrangeTbx, *m_xBuilder, 
rxFrame)),
 mxArrangeTbx2(m_xBuilder->weld_toolbar("arrangetoolbar2")),
 mxArrangeDispatch2(new ToolbarUnoDispatcher(*mxArrangeTbx2, *m_xBuilder, 
rxFrame)),
+mxAlignTbx(m_xBuilder->weld_toolbar("aligntoolbar")),
+mxAlignDispatch(new ToolbarUnoDispatcher(*mxAlignTbx, *m_xBuilder, 
rxFrame)),
+mxAlignTbx2(m_xBuilder->weld_toolbar("aligntoolbar2")),
+mxAlignDispatch2(new ToolbarUnoDispatcher(*mxAlignTbx2, *m_xBuilder, 
rxFrame)),
 mxBtnEditChart(m_xBuilder->weld_button("btnEditChart")),
 maRect(),
 mpView(nullptr),
@@ -138,6 +142,10 @@ void PosSizePropertyPanel::dispose()
 mxFtFlip.reset();
 mxFlipDispatch.reset();
 mxFlipTbx.reset();
+mxAlignDispatch.reset();
+mxAlignDispatch2.reset();
+mxAlignTbx.reset();
+mxAlignTbx2.reset();
 mxArrangeDispatch.reset();
 mxArrangeDispatch2.reset();
 mxArrangeTbx.reset();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 2c78dd033253..bf5f1ff7e8ae 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -112,6 +112,11 @@ private:
 std::unique_ptr mxArrangeTbx2;
 std::unique_ptr mxArrangeDispatch2;
 
+std::unique_ptr mxAlignTbx;
+std::unique_ptr mxAlignDispatch;
+std::unique_ptr mxAlignTbx2;
+std::unique_ptr mxAlignDispatch2;
+
 //edit charts button for online's mobile view
 std::unique_ptr mxBtnEditChart;
 
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index 7b599ade42f3..a630d6fc0c6b 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -2,6 +2,32 @@
 
 
   
+  
+-120
+240
+1
+10
+  
+  
+-120
+240
+1
+10
+  
+  
+100
+1
+10
+  
+  
+100
+1
+10
+  
+  
+359
+5
+  
   
 True
 False
@@ -158,31 +184,6 @@
 2
   
 
-
-  
-True
-False
-end
-vertical
-
-  
-Edit Chart
-True
-True
-True
-  
-  
-False
-True
-2
-  
-
-  
-  
-1
-7
-  
-
 
   
 True
@@ -453,6 +454,156 @@
 2
   
 
+
+  
+True
+False
+end
+vertical
+
+  
+Edit Chart
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+1
+8
+  
+
+
+  
+True
+False
+vertical
+
+  
+True
+False
+Alig_n:
+True
+aligntoolbar
+0
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+Arrange
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+True
+  
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-04-21 Thread Caolán McNamara (via logerrit)

 svx/source/sidebar/text/TextPropertyPanel.cxx |   62 +++--
 svx/source/sidebar/text/TextPropertyPanel.hxx |   26 +-
 svx/source/tbxctrls/tbcontrl.cxx  |  300 --
 svx/source/tbxctrls/tbunocontroller.cxx   |2 
 svx/uiconfig/ui/sidebartextpanel.ui   |  185 
 5 files changed, 361 insertions(+), 214 deletions(-)

New commits:
commit 850b8de31c5be5127eac16a4f5cc18c26a582e53
Author: Caolán McNamara 
AuthorDate: Sun Apr 19 20:36:17 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 21 11:52:58 2020 +0200

weld sidebar text panel

includes

weld SvxFontNameToolBoxControl

Change-Id: Ie48338243600c07f9f8c609701c137175133f8e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92585
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 7cc3c7995fa5..8944f85530f5 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -20,7 +20,6 @@
 #include "TextPropertyPanel.hxx"
 
 #include 
-#include 
 #include 
 #include 
 
@@ -41,20 +40,33 @@ VclPtr TextPropertyPanel::Create (
 }
 
 TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const 
css::uno::Reference& rxFrame )
-: PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", 
rxFrame)
+: PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", 
rxFrame, true)
+, mxFont(m_xBuilder->weld_toolbar("font"))
+, mxFontDispatch(new ToolbarUnoDispatcher(*mxFont, *m_xBuilder, rxFrame))
+, mxFontHeight(m_xBuilder->weld_toolbar("fontheight"))
+, mxFontHeightDispatch(new ToolbarUnoDispatcher(*mxFontHeight, 
*m_xBuilder, rxFrame))
+, mxFontEffects(m_xBuilder->weld_toolbar("fonteffects"))
+, mxFontEffectsDispatch(new ToolbarUnoDispatcher(*mxFontEffects, 
*m_xBuilder, rxFrame))
+, mxFontAdjust(m_xBuilder->weld_toolbar("fontadjust"))
+, mxFontAdjustDispatch(new ToolbarUnoDispatcher(*mxFontAdjust, 
*m_xBuilder, rxFrame))
+, mxToolBoxFontColorSw(m_xBuilder->weld_toolbar("colorbar_writer"))
+, mxToolBoxFontColorSwDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxFontColorSw, *m_xBuilder, rxFrame))
+, mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar_others"))
+, mxToolBoxFontColorDispatch(new ToolbarUnoDispatcher(*mxToolBoxFontColor, 
*m_xBuilder, rxFrame))
+, mxToolBoxBackgroundColor(m_xBuilder->weld_toolbar("colorbar_background"))
+, mxToolBoxBackgroundColorDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
+, mxResetBar(m_xBuilder->weld_toolbar("resetattr"))
+, mxResetBarDispatch(new ToolbarUnoDispatcher(*mxResetBar, *m_xBuilder, 
rxFrame))
+, mxPositionBar(m_xBuilder->weld_toolbar("position"))
+, mxPositionBarDispatch(new ToolbarUnoDispatcher(*mxPositionBar, 
*m_xBuilder, rxFrame))
+, mxSpacingBar(m_xBuilder->weld_toolbar("spacingbar"))
+, mxSpacingBarDispatch(new ToolbarUnoDispatcher(*mxSpacingBar, 
*m_xBuilder, rxFrame))
 {
-get(mpToolBoxFontColorSw, "colorbar_writer");
-get(mpToolBoxFontColor, "colorbar_others");
-get(mpToolBoxBackgroundColor, "colorbar_background");
-
 bool isMobilePhone = false;
 if (comphelper::LibreOfficeKit::isActive() &&
 comphelper::LibreOfficeKit::isMobilePhone(SfxLokHelper::getView()))
 isMobilePhone = true;
-VclPtr xSpacingBar;
-get(xSpacingBar, "spacingbar");
-xSpacingBar->Show(!isMobilePhone);
-xSpacingBar->ShowItem(0, !isMobilePhone);
+mxSpacingBar->set_visible(!isMobilePhone);
 }
 
 TextPropertyPanel::~TextPropertyPanel()
@@ -64,9 +76,27 @@ TextPropertyPanel::~TextPropertyPanel()
 
 void TextPropertyPanel::dispose()
 {
-mpToolBoxFontColorSw.clear();
-mpToolBoxFontColor.clear();
-mpToolBoxBackgroundColor.clear();
+mxResetBarDispatch.reset();
+mxPositionBarDispatch.reset();
+mxSpacingBarDispatch.reset();
+mxToolBoxFontColorSwDispatch.reset();
+mxToolBoxFontColorDispatch.reset();
+mxToolBoxBackgroundColorDispatch.reset();
+mxFontAdjustDispatch.reset();
+mxFontEffectsDispatch.reset();
+mxFontHeightDispatch.reset();
+mxFontDispatch.reset();
+
+mxResetBar.reset();
+mxPositionBar.reset();
+mxSpacingBar.reset();
+mxToolBoxFontColorSw.reset();
+mxToolBoxFontColor.reset();
+mxToolBoxBackgroundColor.reset();
+mxFontAdjust.reset();
+mxFontEffects.reset();
+mxFontHeight.reset();
+mxFont.reset();
 
 PanelLayout::dispose();
 }
@@ -106,9 +136,9 @@ void TextPropertyPanel::HandleContextChange (
 break;
 }
 
-mpToolBoxFontColor->Show(!bWriterText);
-mpToolBoxFontColorSw->Show(bWriterText);
-mpToolBoxBackgroundColor->Show(bDrawText);
+mxToolBoxFontColor->set_visible(!bWriterText);
+mxToolBoxFontColorSw->set_visible(bWriterText);
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-04-07 Thread Pranam Lashkari (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |2 +
 svx/uiconfig/ui/sidebarpossize.ui   |   37 
 3 files changed, 48 insertions(+)

New commits:
commit ed7a51ea8b319bc3c1dc03b7552817eeae3c1c75
Author: Pranam Lashkari 
AuthorDate: Fri Apr 3 03:33:31 2020 +0530
Commit: Andras Timar 
CommitDate: Tue Apr 7 12:17:25 2020 +0200

use "To Background" and "To Foreground" only in writer sidebar

Change-Id: Ib7ccac192721b663c9655417fc3d639766d0424d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91604
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index ccdfc1ee3f8c..24e7b8b205b2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -74,6 +74,8 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 mxFlipDispatch(new ToolbarUnoDispatcher(*mxFlipTbx, *m_xBuilder, rxFrame)),
 mxArrangeTbx(m_xBuilder->weld_toolbar("arrangetoolbar")),
 mxArrangeDispatch(new ToolbarUnoDispatcher(*mxArrangeTbx, *m_xBuilder, 
rxFrame)),
+mxArrangeTbx2(m_xBuilder->weld_toolbar("arrangetoolbar2")),
+mxArrangeDispatch2(new ToolbarUnoDispatcher(*mxArrangeTbx2, *m_xBuilder, 
rxFrame)),
 mxBtnEditChart(m_xBuilder->weld_button("btnEditChart")),
 maRect(),
 mpView(nullptr),
@@ -137,7 +139,9 @@ void PosSizePropertyPanel::dispose()
 mxFlipDispatch.reset();
 mxFlipTbx.reset();
 mxArrangeDispatch.reset();
+mxArrangeDispatch2.reset();
 mxArrangeTbx.reset();
+mxArrangeTbx2.reset();
 mxBtnEditChart.reset();
 
 maTransfPosXControl.dispose();
@@ -268,12 +272,14 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowAngle = false;
 bool bShowFlip = false;
 bool bShowEditChart = false;
+bool bShowArrangeTbx2 = false;
 
 switch (maContext.GetCombinedContext_DI())
 {
 case CombinedEnumContext(Application::WriterVariants, Context::Draw):
 bShowAngle = true;
 bShowFlip = true;
+bShowArrangeTbx2 = true;
 break;
 
 case CombinedEnumContext(Application::WriterVariants, 
Context::Graphic):
@@ -333,6 +339,9 @@ void PosSizePropertyPanel::HandleContextChange(
 // Edit Chart
 mxBtnEditChart->set_visible(bShowEditChart);
 
+// Arrange tool bar 2
+mxArrangeTbx2->set_visible(bShowArrangeTbx2);
+
 if (mxSidebar.is())
 mxSidebar->requestLayout();
 }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index eacd06f4672e..2c78dd033253 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -109,6 +109,8 @@ private:
 
 std::unique_ptr mxArrangeTbx;
 std::unique_ptr mxArrangeDispatch;
+std::unique_ptr mxArrangeTbx2;
+std::unique_ptr mxArrangeDispatch2;
 
 //edit charts button for online's mobile view
 std::unique_ptr mxBtnEditChart;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index 86d5eaaa5a24..7b599ade42f3 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -262,6 +262,43 @@
 1
   
 
+
+  
+True
+False
+Arrange
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+2
+  
+
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-02-07 Thread Caolán McNamara (via logerrit)

 svx/UIConfig_svx.mk  |1 
 svx/source/tbxctrls/grafctrl.cxx |  145 ---
 svx/uiconfig/ui/grafmodebox.ui   |   23 ++
 3 files changed, 101 insertions(+), 68 deletions(-)

New commits:
commit 06164bdf2f5babd337a2f7813c572ca17056c521
Author: Caolán McNamara 
AuthorDate: Fri Feb 7 12:45:11 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 7 16:16:44 2020 +0100

weld ImplGrafModeControl ItemWindow

Change-Id: Ib71436cf9ecb312ea9f273bb974954556868e613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88189
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f3be7c4967ef..d43fb789f426 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/functionmenu \
svx/uiconfig/ui/gallerymenu1 \
svx/uiconfig/ui/gallerymenu2 \
+   svx/uiconfig/ui/grafmodebox \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/imapmenu \
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 588dbc25623f..3f8c084e06f7 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -332,99 +332,108 @@ void ImplGrafControl::Resize()
 
 namespace {
 
-class ImplGrafModeControl : public ListBox
+class ImplGrafModeControl final : public InterimItemWindow
 {
-using Window::Update;
 private:
-sal_uInt16  mnCurPos;
+sal_uInt16 mnCurPos;
 Reference< XFrame > mxFrame;
+std::unique_ptr m_xWidget;
+
+DECL_LINK(SelectHdl, weld::ComboBox&, void);
+DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(FocusInHdl, weld::Widget&, void);
 
-virtual voidSelect() override;
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
 static void ImplReleaseFocus();
 
 public:
-ImplGrafModeControl( vcl::Window* pParent, const 
Reference< XFrame >& rFrame );
+ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& 
rFrame );
+virtual void dispose() override;
+virtual ~ImplGrafModeControl() override;
+
+virtual void GetFocus() override
+{
+m_xWidget->grab_focus();
+}
+
+void set_sensitive(bool bSensitive)
+{
+Enable(bSensitive);
+m_xWidget->set_sensitive(true);
+}
+
+void set_active(int nActive)
+{
+m_xWidget->set_active(nActive);
+}
 
 voidUpdate( const SfxPoolItem* pItem );
 };
 
 }
 
-ImplGrafModeControl::ImplGrafModeControl( vcl::Window* pParent, const 
Reference< XFrame >& rFrame ) :
-ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ),
-mnCurPos( 0 ),
-mxFrame( rFrame )
+ImplGrafModeControl::ImplGrafModeControl(vcl::Window* pParent, const 
Reference& rFrame)
+: InterimItemWindow(pParent, "svx/ui/grafmodebox.ui", "GrafModeBox")
+, mnCurPos(0)
+, mxFrame(rFrame)
+, m_xWidget(m_xBuilder->weld_combo_box("grafmode"))
 {
-SetSizePixel( Size( 100, 260 ) );
+m_xWidget->append_text( SvxResId( RID_SVXSTR_GRAFMODE_STANDARD  ) );
+m_xWidget->append_text( SvxResId( RID_SVXSTR_GRAFMODE_GREYS ) );
+m_xWidget->append_text( SvxResId( RID_SVXSTR_GRAFMODE_MONO  ) );
+m_xWidget->append_text( SvxResId( RID_SVXSTR_GRAFMODE_WATERMARK ) );
 
-InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_STANDARD  ) );
-InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_GREYS ) );
-InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_MONO  ) );
-InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_WATERMARK ) );
+m_xWidget->connect_changed(LINK(this, ImplGrafModeControl, SelectHdl));
+m_xWidget->connect_key_press(LINK(this, ImplGrafModeControl, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ImplGrafModeControl, FocusInHdl));
 
-Show();
+SetSizePixel(m_xWidget->get_preferred_size());
 }
 
-void ImplGrafModeControl::Select()
+void ImplGrafModeControl::dispose()
 {
-if ( !IsTravelSelect() )
-{
-Sequence< PropertyValue > aArgs( 1 );
-aArgs[0].Name = "GrafMode";
-aArgs[0].Value <<= sal_Int16( GetSelectedEntryPos() );
-
-/*  #i33380# DR 2004-09-03 Moved the following line above the 
Dispatch() call.
-This instance may be deleted in the meantime (i.e. when a dialog 
is opened
-while in Dispatch()), accessing members will crash in this case. */
-ImplReleaseFocus();
-
-SfxToolBoxControl::Dispatch(
-Reference< XDispatchProvider >( mxFrame->getController(), 
UNO_QUERY ),
-".uno:GrafMode",
-aArgs );
-}
+m_xWidget.reset();
+InterimItemWindow::dispose();
 }
 
-bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
+ImplGrafModeControl::~ImplGrafModeControl()
 {
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-01-24 Thread andreas kainz (via logerrit)

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |5 
 svx/uiconfig/ui/sidebararea.ui|  497 ++
 2 files changed, 237 insertions(+), 265 deletions(-)

New commits:
commit 0042b77de2f94f5b8af60abff2ec8e352d4fbd66
Author: andreas kainz 
AuthorDate: Fri Jan 24 00:27:31 2020 +0100
Commit: andreas_kainz 
CommitDate: Fri Jan 24 22:19:33 2020 +0100

Area Sidebar same grid and better spacing

Change-Id: I9d891f6d3c59ce047c7ec001c5facbbec4804a38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87313
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index f9b800d25479..fab124cadf6d 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -182,6 +182,11 @@ void AreaPropertyPanelBase::Initialize()
 mxLbFillGradTo->SetSelectHdl( aLink3 );
 mxMTRAngle->connect_value_changed(LINK(this,AreaPropertyPanelBase, 
ChangeGradientAngle));
 
+// https://gerrit.libreoffice.org/c/core/+/87313 set a small width to 
force widgets to
+// take their final width from other widgets in the grid
+mxLbFillGradFrom->get_widget().set_size_request(42, -1);
+mxLbFillGradTo->get_widget().set_size_request(42, -1);
+
 mxLBTransType->connect_changed(LINK(this, AreaPropertyPanelBase, 
ChangeTrgrTypeHdl_Impl));
 
 SetTransparency( 50 );
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index da83892c0a27..80223abb4518 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -32,347 +32,331 @@
   
 True
 False
-True
-True
 
-  
+  
 True
 False
+True
 6
-vertical
-12
+3
+6
 
-  
+  
 True
 False
-True
-6
-6
+6
 
-  
+  
 True
-False
-Fill:
-_Fill:
-True
-fillstyle
-0
+True
+Specify 0% for fully 
opaque through 100% for fully transparent.
+True
+adjustment4
+1
+False
   
   
-0
-0
+False
+True
+0
   
 
 
-  
+  
 True
-False
-True
-
-  
-True
-start
-icons
-False
-2
-
-  
-True
-False
-Select the color to apply.
-True
-  
-  
-False
-False
-  
-
-  
-  
-True
-True
-0
-  
-
-
-  
-True
-False
-Select the effect to 
apply.
-True
-liststore4
-0
-1
-
-  
-  
-0
-  
-
-
-  
-  
-3
-  
-
-
-  
-Hatching/Bitmap
-  
-
-  
-  
-True
-True
-1
-  
-
-
-  
-True
-True
-False
-Fill gradient from.
-center
-True
-True
-
-
-  
-
+True
+Specify 0% for fully opaque 
through 100% for fully transparent.
+adjustment1
+
+  
+Transparency
   
-  
-True
-True
-2
-  
 
   
   
-1
-1
+False
+True
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-01-21 Thread Caolán McNamara (via logerrit)

 svx/source/tbxctrls/linectrl.cxx   |2 +-
 svx/uiconfig/ui/floatinglineend.ui |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 46c0dbea12bd8329aa37ca5503db12b4162ef6c6
Author: Caolán McNamara 
AuthorDate: Tue Jan 21 10:46:58 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 21 13:34:43 2020 +0100

arrow list is scrolled

Change-Id: I8d4a814e9bdba5dff248b73d2dd4b4e6b363ea1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87130
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 9694e191aed3..80c36beb55d5 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -296,7 +296,7 @@ static constexpr sal_uInt16 gnCols = 2;
 SvxLineEndWindow::SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, 
weld::Widget* pParent)
 : WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/floatinglineend.ui", "FloatingLineEnd")
 , mxControl(pControl)
-, mxLineEndSet(new SvtValueSet(nullptr))
+, mxLineEndSet(new 
SvtValueSet(m_xBuilder->weld_scrolled_window("valuesetwin")))
 , mxLineEndSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*mxLineEndSet))
 , mnLines(12)
 {
diff --git a/svx/uiconfig/ui/floatinglineend.ui 
b/svx/uiconfig/ui/floatinglineend.ui
index b86ea2e3dec3..11ec20f5e6dc 100644
--- a/svx/uiconfig/ui/floatinglineend.ui
+++ b/svx/uiconfig/ui/floatinglineend.ui
@@ -19,7 +19,6 @@
 True
 True
 never
-never
 in
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-01-21 Thread Caolán McNamara (via logerrit)

 svx/UIConfig_svx.mk|1 
 svx/source/tbxctrls/linectrl.cxx   |  174 +++--
 svx/uiconfig/ui/floatinglineend.ui |   49 ++
 3 files changed, 142 insertions(+), 82 deletions(-)

New commits:
commit f311d5b778eede2642a49108a08d4134ad1ce097
Author: Caolán McNamara 
AuthorDate: Tue Jan 21 10:24:37 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 21 12:40:25 2020 +0100

Related: tdf#130035 weld SvxLineEndWindow

Change-Id: Ib766ef431620eeeb65dec5ace57f2f4bd8fbd384
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87128
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index bd58d87d32e1..08b3ccb2dd5b 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/floatingareastyle \
svx/uiconfig/ui/floatingcontour \
svx/uiconfig/ui/floatingframeborder \
+   svx/uiconfig/ui/floatinglineend \
svx/uiconfig/ui/floatinglineproperty \
svx/uiconfig/ui/floatingundoredo \
svx/uiconfig/ui/fontworkgallerydialog \
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c6d259fb6567..9694e191aed3 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -246,26 +246,46 @@ VclPtr 
SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *p
 
 namespace {
 
-class SvxLineEndWindow : public svtools::ToolbarPopup
+class SvxLineEndToolBoxControl : public svt::PopupWindowController
+{
+public:
+explicit SvxLineEndToolBoxControl( const 
css::uno::Reference& rContext );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence& 
rArguments ) override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
+
+virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override;
+
+private:
+virtual std::unique_ptr weldPopupWindow() override;
+virtual VclPtr createVclPopupWindow( vcl::Window* pParent ) 
override;
+};
+
+class SvxLineEndWindow final : public WeldToolbarPopup
 {
 private:
 XLineEndListRef mpLineEndList;
-VclPtr mpLineEndSet;
+rtl::Reference mxControl;
+std::unique_ptr mxLineEndSet;
+std::unique_ptr mxLineEndSetWin;
 sal_uInt16 mnLines;
 Size maBmpSize;
-svt::ToolboxController& mrController;
 
-DECL_LINK( SelectHdl, ValueSet*, void );
+DECL_LINK( SelectHdl, SvtValueSet*, void );
 void FillValueSet();
 void SetSize();
 
-protected:
-virtual void GetFocus() override;
+virtual void GrabFocus() override
+{
+mxLineEndSet->GrabFocus();
+}
 
 public:
-SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* 
pParentWindow );
-virtual ~SvxLineEndWindow() override;
-virtual void dispose() override;
+SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, weld::Widget* 
pParent);
 virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) 
override;
 };
 
@@ -273,15 +293,16 @@ public:
 
 static constexpr sal_uInt16 gnCols = 2;
 
-SvxLineEndWindow::SvxLineEndWindow( svt::ToolboxController& rController, 
vcl::Window* pParentWindow )
-:  ToolbarPopup ( rController.getFrameInterface(), pParentWindow, 
WB_STDPOPUP | WB_MOVEABLE | WB_CLOSEABLE ),
-mpLineEndSet( VclPtr::Create(this, WinBits( WB_ITEMBORDER | 
WB_3DLOOK | WB_NO_DIRECTSELECT ) )),
-mnLines ( 12 ),
-mrController( rController )
+SvxLineEndWindow::SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, 
weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/floatinglineend.ui", "FloatingLineEnd")
+, mxControl(pControl)
+, mxLineEndSet(new SvtValueSet(nullptr))
+, mxLineEndSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*mxLineEndSet))
+, mnLines(12)
 {
-SetText( SvxResId( RID_SVXSTR_LINEEND ) );
-SetHelpId( HID_POPUP_LINEEND );
-mpLineEndSet->SetHelpId( HID_POPUP_LINEEND_CTRL );
+mxLineEndSet->SetStyle(mxLineEndSet->GetStyle() | WB_ITEMBORDER | 
WB_3DLOOK | WB_NO_DIRECTSELECT);
+mxLineEndSet->SetHelpId(HID_POPUP_LINEEND_CTRL);
+m_xTopLevel->set_help_id(HID_POPUP_LINEEND);
 
 SfxObjectShell* pDocSh = SfxObjectShell::Current();
 if ( pDocSh )
@@ -292,33 +313,20 @@ SvxLineEndWindow::SvxLineEndWindow( 
svt::ToolboxController& rController, vcl::Wi
 }
 DBG_ASSERT( mpLineEndList.is(), "LineEndList not found" );
 
-mpLineEndSet->SetSelectHdl( LINK( this, SvxLineEndWindow, SelectHdl ) );
-mpLineEndSet->SetColCount( gnCols );
+mxLineEndSet->SetSelectHdl( LINK( this, SvxLineEndWindow, SelectHdl ) );
+mxLineEndSet->SetColCount( gnCols );
 
 // ValueSet fill with entries of LineEndList
 FillValueSet();
 
 AddStatusListener(

[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk sw/uiconfig

2020-01-17 Thread Caolán McNamara (via logerrit)

 svx/UIConfig_svx.mk|1 
 svx/source/tbxctrls/tbcontrl.cxx   |  232 ++---
 svx/uiconfig/ui/floatingframeborder.ui |   49 ++
 sw/uiconfig/swriter/ui/sidebartableedit.ui |2 
 4 files changed, 164 insertions(+), 120 deletions(-)

New commits:
commit f7e013657df0a1955d901d79d6df806e5007a9f8
Author: Caolán McNamara 
AuthorDate: Fri Jan 17 09:24:44 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 17 14:43:49 2020 +0100

weld SvxFrameWindow_Impl

which makes .uno:SetBorderStyle in sidebartableedit work again

Change-Id: I51faa21530171a47ee78863ddb312e1d9996326c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86959
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 1e62d619269d..aa3486ae3a51 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/floatingareastyle \
svx/uiconfig/ui/floatingcontour \
+   svx/uiconfig/ui/floatingframeborder \
svx/uiconfig/ui/floatinglineproperty \
svx/uiconfig/ui/floatingundoredo \
svx/uiconfig/ui/fontworkgallerydialog \
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bf99813bed76..fcd99c90d8fc 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -251,50 +252,71 @@ public:
 };
 
 // SelectHdl needs the Modifiers, get them in MouseButtonUp
-class SvxFrmValueSet_Impl : public ValueSet
+class SvxFrmValueSet_Impl final : public SvtValueSet
 {
-sal_uInt16  nModifier;
-virtual voidMouseButtonUp( const MouseEvent& rMEvt ) override;
-public:
-SvxFrmValueSet_Impl(vcl::Window* pParent,  WinBits nWinStyle)
-: ValueSet(pParent, nWinStyle), nModifier(0) {}
-sal_uInt16  GetModifier() const {return nModifier;}
+private:
+sal_uInt16 nModifier;
 
-};
+virtual bool MouseButtonUp(const MouseEvent& rMEvt) override
+{
+nModifier = rMEvt.GetModifier();
+return SvtValueSet::MouseButtonUp(rMEvt);
+}
 
-}
+public:
+SvxFrmValueSet_Impl()
+: SvtValueSet(nullptr)
+, nModifier(0)
+{
+}
+sal_uInt16 GetModifier() const {return nModifier;}
+};
 
-void SvxFrmValueSet_Impl::MouseButtonUp( const MouseEvent& rMEvt )
-{
-nModifier = rMEvt.GetModifier();
-ValueSet::MouseButtonUp(rMEvt);
 }
 
 namespace {
 
-class SvxFrameWindow_Impl : public svtools::ToolbarPopup
+class SvxFrameToolBoxControl;
+
+class SvxFrameWindow_Impl final : public WeldToolbarPopup
 {
 private:
-VclPtr aFrameSet;
-svt::ToolboxController& mrController;
+rtl::Reference mxControl;
+std::unique_ptr mxFrameSet;
+std::unique_ptr mxFrameSetWin;
 std::vector   aImgVec;
 boolbParagraphMode;
 
 void InitImageList();
 void CalcSizeValueSet();
-DECL_LINK( SelectHdl, ValueSet*, void );
-
-protected:
-virtual voidGetFocus() override;
-virtual voidKeyInput( const KeyEvent& rKEvt ) override;
+DECL_LINK( SelectHdl, SvtValueSet*, void );
 
 public:
-SvxFrameWindow_Impl( svt::ToolboxController& rController, vcl::Window* 
pParentWindow );
-virtual ~SvxFrameWindow_Impl() override;
-virtual void dispose() override;
+SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld::Widget* 
pParent);
+virtual void GrabFocus() override
+{
+mxFrameSet->GrabFocus();
+}
 
 virtual voidstatusChanged( const css::frame::FeatureStateEvent& rEvent 
) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
+};
+
+class SvxFrameToolBoxControl : public svt::PopupWindowController
+{
+public:
+explicit SvxFrameToolBoxControl( const css::uno::Reference< 
css::uno::XComponentContext >& rContext );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& rArguments ) override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
+
+virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override;
+private:
+virtual std::unique_ptr weldPopupWindow() override;
+virtual VclPtr createVclPopupWindow( vcl::Window* pParent ) 
override;
 };
 
 class LineListBox final : public ListBox
@@ -2343,12 +2365,14 @@ Color ColorStatus::GetColor()
 }
 
 
-SvxFrameWindow_Impl::SvxFrameWindow_Impl ( svt::ToolboxController& 
rController, vcl::Window* pParentWindow ) :
-ToolbarPopup( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP 
| WB_MOVEABLE | WB_CLOSEABLE ),
-aFrameSet   ( VclPtr::Create(this, WinBits(

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-01-12 Thread andreas kainz (via logerrit)

 svx/source/dialog/compressgraphicdialog.cxx |4 ++--
 svx/uiconfig/ui/compressgraphicdialog.ui|   14 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit d3ac24bdb5dd4bc70a0b0c217b5e8f503dad8545
Author: andreas kainz 
AuthorDate: Wed Jan 8 14:44:54 2020 +0100
Commit: andreas_kainz 
CommitDate: Mon Jan 13 08:23:36 2020 +0100

tdf#128658 update image compress dialog default settings

Change-Id: I4bfd14d1d8543e27eb31e340742fac527d22e6d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86431
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index df4e08b3ca7a..060c9ba9ab38 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -46,7 +46,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( weld::Window* 
pParent, SdrGrafOb
 m_aGraphic( pGraphicObj->GetGraphicObject().GetGraphic() ),
 m_aViewSize100mm  ( pGraphicObj->GetLogicRect().GetSize() ),
 m_rBindings   ( rBindings ),
-m_dResolution ( 96.0 )
+m_dResolution ( 300 )
 {
 const SdrGrafCropItem& rCrop = 
m_xGraphicObj->GetMergedItem(SDRATTR_GRAFCROP);
 m_aCropRectangle = tools::Rectangle(rCrop.GetLeft(), rCrop.GetTop(), 
rCrop.GetRight(), rCrop.GetBottom());
@@ -61,7 +61,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( weld::Window* 
pParent, Graphic c
 m_aViewSize100mm  ( rViewSize100mm ),
 m_aCropRectangle  ( rCropRectangle ),
 m_rBindings   ( rBindings ),
-m_dResolution ( 96.0 )
+m_dResolution ( 300 )
 {
 Initialize();
 }
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui 
b/svx/uiconfig/ui/compressgraphicdialog.ui
index 2897e7b6ae07..1edc4273ed3f 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -5,7 +5,7 @@
   
 1
 9
-9
+6
 1
 1
   
@@ -19,9 +19,9 @@
   
 1
 99
-90
+80
 1
-10
+5
   
   
 1
@@ -203,10 +203,8 @@
 True
 True
 True
-90
 quality-adjustment
 True
-90
 
   
 
@@ -257,10 +255,10 @@
 True
 True
 True
-9
+6
 compression-adjustment
 True
-9
+6
 
   
 
@@ -429,8 +427,6 @@
 False
 True
 
-  50
-  75
   96
   150
   200
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2020-01-09 Thread Caolán McNamara (via logerrit)

 svx/source/tbxctrls/tbcontrl.cxx  |  159 +-
 svx/uiconfig/ui/currencywindow.ui |2 
 2 files changed, 42 insertions(+), 119 deletions(-)

New commits:
commit bb362ca226a0089a1b036366e9ffc45ab5c90d8d
Author: Caolán McNamara 
AuthorDate: Wed Jan 8 13:15:29 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 9 10:17:34 2020 +0100

use welded CurrencyList dropdown in all toolbars

Change-Id: Ia6d285947ce8cbae50700ee95bba861884c7e030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86434
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 93f589a7d03b..322bf970b54e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -631,27 +631,6 @@ public:
 virtual void dispose() override { m_aLineStyleLb.disposeAndClear(); 
ToolbarPopup::dispose(); }
 };
 
-class SvxCurrencyList_Impl : public svtools::ToolbarPopup
-{
-private:
-VclPtr m_pCurrencyLb;
-rtl::Reference m_xControl;
-OUString&   m_rSelectedFormat;
-LanguageType&   m_eSelectedLanguage;
-
-std::vector m_aFormatEntries;
-LanguageType  m_eFormatLanguage;
-DECL_LINK( SelectHdl, ListBox&, void );
-
-public:
-SvxCurrencyList_Impl( SvxCurrencyToolBoxControl* pControl,
-  vcl::Window* pParentWindow,
-  OUString& rSelectFormat,
-  LanguageType& eSelectLanguage );
-virtual ~SvxCurrencyList_Impl() override { disposeOnce(); }
-virtual void dispose() override;
-};
-
 }
 
 class SvxStyleToolBoxControl;
@@ -2647,68 +2626,6 @@ static Color lcl_mediumColor( Color aMain, Color 
/*aDefault*/ )
 return SvxBorderLine::threeDMediumColor( aMain );
 }
 
-SvxCurrencyList_Impl::SvxCurrencyList_Impl(
-SvxCurrencyToolBoxControl* pControl,
-vcl::Window* pParentWindow,
-OUString& rSelectedFormat,
-LanguageType& eSelectedLanguage ) :
-ToolbarPopup( pControl->getFrameInterface(), pParentWindow, WB_STDPOPUP | 
WB_MOVEABLE | WB_CLOSEABLE ),
-m_pCurrencyLb( VclPtr::Create(this) ),
-m_xControl( pControl ),
-m_rSelectedFormat( rSelectedFormat ),
-m_eSelectedLanguage( eSelectedLanguage )
-{
-m_pCurrencyLb->setPosSizePixel( 2, 2, 300, 140 );
-SetOutputSizePixel( Size( 304, 144 ) );
-
-std::vector< OUString > aList;
-std::vector< sal_uInt16 > aCurrencyList;
-const NfCurrencyTable& rCurrencyTable = 
SvNumberFormatter::GetTheCurrencyTable();
-sal_uInt16 nLen = rCurrencyTable.size();
-
-SvNumberFormatter aFormatter( m_xControl->getContext(), LANGUAGE_SYSTEM );
-m_eFormatLanguage = aFormatter.GetLanguage();
-
-SvxCurrencyToolBoxControl::GetCurrencySymbols( aList, true, aCurrencyList 
);
-
-sal_uInt16 nPos = 0, nCount = 0;
-sal_Int32 nSelectedPos = -1;
-bool bIsSymbol;
-NfWSStringsDtor aStringsDtor;
-
-for( const auto& rItem : aList )
-{
-sal_uInt16& rCurrencyIndex = aCurrencyList[ nCount ];
-if ( rCurrencyIndex < nLen )
-{
-m_pCurrencyLb->InsertEntry( rItem );
-const NfCurrencyEntry& aCurrencyEntry = rCurrencyTable[ 
rCurrencyIndex ];
-
-bIsSymbol = nPos >= nLen;
-
-sal_uInt16 nDefaultFormat = aFormatter.GetCurrencyFormatStrings( 
aStringsDtor, aCurrencyEntry, bIsSymbol );
-const OUString& rFormatStr = aStringsDtor[ nDefaultFormat ];
-m_aFormatEntries.push_back( rFormatStr );
-if( rFormatStr == m_rSelectedFormat )
-nSelectedPos = nPos;
-++nPos;
-}
-++nCount;
-}
-m_pCurrencyLb->SetSelectHdl( LINK( this, SvxCurrencyList_Impl, SelectHdl ) 
);
-SetText( SvxResId( RID_SVXSTR_TBLAFMT_CURRENCY ) );
-if ( nSelectedPos >= 0 )
-m_pCurrencyLb->SelectEntryPos( nSelectedPos );
-m_pCurrencyLb->Show();
-}
-
-void SvxCurrencyList_Impl::dispose()
-{
-m_xControl.clear();
-m_pCurrencyLb.disposeAndClear();
-ToolbarPopup::dispose();
-}
-
 SvxLineWindow_Impl::SvxLineWindow_Impl( svt::ToolboxController& rController, 
vcl::Window* pParentWindow ) :
 ToolbarPopup( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP 
| WB_MOVEABLE | WB_CLOSEABLE ),
 m_aLineStyleLb( VclPtr::Create(this) ),
@@ -2764,22 +2681,6 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( 
svt::ToolboxController& rController, vcl
 m_aLineStyleLb->Show();
 }
 
-IMPL_LINK_NOARG(SvxCurrencyList_Impl, SelectHdl, ListBox&, void)
-{
-VclPtr xThis(this);
-
-if ( IsInPopupMode() )
-EndPopupMode();
-
-if (!m_xControl.is())
-return;
-
-m_rSelectedFormat = m_aFormatEntries[ m_pCurrencyLb->GetSelectedEntryPos() 
];
-m_eSelectedLanguage = m_eFormatLanguage;
-
-m_xControl->execute( m_pCurrencyLb->GetSelectedEntryPos() + 1 );
-}
-
 IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ListBox&, void)
 {
 VclPtr

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-12-13 Thread Muhammet Kara (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   34 ++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |4 +
 svx/uiconfig/ui/sidebarpossize.ui   |   62 +---
 3 files changed, 65 insertions(+), 35 deletions(-)

New commits:
commit 376cd2ceaeedd12a8050c5acd142cd9b9d5e731a
Author: Muhammet Kara 
AuthorDate: Wed Nov 20 15:30:01 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Dec 13 10:40:05 2019 +0100

Add Edit Chart button for online's mobile view

To improve UX by providing mobile viewers a way to
enter into edit mode of a chart via single tap

Change-Id: I3cfb82df166c571a401f195a7f7c806fd6df604e
Reviewed-on: https://gerrit.libreoffice.org/83614
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/85091
Tested-by: Jenkins

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index abbb315b9ffd..036ce3fad157 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -48,6 +49,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -106,6 +108,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
 get( mpDial,  "orientationcontrol" );
 get( mpFtFlip,"fliplabel" );
 get( mpFlipTbx,   "selectrotationtype" );
+get( mpBtnEditChart,   "btnEditChart" );
 Initialize();
 
 mpBindings->Update( SID_ATTR_METRIC );
@@ -135,6 +138,7 @@ void PosSizePropertyPanel::dispose()
 mpDial.clear();
 mpFtFlip.clear();
 mpFlipTbx.clear();
+mpBtnEditChart.clear();
 
 maTransfPosXControl.dispose();
 maTransfPosYControl.dispose();
@@ -204,6 +208,8 @@ void PosSizePropertyPanel::Initialize()
 //flip:
 mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
 
+mpBtnEditChart->SetClickHdl( LINK( this, PosSizePropertyPanel, 
ClickChartEditHdl ) );
+
 mpMtrAngle->InsertValue(0, FieldUnit::CUSTOM);
 mpMtrAngle->InsertValue(4500, FieldUnit::CUSTOM);
 mpMtrAngle->InsertValue(9000, FieldUnit::CUSTOM);
@@ -269,6 +275,8 @@ void PosSizePropertyPanel::HandleContextChange(
 bool bShowPosition = false;
 bool bShowAngle = false;
 bool bShowFlip = false;
+bool bShowEditChart = false;
+bool bIsMobile = comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 
 switch (maContext.GetCombinedContext_DI())
 {
@@ -294,14 +302,24 @@ void PosSizePropertyPanel::HandleContextChange(
 bShowFlip = true;
 break;
 
+case CombinedEnumContext(Application::WriterVariants, Context::OLE):
+if (bIsMobile)
+bShowEditChart = true;
+break;
+
+case CombinedEnumContext(Application::Calc, Context::OLE):
+case CombinedEnumContext(Application::DrawImpress, Context::OLE):
+bShowPosition = true;
+if (bIsMobile)
+bShowEditChart = true;
+break;
+
 case CombinedEnumContext(Application::Calc, Context::Chart):
 case CombinedEnumContext(Application::Calc, Context::Form):
 case CombinedEnumContext(Application::Calc, Context::Media):
-case CombinedEnumContext(Application::Calc, Context::OLE):
 case CombinedEnumContext(Application::Calc, Context::MultiObject):
 case CombinedEnumContext(Application::DrawImpress, Context::Media):
 case CombinedEnumContext(Application::DrawImpress, Context::Form):
-case CombinedEnumContext(Application::DrawImpress, Context::OLE):
 case CombinedEnumContext(Application::DrawImpress, 
Context::ThreeDObject):
 case CombinedEnumContext(Application::DrawImpress, 
Context::MultiObject):
 bShowPosition = true;
@@ -323,6 +341,9 @@ void PosSizePropertyPanel::HandleContextChange(
 mpFtFlip->Show(bShowFlip);
 mpFlipTbx->Show(bShowFlip);
 
+// Edit Chart
+mpBtnEditChart->Show(bShowEditChart);
+
 if (mxSidebar.is())
 mxSidebar->requestLayout();
 }
@@ -497,6 +518,15 @@ IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, 
void )
 }
 }
 
+IMPL_STATIC_LINK_NOARG( PosSizePropertyPanel, ClickChartEditHdl, Button*, void 
)
+{
+SfxViewShell* pCurSh = SfxViewShell::Current();
+if ( pCurSh)
+{
+pCurSh->DoVerb( -1 );
+}
+}
+
 
 void PosSizePropertyPanel::NotifyItemUpdate(
 sal_uInt16 nSID,
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 2ac505428c36..3bc3f96f4151 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -107,6 +107,9 @@ private:
 VclPtr

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-12-01 Thread Jim Raykowski (via logerrit)

 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |   25 +
 svx/source/sidebar/paragraph/ParaSpacingWindow.hxx |5 
 svx/uiconfig/ui/paralrspacing.ui   |6 ++---
 svx/uiconfig/ui/paraulspacing.ui   |4 +--
 4 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 65d3285536e3342c2b1b669d0dc8c134bc7254c6
Author: Jim Raykowski 
AuthorDate: Fri Nov 29 21:29:47 2019 -0900
Commit: andreas_kainz 
CommitDate: Sun Dec 1 16:18:24 2019 +0100

tdf#109425 Make paraspacing windows grab focus

to their shown SvxRelativeField when focus is gained using keyboard
navigation. The patch also corrects images used for before, after, and
above controls.

Change-Id: Ic1411ac0eddf3b281590ac5821171b5e8aaac976
Reviewed-on: https://gerrit.libreoffice.org/84103
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index d945b32ed5bf..d6800db15b8c 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -116,6 +116,11 @@ 
ParaAboveSpacingWindow::ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::R
 m_pBelowContainer->Hide();
 }
 
+void ParaAboveSpacingWindow::GetFocus()
+{
+m_pAboveSpacing->GrabFocus();
+}
+
 // ParaBelowSpacingWindow
 
 ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame)
@@ -125,6 +130,11 @@ 
ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::R
 m_pBelowContainer->Show();
 }
 
+void ParaBelowSpacingWindow::GetFocus()
+{
+m_pBelowSpacing->GrabFocus();
+}
+
 // ParaLRSpacingWindow
 
 ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame)
@@ -304,6 +314,11 @@ ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* 
pParent, css::uno::Ref
 m_pFirstLineContainer->Hide();
 }
 
+void ParaLeftSpacingWindow::GetFocus()
+{
+m_pBeforeSpacing->GrabFocus();
+}
+
 // ParaRightSpacingWindow
 
 ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame)
@@ -314,6 +329,11 @@ 
ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::R
 m_pFirstLineContainer->Hide();
 }
 
+void ParaRightSpacingWindow::GetFocus()
+{
+m_pAfterSpacing->GrabFocus();
+}
+
 // ParaFirstLineSpacingWindow
 
 ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame)
@@ -324,4 +344,9 @@ 
ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css
 m_pFirstLineContainer->Show();
 }
 
+void ParaFirstLineSpacingWindow::GetFocus()
+{
+m_pFLSpacing->GrabFocus();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 5d0496414bd2..6d7ad8232102 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -60,12 +60,14 @@ class ParaAboveSpacingWindow : public ParaULSpacingWindow
 {
 public:
 explicit ParaAboveSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame);
+virtual void GetFocus() override;
 };
 
 class ParaBelowSpacingWindow : public ParaULSpacingWindow
 {
 public:
 explicit ParaBelowSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame);
+virtual void GetFocus() override;
 };
 
 class ParaLRSpacingWindow : public VclVBox,
@@ -100,18 +102,21 @@ class ParaLeftSpacingWindow : public ParaLRSpacingWindow
 {
 public:
 explicit ParaLeftSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame);
+virtual void GetFocus() override;
 };
 
 class ParaRightSpacingWindow : public ParaLRSpacingWindow
 {
 public:
 explicit ParaRightSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame);
+virtual void GetFocus() override;
 };
 
 class ParaFirstLineSpacingWindow : public ParaLRSpacingWindow
 {
 public:
 explicit ParaFirstLineSpacingWindow(vcl::Window* pParent, 
css::uno::Reference const & xFrame);
+virtual void GetFocus() override;
 };
 
 }
diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index d38ff54dd161..6093e4a1eee9 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -22,7 +22,7 @@
 False
 center
 center
-svx/res/symphony/Indent2.png
+svx/res/symphony/Indent4.png
   
   
 False
@@ -60,7 +60,7 @@
 False
 center
 center
-svx/res/symphony/Indent2.png
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-11-07 Thread Michael Meeks (via logerrit)

 svx/source/sidebar/text/TextPropertyPanel.cxx |   11 +++
 svx/uiconfig/ui/sidebartextpanel.ui   |2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit e194b4e209277ed5beeacf8ea875daa8688ab394
Author: Michael Meeks 
AuthorDate: Wed Nov 6 19:58:18 2019 +
Commit: Michael Meeks 
CommitDate: Thu Nov 7 12:15:27 2019 +0100

lok: disable text spacing for now.

Change-Id: I87229ab2bc1b72987d43ce685a03627111951ce3
Reviewed-on: https://gerrit.libreoffice.org/82178
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 3518e0368a4b..eae6f95aa366 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -21,6 +21,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -44,6 +46,15 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, 
const css::uno::Ref
 get(mpToolBoxFontColorSw, "colorbar_writer");
 get(mpToolBoxFontColor, "colorbar_others");
 get(mpToolBoxBackgroundColor, "colorbar_background");
+
+bool isMobile = false;
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+isMobile = true;
+VclPtr xSpacingBar;
+get(xSpacingBar, "spacingbar");
+xSpacingBar->Show(!isMobile);
+xSpacingBar->ShowItem(0, !isMobile);
 }
 
 TextPropertyPanel::~TextPropertyPanel()
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 8fbbc18b8fb0..c2c995490525 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -332,7 +332,7 @@
 
 
   
-True
+False
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig vcl/unx

2019-04-02 Thread Caolán McNamara (via logerrit)

 svx/source/dialog/crashreportdlg.cxx |   97 +++
 svx/source/dialog/crashreportdlg.hxx |   34 
 svx/source/dialog/crashreportui.cxx  |4 -
 svx/uiconfig/ui/crashreportdlg.ui|   38 +++--
 vcl/unx/gtk3/gtk3gtkinst.cxx |   19 ++
 5 files changed, 99 insertions(+), 93 deletions(-)

New commits:
commit ff1bafa9755a1099f12cdf7c89dd62ec328dd223
Author: Caolán McNamara 
AuthorDate: Mon Apr 1 21:32:15 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 2 12:36:29 2019 +0200

weld CrashReportDialog

Change-Id: Ifc4b606596db1469af03748da2d04659b8fa443a
Reviewed-on: https://gerrit.libreoffice.org/70124
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 70799f969bba..652bc4565ba0 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -22,60 +22,50 @@
 #include 
 #include 
 
-CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
-Dialog(pParent, "CrashReportDialog",
-"svx/ui/crashreportdlg.ui")
+CrashReportDialog::CrashReportDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "svx/ui/crashreportdlg.ui",
+"CrashReportDialog")
+, mxBtnSend(m_xBuilder->weld_button("btn_send"))
+, mxBtnCancel(m_xBuilder->weld_button("btn_cancel"))
+, mxBtnClose(m_xBuilder->weld_button("btn_close"))
+, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
+, mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
+, mxFtBugReport(m_xBuilder->weld_text_view("ed_bugreport"))
+, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
 {
-get(mpBtnSend, "btn_send");
-get(mpBtnCancel, "btn_cancel");
-get(mpBtnClose, "btn_close");
-get(mpEditPreUpload, "ed_pre");
-get(mpEditPostUpload, "ed_post");
-get(mpFtBugReport, "ed_bugreport");
-get(mpCBSafeMode, "check_safemode");
-
-maSuccessMsg = mpEditPostUpload->GetText();
-
-mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
-mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
-mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
-mpEditPostUpload->SetReadOnly();
+maSuccessMsg = mxEditPostUpload->get_text();
+
+auto nWidth = mxEditPreUpload->get_preferred_size().Width();
+nWidth = std::max(nWidth, mxCBSafeMode->get_size_request().Width());
+mxEditPreUpload->set_size_request(nWidth, -1);
+mxCBSafeMode->set_size_request(nWidth, -1);
+
+mxBtnSend->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
+mxBtnCancel->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
+mxBtnClose->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
 }
 
 CrashReportDialog::~CrashReportDialog()
 {
-disposeOnce();
 }
 
-void CrashReportDialog::dispose()
+short CrashReportDialog::run()
 {
-mpBtnSend.clear();
-mpBtnCancel.clear();
-mpBtnClose.clear();
-mpEditPreUpload.clear();
-mpEditPostUpload.clear();
-mpFtBugReport.clear();
-mpCBSafeMode.clear();
-
-Dialog::dispose();
-}
+short nRet = GenericDialogController::run();
 
-bool CrashReportDialog::Close()
-{
 // Check whether to go to safe mode
-if (mpCBSafeMode->IsChecked())
+if (mxCBSafeMode->get_active())
 {
 sfx2::SafeMode::putFlag();
 
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
 css::uno::Reference< css::task::XInteractionHandler >());
 }
-
-return Dialog::Close();
+return nRet;
 }
 
-IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
+IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn, void)
 {
-if (pBtn == mpBtnSend.get())
+if ( == mxBtnSend.get())
 {
 std::string ini_path = CrashReporter::getIniFileName();
 
@@ -89,32 +79,33 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 OUString aProcessedMessage = maSuccessMsg.replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=",""));
 
 // vclbuilder seems to replace _ with ~ even in text
-mpEditPostUpload->SetText(aProcessedMessage.replaceAll("~", "_"));
+mxEditPostUpload->set_text(aProcessedMessage.replaceAll("~", "_"));
 }
 else
 {
-mpEditPostUpload->SetText(aCrashID);
+mxEditPostUpload->set_text(aCrashID);
 }
 
-mpBtnClose->Show();
-mpFtBugReport->Show();
-mpEditPreUpload->Hide();
-mpEditPostUpload->Show();
-mpBtnSend->Hide();
-mpBtnSend->Disable();
-mpBtnCancel->Hide();
-mpBtnCancel->Disable();
-mpBtnClose->GrabFocus();
-
-setOptimalLayoutSize();
+mxBtnClose->show();
+mxFtBugReport->show();
+mxEditPostUpload->show();
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-02-20 Thread Libreoffice Gerrit user

 svx/source/dialog/docrecovery.cxx|   33 ---
 svx/source/inc/docrecovery.hxx   |   48 +++---
 svx/source/unodraw/recoveryui.cxx|5 --
 svx/uiconfig/ui/docrecoverysavedialog.ui |   65 +++
 4 files changed, 94 insertions(+), 57 deletions(-)

New commits:
commit 45980b72480c4331f0884d8a0c7ef59e757e7aa6
Author: Caolán McNamara 
AuthorDate: Sun Sep 30 11:44:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Feb 20 22:10:11 2019 +0100

weld SaveDialog

Change-Id: Iaef35328c0657a4538d4b4a44734146baee0346b
Reviewed-on: https://gerrit.libreoffice.org/61153
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index b04db053..accb44c5172d 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -646,52 +646,39 @@ void SAL_CALL WeldPluginProgress::reset()
 m_pProgressBar->set_percentage(0);
 }
 
-SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)
-: Dialog(pParent, "DocRecoverySaveDialog",
-"svx/ui/docrecoverysavedialog.ui")
+SaveDialog::SaveDialog(weld::Window* pParent, RecoveryCore* pCore)
+: GenericDialogController(pParent, "svx/ui/docrecoverysavedialog.ui", 
"DocRecoverySaveDialog")
 , m_pCore(pCore)
+, m_xFileListLB(m_xBuilder->weld_tree_view("filelist"))
+, m_xOkBtn(m_xBuilder->weld_button("ok"))
 {
-get(m_pFileListLB, "filelist");
-m_pFileListLB->set_height_request(m_pFileListLB->GetTextHeight() * 10);
-get(m_pOkBtn, "ok");
+m_xFileListLB->set_size_request(-1, m_xFileListLB->get_height_rows(10));
 
 // Prepare the office for the following crash save step.
 // E.g. hide all open windows so the user can't influence our
 // operation .-)
 m_pCore->doEmergencySavePrepare();
 
-const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
-m_pOkBtn->SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) );
-m_pFileListLB->SetControlBackground( rStyleSettings.GetDialogColor() );
+m_xOkBtn->connect_clicked(LINK(this, SaveDialog, OKButtonHdl));
 
 // fill listbox with current open documents
-m_pFileListLB->Clear();
 
 TURLList&rURLs = m_pCore->getURLListAccess();
 
 for (const TURLInfo& rInfo : rURLs)
 {
-m_pFileListLB->InsertEntry( rInfo.DisplayName, rInfo.StandardImage );
+m_xFileListLB->append("", rInfo.DisplayName, rInfo.StandardImageId);
 }
 }
 
 SaveDialog::~SaveDialog()
 {
-disposeOnce();
-}
-
-void SaveDialog::dispose()
-{
-m_pFileListLB.clear();
-m_pOkBtn.clear();
-Dialog::dispose();
 }
 
-IMPL_LINK_NOARG(SaveDialog, OKButtonHdl, Button*, void)
+IMPL_LINK_NOARG(SaveDialog, OKButtonHdl, weld::Button&, void)
 {
 // start crash-save with progress
-std::unique_ptr xProgress(new 
SaveProgressDialog(GetFrameWeld(), m_pCore));
+std::unique_ptr xProgress(new 
SaveProgressDialog(m_xDialog.get(), m_pCore));
 short nResult = xProgress->run();
 xProgress.reset();
 
@@ -700,7 +687,7 @@ IMPL_LINK_NOARG(SaveDialog, OKButtonHdl, Button*, void)
 if (nResult == DLG_RET_OK)
 nResult = DLG_RET_OK_AUTOLUNCH;
 
-EndDialog(nResult);
+m_xDialog->response(nResult);
 }
 
 SaveProgressDialog::SaveProgressDialog(weld::Window* pParent, RecoveryCore* 
pCore)
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 3a4c1f769c9b..698882acbdc2 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -381,36 +382,35 @@ public:
 virtual void SAL_CALL removeEventListener( const css::uno::Reference< 
css::lang::XEventListener >& xListener) override;
 };
 
-class SaveDialog : public Dialog
+class SaveDialog : public weld::GenericDialogController
 {
-// member
-private:
-VclPtrm_pFileListLB;
-VclPtr   m_pOkBtn;
-RecoveryCore*   m_pCore;
+// member
+private:
+RecoveryCore*   m_pCore;
+std::unique_ptr m_xFileListLB;
+std::unique_ptr m_xOkBtn;
 
-// interface
-public:
-/** @short  create all child controls of this dialog.
+// interface
+public:
+/** @short  create all child controls of this dialog.
 
-@descr  The dialog isn't shown nor it starts any
-action by itself!
+@descr  The dialog isn't shown nor it starts any
+action by itself!
 
-@param  pParent
-can point to a parent window.
-If its set to 0, the defmodal-dialog-parent
-is used automatically.
+@param  pParent
+can point to a parent window.
+If its set to 0, the defmodal-dialog-parent
+is used automatically.

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-02-08 Thread Libreoffice Gerrit user

 svx/source/form/datanavi.cxx |  255 +++
 svx/source/inc/datanavi.hxx  |   61 +++-
 svx/uiconfig/ui/adddataitemdialog.ui |  130 +
 3 files changed, 206 insertions(+), 240 deletions(-)

New commits:
commit 2d6313a9fac81340883b24fe3651781d31c6039d
Author: Caolán McNamara 
AuthorDate: Fri Feb 8 10:00:03 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 8 11:52:16 2019 +0100

weld AddDataItemDialog

Change-Id: I579d6d555b0f01df22e6f97912712a9ec2bf69a6
Reviewed-on: https://gerrit.libreoffice.org/67532
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9d433ff6a5fb..7f3773061e97 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -616,10 +616,10 @@ namespace svxform
 }
 }
 
-ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, 
pNode.get(), m_xUIHelper );
-aDlg->SetText( SvxResId( pResId ) );
-aDlg->InitText( eType );
-short nReturn = aDlg->Execute();
+AddDataItemDialog aDlg(GetFrameWeld(), pNode.get(), 
m_xUIHelper);
+aDlg.set_title(SvxResId(pResId));
+aDlg.InitText( eType );
+short nReturn = aDlg.run();
 if (  DGTInstance == m_eGroup )
 {
 if ( RET_OK == nReturn )
@@ -687,7 +687,7 @@ namespace svxform
 return bHandled;
 }
 
-ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, 
pNode, m_xUIHelper );
+AddDataItemDialog aDlg(GetFrameWeld(), pNode, m_xUIHelper);
 DataItemType eType = DITElement;
 const char* pResId = RID_STR_DATANAV_EDIT_ELEMENT;
 if ( pNode && pNode->m_xNode.is() )
@@ -711,9 +711,9 @@ namespace svxform
 pResId = RID_STR_DATANAV_EDIT_BINDING;
 eType = DITBinding;
 }
-aDlg->SetText( SvxResId( pResId ) );
-aDlg->InitText( eType );
-if ( aDlg->Execute() == RET_OK )
+aDlg.set_title(SvxResId(pResId));
+aDlg.InitText( eType );
+if (aDlg.run() == RET_OK)
 {
 // Set the new name
 OUString sNewName;
@@ -2229,9 +2229,9 @@ namespace svxform
 static_cast(GetWindow())->Initialize( _pInfo );
 }
 
-AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* 
_pNode,
+AddDataItemDialog::AddDataItemDialog(weld::Window* pParent, ItemNode* 
_pNode,
 const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
-: ModalDialog(pParent, "AddDataItemDialog" , 
"svx/ui/adddataitemdialog.ui")
+: GenericDialogController(pParent, "svx/ui/adddataitemdialog.ui", 
"AddDataItemDialog")
 , m_xUIHelper(_rUIHelper)
 , m_pItemNode(_pNode)
 , m_eItemType(DITNone)
@@ -2239,43 +2239,35 @@ namespace svxform
 , m_sFL_Attribute(SvxResId(RID_STR_ATTRIBUTE))
 , m_sFL_Binding(SvxResId(RID_STR_BINDING))
 , m_sFT_BindingExp(SvxResId(RID_STR_BINDING_EXPR))
+, m_xItemFrame(m_xBuilder->weld_frame("itemframe"))
+, m_xNameFT(m_xBuilder->weld_label("nameft"))
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xDefaultFT(m_xBuilder->weld_label("valueft"))
+, m_xDefaultED(m_xBuilder->weld_entry("value"))
+, m_xDefaultBtn(m_xBuilder->weld_button("browse"))
+, m_xSettingsFrame(m_xBuilder->weld_widget("settingsframe"))
+, m_xDataTypeFT(m_xBuilder->weld_label("datatypeft"))
+, m_xDataTypeLB(m_xBuilder->weld_combo_box("datatype"))
+, m_xRequiredCB(m_xBuilder->weld_check_button("required"))
+, m_xRequiredBtn(m_xBuilder->weld_button("requiredcond"))
+, m_xRelevantCB(m_xBuilder->weld_check_button("relevant"))
+, m_xRelevantBtn(m_xBuilder->weld_button("relevantcond"))
+, m_xConstraintCB(m_xBuilder->weld_check_button("constraint"))
+, m_xConstraintBtn(m_xBuilder->weld_button("constraintcond"))
+, m_xReadonlyCB(m_xBuilder->weld_check_button("readonly"))
+, m_xReadonlyBtn(m_xBuilder->weld_button("readonlycond"))
+, m_xCalculateCB(m_xBuilder->weld_check_button("calculate"))
+, m_xCalculateBtn(m_xBuilder->weld_button("calculatecond"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
-get(m_pItemFrame, "itemframe");
-get(m_pNameFT, "nameft");
-get(m_pNameED, "name");
-get(m_pDefaultFT, "valueft");
-get(m_pDefaultED, "value");
-get(m_pDefaultBtn, "browse");
-get(m_pSettingsFrame, "settingsframe");
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-02-08 Thread Libreoffice Gerrit user

 svx/source/form/datanavi.cxx   |  140 +++--
 svx/source/inc/datanavi.hxx|   30 +++
 svx/uiconfig/ui/addsubmissiondialog.ui |   23 +++--
 3 files changed, 96 insertions(+), 97 deletions(-)

New commits:
commit c953ff6ce59001323a05a4f398fd354fac5e559d
Author: Caolán McNamara 
AuthorDate: Fri Feb 8 09:26:45 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 8 11:33:45 2019 +0100

weld AddSubmissionDialog

Change-Id: Ib56b22743ef6b9eb849291f9d8eba02450e3fc68
Reviewed-on: https://gerrit.libreoffice.org/67531
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 0f064627489c..9d433ff6a5fb 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -489,12 +489,12 @@ namespace svxform
 DBG_ASSERT( xModel.is(), "XFormsPage::DoToolBoxAction(): Action 
without model" );
 if ( DGTSubmission == m_eGroup )
 {
-ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this, 
nullptr, m_xUIHelper );
-if ( aDlg->Execute() == RET_OK && 
aDlg->GetNewSubmission().is() )
+AddSubmissionDialog aDlg(GetFrameWeld(), nullptr, m_xUIHelper);
+if ( aDlg.run() == RET_OK && aDlg.GetNewSubmission().is() )
 {
 try
 {
-Reference< css::xforms::XSubmission > xNewSubmission = 
aDlg->GetNewSubmission();
+Reference< css::xforms::XSubmission > xNewSubmission = 
aDlg.GetNewSubmission();
 Reference< XSet > xSubmissions( 
xModel->getSubmissions(), UNO_QUERY );
 xSubmissions->insert( makeAny( xNewSubmission ) );
 Reference< XPropertySet > xNewPropSet( xNewSubmission, 
UNO_QUERY );
@@ -752,9 +752,9 @@ namespace svxform
 }
 else
 {
-ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this, 
pNode, m_xUIHelper );
-aDlg->SetText( SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION ) 
);
-if ( aDlg->Execute() == RET_OK )
+AddSubmissionDialog aDlg(GetFrameWeld(), pNode, 
m_xUIHelper);
+aDlg.set_title(SvxResId(RID_STR_DATANAV_EDIT_SUBMISSION));
+if (aDlg.run() == RET_OK)
 {
 EditEntry( pNode->m_xPropSet );
 bIsDocModified = true;
@@ -3039,63 +3039,47 @@ namespace svxform
 }
 
 AddSubmissionDialog::AddSubmissionDialog(
-vcl::Window* pParent, ItemNode* _pNode,
+weld::Window* pParent, ItemNode* _pNode,
 const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
-: ModalDialog(pParent, "AddSubmissionDialog",
-"svx/ui/addsubmissiondialog.ui")
+: GenericDialogController(pParent, "svx/ui/addsubmissiondialog.ui", 
"AddSubmissionDialog")
 , m_pItemNode(_pNode)
 , m_xUIHelper(_rUIHelper)
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xActionED(m_xBuilder->weld_entry("action"))
+, m_xMethodLB(m_xBuilder->weld_combo_box("method"))
+, m_xRefED(m_xBuilder->weld_entry("expression"))
+, m_xRefBtn(m_xBuilder->weld_button("browse"))
+, m_xBindLB(m_xBuilder->weld_combo_box("binding"))
+, m_xReplaceLB(m_xBuilder->weld_combo_box("replace"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
-get(m_pNameED, "name");
-get(m_pActionED, "action");
-get(m_pMethodLB, "method");
-get(m_pRefED, "expression");
-get(m_pRefBtn, "browse");
-get(m_pBindLB, "binding");
-get(m_pReplaceLB, "replace");
-get(m_pOKBtn, "ok");
 FillAllBoxes();
 
-m_pRefBtn->SetClickHdl( LINK( this, AddSubmissionDialog, RefHdl ) );
-m_pOKBtn->SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) );
+m_xRefBtn->connect_clicked( LINK( this, AddSubmissionDialog, RefHdl ) 
);
+m_xOKBtn->connect_clicked( LINK( this, AddSubmissionDialog, OKHdl ) );
 }
 
-
 AddSubmissionDialog::~AddSubmissionDialog()
 {
-disposeOnce();
-}
-
-void AddSubmissionDialog::dispose()
-{
 // #i38991# if we have added a binding, we need to remove it as well.
 if( m_xCreatedBinding.is() && m_xUIHelper.is() )
 m_xUIHelper->removeBindingIfUseless( m_xCreatedBinding );
-m_pNameED.clear();
-m_pActionED.clear();
-m_pMethodLB.clear();
-m_pRefED.clear();
-m_pRefBtn.clear();
-m_pBindLB.clear();
-m_pReplaceLB.clear();
-m_pOKBtn.clear();
-ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl, Button*, void)
+IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl,

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2019-02-07 Thread Libreoffice Gerrit user

 svx/source/form/datanavi.cxx   |  151 ++---
 svx/source/inc/datanavi.hxx|   24 ++---
 svx/uiconfig/ui/namespacedialog.ui |   94 ---
 3 files changed, 119 insertions(+), 150 deletions(-)

New commits:
commit 950bdd703bb4430526598a132897a6b77cb21005
Author: Caolán McNamara 
AuthorDate: Thu Feb 7 17:15:52 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 7 21:59:13 2019 +0100

weld NamespaceItemDialog

Change-Id: If2029eaae250ed3ee4ab56dae7ec67c2deba3ab8
Reviewed-on: https://gerrit.libreoffice.org/67515
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 85a4a70eb0cf..6b241324b353 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2812,8 +2812,8 @@ namespace svxform
 {
 SAL_WARN( "svx.form", "AddDataItemDialog::EditHdl(): exception 
caught" );
 }
-ScopedVclPtrInstance< NamespaceItemDialog > aDlg( this, xNameContnr );
-aDlg->Execute();
+NamespaceItemDialog aDlg(this, xNameContnr);
+aDlg.run();
 try
 {
 m_xBinding->setPropertyValue( PN_BINDING_NAMESPACES, makeAny( 
xNameContnr ) );
@@ -2866,123 +2866,91 @@ namespace svxform
 m_pResultWin->SetText( sResult );
 }
 
-NamespaceItemDialog::NamespaceItemDialog(
-AddConditionDialog* _pCondDlg,
-Reference< XNameContainer >& _rContainer )
-: ModalDialog( _pCondDlg, "NamespaceDialog",
-"svx/ui/namespacedialog.ui" )
-, m_pConditionDlg(_pCondDlg)
-, m_rNamespaces(_rContainer)
+NamespaceItemDialog::NamespaceItemDialog(AddConditionDialog* pCondDlg, 
Reference& rContainer)
+: GenericDialogController(pCondDlg->GetFrameWeld(), 
"svx/ui/namespacedialog.ui", "NamespaceDialog")
+, m_pConditionDlg(pCondDlg)
+, m_rNamespaces(rContainer)
+, m_xNamespacesList(m_xBuilder->weld_tree_view("namespaces"))
+, m_xAddNamespaceBtn(m_xBuilder->weld_button("add"))
+, m_xEditNamespaceBtn(m_xBuilder->weld_button("edit"))
+, m_xDeleteNamespaceBtn(m_xBuilder->weld_button("delete"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
-get(m_pAddNamespaceBtn, "add");
-get(m_pEditNamespaceBtn, "edit");
-get(m_pDeleteNamespaceBtn, "delete");
-get(m_pOKBtn, "ok");
+
m_xNamespacesList->set_size_request(m_xNamespacesList->get_approximate_digit_width()
 * 80,
+
m_xNamespacesList->get_height_rows(8));
+
+std::vector aWidths;
+aWidths.push_back(m_xNamespacesList->get_approximate_digit_width() * 
20);
+m_xNamespacesList->set_column_fixed_widths(aWidths);
 
-SvSimpleTableContainer* pNamespacesListContainer =
-get("namespaces");
-Size aControlSize(175, 72);
-aControlSize = LogicToPixel(aControlSize, 
MapMode(MapUnit::MapAppFont));
-pNamespacesListContainer->set_width_request(aControlSize.Width());
-pNamespacesListContainer->set_height_request(aControlSize.Height());
-m_pNamespacesList = 
VclPtr::Create(*pNamespacesListContainer, 0);
-
-static long aTabPositions[]= { 0, 35, 200 };
-m_pNamespacesList->SvSimpleTable::SetTabs( 
SAL_N_ELEMENTS(aTabPositions), aTabPositions );
-OUString sHeader = get("prefix")->GetText();
-sHeader += "\t";
-sHeader += get("url")->GetText();
-m_pNamespacesList->InsertHeaderEntry(
-sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| 
HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ );
-
-m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, 
SelectHdl ) );
-Link aLink = LINK( this, NamespaceItemDialog, ClickHdl );
-m_pAddNamespaceBtn->SetClickHdl( aLink );
-m_pEditNamespaceBtn->SetClickHdl( aLink );
-m_pDeleteNamespaceBtn->SetClickHdl( aLink );
-m_pOKBtn->SetClickHdl( LINK( this, NamespaceItemDialog, OKHdl ) );
+m_xNamespacesList->connect_changed( LINK( this, NamespaceItemDialog, 
SelectHdl ) );
+Link aLink = LINK( this, NamespaceItemDialog, 
ClickHdl );
+m_xAddNamespaceBtn->connect_clicked( aLink );
+m_xEditNamespaceBtn->connect_clicked( aLink );
+m_xDeleteNamespaceBtn->connect_clicked( aLink );
+m_xOKBtn->connect_clicked( LINK( this, NamespaceItemDialog, OKHdl ) );
 
 LoadNamespaces();
-SelectHdl( m_pNamespacesList );
+SelectHdl(*m_xNamespacesList);
 }
 
-
 NamespaceItemDialog::~NamespaceItemDialog()
 {
-disposeOnce();
-}
-
-void NamespaceItemDialog::dispose()
-{
-m_pNamespacesList.disposeAndClear();
-m_pAddNamespaceBtn.clear();
-m_pEditNamespaceBtn.clear();
-m_pDeleteNamespaceBtn.clear();
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2018-09-18 Thread Libreoffice Gerrit user

 svx/source/form/fmtextcontroldialogs.cxx |   38 +++--
 svx/source/form/fmtextcontrolshell.cxx   |   14 +--
 svx/source/inc/fmtextcontroldialogs.hxx  |   16 +--
 svx/uiconfig/ui/textcontrolchardialog.ui |  102 +---
 svx/uiconfig/ui/textcontrolparadialog.ui |  128 +++
 5 files changed, 230 insertions(+), 68 deletions(-)

New commits:
commit 117514ec9f79d8a608b34c5372c83cf63b2a6e3b
Author: Caolán McNamara 
AuthorDate: Mon Sep 17 12:20:44 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 18 21:59:11 2018 +0200

weld TextControlCharAttribDialog and TextControlParaAttribDialog

Change-Id: Id90967c9be1a56535aac3900a0cc2555ed8f9600
Reviewed-on: https://gerrit.libreoffice.org/60583
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/fmtextcontroldialogs.cxx 
b/svx/source/form/fmtextcontroldialogs.cxx
index eca5ac22a038..53b854120c9f 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -31,44 +31,38 @@
 namespace svx
 {
 
-TextControlCharAttribDialog::TextControlCharAttribDialog( vcl::Window* 
pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList )
-: SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog",
-"svx/ui/textcontrolchardialog.ui", &_rCoreSet )
-, m_aFontList(_rFontList)
-, m_nCharNamePageId(0)
-, m_nCharEffectsPageId(0)
-, m_nCharPositionPageId(0)
+TextControlCharAttribDialog::TextControlCharAttribDialog(weld::Window* 
pParent, const SfxItemSet& rCoreSet, const SvxFontListItem& rFontList)
+: SfxTabDialogController(pParent, "svx/ui/textcontrolchardialog.ui", 
"TextControlCharacterPropertiesDialog", )
+, m_aFontList(rFontList)
 {
-m_nCharNamePageId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
-m_nCharEffectsPageId = AddTabPage("fonteffects", 
RID_SVXPAGE_CHAR_EFFECTS);
-m_nCharPositionPageId = AddTabPage("position", 
RID_SVXPAGE_CHAR_POSITION);
+AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
+AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
+AddTabPage("position", RID_SVXPAGE_CHAR_POSITION);
 }
 
-void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, 
SfxTabPage& _rPage )
+void TextControlCharAttribDialog::PageCreated(const OString& rId, 
SfxTabPage& rPage)
 {
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
-if (_nId == m_nCharNamePageId)
+if (rId == "font")
 {
 aSet.Put (m_aFontList);
-_rPage.PageCreated(aSet);
+rPage.PageCreated(aSet);
 }
-else if (_nId == m_nCharEffectsPageId)
+else if (rId == "fonteffects")
 {
 aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
-_rPage.PageCreated(aSet);
+rPage.PageCreated(aSet);
 }
-else if (_nId == m_nCharPositionPageId)
+else if (rId == "position")
 {
 aSet.Put( SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER) );
-_rPage.PageCreated(aSet);
+rPage.PageCreated(aSet);
 }
 }
 
-TextControlParaAttribDialog::TextControlParaAttribDialog(vcl::Window* 
_pParent,
-const SfxItemSet& _rCoreSet)
-: SfxTabDialog( _pParent, "TextControlParagraphPropertiesDialog",
-"svx/ui/textcontrolparadialog.ui", &_rCoreSet )
+TextControlParaAttribDialog::TextControlParaAttribDialog(weld::Window* 
pParent, const SfxItemSet& rCoreSet)
+: SfxTabDialogController(pParent, "svx/ui/textcontrolparadialog.ui", 
"TextControlParagraphPropertiesDialog", )
 {
 AddTabPage("labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH);
 AddTabPage("labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH);
@@ -81,8 +75,6 @@ namespace svx
 
 AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
-
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmtextcontrolshell.cxx 
b/svx/source/form/fmtextcontrolshell.cxx
index becb05cb0976..d97182f87ec6 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -619,7 +619,7 @@ namespace svx
 }
 
 
-void FmTextControlShell::executeAttributeDialog( AttributeSet _eSet, 
SfxRequest& _rReq )
+void FmTextControlShell::executeAttributeDialog( AttributeSet _eSet, 
SfxRequest& rReq )
 {
 const SvxFontListItem* pFontList = dynamic_cast( m_pViewFrame->GetObjectShell()->GetItem( 
SID_ATTR_CHAR_FONTLIST )  );
 DBG_ASSERT( pFontList, "FmTextControlShell::executeAttributeDialog: no 
font list item!" );
@@ -640,12 +640,12 @@ namespace svx
 fillFeatureDispatchers( m_xActiveControl, pDialogSlots, 
aAdditionalFestures );
 transferFeatureStatesToItemSet( aAdditionalFestures, *xCurrentItems, 
true );
 
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2018-06-13 Thread heiko tietze

 svx/source/inc/DefaultShapesPanel.hxx|3 
 svx/source/sidebar/shapes/DefaultShapesPanel.cxx |2 
 svx/uiconfig/ui/defaultshapespanel.ui|  549 +++
 3 files changed, 272 insertions(+), 282 deletions(-)

New commits:
commit dc5a7f14cb44c06c19772249973d06df1f4eccaa
Author: heiko tietze 
Date:   Wed Jun 13 13:11:50 2018 +0200

tdf#118110 - Mouse wheel should work with the shapes desk

scrollwindow removed

Change-Id: Id38dd75120effe63314fb3665417c728f3822712
Reviewed-on: https://gerrit.libreoffice.org/55748
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/inc/DefaultShapesPanel.hxx 
b/svx/source/inc/DefaultShapesPanel.hxx
index 3759b1d859cd..d2e94258b965 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -60,7 +60,6 @@ private:
 VclPtr  mpCalloutSet;
 VclPtr  mpStarSet;
 VclPtr  mp3DObjectSet;
-VclPtr mpScrollWindow;
 Reference< XFrame >   mxFrame;
 std::map, std::map> 
mpShapesSetMap;
 
@@ -74,4 +73,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx 
b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 671eeeba55b4..1f8c2d10b58c 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -34,7 +34,6 @@ DefaultShapesPanel::DefaultShapesPanel (
 SvxShapeCommandsMap(),
 mxFrame(rxFrame)
 {
-get(mpScrollWindow, "scrolledwindow1");
 get(mpLineArrowSet, "LinesArrows");
 get(mpCurveSet, "Curves");
 get(mpConnectorSet, "Connectors");
@@ -92,7 +91,6 @@ void DefaultShapesPanel::Initialize()
 void DefaultShapesPanel::dispose()
 {
 mpShapesSetMap.clear();
-mpScrollWindow.clear();
 mpLineArrowSet.clear();
 mpCurveSet.clear();
 mpConnectorSet.clear();
diff --git a/svx/uiconfig/ui/defaultshapespanel.ui 
b/svx/uiconfig/ui/defaultshapespanel.ui
index e211bdf62a84..6350f9b82220 100644
--- a/svx/uiconfig/ui/defaultshapespanel.ui
+++ b/svx/uiconfig/ui/defaultshapespanel.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -16,391 +16,384 @@
 vertical
 12
 
-  
+  
 True
-True
-in
+False
 
-  
+  
 True
 False
+vertical
+3
 
-  
+  
 True
 False
-vertical
-3
+0
+none
 
-  
+  
 True
 False
-0
-none
+12
 
-  
+  
+50
 True
 False
-12
-
-  
-50
-True
-False
-  
-
-  
-
-
-  
-True
-False
-Lines  Arrows
-
-  
-
   
 
   
-  
-True
-True
-0
-  
 
+
+  
+True
+False
+Lines  Arrows
+
+  
+
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
+0
+none
 
-  
+  
 True
 False
-0
-none
+12
 
-  
-True
-False
-12
-
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2018-05-14 Thread Caolán McNamara

 svx/source/dialog/SafeModeDialog.cxx |   23 +--
 svx/uiconfig/ui/profileexporteddialog.ui |   12 +---
 2 files changed, 22 insertions(+), 13 deletions(-)

New commits:
commit 209f95d9148969f578196a76e0981cf6161f11dc
Author: Caolán McNamara 
Date:   Mon May 14 12:33:52 2018 +0100

weld ProfileExportedDialog

Change-Id: Ie360699c167cbee0be6d890ad686d351d64707cd
Reviewed-on: https://gerrit.libreoffice.org/54315
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index af99ec1bd172..33e8912bebc5 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -332,21 +332,24 @@ IMPL_LINK(SafeModeDialog, DialogBtnHdl, Button*, pBtn, 
void)
 }
 
 namespace {
-class ProfileExportedDialog : public ModalDialog
+class ProfileExportedDialog : public weld::GenericDialogController
 {
 private:
-DECL_LINK(OpenHdl, Button*, void);
+std::unique_ptr m_xButton;
+
+DECL_LINK(OpenHdl, weld::Button&, void);
 public:
-explicit ProfileExportedDialog();
+explicit ProfileExportedDialog(weld::Window* pParent);
 };
 
-ProfileExportedDialog::ProfileExportedDialog()
-: ModalDialog(nullptr, "ProfileExportedDialog", 
"svx/ui/profileexporteddialog.ui")
+ProfileExportedDialog::ProfileExportedDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "svx/ui/profileexporteddialog.ui", 
"GenericDialogController")
+, m_xButton(m_xBuilder->weld_button("ok"))
 {
-get("openfolder")->SetClickHdl(LINK(this, 
ProfileExportedDialog, OpenHdl));
+m_xButton->connect_clicked(LINK(this, ProfileExportedDialog, OpenHdl));
 }
 
-IMPL_LINK_NOARG(ProfileExportedDialog, OpenHdl, Button*, void)
+IMPL_LINK_NOARG(ProfileExportedDialog, OpenHdl, weld::Button&, void)
 {
 const OUString uri(comphelper::BackupFileHelper::getUserProfileURL());
 css::uno::Reference< css::system::XSystemShellExecute > exec(
@@ -355,7 +358,7 @@ namespace {
 exec->execute(uri, OUString(), 
css::system::SystemShellExecuteFlags::URIS_ONLY);
 } catch (css::uno::Exception) {
 }
-EndDialog(RET_OK);
+m_xDialog->response(RET_OK);
 }
 }
 
@@ -379,8 +382,8 @@ IMPL_LINK(SafeModeDialog, CreateZipBtnHdl, Button*, 
/*pBtn*/, void)
 return;
 }
 
-ScopedVclPtrInstance< ProfileExportedDialog > aDialog;
-aDialog->Execute();
+ProfileExportedDialog aDialog(GetFrameWeld());
+aDialog.run();
 }
 
 IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void)
diff --git a/svx/uiconfig/ui/profileexporteddialog.ui 
b/svx/uiconfig/ui/profileexporteddialog.ui
index 485d4cfcdbfa..c69be1444f29 100644
--- a/svx/uiconfig/ui/profileexporteddialog.ui
+++ b/svx/uiconfig/ui/profileexporteddialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,7 +7,13 @@
 6
 Profile 
exported
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
@@ -36,7 +42,7 @@
   
 
 
-  
+  
 Open Containing _Folder
 True
 True
@@ -78,7 +84,7 @@
 
 
   close
-  openfolder
+  ok
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2018-05-14 Thread Caolán McNamara

 svx/source/form/datanavi.cxx  |   42 +++---
 svx/source/inc/datanavi.hxx   |   20 --
 svx/uiconfig/ui/addmodeldialog.ui |   11 -
 3 files changed, 35 insertions(+), 38 deletions(-)

New commits:
commit 2cc5db624408b9853200f7ffe09ab2f954c2ae6c
Author: Caolán McNamara 
Date:   Mon May 14 12:27:57 2018 +0100

weld AddModelDialog

Change-Id: Ia12069f966c93ad7700b7a068dd7660284a40130
Reviewed-on: https://gerrit.libreoffice.org/54314
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7d97015284b4..2446606e373d 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1485,15 +1485,15 @@ namespace svxform
 OString sIdent(pBtn->GetCurItemIdent());
 if (sIdent == "modelsadd")
 {
-ScopedVclPtrInstance< AddModelDialog > aDlg( this, false );
+AddModelDialog aDlg(GetFrameWeld(), false);
 bool bShowDialog = true;
 while ( bShowDialog )
 {
 bShowDialog = false;
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
-OUString sNewName = aDlg->GetName();
-bool bDocumentData = aDlg->GetModifyDoc();
+OUString sNewName = aDlg.GetName();
+bool bDocumentData = aDlg.GetModifyDoc();
 
 if ( m_pModelsBox->GetEntryPos( sNewName ) != 
LISTBOX_ENTRY_NOTFOUND )
 {
@@ -1531,8 +1531,8 @@ namespace svxform
 }
 else if (sIdent == "modelsedit")
 {
-ScopedVclPtrInstance< AddModelDialog > aDlg( this, true );
-aDlg->SetName( sSelectedModel );
+AddModelDialog aDlg(GetFrameWeld(), true);
+aDlg.SetName( sSelectedModel );
 
 bool bDocumentData( false );
 try
@@ -1548,13 +1548,13 @@ namespace svxform
 {
 DBG_UNHANDLED_EXCEPTION("svx");
 }
-aDlg->SetModifyDoc( bDocumentData );
+aDlg.SetModifyDoc( bDocumentData );
 
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
-if ( aDlg->GetModifyDoc() != bDocumentData )
+if ( aDlg.GetModifyDoc() != bDocumentData )
 {
-bDocumentData = aDlg->GetModifyDoc();
+bDocumentData = aDlg.GetModifyDoc();
 try
 {
 Reference< css::xforms::XFormsSupplier > 
xFormsSupp( m_xFrameModel, UNO_QUERY_THROW );
@@ -1569,7 +1569,7 @@ namespace svxform
 }
 }
 
-OUString sNewName = aDlg->GetName();
+OUString sNewName = aDlg.GetName();
 if ( !sNewName.isEmpty() && ( sNewName != sSelectedModel ) 
)
 {
 try
@@ -3317,26 +3317,18 @@ namespace svxform
 m_pRefBtn->Enable( m_xTempBinding.is() );
 }
 
-AddModelDialog::AddModelDialog(vcl::Window* pParent, bool bIsEdit)
-: ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui")
+AddModelDialog::AddModelDialog(weld::Window* pParent, bool bIsEdit)
+: GenericDialogController(pParent, "svx/ui/addmodeldialog.ui", 
"AddModelDialog")
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xModifyCB(m_xBuilder->weld_check_button("modify"))
+, m_xAltTitle(m_xBuilder->weld_label("alttitle"))
 {
-get(m_pNameED, "name");
-get(m_pModifyCB, "modify");
-
 if (bIsEdit)
-SetText(get("alttitle")->GetText());
+m_xDialog->set_title(m_xAltTitle->get_label());
 }
 
 AddModelDialog::~AddModelDialog()
 {
-disposeOnce();
-}
-
-void AddModelDialog::dispose()
-{
-m_pNameED.clear();
-m_pModifyCB.clear();
-ModalDialog::dispose();
 }
 
 AddInstanceDialog::AddInstanceDialog(weld::Window* pParent, bool _bEdit)
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index cc66523361aa..786d4f767d81 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -583,26 +583,24 @@ namespace svxform
 const css::uno::Reference< css::xforms::XSubmission >& 
GetNewSubmission() const { return m_xNewSubmission; }
 };
 
-
-class AddModelDialog : public ModalDialog
+class AddModelDialog : public weld::GenericDialogController
 {
 private:
-VclPtr

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2018-05-14 Thread Caolán McNamara

 svx/source/form/datanavi.cxx  |   58 ++
 svx/source/inc/datanavi.hxx   |   26 +++
 svx/uiconfig/ui/addnamespacedialog.ui |   13 +--
 3 files changed, 46 insertions(+), 51 deletions(-)

New commits:
commit f645481d29d09c412d34ea6cbba89135d10babee
Author: Caolán McNamara 
Date:   Mon May 14 12:01:53 2018 +0100

weld ManageNamespaceDialog

Change-Id: Ieb5605fcab285de26e4fab64b8178d4d7818eb2d
Reviewed-on: https://gerrit.libreoffice.org/54311
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 3a7f2a2e7b40..06eade7b63b1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2937,32 +2937,32 @@ namespace svxform
 PushButton* pBtn = static_cast(pButton);
 if ( m_pAddNamespaceBtn == pBtn )
 {
-ScopedVclPtrInstance< ManageNamespaceDialog > aDlg(this, 
m_pConditionDlg, false);
-if ( aDlg->Execute() == RET_OK )
+ManageNamespaceDialog aDlg(GetFrameWeld(), m_pConditionDlg, false);
+if (aDlg.run() == RET_OK)
 {
-OUString sEntry = aDlg->GetPrefix();
+OUString sEntry = aDlg.GetPrefix();
 sEntry += "\t";
-sEntry += aDlg->GetURL();
+sEntry += aDlg.GetURL();
 m_pNamespacesList->InsertEntry( sEntry );
 }
 }
 else if ( m_pEditNamespaceBtn == pBtn )
 {
-ScopedVclPtrInstance< ManageNamespaceDialog > aDlg( this, 
m_pConditionDlg, true );
+ManageNamespaceDialog aDlg(GetFrameWeld(), m_pConditionDlg, true);
 SvTreeListEntry* pEntry = m_pNamespacesList->FirstSelected();
 DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" );
 OUString sPrefix( SvTabListBox::GetEntryText( pEntry, 0 ) );
-aDlg->SetNamespace(
+aDlg.SetNamespace(
 sPrefix,
 SvTabListBox::GetEntryText( pEntry, 1 ) );
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
 // if a prefix was changed, mark the old prefix as 'removed'
-if( sPrefix != aDlg->GetPrefix() )
+if( sPrefix != aDlg.GetPrefix() )
 m_aRemovedList.push_back( sPrefix );
 
-m_pNamespacesList->SetEntryText( aDlg->GetPrefix(), pEntry, 0 
);
-m_pNamespacesList->SetEntryText( aDlg->GetURL(), pEntry, 1 );
+m_pNamespacesList->SetEntryText( aDlg.GetPrefix(), pEntry, 0 );
+m_pNamespacesList->SetEntryText( aDlg.GetURL(), pEntry, 1 );
 }
 }
 else if ( m_pDeleteNamespaceBtn == pBtn )
@@ -3044,43 +3044,33 @@ namespace svxform
 }
 }
 
-ManageNamespaceDialog::ManageNamespaceDialog(vcl::Window* pParent, 
AddConditionDialog* _pCondDlg, bool bIsEdit)
-: ModalDialog(pParent, "AddNamespaceDialog", 
"svx/ui/addnamespacedialog.ui")
-, m_pConditionDlg ( _pCondDlg )
+ManageNamespaceDialog::ManageNamespaceDialog(weld::Window* pParent, 
AddConditionDialog* _pCondDlg, bool bIsEdit)
+: GenericDialogController(pParent, "svx/ui/addnamespacedialog.ui", 
"AddNamespaceDialog")
+, m_xConditionDlg(_pCondDlg)
+, m_xPrefixED(m_xBuilder->weld_entry("prefix"))
+, m_xUrlED(m_xBuilder->weld_entry("url"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
+, m_xAltTitle(m_xBuilder->weld_label("alttitle"))
 {
-get(m_pOKBtn, "ok");
-get(m_pPrefixED, "prefix");
-get(m_pUrlED, "url");
-
 if (bIsEdit)
-SetText(get("alttitle")->GetText());
+m_xDialog->set_title(m_xAltTitle->get_label());
 
-m_pOKBtn->SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
+m_xOKBtn->connect_clicked(LINK(this, ManageNamespaceDialog, OKHdl));
 }
 
 ManageNamespaceDialog::~ManageNamespaceDialog()
 {
-disposeOnce();
 }
 
-void ManageNamespaceDialog::dispose()
+IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl, weld::Button&, void)
 {
-m_pOKBtn.clear();
-m_pPrefixED.clear();
-m_pUrlED.clear();
-m_pConditionDlg.clear();
-ModalDialog::dispose();
-}
-
-IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl, Button*, void)
-{
-OUString sPrefix = m_pPrefixED->GetText();
+OUString sPrefix = m_xPrefixED->get_text();
 
 try
 {
-if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) 
)
+if (!m_xConditionDlg->GetUIHelper()->isValidPrefixName(sPrefix))
 {
-std::unique_ptr

[Libreoffice-commits] core.git: svx/source svx/uiconfig sw/inc sw/source

2018-01-22 Thread Mark Hung

 svx/source/dialog/rubydialog.cxx|   47 +++-
 svx/uiconfig/ui/asianphoneticguidedialog.ui |1 
 sw/inc/unoprnms.hxx |1 
 sw/source/uibase/uno/unotxvw.cxx|   10 +
 4 files changed, 44 insertions(+), 15 deletions(-)

New commits:
commit 7c97a22ac7851329d1a5c71772542c062cd6f4f0
Author: Mark Hung 
Date:   Thu Jan 18 08:06:20 2018 +0800

tdf#35301 Modify Asian phonetic guide dialog.

* Add a new ruby position option "Right" in the Asian phonetic
guide dialog.
* Allow set/get RubyPosition property via XRubySelection interface.

Change-Id: I306450ad32f0eff71f284c85e78497a341bc7971
Reviewed-on: https://gerrit.libreoffice.org/48209
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 309a23cc653e..6507fecd9fa2 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -62,7 +62,7 @@ namespace
 static const sal_Char cRubyBaseText[] = "RubyBaseText";
 static const sal_Char cRubyText[] = "RubyText";
 static const sal_Char cRubyAdjust[] = "RubyAdjust";
-static const sal_Char cRubyIsAbove[] = "RubyIsAbove";
+static const sal_Char cRubyPosition[] = "RubyPosition";
 static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName";
 
 } // end anonymous namespace
@@ -195,7 +195,7 @@ void SvxRubyData_Impl::AssertOneEntry()
 pValues[0].Name = cRubyBaseText;
 pValues[1].Name = cRubyText;
 pValues[2].Name = cRubyAdjust;
-pValues[3].Name = cRubyIsAbove;
+pValues[3].Name = cRubyPosition;
 pValues[4].Name = cRubyCharStyleName;
 }
 }
@@ -476,12 +476,13 @@ void SvxRubyDialog::Update()
 else if(nAdjust != nTmp)
 nAdjust = -2;
 }
-if (nPosition > -2 && pProps[nProp].Name == cRubyIsAbove)
+if (nPosition > -2 && pProps[nProp].Name == cRubyPosition )
 {
-bool bTmp = *o3tl::doAccess(pProps[nProp].Value);
+sal_Int16 nTmp = sal_Int16();
+pProps[nProp].Value >>= nTmp;
 if (!nRuby)
-nPosition = bTmp ? 0 : 1;
-else if ((!nPosition && !bTmp) || (nPosition == 1 && bTmp))
+nPosition = nTmp;
+else if(nPosition != nTmp)
 nPosition = -2;
 }
 if (bCharStyleEqual && pProps[nProp].Name == cRubyCharStyleName)
@@ -611,14 +612,14 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, 
void)
 IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void)
 {
 AssertOneEntry();
-bool bAbove = !rBox.GetSelectedEntryPos();
+sal_Int16 nPosition = rBox.GetSelectedEntryPos();
 Sequence& aRubyValues = m_pImpl->GetRubyValues();
 for (PropertyValues & rProps : aRubyValues)
 {
 for (PropertyValue & propVal : rProps)
 {
-if (propVal.Name == cRubyIsAbove)
-propVal.Value <<= bAbove;
+if (propVal.Name == cRubyPosition)
+propVal.Value <<= nPosition;
 }
 SetModified(true);
 }
@@ -810,20 +811,38 @@ void RubyPreview::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rectang
 bool bRubyStretch = nBaseWidth >= nRubyWidth;
 
 long nCenter = aWinSize.Width() / 2;
-long nLeftStart = nCenter - (bRubyStretch ? (nBaseWidth / 2) : (nRubyWidth 
/ 2));
-long nRightEnd = nCenter + (bRubyStretch ? (nBaseWidth / 2) : (nRubyWidth 
/ 2));
+long nHalfWidth = std::max( nBaseWidth, nRubyWidth ) /2;
+long nLeftStart = nCenter - nHalfWidth;
+long nRightEnd = nCenter + nHalfWidth;
 
+// Deafult values for TOP or no selection
 long nYRuby = aWinSize.Height() / 4 - nTextHeight / 2;
 long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
 
-//use above also if no selection is set
-bool bAbove = m_pParentDlg->m_pPositionLB->GetSelectedEntryPos() != 1;
-if (!bAbove)
+sal_Int16 nRubyPos = m_pParentDlg->m_pPositionLB->GetSelectedEntryPos();
+if ( nRubyPos == 1 )// BOTTOM
 {
 long nTmp = nYRuby;
 nYRuby = nYBase;
 nYBase = nTmp;
 }
+else if ( nRubyPos == 2 ) // RIGHT ( vertically )
+{
+// Align the ruby text and base text to the vertical center.
+nYBase =  ( aWinSize.Height() - nTextHeight ) / 2;
+nYRuby = ( aWinSize.Height() - nRubyWidth ) / 2;
+
+// Align the ruby text at the right side of the base text
+nAdjust = RubyAdjust_RIGHT;
+nHalfWidth = nBaseWidth / 2;
+nLeftStart = nCenter - nHalfWidth;
+nRightEnd = nCenter + nHalfWidth + nRubyWidth + nTextHeight;
+// Render base text first, then render ruby text on the right.
+bRubyStretch = true;
+
+aRubyFont.SetVertical(true);
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2017-11-24 Thread Tomaž Vajngerl

 svx/source/dialog/ClassificationDialog.cxx   |8 ++
 svx/source/dialog/ClassificationEditView.cxx |2 -
 svx/uiconfig/ui/classificationdialog.ui  |   32 +--
 3 files changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 12d12fa8fae469b01db68d23fa6ee2eb89a86d45
Author: TomaÅ¾ Vajngerl 
Date:   Fri Nov 24 17:39:38 2017 +0900

TSCP: fix oversizing of ListBox-es by defining max lines & chars

Change-Id: I47e8018c5f2c0ea890b5a11ac7cc03fafb7d1eed
Reviewed-on: https://gerrit.libreoffice.org/45205
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index a7b1469100f5..aa7f2e778be9 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -194,16 +194,19 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 
 m_pIntellectualPropertyPartAddButton->SetClickHdl(LINK(this, 
ClassificationDialog, ButtonClicked));
 
+m_pClassificationListBox->setMaxWidthChars(20);
 m_pClassificationListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectClassificationHdl));
 for (const OUString& rName : maHelper.GetBACNames())
 m_pClassificationListBox->InsertEntry(rName);
 
+m_pInternationalClassificationListBox->setMaxWidthChars(20);
 m_pInternationalClassificationListBox->SetSelectHdl(LINK(this, 
ClassificationDialog, SelectClassificationHdl));
 for (const OUString& rName : maInternationalHelper.GetBACNames())
 m_pInternationalClassificationListBox->InsertEntry(rName);
 
 if (!maHelper.GetMarkings().empty())
 {
+m_pMarkingListBox->setMaxWidthChars(20);
 m_pMarkingListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectMarkingHdl));
 m_pMarkingListBox->SetLoseFocusHdl(LINK(this, ClassificationDialog, 
LoseFocusMarkingHdl));
 
@@ -216,14 +219,19 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 m_pMarkingLabel->Show(false);
 }
 
+m_pIntellectualPropertyPartNumberListBox->SetDropDownLineCount(5);
+m_pIntellectualPropertyPartNumberListBox->setMaxWidthChars(20);
 m_pIntellectualPropertyPartNumberListBox->SetDoubleClickHdl(LINK(this, 
ClassificationDialog, SelectIPPartNumbersHdl));
 for (const OUString& rName : maHelper.GetIntellectualPropertyPartNumbers())
 m_pIntellectualPropertyPartNumberListBox->InsertEntry(rName);
 
+m_pIntellectualPropertyPartListBox->SetDropDownLineCount(5);
+m_pIntellectualPropertyPartNumberListBox->setMaxWidthChars(20);
 m_pIntellectualPropertyPartListBox->SetDoubleClickHdl(LINK(this, 
ClassificationDialog, SelectIPPartHdl));
 for (const OUString& rName : maHelper.GetIntellectualPropertyParts())
 m_pIntellectualPropertyPartListBox->InsertEntry(rName);
 
+m_pRecentlyUsedListBox->setMaxWidthChars(5);
 m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectRecentlyUsedHdl));
 
 bool bExpand = 
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
diff --git a/svx/source/dialog/ClassificationEditView.cxx 
b/svx/source/dialog/ClassificationEditView.cxx
index 76b778303bc2..75eec4aa8329 100644
--- a/svx/source/dialog/ClassificationEditView.cxx
+++ b/svx/source/dialog/ClassificationEditView.cxx
@@ -49,7 +49,7 @@ ClassificationEditView::ClassificationEditView(vcl::Window* 
pParent, WinBits nBi
 Color aBgColor = rStyleSettings.GetWindowColor();
 
 float fScaleFactor = GetDPIScaleFactor();
-set_width_request(600 * fScaleFactor);
+set_width_request(500 * fScaleFactor);
 set_height_request(100 * fScaleFactor);
 
 SetMapMode(MapMode(MapUnit::MapTwip));
diff --git a/svx/uiconfig/ui/classificationdialog.ui 
b/svx/uiconfig/ui/classificationdialog.ui
index 911363016f25..bfc3d78d8f7e 100644
--- a/svx/uiconfig/ui/classificationdialog.ui
+++ b/svx/uiconfig/ui/classificationdialog.ui
@@ -291,6 +291,7 @@
   
 1
 0
+2
   
 
 
@@ -305,26 +306,13 @@
   
 
 
-  
-True
-True
-True
-True
-
-  
-
-  
-  
-0
-1
-  
-
-
   
 Add
 True
 True
 True
+center
+

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2017-01-16 Thread Katarina Behrens

 svx/source/dialog/SafeModeDialog.cxx |   21 -
 svx/source/dialog/SafeModeDialog.hxx |2 +-
 svx/uiconfig/ui/safemodedialog.ui|6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 29b13a24cf5f0e6e58641d4a55cdfa03c83b68ac
Author: Katarina Behrens 
Date:   Fri Jan 13 23:17:52 2017 +0100

SafeModeDialog: restart in normal mode instead of quitting

Change-Id: I546629656ada6c7a8a15b4dc77a042e1f1106924
Reviewed-on: https://gerrit.libreoffice.org/33059
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index abc2215..d8b4189 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -37,8 +37,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 :   Dialog(pParent, "SafeModeDialog", "svx/ui/safemodedialog.ui"),
 
 mpBtnContinue(),
-mpBtnQuit(),
 mpBtnRestart(),
+mpBtnApply(),
 
 mpBoxRestore(),
 mpBoxConfigure(),
@@ -63,8 +63,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 maBackupFileHelper()
 {
 get(mpBtnContinue, "btn_continue");
-get(mpBtnQuit, "btn_quit");
 get(mpBtnRestart, "btn_restart");
+get(mpBtnApply, "btn_apply");
 
 get(mpBoxRestore, "group_restore");
 get(mpBoxConfigure, "group_configure");
@@ -96,8 +96,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
 
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
-mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
 mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
+mpBtnApply->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
 
 mpCBCheckProfilesafeConfig->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
 mpCBCheckProfilesafeExtensions->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
@@ -112,7 +112,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpBtnCreateZip->SetClickHdl(LINK(this, SafeModeDialog, CreateZipBtnHdl));
 
 // Disable restart btn until some checkbox is active
-mpBtnRestart->Disable();
+mpBtnApply->Disable();
 
 // Check the first radio button and call its handler,
 // it'll disable the relevant parts
@@ -145,8 +145,8 @@ void SafeModeDialog::dispose()
 mpBoxReset.clear();
 
 mpBtnContinue.clear();
-mpBtnQuit.clear();
 mpBtnRestart.clear();
+mpBtnApply.clear();
 
 mpCBCheckProfilesafeConfig.clear();
 mpCBCheckProfilesafeExtensions.clear();
@@ -318,12 +318,15 @@ IMPL_LINK(SafeModeDialog, DialogBtnHdl, Button*, pBtn, 
void)
 {
 Close();
 }
-else if (pBtn == mpBtnQuit.get())
+else if (pBtn == mpBtnRestart.get())
 {
+sfx2::SafeMode::putRestartFlag();
 Close();
-Application::Quit();
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+css::task::OfficeRestartManager::get(xContext)->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
 }
-else if (pBtn == mpBtnRestart.get())
+else if (pBtn == mpBtnApply.get())
 {
 sfx2::SafeMode::putRestartFlag();
 Close();
@@ -394,7 +397,7 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, 
/*pCheckBox*/, void)
 mpCBResetCustomizations->IsChecked() ||
 mpCBResetWholeUserProfile->IsChecked());
 
-mpBtnRestart->Enable(bEnable);
+mpBtnApply->Enable(bEnable);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index aebbb8e..b70265d 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -34,8 +34,8 @@ public:
 private:
 
 VclPtr mpBtnContinue;
-VclPtr mpBtnQuit;
 VclPtr mpBtnRestart;
+VclPtr mpBtnApply;
 
 VclPtr mpBoxRestore;
 VclPtr mpBoxConfigure;
diff --git a/svx/uiconfig/ui/safemodedialog.ui 
b/svx/uiconfig/ui/safemodedialog.ui
index 01ae66b..cb86c62 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -48,8 +48,8 @@
   
 
 
-  
-_Quit
+  
+_Restart in Normal 
Mode
 True
 True
 True
@@ -62,7 +62,7 @@
   
 
 
-  
+  
 _Apply Changes and 
Restart
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-12-06 Thread Samuel Mehrbrodt

 svx/source/dialog/SafeModeDialog.cxx |   12 ++--
 svx/source/dialog/SafeModeDialog.hxx |2 +-
 svx/uiconfig/ui/safemodedialog.ui|2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6ce819eefe8dab8ba38bda160e45ccc4220c40f3
Author: Samuel Mehrbrodt 
Date:   Tue Dec 6 21:23:13 2016 +0100

SafeModeDialog: Rename widget to match label

Change-Id: I6bb02527fa77846343e55ff73497d1b46b5e1ba8
Reviewed-on: https://gerrit.libreoffice.org/31699
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 25ef957..ac9c494 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -47,7 +47,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 
 mpRadioRestore(),
 mpRadioConfigure(),
-mpRadioDeinstall(),
+mpRadioExtensions(),
 mpRadioReset(),
 
 mpCBCheckProfilesafeConfig(),
@@ -73,7 +73,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 
 get(mpRadioRestore, "radio_restore");
 get(mpRadioConfigure, "radio_configure");
-get(mpRadioDeinstall, "radio_deinstall");
+get(mpRadioExtensions, "radio_extensions");
 get(mpRadioReset, "radio_reset");
 
 get(mpCBCheckProfilesafeConfig, "check_profilesafe_config");
@@ -92,7 +92,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 
 mpRadioRestore->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
 mpRadioConfigure->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
-mpRadioDeinstall->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
+mpRadioExtensions->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
 mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
 
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
@@ -137,7 +137,7 @@ void SafeModeDialog::dispose()
 {
 mpRadioRestore.clear();
 mpRadioConfigure.clear();
-mpRadioDeinstall.clear();
+mpRadioExtensions.clear();
 mpRadioReset.clear();
 
 mpBoxRestore.clear();
@@ -223,7 +223,7 @@ void SafeModeDialog::applyChanges()
 }
 
 // Deinstall
-if (mpRadioDeinstall->IsChecked())
+if (mpRadioExtensions->IsChecked())
 {
 if (mpCBDeinstallUserExtensions->IsChecked())
 {
@@ -289,7 +289,7 @@ IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn, void)
 mpBoxDeinstall->Disable();
 
 }
-else if (pBtn == mpRadioDeinstall.get())
+else if (pBtn == mpRadioExtensions.get())
 {
 // Enable the currently selected box
 mpBoxDeinstall->Enable();
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index 07c82d9..aebbb8e 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -44,7 +44,7 @@ private:
 
 VclPtr mpRadioRestore;
 VclPtr mpRadioConfigure;
-VclPtr mpRadioDeinstall;
+VclPtr mpRadioExtensions;
 VclPtr mpRadioReset;
 
 VclPtr mpCBCheckProfilesafeConfig;
diff --git a/svx/uiconfig/ui/safemodedialog.ui 
b/svx/uiconfig/ui/safemodedialog.ui
index 57161f4..01ae66b 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -230,7 +230,7 @@ The proposed changes get more radical from top down so it 
is recommended to try
   
 
 
-  
+  
 Extensions
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-11-03 Thread Samuel Mehrbrodt

 svx/source/dialog/SafeModeDialog.cxx |   48 ++---
 svx/source/dialog/SafeModeDialog.hxx |2 +
 svx/uiconfig/ui/safemodedialog.ui|   57 +--
 3 files changed, 80 insertions(+), 27 deletions(-)

New commits:
commit 16881e76fe0b318c7498f28ebfc81d65825d4830
Author: Samuel Mehrbrodt 
Date:   Thu Nov 3 12:11:12 2016 +0100

SafeModeDialog: Better grouping of options

Disable/Deinstall extensions are mutually exclusive, so group them 
appropriately

Change-Id: I6dc9c53ef4c18103c7521d494a769d522b0412dd
Reviewed-on: https://gerrit.libreoffice.org/30522
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 1a39d38..6403154 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -42,10 +42,12 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 
 mpBoxRestore(),
 mpBoxConfigure(),
+mpBoxDeinstall(),
 mpBoxReset(),
 
 mpRadioRestore(),
 mpRadioConfigure(),
+mpRadioDeinstall(),
 mpRadioReset(),
 
 mpCBCheckProfilesafeConfig(),
@@ -65,10 +67,12 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 
 get(mpBoxRestore, "group_restore");
 get(mpBoxConfigure, "group_configure");
+get(mpBoxDeinstall, "group_deinstall");
 get(mpBoxReset, "group_reset");
 
 get(mpRadioRestore, "radio_restore");
 get(mpRadioConfigure, "radio_configure");
+get(mpRadioDeinstall, "radio_deinstall");
 get(mpRadioReset, "radio_reset");
 
 get(mpCBCheckProfilesafeConfig, "check_profilesafe_config");
@@ -109,6 +113,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 // Check the first radio button and disable the other parts
 mpRadioRestore->Check();
 mpBoxConfigure->Disable();
+mpBoxDeinstall->Disable();
 mpBoxReset->Disable();
 
 // Set URL for help button (module=safemode)
@@ -128,10 +133,12 @@ void SafeModeDialog::dispose()
 {
 mpRadioRestore.clear();
 mpRadioConfigure.clear();
+mpRadioDeinstall.clear();
 mpRadioReset.clear();
 
 mpBoxRestore.clear();
 mpBoxConfigure.clear();
+mpBoxDeinstall.clear();
 mpBoxReset.clear();
 
 mpBtnContinue.clear();
@@ -225,6 +232,14 @@ void SafeModeDialog::applyChanges()
 comphelper::BackupFileHelper::tryDisableAllExtensions();
 }
 
+if (mpCBDisableHWAcceleration->IsChecked())
+{
+comphelper::BackupFileHelper::tryDisableHWAcceleration();
+}
+}
+
+if (mpRadioDeinstall->IsChecked())
+{
 if (mpCBDeinstallUserExtensions->IsChecked())
 {
 // Deinstall all User Extensions (installed for User only)
@@ -236,11 +251,6 @@ void SafeModeDialog::applyChanges()
 // Deinstall all Extensions (user|shared|bundled)
 comphelper::BackupFileHelper::tryDeinstallAllExtensions();
 }
-
-if (mpCBDisableHWAcceleration->IsChecked())
-{
-comphelper::BackupFileHelper::tryDisableHWAcceleration();
-}
 }
 
 // Reset
@@ -266,7 +276,18 @@ void SafeModeDialog::applyChanges()
 
 IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn, void)
 {
-if (pBtn == mpRadioConfigure.get())
+if (pBtn == mpRadioRestore.get())
+{
+// Enable the currently selected box
+mpBoxRestore->Enable();
+// Make sure only possible choices are active
+enableDisableWidgets();
+// Disable the unselected boxes
+mpBoxReset->Disable();
+mpBoxConfigure->Disable();
+mpBoxDeinstall->Disable();
+}
+else if (pBtn == mpRadioConfigure.get())
 {
 // Enable the currently selected box
 mpBoxConfigure->Enable();
@@ -275,27 +296,30 @@ IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn, 
void)
 // Disable the unselected boxes
 mpBoxRestore->Disable();
 mpBoxReset->Disable();
+mpBoxDeinstall->Disable();
 
 }
-else if (pBtn == mpRadioReset.get())
+else if (pBtn == mpRadioDeinstall.get())
 {
 // Enable the currently selected box
-mpBoxReset->Enable();
+mpBoxDeinstall->Enable();
 // Make sure only possible choices are active
 enableDisableWidgets();
 // Disable the unselected boxes
-mpBoxConfigure->Disable();
 mpBoxRestore->Disable();
+mpBoxConfigure->Disable();
+mpBoxReset->Disable();
 }
-else if (pBtn == mpRadioRestore.get())
+else if (pBtn == mpRadioReset.get())
 {
 // Enable the currently selected box
-mpBoxRestore->Enable();
+mpBoxReset->Enable();
 // Make sure only possible choices are active
 enableDisableWidgets();
 // Disable the unselected boxes
-mpBoxReset->Disable();

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-11-01 Thread Samuel Mehrbrodt

 svx/source/dialog/SafeModeDialog.cxx |  140 +---
 svx/source/dialog/SafeModeDialog.hxx |   10 +
 svx/uiconfig/ui/safemodedialog.ui|  203 +--
 3 files changed, 262 insertions(+), 91 deletions(-)

New commits:
commit e13827070cdcdf7bbf96678e7527c684519124d8
Author: Samuel Mehrbrodt 
Date:   Tue Nov 1 09:46:26 2016 +0100

SafeModeDialog: Group options

Change-Id: Ife0903c90f17efb2a1c6681ece8dd9af257873cd
Reviewed-on: https://gerrit.libreoffice.org/30453
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index 4a3a835..0dc4c47 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -37,6 +37,14 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpBtnQuit(),
 mpBtnRestart(),
 
+mpBoxRestore(),
+mpBoxConfigure(),
+mpBoxReset(),
+
+mpRadioRestore(),
+mpRadioConfigure(),
+mpRadioReset(),
+
 mpCBCheckProfilesafeConfig(),
 mpCBCheckProfilesafeExtensions(),
 mpCBDisableAllExtensions(),
@@ -52,6 +60,14 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 get(mpBtnQuit, "btn_quit");
 get(mpBtnRestart, "btn_restart");
 
+get(mpBoxRestore, "group_restore");
+get(mpBoxConfigure, "group_configure");
+get(mpBoxReset, "group_reset");
+
+get(mpRadioRestore, "radio_restore");
+get(mpRadioConfigure, "radio_configure");
+get(mpRadioReset, "radio_reset");
+
 get(mpCBCheckProfilesafeConfig, "check_profilesafe_config");
 get(mpCBCheckProfilesafeExtensions, "check_profilesafe_extensions");
 get(mpCBDisableAllExtensions, "check_disable_all_extensions");
@@ -64,6 +80,10 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 get(mpBugLink, "linkbutton_bugs");
 get(mpUserProfileLink, "linkbutton_profile");
 
+mpRadioRestore->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
+mpRadioConfigure->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
+mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
+
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
@@ -109,9 +129,13 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 {
 mpCBResetCustomizations->Disable();
 }
-
 // no disabe of mpCBResetWholeUserProfile, always possible (as last choice)
 
+// Check the first radio button and disable the other parts
+mpRadioRestore->Check();
+mpBoxConfigure->Disable();
+mpBoxReset->Disable();
+
 // Set URL for help button (module=safemode)
 OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=; + 
utl::ConfigManager::getAboutBoxProductVersion() +
 "=" + utl::ConfigManager::getLocale() + "=safemode");
@@ -127,6 +151,14 @@ SafeModeDialog::~SafeModeDialog()
 
 void SafeModeDialog::dispose()
 {
+mpRadioRestore.clear();
+mpRadioConfigure.clear();
+mpRadioReset.clear();
+
+mpBoxRestore.clear();
+mpBoxConfigure.clear();
+mpBoxReset.clear();
+
 mpBtnContinue.clear();
 mpBtnQuit.clear();
 mpBtnRestart.clear();
@@ -156,58 +188,92 @@ bool SafeModeDialog::Close()
 
 void SafeModeDialog::applyChanges()
 {
-if (mpCBCheckProfilesafeConfig->IsChecked())
-{
-// reset UserConfiguration to last known working state
-// ProfileSafeMode/BackupFileHelper
-maBackupFileHelper.tryPop();
-}
-
-if (mpCBCheckProfilesafeExtensions->IsChecked())
+/// Restore
+if (mpRadioRestore->IsChecked())
 {
-// reset State of installed Extensions to last known working state
-// ProfileSafeMode/BackupFileHelper
-maBackupFileHelper.tryPopExtensionInfo();
+if (mpCBCheckProfilesafeConfig->IsChecked())
+{
+// reset UserConfiguration to last known working state
+// ProfileSafeMode/BackupFileHelper
+maBackupFileHelper.tryPop();
+}
+
+if (mpCBCheckProfilesafeExtensions->IsChecked())
+{
+// reset State of installed Extensions to last known working state
+// ProfileSafeMode/BackupFileHelper
+maBackupFileHelper.tryPopExtensionInfo();
+}
 }
 
-if (mpCBDisableAllExtensions->IsChecked())
+// Configure
+if (mpRadioConfigure->IsChecked())
 {
-// Disable all extensions
-comphelper::BackupFileHelper::tryDisableAllExtensions();
+if (mpCBDisableAllExtensions->IsChecked())
+{
+// Disable all extensions
+comphelper::BackupFileHelper::tryDisableAllExtensions();
+}
+
+if (mpCBDeinstallUserExtensions->IsChecked())
+{
+// Deinstall all

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-10-17 Thread Samuel Mehrbrodt

 svx/source/dialog/SafeModeDialog.cxx |   50 +++
 svx/source/dialog/SafeModeDialog.hxx |5 +
 svx/uiconfig/ui/safemodedialog.ui|  148 ---
 3 files changed, 156 insertions(+), 47 deletions(-)

New commits:
commit 148ca1024379e3712df4d855595df9bb46cdb1c4
Author: Samuel Mehrbrodt 
Date:   Mon Oct 17 11:45:27 2016 +0200

safemode: Add hints how to get help/report a bug

Change-Id: Ie65e9706017f5f56fa4c453aa3fdb117b201096e
Reviewed-on: https://gerrit.libreoffice.org/29961
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/dialog/SafeModeDialog.cxx 
b/svx/source/dialog/SafeModeDialog.cxx
index a2e6ca2..d5a2e6a 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -12,13 +12,21 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 using namespace css;
 
@@ -47,6 +55,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 get(mpCBResetCustomizations, "check_reset_customizations");
 get(mpCBResetWholeUserProfile, "check_reset_whole_userprofile");
 
+get(mpBugLink, "linkbutton_bugs");
+
 mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
 mpBtnRestart->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
@@ -57,6 +67,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 mpCBResetCustomizations->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
 mpCBResetWholeUserProfile->SetToggleHdl(LINK(this, SafeModeDialog, 
CheckBoxHdl));
 
+mpBugLink->SetClickHdl(LINK(this, SafeModeDialog, HandleHyperlink));
+
 // Disable restart btn until some checkbox is active
 mpBtnRestart->Disable();
 
@@ -79,6 +91,11 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
 {
 mpCBResetCustomizations->Disable();
 }
+
+// Set URL for help button (module=safemode)
+OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=; + 
utl::ConfigManager::getAboutBoxProductVersion() +
+"=" + utl::ConfigManager::getLocale() + "=safemode");
+mpBugLink->SetURL(sURL);
 }
 
 SafeModeDialog::~SafeModeDialog()
@@ -98,6 +115,8 @@ void SafeModeDialog::dispose()
 mpCBResetCustomizations.clear();
 mpCBResetWholeUserProfile.clear();
 
+mpBugLink.clear();
+
 Dialog::dispose();
 }
 
@@ -157,6 +176,30 @@ void SafeModeDialog::applyChanges()
 css::uno::Reference< css::task::XInteractionHandler >());
 }
 
+void SafeModeDialog::openWebBrowser(const OUString & sURL, const OUString 
)
+{
+if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty
+return;
+
+try
+{
+uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
+
system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
+//throws css::lang::IllegalArgumentException, 
css::system::SystemShellExecuteException
+xSystemShellExecute->execute( sURL, OUString(), 
system::SystemShellExecuteFlags::URIS_ONLY );
+}
+catch ( const uno::Exception& )
+{
+uno::Any exc(cppu::getCaughtException());
+OUString msg(comphelper::anyToString(exc));
+const SolarMutexGuard guard;
+ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg);
+aErrorBox->SetText( sTitle );
+aErrorBox->Execute();
+}
+}
+
+
 IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void)
 {
 if (pBtn == mpBtnContinue.get())
@@ -186,4 +229,9 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, 
/*pCheckBox*/, void)
 mpBtnRestart->Enable(bEnable);
 }
 
+IMPL_LINK( SafeModeDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
+{
+SafeModeDialog::openWebBrowser( rHyperlink.GetURL(), GetText() );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.hxx 
b/svx/source/dialog/SafeModeDialog.hxx
index 6f2e4af..f84f94d 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SafeModeDialog : public Dialog
@@ -41,14 +42,18 @@ private:
 VclPtr mpCBResetCustomizations;
 VclPtr mpCBResetWholeUserProfile;
 
+VclPtr mpBugLink;
+
 // local BackupFileHelper for handling possible restores
 comphelper::BackupFileHelper maBackupFileHelper;
 
 static void terminateOffice();
 void applyChanges();
+static void openWebBrowser(const OUString & sURL, const OUString );
 
 DECL_LINK(CheckBoxHdl, CheckBox&, void);
 DECL_LINK(BtnHdl, Button*, void);
+DECL_LINK(HandleHyperlink, FixedHyperlink&, void);
 };
 
 #endif
diff --git

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-07-31 Thread Muhammet Kara

 svx/source/dialog/docrecovery.cxx   |6 
 svx/source/dialog/sdstring.src  |4 +--
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui |   35 +++-
 3 files changed, 11 insertions(+), 34 deletions(-)

New commits:
commit 3a7aa4cb86a62249ff2193238b94cfa3a60d
Author: Muhammet Kara 
Date:   Mon Jul 25 13:55:47 2016 +0300

Remove unnecessary label tdf#99341

Remove unnecessary label, update the explanation
of the buttons, and reduce the width of the
document recovery dialog.

Change-Id: I74081d8fd479de419c3be4456228e3415ccc0483
Reviewed-on: https://gerrit.libreoffice.org/27511
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index dbe58e4..8cd7510 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -633,7 +633,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* 
pCore)
 {
 get(m_pFileListLB, "filelist");
 m_pFileListLB->set_height_request(m_pFileListLB->GetTextHeight() * 10);
-m_pFileListLB->set_width_request(m_pFileListLB->approximate_char_width() * 
72);
 get(m_pOkBtn, "ok");
 
 // Prepare the office for the following crash save step.
@@ -694,9 +693,6 @@ SaveProgressDialog::SaveProgressDialog(vcl::Window* 
pParent, RecoveryCore* pCore
 , m_pCore(pCore)
 {
 get(m_pProgrParent, "progress");
-Size aSize(LogicToPixel(Size(SAVEPROGR_CONTROLWIDTH, PROGR_HEIGHT)));
-m_pProgrParent->set_width_request(aSize.Width());
-m_pProgrParent->set_height_request(aSize.Height());
 
 PluginProgress* pProgress   = new PluginProgress(m_pProgrParent, 
pCore->getComponentContext());
 m_xProgress.set(static_cast< css::task::XStatusIndicator* >(pProgress), 
css::uno::UNO_QUERY_THROW);
@@ -865,13 +861,11 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, 
RecoveryCore* pCore)
 {
 get(m_pDescrFT, "desc");
 get(m_pProgrParent, "progress");
-m_pProgrParent->set_height_request(LogicToPixel(Size(0, PROGR_HEIGHT), 
MAP_APPFONT).Height());
 get(m_pNextBtn, "next");
 get(m_pCancelBtn, "cancel");
 
 SvSimpleTableContainer* pFileListLBContainer = 
get("filelist");
 Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT), 
MAP_APPFONT));
-pFileListLBContainer->set_width_request(aSize.Width());
 pFileListLBContainer->set_height_request(aSize.Height());
 m_pFileListLB = VclPtr::Create(*pFileListLBContainer, 
DIALOG_MGR());
 
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index b703485..3bf08a9 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2357,12 +2357,12 @@ String RID_SVXSTR_NOTRECOVYET
 
 String RID_SVXSTR_RECOVERY_INPROGRESS
 {
-Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your 
documents. Depending on the size of the documents this process can take some 
time." ;
+Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION has begun recovering your 
documents. Depending on the size of the documents this process can take some 
time." ;
 };
 
 String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR
 {
-Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' 
to see your documents.";
+Text[ en-US ] = "Recovery of your documents was finished. Click 'Finish' 
to see your documents.";
 };
 
 String RID_SVXSTR_RECOVERYONLY_FINISH
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui 
b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 4fff5a4..1b7b08b 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -18,12 +18,11 @@
 False
 end
 
-  
-_Start
+  
+_Discard
 True
 True
 True
-True
 True
 True
   
@@ -34,11 +33,12 @@
   
 
 
-  
-_Discard
+  
+_Start
 True
 True
 True
+True
 True
 True
   
@@ -69,14 +69,12 @@
 False
 True
 True
-24
+10
 
   
 True
 False
-Press 'Start' to 
start the recovery process of the documents listed below.
-
-Press 'Discard' to abandon attempting recovery of these documents.
+%PRODUCTNAME 
will attempt to recover the state of the files you were working on before it 
crashed. Click 'Start' to begin the process, or click 'Discard' to cancel

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-07-04 Thread Szymon Kłos

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |4 
 svx/uiconfig/ui/sidebarparagraph.ui|2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit d430e8e55f95e95f41bf6c7a7534fdb5bd190614
Author: Szymon KÅos 
Date:   Mon Jul 4 10:12:42 2016 +0200

sidebar: adaptable paragraph indent icon size

Change-Id: I4f000ffb3fee660e6bf9efa9592617f1d037f17c

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index d4cc846..98fb676 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -167,11 +167,7 @@ void ParaPropertyPanel::InitToolBoxIndent()
 mpRightIndent->SetModifyHdl( aLink );
 mpFLineIndent->SetModifyHdl( aLink );
 
-const sal_uInt16 nIdIncrement = 
mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
-const sal_uInt16 nIdDecrement = 
mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
 const sal_uInt16 nIdHanging   = 
mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT);
-mpTbxIndent_IncDec->SetItemImage(nIdIncrement, 
maIncIndentControl.GetIcon());
-mpTbxIndent_IncDec->SetItemImage(nIdDecrement, 
maDecIndentControl.GetIcon());
 mpTbxIndent_IncDec->SetItemImage(nIdHanging, maIndHang);
 
 mpTbxIndent_IncDec->SetSelectHdl(LINK( this, ParaPropertyPanel, 
ClickIndent_IncDec_Hdl_Impl ));
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index bc69e1a..1a87334 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -436,7 +436,7 @@
   
 
 
-  
+  
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-06-27 Thread Muhammet Kara

 svx/source/dialog/docrecovery.cxx   |8 ---
 svx/source/inc/docrecovery.hxx  |2 
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui |   64 
 svx/uiconfig/ui/docrecoverysavedialog.ui|   37 +---
 4 files changed, 15 insertions(+), 96 deletions(-)

New commits:
commit 232dcd258dc03c318e197fe4bfb0080353423760
Author: Muhammet Kara 
Date:   Thu Jun 23 16:28:39 2016 +0300

Simplify Document Recovery dialog tdf#99341

By removing unnecessary header widget
and shortening the description label.

Change-Id: Id421e49e73ccd8e5932309469698843e1e7e0431
Reviewed-on: https://gerrit.libreoffice.org/26607
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index a820a59..dbe58e4 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -631,7 +631,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* 
pCore)
 "svx/ui/docrecoverysavedialog.ui")
 , m_pCore(pCore)
 {
-get(m_pTitleFT, "title");
 get(m_pFileListLB, "filelist");
 m_pFileListLB->set_height_request(m_pFileListLB->GetTextHeight() * 10);
 m_pFileListLB->set_width_request(m_pFileListLB->approximate_char_width() * 
72);
@@ -643,8 +642,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* 
pCore)
 m_pCore->doEmergencySavePrepare();
 
 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-m_pTitleFT->SetBackground(rStyleSettings.GetWindowColor());
-m_pTitleFT->set_height_request(m_pTitleFT->get_preferred_size().Height() + 
48);
 
 m_pOkBtn->SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) );
 m_pFileListLB->SetControlBackground( rStyleSettings.GetDialogColor() );
@@ -671,7 +668,6 @@ SaveDialog::~SaveDialog()
 
 void SaveDialog::dispose()
 {
-m_pTitleFT.clear();
 m_pFileListLB.clear();
 m_pOkBtn.clear();
 Dialog::dispose();
@@ -867,7 +863,6 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, 
RecoveryCore* pCore)
 , m_bWaitForCore(false)
 , m_bWasRecoveryStarted(false)
 {
-get(m_pTitleFT, "title");
 get(m_pDescrFT, "desc");
 get(m_pProgrParent, "progress");
 m_pProgrParent->set_height_request(LogicToPixel(Size(0, PROGR_HEIGHT), 
MAP_APPFONT).Height());
@@ -888,8 +883,6 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, 
RecoveryCore* pCore)
 m_xProgress.set(static_cast< css::task::XStatusIndicator* >(pProgress), 
css::uno::UNO_QUERY_THROW);
 
 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-m_pTitleFT->SetBackground(rStyleSettings.GetWindowColor());
-m_pTitleFT->set_height_request(m_pTitleFT->get_preferred_size().Height() + 
48);
 
 m_pFileListLB->SetBackground( rStyleSettings.GetDialogColor() );
 
@@ -927,7 +920,6 @@ RecoveryDialog::~RecoveryDialog()
 void RecoveryDialog::dispose()
 {
 m_pFileListLB.disposeAndClear();
-m_pTitleFT.clear();
 m_pDescrFT.clear();
 m_pProgrParent.clear();
 m_pNextBtn.clear();
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 31bfdfe..1910c73 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -369,7 +369,6 @@ class SaveDialog : public Dialog
 {
 // member
 private:
-VclPtr  m_pTitleFT;
 VclPtrm_pFileListLB;
 VclPtr   m_pOkBtn;
 RecoveryCore*   m_pCore;
@@ -493,7 +492,6 @@ class RecoveryDialog : public Dialog
 {
 // member
 private:
-VclPtr  m_pTitleFT;
 VclPtr  m_pDescrFT;
 VclPtrm_pProgrParent;
 VclPtr   m_pFileListLB;
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui 
b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index a586ca1..4fff5a4 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -1,12 +1,12 @@
 
-
+
 
   
-  
+  
   
 False
 6
-%PRODUCTNAME 
%PRODUCTVERSION
+%PRODUCTNAME %PRODUCTVERSION 
Document Recovery
 dialog
 
   
@@ -19,7 +19,7 @@
 end
 
   
-_Start Recovery 

+_Start
 True
 True
 True
@@ -35,11 +35,12 @@
 
 
   
-Discard Recovery 
Data
+_Discard
 True
 True
 True
 True
+True
   
   
 False
@@ -73,20 +74,16 @@
   
 True
 False
-0
-Press 'Start 
Recovery' to start the recovery process of the documents listed below.
+Press 'Start' to 
start the recovery process

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-06-18 Thread Markus Mohrhard

 svx/source/dialog/crashreportdlg.cxx |   20 ++--
 svx/source/dialog/crashreportdlg.hxx |6 +-
 svx/uiconfig/ui/crashreportdlg.ui|   27 +--
 3 files changed, 44 insertions(+), 9 deletions(-)

New commits:
commit fabd384e1596d8a5d8753985cca9a4c14c49a1fc
Author: Markus Mohrhard 
Date:   Fri Jun 17 18:49:26 2016 +0200

better message for crash report dialog

Change-Id: I02903cda46809798ec7664cf620c06ea7687e54e
Reviewed-on: https://gerrit.libreoffice.org/26443
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 8cb5c29..4186892 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -26,10 +26,14 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 get(mpBtnClose, "btn_close");
 get(mpEditPreUpload, "ed_pre");
 get(mpEditPostUpload, "ed_post");
+get(mpFtBugReport, "ed_bugreport");
+
+maSuccessMsg = mpEditPostUpload->GetText();
 
 mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
+mpEditPostUpload->SetReadOnly(true);
 }
 
 CrashReportDialog::~CrashReportDialog()
@@ -44,6 +48,7 @@ void CrashReportDialog::dispose()
 mpBtnClose.clear();
 mpEditPreUpload.clear();
 mpEditPostUpload.clear();
+mpFtBugReport.clear();
 
 Dialog::dispose();
 }
@@ -60,15 +65,26 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, 
void)
 OUString aCrashID = OUString::createFromAscii(response.c_str());
 
 if (bSuccess)
-mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " " + 
aCrashID);
+{
+OUString aProcessedMessage = maSuccessMsg.replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=",""));
+
+// vclbuilder seems to replace _ with ~ even in text
+mpEditPostUpload->SetText(aProcessedMessage.replaceAll("~", "_"));
+}
 else
-mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " Error!");
+mpEditPostUpload->SetText("Error!");
 
 mpBtnClose->Show();
+mpFtBugReport->Show();
 mpEditPreUpload->Hide();
 mpEditPostUpload->Show();
 mpBtnSend->Hide();
+mpBtnSend->Disable();
 mpBtnCancel->Hide();
+mpBtnCancel->Disable();
+mpBtnClose->GrabFocus();
+
+this->setOptimalLayoutSize();
 }
 else if (pBtn == mpBtnCancel.get())
 {
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index f090af1..3f3cb40 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class CrashReportDialog : public Dialog
 {
@@ -31,7 +32,10 @@ private:
 VclPtr mpBtnCancel;
 VclPtr mpBtnClose;
 VclPtr mpEditPreUpload;
-VclPtr mpEditPostUpload;
+VclPtr mpEditPostUpload;
+VclPtr mpFtBugReport;
+
+OUString maSuccessMsg;
 
 DECL_LINK_TYPED(BtnHdl, Button*, void);
 };
diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index d483d61..240b334 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -62,16 +62,16 @@
   
 False
 False
-3
+4
   
 
 
   
 True
 False
-We are sorry but it 
seems that LibreOffice crashed the last time.
+We are sorry but it 
seems that %PRODUCTNAME crashed the last time.
 
-You can help us fix this issue by sending the crash report to the LibreOffice 
crash reporting server.
+You can help us fix this issue by sending the crash report to the %PRODUCTNAME 
crash reporting server.
 True
   
   
@@ -81,14 +81,15 @@ You can help us fix this issue by sending the crash report 
to the LibreOffice cr
   
 
 
-  
+  
 False
 center
 0
 The crash report was 
successfully uploaded.
-You can soon find the report on crashreport.libreoffice.org.
-The report can be found by
+You can soon find the report on:
+crashreport.libreoffice.org/stats/crash_details/%CRASHID
 True
+True
   
   
 False
@@ -96,6 +97,20 @@ The report can be found by
 1
   
 
+
+  
+False
+Please check the report 
and if no bug report is connected to the crash report yet, open a new bug 
report at bugs.documentfoundation.org.
+Add detailed instructions on how to reproduce the crash and the shown

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-06-16 Thread Samuel Mehrbrodt

 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |   33 +---
 svx/uiconfig/ui/paralinespacingcontrol.ui   |1 
 2 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit e837ddd75a6d2b6edc41ba05ded6215d63e3be5c
Author: Samuel Mehrbrodt 
Date:   Thu Jun 16 14:18:59 2016 +0200

tdf#85949 Add 1.15 to the Line Spacing dropdown

Change-Id: I45b63522c43086f62f451ea0a17e8bdd15911ea1
Reviewed-on: https://gerrit.libreoffice.org/26369
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 82f8ca5..98594af 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -34,15 +34,13 @@
 
 // values of the mpLineDist listbox
 #define LLINESPACE_1  0
-#define LLINESPACE_15 1
-#define LLINESPACE_2  2
-#define LLINESPACE_PROP   3
-#define LLINESPACE_MIN4
-#define LLINESPACE_DURCH  5
-#define LLINESPACE_FIX6
-
-// special case; should not conflict with the mpLinDist values
-#define LLINESPACE_1157
+#define LLINESPACE_1151
+#define LLINESPACE_15 2
+#define LLINESPACE_2  3
+#define LLINESPACE_PROP   4
+#define LLINESPACE_MIN5
+#define LLINESPACE_DURCH  6
+#define LLINESPACE_FIX7
 
 #define MIN_FIXED_DISTANCE28
 
@@ -143,6 +141,10 @@ void ParaLineSpacingControl::Initialize()
 {
 SelectEntryPos(LLINESPACE_1);
 }
+else if ( LINESPACE_115 == 
currSPItem->GetPropLineSpace() )
+{
+SelectEntryPos(LLINESPACE_115);
+}
 else if ( LINESPACE_15 == 
currSPItem->GetPropLineSpace() )
 {
 SelectEntryPos(LLINESPACE_15);
@@ -244,6 +246,7 @@ void ParaLineSpacingControl::UpdateMetricFields()
 switch (mpLineDist->GetSelectEntryPos())
 {
 case LLINESPACE_1:
+case LLINESPACE_115:
 case LLINESPACE_15:
 case LLINESPACE_2:
 if (mpActLineDistFld == mpLineDistAtPercentBox)
@@ -342,6 +345,7 @@ void ParaLineSpacingControl::ExecuteLineSpace()
 switch ( nPos )
 {
 case LLINESPACE_1:
+case LLINESPACE_115:
 case LLINESPACE_15:
 case LLINESPACE_2:
 SetLineSpace(aSpacing, nPos);
@@ -374,6 +378,11 @@ void 
ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In
 rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
 break;
 
+case LLINESPACE_115:
+rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+rLineSpace.SetPropLineSpace( LINESPACE_115 );
+break;
+
 case LLINESPACE_15:
 rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
 rLineSpace.SetPropLineSpace( LINESPACE_15 );
@@ -431,11 +440,7 @@ void ParaLineSpacingControl::ExecuteLineSpacing(sal_Int32 
nEntry)
 {
 SvxLineSpacingItem aSpacing(DEFAULT_LINE_SPACING, SID_ATTR_PARA_LINESPACE);
 
-// special-case the 1.15 line spacing
-if (nEntry == LLINESPACE_115)
-SetLineSpace(aSpacing, LLINESPACE_PROP, 
mpLineDistAtPercentBox->Denormalize(LINESPACE_115));
-else
-SetLineSpace(aSpacing, nEntry);
+SetLineSpace(aSpacing, nEntry);
 
 SfxViewFrame::Current()->GetBindings().GetDispatcher()->ExecuteList(
 SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, {  });
diff --git a/svx/uiconfig/ui/paralinespacingcontrol.ui 
b/svx/uiconfig/ui/paralinespacingcontrol.ui
index 67ca9c1..e5accdb 100644
--- a/svx/uiconfig/ui/paralinespacingcontrol.ui
+++ b/svx/uiconfig/ui/paralinespacingcontrol.ui
@@ -180,6 +180,7 @@
 1
 
   Single
+  1.15 Lines
   1.5 Lines
   Double
   Proportional
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-06-07 Thread Muhammet Kara

 svx/source/dialog/_bmpmask.cxx |   48 -
 svx/source/dialog/bmpmask.hrc  |3 
 svx/source/dialog/bmpmask.src  |   17 
 svx/uiconfig/ui/dockingcolorreplace.ui |  118 +++--
 4 files changed, 68 insertions(+), 118 deletions(-)

New commits:
commit 71bdc1d936f7930a176f760d7148a152dd9cb3e4
Author: Muhammet Kara 
Date:   Mon Jun 6 11:13:57 2016 +0300

Remove unnecessary strings in bmpmask dialog tdf#87026

By moving accessibility relations to the related .ui file,
and deleting calls to SetAccessibleName where possible.

Change-Id: Ic2b309d54d3579158bdf33468f0895ca2b2a393e
Reviewed-on: https://gerrit.libreoffice.org/25956
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index f947e7a..73f0821 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -1123,24 +1123,6 @@ bool SvxBmpMask::IsEyedropping() const
 */
 void SvxBmpMask::SetAccessibleNames()
 {
-OUString 
sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString());
-OUString sSourceColorN;
-
-sSourceColorN = sSourceColor;
-sSourceColorN += " 1";
-m_pCbx1->SetAccessibleName (sSourceColorN);
-
-sSourceColorN = sSourceColor;
-sSourceColorN += " 2";
-m_pCbx2->SetAccessibleName (sSourceColorN);
-
-sSourceColorN = sSourceColor;
-sSourceColorN += " 3";
-m_pCbx3->SetAccessibleName (sSourceColorN);
-
-sSourceColorN = sSourceColor;
-sSourceColorN += " 4";
-m_pCbx4->SetAccessibleName (sSourceColorN);
 // set the accessible name for valueset
 OUString sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE));
 OUString sColorPaletteN;
@@ -1156,36 +1138,6 @@ void SvxBmpMask::SetAccessibleNames()
 sColorPaletteN = sColorPalette;
 sColorPaletteN += " 4";
 m_pQSet4->SetText (sColorPaletteN);
-// set the accessible for replace with spin boxes.
-OUString sTolerance(BMP_RESID( RID_SVXDLG_BMPMASK_STR_TOLERANCE));
-OUString sToleranceN;
-sToleranceN = sTolerance;
-sToleranceN += " 1";
-m_pSp1->SetAccessibleName (sToleranceN);
-sToleranceN = sTolerance;
-sToleranceN += " 2";
-m_pSp2->SetAccessibleName (sToleranceN);
-sToleranceN = sTolerance;
-sToleranceN += " 3";
-m_pSp3->SetAccessibleName (sToleranceN);
-sToleranceN = sTolerance;
-sToleranceN += " 4";
-m_pSp4->SetAccessibleName (sToleranceN);
-// set the accessible for replace with combo boxes.
-OUString sReplaceWith(BMP_RESID( RID_SVXDLG_BMPMASK_STR_REPLACEWITH));
-OUString sReplaceWithN;
-sReplaceWithN = sReplaceWith;
-sReplaceWithN += " 1";
-m_pLbColor1->SetAccessibleName (sReplaceWithN);
-sReplaceWithN = sReplaceWith;
-sReplaceWithN += " 2";
-m_pLbColor2->SetAccessibleName (sReplaceWithN);
-sReplaceWithN = sReplaceWith;
-sReplaceWithN += " 3";
-m_pLbColor3->SetAccessibleName (sReplaceWithN);
-sReplaceWithN = sReplaceWith;
-sReplaceWithN += " 4";
-m_pLbColor4->SetAccessibleName (sReplaceWithN);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index 3fa3f83..1e446c4 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #define RID_SVXDLG_BMPMASK_STR_TRANSP   (RID_SVX_BMPMASK_START + 1)
-#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR  (RID_SVX_BMPMASK_START + 2)
 #define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
-#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4)
-#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index a6c6a40..d154d7e 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -27,26 +27,9 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP
 Text [ en-US ] = "Transparent";
 };
 
-String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR
-{
-// This string is used by the eyedropper dialog to denote a color in an 
image
-// that will be replaced by another color.
-Text [ en-US ] = "Source Color";
-};
-
 String RID_SVXDLG_BMPMASK_STR_PALETTE
 {
 Text [ en-US ] = "Color Palette";
 };
 
-String RID_SVXDLG_BMPMASK_STR_TOLERANCE
-{
-Text [ en-US ] = "Tolerance";
-};
-
-String RID_SVXDLG_BMPMASK_STR_REPLACEWITH
-{
-Text [ en-US ] = "Replace with";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui 
b/svx/uiconfig/ui/dockingcolorreplace.ui
index e953612..778c740 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-05-25 Thread Muhammet Kara

 svx/source/sidebar/line/LinePropertyPanelBase.cxx |5 --
 svx/uiconfig/ui/sidebarline.ui|   39 ++
 2 files changed, 32 insertions(+), 12 deletions(-)

New commits:
commit 3b298fb67ade536679678768c55eeb8468b6cf33
Author: Muhammet Kara 
Date:   Wed May 25 15:53:16 2016 +0300

tdf#87026: Move accessibility relations to .ui file for 
LinePropertyPanelBase

Now that all LibO dialogs have been migrated to .ui format,
accessibility relations no longer need to be defined in C++ code
and can be moved to .ui files.

Change-Id: I602907ea0f7f8d40f26a06f6af82a2898693696f
Reviewed-on: https://gerrit.libreoffice.org/25454
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx 
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index ab7d993..5bc9fb9 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -236,7 +236,6 @@ void LinePropertyPanelBase::Initialize()
 FillLineStyleList();
 SelectLineStyle();
 mpLBStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, 
ChangeLineStyleHdl ) );
-mpLBStyle->SetAccessibleName("Style");
 mpLBStyle->AdaptDropDownLineCountToMaximum();
 
 const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
@@ -250,19 +249,15 @@ void LinePropertyPanelBase::Initialize()
 SelectEndStyle(true);
 SelectEndStyle(false);
 mpLBStart->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeStartHdl 
) );
-mpLBStart->SetAccessibleName("Beginning Style"); //wj acc
 mpLBStart->AdaptDropDownLineCountToMaximum();
 mpLBEnd->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEndHdl ) );
-mpLBEnd->SetAccessibleName("Ending Style");  //wj acc
 mpLBEnd->AdaptDropDownLineCountToMaximum();
 
 mpMFTransparent->SetModifyHdl(LINK(this, LinePropertyPanelBase, 
ChangeTransparentHdl));
 
 mpLBEdgeStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, 
ChangeEdgeStyleHdl ) );
-mpLBEdgeStyle->SetAccessibleName("Corner Style");
 
 mpLBCapStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, 
ChangeCapStyleHdl ) );
-mpLBCapStyle->SetAccessibleName("Cap Style");
 }
 
 void LinePropertyPanelBase::DataChanged(const DataChangedEvent& /*rEvent*/)
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 1601309..b0170c1 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -40,6 +40,11 @@
 Select 
the style of the beginning arrowhead.
 Select 
the style of the beginning arrowhead.
 True
+
+  
+Beginning Style
+  
+
   
   
 False
@@ -56,6 +61,11 @@
 Select 
the style of the line.
 Select 
the style of the line.
 True
+
+  
+Style
+  
+
   
   
 False
@@ -73,6 +83,11 @@
 Select 
the style of the ending arrowhead.
 6
 True
+
+  
+Ending Style
+  
+
   
   
 False
@@ -98,9 +113,9 @@
   
 True
 False
-0
 _Width:
 True
+0
   
   
 0
@@ -145,9 +160,9 @@
   
 True
 False
-0
 _Color:
 True
+0
   
   
 0
@@ -192,9 +207,9 @@
   
 True
 False
-0
 _Transparency:
 True
+0
   
   
 0
@@ -219,7 +234,7 @@
 
 
   
-  Transparency
+Transparency
   
 
   
@@ -251,10 +266,10 @@
   
 True
 False
-0
 _Corner 
style:
 True
 edgestyle
+0

[Libreoffice-commits] core.git: svx/source svx/uiconfig vcl/source

2016-05-06 Thread Maxim Monastirsky

 svx/source/dialog/fontwork.cxx |   15 --
 svx/uiconfig/ui/dockingfontwork.ui |   38 ++---
 vcl/source/window/builder.cxx  |7 +-
 3 files changed, 29 insertions(+), 31 deletions(-)

New commits:
commit fe620cb2ac2cdd75e7dbdcc0af422dff58c4fb41
Author: Maxim Monastirsky 
Date:   Fri May 6 11:32:35 2016 +0300

Set toggle/radio ToolBox bits in .ui too

The way gtk works doesn't exactly map to our ToolBox
behavior, but still we can use that to some extent.

Change-Id: Ia525e4356a612e3abfacb54d591dba05750278f2

diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 4c67b92..a7cc7e9 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -193,42 +193,27 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings 
*pBindinx,
 
 get(m_pTbxStyle, "style");
 nStyleOffId = m_pTbxStyle->GetItemId(0);
-m_pTbxStyle->SetItemBits(nStyleOffId, ToolBoxItemBits::AUTOCHECK);
 // separator is item "1"
 nStyleRotateId = m_pTbxStyle->GetItemId(2);
-m_pTbxStyle->SetItemBits(nStyleRotateId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nStyleUprightId = m_pTbxStyle->GetItemId(3);
-m_pTbxStyle->SetItemBits(nStyleUprightId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nStyleSlantXId = m_pTbxStyle->GetItemId(4);
-m_pTbxStyle->SetItemBits(nStyleSlantXId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nStyleSlantYId = m_pTbxStyle->GetItemId(5);
-m_pTbxStyle->SetItemBits(nStyleSlantYId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 
 get(m_pTbxShadow, "shadow");
 nShowFormId = m_pTbxShadow->GetItemId(0);
-m_pTbxShadow->SetItemBits(nShowFormId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
 nOutlineId = m_pTbxShadow->GetItemId(1);
-m_pTbxShadow->SetItemBits(nOutlineId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
 // separator is item "2"
 nShadowOffId = m_pTbxShadow->GetItemId(3);
-m_pTbxShadow->SetItemBits(nShadowOffId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nShadowNormalId = m_pTbxShadow->GetItemId(4);
-m_pTbxShadow->SetItemBits(nShadowNormalId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nShadowSlantId = m_pTbxShadow->GetItemId(5);
-m_pTbxShadow->SetItemBits(nShadowSlantId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 
 get(m_pTbxAdjust, "adjust");
 nAdjustMirrorId = m_pTbxAdjust->GetItemId(0);
-m_pTbxAdjust->SetItemBits(nAdjustMirrorId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
 // separator is item "1"
 nAdjustLeftId = m_pTbxAdjust->GetItemId(2);
-m_pTbxAdjust->SetItemBits(nAdjustLeftId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nAdjustCenterId = m_pTbxAdjust->GetItemId(3);
-m_pTbxAdjust->SetItemBits(nAdjustCenterId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nAdjustRightId = m_pTbxAdjust->GetItemId(4);
-m_pTbxAdjust->SetItemBits(nAdjustRightId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 nAdjustAutoSizeId = m_pTbxAdjust->GetItemId(5);
-m_pTbxAdjust->SetItemBits(nAdjustAutoSizeId, 
ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
 
 ApplyImageList();
 
diff --git a/svx/uiconfig/ui/dockingfontwork.ui 
b/svx/uiconfig/ui/dockingfontwork.ui
index 382f269..0c729be 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -27,7 +27,7 @@
 True
 False
 
-  
+  
 True
 False
 Off
@@ -50,7 +50,7 @@
   
 
 
-  
+  
 True
 False
 Rotate
@@ -63,12 +63,13 @@
   
 
 
-  
+  
 True
 False
 Upright
 True
 svx/res/fw03.png
+rotate
   
   
 False
@@ -76,12 +77,13 @@
   
 
 
-  
+  
 True
 False
 Slant 
Horizontal
 True
 svx/res/fw04.png
+rotate
   
   
 False
@@ -89,12 +91,13 @@
   
 
 
-  
+  
 True
 False
 Slant 
Vertical
 True
 svx/res/fw05.png
+rotate
   
   
 False
@@ -112,7 +115,7 @@
 True
 False
 
-  
+  
 True
 False

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-04-25 Thread Samuel Mehrbrodt

 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |  110 
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |8 -
 svx/uiconfig/ui/textcharacterspacingcontrol.ui  |   73 +-
 3 files changed, 12 insertions(+), 179 deletions(-)

New commits:
commit b68a722ff5ed70ce4a7d2eaffd972cb3fd0922bc
Author: Samuel Mehrbrodt 
Date:   Fri Apr 22 16:00:25 2016 +0200

tdf#89953 Character spacing: Apply changes to sidebar widget also

* Step by 0.1 not 1
* Allow to enter negative values without selecting condensed/expanded

Change-Id: Ibe2898cf77f56e52a276166d2ee882fbd23452af
Reviewed-on: https://gerrit.libreoffice.org/24304
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx 
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 5fb8948..a3ff10e 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -46,11 +46,6 @@ 
TextCharacterSpacingControl::TextCharacterSpacingControl(sal_uInt16 nId)
 ,   mnLastCus(SPACING_NOCUSTOM)
 {
 get(maEditKerning, "kerning");
-get(maLBKerning, "kerninglb");
-get(maFTBy, "change_by_label");
-get(maFTSpacing, "spacing_label");
-maEditKerning->Disable();
-maFTBy->Disable();
 
 get(maNormal, "normal");
 get(maVeryTight, "very_tight");
@@ -59,8 +54,6 @@ 
TextCharacterSpacingControl::TextCharacterSpacingControl(sal_uInt16 nId)
 get(maLoose, "loose");
 get(maLastCustom, "last_custom");
 
-maLBKerning->SetSelectHdl(LINK(this, TextCharacterSpacingControl, 
KerningSelectHdl));
-maLBKerning->SetHelpId(HID_SPACING_CB_KERN);
 maEditKerning->SetModifyHdl(LINK(this, TextCharacterSpacingControl, 
KerningModifyHdl));
 maEditKerning->SetHelpId(HID_SPACING_MB_KERN);
 
@@ -90,9 +83,6 @@ void TextCharacterSpacingControl::dispose()
 aWinOpt.SetUserData(aSeq);
 }
 
-maFTBy.clear();
-maFTSpacing.clear();
-maLBKerning.clear();
 maEditKerning.clear();
 
 maNormal.clear();
@@ -135,61 +125,22 @@ void TextCharacterSpacingControl::Initialize()
 
 if(eState >= SfxItemState::DEFAULT)
 {
-maLBKerning->Enable();
-maFTSpacing->Enable();
-
 SfxMapUnit eUnit = GetCoreMetric();
 MapUnit eOrgUnit = (MapUnit)eUnit;
 MapUnit ePntUnit(MAP_POINT);
 long nBig = maEditKerning->Normalize(nKerning);
 nKerning = LogicToLogic(nBig, eOrgUnit, ePntUnit);
-
-if(nKerning > 0)
-{
-maFTBy->Enable();
-maEditKerning->Enable();
-maEditKerning->SetMax();
-maEditKerning->SetLast();
-maEditKerning->SetValue(nKerning);
-maLBKerning->SelectEntryPos(SIDEBAR_SPACE_EXPAND);
-}
-else if(nKerning < 0)
-{
-maFTBy->Enable();
-maEditKerning->Enable();
-maEditKerning->SetValue(-nKerning);
-maLBKerning->SelectEntryPos(SIDEBAR_SPACE_CONDENSED);
-long nMax = GetSelFontSize()/6;
-maEditKerning->SetMax(maEditKerning->Normalize(nMax), FUNIT_POINT);
-
maEditKerning->SetLast(maEditKerning->GetMax(maEditKerning->GetUnit()));
-}
-else
-{
-maLBKerning->SelectEntryPos(SIDEBAR_SPACE_NORMAL);
-maFTBy->Disable();
-maEditKerning->Disable();
-maEditKerning->SetValue(0);
-maEditKerning->SetMax();
-maEditKerning->SetLast();
-}
+maEditKerning->SetValue(nKerning);
 }
 else if(SfxItemState::DISABLED == eState)
 {
 maEditKerning->SetText(OUString());
-maLBKerning->SetNoSelection();
-maLBKerning->Disable();
-maFTSpacing->Disable();
 maEditKerning->Disable();
-maFTBy->Disable();
 }
 else
 {
-maLBKerning->Enable();
-maFTSpacing->Enable();
-maLBKerning->SetNoSelection();
 maEditKerning->SetText(OUString());
 maEditKerning->Disable();
-maFTBy->Disable();
 }
 }
 
@@ -242,53 +193,10 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, 
PredefinedValuesHdl, Button*, pCont
 }
 }
 
-IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningSelectHdl, ListBox&, 
void)
-{
-if(maLBKerning->GetSelectEntryPos() > 0)
-{
-maFTBy->Enable();
-maEditKerning->Enable();
-}
-else
-{
-maEditKerning->SetValue(0);
-maFTBy->Disable();
-maEditKerning->Disable();
-}
-
-KerningModifyHdl(*maEditKerning);
-}
-
 IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningModifyHdl, Edit&, 
void)
 {
-const sal_Int32 nPos = maLBKerning->GetSelectEntryPos();
-
 mnLastCus = SPACING_CLOSE_BY_CUS_EDIT;
-if(nPos == SIDEBAR_SPACE_EXPAND || nPos ==

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-03-05 Thread Yousuf Philips

 svx/source/dialog/srchdlg.src  |4 ++--
 svx/source/tbxctrls/tbunosearchcontrollers.src |2 +-
 svx/uiconfig/ui/findreplacedialog.ui   |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6a85a5ddf5e368871293d9bcaece0593b50b0f1d
Author: Yousuf Philips 
Date:   Sat Mar 5 02:25:17 2016 +0400

Calc: Improve label text in find toolbar and replace dialog

Change-Id: I25eba84394693c9ae50efa8d6587df536052c4ca
Reviewed-on: https://gerrit.libreoffice.org/22874
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index e50d3d7..bb8f1ed 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -28,11 +28,11 @@ String RID_SVXSTR_SEARCH_STYLES
 };
 String RID_SVXSTR_WRITER_STYLES
 {
-Text [ en-US ] = "Search for Paragraph St~yles" ;
+Text [ en-US ] = "Paragraph St~yles" ;
 };
 String RID_SVXSTR_CALC_STYLES
 {
-Text [ en-US ] = "Search for Cell St~yles" ;
+Text [ en-US ] = "Cell St~yles" ;
 };
 String RID_SVXSTR_SEARCH
 {
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.src 
b/svx/source/tbxctrls/tbunosearchcontrollers.src
index e722d64..1e537a9 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.src
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.src
@@ -31,7 +31,7 @@ String RID_SVXSTR_FINDBAR_MATCHCASE
 
 String RID_SVXSTR_FINDBAR_SEARCHFORMATTED
 {
-Text [ en-US ] = "Search Formatted Display String" ;
+Text [ en-US ] = "Formatted Display" ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index bf2989c..1168e74 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -692,7 +692,7 @@
 
 
   
-Search in all sheets
+All sheets
 True
 False
 True
@@ -937,7 +937,7 @@
 
 
   
-Search 
formatted display string
+Formatted 
display
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2016-02-23 Thread melikeyurtoglu

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx   |   12 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |   10 
 svx/source/sidebar/line/LinePropertyPanelBase.cxx   |5 --
 svx/uiconfig/ui/sidebararea.ui  |   49 +---
 svx/uiconfig/ui/sidebargraphic.ui   |   40 
 svx/uiconfig/ui/sidebarline.ui  |   11 
 6 files changed, 95 insertions(+), 32 deletions(-)

New commits:
commit 5a9cbb7a5fa792af32958b6bfc2c386c4d27772a
Author: melikeyurtoglu 
Date:   Sat Jan 23 12:54:42 2016 +0200

tdf#87026 Move accessibility relations to .ui files

Change-Id: I78dab5edf222503a8e7c5cd6f5dd523777df5731
Signed-off-by: melikeyurtoglu 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index f43174b..836821b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -153,8 +153,6 @@ void AreaPropertyPanelBase::Initialize()
 maGradientRect = maGradientLinear;
 maGradientRect.SetGradientStyle(css::awt::GradientStyle_RECT);
 
-mpLbFillType->SetAccessibleName("Fill");//wj acc
-mpLbFillAttr->SetAccessibleName("Fill");//wj acc
 
 mpLbFillType->SetSelectHdl( LINK( this, AreaPropertyPanelBase, 
SelectFillTypeHdl ) );
 
@@ -165,12 +163,10 @@ void AreaPropertyPanelBase::Initialize()
 mpLbFillGradTo->SetSelectHdl( aLink );
 
 mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanelBase, 
ChangeTrgrTypeHdl_Impl));
-mpLBTransType->SetAccessibleName("Transparency");//wj acc
 
 SetTransparency( 50 );
 mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanelBase, 
ModifyTransparentHdl_Impl));
 mpSldTransparent->SetSlideHdl(LINK(this, AreaPropertyPanelBase, 
ModifyTransSliderHdl));
-mpMTRTransparent->SetAccessibleName("Transparency");//wj acc
 
 const sal_uInt16 nIdGradient = 
mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
 mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( 
nIdGradient ) | ToolBoxItemBits::DROPDOWNONLY );
@@ -179,14 +175,6 @@ void AreaPropertyPanelBase::Initialize()
 mpBTNGradient->SetSelectHdl( aLink2 );
 mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
 mpBTNGradient->Hide();
-
-mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT);
-mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr);
-mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor);
-mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
-mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
-mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient);
-
 mpSidebarController = 
sfx2::sidebar::SidebarController::GetSidebarControllerForFrame(mxFrame);
 mpSidebarController->NotifyResize();
 }
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx 
b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index d8fe13b..d68bff3 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -97,18 +97,14 @@ void GraphicPropertyPanel::dispose()
 void GraphicPropertyPanel::Initialize()
 {
 mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, 
ModifyBrightnessHdl ) );
-mpMtrBrightness->SetAccessibleName("Brightness");
 mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, 
ModifyContrastHdl ) );
-mpMtrContrast->SetAccessibleName("Contrast");
 mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl 
) );
-mpMtrTrans->SetAccessibleName("Transparency");
 
 mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD));
 mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS));
 mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO));
 mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK));
 mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, 
ClickColorModeHdl ));
-mpLBColorMode->SetAccessibleName("Color mode");
 
 mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) );
 mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) );
@@ -117,12 +113,6 @@ void GraphicPropertyPanel::Initialize()
 mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText());
 mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText());
 mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText());
-mpMtrGamma->SetAccessibleName("Gamma value");
-
-mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed);
-mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen);
-mpMtrBlue->SetAccessibleRelationLabeledBy(mpMtrBlue);
-mpMtrGamma->SetAccessibleRelationLabeledBy(mpMtrGamma);
 
 // Fix left position of some controls that may be wrong due to
 //

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2015-07-28 Thread Katarina Behrens

 svx/source/sidebar/line/LinePropertyPanel.cxx |   38 
 svx/source/sidebar/line/LinePropertyPanel.hxx |3 
 svx/uiconfig/ui/sidebarline.ui|  206 +-
 3 files changed, 118 insertions(+), 129 deletions(-)

New commits:
commit 5525690f0edf22c3ce96f50d8ecd6931e912
Author: Katarina Behrens katarina.behr...@cib.de
Date:   Tue Jul 28 11:17:28 2015 +0200

Simplify: group widgets and enable them all at once

Change-Id: I2140cf83886654033d8fcb2acfb651041f24fa0d

diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx 
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 7890bca..8f6a2ef 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -190,6 +190,8 @@ LinePropertyPanel::LinePropertyPanel(
 get(mpLBEdgeStyle, edgestyle);
 get(mpFTCapStyle, caplabel);
 get(mpLBCapStyle, linecapstyle);
+get(mpGridLineProps, lineproperties);
+get(mpBoxArrowProps, arrowproperties);
 
 Initialize();
 }
@@ -783,38 +785,10 @@ VclPtrPopupControl 
LinePropertyPanel::CreateLineWidthPopupControl (PopupContai
 void LinePropertyPanel::ActivateControls()
 {
 const sal_Int32 nPos(mpLBStyle-GetSelectEntryPos());
-if( 0 == nPos )
-{
-mpFTWidth-Disable();
-mpTBWidth-Disable();
-mpFTColor-Disable();
-mpLBColor-Disable();
-mpFTTransparency-Disable();
-mpMFTransparent-Disable();
-mpFTArrow-Disable();
-mpLBStart-Disable();
-mpLBEnd-Disable();
-mpFTEdgeStyle-Disable();
-mpLBEdgeStyle-Disable();
-mpFTCapStyle-Disable();
-mpLBCapStyle-Disable();
-}
-else
-{
-mpFTWidth-Enable();
-mpTBWidth-Enable();
-mpFTColor-Enable();
-mpLBColor-Enable();
-mpFTTransparency-Enable();
-mpMFTransparent-Enable();
-mpFTArrow-Enable();
-mpLBStart-Enable();
-mpLBEnd-Enable();
-mpFTEdgeStyle-Enable();
-mpLBEdgeStyle-Enable();
-mpFTCapStyle-Enable();
-mpLBCapStyle-Enable();
-}
+bool bLineStyle( nPos != 0 );
+
+mpGridLineProps-Enable( bLineStyle );
+mpBoxArrowProps-Enable( bLineStyle );
 }
 
 void LinePropertyPanel::EndLineWidthPopupMode()
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx 
b/svx/source/sidebar/line/LinePropertyPanel.hxx
index f86a205..3e7938f 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -25,6 +25,7 @@
 #include sfx2/sidebar/ControllerItem.hxx
 #include vcl/fixed.hxx
 #include vcl/field.hxx
+#include vcl/layout.hxx
 #include memory
 #include svx/sidebar/PanelLayout.hxx
 #include svx/xtable.hxx
@@ -108,6 +109,8 @@ private:
 VclPtrListBox mpLBEdgeStyle;
 VclPtrFixedText   mpFTCapStyle;
 VclPtrListBox mpLBCapStyle;
+VclPtrVclGrid mpGridLineProps;
+VclPtrVclVBox mpBoxArrowProps;
 
 //ControllerItem
 sfx2::sidebar::ControllerItem maStyleControl;
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index e8506db..52ab635 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -2,6 +2,7 @@
 !-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.0/
+  requires lib=LibreOffice version=1.0/
   object class=GtkAdjustment id=adjustment1
 property name=upper100/property
 property name=step_increment5/property
@@ -64,7 +65,7 @@
   /packing
 /child
 child
-  object class=GtkGrid id=grid4
+  object class=GtkGrid id=lineproperties
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
@@ -191,134 +192,145 @@
   /packing
 /child
 child
-  object class=GtkLabel id=arrowlabel
+  object class=GtkBox id=arrowproperties
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yes_Arrow:/property
-property name=use_underlineTrue/property
-property name=mnemonic_widgetbeginarrowstyle/property
-  /object
-  packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position3/property
-  /packing
-/child
-child
-  object class=GtkComboBoxText id=beginarrowstyle
-property name=can_focusFalse/property
-property name=has_tooltipTrue/property
-property name=tooltip_markup translatable=yesSelect the 
style of the beginning arrowhead./property
-property name=tooltip_text translatable=yesSelect the 
style of the beginning arrowhead./property
-

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2015-07-24 Thread Katarina Behrens

 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx |1 -
 svx/uiconfig/ui/sidebarshadow.ui  |7 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e0bbfcbed34bb71c1a4979a7db30e38bfd6a7f61
Author: Katarina Behrens katarina.behr...@cib.de
Date:   Fri Jul 24 15:58:16 2015 +0200

Move spinbox limit definition to .ui file

Change-Id: I5ef6e76d00e5b034109f5b3a0cabfd7b7fa798bc

diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx 
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 45ca003..717ca1b 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -126,7 +126,6 @@ void ShadowPropertyPanel::Initialize()
 Link bLink = LINK(this, ShadowPropertyPanel, ClickShadowHdl );
 mpShowShadow-SetClickHdl( bLink );
 Link aLink = LINK( this, ShadowPropertyPanel, ModifyShadowColorHdl );
-mpShadowTransMetric-SetMax(100);
 mpShadowTransMetric-SetModifyHdl( LINK(this, ShadowPropertyPanel, 
ModifyShadowTransMetricHdl) );
 mpLBShadowColor-SetSelectHdl( aLink );
 mpShadowAngle-SetModifyHdl( LINK(this, ShadowPropertyPanel, 
ModifyShadowDistanceHdl) );
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 1eca4d9..0b2e8cf 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -2,10 +2,16 @@
 !-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.0/
+  requires lib=LibreOffice version=1.0/
   object class=GtkAdjustment id=adjustment1
 property name=lower-180/property
 property name=upper360/property
   /object
+  object class=GtkAdjustment id=adjustment2
+property name=upper100/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkGrid id=ShadowPropertyPanel
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -125,6 +131,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=halignend/property
+property name=adjustmentadjustment2/property
   /object
   packing
 property name=left_attach2/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2015-06-10 Thread Maxim Monastirsky

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |4 
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |1 
 svx/uiconfig/ui/sidebarparagraph.ui|  123 -
 3 files changed, 102 insertions(+), 26 deletions(-)

New commits:
commit ef530d397b021a9606bb3b3abe8c2290a1d94c59
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Wed Jun 10 13:48:49 2015 +0300

tdf#87651 Add outline buttons to impress sidebar

Change-Id: Id3cf58660bfcaf7424d027773894ce6888df788a

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index c26d4ec..6555b92 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -151,6 +151,8 @@ void ParaPropertyPanel::HandleContextChange (
 default:
 break;
 }
+
+mpTBxOutline-Show( maContext.GetApplication_DI() == 
sfx2::sidebar::EnumContext::Application_DrawImpress );
 }
 
 void ParaPropertyPanel::DataChanged (const DataChangedEvent rEvent)
@@ -597,6 +599,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
 //NumBulletBackcolor
 get(mpTBxNumBullet, numberbullet);
 get(mpTBxBackColor, backgroundcolor);
+get(mpTBxOutline, outline);
 //Paragraph spacing
 get(mpTopDist,  aboveparaspacing);
 mpTopDist-set_width_request(mpTopDist-get_preferred_size().Width());
@@ -624,6 +627,7 @@ void ParaPropertyPanel::dispose()
 mpTBxVertAlign.clear();
 mpTBxNumBullet.clear();
 mpTBxBackColor.clear();
+mpTBxOutline.clear();
 mpTopDist.clear();
 mpBottomDist.clear();
 mpTbxIndent_IncDec.clear();
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 0e98775..5d82886 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -78,6 +78,7 @@ private:
 VclPtrToolBoxmpTBxVertAlign;
 //NumBulletBackcolor
 VclPtrToolBoxmpTBxNumBullet;
+VclPtrToolBoxmpTBxOutline;
 VclPtrToolBoxmpTBxBackColor;
 //Paragraph spacing
 VclPtrSvxRelativeField   mpTopDist;
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 4b4897f..0d71cb7 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -59,32 +59,6 @@
   /packing
 /child
 child
-  object class=sfxlo-SidebarToolBox id=backgroundcolor
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=has_tooltipTrue/property
-property name=tooltip_text translatable=yesParagraph 
Background Color/property
-property name=halignend/property
-child
-  object class=GtkMenuToolButton id=parabkcolor
-property name=width_request105/property
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=action_name.uno:BackgroundColor/property
-property name=use_underlineTrue/property
-  /object
-  packing
-property name=expandFalse/property
-property name=homogeneousTrue/property
-  /packing
-/child
-  /object
-  packing
-property name=left_attach1/property
-property name=top_attach1/property
-  /packing
-/child
-child
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -639,6 +613,103 @@
 property name=top_attach2/property
   /packing
 /child
+child
+  object class=GtkBox id=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=sfxlo-SidebarToolBox id=backgroundcolor
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=has_tooltipTrue/property
+property name=tooltip_text translatable=yesParagraph 
Background Color/property
+property name=halignend/property
+child
+  object class=GtkMenuToolButton id=parabkcolor
+property name=width_request105/property
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property 
name=action_name.uno:BackgroundColor/property
+property name=use_underlineTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2015-06-10 Thread Maxim Monastirsky

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |  131 --
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |7 
 svx/uiconfig/ui/sidebarparagraph.ui|  148 -
 3 files changed, 34 insertions(+), 252 deletions(-)

New commits:
commit a861a234b0f5f39b06fd6180655182c167c3a94d
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Wed Jun 10 02:10:54 2015 +0300

tdf#91944 Fix inc/dec indent buttons in impress

Regression from ed6b7d972bf1aee323947f22c6b5de430db4a9a5.
These buttons are implemented inside the sidebar, so just
changing command names in the ui file won't work.
Also, following the decision to use indent buttons across all
modules, there is no need for 2 separate toolboxes anymore.

Change-Id: Id9af0cd10fd0517be86b9793c187cd6508029732
Reviewed-on: https://gerrit.libreoffice.org/16199
Reviewed-by: Maxim Monastirsky momonas...@gmail.com
Tested-by: Maxim Monastirsky momonas...@gmail.com

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 35a0305..c26d4ec 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -40,10 +40,6 @@ const char UNO_INCREMENTINDENT[]  = .uno:IncrementIndent;
 const char UNO_DECREMENTINDENT[]  = .uno:DecrementIndent;
 const char UNO_HANGINGINDENT[]= .uno:HangingIndent;
 
-const char UNO_PROMOTE[]  = .uno:Promote;
-const char UNO_DEMOTE[]   = .uno:Demote;
-const char UNO_HANGINGINDENT2[]   = .uno:HangingIndent2;
-
 namespace svx {namespace sidebar {
 #define DEFAULT_VALUE  0
 
@@ -88,12 +84,11 @@ void ParaPropertyPanel::HandleContextChange (
 switch (maContext.GetCombinedContext_DI())
 {
 case CombinedEnumContext(Application_Calc, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
 mpTBxVertAlign-Show();
 mpTBxBackColor-Hide();
 mpTBxNumBullet-Hide();
 ReSize(false);
-mpTbxIndent_IncDec-Show();
-mpTbxProDemote-Hide();
 break;
 
 case CombinedEnumContext(Application_DrawImpress, Context_Draw):
@@ -103,26 +98,14 @@ void ParaPropertyPanel::HandleContextChange (
 mpTBxBackColor-Hide();
 mpTBxNumBullet-Show();
 ReSize(true);
-mpTbxIndent_IncDec-Hide();
-mpTbxProDemote-Show();
 break;
 
 case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
-mpTBxVertAlign-Show();
-mpTBxBackColor-Hide();
-mpTBxNumBullet-Show();
-ReSize(true);
-mpTbxIndent_IncDec-Hide();
-mpTbxProDemote-Show();
-break;
-
 case CombinedEnumContext(Application_DrawImpress, Context_Table):
 mpTBxVertAlign-Show();
 mpTBxBackColor-Hide();
 mpTBxNumBullet-Show();
 ReSize(true);
-mpTbxIndent_IncDec-Hide();
-mpTbxProDemote-Show();
 break;
 
 case CombinedEnumContext(Application_WriterVariants, Context_Default):
@@ -130,10 +113,7 @@ void ParaPropertyPanel::HandleContextChange (
 mpTBxVertAlign-Hide();
 mpTBxBackColor-Show();
 mpTBxNumBullet-Show();
-
 ReSize(true);
-mpTbxIndent_IncDec-Show();
-mpTbxProDemote-Hide();
 break;
 
 case CombinedEnumContext(Application_WriterVariants, Context_Table):
@@ -141,17 +121,6 @@ void ParaPropertyPanel::HandleContextChange (
 mpTBxBackColor-Show();
 mpTBxNumBullet-Show();
 ReSize(true);
-mpTbxIndent_IncDec-Show();
-mpTbxProDemote-Hide();
-break;
-
-case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
-mpTBxVertAlign-Show();
-mpTBxBackColor-Hide();
-mpTBxNumBullet-Hide();
-ReSize(false);
-mpTbxIndent_IncDec-Show();
-mpTbxProDemote-Hide();
 break;
 
 case CombinedEnumContext(Application_WriterVariants, 
Context_Annotation):
@@ -159,8 +128,6 @@ void ParaPropertyPanel::HandleContextChange (
 mpTBxBackColor-Hide();
 mpTBxNumBullet-Hide();
 ReSize(false);
-mpTbxIndent_IncDec-Show();
-mpTbxProDemote-Hide();
 break;
 
 case CombinedEnumContext(Application_Calc, Context_EditCell):
@@ -217,14 +184,6 @@ void ParaPropertyPanel::InitToolBoxIndent()
 
 mpTbxIndent_IncDec-SetSelectHdl(LINK( this, ParaPropertyPanel, 
ClickIndent_IncDec_Hdl_Impl ));
 m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
-
-const sal_uInt16 nIdPromote  = mpTbxProDemote-GetItemId(UNO_PROMOTE);
-const sal_uInt16 nIdDemote   =

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2014-12-01 Thread Katarina Behrens

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   12 -
 svx/uiconfig/ui/sidebarpossize.ui   |   43 
 2 files changed, 43 insertions(+), 12 deletions(-)

New commits:
commit 759ae3c367f63ee006cfa8f4239ddcc1302b5879
Author: Katarina Behrens bu...@bubli.org
Date:   Mon Dec 1 23:25:35 2014 +0100

Move accessibility relations to .ui file

Change-Id: I910f01cbe2f3a87ff9c629a72231dd8106ddf973

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 44c5288..f7f10f8 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -154,14 +154,10 @@ void PosSizePropertyPanel::Initialize()
 //Position : Horizontal / Vertical
 mpMtrPosX-SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosXHdl ) 
);
 mpMtrPosY-SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosYHdl ) 
);
-mpMtrPosX-SetAccessibleName(OUString( Horizontal));  //wj acc
-mpMtrPosY-SetAccessibleName(OUString( Vertical));//wj acc
 
 //Size : Width / Height
 mpMtrWidth-SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeWidthHdl 
) );
 mpMtrHeight-SetModifyHdl( LINK( this, PosSizePropertyPanel, 
ChangeHeightHdl ) );
-mpMtrWidth-SetAccessibleName(OUString( Width));  //wj acc
-mpMtrHeight-SetAccessibleName(OUString( Height));//wj acc
 
 //Size : Keep ratio
 mpCbxScale-SetClickHdl( LINK( this, PosSizePropertyPanel, ClickAutoHdl ) 
);
@@ -169,7 +165,6 @@ void PosSizePropertyPanel::Initialize()
 //rotation:
 mpMtrAngle-SetModifyHdl(LINK( this, PosSizePropertyPanel, 
AngleModifiedHdl));
 mpMtrAngle-EnableAutocomplete( false );
-mpMtrAngle-SetAccessibleName(OUString( Rotation));   //wj acc
 
 //rotation control
 mpDial-SetModifyHdl(LINK( this, PosSizePropertyPanel, RotationHdl));
@@ -177,13 +172,6 @@ void PosSizePropertyPanel::Initialize()
 //flip:
 mpFlipTbx-SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
 
-mpMtrPosX-SetAccessibleRelationLabeledBy(mpFtPosX);
-mpMtrPosY-SetAccessibleRelationLabeledBy(mpFtPosY);
-mpMtrWidth-SetAccessibleRelationLabeledBy(mpFtWidth);
-mpMtrHeight-SetAccessibleRelationLabeledBy(mpFtHeight);
-mpMtrAngle-SetAccessibleRelationLabeledBy(mpFtAngle);
-mpFlipTbx-SetAccessibleRelationLabeledBy(mpFtFlip);
-
 mpMtrAngle-InsertValue(0, FUNIT_CUSTOM);
 mpMtrAngle-InsertValue(4500, FUNIT_CUSTOM);
 mpMtrAngle-InsertValue(9000, FUNIT_CUSTOM);
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index c135e5c..eeedf5d 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -58,6 +58,14 @@
 property name=tooltip_text translatable=yesEnter the 
value for the horizontal position./property
 property name=invisible_charâ¢/property
 property name=invisible_char_setTrue/property
+accessibility
+  relation type=labelled-by target=horizontallabel/
+/accessibility
+child internal-child=accessible
+  object class=AtkObject 
id=horizontalpos:0in-atkobject
+property name=AtkObject::accessible-name 
translatable=yesHorizontal/property
+  /object
+/child
   /object
   packing
 property name=left_attach0/property
@@ -91,6 +99,14 @@
 property name=tooltip_text translatable=yesEnter the 
value for the vertical position./property
 property name=invisible_charâ¢/property
 property name=invisible_char_setTrue/property
+accessibility
+  relation type=labelled-by target=verticallabel/
+/accessibility
+child internal-child=accessible
+  object class=AtkObject id=verticalpos:0in-atkobject
+property name=AtkObject::accessible-name 
translatable=yesVertical/property
+  /object
+/child
   /object
   packing
 property name=left_attach1/property
@@ -125,6 +141,14 @@
 property name=tooltip_text translatable=yesEnter a 
width for the selected object./property
 property name=invisible_charâ¢/property
 property name=invisible_char_setTrue/property
+accessibility
+  relation type=labelled-by target=widthlabel/
+/accessibility
+child internal-child=accessible
+  object class=AtkObject id=selectwidth:0in-atkobject
+property name=AtkObject::accessible-name

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2014-02-14 Thread Maxim Monastirsky

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |5 ---
 svx/source/sidebar/paragraph/ParaPropertyPanel.hrc |   30 +
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |2 -
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |8 -
 svx/uiconfig/ui/sidebarparagraph.ui|5 ---
 5 files changed, 16 insertions(+), 34 deletions(-)

New commits:
commit 4eb7f3911921817a8f8d56a2bafb54d1fd12afcd
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Fri Feb 14 10:15:14 2014 +0200

fdo#68537 Correct icon and tooltip for background color

Just to close this bug, more changes are expected.

Change-Id: I1017481211a5a1b9219f02fed3af31be0399e27a
Reviewed-on: https://gerrit.libreoffice.org/8046
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index f307c20..ca18b1f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -58,7 +58,7 @@ const char UNO_JUSTIFYPARA[]  = .uno:JustifyPara;
 const char UNO_DEFAULTBULLET[]= .uno:DefaultBullet;
 const char UNO_DEFAULTNUMBERING[] = .uno:DefaultNumbering;
 
-const char UNO_PARABACKCOLOR[]= .uno:ParaBackColor;
+const char UNO_PARABACKCOLOR[]= .uno:BackgroundColor;
 
 const char UNO_INCREMENTINDENT[]  = .uno:IncrementIndent;
 const char UNO_DECREMENTINDENT[]  = .uno:DecrementIndent;
@@ -345,7 +345,6 @@ void ParaPropertyPanel::InitToolBoxBGColor()
 {
 const sal_uInt16 nIdBackColor = 
mpTBxBackColor-GetItemId(UNO_PARABACKCOLOR);
 
-mpTBxBackColor-SetItemImage(nIdBackColor, 
GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : 
maImgBackColor);
 mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0 /* not 
defined, default is transparent */, nIdBackColor, mpTBxBackColor));
 mpTBxBackColor-SetItemBits( nIdBackColor, mpTBxBackColor-GetItemBits( 
nIdBackColor ) | TIB_DROPDOWNONLY );
 
@@ -1439,8 +1438,6 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
   maIndHang (SVX_RES(IMG_INDENT_HANG)),
   maNumBImageList (SVX_RES(IL_NUM_BULLET)),
   maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)),
-  maImgBackColorHigh (SVX_RES(IMG_BACK_COLOR_H)),
-  maImgBackColor (SVX_RES(IMG_BACK_COLOR)),
   maTxtLeft (0),
   mpLnSPItem (NULL),
   meLnSpState (SFX_ITEM_DONTCARE),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index ab03971..24866bd 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -18,22 +18,20 @@
 
 #include svx/dialogs.hrc
 
-#define IMG_BACK_COLOR  (RID_SVX_SIDEBAR_BEGIN +  0)
-#define IMG_BACK_COLOR_H(RID_SVX_SIDEBAR_BEGIN +  1)
-#define IMG_SPACE3  (RID_SVX_SIDEBAR_BEGIN +  2)
-#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN +  3)
-#define IMG_SPACING1(RID_SVX_SIDEBAR_BEGIN +  4)
-#define IMG_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  5)
-#define IMG_SPACING15   (RID_SVX_SIDEBAR_BEGIN +  6)
-#define IMG_SPACING2(RID_SVX_SIDEBAR_BEGIN +  7)
-#define IMG_SEL_SPACING1(RID_SVX_SIDEBAR_BEGIN +  8)
-#define IMG_SEL_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  9)
-#define IMG_SEL_SPACING15   (RID_SVX_SIDEBAR_BEGIN + 10)
-#define IMG_SEL_SPACING2(RID_SVX_SIDEBAR_BEGIN + 11)
-#define IMG_CUSTOM  (RID_SVX_SIDEBAR_BEGIN + 12)
-#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 13)
-#define IL_NUM_BULLET   (RID_SVX_SIDEBAR_BEGIN + 14)
-#define IL_NUM_BULLET_RTL   (RID_SVX_SIDEBAR_BEGIN + 15)
+#define IMG_SPACE3  (RID_SVX_SIDEBAR_BEGIN +  0)
+#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN +  1)
+#define IMG_SPACING1(RID_SVX_SIDEBAR_BEGIN +  2)
+#define IMG_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  3)
+#define IMG_SPACING15   (RID_SVX_SIDEBAR_BEGIN +  4)
+#define IMG_SPACING2(RID_SVX_SIDEBAR_BEGIN +  5)
+#define IMG_SEL_SPACING1(RID_SVX_SIDEBAR_BEGIN +  6)
+#define IMG_SEL_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  7)
+#define IMG_SEL_SPACING15   (RID_SVX_SIDEBAR_BEGIN +  8)
+#define IMG_SEL_SPACING2(RID_SVX_SIDEBAR_BEGIN +  9)
+#define IMG_CUSTOM  (RID_SVX_SIDEBAR_BEGIN + 10)
+#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 11)
+#define IL_NUM_BULLET   (RID_SVX_SIDEBAR_BEGIN + 12)
+#define IL_NUM_BULLET_RTL   (RID_SVX_SIDEBAR_BEGIN + 13)
 
 //for numbering and bullet
 #define IID_BULLET  1
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index c30d7fe..0109d56 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -123,8 +123,6 @@ private:
 
 ImageList   maNumBImageList;
 ImageList   maNumBImageListRTL;

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2014-02-14 Thread Maxim Monastirsky

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |  320 -
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |   14 
 svx/uiconfig/ui/sidebarparagraph.ui|   29 -
 3 files changed, 2 insertions(+), 361 deletions(-)

New commits:
commit 17845be27dacba0abc72647209f5324546b6c8b6
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Fri Feb 14 01:13:36 2014 +0200

sidebar: remove alignment handlers

from paragraph panel

Change-Id: I46cc0c81df02cba681a0586a7ef859f77be046c6
Reviewed-on: https://gerrit.libreoffice.org/8045
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index ca18b1f..b1549f2 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -26,9 +26,7 @@
 #include ParaBulletsControl.hxx
 #include ParaNumberingPopup.hxx
 #include ParaNumberingControl.hxx
-#include sfx2/sidebar/Theme.hxx
 #include sfx2/sidebar/ResourceDefinitions.hrc
-#include sfx2/sidebar/ControlFactory.hxx
 #include sfx2/sidebar/Tools.hxx
 #include svx/sidebar/PopupContainer.hxx
 #include sfx2/dispatch.hxx
@@ -47,13 +45,6 @@
 #include boost/bind.hpp
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Theme;
-using ::sfx2::sidebar::ControlFactory;
-
-const char UNO_LEFTPARA[] = .uno:LeftPara;
-const char UNO_RIGHTPARA[]= .uno:RightPara;
-const char UNO_CENTERPARA[]   = .uno:CenterPara;
-const char UNO_JUSTIFYPARA[]  = .uno:JustifyPara;
 
 const char UNO_DEFAULTBULLET[]= .uno:DefaultBullet;
 const char UNO_DEFAULTNUMBERING[] = .uno:DefaultNumbering;
@@ -70,10 +61,6 @@ const char UNO_HANGINGINDENT2[]   = .uno:HangingIndent2;
 
 const char UNO_LINESPACING[]  = .uno:LineSpacing;
 
-const char UNO_CELLVERTTOP[]  = .uno:CellVertTop;
-const char UNO_CELLVERTCENTER[]   = .uno:CellVertCenter;
-const char UNO_CELLVERTBOTTOM[]   = .uno:CellVertBottom;
-
 const char UNO_PARASPACEINC[] = .uno:ParaspaceIncrease;
 const char UNO_PARASPACEDEC[] = .uno:ParaspaceDecrease;
 
@@ -262,35 +249,6 @@ void ParaPropertyPanel::EndNumberingPopupMode (void)
 }
 
 
-void ParaPropertyPanel::InitToolBoxAlign()
-{
-const sal_uInt16 nIdLeft= mpAlignToolBox-GetItemId(UNO_LEFTPARA);
-const sal_uInt16 nIdCenter  = mpAlignToolBox-GetItemId(UNO_CENTERPARA);
-const sal_uInt16 nIdRight   = mpAlignToolBox-GetItemId(UNO_RIGHTPARA);
-const sal_uInt16 nIdJustify = mpAlignToolBox-GetItemId(UNO_JUSTIFYPARA);
-
-mpAlignToolBox-SetItemImage(nIdLeft, maLeftAlignControl.GetIcon());
-mpAlignToolBox-SetItemImage(nIdCenter, maCenterAlignControl.GetIcon());
-mpAlignToolBox-SetItemImage(nIdRight, maRightAlignControl.GetIcon());
-mpAlignToolBox-SetItemImage(nIdJustify, maJustifyAlignControl.GetIcon());
-
-Link aLink = LINK( this, ParaPropertyPanel, AlignStyleModifyHdl_Impl );
-mpAlignToolBox-SetSelectHdl( aLink );
-}
-
-void ParaPropertyPanel::InitToolBoxVertAlign()
-{
-const sal_uInt16 nIdVertTop = 
mpTBxVertAlign-GetItemId(UNO_CELLVERTTOP);
-const sal_uInt16 nIdVertCenter  = 
mpTBxVertAlign-GetItemId(UNO_CELLVERTCENTER);
-const sal_uInt16 nIdVertBottom  = 
mpTBxVertAlign-GetItemId(UNO_CELLVERTBOTTOM);
-
-mpTBxVertAlign-SetItemImage(nIdVertTop, maVertTop.GetIcon());
-mpTBxVertAlign-SetItemImage(nIdVertCenter, maVertCenter.GetIcon());
-mpTBxVertAlign-SetItemImage(nIdVertBottom, maVertBottom.GetIcon());
-
mpTBxVertAlign-SetSelectHdl(LINK(this,ParaPropertyPanel,VertTbxSelectHandler));
-}
-
-
 void ParaPropertyPanel::InitToolBoxIndent()
 {
 Link aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl );
@@ -406,14 +364,7 @@ void ParaPropertyPanel::InitToolBoxLineSpacing()
 
 void ParaPropertyPanel::initial()
 {
-GetBindings()-Invalidate(SID_ATTR_PARA_ADJUST_LEFT,sal_True,sal_False);
-GetBindings()-Invalidate(SID_ATTR_PARA_ADJUST_CENTER,sal_True,sal_False);
-GetBindings()-Invalidate(SID_ATTR_PARA_ADJUST_RIGHT,sal_True,sal_False);
-GetBindings()-Invalidate(SID_ATTR_PARA_ADJUST_BLOCK,sal_True,sal_False);
-
 //toolbox
-InitToolBoxAlign();
-InitToolBoxVertAlign();
 InitToolBoxIndent();
 InitToolBoxBGColor();
 InitToolBoxBulletsNumbering();
@@ -485,117 +436,6 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, 
ToolBox*, pToolBox)
 }
 
 
-//for Vertical 
Alignment
-
-
-
-IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
-{
-const OUString 
aCommand(pToolBox-GetItemCommand(pToolBox-GetCurItemId()));
-sal_uInt16 nSID = SID_TABLE_VERT_NONE;
-EndTracking();
-
-const sal_uInt16 nIdVertTop= 
mpTBxVertAlign-GetItemId(UNO_CELLVERTTOP);
-const sal_uInt16 nIdVertCenter =

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2014-02-07 Thread Caolán McNamara

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |   12 +---
 svx/uiconfig/ui/sidebarparagraph.ui|   18 --
 2 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 65a384eaa1d186868548f7d3d864229836332c84
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 7 15:00:45 2014 +

set smaller preferred width for sidebar para spinners

i.e. use a size that's big enough for sane values to
fit, rather than full range of legal values. Width
space is at a premium here.

Change-Id: I5d34048690729415deaabec431eb16e43c5b7a0a

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 393c92a..219d8fc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1493,14 +1493,20 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
 get(mpTBxBackColor, backgroundcolor);
 //Paragraph spacing
 get(mpTopDist,  aboveparaspacing);
+mpTopDist-set_width_request(mpTopDist-get_preferred_size().Width());
 get(mpBottomDist,   belowparaspacing);
+
mpBottomDist-set_width_request(mpBottomDist-get_preferred_size().Width());
+get(mpLeftIndent,   beforetextindent);
+
mpLeftIndent-set_width_request(mpLeftIndent-get_preferred_size().Width());
+get(mpRightIndent,  aftertextindent);
+
mpRightIndent-set_width_request(mpRightIndent-get_preferred_size().Width());
+get(mpFLineIndent,  firstlineindent);
+
mpFLineIndent-set_width_request(mpFLineIndent-get_preferred_size().Width());
+
 get(mpTbxIndent_IncDec, indent);
 get(mpTbxProDemote, promotedemote);
 get(mpLineSPTbx,linespacing);
 get(mpTbxUL_IncDec, paraspacing);
-get(mpLeftIndent,   beforetextindent);
-get(mpRightIndent,  aftertextindent);
-get(mpFLineIndent,  firstlineindent);
 
 initial();
 }
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 5aac47e..9c3125a 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,7 +1,13 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
   !-- interface-requires LibreOffice 1.0 --
+  object class=GtkAdjustment id=adjustment1
+property name=upper100/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkGrid id=ParaPropertyPanel
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -338,7 +344,7 @@
 property name=tooltip_text translatable=yesAbove 
Paragraph Spacing/property
 property name=hexpandTrue/property
 property name=invisible_charâ¢/property
-property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
   /object
   packing
 property name=expandFalse/property
@@ -380,7 +386,7 @@
 property name=tooltip_text translatable=yesBelow 
Paragraph Spacing/property
 property name=hexpandTrue/property
 property name=invisible_charâ¢/property
-property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
   /object
   packing
 property name=expandFalse/property
@@ -419,7 +425,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_charâ¢/property
-property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
   /object
   packing
 property name=expandFalse/property
@@ -458,7 +464,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_charâ¢/property
-property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
   /object
   packing
 property name=expandFalse/property
@@ -497,7 +503,7 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=invisible_charâ¢/property
-property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
   /object
   packing
 property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source svx/uiconfig

2014-02-04 Thread Maxim Monastirsky

 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |1 
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |2 
 svx/source/sidebar/text/TextPropertyPanel.cxx   |   24 
 svx/source/sidebar/text/TextPropertyPanel.hrc   |   43 
 svx/source/sidebar/text/TextPropertyPanel.hxx   |4 -
 svx/source/sidebar/text/TextUnderlineControl.cxx|2 
 svx/source/sidebar/text/TextUnderlineControl.hxx|4 -
 svx/uiconfig/ui/sidebartextpanel.ui |   13 
 8 files changed, 93 deletions(-)

New commits:
commit 4c97c6a18f12db3cedfdebb033205594056c7373
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Mon Feb 3 19:07:18 2014 +0200

sidebar: more cleanup of text panel

Change-Id: Iad9b619d599ed13e3d783ca174e7ad5f0053c622
Reviewed-on: https://gerrit.libreoffice.org/7826
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx 
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index a672e9a..ce1941c 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -22,7 +22,6 @@
 #include svx/dialmgr.hxx
 #include unotools/viewoptions.hxx
 #include editeng/kernitem.hxx
-#include sfx2/bindings.hxx
 #include sfx2/dispatch.hxx
 #include sfx2/sidebar/Theme.hxx
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx 
b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index cb5bfae..67b89ee 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -21,8 +21,6 @@
 #include svx/sidebar/PopupControl.hxx
 #include svx/sidebar/ValueSetWithTextControl.hxx
 #include sfx2/bindings.hxx
-#include svtools/ctrlbox.hxx
-#include svtools/ctrltool.hxx
 #include TextPropertyPanel.hxx
 #include vcl/fixed.hxx
 
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index c1a61f8..6c7e743 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -20,8 +20,6 @@
 #include TextPropertyPanel.hxx
 #include SvxSBFontNameBox.hxx
 
-#include svx/dialmgr.hxx
-
 #include editeng/flstitem.hxx
 #include editeng/fontitem.hxx
 #include editeng/kernitem.hxx
@@ -30,12 +28,7 @@
 #include sfx2/dispatch.hxx
 #include sfx2/objsh.hxx
 #include sfx2/viewsh.hxx
-#include sfx2/sidebar/ResourceDefinitions.hrc
-#include sfx2/sidebar/ControlFactory.hxx
-#include sfx2/sidebar/ControllerFactory.hxx
-#include sfx2/sidebar/Theme.hxx
 #include sfx2/sidebar/SidebarToolBox.hxx
-#include sfx2/imagemgr.hxx
 #include svtools/ctrltool.hxx
 #include svtools/unitconv.hxx
 
@@ -51,8 +44,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Theme;
-using ::sfx2::sidebar::ControlFactory;
 
 const char UNO_BACKCOLOR[] = .uno:BackColor;
 const char UNO_COLOR[] = .uno:Color;
@@ -62,8 +53,6 @@ const char UNO_UNDERLINE[] = .uno:Underline;
 
 namespace svx { namespace sidebar {
 
-#undef HAS_IA2
-
 PopupControl* TextPropertyPanel::CreateCharacterSpacingControl 
(PopupContainer* pParent)
 {
 return new TextCharacterSpacingControl(pParent, *this, mpBindings);
@@ -127,7 +116,6 @@ TextPropertyPanel::TextPropertyPanel ( Window* pParent, 
const cssu::Referencecs
 get(mpFontSizeBox, fontsize);
 get(mpToolBoxFont, fonteffects);
 get(mpToolBoxIncDec, fontadjust);
-get(mpToolBoxScript, position);
 get(mpToolBoxSpacing, spacingbar);
 get(mpToolBoxFontColor, colorbar);
 
@@ -254,18 +242,6 @@ void TextPropertyPanel::Initialize (void)
 InitToolBoxFont();
 InitToolBoxSpacing();
 
-#ifdef HAS_IA2
-mpFontNameBox-SetAccRelationLabeledBy(mpFontNameBox);
-mpFontNameBox-SetMpSubEditAccLableBy(mpFontNameBox);
-mpFontSizeBox-SetAccRelationLabeledBy(mpFontSizeBox);
-mpFontSizeBox-SetMpSubEditAccLableBy(mpFontSizeBox);
-mpToolBoxFont-SetAccRelationLabeledBy(mpToolBoxFont);
-mpToolBoxIncDec-SetAccRelationLabeledBy(mpToolBoxIncDec);
-mpToolBoxFontColor-SetAccRelationLabeledBy(mpToolBoxFontColor);
-mpToolBoxScript-SetAccRelationLabeledBy(mpToolBoxScript);
-mpToolBoxSpacing-SetAccRelationLabeledBy(mpToolBoxSpacing);
-#endif
-
 //init state
 mpHeightItem = NULL;
 meUnderline = UNDERLINE_NONE;
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc 
b/svx/source/sidebar/text/TextPropertyPanel.hrc
index 89fb8d5..5685efa 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -25,12 +25,9 @@
 #define VS_UNDERLINE_WIDTH  57
 #define VS_UNDERLINE_HEIGHT  12 * 10
 
-#define IMG_SPACING_D   71
-
 //popup window underline
 #define VS_UNDERLINE1
 #define PB_OPTIONS  2
-#define BMP_UNDERLINE_MORE  3
 
 #define

[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-27 Thread Manal Alhassoun

 svx/UIConfig_svx.mk |2 
 svx/source/dialog/imapdlg.cxx   |   11 +---
 svx/source/dialog/imapdlg.hrc   |7 --
 svx/source/dialog/imapdlg.src   |9 ---
 svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui |   52 
 svx/uiconfig/ui/querysaveimagemapchangesdialog.ui   |   52 
 6 files changed, 111 insertions(+), 22 deletions(-)

New commits:
commit 4c26083959637ffa9ca8bc1eed99f3c218447123
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Thu Dec 26 15:11:57 2013 +0300

convert save and modify imageMaps queryboxes to .ui

Change-Id: I222ce47187e46f7de9916bd559846d28c30d4562
Reviewed-on: https://gerrit.libreoffice.org/7201
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f2a8087..e82509c 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -28,8 +28,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/querydeletecontourdialog \
+   svx/uiconfig/ui/querymodifyimagemapchangesdialog \
svx/uiconfig/ui/querynewcontourdialog \
svx/uiconfig/ui/querysavecontchangesdialog \
+   svx/uiconfig/ui/querysaveimagemapchangesdialog \
svx/uiconfig/ui/queryunlinkgraphicsdialog \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8c1b46f..3cc0bb63 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -40,6 +40,7 @@
 #include sfx2/docfile.hxx
 #include unotools/localedatawrapper.hxx
 #include comphelper/processfactory.hxx
+#include vcl/layout.hxx
 
 #define _IMAPDLG_PRIVATE
 #include svx/imapdlg.hxx
@@ -225,8 +226,7 @@ sal_Bool SvxIMapDlg::Close()
 
 if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
 {
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
-   SVX_RESSTR( STR_IMAPDLG_MODIFY ) );
+MessageDialog aQBox( 
this,QueryModifyImageMapChangesDialog,svx/ui/querymodifyimagemapchangesdialog.ui);
 const long  nRet = aQBox.Execute();
 
 if( nRet == RET_YES )
@@ -240,8 +240,7 @@ sal_Bool SvxIMapDlg::Close()
 }
 else if( pIMapWnd-IsChanged() )
 {
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
-   SVX_RESSTR( STR_IMAPDLG_SAVE ) );
+MessageDialog aQBox( 
this,QuerySaveImageMapChangesDialog,svx/ui/querysaveimagemapchangesdialog.ui);
 const long  nRet = aQBox.Execute();
 
 if( nRet == RET_YES )
@@ -727,8 +726,8 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
 if ( pOwnData-pUpdateEditingObject != pCheckObj )
 {
 if ( pIMapWnd-IsChanged() 
- ( QueryBox( this, WB_YES_NO | WB_DEF_YES,
- SVX_RESSTR( STR_IMAPDLG_SAVE ) ).Execute() == RET_YES ) )
+ ( MessageDialog( this,QuerySaveImageMapChangesDialog,
+ svx/ui/querysaveimagemapchangesdialog.ui ).Execute() == RET_YES 
) )
 {
 DoSave();
 }
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 40ba35b..bcc2569 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -86,11 +86,4 @@
 
 
/**/
 
-
-#define STR_IMAPDLG_SAVE(RID_SVX_IMAPDLG_START + 5)
-#define STR_IMAPDLG_MODIFY  (RID_SVX_IMAPDLG_START + 6)
-
-
-/**/
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 730ef28..486217a 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -344,14 +344,5 @@ Menu RID_SVXMN_IMAP
 
 
/**/
 
-String STR_IMAPDLG_SAVE
-{
-Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the 
changes?;
-};
-
-String STR_IMAPDLG_MODIFY
-{
-Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the 
changes? ;
-};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui 
b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
new file mode 100644
index 000..33e388e
--- /dev/null
+++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
@@ -0,0 +1,52 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkMessageDialog id=QueryModifyImageMapChangesDialog
+property name=can_focusFalse/property
+property name=border_width12/property
+property name=title translatable=yesSave ImageMap

[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-04 Thread Manal Alhassoun

 svx/UIConfig_svx.mk   |4 ++
 svx/source/dialog/_contdlg.cxx|   10 ++---
 svx/source/dialog/contdlg.hrc |4 --
 svx/source/dialog/contdlg.src |   21 --
 svx/uiconfig/ui/querydeletecontourdialog.ui   |   36 ++
 svx/uiconfig/ui/querynewcontourdialog.ui  |   34 +
 svx/uiconfig/ui/querysavecontchangesdialog.ui |   52 ++
 svx/uiconfig/ui/queryunlinkgraphicsdialog.ui  |   35 +
 8 files changed, 166 insertions(+), 30 deletions(-)

New commits:
commit 6931f431331d4cb5b5619c29d5f615f4245a66be
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Wed Dec 4 13:40:46 2013 +0300

convert Contour queryboxes to .ui

Change-Id: Ie6dad2409a7d58a1c01973e8740f436cb597cb99
Reviewed-on: https://gerrit.libreoffice.org/6923
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 1780983..fb29eb1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
+   svx/uiconfig/ui/querydeletecontourdialog \
+   svx/uiconfig/ui/querynewcontourdialog \
+   svx/uiconfig/ui/querysavecontchangesdialog \
+   svx/uiconfig/ui/queryunlinkgraphicsdialog \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d0fcd9e..a3051b4 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -43,6 +43,7 @@
 #include vcl/svapp.hxx
 #include vcl/virdev.hxx
 #include dlgunit.hxx
+#include vcl/layout.hxx
 
 SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 
@@ -303,8 +304,7 @@ sal_Bool SvxSuperContourDlg::Close()
 
 if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
 {
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
-   CONT_RESID(STR_CONTOURDLG_MODIFY).toString() );
+MessageDialog aQBox( 
this,QuerySaveContourChangesDialog,svx/ui/querysavecontchangesdialog.ui);
 const long  nRet = aQBox.Execute();
 
 if ( nRet == RET_YES )
@@ -439,7 +439,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx 
)
 {
 if ( aTbx1.IsItemChecked( TBI_WORKPLACE ) )
 {
-QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, 
CONT_RESID(STR_CONTOURDLG_WORKPLACE).toString() );
+MessageDialog aQBox( 
this,QueryDeleteContourDialog,svx/ui/querydeletecontourdialog.ui);
 
 if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == 
RET_YES ) )
 aContourWnd.SetWorkplaceMode( sal_True );
@@ -535,7 +535,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx 
)
 aStbStatus.Invalidate();
 else if ( bGraphicLinked )
 {
-QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, 
CONT_RESID(STR_CONTOURDLG_LINKED).toString() );
+MessageDialog aQBox( 
this,QueryUnlinkGraphicsDialog,svx/ui/queryunlinkgraphicsdialog.ui);
 
 if ( aQBox.Execute() != RET_YES )
 {
@@ -733,7 +733,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, 
ContourWindow*, pWnd )
 
 if( !!aMask )
 {
-QueryBoxaQBox( this, WB_YES_NO | WB_DEF_YES, 
CONT_RESID(STR_CONTOURDLG_NEWPIPETTE).toString() );
+MessageDialog aQBox( 
this,QueryNewContourDialog,svx/ui/querynewcontourdialog.ui);
 sal_BoolbNewContour;
 
 aRedoGraphic = Graphic();
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index 07afc01..aec18aa 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -61,9 +61,5 @@
 
 
/**/
 
-#define STR_CONTOURDLG_MODIFY   (RID_SVX_CONTOURDLG_START + 2)
-#define STR_CONTOURDLG_NEWPIPETTE   (RID_SVX_CONTOURDLG_START + 3)
-#define STR_CONTOURDLG_WORKPLACE(RID_SVX_CONTOURDLG_START + 4)
-#define STR_CONTOURDLG_LINKED   (RID_SVX_CONTOURDLG_START + 5)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index 41bee84..519b73c 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -220,26 +220,5 @@ FloatingWindow RID_SVXDLG_CONTOUR
 };
 
 
/**/
-String STR_CONTOURDLG_MODIFY
-{
-Text [ en-US ] = The contour has been modified.\nDo you want to save the 
changes? ;
-};
-
-String

72 matches

Mail list logo