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

2022-08-18 Thread Rafael Lima (via logerrit) 
 sfx2/source/doc/templatedlg.cxx |3 +++
 sfx2/uiconfig/ui/templatedlg.ui |3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 410bff99a708371eed6a82677b44e2151a4a990a
Author: Rafael Lima 
AuthorDate: Sat Jul 9 00:43:13 2022 +0200
Commit: Rafael Lima 
CommitDate: Thu Aug 18 13:47:14 2022 +0200

tdf#149768 Do not fix Templates dialog width and height in pixels

This patch removes the fixed size of the Templates dialog in pixels so it 
works better in HiDPI displays.

This patch also makes the dialog a bit wider and non-resizable.

Change-Id: I256d8d5c8b76c8e32a4f008f3a235f80bf59634d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136922
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index ac3015ceb8c0..42e570e75dfb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -203,6 +203,9 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window 
*pParent)
 
 mxLocalView->ShowTooltips(true);
 
+// Set width and height of the templates thumbnail viewer to acommodate 3 
rows and 4 columns of items
+mxLocalViewWeld->set_size_request(TEMPLATE_ITEM_MAX_WIDTH * 5, 
TEMPLATE_ITEM_MAX_HEIGHT_SUB * 3);
+
 mxOKButton->connect_clicked(LINK(this, SfxTemplateManagerDlg, OkClickHdl));
 // FIXME: rather than disabling make 
dispatchCommand(".uno:AdditionsDialog") work in start center
 if ( !SfxModule::GetActiveModule() )
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 013eacb2a467..7f7fe31d6371 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -39,11 +39,10 @@
 
   
   
-740
-500
 False
 6
 Templates
+False
 True
 0
 0

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

2021-03-12 Thread Tomaž Vajngerl (via logerrit) 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |5 ++
 sfx2/uiconfig/ui/developmenttool.ui |   40 +---
 2 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit cd2e32cae86f31e7dff8b350e3c5e551c79f4bc1
Author: Tomaž Vajngerl 
AuthorDate: Thu Mar 11 12:26:38 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Mar 12 16:04:26 2021 +0100

