Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1853] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2010-02-07 19:55:38
|
Revision: 1853
http://openutils.svn.sourceforge.net/openutils/?rev=1853&view=rev
Author: fgiust
Date: 2010-02-07 19:55:31 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-80 some more cleanup, use standard binary nodedata attributes when available for backward compatibility
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-07 19:54:27 UTC (rev 1852)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-07 19:55:31 UTC (rev 1853)
@@ -44,6 +44,7 @@
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -332,6 +333,17 @@
}
info.put(METADATA_SIZE, size);
+ int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
+ if (width > 0)
+ {
+ info.put(METADATA_WIDTH, Integer.toString(width));
+ }
+
+ int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
+ if (height > 0)
+ {
+ info.put(METADATA_HEIGHT, Integer.toString(height));
+ }
}
addToInfo(media, info, METADATA_WIDTH);
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 19:54:27 UTC (rev 1852)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-07 19:55:31 UTC (rev 1853)
@@ -53,7 +53,7 @@
text-indent: -10000px;
overflow: hidden;
display: block;
- float:left;
+ float: left;
}
#navigation .right a.white-active {
@@ -234,8 +234,9 @@
.mediainfo {
border-bottom: dotted 1px #cfcfcf;
- margin: 0px 3px 5px 3px;
- padding: 5px 0 5px 0;
+ margin: 5px 3px 5px 3px;
+ padding: 0 0 0 0;
+ height: 20px;
}
.used span {
@@ -274,13 +275,18 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
-.sexy-tooltip {
- font-size: 0.8em;
+div.sexy-tooltip {
+ font-size: 0.8em !important;
}
+div.sexy-tooltip h4{
+ margin: 0 0 3px 0;
+ padding: 0;
+}
+
.menupopup {
position: absolute;
left: 10px;
@@ -292,7 +298,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-07 19:54:27 UTC (rev 1852)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-07 19:55:31 UTC (rev 1853)
@@ -90,7 +90,7 @@
media.info.media_size=Size: {0}
media.info.media_width=Width: {0}px
media.info.media_height=Height: {0}px
-media.info.media_bitDepth=Bit depth: {0}
+media.info.media_bitdepth=Bit depth: {0}
media.info.media_duration=Duration: {0}
media.info.media_framerate=Frame rate: {0}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-07 19:54:27 UTC (rev 1852)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-07 19:55:31 UTC (rev 1853)
@@ -92,7 +92,7 @@
media.info.media_size=Dimensione: {0}
media.info.media_width=Larghezza: {0}px
media.info.media_height=Altezza: {0}px
-media.info.media_bitDepth=Profondit\u00E0 di colore: {0}
+media.info.media_bitdepth=Profondit\u00E0 di colore: {0}
media.info.media_duration=Durata: {0}
media.info.media_framerate=Frame rate: {0}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-07 19:54:27 UTC (rev 1852)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-07 19:55:31 UTC (rev 1853)
@@ -301,9 +301,9 @@
</div>
[#if media.mediaInfo??]
<div class="mediainfo">
- ${media.mediaInfo['extension']!}
- [#if media.mediaInfo['width']?? && media.mediaInfo['height']??]
- ${media.mediaInfo['width']}x${media.mediaInfo['height']}
+ ${media.mediaInfo['media_extension']!}
+ [#if media.mediaInfo['media_width']?? && media.mediaInfo['media_height']??]
+ ${media.mediaInfo['media_width']}x${media.mediaInfo['media_height']}
[/#if]
</div>
[/#if]
@@ -318,7 +318,7 @@
[/#if]
</div>
[/#if]
- <span class="name [#if !this.singleInstance] status${media.metaData.activationStatus}[/#if]" title="${media.filename}">${name}</span>
+ <span class="name [#if !this.singleInstance] status${media.metaData.activationStatus}[/#if]">${name}</span>
</li>
[/#list]
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
