Move filedialog's .xpm files to the right place. Convert commentbase to Qt4

12 files changed, 141 insertions, 1078 deletions

diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index 8e1a8767..14c96a7a 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -117,7 +117,6 @@ QT4_WRAP_CPP ( muse_moc_headers
 
 QT4_ADD_RESOURCES (muse_qrc_files 
 		  muse.qrc
-		  icons.qrc
 		  )
 
 add_executable ( muse
diff --git a/muse2/muse/global.xpm b/muse2/muse/global.xpm
deleted file mode 100644
index 5175c03f..00000000
--- a/muse2/muse/global.xpm
+++ /dev/null
@@ -1,213 +0,0 @@
-/* XPM */
-static const char* const image0_data[] = { 
-"34 34 176 2",
-"Qt c None",
-".# c #000000",
-".f c #00406a",
-"#w c #004473",
-"#l c #005d8b",
-"aE c #080c08",
-"#h c #08406a",
-"#U c #084c73",
-"#6 c #08507b",
-"aw c #08557b",
-"#V c #0885c5",
-"#n c #101010",
-".W c #104c7b",
-"ay c #105073",
-"## c #10507b",
-"#7 c #105583",
-"ad c #105983",
-".v c #1085ac",
-".n c #1085b4",
-"#z c #181c18",
-".q c #18507b",
-".k c #185583",
-".g c #185983",
-"ax c #18598b",
-"#8 c #185d8b",
-"#F c #1885b4",
-"#q c #1889b4",
-"#M c #1895d5",
-"#K c #202020",
-"ao c #205d7b",
-"at c #205d83",
-"ae c #205d8b",
-"#9 c #20618b",
-"af c #206194",
-"#X c #206594",
-"a# c #20719c",
-"#W c #2085d5",
-"#r c #2089b4",
-"#L c #2091de",
-"a. c #29699c",
-"al c #296d8b",
-"#Y c #296d9c",
-"#Z c #29719c",
-".6 c #29759c",
-"#N c #2975a4",
-"#k c #29799c",
-"#O c #2979a4",
-"#E c #2985ac",
-"#c c #298dbd",
-"#d c #2991b4",
-"#A c #299dde",
-"ai c #316d8b",
-"ac c #317194",
-"#0 c #3175a4",
-"#g c #31799c",
-"#x c #3179a4",
-"an c #317da4",
-"#P c #317dac",
-"#C c #3181ac",
-"#b c #3189b4",
-"#1 c #318dbd",
-"#2 c #3191bd",
-".Z c #3195bd",
-"#B c #31a5e6",
-"#o c #31aede",
-"aD c #397594",
-"#D c #3989b4",
-"#e c #3995c5",
-"#p c #39aade",
-"#3 c #414041",
-"aj c #414441",
-"ag c #41759c",
-"aa c #417994",
-"#Q c #4199bd",
-".0 c #419dc5",
-".Y c #41b2de",
-".X c #41b2e6",
-".a c #4a444a",
-"aK c #4a484a",
-"#R c #4aa1c5",
-"#a c #4ab2e6",
-".d c #525052",
-"#T c #52819c",
-"#5 c #5299bd",
-"#i c #5a7d94",
-"#I c #5a85a4",
-".1 c #5aa5cd",
-"#f c #5aaacd",
-"aT c #626162",
-".N c #62aecd",
-".L c #62b6d5",
-".7 c #6a89a4",
-"#v c #73a1b4",
-".2 c #73b6d5",
-"aS c #7b797b",
-".e c #7b8183",
-"#s c #7bb6d5",
-".O c #7bbad5",
-".M c #7bbede",
-"aN c #837d83",
-"aP c #838183",
-"aM c #838583",
-".P c #83bed5",
-"aR c #8b858b",
-".h c #8b898b",
-".o c #8b8d8b",
-"#j c #948d94",
-"aG c #949194",
-"#G c #94c2de",
-".G c #94c6de",
-".E c #94cade",
-"aO c #9c959c",
-"aL c #9c999c",
-"av c #9cb6c5",
-".H c #9ccade",
-".F c #9ccede",
-"#J c #a4a1a4",
-"#y c #a4a5a4",
-"ah c #a4becd",
-"#S c #a4cee6",
-"#m c #aca5ac",
-"aQ c #acaaac",
-".8 c #acaeac",
-"ab c #acbecd",
-"ak c #acc2d5",
-".I c #acd6e6",
-"aH c #b4aeb4",
-"aJ c #b4b2b4",
-".i c #b4b6b4",
-".S c #b4d2e6",
-".Q c #b4d6ee",
-".x c #b4dae6",
-".4 c #bdb6bd",
-".c c #bdbabd",
-"aF c #bdbebd",
-"#4 c #bdcad5",
-"aC c #bdcede",
-".z c #bddaee",
-".y c #bddef6",
-"aI c #c5bec5",
-"aB c #c5c2c5",
-".5 c #c5c6c5",
-".3 c #c5deee",
-".B c #c5e2ee",
-"aA c #cdc6cd",
-"au c #cdcacd",
-".J c #cdcecd",
-".t c #cde2ee",
-".A c #cde2f6",
-".s c #cde6f6",
-"az c #d5ced5",
-".9 c #d5d2d5",
-"as c #d5d6d5",
-"#t c #d5e6f6",
-".r c #d5eaf6",
-"ar c #ded6de",
-".T c #dedade",
-".U c #dedede",
-"#u c #dee6ee",
-"aq c #e6dee6",
-"am c #e6e2e6",
-"ap c #e6e6e6",
-".V c #eee6ee",
-"#. c #eeeaee",
-".j c #eeeeee",
-".R c #eeeef6",
-".u c #eef2f6",
-".C c #eef2ff",
-"#H c #eef6ff",
-".p c #f6eef6",
-".K c #f6f2f6",
-".w c #f6f6f6",
-".l c #f6faff",
-".D c #fff6ff",
-".m c #fffaff",
-".b c #ffffff",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQt.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQt.a.b.b.c.d.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-".e.f.g.h.i.j.b.b.i.d.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-".k.l.m.n.f.g.o.i.p.b.b.c.d.#.#.#.#Qt.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQt",
-".q.r.s.t.u.b.v.f.g.h.i.j.b.b.c.d.#.#.c.b.w.d.#.#.#.#QtQtQtQtQtQtQtQt",
-".k.x.y.z.A.B.A.C.b.n.f.g.o.i.p.m.b.w.D.w.m.m.b.b.#.#QtQtQtQtQtQtQtQt",
-".q.E.F.G.H.I.x.t.B.t.u.b.v.f.g.h.J.p.m.b.j.w.w.D.K.#Qt.#QtQtQtQtQtQt",
-".q.L.M.N.O.P.G.F.Q.z.A.t.C.R.S.g.c.J.T.U.V.w.b.j.p.#.#QtQtQtQtQtQtQt",
-".W.X.Y.Z.0.1.N.2.P.G.H.I.x.3.t.f.h.4.5.T.6.7.8.9.U#..#Qt.#QtQtQtQtQt",
-"##.Y#a#b#c#d#e.0#f.N.O.P.G.F.t#g#h#i#j.4.f#k.f#l#m.T#nQtQtQtQtQtQtQt",
-".W#o#p#q.v.n#r#c#d.Z.0.1.N#s.G#t#u#v#w#x.f.A.u.b.6#y#zQtQtQtQtQtQtQt",
-".q#A#B#C#D#E#q#F#F#b#c#d#e.0.N.P#G.x#H.t#x.B#t.t#I#J#KQtQtQtQtQtQtQt",
-".W#L#M#N#O#P#C#b#E#q.v.n#b#c#d#Q#R.N.O.H#S.H.H.I#T#y#zQtQtQtQtQtQtQt",
-"#U#V#W#X#Y#Z#0#O#C#C#D#E#q#F#F#b#1#2#e.0#f.N.O.P#T#J#KQtQtQtQtQtQtQt",
-"#3#4#5#6#7#8#9a.a##N#N#P#C#b#E#q.v.n#b#1#d.Z.0.1aa#y#zQtQtQtQtQtQtQt",
-".a.b.b.babac#6adaeaf#Y#Z#0#O#C#C#D#E#q#F#F#r#c#dag#J#KQtQtQtQtQtQtQt",
-"#3.b.m.D.K.D.wahac#6.g#8#9a.a##N#O#P#C#b#E#q.v.nai#y#zQtQtQtQtQtQtQt",
-"aj.m.m.w.w.j.p#..K.Kakac#6.gaeaf#Y#Z#0#O#C#C#D#Eal#J#KQtQtQtQtQtQtQt",
-"#3.m.K.K.j.p#.#.amam.U#.#.abac#6#7#8#9a.a##N#Oanao#y#zQtQtQtQtQtQtQt",
-".a.K.K.j.p#.#.ap.Vaqaq.Taras.Tapabac#6.gaeaf#Y#Zat#J#K.#.#.#.#QtQtQt",
-"#3.p#.#.#.#.amam.Uaq.T.T.9.9.Jauau.9.Uavacawadaxay#y#z.#.#.#.#.#.#.#",
-"ajap.V.V#.amamaqaq.T.TasasazazauaAaBaBaBau.UaCaD.a#J#K.#.#.#.#.#.#.#",
-"aE.haBar.Uaq.Uaq.Taras.9.JazauauaBaBaF.c.c.9aGaHaj#y#z.#.#.#.#.#.#.#",
-".#.#.#.##Jauarasarasas.Jazauau.5aAaIaI.cam.haJ.JaK#J#K.#.#.#.#.#.#.#",
-"QtQtQt.#.#.#.#aLaBazauauauauaBaBaFaIaF.VaMaJ.TaNaj#y#z.#.#.#.#.#.#.#",
-"QtQtQtQtQtQt.#.#.#.#aO.caAaBaBaIaI.camaMaJaqaPaQaK#J#K.#.#.#.#.#.#.#",
-"QtQtQtQt.#QtQtQtQt.#.#.#.##jaJaI.i.TaRaJ.TaPaQauaj#y#z.#.#.#.#.#.#Qt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.#.#.#.#auaP.i.JaNaQ.JaSaK#J#K.#.#.#.#.#QtQt",
-"QtQtQtQtQtQtQtQtQtQt.#QtQtQtQt.#.#.#.#aT#J.JaS#yaj#y#z.#.#.#.#QtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#.#.#aSaOaKaG#K.#.#.#QtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#QtQtQtQt.#.#.#.##K.#.#.#QtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#QtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp
index efe70801..c949b4d3 100644
--- a/muse2/muse/icons.cpp
+++ b/muse2/muse/icons.cpp
@@ -209,6 +209,10 @@
 #include "xpm/stereo.xpm"
 #include "xpm/muse_icon.xpm"
 
+#include "xpm/global.xpm"
+#include "xpm/project.xpm"
+#include "xpm/user.xpm"
+
 #if QT_VERSION >= 0x040600
 #define MPIXMAP(a,b) QPixmap(QIcon::fromTheme(b, QIcon(QPixmap(a))).pixmap(QPixmap(a).width(),QPixmap(a).height()))
 #define MICON(a,b) QIcon(QIcon::fromTheme(b, QIcon(QPixmap(a))))
@@ -420,6 +424,10 @@ QPixmap* monoIcon;
 QPixmap* stereoIcon;
 QPixmap* museIcon;
 
+QIcon* globalIcon;
+QIcon* projectIcon;
+QIcon* userIcon;
+
 //---------------------------------------------------------
 //   initIcons
 //---------------------------------------------------------
@@ -622,9 +630,13 @@ void initIcons()
       view_mixerIcon                                = new MPIXMAP(view_mixer_xpm, NULL);
       view_transport_windowIcon                     = new MPIXMAP(view_transport_window_xpm, NULL);
 
-      monoIcon   = new MPIXMAP(mono_xpm, NULL);
-      stereoIcon = new MPIXMAP(stereo_xpm, NULL);
+      monoIcon                                      = new MPIXMAP(mono_xpm, NULL);
+      stereoIcon                                    = new MPIXMAP(stereo_xpm, NULL);
+
+      museIcon                                      = new MPIXMAP(muse_icon_xpm, NULL);
 
-      museIcon = new MPIXMAP(muse_icon_xpm, NULL);
+      globalIcon                                    = new MICON(global_xpm, "folder");
+      userIcon                                      = new MICON(user_xpm, "user-home");
+      projectIcon                                   = new MICON(project_xpm, "folder-sound");
       }
 
diff --git a/muse2/muse/icons.h b/muse2/muse/icons.h
index ba069fbb..7592fb40 100644
--- a/muse2/muse/icons.h
+++ b/muse2/muse/icons.h
@@ -216,5 +216,9 @@ extern QPixmap* stereoIcon;
 
 extern QPixmap* museIcon;
 
+extern QIcon* globalIcon;
+extern QIcon* projectIcon;
+extern QIcon* userIcon;
+
 #endif
 
diff --git a/muse2/muse/icons.qrc b/muse2/muse/icons.qrc
deleted file mode 100644
index c5c52bef..00000000
--- a/muse2/muse/icons.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC version="1.0">
-    <qresource prefix="/icons">
-        <file>global.xpm</file>
-        <file>user.xpm</file>
-        <file>project.xpm</file>
-    </qresource>
-</RCC>
diff --git a/muse2/muse/project.xpm b/muse2/muse/project.xpm
deleted file mode 100644
index b373e62e..00000000
--- a/muse2/muse/project.xpm
+++ /dev/null
@@ -1,389 +0,0 @@
-/* XPM */
-static const char* const image2_data[] = { 
-"34 34 352 2",
-".a c None",
-".# c None",
-"Qt c None",
-".b c #000000",
-".s c #000400",
-"dy c #000808",
-"dB c #000c10",
-"dp c #001010",
-"de c #001418",
-"cT c #001818",
-"cr c #001c18",
-"c7 c #002c31",
-"ce c #003031",
-"bF c #003c41",
-"bG c #004041",
-"dt c #00404a",
-".o c #00406a",
-"bd c #00446a",
-"df c #00484a",
-"c9 c #004852",
-"by c #004873",
-"#M c #00488b",
-"bT c #004c73",
-"cV c #00555a",
-"cW c #005d62",
-"cX c #00616a",
-"dj c #00656a",
-"cH c #006573",
-"cY c #00658b",
-"cZ c #006d73",
-"cl c #006d7b",
-"cJ c #00717b",
-"ct c #007194",
-"cu c #00757b",
-"cv c #007983",
-"cx c #0079a4",
-"cw c #00818b",
-"cK c #00819c",
-"da c #008994",
-"b3 c #008db4",
-"cL c #0099ac",
-"c0 c #0099c5",
-"ch c #00aab4",
-"cj c #00aec5",
-"bI c #00bacd",
-"b2 c #00c6d5",
-".g c #080408",
-"dh c #081010",
-"at c #081818",
-"aY c #083452",
-"aZ c #08446a",
-"c8 c #084862",
-"dz c #085052",
-"bf c #085083",
-"cU c #085962",
-"#O c #0861ac",
-"d. c #08697b",
-"cG c #086983",
-"#y c #086dac",
-"di c #087183",
-"d# c #08758b",
-"cI c #087d94",
-"cg c #08aac5",
-"ck c #08b2d5",
-"ci c #08bede",
-"aR c #102829",
-"a6 c #103031",
-"#4 c #103839",
-"aD c #104041",
-"ay c #104462",
-"aK c #104c73",
-"bz c #105083",
-"a0 c #10509c",
-"cc c #105583",
-"a1 c #10598b",
-"bB c #105d8b",
-"bh c #10618b",
-"bV c #106194",
-"bU c #1061a4",
-"a2 c #1065ac",
-"ae c #1091e6",
-"#5 c #183431",
-"bl c #184041",
-"bA c #1859a4",
-".x c #185d9c",
-"be c #18619c",
-"az c #1861a4",
-"bg c #1865a4",
-"bC c #1865ac",
-"aM c #186994",
-".p c #18699c",
-"aL c #1869a4",
-"aA c #186d94",
-"bj c #186d9c",
-"bi c #1871ac",
-"bW c #1871b4",
-"#2 c #1891d5",
-"#3 c #1895f6",
-"aJ c #202020",
-"a3 c #2071bd",
-"a4 c #20759c",
-"aO c #2075a4",
-"al c #2079ac",
-"aB c #2079bd",
-"aN c #207dbd",
-"af c #2085e6",
-"dC c #294c52",
-"bc c #296594",
-"#N c #29759c",
-"am c #2979a4",
-"a5 c #297dc5",
-"#U c #2981ac",
-"#8 c #2981c5",
-"aT c #29858b",
-"#9 c #2985ac",
-"aC c #2985cd",
-"#C c #2989ac",
-"#G c #2989b4",
-"#F c #2989cd",
-"#q c #298db4",
-"an c #2991c5",
-"aP c #2995cd",
-"#S c #29a1f6",
-"#R c #29aaf6",
-".z c #313031",
-"c1 c #313431",
-"#7 c #313c39",
-"bx c #3171ac",
-".w c #3179b4",
-"#i c #3179bd",
-"#0 c #317da4",
-"#w c #3185bd",
-"a. c #3189cd",
-"#E c #318db4",
-"#D c #318dcd",
-"#H c #3191d5",
-".9 c #3195bd",
-"#V c #3195cd",
-"#s c #3195d5",
-"#p c #3199cd",
-"#A c #31aade",
-".c c #393c39",
-"cm c #394041",
-"bo c #394c5a",
-"a9 c #396d8b",
-"cF c #39757b",
-"cb c #3975b4",
-"bS c #3981b4",
-"av c #39858b",
-"du c #398da4",
-"a# c #3995bd",
-".7 c #39b2de",
-"#B c #39baf6",
-".d c #413c41",
-".h c #414041",
-"cz c #41444a",
-"bO c #414c4a",
-"cd c #4179bd",
-"#T c #4189c5",
-"#o c #41b2f6",
-"cE c #4a444a",
-"b6 c #4a484a",
-"#6 c #4a4c4a",
-".n c #4a85bd",
-"#W c #4a99cd",
-"ao c #4a99d5",
-"#r c #4a9dd5",
-"#. c #4a9dde",
-"aq c #4aa1de",
-".8 c #4ac2f6",
-"b1 c #4acad5",
-"cf c #4aced5",
-"bJ c #523452",
-"dl c #523852",
-"bt c #524c52",
-"aF c #525052",
-"b. c #525552",
-"#L c #52819c",
-"cs c #528dac",
-"bX c #528db4",
-"ap c #52a1d5",
-"## c #52a5c5",
-"bn c #52e2ff",
-"dx c #5a405a",
-"bp c #5a555a",
-"aw c #5a595a",
-"dk c #5a5d5a",
-"aU c #626162",
-"ak c #626562",
-"bD c #62a1de",
-"#t c #62aede",
-"aa c #62bae6",
-"#n c #62beff",
-"ai c #6a696a",
-"aV c #6a6d6a",
-"dq c #6a8994",
-"#j c #6a899c",
-"ar c #6ab2e6",
-"#a c #6abae6",
-"bH c #6adaf6",
-"dw c #736173",
-"aj c #736573",
-"aI c #736d73",
-"ba c #737173",
-"ax c #737573",
-"#x c #738db4",
-"#b c #73b6cd",
-".V c #73b6ee",
-".T c #73bed5",
-"aG c #7b717b",
-"aW c #7b797b",
-"c6 c #7b7d7b",
-"bk c #7bb2c5",
-"ab c #7bbad5",
-"bm c #7bdae6",
-"a8 c #7bdaff",
-"b# c #837583",
-"dd c #837d83",
-"bL c #838183",
-"br c #838583",
-"ah c #8395a4",
-"dA c #83bacd",
-".U c #83beee",
-".S c #83c6ee",
-"b0 c #83e6ff",
-"bK c #8b7d8b",
-".i c #8b898b",
-".J c #8bc6de",
-"bq c #947d94",
-"aH c #948194",
-"dn c #948594",
-"bE c #949194",
-"#Q c #949594",
-"#d c #94c6de",
-".X c #94c6f6",
-"aX c #9c7d9c",
-"bb c #9c899c",
-"dg c #9c999c",
-"bN c #9c9d9c",
-"bw c #9caebd",
-"ca c #9cb2c5",
-"#c c #9ccaf6",
-"aE c #9ce6ff",
-"c5 c #a485a4",
-"cN c #a491a4",
-"cM c #a495a4",
-"bu c #a4a1a4",
-"bR c #a4bae6",
-"ad c #a4cede",
-".W c #a4cef6",
-"#e c #ac8dac",
-"b4 c #ac91ac",
-"bM c #ac9dac",
-"bQ c #acaeac",
-".M c #acd2e6",
-"ac c #acd2f6",
-".Y c #acd2ff",
-"bZ c #ace6ee",
-"bs c #b495b4",
-"c3 c #b499b4",
-"aQ c #b4a1b4",
-"#1 c #b4a5b4",
-"cy c #b4b2b4",
-"#f c #b4b6b4",
-"as c #b4c6d5",
-"#X c #b4d6ff",
-".K c #b4daff",
-"cA c #bd9dbd",
-"ds c #bda1bd",
-"bP c #bdaabd",
-"do c #bdb2bd",
-"b8 c #bdbabd",
-"cQ c #bdbebd",
-".0 c #bdd2ff",
-".L c #bddaff",
-"b7 c #c5a5c5",
-"cS c #c5b2c5",
-"b5 c #c5b6c5",
-"dm c #c5bac5",
-"c4 c #c5bec5",
-"cC c #c5c2c5",
-"cn c #c5c6c5",
-".O c #c5deee",
-"#u c #c5deff",
-".v c #c5e2ee",
-".D c #c5e2ff",
-"au c #c5eef6",
-"ag c #c5eeff",
-"aS c #c5f6ff",
-"#k c #cdbacd",
-"db c #cdbecd",
-"cO c #cdc2cd",
-"cp c #cdc6cd",
-"c. c #cdcacd",
-"dD c #cdced5",
-"#P c #cddeee",
-"#J c #cde2ee",
-"#I c #cde2ff",
-".t c #cde6f6",
-".A c #cde6ff",
-"a7 c #cdf6ff",
-".1 c #d5b6d5",
-"dc c #d5bad5",
-".j c #d5c2d5",
-".q c #d5c6d5",
-"dr c #d5cad5",
-"cq c #d5caee",
-"#l c #d5d2d5",
-"#h c #d5d6d5",
-".B c #d5deff",
-".N c #d5e6ff",
-".C c #d5eaff",
-"co c #debede",
-"cP c #dec2de",
-".5 c #dec6de",
-"cD c #decade",
-"bv c #decede",
-"cB c #ded2de",
-".k c #ded6de",
-".Q c #dedade",
-".F c #dee2ff",
-"dv c #e6cae6",
-"b9 c #e6d2e6",
-"#g c #e6d6e6",
-"c# c #e6dae6",
-"c2 c #e6e2e6",
-"#m c #e6e6e6",
-"#Y c #e6eaff",
-".E c #e6eeff",
-".Z c #e6f2ff",
-"bY c #e6faff",
-"cR c #eed2ee",
-".G c #eed6ee",
-".2 c #eedaee",
-".P c #eedeee",
-"#v c #eee6ff",
-"#Z c #eef2ff",
-".u c #eef6ff",
-".r c #f6d6f6",
-".3 c #f6daf6",
-".I c #f6e2f6",
-"#z c #f6e6f6",
-".R c #f6f2f6",
-".l c #f6f6f6",
-"#K c #f6f6ff",
-".6 c #ffe6ff",
-".4 c #ffeaff",
-".f c #ffeeff",
-".H c #fff2ff",
-".y c #fff6ff",
-".m c #fffaff",
-".e c #ffffff",
-"Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#",
-".aQt.aQt.aQt.aQt.b.b.c.b.bQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt",
-"Qt.#Qt.#Qt.#Qt.d.e.e.f.b.g.c.b.bQt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#",
-".aQt.aQt.a.h.c.h.i.j.k.e.l.f.b.b.c.b.bQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt",
-"Qt.#Qt.#Qt.d.e.m.n.o.p.i.q.r.e.m.f.b.s.c.b.bQt.d.g.d.b.bQt.#Qt.#Qt.#",
-".aQt.aQt.a.h.t.u.v.e.e.w.o.x.i.j.k.e.m.y.s.s.b.e.e.f.b.b.z.b.bQt.aQt",
-"Qt.#Qt.#Qt.d.A.B.C.D.E.F.e.e.n.o.p.i.q.G.y.H.e.y.e.y.e.e.I.b.b.bQt.#",
-".aQt.aQt.a.h.J.K.J.L.M.N.O.E.v.e.e.w.o.x.i.P.Q.y.l.e.R.e.l.y.b.b.bQt",
-"Qt.#Qt.#Qt.d.S.T.U.V.W.X.L.Y.C.D.Z.H.e.0.p.1.2.3.4.5.I.6.e.4.g.b.b.#",
-".aQt.aQt.a.h.7.8.9#.###a#b#c#d.L.M.N.v.e.o#e#f#g#h#i#j#k#l.f#m.s.b.b",
-"Qt.#Qt.#Qt.d#n#o#p#q#r#s#t##.U.V.W.X#u#v#w.o#x.i.q.o.n.o#y.i#z.b.b.b",
-".aQt.aQt.a.h#A#B#C#D#E#F#G#H.9#.###a#d#I#J#K#L#M#N#O#P.e.e.w#Q.s.b.b",
-"Qt.#Qt.#Qt.d#R#S#T#U#V#G#W#E#p#q#r#s#t##.W#X#Y.H#Z#0.E.A.Z.e#1.b.b.b",
-".aQt.aQt.a.h#2#3.p#4#5#6#7#8#9a.#E#D#G#Ha#aaabacad.N#d.L.M.e#Q.s.b.b",
-"Qt.#Qt.#Qt.baeaf#4agahaiajakalaman#Gao#E#p#qapaqar##.U.V.W.H#1.b.b.b",
-".aQt.aQt.a.sasatauavawaiax.hayazaAaB#UaC#C#D#E#D#q#H.9#.##.Z#Q.s.b.b",
-"Qt.#Qt.#Qt.baDagaEaFaGaiaHaIaJaKaLaMaNaO#T#U#V#Gao#EaP#q#r.YaQ.b.b.b",
-".aQt.aQt.aaRauaSaTaFaUaVaWaX.haYaZa0a1a2.pa3a4a5#UaC#C#D#Eac#Q.s.b.b",
-"Qt.#Qt.#a6aga7a8a9b.b#babb.ibbawbcbdbebfbgbhbibjaNaO#T#U#VbkaQ.b.b.b",
-".aQt.ablauaSbmbnbobpaibqbrbs.ibtbubvbwbxbybzbzbAbBbC.pa3a4bDbE.s.b.b",
-"QtbFbGagaEa8bHbIbJ#6bKbLbMbN#1bObPbQbv#l.fbRbSbTbUbzbgbVbWbXaQ.b.b.b",
-"bFbYbZb0b1bnb2b3.ebvaWb4bNb5bQb6bEb7b8b9c.c##l#zcacbbTccbzcdbE.s.b.b",
-"cecfcgchcicjckcl#z.m.Pbu#k#f.qcmbMbu.q.5#gcnb9cobvcp.IcqbSbdaQ.b.b.b",
-"crcsclctcucvcwcxcy.iai.H#h.I.kcz.icA#fcBcncBcCcDb8.q#lb4bQcEbu.s.b.b",
-"atcFcGcHcIcJcKcLcMaFaH.e.e.4.mcmcNbNcOcCb9cPbvcQ.qcRcNbQ.2cEcS.b.b.b",
-"cTcUcVcWcXcYcZc0c1aic2.e.m.e.ecmbLc3bQcDc4bvb8.q#lc5cy.2c6cEbu.s.b.b",
-".bc7c8c9d.cXd#dadbcC.I.6.e.m.ecmaH#Q#kdcbvcQ.qcRcNcy.Pddb5czcS.b.b.b",
-".b.b.bdedfcWcXcYdg.qc.#z#m.e#m.h.b.zaW#kb8.q#lc5cy.2c6b5cncEbu.s.b.b",
-".b.b.b.bdhc9didjbPdc#g#l.f.H.2dk.b.b.s.bdlcPbbcy.2c6dmc.dncEdo.b.b.b",
-".b.b.b.b.bdpdfcWdqdrcC.2.Q.f#Q.b.b.b.b.b.b.s.bb6dkdsc.c6bucEbu.s.b.b",
-"Qt.b.b.b.b.batdtducQb9dv#z.3dw.b.b.b.b.b.b.b.b.b.g.bdxaW#1bdaQ.b.b.b",
-".aQt.a.b.b.b.bdydzdAcCb9c..i.b.b.b.b.b.b.a.b.b.b.b.b.b.s.b.s.b.b.b.b",
-"Qt.#Qt.#.b.b.b.bdBdCdDcC.qaF.b.b.b.b.b.bQt.#Qt.#.b.b.b.b.b.b.b.b.b.b",
-".aQt.aQt.a.b.b.b.b.b.b.b.b.b.b.b.b.b.bQt.aQt.aQt.aQt.a.b.b.b.b.b.bQt"};
diff --git a/muse2/muse/user.xpm b/muse2/muse/user.xpm
deleted file mode 100644
index 49dfa00e..00000000
--- a/muse2/muse/user.xpm
+++ /dev/null
@@ -1,333 +0,0 @@
-/* XPM */
-static const char* const image1_data[] = { 
-"34 34 296 2",
-".a c None",
-".# c None",
-"Qt c None",
-".b c #000000",
-".s c #000400",
-".o c #00406a",
-"bM c #00446a",
-"#O c #00487b",
-"bD c #004c73",
-".g c #080408",
-"cr c #080808",
-"#Q c #08619c",
-"#y c #08659c",
-"cF c #101410",
-"bu c #105083",
-"bE c #105583",
-"bt c #105994",
-"bw c #106194",
-"cE c #181418",
-"bT c #181c18",
-".y c #185d8b",
-"bv c #185d94",
-".p c #18618b",
-"bm c #18659c",
-"bn c #18699c",
-"bx c #1869a4",
-"#6 c #1891d5",
-"#7 c #1895e6",
-"b4 c #202020",
-"cq c #202420",
-"ba c #206994",
-"a1 c #2071ac",
-"a2 c #20759c",
-"be c #2075a4",
-"bN c #292829",
-"bU c #292c29",
-"b# c #29699c",
-"a0 c #296d94",
-"#P c #29759c",
-"bc c #2975a4",
-"bd c #2979ac",
-"a3 c #297db4",
-"a# c #2981a4",
-"aP c #2981ac",
-"ak c #2981cd",
-"a4 c #2985bd",
-"a5 c #2989ac",
-"#G c #2989b4",
-"#F c #2989bd",
-"#o c #298db4",
-"aQ c #298dbd",
-"#T c #29a1e6",
-"aB c #312c31",
-".A c #313031",
-"bb c #3175a4",
-".x c #3179a4",
-"#g c #3179ac",
-"#4 c #317da4",
-"#w c #317dac",
-"bf c #3181b4",
-"#E c #318db4",
-"ac c #318dbd",
-"#H c #3191c5",
-".6 c #3195bd",
-"#q c #3195c5",
-"#A c #31aade",
-"aK c #392c39",
-".c c #393c39",
-"bC c #3975a4",
-"bL c #3979a4",
-".n c #397dac",
-"#X c #398db4",
-"aH c #3991bd",
-"#W c #3991c5",
-"#p c #3995c5",
-"ad c #3999c5",
-".4 c #39b2de",
-"#B c #39b2e6",
-".d c #413c41",
-".h c #414041",
-"aT c #414441",
-"ck c #41444a",
-"bF c #4179ac",
-"at c #4199c5",
-"#m c #41b2e6",
-"am c #4a3c4a",
-"aI c #4a404a",
-"a6 c #4a444a",
-"ax c #4a484a",
-"bh c #4a4c4a",
-"bl c #4a718b",
-"bs c #4a758b",
-".7 c #4a9dcd",
-"au c #4aa1cd",
-".5 c #4abae6",
-"al c #524852",
-"aU c #525052",
-"#N c #52819c",
-"by c #528db4",
-"#I c #52a1c5",
-".8 c #52a5c5",
-"#r c #52a5cd",
-"#l c #52b6ee",
-"bR c #5a1c08",
-"a7 c #5a4c5a",
-"aA c #5a595a",
-"cG c #5a5d5a",
-"av c #5aaad5",
-"cH c #622c31",
-"bk c #626162",
-"aD c #62798b",
-"#x c #6285a4",
-"aq c #6295bd",
-"as c #6299b4",
-"bo c #62a1cd",
-"aa c #62a5cd",
-"cK c #6a2000",
-"cw c #6a3031",
-"bq c #6a656a",
-"bO c #6a6d6a",
-"b. c #6a8194",
-"#h c #6a899c",
-"aj c #6aaade",
-".9 c #6ab2d5",
-"c# c #732000",
-"ch c #732400",
-"cz c #732800",
-"a9 c #736d73",
-"aV c #737173",
-"ab c #73919c",
-"a. c #7391ac",
-"aO c #73a5cd",
-"aE c #73aecd",
-"#. c #73b6cd",
-".T c #73b6de",
-".S c #73bed5",
-".R c #73bede",
-"cL c #7b797b",
-"cc c #7b7d7b",
-"ap c #7b8da4",
-"#D c #7b9dbd",
-"bg c #7bb2c5",
-"ag c #7bbad5",
-"cp c #832800",
-"cd c #83444a",
-"cj c #837d83",
-"a8 c #838183",
-"bS c #838583",
-"#J c #8399a4",
-"#0 c #8399ac",
-"#V c #839db4",
-"ae c #83a5bd",
-"cl c #8b444a",
-".i c #8b898b",
-"#n c #8ba5bd",
-"## c #8bc2e6",
-".J c #8bc6de",
-"b0 c #945531",
-"cu c #948594",
-"bZ c #948994",
-"bp c #949194",
-"#S c #949594",
-"ao c #94b2cd",
-"#a c #94c6de",
-".U c #94c6e6",
-"cJ c #9c4008",
-"bQ c #9c5531",
-"b7 c #9c616a",
-"#c c #9c8d9c",
-"bX c #9c919c",
-"aJ c #9c959c",
-"b6 c #9c999c",
-"bB c #9cb2c5",
-"ah c #9ccae6",
-"b3 c #a44008",
-"cI c #a44410",
-"aR c #a499a4",
-"#5 c #a49da4",
-"bY c #a4a1a4",
-"#t c #a4b6c5",
-"ai c #a4cede",
-"ar c #a4ceee",
-".K c #a4d2ee",
-"c. c #ac5000",
-"cB c #ac5518",
-"bP c #ac754a",
-"cb c #aca1ac",
-"bH c #aca5ac",
-"bz c #acaaac",
-"bI c #acaeac",
-"#Y c #acbed5",
-".M c #acd2e6",
-".L c #acd2ee",
-"cD c #b45000",
-"b5 c #b4aab4",
-"bi c #b4aeac",
-"bj c #b4aeb4",
-"az c #b4b2b4",
-"#d c #b4b6b4",
-"aZ c #b4c6de",
-"#u c #b4d6ee",
-"co c #bd5908",
-"b1 c #bd998b",
-"#i c #bdb2bd",
-"bA c #bdb6b4",
-"ct c #bdb6bd",
-"bW c #bdbabd",
-"aG c #bdc2c5",
-".Y c #bdd2ee",
-"#K c #bddaee",
-".B c #bddef6",
-"cg c #c55d08",
-".Z c #c5b6c5",
-".j c #c5bac5",
-".q c #c5bec5",
-"bG c #c5c2c5",
-"cv c #c5c6c5",
-"bK c #c5cade",
-"af c #c5d6e6",
-"#s c #c5daf6",
-".N c #c5deee",
-".C c #c5def6",
-".v c #c5e2ee",
-".D c #c5e2f6",
-"cC c #cd5d08",
-"bJ c #cdbecd",
-"bV c #cdc2cd",
-".2 c #cdc6cd",
-"cA c #cdcacd",
-"cs c #cdcecd",
-"aF c #cddade",
-"#R c #cddeee",
-"#L c #cde2ee",
-".F c #cde2f6",
-".t c #cde6f6",
-"cy c #d56910",
-"cf c #d58139",
-"cx c #d59d83",
-"aS c #d5cad5",
-"ca c #d5cecd",
-"#e c #d5ced5",
-"#j c #d5d2d5",
-"#f c #d5d6d5",
-"br c #d5d6e6",
-"an c #d5daee",
-"#9 c #d5e2ee",
-"#1 c #d5e2f6",
-".O c #d5e6f6",
-".E c #d5e6ff",
-".V c #d5eaff",
-"cn c #de8541",
-"cm c #debaa4",
-".0 c #ded2de",
-".k c #ded6de",
-".P c #dedade",
-"ay c #dedede",
-"#U c #dedeee",
-"aW c #dee2ee",
-"aC c #dee6ee",
-"#v c #dee6f6",
-"#8 c #deeaf6",
-"#3 c #deeaff",
-"#C c #deeef6",
-".u c #deeeff",
-"b9 c #e69962",
-"b8 c #e6cab4",
-".r c #e6d6e6",
-"ci c #e6dade",
-".I c #e6dae6",
-"#z c #e6dee6",
-"aL c #e6e2f6",
-"#k c #e6e6e6",
-"aM c #e6e6f6",
-"aX c #e6eaf6",
-"aN c #e6eaff",
-"#M c #e6eeff",
-"b2 c #eecac5",
-".1 c #eee2ee",
-".f c #eee6ee",
-"aw c #eeeaee",
-"aY c #eeeaff",
-"#Z c #eeeeff",
-".W c #eef2ff",
-"#b c #eef6ff",
-"ce c #f6d2c5",
-".3 c #f6eaf6",
-".z c #f6eef6",
-".Q c #f6f2f6",
-"#2 c #f6f2ff",
-".l c #f6f6f6",
-".X c #f6f6ff",
-".w c #f6faff",
-".G c #fff2ff",
-".H c #fff6ff",
-".m c #fffaff",
-".e c #ffffff",
-"Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#",
-".aQt.aQt.aQt.aQt.b.b.c.b.bQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt",
-"Qt.#Qt.#Qt.#Qt.d.e.e.f.b.g.c.b.bQt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#",
-".aQt.aQt.a.h.c.h.i.j.k.e.l.f.b.b.c.b.bQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt",
-"Qt.#Qt.#Qt.d.e.m.n.o.p.i.q.r.e.m.f.b.s.c.b.bQt.d.g.d.b.bQt.#Qt.#Qt.#",
-".aQt.aQt.a.h.t.u.v.w.e.x.o.y.i.j.k.e.m.z.s.s.b.e.e.f.b.b.A.b.bQt.aQt",
-"Qt.#Qt.#Qt.d.B.C.D.D.E.F.w.e.n.o.p.i.q.k.z.G.m.H.m.H.m.e.I.b.b.bQt.#",
-".aQt.aQt.a.h.J.K.J.L.M.C.N.O.v.w.e.x.o.y.i.k.P.z.l.H.Q.m.l.z.b.b.bQt",
-"Qt.#Qt.#Qt.d.R.S.T.T.U.U.L.L.D.D.V.W.X.Y.p.Z.0.I.1.2.I.f.H.3.g.b.b.#",
-".aQt.aQt.a.h.4.5.6.7.8.9#.###a.L.M.C.v#b.o#c#d#e#f#g#h#i#j.f#k.s.b.b",
-"Qt.#Qt.#Qt.d#l#m#n#o#p#q#r.8.T#s#t.U#u#v#w.o#x.i.q.o.n.o#y.i#z.b.b.b",
-".aQt.aQt.a.h#A#B#C#D#E#F#G#H#I.E#J.9#a#K#L#M#N#O#P#Q#R.w.e.x#S.s.b.b",
-"Qt.#Qt.#Qt.d#T#T.W#U#V#G#W#X#Y#Z#0#q#r.8.U#u#1#2#3#4.E.t.V.e#5.b.b.b",
-".aQt.aQt.a.h#6#7#8#1#9a.a#aa#8.Wabac#Gadaeafagahai.C#a.L.M.e#S.s.b.b",
-"Qt.#Qt.#.h.bajakal.hamanao.O.W#Zap#Gaqar#basatauav.8.T.T.U.W#5.b.b.b",
-".aQt.aQt.c.bawaxayazaAaBaC#M#8#ZaDaEaF.WaGaH#Eac#o#H.6.7.8.V#S.s.b.b",
-"Qt.#Qt.#aI.bal#z.2aJ.iaAaKaL#ZaM#ZaN.WaMaOaPac#G#W#EaQ#o#p.LaR.b.b.b",
-".aQt.aQt.daxayaSaTaUaTaVaAaBaWaXaCaYaCaZa0a1a2a3aPa4a5ac#Eah#S.s.b.b",
-"Qt.#Qt.#al#z.2a6a7a8a7a6a9aAaK.H.WaMaMb.b#babbbcbdbebfaPacbgaR.b.b.b",
-".aQt.aaxay.2aTbhbi.fbjbhaTbkaAaB.m.e.l#ZaWaXaCanblbmbna1a2bobp.s.b.b",
-"Qt.#al#z#ia6a7az.f.e.faza7a6bqaAaK.m.e.m.e.HbrbsbtbubvbwbxbyaR.b.b.b",
-".aaxayaJaTbhbi.f.m.e.m.QbzbhaTbkaAaB.l.e.l.fbA.IbBbCbDbEbubFbp.s.b.b",
-"albGbHa6a7bI.f.e.e.e.e.e.z#da7a6bqaAaK.m#zbiaSbJ.2.2.IbKbLbMaR.b.b.b",
-".baxbN.AbO#e.m.mbPbQbR.e.e.fbSbTbNbU#k.e#k.fbibVbW.q#jbXbIa6bY.s.b.b",
-".b.b.b.AbZ.I.eb0b1b2b3bR.e.1#5b4.e.m.e.H.e.H.e.HbV.0bZbI.0a6b5.b.b.b",
-".a.b.b.Ab6.f.mb7b8b9c.c#.m.fb6.b.l.e.l.m.l.m.l.mcacbbI.0cca6bY.s.b.b",
-"Qt.#Qt.Acb.1.ecdcecfcgch.e.1cb.b.H.H.e.H.e.Gci.0bZaz.kcjbjckb5.b.b.b",
-".aQt.a.Ab6.f.mclcmcncocp.m.fb6.bcqcrcs.m.lctbGcuaz.0ccbjcva6bY.s.b.b",
-"Qt.#Qt.Acb.1.ecwcxcycgcz.e.1cb.b.b.b.b.bcr.G.kbA.0ccazcAcja6bz.b.b.b",
-".aQt.a.Ab6.f.mcwcBcCcDch.m.fb6.b.b.b.b.b.bcEcFaUcGcbcAccbYa6bY.s.b.b",
-"Qt.#Qt.AaJ#e.3cHcIcJcIcK.3#eaJ.b.b.b.b.b.b.b.b.b.g.baIcL#5bMaR.b.b.b",
-".aQt.a.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.aQt.a.b.b.b.b.b.b.s.b.s.b.b.b.b",
-"Qt.#Qt.b.b.b.b.b.b.b.b.b.b.b.b.b.b.bQt.#Qt.#Qt.#.b.b.b.b.b.b.b.b.b.b",
-".aQt.aQt.b.b.b.b.b.b.b.b.b.b.b.b.bQt.aQt.aQt.aQt.aQt.a.b.b.b.b.b.bQt"};
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index 209371e2..f8056dad 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -132,6 +132,7 @@ QT4_WRAP_CPP (widget_mocs
       )
 
 QT4_WRAP_UI (UIC
+      commentbase.ui  
       fdialogbuttons.ui  
       itransformbase.ui  
       mittransposebase.ui  
@@ -148,7 +149,6 @@ QT4_WRAP_UI3 (widget_ui_headers
       mixdowndialogbase.ui  
       transposebase.ui  
       appearancebase.ui  
-      commentbase.ui  
       synthconfigbase.ui  
       gatetimebase.ui  
       metronomebase.ui  
diff --git a/muse2/muse/widgets/comment.cpp b/muse2/muse/widgets/comment.cpp
index ef727859..4a091ddb 100644
--- a/muse2/muse/widgets/comment.cpp
+++ b/muse2/muse/widgets/comment.cpp
@@ -8,15 +8,15 @@
 #include "comment.h"
 #include "song.h"
 #include "track.h"
-#include <q3multilineedit.h>
-#include <qlabel.h>
+
+#include <QWidget>
 
 //---------------------------------------------------------
 //   Comment
 //---------------------------------------------------------
 
-Comment::Comment(QWidget* parent, const char* name)
-   : CommentBase(parent, name)
+Comment::Comment(QWidget* parent)
+   : CommentBaseWidget(parent)
       {
       }
 
@@ -33,13 +33,14 @@ void Comment::textChanged()
 //   TrackComment
 //---------------------------------------------------------
 
-TrackComment::TrackComment(Track* t, QWidget* parent, const char* name)
-   : Comment(parent, name)
+TrackComment::TrackComment(Track* t, QWidget* parent)
+   : Comment(parent)
       {
       setCaption(tr("MusE: Track Comment"));
       track = t;
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
       textentry->setText(track->comment());
+      textentry->moveCursor(QTextCursor::End);
       connect(textentry, SIGNAL(textChanged()), SLOT(textChanged()));
       label1->setText(tr("Track Comment:"));
       label2->setText(track->name());
@@ -69,7 +70,7 @@ void TrackComment::songChanged(int flags)
       if (track->comment() != textentry->text()) {
             disconnect(textentry, SIGNAL(textChanged()), this, SLOT(textChanged()));
             textentry->setText(track->comment());
-            textentry->setCursorPosition(1000, 1000);
+            textentry->moveCursor(QTextCursor::End);
             connect(textentry, SIGNAL(textChanged()), this, SLOT(textChanged()));
             }
       }
diff --git a/muse2/muse/widgets/comment.h b/muse2/muse/widgets/comment.h
index f3fbd547..f2dfbccc 100644
--- a/muse2/muse/widgets/comment.h
+++ b/muse2/muse/widgets/comment.h
@@ -8,17 +8,30 @@
 #ifndef __COMMENT_H__
 #define __COMMENT_H__
 
-#include <qwidget.h>
-#include "commentbase.h"
+#include "ui_commentbase.h"
 
 class Xml;
 class Track;
+class QWidget;
+
+//---------------------------------------------------------
+//   CommentBaseWidget
+//   Wrapper around Ui::CommentBase
+//---------------------------------------------------------
+
+class CommentBaseWidget : public QWidget, public Ui::CommentBase
+{
+     Q_OBJECT
+
+  public:
+     CommentBaseWidget(QWidget *parent = 0) : QWidget(parent) { setupUi(this); }
+};
 
 //---------------------------------------------------------
 //   Comment
 //---------------------------------------------------------
 
-class Comment : public CommentBase {
+class Comment : public CommentBaseWidget {
       Q_OBJECT
 
    private:
@@ -28,7 +41,7 @@ class Comment : public CommentBase {
       void textChanged();
 
    public:
-      Comment(QWidget* parent, const char* name = 0);
+      Comment(QWidget* parent);
       };
 
 //---------------------------------------------------------
@@ -46,7 +59,7 @@ class TrackComment : public Comment {
       void songChanged(int);
 
    public:
-      TrackComment(Track*, QWidget*, const char* name = 0);
+      TrackComment(Track*, QWidget*);
       };
 
 #endif
diff --git a/muse2/muse/widgets/commentbase.ui b/muse2/muse/widgets/commentbase.ui
index a4bed010..05f3087d 100644
--- a/muse2/muse/widgets/commentbase.ui
+++ b/muse2/muse/widgets/commentbase.ui
@@ -1,116 +1,91 @@
-<!DOCTYPE UI><UI>
-<class>CommentBase</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>CommentBase</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>387</width>
-            <height>205</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Form1</string>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout1</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>label1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>4</hsizetype>
-                            <vsizetype>1</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Track Comment</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>label2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <pointsize>12</pointsize>
-                            <bold>1</bold>
-                        </font>
-                    </property>
-                    <property stdset="1">
-                        <name>frameShape</name>
-                        <enum>Box</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>frameShadow</name>
-                        <enum>Sunken</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>midLineWidth</name>
-                        <number>1</number>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Track 1</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget>
-            <class>QMultiLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>textentry</cstring>
-            </property>
-            <property stdset="1">
-                <name>font</name>
-                <font>
-                    <pointsize>12</pointsize>
-                    <bold>1</bold>
-                </font>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>WinPanel</enum>
-            </property>
-        </widget>
-    </vbox>
-</widget>
-</UI>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CommentBase</class>
+ <widget class="QWidget" name="CommentBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>387</width>
+    <height>205</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form1</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
+    <number>11</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="hbox">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Track Comment</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label2">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::Box</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Sunken</enum>
+       </property>
+       <property name="midLineWidth">
+        <number>1</number>
+       </property>
+       <property name="text">
+        <string>Track 1</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="textentry" native="true">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index cd4fff91..00cc136f 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -13,6 +13,7 @@
 #include <QSplitter>
 #include <QStringList>
 
+#include "icons.h"
 #include "filedialog.h"
 #include "../globals.h"
 
@@ -172,9 +173,9 @@ MFileDialog::MFileDialog(const QString& dir,
 
 	    // Qt >= 4.6 allows us to select icons from the theme
 #if QT_VERSION >= 0x040600
-            buttons.globalButton->setIcon(QIcon::fromTheme("folder", style()->standardIcon(QStyle::SP_DirIcon)));
-            buttons.userButton->setIcon(QIcon::fromTheme("user-home", style()->standardIcon(QStyle::SP_DirHomeIcon)));
-            buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", style()->standardIcon(QStyle::SP_DirOpenIcon)));
+            buttons.globalButton->setIcon(*globalIcon);
+            buttons.userButton->setIcon(*userIcon);
+            buttons.projectButton->setIcon(*projectIcon);
 #else
             buttons.globalButton->setIcon(style()->standardIcon(QStyle::SP_DirIcon));
             buttons.userButton->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));