[mac-widgets] 01/06: Merge tag 'upstream/0.10.0+svn416-dfsg1'
Gilles Filippini
pini at moszumanska.debian.org
Mon Sep 22 09:31:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository mac-widgets.
commit 2523738e73b176a8e500302fb633f8efaf26a326
Merge: ac6547f ba7de6b
Author: Gilles Filippini <pini at debian.org>
Date: Mon Sep 22 00:11:10 2014 +0200
Merge tag 'upstream/0.10.0+svn416-dfsg1'
Upstream version 0.10.0+svn416-dfsg1
Conflicts:
source/com/explodingpixels/macwidgets/MacButtonFactory.java
.classpath | 8 +
.project | 17 +
.settings/org.eclipse.jdt.core.prefs | 12 +
.../com/explodingpixels/macwidgets/DBottomBar.java | 89 +-
.../macwidgets/DComponentBottomBar.java | 67 +-
.../explodingpixels/macwidgets/DEverything.java | 55 +-
.../explodingpixels/macwidgets/DHudControls.java | 34 +-
.../explodingpixels/macwidgets/DITunesTableUI.java | 194 +--
.../macwidgets/DSourceListExpansionListener.java | 84 ++
.../macwidgets/DUnifiedToolbar.java | 138 +-
ide_support/intellij/MacWidgets.ipr | 78 +-
ide_support/intellij/MacWidgets.iws | 1426 ++++++--------------
ide_support/intellij/macwidgets/macwidgets.iml | 22 +-
.../border/FocusStateMatteBorder.java | 11 +-
.../explodingpixels/macwidgets/ActivePanel.java | 96 ++
.../com/explodingpixels/macwidgets/BottomBar.java | 362 +++--
.../macwidgets/ComponentBottomBar.java | 196 ++-
.../macwidgets/ComponentTopBar.java | 4 +-
.../macwidgets/HudWidgetFactory.java | 33 +-
.../com/explodingpixels/macwidgets/HudWindow.java | 48 +-
.../macwidgets/IAppWidgetFactory.java | 21 +-
.../macwidgets/ITunesRatingTableCellEditor.java | 45 +
.../macwidgets/ITunesRatingTableCellRenderer.java | 9 +-
.../macwidgets/ITunesTableHeaderRenderer.java | 32 +-
.../macwidgets/LabeledComponentGroup.java | 41 +-
.../macwidgets/MacBadgeContentProvider.java | 11 +
...untBadgeRenderer.java => MacBadgeRenderer.java} | 49 +-
.../macwidgets/MacButtonFactory.java | 51 +-
.../explodingpixels/macwidgets/MacColorUtils.java | 4 +-
.../explodingpixels/macwidgets/MacFontUtils.java | 33 +-
.../macwidgets/MacPainterFactory.java | 28 +-
.../com/explodingpixels/macwidgets/MacUtils.java | 4 +-
.../macwidgets/MacWidgetFactory.java | 9 +-
.../macwidgets/PreferencesTabBar.java | 18 +-
.../macwidgets/RatingComponent.java | 21 +-
.../macwidgets/RatingStarEditorPanel.java | 138 ++
.../com/explodingpixels/macwidgets/SourceList.java | 190 ++-
.../macwidgets/SourceListBadgeContentProvider.java | 2 +-
.../macwidgets/SourceListBizLafColorScheme.java | 39 +
.../macwidgets/SourceListCategory.java | 4 +-
.../macwidgets/SourceListColorScheme.java | 21 +-
.../macwidgets/SourceListControlBar.java | 72 +-
.../macwidgets/SourceListCountBadgeRenderer.java | 111 +-
.../macwidgets/SourceListDarkColorScheme.java | 29 +-
.../macwidgets/SourceListExpansionListener.java | 72 +
.../explodingpixels/macwidgets/SourceListItem.java | 16 +-
.../macwidgets/SourceListSeaGlassColorScheme.java | 39 +
.../macwidgets/SourceListStandardColorScheme.java | 31 +-
.../macwidgets/TriAreaComponent.java | 394 +++---
.../explodingpixels/macwidgets/UnifiedToolBar.java | 242 ++--
.../macwidgets/WidgetBaseColors.java | 62 +
.../macwidgets/WidgetColorScheme.java | 164 +++
...ColorScheme.java => WidgetDarkColorScheme.java} | 93 +-
.../explodingpixels/macwidgets/WidgetFactory.java | 34 +
...rScheme.java => WidgetStandardColorScheme.java} | 79 +-
.../images/iapp_scrollpane_corner_left.png | Bin 0 -> 2366 bytes
.../macwidgets/plaf/ArtworkUtils.java | 7 +-
.../macwidgets/plaf/EmphasizedLabelUI.java | 11 +-
.../macwidgets/plaf/HudButtonUI.java | 59 +-
.../macwidgets/plaf/HudCheckBoxUI.java | 65 +-
.../macwidgets/plaf/HudComboBoxUI.java | 52 +-
.../macwidgets/plaf/HudLabelUI.java | 12 +-
.../macwidgets/plaf/HudPaintingUtils.java | 54 +-
...HudTextFieldUI.java => HudPasswordFieldUI.java} | 32 +-
.../macwidgets/plaf/HudRadioButtonUI.java | 48 +-
.../macwidgets/plaf/HudSliderUI.java | 16 +-
.../macwidgets/plaf/HudTextFieldUI.java | 25 +-
.../macwidgets/plaf/IAppScrollBarArtworkUtils.java | 11 +-
.../macwidgets/plaf/IAppScrollBarUI.java | 44 +-
.../macwidgets/plaf/ITunesTableUI.java | 275 ++--
.../macwidgets/plaf/PreferencesTabBarButtonUI.java | 14 +-
.../macwidgets/plaf/SourceListTreeUI.java | 88 +-
.../macwidgets/plaf/UnifiedToolbarButtonUI.java | 23 +-
.../painter/ButtonStatePainter.java | 36 +-
.../explodingpixels/painter/CompoundPainter.java | 14 +-
.../explodingpixels/painter/FocusStatePainter.java | 167 ++-
.../explodingpixels/painter/GradientPainter.java | 2 +-
.../painter/GradientWithBorderPainter.java | 2 +-
.../com/explodingpixels/painter/ImagePainter.java | 5 +-
.../{Painter.java => MacWidgetsPainter.java} | 4 +-
.../explodingpixels/painter/RectanglePainter.java | 10 +-
source/com/explodingpixels/swingx/EPButton.java | 11 +-
source/com/explodingpixels/swingx/EPPanel.java | 13 +-
.../com/explodingpixels/swingx/EPToggleButton.java | 11 +-
.../widgets/ImageBasedJComponent.java | 6 +-
.../com/explodingpixels/widgets/ImageButton.java | 13 +-
.../com/explodingpixels/widgets/PopdownButton.java | 22 +-
.../com/explodingpixels/widgets/PopupButton.java | 353 ++---
.../widgets/PopupMenuCustomizerUsingActions.java | 5 +-
.../widgets/PopupMenuCustomizerUsingStrings.java | 9 +-
.../widgets/StripedViewportBorder.java | 185 ++-
.../explodingpixels/widgets/TabCloseListener.java | 2 +-
.../explodingpixels/widgets/TableHeaderUtils.java | 9 +-
source/com/explodingpixels/widgets/TableUtils.java | 11 +-
.../explodingpixels/widgets/TrackingSpacer.java | 3 +-
source/com/explodingpixels/widgets/TreeUtils.java | 12 +-
.../com/explodingpixels/widgets/WindowDragger.java | 3 +-
.../com/explodingpixels/widgets/WindowUtils.java | 409 +++---
.../widgets/plaf/ButtonsSeparateScrollBarSkin.java | 21 +-
.../widgets/plaf/ButtonsTogetherScrollBarSkin.java | 19 +-
.../explodingpixels/widgets/plaf/EPComboPopup.java | 27 +-
.../explodingpixels/widgets/plaf/EPTabPainter.java | 15 +-
.../widgets/plaf/EPTabbedPaneUI.java | 44 +-
.../widgets/plaf/ScrollBarOrientation.java | 3 +-
.../widgets/plaf/ScrollBarSkin.java | 3 +-
.../widgets/plaf/ScrollThumbImagePainter.java | 15 +-
.../widgets/plaf/SkinnableScrollBarUI.java | 24 +-
.../macwidgets/TSourceListModel.java | 5 +-
108 files changed, 4450 insertions(+), 3061 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mac-widgets.git
More information about the pkg-java-commits
mailing list