Skip to content

Commit 4b51d05

Browse files
committed
Feature: #41
Table cell data popup dialog now offers a toggle button to pin the dialog. When pinned any further cell data will be displayed in the pinned dialog.
1 parent 4e0f7be commit 4b51d05

35 files changed

+318
-160
lines changed

sql12/core/doc/changes.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Not yet released, available in our GIT repository, snapshots and future releases
66

77
Enhancements:
88

9+
https://github.com/squirrel-sql-client/squirrel-sql-code/issues/41
10+
Table cell data popup dialog now offers a toggle button to pin the dialog.
11+
When pinned any further cell data will be displayed in the pinned dialog.
12+
913
https://github.com/squirrel-sql-client/squirrel-sql-code/issues/44
1014
SQL result table: Numeric values can now be right aligned,
1115
see menu File --> Global Preferences tab Data Types --> section "General"

sql12/core/src/net/sourceforge/squirrel_sql/client/Application.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeComponentFactoryRegistry;
6666
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypePropertiesManager;
6767
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellImportExportInfoSaver;
68+
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.PinnedCellDataDialogHandler;
6869
import net.sourceforge.squirrel_sql.fw.datasetviewer.columndisplaychoice.CellDetailDisplayModeManager;
6970
import net.sourceforge.squirrel_sql.fw.gui.ErrorDialog;
7071
import net.sourceforge.squirrel_sql.fw.gui.action.fileexport.MultipleSqlResultExportChannel;
@@ -238,6 +239,7 @@ public class Application implements IApplication
238239
private DataTypePropertiesManager _dataTypePropertiesManager = new DataTypePropertiesManager();
239240

240241
private CellDetailDisplayModeManager _cellDetailDisplayModeManager = new CellDetailDisplayModeManager();
242+
private PinnedCellDataDialogHandler _pinnedCellDataDialogHandler = new PinnedCellDataDialogHandler();
241243

242244
public Application()
243245
{
@@ -1558,4 +1560,10 @@ public CellDetailDisplayModeManager getCellDetailDisplayModeManager()
15581560
{
15591561
return _cellDetailDisplayModeManager;
15601562
}
1563+
1564+
@Override
1565+
public PinnedCellDataDialogHandler getStickyCellDataDialog()
1566+
{
1567+
return _pinnedCellDataDialogHandler;
1568+
}
15611569
}

sql12/core/src/net/sourceforge/squirrel_sql/client/IApplication.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import net.sourceforge.squirrel_sql.client.shortcut.ShortcutManager;
4848
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeComponentFactoryRegistry;
4949
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypePropertiesManager;
50+
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.PinnedCellDataDialogHandler;
5051
import net.sourceforge.squirrel_sql.fw.datasetviewer.columndisplaychoice.CellDetailDisplayModeManager;
5152
import net.sourceforge.squirrel_sql.fw.gui.action.fileexport.MultipleSqlResultExportChannel;
5253
import net.sourceforge.squirrel_sql.fw.gui.action.rowselectionwindow.RowsWindowFrameRegistry;
@@ -315,4 +316,6 @@ interface IMenuIDs extends MainFrame.IMenuIDs
315316
DataTypePropertiesManager getDataTypePropertiesManager();
316317

317318
CellDetailDisplayModeManager getCellDetailDisplayModeManager();
319+
320+
PinnedCellDataDialogHandler getStickyCellDataDialog();
318321
}

sql12/core/src/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ public interface IImageNames
207207

208208
String RUN_ALL = "run_all";
209209

210+
String PINNED = "pinned";
211+
210212
}
211213

212214
public SquirrelResources(String rsrcBundleBaseName)
Binary file not shown.
400 Bytes
Loading

sql12/core/src/net/sourceforge/squirrel_sql/client/resources/squirrel.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ show_detail.image=show_detail.png
196196

197197
run_all.image=eclipse/active/run_all.png
198198

199+
pinned.image=pinned.png
200+
199201
########
200202
# Configuration information for ObjectTreeInternalFrame.
201203
########
@@ -495,7 +497,7 @@ action.net.sourceforge.squirrel_sql.client.session.action.CloseCurrentSQLResultT
495497
action.net.sourceforge.squirrel_sql.client.session.action.CloseCurrentSQLResultTabAction.name=Close current SQL Result Tab
496498
action.net.sourceforge.squirrel_sql.client.session.action.CloseCurrentSQLResultTabAction.tooltip=Close current SQL Result Tab
497499

