[Jreepad-CVS] jreepad/src/jreepad JreepadPrefs.java, 1.26, 1.27 JreepadView.java, 1.47, 1.48 JreepadViewer.java, 1.60, 1.61

[Dan S. <dan...@us...>]

Update of /cvsroot/jreepad/jreepad/src/jreepad
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13685/src/jreepad

Modified Files:
	JreepadPrefs.java JreepadView.java JreepadViewer.java 
Log Message:
Fixed request #1699525 and #1699524 re the convenience of the "Edit node title" action


Index: JreepadView.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadView.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** JreepadView.java	21 Mar 2007 10:40:35 -0000	1.47
--- JreepadView.java	12 Apr 2007 21:23:23 -0000	1.48
***************
*** 254,257 ****
--- 254,258 ----
  //      editorPane.setSize(articleView.getSize());
  //      editorPane.setSize(articleView.getViewport().getViewSize());
+     getPrefs().viewWhich = JreepadPrefs.VIEW_BOTH;
    }
    private void setViewTreeOnly()
***************
*** 260,263 ****
--- 261,265 ----
        this.add(treeView);
        treeView.setSize(getSize());
+     getPrefs().viewWhich = JreepadPrefs.VIEW_TREE;
    }
    private void setViewArticleOnly()
***************
*** 268,271 ****
--- 270,274 ----
       this.add(articlePane);
       articlePane.setSize(getSize());
+     getPrefs().viewWhich = JreepadPrefs.VIEW_ARTICLE;
    }
  
***************
*** 937,940 ****
--- 940,948 ----
    public void editNodeTitleAction()
    {
+     if(getPrefs().viewWhich == JreepadPrefs.VIEW_ARTICLE)
+     {
+       setViewMode(JreepadPrefs.VIEW_BOTH);
+     }
+     
      tree.startEditingAtPath(tree.getSelectionPath());
    }

Index: JreepadPrefs.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadPrefs.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** JreepadPrefs.java	26 Mar 2007 11:49:24 -0000	1.26
--- JreepadPrefs.java	12 Apr 2007 21:23:23 -0000	1.27
***************
*** 152,156 ****
      autoSave = prefs.getBoolean("AUTOSAVE", false);
  
!     viewWhich = prefs.getInt("VIEWWHICH", 0);
  
      viewToolbar = prefs.getBoolean("VIEWTOOLBAR", true);
--- 152,156 ----
      autoSave = prefs.getBoolean("AUTOSAVE", false);
  
!     viewWhich = prefs.getInt("VIEWWHICH", VIEW_BOTH);
  
      viewToolbar = prefs.getBoolean("VIEWTOOLBAR", true);

Index: JreepadViewer.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadViewer.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** JreepadViewer.java	12 Apr 2007 20:32:57 -0000	1.60
--- JreepadViewer.java	12 Apr 2007 21:23:23 -0000	1.61
***************
*** 557,560 ****
--- 557,561 ----
  	  addChildMenuItem.setAccelerator(KeyStroke.getKeyStroke('D', MENU_MASK));
  	  newFromClipboardMenuItem.setAccelerator(KeyStroke.getKeyStroke('M', MENU_MASK));
+       editNodeTitleMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0));
  	  upMenuItem.setMnemonic('u');
  	  upMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_UP, MENU_MASK | java.awt.Event.ALT_MASK));