adjust the UI

5 files changed, 36 insertions, 31 deletions

diff --git a/swext/mediawiki/dialogs/EditSetting.xdl b/swext/mediawiki/dialogs/EditSetting.xdl
index 619e112cd175..f6fa6254afc6 100644
--- a/swext/mediawiki/dialogs/EditSetting.xdl
+++ b/swext/mediawiki/dialogs/EditSetting.xdl
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: EditSetting.xdl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mav $ $Date: 2008-02-07 11:17:01 $
+ *  last change: $Author: mav $ $Date: 2008-02-07 12:49:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -34,24 +34,24 @@
  *
  ************************************************************************ -->
 <!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="EditSetting" dlg:tab-index="1" dlg:left="180" dlg:top="89" dlg:width="198" dlg:height="141" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="EditSetting" dlg:tab-index="1" dlg:left="180" dlg:top="89" dlg:width="198" dlg:height="125" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE">
  <dlg:bulletinboard>
-  <dlg:text dlg:id="UrlLabel" dlg:tab-index="3" dlg:left="6" dlg:top="26" dlg:width="50" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
-  <dlg:textfield dlg:id="UrlField" dlg:tab-index="4" dlg:left="58" dlg:top="23" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.UrlField"/>
-  <dlg:textfield dlg:id="UsernameField" dlg:tab-index="6" dlg:left="58" dlg:top="68" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.UsernameField"/>
-  <dlg:textfield dlg:id="PasswordField" dlg:tab-index="8" dlg:left="58" dlg:top="84" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.PasswordField" dlg:echochar="*"/>
-  <dlg:button dlg:id="OkButton" dlg:tab-index="11" dlg:left="89" dlg:top="122" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="TOREPLACE">
+  <dlg:text dlg:id="UrlLabel" dlg:tab-index="3" dlg:left="6" dlg:top="22" dlg:width="50" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
+  <dlg:textfield dlg:id="UrlField" dlg:tab-index="4" dlg:left="58" dlg:top="19" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.UrlField"/>
+  <dlg:textfield dlg:id="UsernameField" dlg:tab-index="6" dlg:left="58" dlg:top="52" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.UsernameField"/>
+  <dlg:textfield dlg:id="PasswordField" dlg:tab-index="8" dlg:left="58" dlg:top="68" dlg:width="122" dlg:height="12" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.PasswordField" dlg:echochar="*"/>
+  <dlg:button dlg:id="OkButton" dlg:tab-index="11" dlg:left="89" dlg:top="106" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="TOREPLACE">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:OK" script:language="UNO"/>
   </dlg:button>
-  <dlg:button dlg:id="CancelButton" dlg:tab-index="12" dlg:left="143" dlg:top="122" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
-  <dlg:button dlg:id="HelpButton" dlg:tab-index="10" dlg:left="5" dlg:top="122" dlg:width="50" dlg:height="14" dlg:value="TOREPLACE">
+  <dlg:button dlg:id="CancelButton" dlg:tab-index="12" dlg:left="143" dlg:top="106" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
+  <dlg:button dlg:id="HelpButton" dlg:tab-index="10" dlg:left="5" dlg:top="106" dlg:width="50" dlg:height="14" dlg:value="TOREPLACE">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Help" script:language="UNO"/>
   </dlg:button>
-  <dlg:text dlg:id="UsernameLabel" dlg:tab-index="5" dlg:left="6" dlg:top="69" dlg:width="46" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
-  <dlg:text dlg:id="PasswordLabel" dlg:tab-index="7" dlg:left="6" dlg:top="85" dlg:width="46" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
-  <dlg:checkbox dlg:id="SaveBox" dlg:tab-index="9" dlg:left="58" dlg:top="100" dlg:width="116" dlg:height="8" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.SaveBox" dlg:value="TOREPLACE" dlg:checked="false"/>
-  <dlg:fixedline dlg:id="BottomLine" dlg:tab-index="0" dlg:left="-4" dlg:top="113" dlg:width="205" dlg:height="8"/>
-  <dlg:fixedline dlg:id="AccountLine" dlg:tab-index="1" dlg:left="3" dlg:top="54" dlg:width="193" dlg:height="8" dlg:value="TOREPLACE"/>
+  <dlg:text dlg:id="UsernameLabel" dlg:tab-index="5" dlg:left="6" dlg:top="53" dlg:width="46" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
+  <dlg:text dlg:id="PasswordLabel" dlg:tab-index="7" dlg:left="6" dlg:top="69" dlg:width="46" dlg:height="8" dlg:value="TOREPLACE" dlg:tabstop="false"/>
+  <dlg:checkbox dlg:id="SaveBox" dlg:tab-index="9" dlg:left="58" dlg:top="84" dlg:width="116" dlg:height="8" dlg:help-url="com.sun.star.wiki.MediaWiki.EditSetting.SaveBox" dlg:value="TOREPLACE" dlg:checked="false"/>
+  <dlg:fixedline dlg:id="BottomLine" dlg:tab-index="0" dlg:left="-4" dlg:top="97" dlg:width="205" dlg:height="8"/>
+  <dlg:fixedline dlg:id="AccountLine" dlg:tab-index="1" dlg:left="3" dlg:top="38" dlg:width="193" dlg:height="8" dlg:value="TOREPLACE"/>
   <dlg:fixedline dlg:id="WikiLine" dlg:tab-index="2" dlg:left="3" dlg:top="5" dlg:width="193" dlg:height="8" dlg:value="TOREPLACE"/>
  </dlg:bulletinboard>
 </dlg:window>