498-
action.net.sourceforge.squirrel_sql.client.session.action.ToggleCurrentSQLResultTabStickyAction.image=eclipse/pinned.gif
500+
action.net.sourceforge.squirrel_sql.client.session.action.ToggleCurrentSQLResultTabStickyAction.image=pinned.png
499501
action.net.sourceforge.squirrel_sql.client.session.action.ToggleCurrentSQLResultTabStickyAction.name=Toggle current SQL Result Tab sticky
500502
action.net.sourceforge.squirrel_sql.client.session.action.ToggleCurrentSQLResultTabStickyAction.tooltip=Toggle current SQL Result Tab sticky
501503

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTable.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
55
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellRenderer;
66
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField;
7-
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataPopup;
7+
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataDialogHandler;
88
import net.sourceforge.squirrel_sql.fw.datasetviewer.coloring.ColoringService;
99
import net.sourceforge.squirrel_sql.fw.gui.RectangleSelectionHandler;
1010
import net.sourceforge.squirrel_sql.fw.gui.table.ButtonTableHeader;
@@ -15,11 +15,15 @@
1515
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
1616
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
1717

18-
import javax.swing.*;
18+
import javax.swing.DefaultCellEditor;
19+
import javax.swing.JOptionPane;
20+
import javax.swing.JTable;
1921
import javax.swing.table.DefaultTableColumnModel;
2022
import javax.swing.table.TableCellEditor;
2123
import javax.swing.table.TableColumnModel;
22-
import java.awt.*;
24+
import java.awt.Graphics;
25+
import java.awt.Point;
26+
import java.awt.Rectangle;
2327
import java.awt.event.KeyEvent;
2428
import java.awt.event.MouseAdapter;
2529
import java.awt.event.MouseEvent;
@@ -392,7 +396,7 @@ else if (evt.getClickCount() == 2 && false == tableClickPosition.isClickedOnTabl
392396
if (RowNumberTableColumn.ROW_NUMBER_MODEL_INDEX != modelIndex)
393397
{
394398
ColumnDisplayDefinition colDefs[] = _dataSetViewerTablePanel.getColumnDefinitions();
395-
CellDataPopup.showDialog(this, colDefs[modelIndex], evt, _dataSetViewerTablePanel.isTableEditable());
399+
CellDataDialogHandler.showDialog(this, colDefs[modelIndex], evt, _dataSetViewerTablePanel.isTableEditable());
396400
}
397401
}
398402
}

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/RowDataInputFrame.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
24-
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataPopup;
24+
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataDialogHandler;
2525
import net.sourceforge.squirrel_sql.fw.sql.JDBCTypeMapper;
2626
import net.sourceforge.squirrel_sql.fw.util.StringManager;
2727
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -264,7 +264,7 @@ else if (evt.getClickCount() == 2)
264264

265265
Point pt = evt.getPoint();
266266
int col = RowDataJTable.this.columnAtPoint(pt);
267-
CellDataPopup.showDialog(RowDataJTable.this, _colDefs[col], evt, true);
267+
CellDataDialogHandler.showDialog(RowDataJTable.this, _colDefs[col], evt, true);
268268
}
269269
}
270270
public void mouseReleased(MouseEvent evt)

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BaseDataTypeComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause.EmptyWhereClausePart;
2323
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause.IWhereClausePart;
2424
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.whereClause.IsNullWhereClausePart;
25-
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataPopup;
25+
import net.sourceforge.squirrel_sql.fw.datasetviewer.celldatapopup.CellDataDialogHandler;
2626
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
2727
import net.sourceforge.squirrel_sql.fw.dialects.DialectUtils2;
2828
import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
@@ -130,7 +130,7 @@ public void mousePressed(MouseEvent evt)
130130
{
131131
MouseEvent tableEvt = SwingUtilities.convertMouseEvent(
132132
_textField, evt, table);
133-
CellDataPopup.showDialog(table, _colDef, tableEvt, true);
133+
CellDataDialogHandler.showDialog(table, _colDef, tableEvt, true);
134134
}
135135
}
136136
}); // end of mouse listener

0 commit comments

Comments
 (0)