devtools: make all columns sorted in all tree views

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index e0f2b4ae9d5d..6b6a1bdfcc1d 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -736,6 +736,11 @@ ObjectInspectorTreeHandler::ObjectInspectorTreeHandler(
 mpPropertiesTreeView->connect_changed(LINK(this, 
ObjectInspectorTreeHandler, SelectionChanged));
 mpMethodsTreeView->connect_changed(LINK(this, ObjectInspectorTreeHandler, 
SelectionChanged));
 
+mpInterfacesTreeView->make_sorted();
+mpServicesTreeView->make_sorted();
+mpPropertiesTreeView->make_sorted();
+mpMethodsTreeView->make_sorted();
+
 mpObjectInspectorToolbar->connect_clicked(
 LINK(this, ObjectInspectorTreeHandler, ToolbarButtonClicked));
 mpObjectInspectorToolbar->set_item_sensitive("inspect", false);
diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index 22c1f5f315f1..9f23752d7f26 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -174,9 +174,12 @@
   
 
 
-  
+  
 True
 Name
+True
+True
+0
 
   
   
@@ -223,6 +226,9 @@
   
 True
 Name
+True
+True
+0
 
   
   
@@ -273,6 +279,9 @@
   
 True
 Object
+True
+True
+0
 
   
   
@@ -285,6 +294,9 @@
   
 True
 Value
+True
+True
+1
 
   
   
@@ -297,6 +309,9 @@
   
 True
 Type
+True
+True
+2
 
   
   
@@ -309,6 +324,9 @@
   
 True
 Info
+True
+True
+3
 
   
   
@@ -356,9 +374,12 @@
   
 
 
-  
+  
 True
 Method
+True
+True
+0
 
   
   
@@ -368,9 +389,12 @@
   
 
 
-  
+  
 True
 Return Type
+True
+True
+1
 
   
   
@@ -380,9 +404,12 @@
   
 
 
-  
+  
 True
 Parameters
+True
+True
+2

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

2021-03-12 Thread Tomaž Vajngerl (via logerrit) 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |  125 
 sfx2/uiconfig/ui/developmenttool.ui |   22 ++-
 2 files changed, 118 insertions(+), 29 deletions(-)

New commits:
commit 8d1888fca3147520c6f049ba4335932f69caf358
Author: Tomaž Vajngerl 
AuthorDate: Fri Mar 5 22:28:40 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Mar 12 16:03:58 2021 +0100

devtools: new column "Info" for properties in object inspector

Adds additional column "info" for properties, where additional
property attributes are written. Currently these are mostly
constants from beans::PropertyAttribute, but they can be others
too (anything that is useful to the users for the current property,
struct, sequence).

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 0466f252166e..e0f2b4ae9d5d 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -349,15 +350,18 @@ class BasicValueNode : public SimpleStringNode
 {
 protected:
 uno::Any maAny;
+OUString mrInfo;
 uno::Reference mxContext;
 
-ObjectInspectorNodeInterface* createNodeObjectForAny(OUString const& 
rName, uno::Any& rAny);
+ObjectInspectorNodeInterface* createNodeObjectForAny(OUString const& 
rName, uno::Any& rAny,
+ OUString const& 
mrInfo);
 
 public:
-BasicValueNode(OUString const& rName, uno::Any const& rAny,
+BasicValueNode(OUString const& rName, uno::Any const& rAny, OUString 
const& rInfo,
uno::Reference const& xContext)
 : SimpleStringNode(rName)
 , maAny(rAny)
+, mrInfo(rInfo)
 , mxContext(xContext)
 {
 }
@@ -389,19 +393,16 @@ public:
 OUString aValue = AnyToString(maAny, mxContext);
 OUString aType = getAnyType(maAny);
 
-return {
-{ 1, aValue },
-{ 2, aType },
-};
+return { { 1, aValue }, { 2, aType }, { 3, mrInfo } };
 }
 };
 
 class GenericPropertiesNode : public BasicValueNode
 {
 public:
-GenericPropertiesNode(OUString const& rName, uno::Any const& rAny,
+GenericPropertiesNode(OUString const& rName, uno::Any const& rAny, 
OUString const& rInfo,
   uno::Reference const& 
xContext)
-: BasicValueNode(rName, rAny, xContext)
+: BasicValueNode(rName, rAny, rInfo, xContext)
 {
 }
 
@@ -412,9 +413,9 @@ public:
 class StructNode : public BasicValueNode
 {
 public:
-StructNode(OUString const& rName, uno::Any const& rAny,
+StructNode(OUString const& rName, uno::Any const& rAny, OUString const& 
rInfo,
uno::Reference const& xContext)
-: BasicValueNode(rName, rAny, xContext)
+: BasicValueNode(rName, rAny, rInfo, xContext)
 {
 }
 
@@ -429,9 +430,9 @@ class SequenceNode : public BasicValueNode
 uno::Reference mxIdlArray;
 
 public:
-SequenceNode(OUString const& rName, uno::Any const& rAny,
+SequenceNode(OUString const& rName, uno::Any const& rAny, OUString const& 
rInfo,
  uno::Reference const& xContext)
-: BasicValueNode(rName, rAny, xContext)
+: BasicValueNode(rName, rAny, rInfo, xContext)
 {
 auto xReflection = reflection::theCoreReflection::get(mxContext);
 OUString aTypeName = maAny.getValueType().getTypeName();
@@ -456,7 +457,8 @@ public:
 uno::Any aArrayValue = mxIdlArray->get(maAny, i);
 uno::Reference xCurrent;
 
-auto* pObjectInspectorNode = 
createNodeObjectForAny(OUString::number(i), aArrayValue);
+auto* pObjectInspectorNode
+= createNodeObjectForAny(OUString::number(i), aArrayValue, "");
 if (pObjectInspectorNode)
 lclAppendNodeToParent(pTree, pParent, pObjectInspectorNode);
 }
@@ -490,7 +492,8 @@ void 
GenericPropertiesNode::fillChildren(std::unique_ptr& pTree,
 for (OUString const& rName : aNames)
 {
 uno::Any aAny = xNameAccess->getByName(rName);
-auto* pObjectInspectorNode = createNodeObjectForAny("@" + rName, 
aAny);
+auto* pObjectInspectorNode
+= createNodeObjectForAny(u"@" + rName, aAny, u"name 
container");
 lclAppendNodeToParent(pTree, pParent, pObjectInspectorNode);
 }
 }
@@ -502,7 +505,7 @@ void 
GenericPropertiesNode::fillChildren(std::unique_ptr& pTree,
 {
 uno::Any aAny = xIndexAccess->getByIndex(nIndex);
 auto* pObjectInspectorNode
-=

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

2021-03-11 Thread Tomaž Vajngerl (via logerrit) 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |5 +
 sfx2/uiconfig/ui/developmenttool.ui |   18 --
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 8839ea90176a38e07ca8a36f5a33e9cbe2b4fcef
Author: Tomaž Vajngerl 
AuthorDate: Thu Mar 4 15:30:19 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Mar 11 12:46:59 2021 +0100

devtools: add refresh to toolbar for the object inspector

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 5d3d8049d467..7f969ae24464 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -786,6 +786,11 @@ IMPL_LINK(ObjectInspectorTreeHandler, 
ToolbarButtonClicked, const OString&, rSel
 inspectObject(xInterface);
 }
 }
+else if (rSelectionId == "refresh")
+{
+auto rPageId = mpObjectInspectorNotebook->get_current_page_ident();
+NotebookEnterPage(rPageId);
+}
 }
 
 IMPL_LINK(ObjectInspectorTreeHandler, NotebookEnterPage, const OString&, 
rPageId, void)
diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index b915d1f6f12d..8326083cde5a 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -426,7 +426,7 @@
   
 True
 False
-Back
+Back
 Back
 True
 cmd/lc_prevrecord.png
@@ -440,7 +440,7 @@
   
 True
 False
-Inspect
+Inspect
 Inspect
 True
 cmd/lc_recsearch.png
@@ -450,6 +450,20 @@
 True
   
 
+
+  
+True
+False
+Refresh
+Refresh
+True
+cmd/lc_reload.png
+  
+  
+False
+True
+  
+
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-03-04 Thread Caolán McNamara (via logerrit) 
 sfx2/source/sidebar/DeckTitleBar.cxx  |2 +-
 sfx2/source/sidebar/PanelTitleBar.cxx |4 ++--
 sfx2/uiconfig/ui/decktitlebar.ui  |2 +-
 sfx2/uiconfig/ui/paneltitlebar.ui |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 98921e04bd16651b8ff92f82ff9073a1b12c
Author: Caolán McNamara 
AuthorDate: Thu Mar 4 10:41:37 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 4 13:14:13 2021 +0100

master slide panel shouldn't have "more options" button

default the toolbox to hidden and show it if "more options" is enabled

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

diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 91d95d69f264..59e9aa0db6c8 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -119,7 +119,7 @@ void DeckTitleBar::SetCloserVisible (const bool 
bIsCloserVisible)
 
 mbIsCloserVisible = bIsCloserVisible;
 
-mxToolBox->set_item_visible("button", mbIsCloserVisible);
+mxToolBox->set_visible(mbIsCloserVisible);
 }
 
 void DeckTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 7f2ff3214722..ddde9ca7aa6f 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -91,7 +91,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& 
rsCommandName,
 return;
 
 if (!msMoreOptionsCommand.isEmpty())
-mxToolBox->set_item_visible(msIdent, false);
+mxToolBox->hide();
 
 msMoreOptionsCommand = rsCommandName;
 
@@ -108,7 +108,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& 
rsCommandName,
 ControllerFactory::CreateToolBoxController(
 *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, 
rxController, true);
 
-mxToolBox->set_item_visible(msIdent, true);
+mxToolBox->show();
 }
 
 void PanelTitleBar::HandleToolBoxItemClick()
diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui
index bbfcba7bf69b..8c34a7d5b415 100644
--- a/sfx2/uiconfig/ui/decktitlebar.ui
+++ b/sfx2/uiconfig/ui/decktitlebar.ui
@@ -52,8 +52,8 @@
 
 
   
-True
 False
+True
 icons
 False
 2
diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui 
b/sfx2/uiconfig/ui/paneltitlebar.ui
index 2e352bf21a4f..eac7c877cf2e 100644
--- a/sfx2/uiconfig/ui/paneltitlebar.ui
+++ b/sfx2/uiconfig/ui/paneltitlebar.ui
@@ -59,8 +59,8 @@
 
 
   
-True
 False
+True
 icons
 False
 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-02-21 Thread Tomaž Vajngerl (via logerrit) 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |6 --
 sfx2/uiconfig/ui/developmenttool.ui |   14 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 460c778bd483fb0a61c4b0d46f5f876ce80dff26
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 22 09:15:39 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 22 06:29:27 2021 +0100

devtools: add implementation class to the methods category

Implementation class is the class where the method is implemented
on.

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 39f2d70eb06a..e672d256fbe6 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -301,12 +301,11 @@ public:
 
 std::vector> getColumnValues() override
 {
-OUString aInString;
 OUString aOutString;
-
 auto xClass = mxMethod->getReturnType();
 aOutString = simpleTypeName(xClass);
 
+OUString aInString;
 const auto aParameters = mxMethod->getParameterInfos();
 bool bFirst = true;
 for (auto const& rParameterInfo : aParameters)
@@ -334,9 +333,12 @@ public:
 aInString += rParameterInfo.aName + " : " + 
simpleTypeName(rParameterInfo.aType);
 }
 
+OUString aImplementationClass = 
mxMethod->getDeclaringClass()->getName();
+
 return {
 { 1, aOutString },
 { 2, aInString },
+{ 3, aImplementationClass },
 };
 }
 
diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index 9dd110804991..3eeb94859885 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -26,6 +26,8 @@
   
   
   
+  
+  
   
   
 
@@ -407,6 +409,18 @@
 
   
 
+
+  
+True
+Implementation Class
+
+  
+  
+3
+  
+
+  
+
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-02-11 Thread Tomaž Vajngerl (via logerrit) 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |   81 +++-
 sfx2/uiconfig/ui/developmenttool.ui |   21 +++--
 2 files changed, 32 insertions(+), 70 deletions(-)

New commits:
commit 07f8efa33fb61b256d0a2578e6f3ff0d17cf2610
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 9 19:29:50 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 11 15:45:17 2021 +0100

devtools: add "Type" column to object inspector

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 98e92fb46cbf..6c2105cbc63e 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -55,7 +55,7 @@ TypeToIdlClass(const uno::Type& rType, const 
uno::Reference& xContext)
+OUString AnyToString(const uno::Any& aValue)
 {
 uno::Type aValType = aValue.getValueType();
 uno::TypeClass eType = aValType.getTypeClass();
@@ -63,69 +63,6 @@ OUString AnyToString(const uno::Any& aValue, const 
uno::ReferencegetName() + " ";
-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();
@@ -186,6 +123,13 @@ OUString AnyToString(const uno::Any& aValue, const 
uno::Reference& xContext)
+{
+uno::Type aValType = aValue.getValueType();
+auto xIdlClass = TypeToIdlClass(aValType, xContext);
+return xIdlClass->getName();
+}
+
 // Object inspector nodes
 
 class ObjectInspectorNode
@@ -312,6 +256,7 @@ public:
 for (auto const& xProperty : xProperties)
 {
 OUString aValue;
+OUString aType;
 uno::Any aAny;
 uno::Reference xCurrent = mxObject;
 
@@ -320,12 +265,14 @@ public:
 if (xInvocation->hasProperty(xProperty.Name))
 {
 aAny = xInvocation->getValue(xProperty.Name);
-aValue = AnyToString(aAny, mxContext);
+aValue = AnyToString(aAny);
+aType = getAnyType(aAny, mxContext);
 }
 }
 catch (...)
 {
 aValue = "";
+aType = "?";
 }
 
 bool bComplex = false;
@@ -357,6 +304,10 @@ public:
 {
 pTree->set_text(*pCurrent, aValue, 1);
 }
+if (!aType.isEmpty())
+{
+pTree->set_text(*pCurrent, aType, 2);
+}
 }
 }
 };
diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index e3f3bc78e9e8..d65542b00167 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -16,6 +16,8 @@
   
   
   
+  
+  
   
   
 
@@ -31,7 +33,7 @@
 True
 True
 True
-800
+250
 True
 
   
@@ -169,12 +171,9 @@

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

2021-01-27 Thread Caolán McNamara (via logerrit) 
 sfx2/source/appl/newhelp.cxx   |1 -
 sfx2/uiconfig/ui/helpwindow.ui |5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c79426288318b1dd52eff5b38d0e49f37e21b626
Author: Caolán McNamara 
AuthorDate: Wed Jan 27 12:43:25 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 27 15:15:24 2021 +0100

tdf#138727 help browser didn't flow text

because of its size request, while the paned shrink lets the pane shrink
below the size request the contents stay at a min of the size request
and aren't really shrunk, just clipped. Instead don't let the pane
shrink but don't set a size.request letting it shrink to its natural
min of its contents which are then truly resized so the text flow works.

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

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 065f18c820a9..c57522ad55e5 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2448,7 +2448,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
 m_xContainer->connect_size_allocate(LINK(this, SfxHelpWindow_Impl, 
ResizeHdl));
 m_xHelpPaneWindow = m_xBuilder->weld_container("helppanewindow");
 m_xHelpTextWindow = m_xBuilder->weld_container("helptextwindow");
-
m_xHelpTextWindow->set_size_request(m_xHelpTextWindow->get_approximate_digit_width()
 * 120, -1);
 m_xHelpTextXWindow = m_xHelpTextWindow->CreateChildFrame();
 
 pHelpInterceptor->InitWaiter( this );
diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui
index 2505167b8c92..53f589bb67a4 100644
--- a/sfx2/uiconfig/ui/helpwindow.ui
+++ b/sfx2/uiconfig/ui/helpwindow.ui
@@ -20,7 +20,7 @@
 
   
   
-True
+False
 False
   
 
@@ -43,7 +43,6 @@
 True
 False
 icons
-False
 
   
 True
@@ -196,7 +195,7 @@
   
   
 True
-True
+False
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-22 Thread Heiko Tietze (via logerrit) 
 sfx2/source/doc/templatedlg.cxx |1 
 sfx2/uiconfig/ui/templatedlg.ui |  204 ++--
 2 files changed, 95 insertions(+), 110 deletions(-)

New commits:
commit 091ae73930f61f1438ac9eb1a6e2e5fda52d578b
Author: Heiko Tietze 
AuthorDate: Thu Oct 22 12:01:28 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 22 13:51:23 2020 +0200

Resolves tdf#137671 - Extensions on Impres start-up

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

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 78910b8cf374..df51462e36cd 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1335,7 +1335,6 @@ 
SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent)
 
 mxCBApp->set_sensitive(false);
 mxActionBar->hide();
-mxMoreTemplatesButton->hide();
 mxMoveButton->hide();
 mxExportButton->hide();
 mxCBXHideDlg->show();
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 81259e0c9518..d9135e87c551 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -87,6 +87,22 @@
 True
   
 
+
+  
+Show this dialog at startup
+True
+False
+True
+0
+True
+  
+  
+False
+True
+1
+True
+  
+
 
   
 gtk-ok
@@ -100,7 +116,7 @@
   
 False
 True
-1
+2
   
 
 
@@ -114,7 +130,7 @@
   
 False
 True
-2
+3
   
 
   
@@ -330,57 +346,15 @@
 True
 False
 
-  
-True
-False
-
-  
-True
-False
-Settings
-image7
-none
-True
-menu1
-False
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-True
-True
-Add more templates via 
extension
-image5
-none
-True
-  
-  
-False
-True
-1
-  
-
-
-  
-Show this dialog at startup
-True
-False
-True
-0
-True
-  
-  
-False
-True
-3
-  
-
+  
+True
+False
+Settings
+image7
+none
+True
+menu1
+False
   
   
 False
@@ -389,69 +363,81 @@
   
 
 
-  
+  
+_Extensions
 True
-False
-end
-3
-
-  
-Move
-True
-True
-True
-Move Templates
-image3
-none
-True
-  
-  
-False
-True
-0
-  
-
-
-  
-Export
-True
-True
-True
-Export Templates
-image1
-none
-True
-  
-  
-

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

2020-10-20 Thread Caolán McNamara (via logerrit) 
 sfx2/source/dialog/backingwindow.cxx |6 --
 sfx2/uiconfig/ui/startcenter.ui  |   13 +
 vcl/workben/vcldemo.cxx  |2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 9e0646eaffe7954d60ebf36c86895acff63096d7
Author: Caolán McNamara 
AuthorDate: Tue Oct 20 10:03:05 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 20 20:20:48 2020 +0200

remove motif from startcenter

the icon doesn't exist in the normal case since

commit 60413c9800c27f53c1108015b50754b065bc98c6
Date:   Wed Apr 18 12:22:07 2018 +0200

Replace Galaxy icon theme by Colibre

through a theoretical route via installing a gallery
icon extension still exists.

Use a different existing icon for the vcldemo

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

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 48bb6c1cf416..a1a48e253e70 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -258,12 +258,6 @@ void BackingWindow::initControls()
 aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
 mpCreateLabel->SetControlFont(aFont);
 
-// motif image under the buttons
-Wallpaper aWallpaper(get("motif")->GetImage().GetBitmapEx());
-aWallpaper.SetStyle(WallpaperStyle::BottomRight);
-
-mpButtonsBox->SetBackground(aWallpaper);
-
 Resize();
 
 // compute the menubar height
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 9bfdac820e73..05f802c06a75 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -373,17 +373,6 @@
 12
   
 
-
-  
-False
-sfx2/res/startcenter-logo.png
-  
-  
-False
-True
-13
-  
-
 
   
 False
@@ -394,7 +383,7 @@
   
 False
 True
-14
+13
   
 
   
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 40fd93f0696b..a089301db7cf 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1930,7 +1930,7 @@ public:
 {
 SetText("VCL widget demo");
 
-Wallpaper aWallpaper(BitmapEx("sfx2/res/startcenter-logo.png"));
+Wallpaper aWallpaper(BitmapEx("sfx2/res/128x128_writer_doc-p.png"));
 aWallpaper.SetStyle(WallpaperStyle::BottomRight);
 aWallpaper.SetColor(COL_RED);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-26 Thread Libreoffice Gerrit user 
 sfx2/source/dialog/versdlg.cxx   |  204 +--
 sfx2/source/inc/versdlg.hxx  |   36 +-
 sfx2/uiconfig/ui/versionscmis.ui |  168 +---
 3 files changed, 153 insertions(+), 255 deletions(-)

New commits:
commit b1baf73dc671069bedec18d170f8199b0766ea60
Author: Caolán McNamara 
AuthorDate: Sun Nov 25 20:18:11 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 26 11:31:37 2018 +0100

weld SfxCmisVersionsDialog

Change-Id: I73fc8ba88021f3d1450d10a75970e1fd58f26c3f
Reviewed-on: https://gerrit.libreoffice.org/64002
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 7ceb3b7be93f..13724cf6a54c 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -111,105 +111,42 @@ SfxVersionInfo::SfxVersionInfo()
 {
 }
 
-void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent& rKeyEvent)
+namespace
 {
-const vcl::KeyCode& rCode = rKeyEvent.GetKeyCode();
-switch (rCode.GetCode())
+void setColSizes(weld::TreeView& rVersionBox)
 {
-case KEY_RETURN :
-case KEY_ESCAPE :
-case KEY_TAB :
-{
-Dialog *pParent = GetParentDialog();
-if (pParent)
-pParent->KeyInput(rKeyEvent);
-else
-SvSimpleTable::KeyInput(rKeyEvent);
-break;
-}
-default:
-SvSimpleTable::KeyInput( rKeyEvent );
-break;
-}
-}
-
-void SfxVersionsTabListBox_Impl::setColSizes()
-{
-HeaderBar  = GetTheHeaderBar();
-if (rBar.GetItemCount() < 3)
-return;
-
-// recalculate the datetime column width
-long 
nWidestTime(GetTextWidth(getWidestTime(Application::GetSettings().GetLocaleDataWrapper(;
-long nW1 = rBar.GetTextWidth(rBar.GetItemText(1));
+// recalculate the datetime column width
+int 
nWidestTime(rVersionBox.get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
+int nW1 = 
rVersionBox.get_pixel_size(rVersionBox.get_column_title(1)).Width();
 
-long nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const long nRest = GetSizePixel().Width() - nMax;
+int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little 
offset
+const int nRest = rVersionBox.get_preferred_size().Width() - nMax;
 
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
-{
-
aAuthors.insert(static_cast(pEntry->GetUserData())->aAuthor);
-}
+std::set aAuthors;
+SfxVersionInfo aInfo;
+aAuthors.insert(SvtUserOptions().GetFullName());
 
-long nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth, GetTextWidth(author));
-if (nMaxAuthorWidth > nRest/2)
+for (int i = 0; i < rVersionBox.n_children(); ++i)
 {
-nMaxAuthorWidth = nRest/2;
-break;
+
aAuthors.insert(reinterpret_cast(rVersionBox.get_id(i).toInt64())->aAuthor);
 }
-}
 
-long aTabPositions[] = { 0, nMax, nMax + nMaxAuthorWidth };
-SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions, 
MapUnit::MapPixel);
-}
-
-void SfxVersionsTabListBox_Impl::Resize()
-{
-SvSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
-}
-
-void SfxVersionDialog::setColSizes()
-{
-// recalculate the datetime column width
-int 
nWidestTime(m_xVersionBox->get_pixel_size(getWidestTime(Application::GetSettings().GetLocaleDataWrapper())).Width());
-int nW1 = 
m_xVersionBox->get_pixel_size(m_xVersionBox->get_column_title(1)).Width();
-
-int nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset
-const int nRest = m_xVersionBox->get_preferred_size().Width() - nMax;
-
-std::set aAuthors;
-SfxVersionInfo aInfo;
-aAuthors.insert(SvtUserOptions().GetFullName());
-
-for (int i = 0; i < m_xVersionBox->n_children(); ++i)
-{
-
aAuthors.insert(reinterpret_cast(m_xVersionBox->get_id(i).toInt64())->aAuthor);
-}
-
-int nMaxAuthorWidth = nRest/4;
-for (auto const& author : aAuthors)
-{
-nMaxAuthorWidth = std::max(nMaxAuthorWidth, 
m_xVersionBox->get_pixel_size(author).Width());
-if (nMaxAuthorWidth > nRest/2)
+int nMaxAuthorWidth = nRest/4;
+for (auto const& author : aAuthors)
 {
-nMaxAuthorWidth = nRest/2;
-break;
+nMaxAuthorWidth = std::max(nMaxAuthorWidth, 
rVersionBox.get_pixel_size(author).Width());
+if (nMaxAuthorWidth > nRest/2)
+{
+nMaxAuthorWidth = nRest/2;
+break;
+}

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

2018-04-13 Thread Caolán McNamara 
 sfx2/source/appl/newhelp.cxx   |   44 ++---
 sfx2/source/appl/newhelp.hxx   |   12 +-
 sfx2/uiconfig/ui/bookmarkdialog.ui |   34 +---
 3 files changed, 44 insertions(+), 46 deletions(-)

New commits:
commit 167dea2eacd6cabfc65c6c756a14a62b58b7f206
Author: Caolán McNamara 
Date:   Fri Apr 13 12:04:10 2018 +0100

weld SfxAddHelpBookmarkDialog

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

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 47f5a4c09c77..b5dd4b791d97 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1185,15 +1185,15 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 sal_Int32 nPos = GetSelectedEntryPos();
 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
 {
-ScopedVclPtrInstance< SfxAddHelpBookmarkDialog_Impl > 
aDlg(this, true);
-aDlg->SetTitle( GetEntry( nPos ) );
-if ( aDlg->Execute() == RET_OK )
+SfxAddHelpBookmarkDialog_Impl aDlg(GetFrameWeld(), true);
+aDlg.SetTitle(GetEntry(nPos));
+if (aDlg.run() == RET_OK)
 {
 OUString* pURL = static_cast(GetEntryData( nPos 
));
 RemoveEntry( nPos );
 OUString aImageURL = IMAGE_URL;
 aImageURL += INetURLObject( *pURL ).GetHost();
-nPos = InsertEntry( aDlg->GetTitle(), 
SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
+nPos = InsertEntry( aDlg.GetTitle(), 
SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) );
 SetEntryData( nPos, new OUString( *pURL ) );
 SelectEntryPos( nPos );
 delete pURL;
@@ -3099,12 +3099,12 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId 
)
 OUString aValue;
 if ( aAny >>= aValue )
 {
-OUString aTitle( aValue );
-ScopedVclPtrInstance< 
SfxAddHelpBookmarkDialog_Impl > aDlg(this, false);
-aDlg->SetTitle( aTitle );
-if ( aDlg->Execute() == RET_OK )
+OUString aTitle(aValue);
+SfxAddHelpBookmarkDialog_Impl aDlg(GetFrameWeld(), 
false);
+aDlg.SetTitle(aTitle);
+if (aDlg.run() == RET_OK )
 {
-aTitle = aDlg->GetTitle();
+aTitle = aDlg.GetTitle();
 pIndexWin->AddBookmarks( aTitle, aURL );
 }
 }
@@ -3167,29 +3167,19 @@ bool SfxHelpWindow_Impl::HasHistorySuccessor() const
 
 // class SfxAddHelpBookmarkDialog_Impl ---
 
-SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* 
pParent, bool bRename)
-: ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui")
+SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(weld::Window* 
pParent, bool bRename)
+: GenericDialogController(pParent, "sfx/ui/bookmarkdialog.ui", 
"BookmarkDialog")
+, m_xTitleED(m_xBuilder->weld_entry("entry"))
+, m_xAltTitle(m_xBuilder->weld_label("alttitle"))
 {
-get(m_pTitleED, "entry");
 if (bRename)
-SetText(get("alttitle")->GetText());
+m_xDialog->set_title(m_xAltTitle->get_label());
 }
 
-SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
+void SfxAddHelpBookmarkDialog_Impl::SetTitle(const OUString& rTitle)
 {
-disposeOnce();
-}
-
-void SfxAddHelpBookmarkDialog_Impl::dispose()
-{
-m_pTitleED.clear();
-ModalDialog::dispose();
-}
-
-void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle )
-{
-m_pTitleED->SetText( rTitle );
-m_pTitleED->SetSelection( Selection( 0, rTitle.getLength() ) );
+m_xTitleED->set_text(rTitle);
+m_xTitleED->select_region(0, -1);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index b5388a3af315..4c6d4818910a 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -563,17 +564,16 @@ public:
   bool bAddToHistory = 
true);
 };
 
-class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
+class SfxAddHelpBookmarkDialog_Impl : public

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

2018-03-03 Thread Caolán McNamara 
 sfx2/source/appl/appserv.cxx|   44 +---
 sfx2/uiconfig/ui/safemodequerydialog.ui |   43 ++-
 2 files changed, 38 insertions(+), 49 deletions(-)

New commits:
commit 66bed5a89d3418c5f634f0dc3213ca600a3abd60
Author: Caolán McNamara 
Date:   Sat Mar 3 17:13:53 2018 +

weld SafeMode dialog

and rework as an explicit MessageDialog

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

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 4b5c0080dc28..bc04d9b178a6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -334,28 +334,32 @@ namespace
 }
 };
 
-class SafeModeQueryDialog : public ModalDialog
+class SafeModeQueryDialog
 {
 private:
-DECL_LINK(RestartHdl, Button*, void);
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xDialog;
 public:
-explicit SafeModeQueryDialog();
-};
-
-SafeModeQueryDialog::SafeModeQueryDialog()
-: ModalDialog(nullptr, "SafeModeQueryDialog", 
"sfx/ui/safemodequerydialog.ui")
-{
-get("restart")->SetClickHdl(LINK(this, 
SafeModeQueryDialog, RestartHdl));
-}
+SafeModeQueryDialog(weld::Window* pParent)
+: m_xBuilder(Application::CreateBuilder(pParent, 
"sfx/ui/safemodequerydialog.ui"))
+, m_xDialog(m_xBuilder->weld_message_dialog("SafeModeQueryDialog"))
+{
+
m_xDialog->set_primary_text(Translate::GetReadStringHook()(m_xDialog->get_primary_text()));
+}
 
-IMPL_LINK_NOARG(SafeModeQueryDialog, RestartHdl, Button*, void)
-{
-EndDialog(RET_OK);
-sfx2::SafeMode::putFlag();
-uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-css::task::OfficeRestartManager::get(xContext)->requestRestart(
-css::uno::Reference< css::task::XInteractionHandler >());
-}
+short run()
+{
+short nRet = m_xDialog->run();
+if (nRet == RET_OK)
+{
+sfx2::SafeMode::putFlag();
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+css::task::OfficeRestartManager::get(xContext)->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
+}
+return nRet;
+}
+};
 }
 
 void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
@@ -1026,8 +1030,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 }
 case SID_SAFE_MODE:
 {
-ScopedVclPtrInstance< SafeModeQueryDialog > aDialog;
-aDialog->Execute();
+SafeModeQueryDialog aDialog(GetRequestFrameWeld(rReq));
+aDialog.run();
 break;
 }
 
diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui 
b/sfx2/uiconfig/ui/safemodequerydialog.ui
index 4a01791f52b2..b9409d0a5d5a 100644
--- a/sfx2/uiconfig/ui/safemodequerydialog.ui
+++ b/sfx2/uiconfig/ui/safemodequerydialog.ui
@@ -1,22 +1,22 @@
 
-
+
 
   
-  
+  
 False
-6
 Enter Safe Mode
-False
 dialog
+question
+Are you sure you want to restart 
%PRODUCTNAME and enter safe mode?
 
-  
+  
 False
 vertical
-12
+2
 
-  
+  
 False
-end
+True
 
   
 gtk-cancel
@@ -35,7 +35,7 @@
   
 
 
-  
+  
 _Restart
 True
 True
@@ -51,33 +51,18 @@
   
   
 False
-True
-end
+False
 0
   
 
-
-  
-True
-False
-Are you sure you want to restart 
%PRODUCTNAME and enter safe mode?
-True
-80
-2
-0
-0
-  
-  
-False
-True
-1
-  
-
   
 
 
   cancel
-  restart
+  ok
 
+
+  
+
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-20 Thread tagezi 
 sfx2/source/appl/sfxhelp.cxx   |9 -
 sfx2/uiconfig/ui/helpmanual.ui |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 400b70f85fdf0ae5a6d606eb3fff683b9f1ce7ab
