[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[14273] plugins/SVNPlugin/trunk
From:       daleanson () users ! sourceforge ! net
Date:       2008-12-31 22:59:39
Message-ID: E1LIA2N-0004yv-7s () bj8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14273
          http://jedit.svn.sourceforge.net/jedit/?rev=14273&view=rev
Author:   daleanson
Date:     2008-12-31 22:59:39 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
minor adjustments for merge dialog

Modified Paths:
--------------
    plugins/SVNPlugin/trunk/SVNPlugin.props
    plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java

Modified: plugins/SVNPlugin/trunk/SVNPlugin.props
===================================================================
--- plugins/SVNPlugin/trunk/SVNPlugin.props	2008-12-31 22:58:37 UTC (rev 14272)
+++ plugins/SVNPlugin/trunk/SVNPlugin.props	2008-12-31 22:59:39 UTC (rev 14273)
@@ -611,3 +611,4 @@
 ips.Choose_one_or_more_values>=Choose one or more values:
 ips.Choose_a_value>=Choose a value:
 ips.Select_Repository_Location=Select Repository Location
+ips.Show_log_for_this_file.=Show log for this file.

Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java
===================================================================
--- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java	2008-12-31 \
                22:58:37 UTC (rev 14272)
+++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java	2008-12-31 \
22:59:39 UTC (rev 14273) @@ -28,6 +28,7 @@
 
 package ise.plugin.svn.gui;
 
+import java.awt.Font;
 import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -73,6 +74,7 @@
      */
     public MergeDialog( View view, String fromPath ) {
         super( ( JFrame ) view, jEdit.getProperty( "ips.Merge", "Merge" ), false );
+        setResizable( false );
         this.view = view;
         this.fromPath = fromPath;
         init();
@@ -103,6 +105,7 @@
                 }
             }
         );
+        from_log_btn.setToolTipText( jEdit.getProperty( \
"ips.Show_log_for_this_file.", "Show log for this file." ) );  
         // merge to location
         JPanel merge_to_panel = new JPanel( new KappaLayout() );
@@ -124,6 +127,7 @@
                 }
             }
         );
+        to_log_btn.setToolTipText( jEdit.getProperty( "ips.Show_log_for_this_file.", \
"Show log for this file." ) );  
         // sync "from" and "to", so that when the user makes a change in the
         // "from", the "to" changes to be the same. This makes it easier on the
@@ -184,9 +188,10 @@
         JLabel command_line_label = new JLabel( jEdit.getProperty( \
"ips.Command-line_Equivalent>", "Command-line Equivalent:" ) );  final JTextArea \
command_line = new JTextArea();  command_line.setRows( 5 );
-        command_line.setColumns( 42 );
+        command_line.setColumns( 80 );
         command_line.setLineWrap( true );
         command_line.setWrapStyleWord( true );
+        command_line.setFont( new Font("Monospaced", Font.PLAIN, 10) );
         command_line.setEditable( false );
         JButton show_command_line = new JButton( "Show" );
         show_command_line.addActionListener(
@@ -221,7 +226,7 @@
             }
         );
         command_line_panel.add( "0, 0, 6, 1, E, w, 3", command_line_label );
-        command_line_panel.add( "0, 1, 5, 1, E, w, 3", new JScrollPane( command_line \
) ); +        command_line_panel.add( "0, 1, 5, 1, 0, w, 3", new JScrollPane( \
                command_line ) );
         command_line_panel.add( "5, 1, 1, 1, 0, w, 3", show_command_line );
 
         // ok and cancel buttons


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]