|
From: <ger...@us...> - 2012-10-27 11:52:01
|
Revision: 6702
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6702&view=rev
Author: gerdwagner
Date: 2012-10-27 11:51:54 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -446,12 +446,13 @@
add(new ExecuteSqlAction(_app));
add(new ExitAction(_app));
add(new FileNewAction(_app));
+ add(new FileDetachAction(_app));
add(new FileOpenAction(_app));
add(new FileAppendAction(_app));
add(new FileSaveAction(_app));
add(new FileSaveAsAction(_app));
- add(new FilePrintAction(_app));
- add(new FileCloseAction(_app));
+ add(new FileCloseAction(_app));
+ add(new FilePrintAction(_app));
add(new GlobalPreferencesAction(_app));
add(new GotoNextResultsTabAction(_app));
add(new GotoPreviousResultsTabAction(_app));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -433,13 +433,14 @@
private Component createFileMenu(Resources rsrc)
{
JMenu menu = rsrc.createMenu(SquirrelResources.IMenuResourceKeys.FILE);
+ addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileDetachAction.class, menu);
+ addToMenu(rsrc, FileOpenAction.class, menu);
addToMenu(rsrc, FileSaveAction.class, menu);
addToMenu(rsrc, FileSaveAsAction.class, menu);
- addToMenu(rsrc, FileOpenAction.class, menu);
- addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileCloseAction.class, menu);
addToMenu(rsrc, FileAppendAction.class, menu);
addToMenu(rsrc, FilePrintAction.class, menu);
- addToMenu(rsrc, FileCloseAction.class, menu);
return menu;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -179,12 +179,13 @@
add(actions.get(ExecuteSqlAction.class));
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
- add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
+ add(actions.get(FileCloseAction.class));
+ add(actions.get(FilePrintAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -566,12 +566,13 @@
// actions.get(SQLFilterAction.class).setEnabled(false);
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
+ add(actions.get(FileCloseAction.class));
add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -293,8 +293,10 @@
void fileNew();
- void filePrint();
+ void fileDetach();
+ void filePrint();
+
void showToolsPopup();
boolean confirmClose();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -99,13 +99,14 @@
_toolsPopupController.addAction("undo", _panel.getUndoAction());
_toolsPopupController.addAction("redo", _panel.getRedoAction());
_toolsPopupController.addAction("runsql", ac.get(ExecuteSqlAction.class));
+ _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
+ _toolsPopupController.addAction("filedetach", ac.get(FileDetachAction.class));
_toolsPopupController.addAction("fileopen", ac.get(FileOpenAction.class));
_toolsPopupController.addAction("filesave", ac.get(FileSaveAction.class));
_toolsPopupController.addAction("filesaveas", ac.get(FileSaveAsAction.class));
- _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
_toolsPopupController.addAction("fileappend", ac.get(FileAppendAction.class));
+ _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("fileprint", ac.get(FilePrintAction.class));
- _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("tabnext", ac.get(GotoNextResultsTabAction.class));
_toolsPopupController.addAction("tabprevious", ac.get(GotoPreviousResultsTabAction.class));
@@ -196,29 +197,45 @@
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileClose()
*/
- public void fileClose() {
- if (unsavedEdits) {
- showConfirmSaveDialog();
- }
- setEntireSQLScript("");
- getActiveSessionTabWidget().setSqlFile(null);
- fileOpened = false;
- fileSaved = false;
- unsavedEdits = false;
- ActionCollection actions =
- getSession().getApplication().getActionCollection();
- actions.enableAction(FileSaveAction.class, true);
- _fileManager.clearCurrentFile();
+ public void fileClose()
+ {
+ _closeFile(true);
}
-
-
+
+ private void _closeFile(boolean clearEditor)
+ {
+ if (unsavedEdits)
+ {
+ showConfirmSaveDialog();
+ }
+ if (clearEditor)
+ {
+ setEntireSQLScript("");
+ }
+ getActiveSessionTabWidget().setSqlFile(null);
+ fileOpened = false;
+ fileSaved = false;
+ unsavedEdits = false;
+ ActionCollection actions =
+ getSession().getApplication().getActionCollection();
+ actions.enableAction(FileSaveAction.class, true);
+ _fileManager.clearCurrentFile();
+ }
+
+
/* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
- */
- public void fileNew() {
+ * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
+ */
+ public void fileNew()
+ {
fileClose();
}
-
+
+ public void fileDetach()
+ {
+ _closeFile(false);
+ }
+
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileSaveAs()
*/
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (from rev 6686, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileNewAction.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -0,0 +1,47 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+/*
+ * Copyright (C) 2006 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import java.awt.event.ActionEvent;
+
+
+public class FileDetachAction extends SquirrelAction implements ISQLPanelAction
+{
+ private ISQLPanelAPI _panel;
+
+ public FileDetachAction(IApplication app)
+ {
+ super(app);
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ _panel.fileDetach();
+ }
+
+ public void setSQLPanel(ISQLPanelAPI panel)
+ {
+ _panel = panel;
+ setEnabled(null != _panel);
+ }
+}
\ No newline at end of file
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-27 11:51:54 UTC (rev 6702)
@@ -398,6 +398,10 @@
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.name=New file
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.tooltip=New file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.image=file_detach.gif
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.name=Detach file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.tooltip=Detach/close file while keeping editor contents
+
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.image=eclipse/open.gif
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.name=Open
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.tooltip=Open a file
@@ -822,6 +826,9 @@
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.mnemonic=N
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.accelerator=
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.mnemonic=
+
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.mnemonic=C
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-27 11:51:54 UTC (rev 6702)
@@ -8,6 +8,8 @@
Enhancements:
+Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
+
Hibernate Plugin:
New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
