|
From: <ger...@us...> - 2011-03-15 21:08:10
|
Revision: 6195
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6195&view=rev
Author: gerdwagner
Date: 2011-03-15 21:08:02 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
More Query Builder
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/IObjectTreeAPI.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SqlScriptAcessor.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ZoomPrintController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesCtrlr.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/graph.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/IObjectTreeAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/IObjectTreeAPI.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/IObjectTreeAPI.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -20,10 +20,10 @@
* 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 java.awt.*;
import java.util.List;
-import javax.swing.Action;
-import javax.swing.JMenu;
+import javax.swing.*;
import javax.swing.event.TreeModelListener;
import javax.swing.event.TreeSelectionListener;
@@ -281,4 +281,6 @@
FindInObjectTreeController getFindController();
+
+ Component getDetailTabComp();
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -980,6 +980,12 @@
return _findInObjectTreeController;
}
+ @Override
+ public Component getDetailTabComp()
+ {
+ return _splitPane.getRightComponent();
+ }
+
private final class LeftPanel extends JPanel
{
private static final long serialVersionUID = 1L;
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -2,10 +2,12 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
+import java.awt.*;
import java.util.Vector;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
@@ -36,7 +38,8 @@
String fkTableName = fkFrameOriginatingFrom.getTableInfo().getSimpleName();
String pkTableName = pkFramePointingTo.getTableInfo().getSimpleName();
- _dlg = new ConfigureNonDbConstraintDlg(session.getApplication().getMainFrame(), fkTableName, pkTableName);
+ Window parent = SwingUtilities.windowForComponent(fkFrameOriginatingFrom.getFrame());
+ _dlg = new ConfigureNonDbConstraintDlg(parent, fkTableName, pkTableName);
_constraintDataSet = new ConstraintDataSet(constraintView, fkTableName, pkTableName);
_dlg._table.show(_constraintDataSet);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintDlg.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConfigureNonDbConstraintDlg.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -28,9 +28,10 @@
JComboBox _cboLocalCol;
JTextField _txtContstrName;
- public ConfigureNonDbConstraintDlg(MainFrame mainFrame, String fkTableName, String pkTableName)
+ public ConfigureNonDbConstraintDlg(Window parent, String fkTableName, String pkTableName)
{
- super(mainFrame, s_stringMgr.getString("graph.ConfigureNonDbConstraintDlgConfigureNonDBConstraint"), true);
+ super(parent, s_stringMgr.getString("graph.ConfigureNonDbConstraintDlgConfigureNonDBConstraint"));
+ setModal(true);
getContentPane().setLayout(new GridBagLayout());
GridBagConstraints gbc;
@@ -67,7 +68,7 @@
setSize(800, 530);
- GUIUtils.centerWithinScreen(this);
+ GUIUtils.centerWithinParent(this);
getRootPane().setDefaultButton(_btnOk);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -11,6 +11,7 @@
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import java.awt.*;
import java.awt.event.*;
import java.io.File;
import java.util.Arrays;
@@ -214,108 +215,104 @@
};
}
- public void setVisible(boolean b)
+ public void setVisible(Window parent, boolean b)
{
- if (null == _dlg)
+ _dlg = new FormatDlg(parent);
+
+ if(null == _formats)
{
- _dlg = new FormatDlg(_session.getApplication().getMainFrame());
+ _formats = getDefaultFormats();
+ }
- if(null == _formats)
- {
- _formats = getDefaultFormats();
- }
+ _dlg.lstFormats.setListData(_formats);
- _dlg.lstFormats.setListData(_formats);
+ _dlg.cboUnit.addItem(Unit.UNIT_CM);
+ _dlg.cboUnit.addItem(Unit.UNIT_INCH);
+ m_currentUnit = Unit.UNIT_CM;
+ _dlg.cboUnit.setSelectedItem(Unit.UNIT_CM);
- _dlg.cboUnit.addItem(Unit.UNIT_CM);
- _dlg.cboUnit.addItem(Unit.UNIT_INCH);
- m_currentUnit = Unit.UNIT_CM;
- _dlg.cboUnit.setSelectedItem(Unit.UNIT_CM);
+ _dlg.lstFormats.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- _dlg.lstFormats.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-
- _dlg.lstFormats.addListSelectionListener(new ListSelectionListener()
+ _dlg.lstFormats.addListSelectionListener(new ListSelectionListener()
+ {
+ public void valueChanged(ListSelectionEvent e)
{
- public void valueChanged(ListSelectionEvent e)
- {
- onListSelectionChanged(e);
- }
- });
+ onListSelectionChanged(e);
+ }
+ });
- _dlg.lstFormats.addMouseListener(new MouseAdapter()
+ _dlg.lstFormats.addMouseListener(new MouseAdapter()
+ {
+ public void mousePressed(MouseEvent e)
{
- public void mousePressed(MouseEvent e)
- {
- maybeShowListPopUp(e);
- }
+ maybeShowListPopUp(e);
+ }
- public void mouseReleased(MouseEvent e)
- {
- maybeShowListPopUp(e);
- }
- });
+ public void mouseReleased(MouseEvent e)
+ {
+ maybeShowListPopUp(e);
+ }
+ });
- m_lstPopup = new JPopupMenu();
+ m_lstPopup = new JPopupMenu();
- // i18n[graph.mnuDelete=delete]
- JMenuItem mnuDeleteFomat = new JMenuItem(s_stringMgr.getString("graph.mnuDelete"));
- mnuDeleteFomat.addActionListener(new ActionListener()
+ // i18n[graph.mnuDelete=delete]
+ JMenuItem mnuDeleteFomat = new JMenuItem(s_stringMgr.getString("graph.mnuDelete"));
+ mnuDeleteFomat.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
{
- public void actionPerformed(ActionEvent e)
- {
- onDeleteSeletedListItems();
- }
- });
- m_lstPopup.add(mnuDeleteFomat);
+ onDeleteSeletedListItems();
+ }
+ });
+ m_lstPopup.add(mnuDeleteFomat);
- // i18n[graph.landscape=landscape]
- JMenuItem mnuLandscape = new JMenuItem(s_stringMgr.getString("graph.landscape"));
- mnuLandscape.addActionListener(new ActionListener()
+ // i18n[graph.landscape=landscape]
+ JMenuItem mnuLandscape = new JMenuItem(s_stringMgr.getString("graph.landscape"));
+ mnuLandscape.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
{
- public void actionPerformed(ActionEvent e)
- {
- onLandscape();
- }
- });
- m_lstPopup.add(mnuLandscape);
+ onLandscape();
+ }
+ });
+ m_lstPopup.add(mnuLandscape);
- _dlg.btnNew.addActionListener(new ActionListener()
+ _dlg.btnNew.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
{
- public void actionPerformed(ActionEvent e)
- {
- onNew();
- }
- });
+ onNew();
+ }
+ });
- _dlg.btnSave.addActionListener(new ActionListener()
+ _dlg.btnSave.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
{
- public void actionPerformed(ActionEvent e)
- {
- onSave();
- }
- });
+ onSave();
+ }
+ });
- _dlg.addWindowListener(new WindowAdapter()
+ _dlg.addWindowListener(new WindowAdapter()
+ {
+ public void windowClosing(WindowEvent e)
{
- public void windowClosing(WindowEvent e)
- {
- onWindowClosing();
- }
- });
+ onWindowClosing();
+ }
+ });
- _dlg.cboUnit.addItemListener(new ItemListener()
+ _dlg.cboUnit.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent e)
{
- public void itemStateChanged(ItemEvent e)
- {
- onUnitChanged(e);
- }
- });
+ onUnitChanged(e);
+ }
+ });
- }
-
GUIUtils.centerWithinParent(_dlg);
_dlg.setVisible(b);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatDlg.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FormatDlg.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -22,10 +22,11 @@
JComboBox cboUnit;
- public FormatDlg(JFrame parent)
+ public FormatDlg(Window parent)
{
// i18n[graph.formats=Formats]
- super(parent, s_stringMgr.getString("graph.formats"), false);
+ super(parent, s_stringMgr.getString("graph.formats"));
+ setModal(false);
getContentPane().setLayout(new GridLayout(1,2,10,0));
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -165,7 +165,8 @@
tableInfos[i] = tableFrameController.getTableInfo();
}
- SqlScriptAcessor.scriptTablesToSQLEntryArea(_session, tableInfos);
+ Window parent = SwingUtilities.windowForComponent(_panelController.getGraphPanel());
+ SqlScriptAcessor.scriptTablesToSQLEntryArea(parent, _session, tableInfos);
}
private void refreshAllTables()
@@ -436,5 +437,11 @@
{
_panelController.sessionEnding();
}
+
+ public void showQueryBuilderInWindowBesidesObjectTree()
+ {
+ _panelController.getModeManager().setMode(Mode.QUERY_BUILDER);
+ _tabToWindowHandler.showInWindowBesidesObjectTree();
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -385,7 +385,8 @@
private void onRemoveGraph()
{
// i18n[graph.delGraph=Do you really wish to delete this graph?]
- int res = JOptionPane.showConfirmDialog(_session.getApplication().getMainFrame(), s_stringMgr.getString("graph.delGraph"));
+ Window parent = SwingUtilities.windowForComponent(_desktopPane);
+ int res = JOptionPane.showConfirmDialog(parent, s_stringMgr.getString("graph.delGraph"));
if(res == JOptionPane.YES_OPTION)
{
_listener.removeRequest();
@@ -396,7 +397,8 @@
{
// i18n[graph.newName=Please enter a new name]
- String newName = JOptionPane.showInputDialog(_session.getApplication().getMainFrame(), s_stringMgr.getString("graph.newName"));
+ Window parent = SwingUtilities.windowForComponent(_desktopPane);
+ String newName = JOptionPane.showInputDialog(parent, s_stringMgr.getString("graph.newName"));
if(null != newName && 0 != newName.trim().length())
{
_listener.renameRequest(newName);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-import java.util.*;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
import net.sourceforge.squirrel_sql.client.plugin.*;
@@ -31,6 +29,11 @@
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Vector;
+
/**
* The SQL Script plugin class.
*/
@@ -146,6 +149,7 @@
ActionCollection coll = app.getActionCollection();
coll.add(new AddToGraphAction(app, _resources, this));
+ coll.add(new NewQueryBuilderWindowAction(app, _resources, this));
}
/**
@@ -183,6 +187,10 @@
ActionCollection coll = getApplication().getActionCollection();
api.addToPopup(DatabaseObjectType.TABLE, coll.get(AddToGraphAction.class));
+ session.addSeparatorToToolbar();
+ session.addToToolbar(coll.get(NewQueryBuilderWindowAction.class));
+
+
return new PluginSessionCallbackAdaptor(this);
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -130,4 +130,10 @@
{
_listeners.remove(modeManagerListener);
}
+
+ public void setMode(Mode mode)
+ {
+ _mnuMode.setMode(mode);
+ onModeChanged();
+ }
}
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -0,0 +1,34 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+
+import java.awt.event.ActionEvent;
+
+public class NewQueryBuilderWindowAction extends SquirrelAction implements ISessionAction
+{
+ private GraphPlugin _graphPlugin;
+ private ISession _session;
+
+ public NewQueryBuilderWindowAction(IApplication app, PluginResources resources, GraphPlugin graphPlugin)
+ {
+ super(app, resources);
+ _graphPlugin = graphPlugin;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ GraphController gc = _graphPlugin.createNewGraphControllerForSession(_session);
+ gc.showQueryBuilderInWindowBesidesObjectTree();
+ }
+
+ @Override
+ public void setSession(ISession session)
+ {
+ _session = session;
+ }
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -176,7 +176,8 @@
}
};
- new QueryFilterController(_tableName, _columnInfo, graphPlugin, _session, queryFilterListener);
+ Window parent = SwingUtilities.windowForComponent(txtColumn);
+ new QueryFilterController(parent,_tableName, _columnInfo, graphPlugin, _session, queryFilterListener);
}
int getMaxWidth(ColumnInfo[] allColumnInfos)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -28,7 +28,7 @@
private SessionAdapter _sessionAdapter;
- public QueryFilterController(String tableName, ColumnInfo columnInfo, GraphPlugin graphPlugin, ISession session, QueryFilterListener queryFilterListener)
+ public QueryFilterController(Window parent, String tableName, ColumnInfo columnInfo, GraphPlugin graphPlugin, ISession session, QueryFilterListener queryFilterListener)
{
_tableName = tableName;
_columnInfo = columnInfo;
@@ -48,7 +48,7 @@
_session.getApplication().getSessionManager().addSessionListener(_sessionAdapter);
_queryFilterListener = queryFilterListener;
- _queryFilterDlg = new QueryFilterDlg(graphPlugin.getApplication().getMainFrame(), tableName + "." + _columnInfo.toString());
+ _queryFilterDlg = new QueryFilterDlg(parent, tableName + "." + _columnInfo.toString());
boolean applyQuotes = Preferences.userRoot().getBoolean(PREF_KEY_QUERY_ALWAYS_APPEND_QUOTES, false);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -29,9 +29,9 @@
private static final String PREF_KEY_QUERY_FILTER_HEIGHT = "Squirrel.queryFilterDlg.height";
- public QueryFilterDlg(MainFrame mainFrame, String qualifiedColumn)
+ public QueryFilterDlg(Window parent, String qualifiedColumn)
{
- super(mainFrame, s_stringMgr.getString("QueryFilterDlg.title"));
+ super(parent, s_stringMgr.getString("QueryFilterDlg.title"));
getContentPane().setLayout(new GridBagLayout());
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SqlScriptAcessor.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SqlScriptAcessor.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SqlScriptAcessor.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
+import java.awt.*;
public class SqlScriptAcessor
@@ -13,14 +14,14 @@
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(SqlScriptAcessor.class);
- public static void scriptTablesToSQLEntryArea(ISession session, ITableInfo[] tableInfos)
+ public static void scriptTablesToSQLEntryArea(Window parent, ISession session, ITableInfo[] tableInfos)
{
ScriptInterface si = (ScriptInterface) session.getApplication().getPluginManager().bindExternalPluginService("sqlscript", ScriptInterface.class);
if (null == si)
{
// i18n[graph.scriptPlugNeeded=Scripting is only available with the SQL Scripts Plugin.\nGet the plugin from www.squirrelsql.org. It's free.]
String msg = s_stringMgr.getString("graph.scriptPlugNeeded");
- JOptionPane.showMessageDialog(session.getApplication().getMainFrame(), msg);
+ JOptionPane.showMessageDialog(parent, msg);
return;
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrameController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -743,8 +743,10 @@
private void onQueryClearAllFilters()
{
- int opt = JOptionPane.showConfirmDialog(_session.getApplication().getMainFrame(), s_stringMgr.getString("graph.tableFrameController.queryClearAllFilters"));
+ Window parent = SwingUtilities.windowForComponent(_frame);
+ int opt = JOptionPane.showConfirmDialog(parent, s_stringMgr.getString("graph.tableFrameController.queryClearAllFilters"));
+
if (JOptionPane.YES_OPTION != opt)
{
return;
@@ -757,7 +759,8 @@
{
if(false == b)
{
- int opt = JOptionPane.showConfirmDialog(_session.getApplication().getMainFrame(), s_stringMgr.getString("graph.tableFrameController.queryUnselectAll"));
+ Window parent = SwingUtilities.windowForComponent(_frame);
+ int opt = JOptionPane.showConfirmDialog(parent, s_stringMgr.getString("graph.tableFrameController.queryUnselectAll"));
if(JOptionPane.YES_OPTION != opt)
{
@@ -793,7 +796,8 @@
private void onScriptTable()
{
- SqlScriptAcessor.scriptTablesToSQLEntryArea(_session, new ITableInfo[]{getTableInfo()});
+ Window parent = SwingUtilities.windowForComponent(_frame);
+ SqlScriptAcessor.scriptTablesToSQLEntryArea(parent, _session, new ITableInfo[]{getTableInfo()});
}
public ITableInfo getTableInfo()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ZoomPrintController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ZoomPrintController.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ZoomPrintController.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -7,6 +7,7 @@
import net.sourceforge.squirrel_sql.plugins.graph.graphtofiles.GraphToFilesCtrlr;
import net.sourceforge.squirrel_sql.plugins.graph.graphtofiles.SaveToFilePageFormat;
+import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.event.ActionEvent;
@@ -230,8 +231,8 @@
images.add(img);
}
- new GraphToFilesCtrlr(images.toArray(new BufferedImage[images.size()]),
- _session.getApplication().getMainFrame());
+ Window parent = SwingUtilities.windowForComponent(_panel);
+ new GraphToFilesCtrlr(images.toArray(new BufferedImage[images.size()]), parent);
}
catch (PrinterException e)
@@ -328,7 +329,8 @@
private void onBtnFormat()
{
- _formatController.setVisible(true);
+ Window parent = SwingUtilities.windowForComponent(_panel);
+ _formatController.setVisible(parent, true);
}
private void onHideScrollbars()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesCtrlr.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesCtrlr.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesCtrlr.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -1,12 +1,12 @@
package net.sourceforge.squirrel_sql.plugins.graph.graphtofiles;
-import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.ExtensionFilter;
import javax.imageio.ImageIO;
import javax.swing.*;
+import java.awt.*;
import java.awt.image.BufferedImage;
import java.awt.event.*;
import java.io.File;
@@ -23,13 +23,13 @@
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(GraphToFilesCtrlr.class);
private BufferedImage[] _images;
- private MainFrame _mainFrame;
+ private Window _parent;
- public GraphToFilesCtrlr(BufferedImage[] images, MainFrame mainFrame)
+ public GraphToFilesCtrlr(BufferedImage[] images, Window parent)
{
_images = images;
- _mainFrame = mainFrame;
- _dlg = new GraphToFilesDlg(mainFrame, images);
+ _parent = parent;
+ _dlg = new GraphToFilesDlg(parent, images);
_dlg.btnClose.addActionListener(new ActionListener()
{
@@ -92,7 +92,7 @@
fc.setFileFilter(ef);
}
- if (fc.showSaveDialog(_mainFrame) == JFileChooser.APPROVE_OPTION)
+ if (fc.showSaveDialog(_parent) == JFileChooser.APPROVE_OPTION)
{
File selectedFile = fc.getSelectedFile();
if (null != selectedFile)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesDlg.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesDlg.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -21,10 +21,10 @@
StringManagerFactory.getStringManager(GraphToFilesCtrlr.class);
- public GraphToFilesDlg(Frame owner, BufferedImage[] images)
+ public GraphToFilesDlg(Window parent, BufferedImage[] images)
throws HeadlessException
{
- super(owner);
+ super(parent);
// i18n[graphToClipboard.title=Copy graph image pages to clipboard]
setTitle(s_stringMgr.getString("graphToFile.title"));
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-03-15 21:08:02 UTC (rev 6195)
@@ -42,7 +42,11 @@
tabBoundsOnScreen.height = size.height;
+ toWindowAtBounds(tabBoundsOnScreen);
+ }
+ private void toWindowAtBounds(Rectangle tabBoundsOnScreen)
+ {
final int tabIdx = _session.getSessionSheet().removeMainTab(_graphMainPanelTab);
GraphWindowControllerListener listener = new GraphWindowControllerListener()
@@ -115,4 +119,16 @@
{
_graphMainPanelTab.setTitle(title);
}
+
+ public void showInWindowBesidesObjectTree()
+ {
+ _session.selectMainTab(ISession.IMainPanelTabIndexes.OBJECT_TREE_TAB);
+
+ Component detailTabComp = _session.getObjectTreeAPIOfActiveSessionWindow().getDetailTabComp();
+ Point locOnScreen = GUIUtils.getScreenLocationFor(detailTabComp);
+
+ Rectangle bounds = new Rectangle(locOnScreen.x, locOnScreen.y, detailTabComp.getWidth(), detailTabComp.getHeight());
+
+ toWindowAtBounds(bounds);
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/graph.properties 2011-03-15 21:08:02 UTC (rev 6195)
@@ -15,6 +15,9 @@
action.net.sourceforge.squirrel_sql.plugins.graph.AddToGraphAction.name=Add to graph
action.net.sourceforge.squirrel_sql.plugins.graph.AddToGraphAction.tooltip=Add to graph
+action.net.sourceforge.squirrel_sql.plugins.graph.NewQueryBuilderWindowAction.name=Query Builder
+action.net.sourceforge.squirrel_sql.plugins.graph.NewQueryBuilderWindowAction.tooltip=Open new Query Builder
+action.net.sourceforge.squirrel_sql.plugins.graph.NewQueryBuilderWindowAction.image=graph.png
########
# Menus.
@@ -29,4 +32,5 @@
menuitem.net.sourceforge.squirrel_sql.plugins.graph.AddToGraphAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.plugins.graph.AddToGraphAction.mnemonic=
-
+menuitem.net.sourceforge.squirrel_sql.plugins.graph.NewQueryBuilderWindowAction.accelerator=
+menuitem.net.sourceforge.squirrel_sql.plugins.graph.NewQueryBuilderWindowAction.mnemonic=
Added: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/graph.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/graph.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties 2011-03-15 20:42:37 UTC (rev 6194)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties 2011-03-15 21:08:02 UTC (rev 6195)
@@ -1,2 +1,2 @@
-graph.window.return=Return
+graph.window.return=Return to tab
graph.window.stayOnTop=Stay on top
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