Author: tagezi 
Date:   Tue Dec 5 16:01:32 2017 +0200

tdf#114204 - Clarify the "Local Help not installed" message

Change-Id: If25e5f8a1eb2e247e2432bb8a14b7a4aa2509f62
Reviewed-on: https://gerrit.libreoffice.org/45880
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4d5a2b240a01..bce03be37adb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -650,7 +651,13 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
 if ( !impl_hasHelpInstalled() )
 {
-ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),
+"onlinehelpmanual", "sfx/ui/helpmanual.ui");
+
+LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
+OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
+OUString sPrimTex = aQueryBox->get_primary_text();
+aQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE", 
sLocaleString));
 short OnlineHelpBox = aQueryBox->Execute();
 
 if(OnlineHelpBox == RET_OK)
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index f3847c880a92..e750ed0c7a96 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -9,7 +9,7 @@
 False
 dialog
 True
-The %PRODUCTNAME built-in help is not 
installed on your computer.
+The %PRODUCTNAME built-in help for 
current UI language ($UILOCALE) is not installed on your computer.
 You may either install it from our 
website or your system’s repositories, or read an online version.
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

2017-01-11 Thread pv2k 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/sfxhelp.cxx   |   23 +++---
 sfx2/uiconfig/ui/helpmanual.ui |   65 +
 3 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit 6a41cef3f9972a88de378a1117697199dbf1d436
Author: pv2k 
Date:   Mon Nov 28 21:48:43 2016 +0530

tdf#103391: ask user whether to open online help

opens a dialog box from which user can choose to take online help or cancel 
it

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

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 3d182da..e057deb 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/helpcontrol \
sfx2/uiconfig/ui/helpcontentpage \
sfx2/uiconfig/ui/helpindexpage \
+   sfx2/uiconfig/ui/helpmanual \
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6586e79..80117d0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -611,12 +611,25 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
 if ( !impl_hasHelpInstalled() )
 {
-if ( impl_showOnlineHelp( aHelpURL ) )
-return true;
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+short OnlineHelpBox = aQueryBox->Execute();
+
+if(OnlineHelpBox == RET_OK)
+{
+if ( impl_showOnlineHelp( aHelpURL ) )
+return true;
+else
+{
+ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast< 
vcl::Window* >( pWindow ));
+aErrBox->Execute();
+return false;
+}
+}
+else
+{
+return false;
+}
 
-ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast< 
vcl::Window* >( pWindow ));
-aErrBox->Execute();
-return false;
 }
 
 Reference < XDesktop2 > xDesktop = Desktop::create( 
::comphelper::getProcessComponentContext() );
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
new file mode 100644
index 000..ac6ab51
--- /dev/null
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -0,0 +1,65 @@
+
+
+
+  
+  
+False
+False
+dialog
+True
+question
+ %PRODUCTNAME  built-in help is 
not installed
+
+  
+False
+vertical
+2
+
+  
+False
+True
+end
+
+  
+Read Help 
Online
+True
+True
+False
+True
+  
+  
+True
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+True
+True
+  
+  
+True
+True
+1
+  
+
+  
+  
+False
+False
+0
+  
+
+  
+
+
+  website
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

2016-11-18 Thread Miklos Vajna 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/view/viewfrm.cxx   |   63 +---
 sfx2/uiconfig/ui/editdocumentdialog.ui |   73 +
 3 files changed, 130 insertions(+), 7 deletions(-)

New commits:
commit d4460b70006d7987fa7646739334d67a2d6ae3b6
Author: Miklos Vajna 
Date:   Fri Nov 18 11:28:45 2016 +0100

sfx2: let .uno:SignPDF result in a warning before editing the doc

Editing such a document is most probably not what you want, help the
user to avoid the trouble.

Change-Id: I87d52d89e12658675b580b7dc21fb38fe41dd777
Reviewed-on: https://gerrit.libreoffice.org/30955
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 554bf63..3d182da 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentfontspage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
+   sfx2/uiconfig/ui/editdocumentdialog \
sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/emojicontrol \
sfx2/uiconfig/ui/errorfindemaildialog \
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 660e0d5..3586a9a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -154,6 +154,55 @@ void SfxViewFrame::InitInterface_Impl()
 #endif
 }
 
+/// Asks the user if editing a read-only document is really wanted.
+class SfxEditDocumentDialog : public MessageDialog
+{
+private:
+VclPtr m_pEditDocument;
+VclPtr m_pCancel;
+
+public:
+SfxEditDocumentDialog(vcl::Window* pParent);
+~SfxEditDocumentDialog() override;
+void dispose() override;
+};
+
+SfxEditDocumentDialog::SfxEditDocumentDialog(vcl::Window* pParent)
+: MessageDialog(pParent, "EditDocumentDialog", 
"sfx/ui/editdocumentdialog.ui")
+{
+get(m_pEditDocument, "edit");
+get(m_pCancel, "cancel");
+}
+
+SfxEditDocumentDialog::~SfxEditDocumentDialog()
+{
+disposeOnce();
+}
+
+void SfxEditDocumentDialog::dispose()
+{
+m_pEditDocument.clear();
+m_pCancel.clear();
+MessageDialog::dispose();
+}
+
+/// Is this read-only object shell opened via .uno:SignPDF?
+static bool IsSignPDF(SfxObjectShellRef xObjSh)
+{
+if (!xObjSh.Is())
+return false;
+
+SfxMedium* pMedium = xObjSh->GetMedium();
+if (pMedium && !pMedium->IsOriginallyReadOnly())
+{
+std::shared_ptr pFilter = pMedium->GetFilter();
+if (pFilter && pFilter->GetName() == "draw_pdf_import")
+return true;
+}
+
+return false;
+}
+
 static bool AskPasswordToModify_Impl( const uno::Reference< 
task::XInteractionHandler >& xHandler, const OUString& aPath, const 
std::shared_ptr& pFilter, sal_uInt32 nPasswordHash, const 
uno::Sequence< beans::PropertyValue >& aInfo )
 {
 // TODO/LATER: In future the info should replace the direct hash completely
@@ -1149,13 +1198,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 }
 else
 {
-bool bSignPDF = false;
-SfxMedium* pMedium = m_xObjSh->GetMedium();
-if (pMedium && !pMedium->IsOriginallyReadOnly())
-{
-std::shared_ptr pFilter = 
pMedium->GetFilter();
-bSignPDF = pFilter && pFilter->GetName() == 
"draw_pdf_import";
-}
+bool bSignPDF = IsSignPDF(m_xObjSh);
 
 SfxInfoBarWindow* pInfoBar = AppendInfoBar("readonly", 
SfxResId(bSignPDF ? STR_READONLY_PDF : STR_READONLY_DOCUMENT));
 if (pInfoBar)
@@ -1267,6 +1310,12 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 
 IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler, Button*, void)
 {
+if (m_xObjSh.Is() && IsSignPDF(m_xObjSh))
+{
+ScopedVclPtrInstance pDialog(nullptr);
+if (pDialog->Execute() != RET_OK)
+return;
+}
 GetDispatcher()->Execute(SID_EDITDOC);
 }
 
diff --git a/sfx2/uiconfig/ui/editdocumentdialog.ui 
b/sfx2/uiconfig/ui/editdocumentdialog.ui
new file mode 100644
index 000..bfaccd9
--- /dev/null
+++ b/sfx2/uiconfig/ui/editdocumentdialog.ui
@@ -0,0 +1,73 @@
+
+
+
+  
+  
+False
+6
+Confirm editing of 
document
+False
+True
+dialog
+True
+question
+Are you sure you want to edit the 
document?
+The original file can 
be signed without editing the document. Existing signatures on the document 
will be lost in case of saving an edited version.
+
+  
+False
+vertical
+12
+
+  
+False
+end
+
+  
+Edit

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

