[banshee] Revert "ThickClient: workaround for invisible (instead of bold) text (bgo#732838)"
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Revert "ThickClient: workaround for invisible (instead of bold) text (bgo#732838)"
- Date: Wed, 16 Jul 2014 18:29:43 +0000 (UTC)
commit aa9abcda5b214c8e83f62cc142b48ad6f61eae4d
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Wed Jul 16 20:09:19 2014 +0200
Revert "ThickClient: workaround for invisible (instead of bold) text (bgo#732838)"
This reverts commit f3f9c3300d415f86b78c20ca22fef077ec221c44
because it was just a workaround, and we have found the proper
fix.
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
index ade2e88..7ba287d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
@@ -28,6 +28,7 @@
//
using System;
+using System.Collections.Generic;
using Mono.Unix;
using Gtk;
@@ -37,6 +38,7 @@ using Hyena;
using Hyena.Gui;
using Hyena.Gui.Theatrics;
+using Banshee.Base;
using Banshee.Collection;
using Banshee.Collection.Gui;
using Banshee.ServiceStack;
@@ -503,7 +505,7 @@ namespace Banshee.Gui.Widgets
protected virtual string GetFirstLineText (TrackInfo track)
{
- return WrapWithDefaultTextColor (String.Format ("<b>{0}</b>", GLib.Markup.EscapeText
(track.DisplayTrackTitle)));
+ return String.Format ("<b>{0}</b>", GLib.Markup.EscapeText (track.DisplayTrackTitle));
}
protected virtual string GetSecondLineText (TrackInfo track)
@@ -540,11 +542,6 @@ namespace Banshee.Gui.Widgets
markup = GetByFrom (track.ArtistName, track.DisplayArtistName, track.AlbumTitle,
track.DisplayAlbumTitle, true);
}
- return WrapWithDefaultTextColor (markup);
- }
-
- private string WrapWithDefaultTextColor (string markup)
- {
return String.Format ("<span color=\"{0}\">{1}</span>",
CairoExtensions.ColorGetHex (TextColor, false),
markup);
@@ -566,6 +563,7 @@ namespace Banshee.Gui.Widgets
private string GetByFrom (string artist, string display_artist, string album, string display_album,
bool unknown_ok)
{
+
bool has_artist = !String.IsNullOrEmpty (artist);
bool has_album = !String.IsNullOrEmpty (album);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]