Ticket #49 (closed Patch: None)
939827 - time format.patch from masiar
| Reported by: | bflorat | Owned by: | nobody |
|---|---|---|---|
| Priority: | 5, normal | Milestone: | |
| Component: | Any (Default Component) | Version: | |
| Keywords: | Cc: |
Description
Index: src/org/jajuk/ui/JajukWindow.java
===================================================================
RCS file:
/cvsroot/jajuk/jajuk/src/org/jajuk/ui/JajukWindow.java,v
retrieving revision 1.7
diff -u -r1.7 JajukWindow.java
--- src/org/jajuk/ui/JajukWindow.java 15 Apr
2004 20:00:11 -0000 1.7
+++ src/org/jajuk/ui/JajukWindow.java 28 Apr
2004 09:37:49 -0000
@@ -123,45 +123,45 @@
} catch (MalformedURLException
e) {
e.printStackTrace();
}
- stmi = new SysTrayMenuIcon(url);
- stmi.addSysTrayMenuListener(this);
- stm = new
SysTrayMenu(stmi,Messages.getString("JajukWindow.3"));
//$NON-NLS-1$
- stmiExit = new
SysTrayMenuItem(Messages.getString("JajukWindow.4"));
//$NON-NLS-1$
-
stmiExit.addSysTrayMenuListener(this);
- stmiAbout = new
SysTrayMenuItem(Messages.getString("JajukWindow.5"));
//$NON-NLS-1$
-
stmiAbout.addSysTrayMenuListener(this);
- stmiShuffle = new
SysTrayMenuItem(Messages.getString("JajukWindow.6"));
//$NON-NLS-1$
-
stmiShuffle.addSysTrayMenuListener(this);
- stmiBestof = new
SysTrayMenuItem(Messages.getString("JajukWindow.7"));
//$NON-NLS-1$
-
stmiBestof.addSysTrayMenuListener(this);
- stmiVisible = new
SysTrayMenuItem(Messages.getString("JajukWindow.8"));
//$NON-NLS-1$
-
stmiVisible.setEnabled(!bVisible);//if it is already
visible, this menu is hidden
-
stmiVisible.addSysTrayMenuListener(this);
- stmiHidden = new
SysTrayMenuItem(Messages.getString("JajukWindow.9"));
//$NON-NLS-1$
- stmiHidden.setEnabled(bVisible);
-
stmiHidden.addSysTrayMenuListener(this);
- stmiPause = new
SysTrayMenuItem(Messages.getString("JajukWindow.10"));
//$NON-NLS-1$
-
stmiPause.addSysTrayMenuListener(this);
- stmiStop = new
SysTrayMenuItem(Messages.getString("JajukWindow.11"));
//$NON-NLS-1$
-
stmiStop.addSysTrayMenuListener(this);
- stmiPrevious = new
SysTrayMenuItem(Messages.getString("JajukWindow.13"));
//$NON-NLS-1$
-
stmiPrevious.addSysTrayMenuListener(this);
- stmiNext = new
SysTrayMenuItem(Messages.getString("JajukWindow.14"));
//$NON-NLS-1$
-
stmiNext.addSysTrayMenuListener(this);
- stm.addItem(stmiExit);
- stm.addSeparator();
- stm.addItem(stmiAbout);
- stm.addSeparator();
- stm.addItem(stmiShuffle);
- stm.addItem(stmiBestof);
- stm.addSeparator();
- stm.addItem(stmiNext);
- stm.addItem(stmiPrevious);
- stm.addItem(stmiStop);
- stm.addItem(stmiPause);
- stm.addSeparator();
- stm.addItem(stmiHidden);
- stm.addItem(stmiVisible);
+// stmi = new SysTrayMenuIcon(url);
+//
stmi.addSysTrayMenuListener(this);
+// stm = new
SysTrayMenu(stmi,Messages.getString("JajukWindow.3"));
//$NON-NLS-1$
+// stmiExit = new
SysTrayMenuItem(Messages.getString("JajukWindow.4"));
//$NON-NLS-1$
+//
stmiExit.addSysTrayMenuListener(this);
+// stmiAbout = new
SysTrayMenuItem(Messages.getString("JajukWindow.5"));
//$NON-NLS-1$
+//
stmiAbout.addSysTrayMenuListener(this);
+// stmiShuffle = new
SysTrayMenuItem(Messages.getString("JajukWindow.6"));
//$NON-NLS-1$
+//
stmiShuffle.addSysTrayMenuListener(this);
+// stmiBestof = new
SysTrayMenuItem(Messages.getString("JajukWindow.7"));
//$NON-NLS-1$
+//
stmiBestof.addSysTrayMenuListener(this);
+// stmiVisible = new
SysTrayMenuItem(Messages.getString("JajukWindow.8"));
//$NON-NLS-1$
+//
stmiVisible.setEnabled(!bVisible);//if it is already
visible, this menu is
hidden
+//
stmiVisible.addSysTrayMenuListener(this);
+// stmiHidden = new
SysTrayMenuItem(Messages.getString("JajukWindow.9"));
//$NON-NLS-1$
+// stmiHidden.setEnabled(bVisible);
+//
stmiHidden.addSysTrayMenuListener(this);
+// stmiPause = new
SysTrayMenuItem(Messages.getString("JajukWindow.10"));
//$NON-NLS-1$
+//
stmiPause.addSysTrayMenuListener(this);
+// stmiStop = new
SysTrayMenuItem(Messages.getString("JajukWindow.11"));
//$NON-NLS-1$
+//
stmiStop.addSysTrayMenuListener(this);
+// stmiPrevious = new
SysTrayMenuItem(Messages.getString("JajukWindow.13"));
//$NON-NLS-1$
+//
stmiPrevious.addSysTrayMenuListener(this);
+// stmiNext = new
SysTrayMenuItem(Messages.getString("JajukWindow.14"));
//$NON-NLS-1$
+//
stmiNext.addSysTrayMenuListener(this);
+// stm.addItem(stmiExit);
+// stm.addSeparator();
+// stm.addItem(stmiAbout);
+// stm.addSeparator();
+// stm.addItem(stmiShuffle);
+// stm.addItem(stmiBestof);
+// stm.addSeparator();
+// stm.addItem(stmiNext);
+// stm.addItem(stmiPrevious);
+// stm.addItem(stmiStop);
+// stm.addItem(stmiPause);
+// stm.addSeparator();
+// stm.addItem(stmiHidden);
+// stm.addItem(stmiVisible);
}
}
Index: src/org/jajuk/ui/views/LogicalTableView.java
===================================================================
RCS file:
/cvsroot/jajuk/jajuk/src/org/jajuk/ui/views/LogicalTableView.java,v
retrieving revision 1.15
diff -u -r1.15 LogicalTableView.java
--- src/org/jajuk/ui/views/LogicalTableView.java
6 Apr 2004 19:54:09 -0000 1.15
+++ src/org/jajuk/ui/views/LogicalTableView.java
28 Apr 2004 09:37:51 -0000
@@ -301,7 +301,7 @@
oValues[i][0] = track.getName();
oValues[i][1] =
track.getAlbum().getName2();
oValues[i][2] =
track.getAuthor().getName2();
- oValues[i][3] = new
Long(track.getLength());
+ oValues[i][3] =
Util.formatTimeBySec((long)track.getLength());
oValues[i][4] =
track.getStyle().getName2();
oValues[i][5] = new
Long(track.getRate());
oValues[i][6] = track.getId();
Index: src/org/jajuk/ui/views/PhysicalTableView.java
===================================================================
RCS file:
/cvsroot/jajuk/jajuk/src/org/jajuk/ui/views/PhysicalTableView.java,v
retrieving revision 1.16
diff -u -r1.16 PhysicalTableView.java
--- src/org/jajuk/ui/views/PhysicalTableView.java
6 Apr 2004 19:54:09 -0000 1.16
+++ src/org/jajuk/ui/views/PhysicalTableView.java
28 Apr 2004 09:37:50 -0000
@@ -301,7 +301,7 @@
oValues[i][0] =
file.getTrack().getName();
oValues[i][1] =
file.getTrack().getAlbum().getName2();
oValues[i][2] =
file.getTrack().getAuthor().getName2();
- oValues[i][3] = new
Long(file.getTrack().getLength());
+ oValues[i][3] =
Util.formatTimeBySec((long)file.getTrack().getLength());
oValues[i][4] =
file.getTrack().getStyle().getName2();
oValues[i][5] =
file.getDirectory().getDevice().getName();
oValues[i][6] = file.getName();
Index: src/org/jajuk/util/Util.java
===================================================================
RCS file:
/cvsroot/jajuk/jajuk/src/org/jajuk/util/Util.java,v
retrieving revision 1.37
diff -u -r1.37 Util.java
--- src/org/jajuk/util/Util.java 22 Apr 2004
20:31:33 -0000 1.37
+++ src/org/jajuk/util/Util.java 28 Apr 2004
09:37:52 -0000
@@ -301,12 +301,16 @@
long lMins = l/60-(lHours*60);
long lSecs = l-(lHours*3600)-(lMins*60);
StringBuffer sbHours = new
StringBuffer(Long.toString(lHours));
- if ( sbHours.length() == 1)
sbHours.insert(0,'0');
+// if ( sbHours.length() == 1)
sbHours.insert(0,'0');
StringBuffer sbMins = new
StringBuffer(Long.toString(lMins));
- if ( sbMins.length() == 1)
sbMins.insert(0,'0');
+// if ( sbMins.length() == 1)
sbMins.insert(0,'0');
StringBuffer sbSecs = new
StringBuffer(Long.toString(lSecs));
- if ( sbSecs.length() == 1)
sbSecs.insert(0,'0');
- return
sbHours.append(':').append(sbMins).append(':').append(sbSecs).toString();
+ if ( sbSecs.length() == 1) sbSecs.insert(0,'0');
+
+ StringBuffer sbResult = new StringBuffer();
+ if (lHours > 0) sbResult.append(sbHours).append(":");
+ return
sbResult.append(sbMins).append(":").append(sbSecs).toString();
+// return
sbHours.append(':').append(sbMins).append(':').append(sbSecs).toString();
}
Attachments
Change History
Note: See
TracTickets for help on using
tickets.
