diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java @@ -62,6 +62,7 @@ import javax.swing.JPopupMenu; import javax.swing.JTable; import javax.swing.RowFilter; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -176,17 +177,23 @@ if (isSelected) { if ((obj == null && value == null) || (obj != null && value != null && value.equals(obj))) { - color = gray; + color = UIManager.getColor("nb.dataview.tablecell.edited.selected.emptyNull.foreground") != null ? + UIManager.getColor("nb.dataview.tablecell.edited.selected.emptyNull.foreground"): + gray; override = true; } else { - color = Color.ORANGE; + color = UIManager.getColor("nb.dataview.tablecell.edited.selected.foreground") != null ? + UIManager.getColor("nb.dataview.tablecell.edited.selected.foreground") : + Color.ORANGE; override = true; } } else { if ((obj == null && value == null) || (obj != null && value != null && value.equals(obj))) { color = table.getForeground(); } else { - color = green; + color = UIManager.getColor("nb.dataview.tablecell.edited.unselected.foreground") != null ? + UIManager.getColor("nb.dataview.tablecell.edited.unselected.foreground") : + green; override = true; } } diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableDecorator.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableDecorator.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableDecorator.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableDecorator.java @@ -60,7 +60,7 @@ public static final Color ROW_COLOR = UIManager.getColor("nb.dataview.table.background") != null ? UIManager.getColor("nb.dataview.table.background") : Color.WHITE; public static final Color ALTERNATE_ROW_COLOR = UIManager.getColor("nb.dataview.table.altbackground") != null ? UIManager.getColor("nb.dataview.table.altbackground") : new Color(0.92F, 0.95F, 0.99F); public static final Color GRID_COLOR = UIManager.getColor("nb.dataview.table.gridbackground") != null ? UIManager.getColor("nb.dataview.table.gridbackground") : new Color(14277081); - public static final Color ROLLOVER_ROW_COLOR = UIManager.getColor("nb.dataview.table.altbackground") != null ? UIManager.getColor("nb.dataview.table.altbackground") : new Color(0.94F, 0.96F, 0.96F); + public static final Color ROLLOVER_ROW_COLOR = UIManager.getColor("nb.dataview.table.rollOverRowBackground") != null ? UIManager.getColor("nb.dataview.table.rollOverRowBackground") : new Color(0.94F, 0.96F, 0.96F); JXTableDecorator() { super(); diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java @@ -124,7 +124,7 @@ setAutoResizeMode(JXTable.AUTO_RESIZE_OFF); setFillsViewportHeight(true); - setHighlighters(HighlighterFactory.createAlternateStriping(Color.WHITE, ALTERNATE_ROW_COLOR)); + setHighlighters(HighlighterFactory.createAlternateStriping(ROW_COLOR, ALTERNATE_ROW_COLOR)); addHighlighter(new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, ROLLOVER_ROW_COLOR, null)); setDefaultCellRenderers(); diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/util/JXDateTimePicker.java @@ -140,7 +140,7 @@ static { LookAndFeelAddons.contribute(new DatePickerAddon()); } - + /** * UI Class ID */ @@ -358,6 +358,32 @@ _monthView = new JXMonthView(); // _monthView.setSelectionModel(new SingleDaySelectionModel()); _monthView.setTraversable(true); + + if(UIManager.getColor("nb.dataview.jxdatetimepicker.background") != null){ + _monthView.setBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.background")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground") != null){ + _monthView.setForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.foreground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground") != null){ + _monthView.setSelectionBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedBackground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground") != null){ + _monthView.setSelectionForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.selectedForeground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground") != null){ + _monthView.setMonthStringBackground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringBackground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground") != null){ + _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.monthStringForeground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground") != null){ + _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.daysOfTheWeekForeground")); + } + if(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground") != null){ + _monthView.setMonthStringForeground(UIManager.getColor("nb.dataview.jxdatetimepicker.todayBackground")); + } + _monthView.addPropertyChangeListener(getMonthViewListener()); } @@ -918,11 +944,19 @@ @SuppressWarnings("rawtypes") TodayPanel() { super(new FlowLayout()); - setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, new Color(238, 238, 238), 0, 1, Color.WHITE))); + Color gradientStart = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start") != null + ? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.start") + : new Color(238, 238, 238); + Color gradientEnd = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end") != null + ? UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.background.gradient.end") + : Color.WHITE; + setBackgroundPainter(new MattePainter(new GradientPaint(0, 0, gradientStart, 0, 1, gradientEnd))); todayAction = new TodayAction(); todayLink = new JXHyperlink(todayAction); todayLink.addMouseListener(createDoubleClickListener()); - Color textColor = new Color(16, 66, 104); + Color textColor = UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") != null ? + UIManager.getColor("nb.dataview.jxdatetimepicker.todayPanel.linkForeground") : + new Color(16, 66, 104); todayLink.setUnclickedColor(textColor); todayLink.setClickedColor(textColor); add(todayLink);