2016-09-09 Thread Maxim Monastirsky 
 sfx2/source/dialog/recfloat.cxx|  138 -
 sfx2/source/inc/recfloat.hxx   |5 -
 sfx2/uiconfig/ui/floatingrecord.ui |3 
 3 files changed, 1 insertion(+), 145 deletions(-)

New commits:
commit ccb986bae00ece4c1402ea89e66c9e46a331c8b1
Author: Maxim Monastirsky 
Date:   Fri Sep 9 10:00:34 2016 +0300

Simplify SfxRecordingFloat_Impl by using SidebarToolBox

Change-Id: I3d2348d8e3db91b0ae4e757efa14a0168604a2b0

diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 780fb40..aebfd9c 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -18,15 +18,9 @@
  */
 
 #include 
-#include 
-#include 
-#include 
-#include 
 
 #include 
-#include 
 #include 
-#include 
 
 #include "recfloat.hxx"
 #include "dialog.hrc"
@@ -38,90 +32,6 @@
 #include 
 #include 
 
-using namespace ::com::sun::star;
-
-static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const 
uno::Reference< frame::XFrame >& xFrame )
-{
-OUString aLabel;
-OUString aModuleIdentifier;
-uno::Reference< container::XNameAccess > xUICommandLabels;
-uno::Reference< uno::XComponentContext > xContext;
-uno::Reference< container::XNameAccess > xUICommandDescription;
-uno::Reference< css::frame::XModuleManager2 > xModuleManager;
-
-static uno::WeakReference< uno::XComponentContext > xTmpContext;
-static uno::WeakReference< container::XNameAccess > xTmpNameAccess;
-static uno::WeakReference< css::frame::XModuleManager2 > xTmpModuleMgr;
-
-xContext = xTmpContext;
-if ( !xContext.is() )
-{
-xContext = ::comphelper::getProcessComponentContext();
-xTmpContext = xContext;
-}
-
-xUICommandDescription = xTmpNameAccess;
-if ( !xUICommandDescription.is() )
-{
-xUICommandDescription = frame::theUICommandDescription::get(xContext);
-xTmpNameAccess = xUICommandDescription;
-}
-
-xModuleManager = xTmpModuleMgr;
-if ( !xModuleManager.is() )
-{
-xModuleManager = frame::ModuleManager::create(xContext);
-xTmpModuleMgr = xModuleManager;
-}
-
-// Retrieve label from UI command description service
-try
-{
-try
-{
-aModuleIdentifier = xModuleManager->identify( xFrame );
-}
-catch( uno::Exception& )
-{
-}
-
-uno::Any a = xUICommandDescription->getByName( aModuleIdentifier );
-uno::Reference< container::XNameAccess > xUICommands;
-a >>= xUICommandLabels;
-}
-catch ( uno::Exception& )
-{
-}
-
-if ( xUICommandLabels.is() )
-{
-try
-{
-if ( !rCommandURL.isEmpty() )
-{
-uno::Sequence< beans::PropertyValue > aPropSeq;
-uno::Any a( xUICommandLabels->getByName( rCommandURL ));
-if ( a >>= aPropSeq )
-{
-for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-{
-if ( aPropSeq[i].Name == "Label" )
-{
-aPropSeq[i].Value >>= aLabel;
-break;
-}
-}
-}
-}
-}
-catch (uno::Exception& )
-{
-}
-}
-
-return aLabel;
-}
-
 SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, 
SID_RECORDING_FLOATWINDOW );
 
 SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* 
pParentWnd ,
@@ -169,29 +79,6 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
  pParent,
  "FloatingRecord", "sfx/ui/floatingrecord.ui", 
pBind->GetActiveFrame() )
 {
-get(m_pTbx, "toolbar");
-
-// Retrieve label from helper function
-uno::Reference< frame::XFrame > xFrame = getFrame();
-OUString aCommandStr( ".uno:StopRecording" );
-sal_uInt16 nItemId = m_pTbx->GetItemId(aCommandStr);
-m_pTbx->SetItemText( nItemId, GetLabelFromCommandURL( aCommandStr, xFrame 
));
-
-// create a generic toolbox controller for our internal toolbox
-svt::GenericToolboxController* pController = new 
svt::GenericToolboxController(
-
::comphelper::getProcessComponentContext(),
-xFrame,
-m_pTbx,
-nItemId,
-aCommandStr );
-xStopRecTbxCtrl.set( static_cast< cppu::OWeakObject* >( pController ),
- uno::UNO_QUERY );
-uno::Reference< util::XUpdatable > xUpdate( xStopRecTbxCtrl, 
uno::UNO_QUERY );
-if ( xUpdate.is() )
-xUpdate->update();
-
-m_pTbx->SetSelectHdl( LINK( this, SfxRecordingFloat_Impl, Select ) );
-
 //

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

2016-06-17 Thread Akshay Deep 
 sfx2/source/dialog/backingwindow.cxx |   71 ---
 sfx2/source/dialog/backingwindow.hxx |2 
 sfx2/uiconfig/ui/startcenter.ui  |   13 +-
 3 files changed, 54 insertions(+), 32 deletions(-)

New commits:
commit 59c45c8e6d16cb145f3551f9ecd1a3c45ca5d4d8
Author: Akshay Deep 
Date:   Fri Jun 17 12:59:44 2016 +0530

tdf#90577 Start Center: Clear List item should more accessible

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

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 350dc4a..730627c 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -260,6 +261,7 @@ void BackingWindow::initControls()
 mpLocalView->Hide();
 
 mpTemplateButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+mpRecentButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 
 //set handlers
 mpLocalView->setCreateContextMenuHdl(LINK(this, BackingWindow, 
CreateContextMenuHdl));
@@ -587,43 +589,52 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, 
pButton, void )
 
 IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void )
 {
-initializeLocalView();
-
-OString sId = pButton->GetCurItemIdent();
-
-if( sId == "filter_writer" )
+if(pButton == mpRecentButton)
 {
-
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::WRITER));
-}
-else if( sId == "filter_calc" )
-{
-
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::CALC));
-}
-else if( sId == "filter_impress" )
-{
-
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::IMPRESS));
-}
-else if( sId == "filter_draw" )
-{
-
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::DRAW));
+SvtHistoryOptions().Clear(ePICKLIST);
+mpAllRecentThumbnails->Reload();
+return;
 }
-else if( sId == "manage" )
+else if(pButton == mpTemplateButton)
 {
-Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
+initializeLocalView();
 
-Sequence< css::beans::PropertyValue > aArgs(1);
-PropertyValue* pArg = aArgs.getArray();
-pArg[0].Name = "Referer";
-pArg[0].Value <<= OUString("private:user");
+OString sId = pButton->GetCurItemIdent();
 
-dispatchURL( ".uno:NewDoc", OUString(), xFrame, aArgs );
+if( sId == "filter_writer" )
+{
+
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::WRITER));
+}
+else if( sId == "filter_calc" )
+{
+
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::CALC));
+}
+else if( sId == "filter_impress" )
+{
+
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::IMPRESS));
+}
+else if( sId == "filter_draw" )
+{
+
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::DRAW));
+}
+else if( sId == "manage" )
+{
+Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
-}
+Sequence< css::beans::PropertyValue > aArgs(1);
+PropertyValue* pArg = aArgs.getArray();
+pArg[0].Name = "Referer";
+pArg[0].Value <<= OUString("private:user");
 
-mpAllRecentThumbnails->Hide();
-mpLocalView->Show();
-mpLocalView->reload();
-mpLocalView->GrabFocus();
+dispatchURL( ".uno:NewDoc", OUString(), xFrame, aArgs );
+
+}
+
+mpAllRecentThumbnails->Hide();
+mpLocalView->Show();
+mpLocalView->reload();
+mpLocalView->GrabFocus();
+}
 }
 
 IMPL_LINK_TYPED(BackingWindow, CreateContextMenuHdl, ThumbnailViewItem*, 
pItem, void)
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 199302f..cfaf984 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -59,7 +59,7 @@ class BackingWindow : public vcl::Window, public 
VclBuilderContainer
 css::uno::Reference 
mxDropTargetListener;
 
 VclPtr mpOpenButton;
-VclPtr mpRecentButton;
+VclPtr mpRecentButton;
 VclPtr mpRemoteButton;
 VclPtr mpTemplateButton;
 
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 2591be7..68ab548 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -18,6 +18,17 @@
 False
 res/odg_32_8.png
   
+  
+True
+False
+
+  
+True
+False
+Clear Recent 
Documents
+  
+
+

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

2016-05-26 Thread Akshay Deep 
 sfx2/source/dialog/backingwindow.cxx |2 +-
 sfx2/uiconfig/ui/startcenter.ui  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9b8da7a53b7bd3b43076a7d9bc3ce735bbe7f80f
Author: Akshay Deep 
Date:   Thu May 26 15:31:52 2016 +0530

Start Center: Rename "Edit Templates" to "Manage Templates"

Change-Id: I184c0508dba673153153a83cf033c9fb057a3435
Reviewed-on: https://gerrit.libreoffice.org/25507
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 61f280c..06955c2 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -609,7 +609,7 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, 
pButton, void )
 {
 
mpLocalView->filterItems(ViewFilter_Application(FILTER_APPLICATION::DRAW));
 }
