From b3102518d9f12ad2923e5e5409d6570030ae8ef5 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Wed, 17 Nov 2010 03:24:36 +0000 Subject: Ported filedialog widget to Qt4 --- muse2/ChangeLog | 6 + muse2/muse/CMakeLists.txt | 5 +- muse2/muse/global.xpm | 213 +++++++++++++++++++ muse2/muse/icons.qrc | 7 + muse2/muse/project.xpm | 389 +++++++++++++++++++++++++++++++++++ muse2/muse/user.xpm | 333 ++++++++++++++++++++++++++++++ muse2/muse/widgets/CMakeLists.txt | 7 +- muse2/muse/widgets/fdialogbuttons.ui | 361 ++++++++++++++------------------ muse2/muse/widgets/filedialog.cpp | 153 ++++++++------ muse2/muse/widgets/filedialog.h | 28 ++- 10 files changed, 1226 insertions(+), 276 deletions(-) create mode 100644 muse2/muse/global.xpm create mode 100644 muse2/muse/icons.qrc create mode 100644 muse2/muse/project.xpm create mode 100644 muse2/muse/user.xpm diff --git a/muse2/ChangeLog b/muse2/ChangeLog index be5bf9fa..daa83841 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -6,6 +6,12 @@ LayoutRequest events, just before paint events when the window sizes are finally correct. TODO: Still off by a few pixels when mixer first opened, because main window frameSize is not set yet, by the time LayoutRequest is caught. + - Transformed file dialogs to Qt4. This was the first attempt to transform a .ui file to Qt4 + as well. New .ui files do not store image information. Thus I moved the 3 icons from + qfiledialog.ui into their own files. + TODO: Qt4 does not support file preview in file dialogs yet. The relevant code (wallpaper + preview) is disabled. Now we either have to implement an image previewer, or forget about + this feature. (Orcan) 14.11.2010 - renamed deicsonze2 files and classes with '2' suffixes - Applied patch by Orcan to convert populateAddSynth(). (Tim) diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt index 303e6b51..8e1a8767 100644 --- a/muse2/muse/CMakeLists.txt +++ b/muse2/muse/CMakeLists.txt @@ -115,7 +115,10 @@ QT4_WRAP_CPP ( muse_moc_headers appearance.h ) -QT4_ADD_RESOURCES (muse_qrc_files muse.qrc) +QT4_ADD_RESOURCES (muse_qrc_files + muse.qrc + icons.qrc + ) add_executable ( muse ${muse_qrc_files} diff --git a/muse2/muse/global.xpm b/muse2/muse/global.xpm new file mode 100644 index 00000000..5175c03f --- /dev/null +++ b/muse2/muse/global.xpm @@ -0,0 +1,213 @@ +/* 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.qrc b/muse2/muse/icons.qrc new file mode 100644 index 00000000..c5c52bef --- /dev/null +++ b/muse2/muse/icons.qrc @@ -0,0 +1,7 @@ + + + global.xpm + user.xpm + project.xpm + + diff --git a/muse2/muse/project.xpm b/muse2/muse/project.xpm new file mode 100644 index 00000000..b373e62e --- /dev/null +++ b/muse2/muse/project.xpm @@ -0,0 +1,389 @@ +/* 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 new file mode 100644 index 00000000..49dfa00e --- /dev/null +++ b/muse2/muse/user.xpm @@ -0,0 +1,333 @@ +/* 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 e58d8c8e..f7be819a 100644 --- a/muse2/muse/widgets/CMakeLists.txt +++ b/muse2/muse/widgets/CMakeLists.txt @@ -130,6 +130,11 @@ QT4_WRAP_CPP (widget_mocs action.h ) +QT4_WRAP_UI (UIC + fdialogbuttons.ui + ) + + #QT4_WRAP_UI (widget_ui_headers QT4_WRAP_UI3 (widget_ui_headers midisync.ui @@ -152,7 +157,6 @@ QT4_WRAP_UI3 (widget_ui_headers editsysexdialogbase.ui cliplisteditorbase.ui mittransposebase.ui - fdialogbuttons.ui shortcutconfigbase.ui shortcutcapturedialogbase.ui aboutbox.ui @@ -170,6 +174,7 @@ QT4_WRAP_UI3 (widget_ui_headers # ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h) add_library ( widgets STATIC + ${UIC} ${widget_ui_headers} ${widget_mocs} utils.cpp diff --git a/muse2/muse/widgets/fdialogbuttons.ui b/muse2/muse/widgets/fdialogbuttons.ui index 33c79814..24f58e1f 100644 --- a/muse2/muse/widgets/fdialogbuttons.ui +++ b/muse2/muse/widgets/fdialogbuttons.ui @@ -1,204 +1,159 @@ - -FileDialogButtons - - - FileDialogButtons - - - - 0 - 0 - 175 - 438 - - - - - 5 - 5 - 0 - 0 - - - - Form1 - - - - unnamed - - - 11 - - - 6 - - - - pathGroup - - - 0 - - - - - - true - - - true - - - - unnamed - - - - globalButton - - - - - - true - - - image0 - - - true - - - true - - - Global - - - 0 - - - - - userButton - - - - - - true - - - image1 - - - true - - - true - - - User - - - 0 - - - - - projectButton - - - - - - true - - - image2 - - - true - - - true - - - Project - - - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 20 - 60 - - - - - - loadAllGroup - - - Load: - - - true - - - - unnamed - - - - loadAllButton - - - Songdata + -Cofiguration - - - - - loadSongButton - - - only + + + FileDialogButtons + + + + 0 + 0 + 145 + 438 + + + + fdialogbuttons + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + 0 + + + + + + + 80 + 80 + + + + Global + + + + 48 + 48 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 80 + 80 + + + + User + + + + 48 + 48 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 80 + 80 + + + + Project + + + + 48 + 48 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 245 + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Songdata + +Configuration + + + + + + + only Songdata - - - true - - - 0 - - - - - - - - - 789cad965b73e2481285dffb57383adf3a3672102021c5c63ed86e5ff10ddfdaee89794824617cc137c0b789fdef9bca3ca5a66dd8d999d9aec6e673294f9dcaca4af8e5cbd2d9c1eed2975f3e8d2732b9cc97f2a13c2e7d29a6a3d1ebafbffdebf74f9f5bed25fd1f7592a5e6e77f7cfadc9b2ce54b7b77b765054c0ad4b07fc603e77623918ae919dceeb48c6f9ce322ed572c6bc669236fa4363f74aee34fc039e213e7b8d1f1f86770ec4ca7ce699cc7c6b715478d6a98bf6fceaae7f1afceaae7fa54b3eb75c0716af3528033677e724e63c98d6f03f7db16ff669c467964fbe307e7a0cfd760e8f30518faf252b3fb49c1c81fad3bd7eb413fcdc0bbce595c783eba15371bd530fd3be7b8403e2681b17e59b3af97392711ce6f1038f3f5cec0b1b3907327ca2c3ff4cd390d7e1ec1c1ef8e731615565fc2c6599279bcdc80839ff3c0d0ffee1cd6e3041c637e2fb0f87ad760e8d37e60ccaf3987f3a51c5cf40be3c2398be07f195cc0ff65c5ad28f895dcb913f2d500073f17e0e0e725b0cfcb2db8c0f30735fbf3abce6904ee83437e2370f0df7456ffc6fc1d1c637ec559e23231be0397d8df57e32abfae0faed72b9db3701fef9d453c9e5a15b7a376a31d99de15b80dbe700ee72702ceb05ecf39cbe0bf012e7c3d3e77ee377d3d3e0becfb61d7135dcffa8d74c1a9331d3a4b04ff78be8eb7f38f9b7123b6e648c7ce69a8f7d839f823ab87583a05fc6f39a7387f8e9c25cefdf901589cc5f493661225b61eef394be9f3bce3dc4ffc7eb1f5af44d250cfd6af3a2d41bd72d3393c2f47c6fd4e86fe543aa791f7031a3bd7fafb6001ef82437d98bfb4d509fde4c039e8c92e38f43fcc6bbcfbb1fca77d9d773f4330fa21df81433fb0fac9da29f22b1bce59b86fe03cd443e004bc06467d8aed2fcbb3507f3be0d08f9e9cfb09ea6dd339c4f33a18f9a0ed8aa52d11cee3158cf397a1731fe74947ce7989fb3732ce05fd487a60c1e74f0a2e31df770e7a72edacfb77bf5bce45e2fa62fefb6d29bd3e64dbb9df44bd5c8213f0917311ee430f9c94beff17b060be6d5c68bcd76b0e1667590797b82f783e477dc92a18f9e43767d5777e059703df8fed2f8f75ff1ebfe29c37715e31389c5fcbb928a187e7cba6b3587fcf0b7ddefd4ec1b89fbc0d0ef771e21ce27939b0fbe33138815fdb4f11e7a87fce9c0b9c978cc1b87f34710ef1fc0816e8399745a8ef6370a8cf1370a8cfa97389f313fb3e512605ea4f46ce25ce5beec1a81fb6ef5f651d4f0c0ee773050ef93d0c0cff53e741c8cf6acd03d3db0427ce6ceb0f923abeeb5cc73f83437e6ec08278fbbc1a0c6abd1138ccf7c103e7dee4ef8f1f3a4c61fc1d1d16eeebc8b9f86b6adee779c0173ce44bbe32b5cb3faf663ad77cc323be35b53b55b9ffe8ed8f766d3a0ffcc8639ef054a39fde790b6ab9be7f5eec137e5ef895df789957f4b5aa11b3de46a6f0555f237bdf5fa8f3c06bbcce1bbcc95baa3851b59fbd6d43ed4ab52ac5aeef748ece0eeff21eeff381aaad73cfbc4dd4d9211fa952ae4ac77cc2a7aa52a9dd7f74643adff88ccff93b373852b5a6a9b9b796aa0dd4519b63554ab8c329677c42fcde91dd27e27312ea534e0595dca0c18cb7095dd0902ee94ab50674adaf1b1af131ddcef34377744f0f9a8f5b7aacd482371af3064d684a4ff44c2fea6cd9f296d02bbdcdcb332dd30aadd2575aa3075ad7517b536707b4c12fb4a9ce5e788526fa7b8bb6a93bd7cf0eedd21eedd381aaf52b35f3e66a3d3ab47d6ed291664df346c7f3fdd0099dd2373aa373fa4e0d555b7de72da2e66cde5467ae1f6a519b624aa8432965c242ea6def83b728e44d64417efcaeebc7a5e4fab54e3ff664b0c09b9d825c2cf2a32a23ab53ad7e19566a7c31e3ed5ddee472be1fb9b29b53d5bcd6aad65897bb72ed6af3bcc9cd423fa32ad655886524a3aa66f59dedf4a7bcedcbaddc2dcccfacca3d9fca833cf0b13cca587fdebbda0f6f32a9fcfcdc41e0e73eb429f752a9e8c8746ccb54a6d59d9227fda6f5aca7f022af959f1f9dad1a9e9fca039fba8a7b511f631d6f3aa6b22c2b36a6aab62a5f7583337e6674d678a84f3d9a8f937a4795974a656a1aebda3d72ce644336e56abe9ff09eaa3da882bdc6418563f5b3255b9ceb8e87b2ad7fefcef7e3990a7f911d5ddd7dd45e54675db3bfab2ac7b2b7c8cfecf9d56afbbabee7055e2a15cddd81f4febb9fd9fe56eff44a63b7b4db1fcba179a954a61ffdcc7e2e7f1cb5b7a91ca8d6b6eea8a73f8fdefb09f5335fe3839a768b4a855e7ff6f3a30e17f999ebed48f6a52b1bc1cfecbdf8638d0f797ba7f2bffb79ffb9f77efcdfbe47fdfb9f9ffe03facd42d6 - - - 789ca5975973db3a1285dff32b5ce9b7d414ae2889145953f3e07ddf774fcd433748598be54df2a65bf3dfa7893e60ecd83735531386297f017070d06834e13f7e2c5c1cec2efcf8e3db74c6b3a15ff0037e5cf8513e4d266ffffcd73ffefcf6bdd35dd0bfed225b687fffdbb7ef8e17fcc2dedd6d1580dec1e1ec7d8b28502bfc093c0577c177c6dd56c635cb2eb86b4cfbe0bc27a17d05ec7b9d30fe3a70ae0279cdfe119c1bd3a17196143ef01b3835f66b3527ada49b043ff2649cb6f2a02fabe0143c03174537f08bb1ea07f6d63f57bd30bf9c80bdb17b334ecbdcd6f31cd9c6bb7be32c41fb040cbf720b2ec0af91398ca7ccb848ca34700f9c5659e8dfadb9ddaa9fe0f701dc351636ceb03e4e8c7b0987f9b80d8e7eaac836bfec052eda79bb087c0af660328efeb905c6fae9c0b8d1f791a15f820bf8e9804b31bfd0cf13ebcf070d5bff71645f06ee8253314ec1d0a7f5c8a64f6b0d87fe74078ef31f366ced27c69c58fc79a9e64ed2f69d24ecf7a271a7652c621cd7eb5ec1717faf1b367f5d7089f697862d7e7de33c81ff5570f4eb1b36bf1bc645e243feb80c8cf8d043646b27f8672ec379e7edc0badf9db0dfcef48b0e58968d9bfddc01637dee160cff7461dcf8357f4591c0cf7964f8b907c31f97e002ebb17815d236bfb414d9f6c785fedda4e3bbb63f03e36ecb984fc05d633f6ed8ead79a71939f33e3383f4d8ce37c6ccc3a5f18cf9bc63a9f7106863ebf8273cc370063bcdc18f762fd98825363d7332e4ae4ff9331e33cb8d45818fe825edaeee66928fb7c6a9cb68c69cf38477d953730f68b368d39e6530e8ef9f3d8b0ed27e693ac0afb23478175b8d573ee19777d6af158344e0b63bf0e2ed1fe6cacf919e6f3217fb2763c7f3236ce92ccd6b762dc2b2c5ef46a9c235ff9c1389e079e82511fe4ce38c693198cf5f9703e326ee37be85f8c9bf36ffa9ca5f81eee834bb033cef1bda10138d6d391713c8fae30d67cb7f587fad8eb34f30fc0f81efb393837e6c2382bed7bcb67c6bd042cc605f69f5d64e4ffbe715c3faf822bec37fa4b86fc3b890cffc7e0cafcbba38643bb0ff5a327bdc2ee07de834b63be37ce637d5c312e50efe4da58daa8179163be84f179130f5f1ac7f3e847c6bdd2ee079c1be709ee0bc760dc1f68cbb888f5bcd5b0d5bb3370ac77953123df7c381fb9c4f9ddd0388ff97a6b1cfb1319fb58dfb6c088af84f98b6e9a5afef927e33cc5fde60a1cef3bf7c645ccbf6330faf39db1c6d3e667e3389f3b8d6c7e7cf053784d3fbb2f1d1a473fd233d6f369f7416f9c97a83717c64dfe41af88f7870c1cef4b4bc6cd7e0f8c3dea9d84fb84965bf8f19b60dc0ff9c8b8d9bf148cfc924b63c6fd8366c69adf36dfd0d8237ff931b2d53bb76d5cb68d7d381fecd3785e97c029ee9707c6bd14f928c68cf3271be0143c073378135c21ffccbf6fcedbae7119f367a761f317ce9374a33f498d99510f8760e8cb2832f27b6e2c6d7c2f4a7086f62be3983ff4645ce2fbe043be499916c89fc4b888e7c1e62f55dfcefb2218fa7ed6b0b59f8319f57dddd8235fdca5715c3f6d8319fbb704aefa96dfa19ee87695e6cf5d19c77c702330831fc095b1ac1bc7f9fd3318e3651b1cef5f7de312e78ba660363f6e0f1cf36d3932daa15f617d6e2532d663fdcbb81ed93216d4733933f638ffae0d467df78b60064fc118cf6bc625d6434760f8a51de3c6df5a64f89f8133f80df79132cd0a3bbfbe6f9c27761ff5afc645acdfc7c63ed67f06c7ef551519bf5f8d8c4b7c5f09fa65662c8f91719fba05235fa8308eeba12432d6b30fc67adc6ac3fdc0676036f6a65fe529eea7136361dcaf5bc625eebf6e0c8ef5f9001cf3e90d8c7a45a791cd2f9f1b47ffbc0cc6f9a4e7c8e69f7230f2913a0d07ff14c7c77c7c6a38b44b8857a5bf3eda7d4d72638f7ae31e8d63bcfd101cef439b91713ee6e00afbb3631ce34f6370dcbfddc8d6ce1760ac87f71ab6f5c4fed17f380f55e5e3794f8c9b7cee83113f7e01235ff83232f4afc0d077e7c6fd36da058c7cf1217ffb5919eb59c738fa7773708cffa1713fc6a3ddb0cd77038ef979d1b0b5bf80e1d7857ad6ef37e337c0b1ff041cfb57e0bef1e1ccd1fffb065dd69fdebfa28faffffde5ff7ff37ee1a774953e7dd5b96ed4fe473f6ea023076ee8466eac5a3741edbff2f68b9fdacbc4ddba3b77af6a0fee3170ad366dd44af559feeaf3939f997b72cfee45c7bfaada5be36de2e6aa35d5f171d5e2167ffafce467c92dbb157d56dd5a50fbe96dac4aebaab781b7729b414dbef4b3e5b6f5dd71bbaab7e7f67ff1367607aa76a33a87aa74a33f43e9939f2377ec4ef439d567479fdadb993b7717ee527d5db996ba485c5bffedab5a4763552b7df6d375a9cb5ccfe5ae2047440c6fcf24ee8e3c9554519fae6940431ab93e8d43cce4573f744313baa53bbaa7077a54b5139ad2cc9dd2133dd38b2abd8658ddd571235d296165bffaa1455aa2655aa1555aa375daa04db74a5bea8d699b766897f6689f0ee8908e2c6e74fc177e4ee8c49dd3299da9ca395dd0255d510bde6a5709b5a9435dddcf99c6ada2f42ffc64d4a35c7b17ec98982977e7ac171e5a672dc3dce76b1ef0d02d236ed5577e34cac2231ef38d1bf0846ff94ef7fd9caef85e551ef89184a73ce3277eaee316f6f4fc4b3f9af9fcc2affcc6735ee4255ed678e4aab3c2abbca6bed6798356d5db1d6d604fcfbef2c39a9f7ca33bd0e62d3754a56dde51955d7df7546597f7f9a05ea1c66d950feb3d753b7cf4859f327839e6133ed5f72c783ae70b5ee64b7dafb8a537f9367754ad5bdfe1556df0a51ff392718f737d332e6a4f9ab5b5975dedac011211af37db4afab537b9feeca7f6a22a273290a1ebcb4806faf3b8f614cee48daecebcddca8d4ce4b6f6267772ffd14fed8586c1cb5c4f8e56068db57a9287e069122a47e536e451a63293277996177995b78f7e425cb6a2178c3a94f93b4f37561f65d16dca922ccb8aacaadada7b3f7c23ebb2517b91cde0253e732adf7ba2b90cf958b6f4b4eb79976dd991dd0f7e845f65cf2dca3ed53e267220877264754f8ee544f6e454cf75a56f5f867226e7ee814672219b3ac7e54f3fa6a83a575a552a6949a2bf9974825242a974636ce22b67ae2557eabda53a1ff2193a591d1be9492e85779eea0aafff2788cd24be7adf905a457fd1fde007f9b3e8452b5d15eee17d7fed07b51f5fcfb0d17859f7c3da8beee9d88f64e4c7f2e97c453ffec64ffcadbff3f7d18f7ff08f7e5a7bf13359f74faaa25e54e5f9b77e5efcab7f533ff3c60f1effa8df8bb1ee7cbda2b95ff423d5f9540f1b3f2f7ec92ffb155d578ccf4fa555bfc6a77edd8baa78b9fcda0f6fe9be77fc86dff45bfa6ebb0e557af2e5d3a3df08def43bba97bb9fcfd717fddf3f9ffb4cf1363af0f35b9df7dff2afda3fd49fdfa97cba637c6cfffeefbf7ffb0ffbcaf966 - - - 789ca598d96e23cb0d86efe7298ce1dd4150475b4bdd0872e17d5fe4dd0e7241b25a966ccbabbc0679f7948a3f35b667264890d1e8603e5515fb278bc5629f3fff983bdddb9efbe3cf6f8f139e8c744e87fc30f7477c1a8fdffefe8fbffdf3dbf776676efab768cdb5beffe5dbf7c0733ab7737b5367a00fd09f7c1c9104d4c87f323f823bc6f10d5c36cacc0b606ddaf89d71b301aec19d669eaf87e012fc005670cfb8a5ed6666ac6f378c6505ac1de355e34ec3384e66cc59ffad7337b34470c7380ec0a5cdd7cab9c8619337e75e7bcab4ed5c4a1e873f1db5713d362e8ac2ec9d806337dbd353e36e13cfbf0417c6bae60c7b67cef63c3d07478c5fcfd8c6378c7b4df0c4b9ea647e0217187f0657a5d97b75669bff629cb6cbe66f3a579af533b832fbd20647b1f55bc655c579be369cb5c83c3466c67cc4836b1b977563618d995bc6da8d793c5c642ed3065b3e9abdd2f38f2760e41b5b3ccb76c7f6972d9ea5e78396e0d2f62bbe1b170de4c3c019f13a0257369f768dbb4df33706708578af3adb7a7a0347cc1f19f79a361e09ecfbbf0e8ed84ff8cf8c785e194bcbe2a3b02775cce79bf7a7dc6cb4ca5695b96bece78b3ae0b26de34bc67ebef80ddc317f79138cfc9777638f0f379c2d5f54c105c69be00ae769011cc143e32ef24f8e9d916f47ce96afdc0217164fae8dab66ddcdfe1599d3fea39e5c1bbb7f326f5c20ffc32b389a7e317b697f8df9ddd9e6cb05b8002fced8e66f83715ec2dd8c6d7ccb19fe404f17fb2d9733363d23e31ef24d4e9ced3c91c5a3ac9a960fd40617831c0fcef5a2d5987e32b78dd3fa7cdeb8032ea06fd719faaec138dfbce08cf53be0081e189785ed47ccf169551dc5f952e36e61fe92adaf66cf1f833d3e05385afed39171897850e96ce37c08c679a2ca19fa179dadde9033fca35567c477c519f3efc1a87f7c635cf9f3f7c06effc0989bb61fb40f66e390f3abddf4f3a94d30f2977a60b5f32aafc69e0fe105ec7a4733b6e737c0d1e249985f16d8af0076ff96c1f08f969c31be66ecf9162a30ecd1b133e63f3a233fefc0febc796366ab5f21e747bb727f756c3c3bbfb760b5fb97edf95517f544578c67f79f389b3f72605ce2fcf03318f9129fc0881793b1fb176c3faa547fb35e5a00fb7ee6fea3d3f4fe250c8d5dbfbe833bd68fc82e58d19f60fd6cff0e8d4bdca7746b2c2d7b9ee6fdeaf0cc5e178c7e879c613fdc18fbfed389b1ef07df3a63bf1ec0111c666cf7cdbd3137b17fa5b1429f34c18cfb6a00ae8d25d7a7a2e5f775bc067b7f3631f6fac12bc6b3fb3a800b63da32f6fe451fc1b87fe5d419fb7f67cc5e3f095ca03fb931ae5b8341d697cf5f2a8e0dcb3fb1f5ecfd20bf802be378058e18cff5abdb4afda1f973052e8c65c9d8e34913b0dfef6c2c8cfbee065c9b3ecee7bfcbddcafa1d3e0647f4a3f7c6decfd1e58cad3e3e184b0bf6198ce7c99a7144bec7ec6fafdd6d5a7fc09760f4b7bc0e463f2b6cdcf3f9af60cc27f0acfe88b1742d3fc3b1736df97608463e71aedf3df1fe984fc0de9f75c1e8a7e5ca585aa8df0246becad838c27f2e9d2dde92f3a54cfad1cf457034962de312fd9e3c80bd3f1a1a57b86fe3bcb1f7c3e1085cc3df036385ffd230aebbd093fbb532f967f52c8c8c4bf45f61c338f5d7b63ee743d5f17e93d78c4bf45ff1068cfb5a968d2b8c531fecf7793476fbe1d419fd88b1f6bcbf1163cfbf78615c816507ecf35f8cb9b6faa56cecfb476aacc84f36bdeaf1d1dc4fa4f28878eb8e7185fe4eb7c1dedf3d19b3f77ffbc67e1e381a2bce673871c67d9ffb49d659fde91857decf6d837dbc6fcc35ee778c479c475667dc376733b6fd3f37ae3d3f72fd93e40fdebfda60f40bdc3766ef279b609fff662c2d8c0fc05dac877d7f5fa353e38878874d30ce8be6fc9658a15f8cb63e32fa51d90333c66f8dd3f36dbc04635cfb60e44368187b3cc216d8cf6bbebf53f380faae07c69e3f5280bbc6710cf6f7af0e18efafba68ac58af3760ac0fbbc611e7979e9ca1efd9b86ee17c2f39a39e637e8d7ce28b19db38f40f106fcaf54ca3d78f28e0da584d4f4c7a8defc0a8af1ac0be7e098cfa4a7bc6337f368c5d3fad3bc3bf0918e73fcccfd8f4db7e44d71f72fec5147f7b5e5430ea71b83456bcff867bb0cf7f007bbfe1e30c7dd7c611eb6908f6ffdfb000f6fdd93176bd6111ecf99cf333d6fefead7bc68afe301460d4435d02a3df9567b0afb7e7d7d1d75f81bd9ef6c1de2faf18cffa936cafeeaadfd795b1d70fba00778d95c098af2de3dae78fc1984f6760f81f96c11eaf73e381d723cc1f78bc72fdac937fc8f755b0dfe72d30f62bec813ddfccbfdaf783ec79b53f2f3c817dbf723e0c92bfc8bf36d8fbf575e31af594dec13e7fdf78e0f5f61a8c71da9cb13d2ff71783c12c5f3a608fd700ecf15a339ee97f03fbfa31d8d7d7e081717f12e8fffd66bb9cfef5f12be9a3d3ff7ef9fd3f7c7fa127863a7d06c9cec5ccdaffa8270cd3ca611885cb70956c5d676bff95b62f7aa65ac6e126dc86bb64ed3e3c649e5a7b9c598b4967fcaaf3273d93f0149eb3672fc9daeb4cdb38bc255b8f69bd7b2de1fd87ce9ff4cc8785b01896c27258c92b7e685b4d96d6d22f6ff8d6613d5b935fead9089be9bb15b6c34ed84dd63e6bdb0bfd64e33afdb29fe3f7e6967ed273100ec351380e27e134593bcbdaceb38e46d2d50cadd00e9d50242dddf45b27c56a6ae9673dbd50868a021131092945689beabaa59a067441431ad1255d51da4f1ae798c9573d7443b77447f7f4408f3421726df444cf94bca3d71cabdb69dce82d8ce8dd3cfbaa87e6698116698996698556696da62dd23a6dd0266dd136edd02eed59dca8ff1b3dfb7440877444c7c9ca49b2f651db099dd25958a3736aa41d984f71aba9f91b3d2d6a873bea50415dea51491587646d69aa8d8953eb337d5d0e3b885bfd1b3da905e5417a95bee0218ff892aff89ac77c43ab7c6bdaf88eeff96116b7b5dfe879e4479ef0133ff34bb2f31a86fcc6ef3ccf0b74c48b88db52f214710be7bfd5b394b42cf30aaf263b6bbcce1bbcc95bbccd3bbceb719b6ae3bd69dcc219f77fa587f79396033e4c768ef8984ff834293ae3736ea41ebc15eeb89dbaf1e28736d65fe9e16ed2d2e392ab3440a95b94304a2f752fa2b9571cc8850c6524973fb4c9d5cf7ae47aaa45c67223b772c723b99707794c9626f224cff222aff226efe9332f0bb268da6449963fea911559cd7129654dd66583bab2295bb22d3bd4945dd993be3c4f4f81eccb811cca51b27621c77222a71ff5242b67722e0d69262d2d69875a9ef924f5e13b52240b5d59969e94526950a26b7a4ffd9bc8a1aabca7deef831ead75a0173ad4915eea95a699a96aedc9533a898370afe3a4eb299da9822ef42659bb9567bd0beb7a9fb4c58f7af4411ff55a27faa4cffaa2af9ace1f8f528e0d5375b8d2f730d2791ae882dea4efa22e4919eee93ae9edeb727ac24c0f4f744557754dd7754337754bb7d3beafe573d809631deb8eece8ae2e262d7b494b3f69dc4fbff5434b97f5e0839e433dd2633dd1533dd3736d689347daca3539d94a7e6d693b3d7b493b69dfb296d4a3bf252bddcf7a82684fcbf43a16f43452eab2441751efc6533bbc467dba8afa434bb2b217a314fafe518ffd2bf56903d3142fd2ec40efa9d6d5e93b9cde0c7c42579fb5242b375ff5c0d230691ac54bd98b9aaae7f4165c0bad789547d3ec789de22366258e35c46427de7ed5932ddd4d35c5fbf8903c6ba5bb6140fd1fa3662d75df57f131e552579e3eeb4167903f3c8993f8a47da9e273caa3767cf964c73ee98e88afc9d3e6e7fc41ed714d6ff13dcee75d0ea9a67f5ccf5fb59996afe77d6669212ec6a5e4d93daf7c5cf975dec7cf977af88b191fac7cea313e8f7dffd75fbffd1bbcd1c249 - - - - + + + true + + + + + + + + + + + + diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp index 6ffa6f69..61737a71 100644 --- a/muse2/muse/widgets/filedialog.cpp +++ b/muse2/muse/widgets/filedialog.cpp @@ -5,19 +5,15 @@ // (C) Copyright 2000 Werner Schweer (ws@seh.de) //========================================================= -#include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include #include "filedialog.h" -#include "fdialogbuttons.h" #include "../globals.h" MFileDialog::ViewType MFileDialog::lastViewUsed = GLOBAL_VIEW; @@ -88,12 +84,12 @@ static bool testDirCreate(QWidget* parent, const QString& path) void MFileDialog::globalToggled(bool flag) { if (flag) { - buttons->userButton->setOn(!flag); - buttons->projectButton->setOn(!flag); + buttons.userButton->setChecked(!flag); + buttons.projectButton->setChecked(!flag); if (lastGlobalDir.isEmpty()) lastGlobalDir = museGlobalShare + QString("/") + baseDir; // Initialize if first time QString dir = lastGlobalDir; - setDir(dir); + setDirectory(dir); lastViewUsed = GLOBAL_VIEW; } } @@ -105,8 +101,8 @@ void MFileDialog::globalToggled(bool flag) void MFileDialog::userToggled(bool flag) { if (flag) { - buttons->globalButton->setOn(!flag); - buttons->projectButton->setOn(!flag); + buttons.globalButton->setChecked(!flag); + buttons.projectButton->setChecked(!flag); if (lastUserDir.isEmpty()) { @@ -114,9 +110,9 @@ void MFileDialog::userToggled(bool flag) } if (testDirCreate(this, lastUserDir)) - setDir(museUser); + setDirectory(museUser); else - setDir(lastUserDir); + setDirectory(lastUserDir); lastViewUsed = USER_VIEW; } @@ -129,8 +125,8 @@ void MFileDialog::userToggled(bool flag) void MFileDialog::projectToggled(bool flag) { if (flag) { - buttons->globalButton->setOn(!flag); - buttons->userButton->setOn(!flag); + buttons.globalButton->setChecked(!flag); + buttons.userButton->setChecked(!flag); QString s; if (museProject == museProjectInitPath ) { @@ -142,9 +138,9 @@ void MFileDialog::projectToggled(bool flag) s = museProject + QString("/"); // + baseDir; if (testDirCreate(this, s)) - setDir(museProject); + setDirectory(museProject); else - setDir(s); + setDirectory(s); lastViewUsed = PROJECT_VIEW; } } @@ -156,52 +152,62 @@ void MFileDialog::projectToggled(bool flag) MFileDialog::MFileDialog(const QString& dir, const QString& filter, QWidget* parent, bool writeFlag) - : Q3FileDialog(QString("."), filter, parent, 0, true) + : QFileDialog(parent, QString(), QString("."), filter) { showButtons = false; if (dir.length() > 0 && dir[0] == QChar('/')) { - buttons = 0; - setDir(dir); + setDirectory(dir); } else { + // We replace the original sidebar widget with our 3-button widget + QLayout* mainlayout = this->layout(); + QSplitter* spl = (QSplitter*)mainlayout->itemAt(2)->widget(); + QWidget* original_sidebarwidget = spl->widget(0); + original_sidebarwidget->setVisible(false); + baseDir = dir; showButtons = true; - buttons = new FileDialogButtons(this, "fdialogbuttons"); - addLeftWidget(buttons); - connect(buttons->globalButton, SIGNAL(toggled(bool)), SLOT(globalToggled(bool))); - connect(buttons->userButton, SIGNAL(toggled(bool)), SLOT(userToggled(bool))); - connect(buttons->projectButton, SIGNAL(toggled(bool)), SLOT(projectToggled(bool))); - connect(this, SIGNAL(dirEntered(const QString&)), SLOT(directoryChanged(const QString&))); + + spl->insertWidget(0,&buttons); + buttons.globalButton->setIcon(QIcon::fromTheme("folder", QIcon(":/icons/global.xpm"))); + buttons.userButton->setIcon(QIcon::fromTheme("user-home", QIcon(":/icons/user.xpm"))); + buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", QIcon(":/icons/project.xpm"))); + + connect(buttons.globalButton, SIGNAL(toggled(bool)), this, SLOT(globalToggled(bool))); + connect(buttons.userButton, SIGNAL(toggled(bool)), this, SLOT(userToggled(bool))); + connect(buttons.projectButton, SIGNAL(toggled(bool)), this, SLOT(projectToggled(bool))); + connect(this, SIGNAL(directoryEntered(const QString&)), SLOT(directoryChanged(const QString&))); + if (writeFlag) { - buttons->globalButton->setEnabled(false); + buttons.globalButton->setEnabled(false); switch (lastViewUsed) { case GLOBAL_VIEW: case PROJECT_VIEW: - buttons->projectButton->setOn(true); + buttons.projectButton->setChecked(true); break; case USER_VIEW: - buttons->userButton->setOn(true); + buttons.userButton->setChecked(true); break; } } else { switch (lastViewUsed) { case GLOBAL_VIEW: - buttons->globalButton->setOn(true); + buttons.globalButton->setChecked(true); break; case PROJECT_VIEW: - buttons->projectButton->setOn(true); + buttons.projectButton->setChecked(true); break; case USER_VIEW: - buttons->userButton->setOn(true); + buttons.userButton->setChecked(true); break; } - } - buttons->loadAllGroup->setShown(false); + } + buttons.loadAllGroup->setVisible(false); } } @@ -211,12 +217,11 @@ MFileDialog::MFileDialog(const QString& dir, void MFileDialog::directoryChanged(const QString&) { ViewType currentView = GLOBAL_VIEW; - const QDir* ndir = dir(); - QString newdir = ndir->absPath().latin1(); - delete ndir; // We're owners of this one so we should delete it - if (buttons->projectButton->isOn()) + QDir ndir = directory(); + QString newdir = ndir.absPath().latin1(); + if (buttons.projectButton->isChecked()) currentView = PROJECT_VIEW; - else if (buttons->userButton->isOn()) + else if (buttons.userButton->isChecked()) currentView = USER_VIEW; switch (currentView) { @@ -234,6 +239,8 @@ void MFileDialog::directoryChanged(const QString&) } } +/* ORCAN - disable preview for now. It is not available in qt4. We will + need to implement it ourselves. //--------------------------------------------------------- // ContentsPreview //--------------------------------------------------------- @@ -261,6 +268,7 @@ void ContentsPreview::previewUrl(const Q3Url& url) if (bg) setBackgroundPixmap(*bg); } +*/ //--------------------------------------------------------- // getFilterExtension @@ -299,18 +307,23 @@ QString getOpenFileName(const QString &startWith, { QString initialSelection; MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, false); - dlg->setFilters(filters); + dlg->setNameFilters(filters); dlg->setCaption(name); - if (all) - dlg->buttons->loadAllGroup->setShown(true); + if (all) { + dlg->buttons.loadAllGroup->setVisible(true); + dlg->buttons.globalButton->setVisible(false); + } if (!initialSelection.isEmpty()) - dlg->setSelection(initialSelection); - dlg->setMode(Q3FileDialog::ExistingFile); + dlg->selectFile(initialSelection); + dlg->setFileMode(QFileDialog::ExistingFile); + QStringList files; QString result; if (dlg->exec() == QDialog::Accepted) { - result = dlg->selectedFile(); + files = dlg->selectedFiles(); + if (!files.isEmpty()) + result = files[0]; if (all) { - *all = dlg->buttons->loadAllButton->isOn(); + *all = dlg->buttons.loadAllButton->isChecked(); } } delete dlg; @@ -326,18 +339,21 @@ QString getSaveFileName(const QString &startWith, const QStringList& filters, QWidget* parent, const QString& name) { MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, true); - dlg->setFilters(filters); + dlg->setNameFilters(filters); dlg->setCaption(name); - dlg->setMode(Q3FileDialog::AnyFile); + dlg->setFileMode(QFileDialog::AnyFile); + QStringList files; QString result; - if (dlg->exec() == QDialog::Accepted) - result = dlg->selectedFile(); - - + if (dlg->exec() == QDialog::Accepted) { + files = dlg->selectedFiles(); + if (!files.isEmpty()) + result = files[0]; + } + // Added by T356. if(!result.isEmpty()) { - QString filt = dlg->selectedFilter(); + QString filt = dlg->selectedNameFilter(); filt = getFilterExtension(filt); // Do we have a valid extension? if(!filt.isEmpty()) @@ -359,8 +375,8 @@ QString getSaveFileName(const QString &startWith, // but only if there are no errors in the list of filters. fileOpen() will act as a 'catchall'. // // Force the filter list to the first one (the preferred one), and then get the filter. - dlg->setSelectedFilter(0); - filt = dlg->selectedFilter(); + dlg->selectNameFilter(dlg->filters().at(0)); + filt = dlg->selectedNameFilter(); filt = getFilterExtension(filt); // Do we have a valid extension? @@ -402,20 +418,25 @@ QString getImageFileName(const QString& startWith, MFileDialog *dlg = new MFileDialog(*workingDirectory, QString::null, parent); + /* ORCAN - disable preview for now. It is not available in qt4. We will + need to implement it ourselves. dlg->setContentsPreviewEnabled(true); ContentsPreview* preview = new ContentsPreview(dlg); dlg->setContentsPreview(preview, preview); - dlg->setPreviewMode(Q3FileDialog::Contents); - + dlg->setPreviewMode(QFileDialog::Contents); + */ dlg->setCaption(name); - dlg->setFilters(filters); - dlg->setMode(Q3FileDialog::ExistingFile); + dlg->setNameFilters(filters); + dlg->setFileMode(QFileDialog::ExistingFile); + QStringList files; QString result; if (!initialSelection.isEmpty()) - dlg->setSelection( initialSelection); + dlg->selectFile( initialSelection); if (dlg->exec() == QDialog::Accepted) { - result = dlg->selectedFile(); - } + files = dlg->selectedFiles(); + if (!files.isEmpty()) + result = files[0]; + } delete dlg; return result; } diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h index 2208b5bc..c2feba37 100644 --- a/muse2/muse/widgets/filedialog.h +++ b/muse2/muse/widgets/filedialog.h @@ -5,18 +5,33 @@ // (C) Copyright 2000 Werner Schweer (ws@seh.de) //========================================================= -#include -//Added by qt3to4: +#include #include -class FileDialogButtons; +#include "ui_fdialogbuttons.h" + class QStringList; +//--------------------------------------------------------- +// FileDialogButtonsWidget +// Wrapper around Ui::FileDialogButtons +//--------------------------------------------------------- + +class FileDialogButtonsWidget : public QWidget, public Ui::FileDialogButtons +{ + Q_OBJECT + + public: + FileDialogButtonsWidget(QWidget *parent = 0) + : QWidget(parent) + { setupUi(this); } +}; + //--------------------------------------------------------- // MFileDialog //--------------------------------------------------------- -class MFileDialog : public Q3FileDialog { +class MFileDialog : public QFileDialog { Q_OBJECT enum ViewType { GLOBAL_VIEW, PROJECT_VIEW, USER_VIEW }; //!< The three different viewtypes @@ -32,11 +47,13 @@ class MFileDialog : public Q3FileDialog { void directoryChanged(const QString& directory); public: - FileDialogButtons* buttons; + FileDialogButtonsWidget buttons; MFileDialog(const QString& dir, const QString& filter = QString::null, QWidget* parent = 0, bool writeFlag = false); }; +/* ORCAN - Disable previeww for now. It is not available in qt4. We will + need to implement it ourselves. //--------------------------------------------------------- // ContentsPreview //--------------------------------------------------------- @@ -55,6 +72,7 @@ class ContentsPreview : public QWidget, public Q3FilePreview { } ~ContentsPreview(); }; +*/ //QString getSaveFileName(const QString& startWidth, const char** filter, QString getSaveFileName(const QString& startWidth, const QStringList& filters, -- cgit v1.2.3