diff --git a/swext/mediawiki/dialogs/Settings.xdl b/swext/mediawiki/dialogs/Settings.xdl
index 9fc9b2fb3146..264879494e5f 100644
--- a/swext/mediawiki/dialogs/Settings.xdl
+++ b/swext/mediawiki/dialogs/Settings.xdl
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: Settings.xdl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mav $ $Date: 2008-02-07 11:17:01 $
+ *  last change: $Author: mav $ $Date: 2008-02-07 12:49:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,18 +36,19 @@
 <!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="Settings" dlg:left="142" dlg:top="89" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:withtitlebar="false">
  <dlg:bulletinboard>
-  <dlg:button dlg:id="AddButton" dlg:tab-index="1" dlg:left="205" dlg:top="6" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.AddButton" dlg:value="TOREPLACE">
+  <dlg:button dlg:id="AddButton" dlg:tab-index="1" dlg:left="204" dlg:top="20" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.AddButton" dlg:value="TOREPLACE">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Add" script:language="UNO"/>
   </dlg:button>
-  <dlg:button dlg:id="EditButton" dlg:tab-index="2" dlg:left="205" dlg:top="22" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.EditButton" dlg:value="TOREPLACE">
+  <dlg:button dlg:id="EditButton" dlg:tab-index="2" dlg:left="204" dlg:top="36" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.EditButton" dlg:value="TOREPLACE">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Edit" script:language="UNO"/>
   </dlg:button>
-  <dlg:button dlg:id="RemoveButton" dlg:tab-index="3" dlg:left="205" dlg:top="38" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.RemoveButton" dlg:value="TOREPLACE">
+  <dlg:button dlg:id="RemoveButton" dlg:tab-index="3" dlg:left="204" dlg:top="52" dlg:width="50" dlg:height="14" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.RemoveButton" dlg:value="TOREPLACE">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Remove" script:language="UNO"/>
   </dlg:button>
-  <dlg:menulist dlg:id="WikiList" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="188" dlg:height="150" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.WikiList" dlg:multiselection="true">
+  <dlg:menulist dlg:id="WikiList" dlg:tab-index="0" dlg:left="9" dlg:top="20" dlg:width="189" dlg:height="120" dlg:help-url="com.sun.star.wiki.MediaWiki.Settings.WikiList" dlg:multiselection="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:ListStatus" script:language="UNO"/>
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:ListEdit" script:language="UNO"/>
   </dlg:menulist>
+  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="1" dlg:left="6" dlg:top="6" dlg:width="248" dlg:height="8" dlg:help-text="" dlg:value="TOREPLACE"/>
  </dlg:bulletinboard>
 </dlg:window>
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 5edc638015b4..79200685fed2 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Helper.java,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: mav $ $Date: 2008-02-05 16:35:54 $
+ *  last change: $Author: mav $ $Date: 2008-02-07 12:49:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -122,8 +122,9 @@ public class Helper
     public final static int DLG_EDITSETTING_SAVEBOX = 29;
 
     public final static int CANCELSENDING_ERROR = 30;
+    public final static int DLG_MEDIAWIKIEXTENSION_STRING = 31;
 
-    public final static int STRINGS_NUM = 31;
+    public final static int STRINGS_NUM = 32;
 
     private final static String[] m_pEntryNames = { "GeneralSendError",
                                                     "NoWikiFilter",
@@ -155,7 +156,8 @@ public class Helper
                                                     "Dlg_EditSetting_AccountLine",
                                                     "Dlg_EditSetting_WikiLine",
                                                     "Dlg_EditSetting_SaveBox",
-                                                    "CancelSending" };
+                                                    "CancelSending",
+                                                    "Dlg_MediaWiki_Extension_String" };
 
     private static String[] m_pConfigStrings;
 
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index b936021b4832..706029c9dd68 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WikiEditSettingDialog.java,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: mav $ $Date: 2008-02-05 18:23:34 $
+ *  last change: $Author: mav $ $Date: 2008-02-07 12:49:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -67,7 +67,7 @@ public class WikiEditSettingDialog extends WikiDialog
         setting = new Hashtable();
         addMode = true;
 
-        InsertThrobber( 184, 24, 10, 10 );
+        InsertThrobber( 184, 20, 10, 10 );
         InitStrings( xContext );
         InitSaveCheckbox( xContext );
     }
@@ -93,7 +93,7 @@ public class WikiEditSettingDialog extends WikiDialog
         addMode = false;
         m_bAllowURLChange = bAllowURLChange;
 
-        InsertThrobber( 184, 24, 10, 10 );
+        InsertThrobber( 184, 20, 10, 10 );
         InitStrings( xContext );
         InitSaveCheckbox( xContext );
     }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 53bec0ee0a0a..764fbb97294d 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WikiOptionsEventHandlerImpl.java,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mav $ $Date: 2008-02-07 09:17:30 $
+ *  last change: $Author: mav $ $Date: 2008-02-07 12:49:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -195,6 +195,8 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
     {
         try
         {
+
+            GetPropSet( "FixedLine1" ).setPropertyValue( "Label", Helper.GetLocalizedString( m_xContext, Helper.DLG_MEDIAWIKIEXTENSION_STRING ) );
             GetPropSet( "AddButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( m_xContext, Helper.DLG_ADDBUTTON ) );
             GetPropSet( "EditButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( m_xContext, Helper.DLG_EDITBUTTON ) );
             GetPropSet( "RemoveButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( m_xContext, Helper.DLG_REMOVEBUTTON ) );