-else if( sId == "edit" )
+else if( sId == "manage" )
 {
 Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 5b78deb..2591be7 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -56,10 +56,10 @@
   
 
 
-  
+  
 True
 False
-Edit Templates
+Manage Templates
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-25 Thread Akshay Deep 
 sfx2/source/doc/saveastemplatedlg.cxx   |1 
 sfx2/source/doc/templatedlg.cxx |3 
 sfx2/uiconfig/ui/saveastemplatedlg.ui   |  112 ++--
 sfx2/uiconfig/ui/templatecategorydlg.ui |  112 ++--
 4 files changed, 160 insertions(+), 68 deletions(-)

New commits:
commit 75cec5cd54a731039b63d564be378a1202fb9e8b
Author: Akshay Deep 
Date:   Mon May 23 19:01:02 2016 +0530

Template Manager: ListView in Save As and Category Selector Dialog

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

diff --git a/sfx2/source/doc/saveastemplatedlg.cxx 
b/sfx2/source/doc/saveastemplatedlg.cxx
index d219a7f..1d46197 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -122,7 +122,6 @@ void SfxSaveAsTemplateDialog::initialize()
 
 void SfxSaveAsTemplateDialog::SetCategoryLBEntries(std::vector 
aFolderNames)
 {
-mpLBCategory->InsertEntry(OUString("None"), 0);
 if (!aFolderNames.empty())
 {
 for (size_t i = 0, n = aFolderNames.size(); i < n; ++i)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index fe9c922..ee43d48 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1601,10 +1601,12 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, 
SelectCategoryHdl, ListBox&, vo
 {
 msSelectedCategory = OUString();
 mpOKButton->Disable();
+mpNewCategoryEdit->Enable();
 }
 else
 {
 msSelectedCategory = mpLBCategory->GetSelectEntry();
+mpNewCategoryEdit->Disable();
 mpOKButton->Enable();
 }
 
@@ -1613,7 +1615,6 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateCategoryDialog, 
SelectCategoryHdl, ListBox&, vo
 
 void SfxTemplateCategoryDialog::SetCategoryLBEntries(std::vector 
aFolderNames)
 {
-mpLBCategory->InsertEntry(OUString("None"), 0);
 if (!aFolderNames.empty())
 {
 for (size_t i = 0, n = aFolderNames.size(); i < n; ++i)
diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui 
b/sfx2/uiconfig/ui/saveastemplatedlg.ui
index 49e6832..da673a3 100644
--- a/sfx2/uiconfig/ui/saveastemplatedlg.ui
+++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui
@@ -3,6 +3,17 @@
 
   
   
+  
+
+  
+  
+
+
+  
+None
+  
+
+  
   
 False
 6
@@ -79,14 +90,39 @@
 12
 12
 
-  
+  
 True
 False
-0
-Enter Template 
Name
-
-  
-
+vertical
+6
+
+  
+True
+False
+0
+Enter Template 
Name
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+300
+  
+  
+False
+True
+1
+  
+
   
   
 0
@@ -94,41 +130,51 @@
   
 
 
-  
-True
-True
-  
-  
-1
-0
-  
-
-
-  
+  
 True
 False
-0
-Select Template 
Category
-
-  
-
+vertical
+6
+
+  
+True
+False
+0
+Select Template 
Category
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+150
+300
+True
+False
+2
+categorylist
+
+  
+
+  
+  
+False
+True
+1
+  
+
   
   
 0
 1
   
 
-
-  
-250
-True
-

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

2016-01-05 Thread Arul 
 sfx2/source/dialog/dinfdlg.cxx   |8 
 sfx2/uiconfig/ui/documentpropertiesdialog.ui |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 804e2403cd077a069372ead548fa6a5c593db1f6
Author: Arul 
Date:   Tue Jan 5 15:41:26 2016 +0530

tdf#91065 Support localization of Properties dialog title

Having a place holder for substituting the file name instead of 
concatenating it in
Properties dialogue title.

Change-Id: I8b3bafbc95c857fa5957bfdafbded5dde94e0e64
Reviewed-on: https://gerrit.libreoffice.org/21107
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0cb152f..75e03a5 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1208,18 +1208,18 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( 
vcl::Window* pParent,
 {
 OUString aLastName( aURL.GetLastName() );
 if ( !aLastName.isEmpty() )
-aTitle += aLastName;
+aTitle = aTitle.replaceFirst("%1", aLastName);
 else
-aTitle += aFile;
+aTitle = aTitle.replaceFirst("%1", aFile);
 }
 else
-aTitle += SfxResId( STR_NONAME ).toString();
+aTitle = aTitle.replaceFirst("%1", SfxResId( STR_NONAME 
).toString());
 }
 else
 {
 DBG_ASSERT( dynamic_cast(pItem) != nullptr,
 "SfxDocumentInfoDialog: expected" );
-aTitle += static_cast(pItem)->GetValue();
+aTitle = aTitle.replaceFirst("%1", static_cast(pItem)->GetValue());
 }
 SetText( aTitle );
 
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui 
b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index 88cf755..54890cc 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -5,7 +5,7 @@
   
 False
 6
-Properties of 
+Properties of %1
 False
 dialog
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-14 Thread Caolán McNamara 
 sfx2/source/dialog/backingwindow.cxx |2 ++
 sfx2/uiconfig/ui/startcenter.ui  |   18 --
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit f2efbca82d70451b0e8582bb699f33d709152e24
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jan 14 09:55:15 2015 +

Resolves: fdo#87353 Start Center 'Help' button not functioning any more

Change-Id: I81607ea1951c4a71c003e639b3ebe871a6943374

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index c7dcd7e..ce33bae 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -115,6 +115,8 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 get(mpMathAllButton, math_all);
 
 get(mpHelpButton, help);
+//set an alternative help label that doesn't hotkey the H of the Help menu
+mpHelpButton-SetText(getWindow(althelplabel)-GetText());
 get(mpExtensionsButton, extensions);
 
 //Containers are invisible to cursor traversal
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 3cb7425..7977c33 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,8 +1,8 @@
 ?xml version=1.0 encoding=UTF-8?
 !-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires LibreOffice 1.0 --
   requires lib=gtk+ version=3.0/
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkImage id=calc_all_image
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -332,6 +332,19 @@
 property name=position11/property
   /packing
 /child
+child
+  object class=GtkLabel id=althelplabel
+property name=can_focusFalse/property
+property name=no_show_allTrue/property
+property name=label translatable=yesHe_lp/property
+property name=use_underlineTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position12/property
+  /packing
+/child
   /object
   packing
 property name=expandFalse/property
@@ -365,13 +378,14 @@
 property name=orientationvertical/property
 child
   object class=GtkButton id=help
-property name=label 
translatable=yesHe_lp/property
+property name=labelgtk-help/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=has_tooltipTrue/property
 property name=reliefnone/property
 property name=use_underlineTrue/property
+property name=use_stockTrue/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: sfx2/source sfx2/uiconfig

2014-10-09 Thread Caolán McNamara 
 sfx2/source/dialog/backingwindow.cxx |7 +
 sfx2/source/dialog/backingwindow.hxx |1 
 sfx2/uiconfig/ui/startcenter.ui  |  139 ---
 3 files changed, 90 insertions(+), 57 deletions(-)

New commits:
commit fe421533614cce6819c72c16f19b8de19e0d99da
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 9 17:07:43 2014 +0100

Resolves: fdo#83003 provide a means to return from template view

Change-Id: Ie6d2cfb5ee28fbd9395a49fa074a252c9c6e20ec

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 0d5801d..1e87b42 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -101,6 +101,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), 
sfx/ui/startcenter.ui, StartCenter );
 
 get(mpOpenButton, open_all);
+get(mpRecentButton, open_recent);
 get(mpTemplateButton, templates_all);
 
 get(mpCreateLabel, create_label);
@@ -274,6 +275,7 @@ void BackingWindow::initControls()
 mpLocalView-setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
 
 setupButton( mpOpenButton );
+setupButton( mpRecentButton );
 setupButton( mpTemplateButton );
 setupButton( mpWriterAllButton );
 setupButton( mpDrawAllButton );
@@ -545,6 +547,11 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
 dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
 }
+else if( pButton == mpRecentButton )
+{
+mpLocalView-Hide();
+mpAllRecentThumbnails-Show();
+}
 else if( pButton == mpTemplateButton )
 {
 mpAllRecentThumbnails-Hide();
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 72c8a67..cc1e9e5 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -62,6 +62,7 @@ class BackingWindow
 com::sun::star::uno::Reference 
com::sun::star::datatransfer::dnd::XDropTargetListener  mxDropTargetListener;
 
 PushButton* mpOpenButton;
+PushButton* mpRecentButton;
 MenuButton* mpTemplateButton;
 
 FixedText*  mpCreateLabel;
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index e23d8f8..18660ce 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.0 on Fri Aug  8 17:26:41 2014 --
+!-- 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=GtkImage id=calc_all_image
 property name=visibleTrue/property
@@ -18,6 +18,51 @@
 property name=can_focusFalse/property
 property name=pixbufres/odg_32_8.png/property
   /object
+  object class=GtkMenu id=filtermenu
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkMenuItem id=filter_writer
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesWriter Templates/property
+  /object
+/child
+child
+  object class=GtkMenuItem id=filter_calc
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesCalc Templates/property
+  /object
+/child
+child
+  object class=GtkMenuItem id=filter_impress
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesImpress Templates/property
+  /object
+/child
+child
+  object class=GtkMenuItem id=filter_draw
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesDraw Templates/property
+  /object
+/child
+child
+  object class=GtkSeparatorMenuItem id=menuitem3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+  /object
+/child
+child
+  object class=GtkMenuItem id=edit
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesEdit Templates/property
+  /object
+/child
+  /object
   object class=GtkImage id=impress_all_image
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -33,6 +78,11 @@
 property name=can_focusFalse/property
 property name=pixbufframework/res/folder_32.png/property
   /object
+  object class=GtkImage id=open_all_image1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufframework/res/folder_32.png/property
+  /object
   object class=GtkImage

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

2014-02-17 Thread Caolán McNamara 
 sfx2/source/dialog/mgetempl.cxx |5 +
 sfx2/uiconfig/ui/managestylepage.ui |   10 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit a95888e6e62a702f4b9af4a68c44339b51dc283e
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 17 12:44:14 2014 +

Resolves: fdo#72233 too long style names over-stretch dialog

Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index b087613..b340f34 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* 
pParent, const SfxItemS
 {
 get(m_pNameRo, namero);
 get(m_pNameRw, namerw);
+m_pNameRo-set_width_request(m_pNameRw-get_preferred_size().Width());
 get(m_pAutoCB, autoupdate);
 get(m_pFollowFt, nextstyleft);
 get(m_pFollowLb, nextstyle);
 m_pFollowLb-SetStyle(m_pFollowLb-GetStyle() | WB_SORT);
+const sal_Int32 nMaxWidth(62);
+m_pFollowLb-setMaxWidthChars(nMaxWidth);
 get(m_pBaseFt, linkedwithft);
 get(m_pBaseLb, linkedwith);
 m_pBaseLb-SetStyle(m_pBaseLb-GetStyle() | WB_SORT);
+m_pBaseLb-setMaxWidthChars(nMaxWidth);
 get(m_pFilterFt, categoryft);
 get(m_pFilterLb, category);
 m_pFilterLb-SetStyle(m_pFilterLb-GetStyle() | WB_SORT);
+m_pFilterLb-setMaxWidthChars(nMaxWidth);
 get(m_pDescFt, desc);
 
 // this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui 
b/sfx2/uiconfig/ui/managestylepage.ui
index 6835793..9798530 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
 ?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/
   object class=GtkBox id=ManageStylePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -100,8 +101,6 @@
 property name=can_focusFalse/property
 property name=valigncenter/property
 property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
   /object
   packing
 property name=left_attach1/property
@@ -116,8 +115,6 @@
 property name=can_focusFalse/property
 property name=valigncenter/property
 property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
   /object
   packing
 property name=left_attach1/property
@@ -132,8 +129,6 @@
 property name=can_focusFalse/property
 property name=valigncenter/property
 property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
   /object
   packing
 property name=left_attach1/property
@@ -187,6 +182,7 @@
 property name=valigncenter/property
 property name=hexpandTrue/property
 property name=invisible_char●/property
+property name=width_chars52/property
   /object
   packing
 property name=left_attach1/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

2013-12-16 Thread Caolán McNamara 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/app.hrc   |2 
 sfx2/source/appl/newhelp.cxx   |   29 +--
 sfx2/source/appl/newhelp.hrc   |8 --
 sfx2/source/appl/newhelp.hxx   |   12 ---
 sfx2/source/appl/newhelp.src   |   52 --
 sfx2/uiconfig/ui/bookmarkdialog.ui |  136 +
 7 files changed, 148 insertions(+), 92 deletions(-)

New commits:
commit 0136616a5a005cc2237f020d46718bdb78f33c2b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 16 11:08:29 2013 +

convert help bookmark dialog to .ui

Change-Id: I7831bc63f66ab7fe30f5648efc2f733c6bd90d0e

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a693f2d..c389696 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,sfx))
 
 $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/alienwarndialog \
+   sfx2/uiconfig/ui/bookmarkdialog \
sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/descriptioninfopage \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 6a5a97c..84050c0 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -46,7 +46,7 @@
 #define TP_HELP_INDEX   (RID_SFX_APP_START+101)
 #define TP_HELP_SEARCH  (RID_SFX_APP_START+102)
 #define TP_HELP_BOOKMARKS   (RID_SFX_APP_START+103)
-#define DLG_HELP_ADDBOOKMARK(RID_SFX_APP_START+104)
+
 #define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
 #define RID_INFO_NOSEARCHRESULTS(RID_SFX_APP_START+106)
 #define RID_INFO_NOSEARCHTEXTFOUND  (RID_SFX_APP_START+107)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index bcef1d2..8bd2f5f 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -3388,35 +3388,20 @@ sal_Bool SfxHelpWindow_Impl::HasHistorySuccessor() const
 
 // class SfxAddHelpBookmarkDialog_Impl ---
 
-SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl( Window* pParent, 
sal_Bool bRename ) :
-
-ModalDialog( pParent, SfxResId( DLG_HELP_ADDBOOKMARK ) ),
-
-aTitleFT( this, SfxResId( FT_BOOKMARK_TITLE ) ),
-aTitleED( this, SfxResId( ED_BOOKMARK_TITLE ) ),
-aOKBtn  ( this, SfxResId( PB_BOOKMARK_OK ) ),
-aEscBtn ( this, SfxResId( PB_BOOKMARK_CANCEL ) ),
-aHelpBtn( this, SfxResId( PB_BOOKMARK_HELP ) )
-
-{
-if ( bRename )
-SetText( SfxResId(STR_BOOKMARK_RENAME).toString() );
-
-FreeResource();
-}
-
-// ---
-
-SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
+SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, 
sal_Bool bRename)
+: ModalDialog( pParent, BookmarkDialog, sfx/ui/bookmarkdialog.ui)
 {
+get(m_pTitleED, entry);
+if (bRename)
+SetText(getFixedText(alttitle)-GetText());
 }
 
 // ---
 
 void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString rTitle )
 {
-aTitleED.SetText( rTitle );
-aTitleED.SetSelection( Selection( 0, rTitle.getLength() ) );
+m_pTitleED-SetText( rTitle );
+m_pTitleED-SetSelection( Selection( 0, rTitle.getLength() ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index 6f85a86..bfaab51 100644
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.hrc
@@ -49,14 +49,6 @@
 // Content TabPage
 #define LB_CONTENTS 10
 
-// Add to bookmarks dialog
-#define FT_BOOKMARK_TITLE   10
-#define ED_BOOKMARK_TITLE   11
-#define PB_BOOKMARK_OK  12
-#define PB_BOOKMARK_CANCEL  13
-#define PB_BOOKMARK_HELP14
-#define STR_BOOKMARK_RENAME 15
-
 // Index Window: Id's of the tabpages
 #define HELP_INDEX_PAGE_FIRST   1
 #define HELP_INDEX_PAGE_CONTENTSHELP_INDEX_PAGE_FIRST
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e62af43..0ebbcf6 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -582,18 +582,12 @@ public:
 class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
 {
 private:
-FixedText   aTitleFT;
-EditaTitleED;
-OKButtonaOKBtn;
-CancelButtonaEscBtn;
-HelpButton  aHelpBtn;
-
+Edit* m_pTitleED;
 public:
 SfxAddHelpBookmarkDialog_Impl( Window* pParent, sal_Bool bRename = 
sal_True );
-~SfxAddHelpBookmarkDialog_Impl();
 
-voidSetTitle( const OUString rTitle );
-inline OUString GetTitle()

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

2013-12-13 Thread Jan Holesovsky 
 sfx2/source/dialog/backingwindow.cxx |6 +-
 sfx2/uiconfig/ui/startcenter.ui  |   29 +++--
 2 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit cabd8725dbd2a1602c6e687788492e5177f5a3e9
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Dec 13 17:41:04 2013 +0100

startcenter: Move the 'Create' under the separator  add a colon.

Change-Id: Ie8a1ce8628fa0f31ae6d6a3f1303342c145e33aa

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 8ee2919..f7a66fb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -59,6 +59,7 @@ const char TEMPLATE_URL[] =   slot:5500;
 const char OPEN_URL[] =   .uno:Open;
 const char SERVICENAME_CFGREADACCESS[] = 
com.sun.star.configuration.ConfigurationAccess;
 
+const int nButtonsFontSize = 15;
 const Color aButtonsBackground(114, 168, 84); // TDF green
 const Color aButtonsText(COL_WHITE);
 
@@ -234,6 +235,9 @@ void BackingWindow::initControls()
 
 // setup nice colors
 mpCreateLabel-SetControlForeground(aButtonsText);
+Font aFont(mpCreateLabel-GetControlFont());
+aFont.SetHeight(nButtonsFontSize);
+mpCreateLabel-SetControlFont(aFont);
 
 mpHelpButton-SetControlForeground(aButtonsText);
 mpExtensionsButton-SetControlForeground(aButtonsText);
@@ -261,7 +265,7 @@ void BackingWindow::setupButton( PushButton* pButton )
 {
 // the buttons should have a bit bigger font
 Font aFont(pButton-GetControlFont());
-aFont.SetHeight(15);
+aFont.SetHeight(nButtonsFontSize);
 pButton-SetControlFont(aFont);
 
 // color that fits the theme
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index dd175fb..7f60948 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,6 +2,11 @@
 interface
   !-- interface-requires gtk+ 3.0 --
   !-- interface-requires LibreOffice 1.0 --
+  object class=GtkImage id=calc_all_image
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufres/ods_32_8.png/property
+  /object
   object class=GtkBox id=StartCenter
 property name=can_focusFalse/property
 child
@@ -23,9 +28,10 @@
 property name=hexpandTrue/property
 property name=vexpandTrue/property
 property name=orientationvertical/property
+property name=spacing3/property
 child
   object class=GtkButton id=open_all
-property name=label translatable=yes_Open/property
+property name=label translatable=yes_Open 
File/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -61,13 +67,11 @@
   /packing
 /child
 child
-  object class=GtkLabel id=create_label
+  object class=GtkSeparator id=separator1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left12/property
-property name=margin_top12/property
-property name=xalign0/property
-property name=label translatable=yesCreate/property
+property name=margin_left6/property
+property name=margin_right6/property
   /object
   packing
 property name=expandFalse/property
@@ -76,11 +80,13 @@
   /packing
 /child
 child
-  object class=GtkSeparator id=separator1
+  object class=GtkLabel id=create_label
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_right6/property
+property name=margin_left12/property
+property name=margin_bottom6/property
+property name=xalign0/property
+property name=label 
translatable=yesCreate:/property
   /object
   packing
 property name=expandFalse/property
@@ -359,11 +365,6 @@
   /packing
 /child
   /object
-  object class=GtkImage id=calc_all_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/ods_32_8.png/property
-  /object
   object class=GtkImage id=database_all_image
 property name=visibleTrue/property
 property name=can_focusFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

2013-08-30 Thread Krisztian Pinter 
 sfx2/source/dialog/backingwindow.cxx |   48 +++--
 sfx2/source/dialog/backingwindow.hxx |3 
 sfx2/uiconfig/ui/startcenter.ui  |  304 ++-
 3 files changed, 158 insertions(+), 197 deletions(-)

New commits:
commit 729bc005ec12cdb1c8cb319a60bdccc3b0964c85
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Fri Aug 30 16:55:53 2013 +0200

startcenter: Tweak button layout in Start Center

Change-Id: I7a02b5c831b268f326d30c331065c57deceeb6ee

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 4cedf1b..1ce82d8 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -277,25 +277,14 @@ void BackingWindow::initControls()
 setupExternalLink( mpInfoButton );
 setupExternalLink( mpTplRepButton );
 
-mpShowWriterTemplateButton  -SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowCalcTemplateButton-SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowImpressTemplateButton -SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowDrawTemplateButton-SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-
-mpShowWriterRecentButton-SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowCalcRecentButton  -SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowImpressRecentButton   -SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-mpShowDrawRecentButton  -SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
-
-mpShowWriterRecentButton-Hide();
-mpShowCalcRecentButton  -Hide();
-mpShowImpressRecentButton   -Hide();
-mpShowDrawRecentButton  -Hide();
-
-setupTemplateView( mpWriterTemplateThumbnails,  FILTER_APP_WRITER );
-setupTemplateView( mpCalcTemplateThumbnails,FILTER_APP_CALC );
-setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS );
-setupTemplateView( mpDrawTemplateThumbnails,FILTER_APP_DRAW );
+setupTemplateView( mpWriterTemplateThumbnails,  FILTER_APP_WRITER,
+   mpShowWriterRecentButton,mpShowWriterTemplateButton 
);
+setupTemplateView( mpCalcTemplateThumbnails,FILTER_APP_CALC,
+   mpShowCalcRecentButton,  mpShowCalcTemplateButton );
+setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS,
+   mpShowImpressRecentButton,   
mpShowImpressTemplateButton );
+setupTemplateView( mpDrawTemplateThumbnails,FILTER_APP_DRAW,
+   mpShowDrawRecentButton,  mpShowDrawTemplateButton );
 
 Resize();
 }
@@ -331,8 +320,10 @@ void BackingWindow::setupButton( PushButton* pButton )
 pButton-SetControlFont( aFont );
 }
 
-void BackingWindow::setupTemplateView( TemplateLocalView* pView, 
FILTER_APPLICATION eFilter )
+void BackingWindow::setupTemplateView( TemplateLocalView* pView, 
FILTER_APPLICATION eFilter,
+   PushButton* pRecentButton, PushButton* 
pTemplateButton )
 {
+// setup view
 pView-SetStyle(pView-GetStyle() | WB_VSCROLL);
 pView-setItemMaxTextLength(nTemplateItemMaxTextLength);
 
@@ -343,6 +334,23 @@ void BackingWindow::setupTemplateView( TemplateLocalView* 
pView, FILTER_APPLICAT
 pView-Hide(); // hidden by default
 pView-showRootRegion();
 pView-setOpenTemplateHdl( LINK( this, BackingWindow, OpenTemplateHdl ) );
+
+// setup buttons
+pRecentButton-SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
+pTemplateButton-SetClickHdl( LINK( this, BackingWindow, 
RecentTemplateToggleHdl ) );
+
+// button text - slighly larger font than normal labels on the texts
+Font aFont;
+aFont.SetSize( Size( 0, 11 ) );
+aFont.SetWeight( WEIGHT_NORMAL );
+
+pRecentButton-SetFont( aFont );
+pRecentButton-SetControlFont( aFont );
+
+pTemplateButton-SetFont( aFont );
+pTemplateButton-SetControlFont( aFont );
+
+pRecentButton-Hide();  // hidden by default
 }
 
 void BackingWindow::setupExternalLink( PushButton* pButton )
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 5009df8..1da5a9a 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -107,7 +107,8 @@ class BackingWindow
 const OUString rURL, const std::setOUString rURLS, 
SvtModuleOptions rOpt,
 SvtModuleOptions::EModule eMod );
 void setupButton( PushButton* pButton );
-void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION 
eFilter );
+void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION 
eFilter,
+PushButton* pRecentButton, PushButton* 
pTemplateButton );
 void setupExternalLink( PushButton* pButton );
 
 void dispatchURL( const

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

2013-08-21 Thread Krisztian Pinter 
 sfx2/source/dialog/backingwindow.cxx |   28 +++--
 sfx2/source/dialog/backingwindow.hxx |7 +
 sfx2/uiconfig/ui/startcenter.ui  |  177 +--
 3 files changed, 176 insertions(+), 36 deletions(-)

New commits:
commit 08dc975721d7837bf9611104a7052b5384685167
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Fri Aug 16 19:16:45 2013 +0200

startcenter: Add new document buttons to All tab

Change-Id: I39154f74e126826daeb74345c0712156b89a6d02
Reviewed-on: https://gerrit.libreoffice.org/5456
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 2e8afdf..d69b2fb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -82,6 +82,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 get(mpDBButton, database);
 get(mpMathButton,   math);
 
+get(mpWriterAllButton,  writer_all);
+get(mpCalcAllButton,calc_all);
+get(mpImpressAllButton, impress_all);
+get(mpDrawAllButton,draw_all);
+get(mpDBAllButton,  database_all);
+get(mpMathAllButton,math_all);
+
 get(mpExtensionsButton, extension);
 get(mpInfoButton,   info);
 get(mpTplRepButton, add_temp);
@@ -226,6 +233,13 @@ void BackingWindow::initControls()
 setupButton( mpImpressButton );
 setupButton( mpMathButton );
 
+setupButton( mpWriterAllButton );
+setupButton( mpDrawAllButton );
+setupButton( mpCalcAllButton );
+setupButton( mpDBAllButton );
+setupButton( mpImpressAllButton );
+setupButton( mpMathAllButton );
+
 setupButton( mpOpenButton );
 setupButton( mpTemplateButton );
 
@@ -234,8 +248,6 @@ void BackingWindow::initControls()
 setupExternalLink( mpTplRepButton );
 
 Resize();
-
-mpWriterButton-GrabFocus();
 }
 
 void BackingWindow::setupModuleTab(const OString rTabName, RecentDocsView* 
pRecView, int nFileTypes,
@@ -392,17 +404,17 @@ IMPL_LINK( BackingWindow, ExtLinkClickHdl, Button*, 
pButton )
 IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 {
 // dispatch the appropriate URL and end the dialog
-if( pButton == mpWriterButton )
+if( pButton == mpWriterButton   || pButton == mpWriterAllButton )
 dispatchURL( WRITER_URL );
-else if( pButton == mpCalcButton )
+else if( pButton == mpCalcButton|| pButton == mpCalcAllButton )
 dispatchURL( CALC_URL );
-else if( pButton == mpImpressButton )
+else if( pButton == mpImpressButton || pButton == mpImpressAllButton )
 dispatchURL( IMPRESS_WIZARD_URL );
-else if( pButton == mpDrawButton )
+else if( pButton == mpDrawButton|| pButton == mpDrawAllButton )
 dispatchURL( DRAW_URL );
-else if( pButton == mpDBButton )
+else if( pButton == mpDBButton  || pButton == mpDBAllButton )
 dispatchURL( BASE_URL );
-else if( pButton == mpMathButton )
+else if( pButton == mpMathButton|| pButton == mpMathAllButton )
 dispatchURL( MATH_URL );
 else if( pButton == mpOpenButton )
 {
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 7fbcabd..9bacbc8 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -59,6 +59,13 @@ class BackingWindow
 PushButton* mpDBButton;
 PushButton* mpMathButton;
 
+PushButton* mpWriterAllButton;
+PushButton* mpCalcAllButton;
+PushButton* mpImpressAllButton;
+PushButton* mpDrawAllButton;
+PushButton* mpDBAllButton;
+PushButton* mpMathAllButton;
+
 PushButton* mpExtensionsButton;
 PushButton* mpInfoButton;
 PushButton* mpTplRepButton;
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 05d4bdb..2274155 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -7,31 +7,6 @@
 property name=can_focusFalse/property
 property name=pixbufframework/res/addtemplate_32.png/property
   /object
-  object class=GtkImage id=calc_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/ods_32_8.png/property
-  /object
-  object class=GtkImage id=database_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/odb_32_8.png/property
-  /object
-  object class=GtkImage id=draw_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/odg_32_8.png/property
-  /object
-  object class=GtkImage id=extension_image
-property name=visibleTrue/property
-

[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk

2013-04-04 Thread Caolán McNamara 
 sfx2/UI_sfx.mk|1 
 sfx2/source/appl/app.hrc  |   10 
 sfx2/source/appl/app.src  |   55 
 sfx2/source/appl/appserv.cxx  |   52 --
 sfx2/uiconfig/ui/licensedialog.ui |   87 ++
 5 files changed, 90 insertions(+), 115 deletions(-)

New commits:
commit 26f33b9c61d5b050b398a69a83d4f99fe9c228f5
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Apr 3 20:33:10 2013 +0100

convert license dialog to .ui format

Change-Id: Icbcb2a86369c95f9acff05d677a4f5eaa1d9dfb9

diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index da23f43..0b59c7f 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
+   sfx2/uiconfig/ui/licensedialog \
sfx2/uiconfig/ui/managestylepage \
sfx2/uiconfig/ui/optprintpage \
sfx2/uiconfig/ui/password \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 899324f..6a5a97c 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -132,16 +132,6 @@
 #define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202)
 #define RID_SVXSTR_GRFILTER_TOOBIG  (RID_SFX_APP_START + 203)
 
-// For the License Information dialog box
-#define DLG_HELP_LICENSING  (RID_SFX_APP_START + 204)
-#define STR_LICENSING_INFORMATION_1 (RID_SFX_APP_START + 205)
-#define STR_LICENSING_INFORMATION_2 (RID_SFX_APP_START + 206)
-#define STR_LICENSING_INFORMATION_3 (RID_SFX_APP_START + 207)
-#define STR_LICENSING_INFORMATION_4 (RID_SFX_APP_START + 208)
-#define STR_LICENSING_INFORMATION_5 (RID_SFX_APP_START + 209)
-#define PB_LICENSING_SHOW   (RID_SFX_APP_START + 210)
-#define PB_LICENSING_CLOSE  (RID_SFX_APP_START + 211)
-
 #define RID_SVXSTR_END_REDLINING_WARNING(RID_SFX_APP_START + 212)
 #define RID_SVXSTR_INCORRECT_PASSWORD   (RID_SFX_APP_START + 213)
 #define RID_SVXSTR_FORWARD_ERRMSSG  (RID_SFX_APP_START + 214)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index c05081e..d105a70 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -508,59 +508,4 @@ String RID_SVXSTR_FORWARD_ERRMSSG
 Text [ en-US ] = If you select the option \%PLACEHOLDER%\, you must 
enter a URL. ;
 };
 
-ModalDialog DLG_HELP_LICENSING
-{
-// Size is computed
-Text [ en-US ] = Licensing and Legal information;
-MOVEABLE = TRUE ;
-CLOSEABLE = TRUE ;
-OUTPUTSIZE = TRUE ;
-SVLOOK = TRUE ;
-String STR_LICENSING_INFORMATION_1
-{
-Text [ en-US ] =
-%PRODUCTNAME is made available subject to the terms of GNU Lesser 
General Public\n
-License Version 3. A copy of the LGPL license can be found at\n
-http://www.gnu.org/licenses/lgpl-3.0.html; ;
-};
-String STR_LICENSING_INFORMATION_2
-{
-Text [ en-US ] =
-Third Party Code Additional copyright notices and license terms 
applicable to\n
-portions of the Software are set forth in the LICENSE.html\n
-file; choose Show License to see exact details in English. ;
-};
-String STR_LICENSING_INFORMATION_3
-{
-Text [ en-US ] =
-All trademarks and registered trademarks mentioned herein are the 
property of\n
-their respective owners. ;
-};
-String STR_LICENSING_INFORMATION_4
-{
-Text [ en-US ] =
-Copyright © 2000, 2013 LibreOffice contributors and/or their 
affiliates. All rights\n
-reserved. ;
-};
-String STR_LICENSING_INFORMATION_5
-{
-Text [ en-US ] =
-This product was created by %OOOVENDOR, based on 
OpenOffice.org,\n
-which is Copyright 2000, 2011 Oracle and/or its affiliates.\n
-%OOOVENDOR acknowledges all community members, please see\n
-http://www.libreoffice.org/ for more details. ;
-};
-OKButton PB_LICENSING_SHOW
-{
-// Position and size is computed
-Text [ en-US ] = ~Show License ;
-DefButton = TRUE ;
-};
-CancelButton PB_LICENSING_CLOSE
-{
-// Position and size is computed
-Text [ en-US ] = ~Close ;
-};
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f845a05..d631b7b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -229,61 +229,15 @@ namespace
 class LicenseDialog : public ModalDialog
 {
 private:
-FixedText aText;
-OKButton aShow;
-CancelButton aClose;
-
-DECL_LINK(CancelHdl, void *);
 DECL_LINK(ShowHdl, void