|
From: <ger...@us...> - 2012-07-05 22:39:42
|
Revision: 6641
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6641&view=rev
Author: gerdwagner
Date: 2012-07-05 22:39:35 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Removed misleading button "Remember widths" from Overview Tab
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -69,22 +69,8 @@
onShowInTableWin();
}
});
-
- _overwiewPanel.btnSaveColumnWidth.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onSaveColumnWidths();
- }
- });
-
}
- private void onSaveColumnWidths()
- {
- _overviewHolder.getDataScaleTable().saveColumnWidths();
- }
private void onShowInTableWin()
@@ -258,11 +244,11 @@
col.setHeaderValue(DataScaleTableModel.getColumnNames()[i]);
if (DataScaleTableModel.COL_NAME_COLUMN.equals(DataScaleTableModel.getColumnNames()[i]))
{
- col.setPreferredWidth(dataScaleTableModel.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
}
else if (DataScaleTableModel.COL_NAME_DATA.equals(DataScaleTableModel.getColumnNames()[i]))
{
- col.setPreferredWidth(dataScaleTableModel.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
}
tcm.addColumn(col);
}
@@ -280,8 +266,6 @@
_overwiewPanel.btnShowInTable.setEnabled(_overviewHolder.canShowInSimpleTable());
_overwiewPanel.btnShowInTableWin.setEnabled(_overviewHolder.canShowInSimpleTable());
- _overwiewPanel.btnSaveColumnWidth.setEnabled(_overviewHolder.isScaleTable());
-
_overwiewPanel.scrollPane.setViewportView(_overviewHolder.getComponent());
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -20,7 +20,6 @@
JButton btnShowInTableWin;
JButton btnShowInTable;
- JButton btnSaveColumnWidth;
public OverwiewPanel(SquirrelResources rsrc)
{
@@ -65,13 +64,7 @@
btnShowInTableWin.setToolTipText(s_stringMgr.getString("OverwiewPanel.showTableInWinToolTip"));
ret.add(btnShowInTableWin, gbc);
- gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,20,0,0),0,0);
- btnSaveColumnWidth = new JButton(s_stringMgr.getString("OverwiewPanel.saveColumnWidth"));
- btnSaveColumnWidth.setToolTipText(s_stringMgr.getString("OverwiewPanel.saveColumnWidthToolTip"));
- ret.add(btnSaveColumnWidth, gbc);
-
-
- gbc = new GridBagConstraints(5,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
+ gbc = new GridBagConstraints(4,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
ret.add(new JPanel(), gbc);
return ret;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -15,8 +15,6 @@
public class DataScaleTable extends SortableTable
{
-
-
private List<Object[]> _allRows;
private ColumnDisplayDefinition[] _columnDefinitions;
@@ -35,6 +33,8 @@
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
new DataScaleTablePopupHandler(this);
+
+ new DataScaleTableColumnWidthsPersister(getTableHeader());
}
@@ -142,23 +142,4 @@
{
return _kidSimpleTable;
}
-
- public void saveColumnWidths()
- {
- int wColumn = DataScaleTableModel.DEFAULT_COL_WIDTH_COLUMN;
- int wData = DataScaleTableModel.DEFAULT_COL_WIDTH_DATA;
- for (int i = 0; i < getColumnModel().getColumnCount(); i++)
- {
- if(DataScaleTableModel.COL_NAME_COLUMN.equals(getColumnModel().getColumn(i).getHeaderValue()))
- {
- wColumn = getColumnModel().getColumn(i).getWidth();
- }
- else if(DataScaleTableModel.COL_NAME_DATA.equals(getColumnModel().getColumn(i).getHeaderValue()))
- {
- wData = getColumnModel().getColumn(i).getWidth();
- }
-
- DataScaleTableModel.saveColumWidhts(wColumn, wData);
- }
- }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -0,0 +1,104 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
+
+import javax.swing.*;
+import javax.swing.table.JTableHeader;
+import javax.swing.table.TableColumnModel;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.prefs.Preferences;
+
+public class DataScaleTableColumnWidthsPersister
+{
+ private static final int DEFAULT_COL_WIDTH_COLUMN = 100;
+ private static final int DEFAULT_COL_WIDTH_DATA = 1000;
+
+ private static final String PREF_KEY_COL_WIDTH_COLUMN = "Squirrel.overview.colWidthColumn";
+ private static final String PREF_KEY_COL_WIDTH_DATA = "Squirrel.overview.colWidthData";
+
+ private final Timer _timer;
+ private JTableHeader _tableHeader;
+
+ public DataScaleTableColumnWidthsPersister(final JTableHeader tableHeader)
+ {
+ _tableHeader = tableHeader;
+ tableHeader.addMouseMotionListener(new MouseMotionAdapter()
+ {
+ @Override
+ public void mouseDragged(MouseEvent e)
+ {
+ onMouseDraggedOnTableHeader(e);
+ }
+ });
+
+ tableHeader.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ if(2 == e.getClickCount() && _tableHeader.getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ {
+ onMouseDraggedOnTableHeader(e);
+ }
+ }
+ });
+
+ _timer = new Timer(200, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ saveColumnWidths();
+ }
+ });
+
+ _timer.setRepeats(false);
+
+ }
+
+ private void onMouseDraggedOnTableHeader(MouseEvent e)
+ {
+ _timer.restart();
+ }
+
+ public static int getColumnWidthForColName(String colName)
+ {
+ if(DataScaleTableModel.COL_NAME_COLUMN.equals(colName))
+ {
+ return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_COLUMN, DEFAULT_COL_WIDTH_COLUMN);
+ }
+ else if(DataScaleTableModel.COL_NAME_DATA.equals(colName))
+ {
+ return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_DATA, DEFAULT_COL_WIDTH_DATA);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unknown column name " + colName);
+ }
+
+ }
+
+ private void saveColumnWidths()
+ {
+ TableColumnModel columnModel = _tableHeader.getColumnModel();
+
+ int wColumn = DEFAULT_COL_WIDTH_COLUMN;
+ int wData = DEFAULT_COL_WIDTH_DATA;
+ for (int i = 0; i < columnModel.getColumnCount(); i++)
+ {
+ if(DataScaleTableModel.COL_NAME_COLUMN.equals(columnModel.getColumn(i).getHeaderValue()))
+ {
+ wColumn = columnModel.getColumn(i).getWidth();
+ }
+ else if(DataScaleTableModel.COL_NAME_DATA.equals(columnModel.getColumn(i).getHeaderValue()))
+ {
+ wData = columnModel.getColumn(i).getWidth();
+ }
+
+ }
+
+ Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_COLUMN, wColumn);
+ Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_DATA, wData);
+
+ //System.out.println("DataScaleTableColumnWidthsPersister.saveColumnWidths wC=" + wColumn + "; wD=" +wData);
+
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -10,16 +10,10 @@
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataScaleTableModel.class);
- private static final String PREF_KEY_COL_WIDTH_COLUMN = "Squirrel.overview.colWidthColumn";
- private static final String PREF_KEY_COL_WIDTH_DATA = "Squirrel.overview.colWidthData";
-
public static final String COL_NAME_COLUMN = s_stringMgr.getString("DataScaleTableModel.colNameColumn");
public static final String COL_NAME_DATA = s_stringMgr.getString("DataScaleTableModel.colNameData");
- public static final int DEFAULT_COL_WIDTH_COLUMN = 100;
- public static final int DEFAULT_COL_WIDTH_DATA = 1000;
-
private DataScale[] _dataScales;
@@ -29,24 +23,7 @@
_dataScales = dataScales;
}
- public int getColumnWidthForColName(String colName)
- {
- if(COL_NAME_COLUMN.equals(colName))
- {
- return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_COLUMN, DEFAULT_COL_WIDTH_COLUMN);
- }
- else if(COL_NAME_DATA.equals(colName))
- {
- return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_DATA, DEFAULT_COL_WIDTH_DATA);
- }
- else
- {
- throw new IllegalArgumentException("Unknown column name " + colName);
- }
- }
-
-
public static String[] getColumnNames()
{
return new String[]{COL_NAME_COLUMN, COL_NAME_DATA};
@@ -88,9 +65,4 @@
return _dataScales[row];
}
- public static void saveColumWidhts(int wColumn, int wData)
- {
- Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_COLUMN, wColumn);
- Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_DATA, wData);
- }
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-07-05 22:39:35 UTC (rev 6641)
@@ -9,6 +9,8 @@
Enhancements:
+Removed misleading button "Remember widths" from Overview Tab
+
Instead of displaying the file paths in Session tabs a small button is displayed when an open file exists.
Clicking the button will open a popup menu that gives access to several information and functions concerning the file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
