|
From: <ger...@us...> - 2011-03-24 21:51:16
|
Revision: 6206
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6206&view=rev
Author: gerdwagner
Date: 2011-03-24 21:51:09 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
More Query Builder
Modified Paths:
--------------
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/GraphDesktopListener.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/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.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/I18NStrings.properties
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-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -92,6 +92,12 @@
{
onTablesDropped(tis, dropPoint);
}
+
+ @Override
+ public void toggleWindowTab()
+ {
+ _tabToWindowHandler.toggleWindowTab();
+ }
};
_panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin);
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-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -36,6 +36,7 @@
private JMenuItem _mnuSelectTablesByName;
private JCheckBoxMenuItem _mnuShowConstraintNames;
private JCheckBoxMenuItem _mnuShowQualifiedTableNames;
+ private JMenuItem _mnuToggleWindowTab;
private GraphDesktopListener _listener;
private ISession _session;
private GraphPlugin _plugin;
@@ -253,7 +254,18 @@
}
});
+ ImageIcon toWInIcon = _graphPluginResources.getIcon(GraphPluginResources.IKeys.TO_WINDOW);
+ _mnuToggleWindowTab = new JMenuItem(s_stringMgr.getString("graph.toggleWindowTab"), toWInIcon);
+ _mnuToggleWindowTab.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onToggleWindowTab();
+ }
+ });
+
_mnuAllTablesDbOrder = new JMenuItem(s_stringMgr.getString("graph.allTablesDbOrderRequested"));
_mnuAllTablesDbOrder.addActionListener(new ActionListener()
{
@@ -311,6 +323,8 @@
_popUp.add(_mnuShowConstraintNames);
_popUp.add(_mnuShowQualifiedTableNames);
_popUp.add(new JSeparator());
+ _popUp.add(_mnuToggleWindowTab);
+ _popUp.add(new JSeparator());
_popUp.add(_modeManager.getModeMenuItem());
_modeManager.addModeManagerListener(new ModeManagerListener()
@@ -370,7 +384,13 @@
_listener.allTablesFilteredSelectedOrderRequested();
}
+ private void onToggleWindowTab()
+ {
+ _listener.toggleWindowTab();
+ }
+
+
private void onScriptAllTables()
{
_listener.scriptAllTablesRequested();
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2011-03-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopListener.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -25,4 +25,5 @@
void tablesDropped(List<ITableInfo> tis, Point dropPoint);
+ void toggleWindowTab();
}
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-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -35,6 +35,7 @@
_columnInfo = columnInfo;
_session = session;
_graphPluginResources = new GraphPluginResources(graphPlugin);
+ setBorder(BorderFactory.createEmptyBorder());
JPanel pnlButtons = new JPanel(new GridBagLayout());
pnlButtons.setBackground(GraphTextAreaFactory.TEXTAREA_BG);
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-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -16,7 +16,7 @@
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryFilterDlg.class);
- private static final int MIN_HEIGHT = 240;
+ private static final int MIN_HEIGHT = 270;
JTextField _txtFilter;
JButton _btnOk;
@@ -87,6 +87,8 @@
getRootPane().getInputMap(JComponent.WHEN_FOCUSED).put(escapeStroke, "CloseAction");
getRootPane().getActionMap().put("CloseAction", closeAction);
+ getRootPane().setDefaultButton(_btnOk);
+
int width = Preferences.userRoot().getInt(PREF_KEY_QUERY_FILTER_WIDTH, 500);
int height = Preferences.userRoot().getInt(PREF_KEY_QUERY_FILTER_HEIGHT, MIN_HEIGHT);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-03-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -245,4 +245,9 @@
_frameWindow.setTitle(newName);
}
}
+
+ public void returnToTab()
+ {
+ onReturn();
+ }
}
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-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-03-24 21:51:09 UTC (rev 6206)
@@ -131,4 +131,16 @@
toWindowAtBounds(bounds);
}
+
+ public void toggleWindowTab()
+ {
+ if(null == _graphWindowController)
+ {
+ toWindow();
+ }
+ else
+ {
+ _graphWindowController.returnToTab();
+ }
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-03-23 00:46:58 UTC (rev 6205)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-03-24 21:51:09 UTC (rev 6206)
@@ -195,3 +195,6 @@
graph.GraphQueryResultPanel.autoSyncResult=Auto sync result
graph.GraphQueryResultPanel.syncResultNow=Sync result
+
+
+graph.toggleWindowTab=Switch window/tab display
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
