Changeset 43

Timestamp:

01/07/08 17:44:35 (4 years ago)

Author:

sander

Message:

Made a function to format the time nicely.
Also tried to format the message content, though it's still not perfect, at least here.

Files:

• gui/main_window.cpp (modified) (4 diffs)
• lib/song.cpp (modified) (2 diffs)
• lib/song.h (modified) (1 diff)

gui/main_window.cpp

@@ -1 @@
-#include <cmath>
 #include <QtGui>
 #include <QIcon>
@@ -123 +122 @@
     trayIcon->setIcon(icon);
     trayIcon->setToolTip("QtMPC");
-    
+
     return true;
 }
@@ -213 +212 @@
         if (!song->title.isEmpty() && !song->artist.isEmpty() && !song->album.isEmpty()) {
             trayIcon->showMessage(song->artist + " - " + song->title,
-                "album:" + song->album + "\n" + 
-                "track:" + QString::number(song->track) + "\n" + 
-                "time:" + QString::number(song->time) + "\n",
+                "album:  " + song->album + "\n" +
+                "track:  " + QString::number(song->track) + "\n" +
+                "length: " + Song::formattedTime(song->time),
                 QSystemTrayIcon::Information, 5000);
         }
@@ -248 +247 @@
         timeElapsedFormattedString = "00:00 / 00:00";
     } else {
-        // Time elapsed
-        timeElapsedFormattedString += QString::number(floor(status.time_elapsed / 60.0));
-        timeElapsedFormattedString += ":";
-        if(status.time_elapsed % 60 < 10) {
-            timeElapsedFormattedString += "0";
-        }
-        timeElapsedFormattedString += QString::number(status.time_elapsed % 60);
-
+        timeElapsedFormattedString += Song::formattedTime(status.time_elapsed);
         timeElapsedFormattedString += " / ";
-
-        // Time total
-        timeElapsedFormattedString += QString::number(floor(status.time_total / 60.0));
-        timeElapsedFormattedString += ":";
-        if(status.time_total % 60 < 10) {
-            timeElapsedFormattedString += "0";
-        }
-        timeElapsedFormattedString += QString::number(status.time_total % 60);
+        timeElapsedFormattedString += Song::formattedTime(status.time_total);
     }
 

lib/song.cpp

@@ +1 @@
+#include <cmath>
 #include "song.h"
 
@@ -25 +26 @@
         title = "<Unknown>";
 }
+
+QString Song::formattedTime(const quint32 &seconds)
+{
+    QString result;
+
+    result += QString::number(floor(seconds / 60.0));
+    result += ":";
+    if(seconds % 60 < 10)
+        result += "0";
+    result += QString::number(seconds % 60);
+
+    return result;
+}

lib/song.h

@@ -20 +20 @@
         bool isEmpty() const;
         void fillEmptyFields();
+        static QString formattedTime(const quint32 &seconds);
 };