You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/10/28 12:54:53 UTC
[openoffice] branch AOO418 updated: Wiki Publisher: Resized dialog,
removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO418 by this push:
new d3be661 Wiki Publisher: Resized dialog, removed whitespace
d3be661 is described below
commit d3be6617796a02223a7ae1e267fea43501cb2a96
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Oct 28 13:54:14 2020 +0100
Wiki Publisher: Resized dialog, removed whitespace
---
main/swext/mediawiki/dialogs/SendToMediaWiki.xdl | 26 ++++++------
.../src/com/sun/star/wiki/WikiPropDialog.java | 48 +++++++++++-----------
main/swext/mediawiki/src/description.xml | 10 ++---
3 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl b/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
index 49986ed..eeb166d 100644
--- a/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
+++ b/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,43 +8,43 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="SendToMediaWiki" dlg:left="62" dlg:top="57" dlg:width="242" dlg:height="164" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE" dlg:help-url="vnd.com.sun.star.wiki:sendDialog">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="SendToMediaWiki" dlg:left="62" dlg:top="57" dlg:width="260" dlg:height="164" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE" dlg:help-url="vnd.com.sun.star.wiki:sendDialog">
<dlg:bulletinboard>
<dlg:text dlg:id="Label1" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="65" dlg:height="10" dlg:value="MediaWiki Server"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="11" dlg:top="38" dlg:width="59" dlg:height="10" dlg:value="Title"/>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="11" dlg:top="57" dlg:width="59" dlg:height="10" dlg:value="Summary"/>
- <dlg:menulist dlg:id="WikiList" dlg:tab-index="1" dlg:left="75" dlg:top="6" dlg:width="116" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.WikiList">
+ <dlg:menulist dlg:id="WikiList" dlg:tab-index="1" dlg:left="75" dlg:top="6" dlg:width="124" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.WikiList">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:WikiListChange" script:language="UNO"/>
</dlg:menulist>
- <dlg:combobox dlg:id="ArticleText" dlg:tab-index="4" dlg:left="75" dlg:top="36" dlg:width="160" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.ArticleText">
+ <dlg:combobox dlg:id="ArticleText" dlg:tab-index="4" dlg:left="75" dlg:top="36" dlg:width="179" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.ArticleText">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.UNO:ArticleTextChange" script:language="UNO"/>
</dlg:combobox>
- <dlg:textfield dlg:id="CommentText" dlg:tab-index="6" dlg:left="75" dlg:top="55" dlg:width="160" dlg:height="48" dlg:multiline="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.CommentText"/>
- <dlg:button dlg:id="AddButton" dlg:tab-index="2" dlg:left="195" dlg:top="6" dlg:width="40" dlg:height="14" dlg:value="Add..." dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.AddButton">
+ <dlg:textfield dlg:id="CommentText" dlg:tab-index="6" dlg:left="75" dlg:top="55" dlg:width="179" dlg:height="48" dlg:multiline="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.CommentText"/>
+ <dlg:button dlg:id="AddButton" dlg:tab-index="2" dlg:left="205" dlg:top="6" dlg:width="50" dlg:height="14" dlg:value="Add..." dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.AddButton">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:AddWiki" script:language="UNO"/>
</dlg:button>
<dlg:checkbox dlg:id="MinorCheck" dlg:tab-index="7" dlg:left="75" dlg:top="109" dlg:width="141" dlg:height="10" dlg:value="Minor edit" dlg:checked="false" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.MinorCheck"/>
<dlg:checkbox dlg:id="BrowserCheck" dlg:tab-index="8" dlg:left="75" dlg:top="122" dlg:width="141" dlg:height="10" dlg:value="Show in browser" dlg:checked="false" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.BrowserCheck"/>
- <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="9" dlg:left="-2" dlg:top="138" dlg:width="246" dlg:height="4"/>
- <dlg:button dlg:id="CancelButton" dlg:tab-index="10" dlg:left="187" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
- <dlg:button dlg:id="SendButton" dlg:tab-index="11" dlg:disabled="true" dlg:left="134" dlg:top="145" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="Send" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.SendButton">
+ <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="9" dlg:left="-2" dlg:top="138" dlg:width="264" dlg:height="4"/>
+ <dlg:button dlg:id="CancelButton" dlg:tab-index="10" dlg:left="205" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
+ <dlg:button dlg:id="SendButton" dlg:tab-index="11" dlg:disabled="true" dlg:left="152" dlg:top="145" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="Send" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.SendButton">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Send" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="HelpButton" dlg:tab-index="12" dlg:left="5" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="help"/>
- <dlg:fixedline dlg:id="FixedLine2" dlg:tab-index="13" dlg:left="5" dlg:top="25" dlg:width="234" dlg:height="6" dlg:value="MediaWiki"/>
+ <dlg:fixedline dlg:id="FixedLine2" dlg:tab-index="13" dlg:left="5" dlg:top="25" dlg:width="250" dlg:height="6" dlg:value="MediaWiki"/>
</dlg:bulletinboard>
</dlg:window>
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index b081195..f05ff2a 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -39,21 +39,21 @@ import com.sun.star.uno.XComponentContext;
import java.util.Hashtable;
public class WikiPropDialog extends WikiDialog{
-
+
WikiEditorImpl m_aWikiEditor;
private final String sSendMethod = "Send";
private final String sWikiListMethod = "WikiListChange";
private final String sArticleTextMethod = "ArticleTextChange";
private final String sAddWikiMethod = "AddWiki";
-
+
String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod};
-
+
private String m_sWikiTitle = "";
protected String m_sWikiEngineURL = "";
protected String m_sWikiComment = "";
protected boolean m_bWikiMinorEdit = false;
-
+
/** Creates a new instance of WikiPropDialog */
public WikiPropDialog(XComponentContext xContext, String DialogURL, WikiEditorImpl aWikiEditorForThrobber )
{
@@ -62,7 +62,7 @@ public class WikiPropDialog extends WikiDialog{
if ( aWikiEditorForThrobber != null )
{
- InsertThrobber( 224, 122, 10, 10 );
+ InsertThrobber( 244, 122, 10, 10 );
m_aWikiEditor = aWikiEditorForThrobber;
}
@@ -82,7 +82,7 @@ public class WikiPropDialog extends WikiDialog{
e.printStackTrace();
}
}
-
+
private void InitStrings( XComponentContext xContext )
{
try
@@ -102,7 +102,7 @@ public class WikiPropDialog extends WikiDialog{
e.printStackTrace();
}
}
-
+
private void InitShowBrowser( XComponentContext xContext )
{
try
@@ -121,7 +121,7 @@ public class WikiPropDialog extends WikiDialog{
boolean bResult = super.show();
if ( bResult && Helper.GetShowInBrowserByDefault( m_xContext ) )
- Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle );
+ Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle );
return bResult;
}
@@ -144,7 +144,7 @@ public class WikiPropDialog extends WikiDialog{
public void fillWikiList()
{
String [] WikiList = m_aSettings.getWikiURLs();
-
+
try
{
XPropertySet xPS = GetPropSet("WikiList");
@@ -156,9 +156,9 @@ public class WikiPropDialog extends WikiDialog{
catch (Exception ex)
{
ex.printStackTrace();
- }
+ }
}
-
+
public void fillDocList()
{
XPropertySet xPS = GetPropSet("ArticleText");
@@ -172,8 +172,8 @@ public class WikiPropDialog extends WikiDialog{
ex.printStackTrace();
}
}
-
-
+
+
public String GetWikiTitle()
{
return m_sWikiTitle;
@@ -190,9 +190,9 @@ public class WikiPropDialog extends WikiDialog{
catch (Exception ex)
{
ex.printStackTrace();
- }
+ }
}
-
+
public void switchSendButtonIfNecessary()
{
@@ -251,7 +251,7 @@ public class WikiPropDialog extends WikiDialog{
ex.printStackTrace();
}
}
-
+
public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
{
if ( MethodName.equals( sSendMethod ) )
@@ -274,9 +274,9 @@ public class WikiPropDialog extends WikiDialog{
short minorState = ((Short) aMinorCheckProps.getPropertyValue("State")).shortValue();
if (minorState != 0)
m_bWikiMinorEdit = true;
- else
+ else
m_bWikiMinorEdit = false;
-
+
short nBrowserState = ((Short) aBrowserCheckProps.getPropertyValue("State")).shortValue();
Helper.SetShowInBrowserByDefault( m_xContext, nBrowserState != 0 );
@@ -295,7 +295,7 @@ public class WikiPropDialog extends WikiDialog{
// start spinning
SetThrobberVisible( true );
SetThrobberActive( true );
-
+
// the following method might show a dialog, should be used in main thread
final Hashtable aWikiSettings = m_aSettings.getSettingByUrl( m_sWikiEngineURL );
if ( Helper.AllowThreadUsage( m_xContext ) )
@@ -347,7 +347,7 @@ public class WikiPropDialog extends WikiDialog{
xDialogToClose.endExecute();
}
}
-
+
return true;
}
else if ( MethodName.equals( sWikiListMethod ) )
diff --git a/main/swext/mediawiki/src/description.xml b/main/swext/mediawiki/src/description.xml
index e2c104e..60dc157 100644
--- a/main/swext/mediawiki/src/description.xml
+++ b/main/swext/mediawiki/src/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="1.2.1"/>
@@ -35,6 +35,6 @@
<OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
</dependencies>
<publisher>
- <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
+ <name xlink:href="https://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher>
</description>