diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 40177d6c..05b0261d 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -164,6 +164,10 @@ void PTextEdit::setupFileActions() connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); a->addTo( tb ); a->addTo( menu ); + a = new QAction( QPixmap::fromMimeSource( "filereload.xpm" ), tr( "Reload..." ), 0, this, "fileReload" ); + connect( a, SIGNAL( activated() ), this, SLOT( fileReload() ) ); + a->addTo( tb ); + a->addTo( menu ); menu->insertSeparator(); a = new QAction( QPixmap::fromMimeSource( "filesave.xpm" ), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" ); connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); @@ -223,6 +227,23 @@ void PTextEdit::setupEditActions() a->addTo( tb ); a->addTo( menu ); menu->insertSeparator(); + a = new QAction( QPixmap::fromMimeSource( "editfind.xpm" ), tr( "&Find" ), CTRL + Key_F, this, "editFind" ); + connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); + a->addTo( tb ); + a->addTo( menu ); + a = new QAction( QPixmap::fromMimeSource( "editnext.xpm" ), tr( "Find &Next" ), Key_F3, this, "editFindNext" ); + connect( a, SIGNAL( activated() ), this, SLOT( editFindNext() ) ); + a->addTo( tb ); + a->addTo( menu ); + a = new QAction( QPixmap::fromMimeSource( "editprevious.xpm" ), tr( "Find Pre&vious" ), SHIFT + Key_F3, this, "editFindPrevious" ); + connect( a, SIGNAL( activated() ), this, SLOT( editFindPrevious() ) ); + a->addTo( tb ); + a->addTo( menu ); + a = new QAction( tr( "Replace..." ), CTRL + Key_R, this, "editReplace" ); + connect( a, SIGNAL( activated() ), this, SLOT( editFindAndReplace() ) ); + a->addTo( tb ); + a->addTo( menu ); + menu->insertSeparator(); a = new QAction( tr( "(Un)Co&mment" ), CTRL + Key_M, this, "editComment" ); connect( a, SIGNAL( activated() ), this, SLOT( editComment() ) ); a->addTo( tb ); @@ -464,6 +485,15 @@ void PTextEdit::fileOpen() } } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PTextEdit::fileReload() +{ + QMessageBox::information(this, "**INFO**", "Not Yet Implemented", QMessageBox::Ok); +} + //---------------------------------------------------------------------------------------------------- /** *

@@ -658,6 +688,42 @@ void PTextEdit::editPaste() currentEditor()->paste(); } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PTextEdit::editFind() +{ + QMessageBox::information(this, "**INFO**", "Not Yet Implemented", QMessageBox::Ok); +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PTextEdit::editFindNext() +{ + QMessageBox::information(this, "**INFO**", "Not Yet Implemented", QMessageBox::Ok); +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PTextEdit::editFindPrevious() +{ + QMessageBox::information(this, "**INFO**", "Not Yet Implemented", QMessageBox::Ok); +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +void PTextEdit::editFindAndReplace() +{ + QMessageBox::information(this, "**INFO**", "Not Yet Implemented", QMessageBox::Ok); +} + //---------------------------------------------------------------------------------------------------- /** *

@@ -1228,9 +1294,26 @@ void PTextEdit::musrT0() if ( !currentEditor() ) return; - QMessageBox::information( this, "musrT0", - "Will call musrt0.\n" - "NOT IMPLEMENTED YET :-(" ); + QString tabLabel = fTabWidget->label(fTabWidget->currentPageIndex()); + if (tabLabel == "noname") { + QMessageBox::critical(this, "**ERROR**", "For a view a real mlog/msr-file is needed."); + return; + } else if (tabLabel == "noname*") { + fileSaveAs(); + } else if (tabLabel.find("*") > 0) { + fileSave(); + } + + QString cmd; + QString str; + + str = fAdmin->getExecPath() + "/musrt0"; + cmd = str + " "; + + str = *fFilenames.find( currentEditor() ); + cmd += str + " &"; + + system(cmd.latin1()); } //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PTextEdit.h b/src/musrgui/PTextEdit.h index cd9dde40..622d12d0 100644 --- a/src/musrgui/PTextEdit.h +++ b/src/musrgui/PTextEdit.h @@ -67,6 +67,7 @@ private: private slots: void fileNew(); void fileOpen(); + void fileReload(); void fileSave(); void fileSaveAs(); void filePrint(); @@ -79,6 +80,10 @@ private slots: void editCut(); void editCopy(); void editPaste(); + void editFind(); + void editFindNext(); + void editFindPrevious(); + void editFindAndReplace(); void editComment(); void textFamily( const QString &f ); diff --git a/src/musrgui/images/editfind.xpm b/src/musrgui/images/editfind.xpm new file mode 100644 index 00000000..f5790f34 --- /dev/null +++ b/src/musrgui/images/editfind.xpm @@ -0,0 +1,202 @@ +/* XPM */ +static char * editfind_xpm[] = { +"22 22 177 2", +" c None", +". c #59595A", +"+ c #3B3B3C", +"@ c #3E3E3F", +"# c #3C3C3D", +"$ c #404041", +"% c #585859", +"& c #979797", +"* c #5B5B5B", +"= c #FFFFFF", +"- c #5D5D5E", +"; c #49494A", +"> c #868787", +", c #AFB4B4", +"' c #BBC4C6", +") c #BBC5C6", +"! c #B2B7B7", +"~ c #7A7A7B", +"{ c #1D1D1D", +"] c #474747", +"^ c #3D3D3D", +"/ c #444445", +"( c #7B7879", +"_ c #CFDADA", +": c #E5F0F2", +"< c #DCF2F5", +"[ c #DDF4FA", +"} c #D7F3F8", +"| c #CCEFF7", +"1 c #DCE7E9", +"2 c #6F6F70", +"3 c #434343", +"4 c #E4E4E4", +"5 c #4C4C4D", +"6 c #7D7E7D", +"7 c #E9F8FA", +"8 c #C6EDF5", +"9 c #BDE7F0", +"0 c #A5DCEA", +"a c #9BD6E2", +"b c #BBE7EE", +"c c #444444", +"d c #8A8A8A", +"e c #767676", +"f c #C5CFD2", +"g c #B1E2EC", +"h c #9DD9E6", +"i c #8ACDD9", +"j c #81C9D6", +"k c #AFE1EC", +"l c #CED9D9", +"m c #29292A", +"n c #818181", +"o c #6C6C6C", +"p c #4A4A4A", +"q c #5C5C5C", +"r c #A2A7A7", +"s c #E5F4F8", +"t c #C3E9F0", +"u c #ACE0EB", +"v c #99D8E6", +"w c #87CDDC", +"x c #6CBACB", +"y c #7BC4D4", +"z c #9DA2A1", +"A c #626262", +"B c #727272", +"C c #535353", +"D c #494949", +"E c #BAC0C1", +"F c #E7F3F6", +"G c #CBE9F2", +"H c #86D1E1", +"I c #6CC3D9", +"J c #50A6B9", +"K c #6AB5C3", +"L c #B2C7CB", +"M c #454545", +"N c #4F4F4F", +"O c #4B4B4B", +"P c #373737", +"Q c #E3F2F4", +"R c #C5E7EC", +"S c #A8E1EB", +"T c #96D7E7", +"U c #74C8DD", +"V c #5BB1C4", +"W c #4399A8", +"X c #54ACB9", +"Y c #0C0C0C", +"Z c #D3D3D3", +"` c #464646", +" . c #434344", +".. c #A6ABAA", +"+. c #D8EDF1", +"@. c #B1DBE4", +"#. c #96D5E5", +"$. c #4DBACE", +"%. c #449AA9", +"&. c #3D8996", +"*. c #63B5C4", +"=. c #ABDFEA", +"-. c #232323", +";. c #FCFCFC", +">. c #78C3D3", +",. c #68BDCF", +"'. c #4CB7CB", +"). c #4298A7", +"!. c #398491", +"~. c #489EAD", +"{. c #404647", +"]. c #484848", +"^. c #797A79", +"/. c #D7F0F4", +"(. c #A4DBE9", +"_. c #79BFCC", +":. c #60B3C5", +"<. c #52A7B3", +"[. c #4496A5", +"}. c #50A3B5", +"|. c #8ACFE1", +"1. c #000000", +"2. c #8E8E8E", +"3. c #5C5D5C", +"4. c #BAE4EF", +"5. c #99D4E0", +"6. c #87CAD6", +"7. c #BDE6F0", +"8. c #414648", +"9. c #AC993F", +"0. c #6C6D6C", +"a. c #7B7C7B", +"b. c #79989C", +"c. c #A9C7CE", +"d. c #B3CAD0", +"e. c #88A8AD", +"f. c #6B7274", +"g. c #DECE9D", +"h. c #635920", +"i. c #4D4D4E", +"j. c #595959", +"k. c #737374", +"l. c #757576", +"m. c #717172", +"n. c #707071", +"o. c #424849", +"p. c #414748", +"q. c #BDA44C", +"r. c #717171", +"s. c #686868", +"t. c #928237", +"u. c #747475", +"v. c #767677", +"w. c #373738", +"x. c #939393", +"y. c #E3E3E3", +"z. c #363637", +"A. c #777778", +"B. c #E1E1E1", +"C. c #39393A", +"D. c #3B3B3B", +"E. c #DCDCDC", +"F. c #828282", +"G. c #CECECE", +"H. c #3A3F40", +"I. c #727273", +"J. c #313131", +"K. c #575757", +"L. c #393939", +"M. c #EEEEEE", +"N. c #3D3D3E", +"O. c #9D9D9D", +"P. c #FEFEFE", +"Q. c #323233", +"R. c #7F7F80", +"S. c #0B0B0B", +"T. c #4D4D4D", +" . + @ # $ % & * = ", +" - ; > , ' ) ! ~ { ] * ^ = & ", +" / ( _ : < [ } | [ 1 2 3 4 4 * ", +" 5 6 1 7 = 7 8 9 0 a b 1 6 c d e = ", +" ; f 7 = = = 7 g h i j k l m n o * p = ", +"q r 1 < s = 7 t u v w x y k z A B * C D = ", +"; E F G G 7 t k v H I J K g L M N O M P ", +"; ' Q R b g S T H U V W X S L Y Z ` P = ", +" ...+.@.a v #.H U $.%.&.*.=.r -. ;.= ", +"o 6 _ k i j >.,.'.).!.~.#._ {.] ", +" ].^./.(._.:.<.[.&.}.|.+.z 1. ", +" 2.3.6 +.4.5.6.>.w 7.+.6 8.1.9. ", +" * 0.a.b.c.R R d.e.f.8.1.= g.h. ", +" q i.j.k.l.m.n.o.p.1.q.g.= k.$ ", +" r.i.N p D s. h.t.o.u.= v.w. ", +" x.C y. h.z.o.A.B.~ C. ", +" * D.E.F.M G. z.z.H.I.G.2 J. ", +" = = K.L.M. 1.z.o.n.G.n.N.", +"O.d e P.y. Q.z.o.n.R.$ ", +"n o * ].4 & * = 1.z.o.S.$ ", +"e * C D 4 * ^ = 1.1.$ ", +"K.T.M P = = = "}; diff --git a/src/musrgui/images/editnext.xpm b/src/musrgui/images/editnext.xpm new file mode 100644 index 00000000..383761ec --- /dev/null +++ b/src/musrgui/images/editnext.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char * editnext_xpm[] = { +"24 24 22 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E6E6E6", +"# c #FAFAFA", +"$ c #AEAEAE", +"% c #F6F6F6", +"& c #C9C9C9", +"* c #666666", +"= c #ACACAC", +"- c #F3F3F3", +"; c #FDFDFD", +"> c #676767", +", c #AAAAAA", +"' c #888888", +") c #A5A5A5", +"! c #F0F0F0", +"~ c #525252", +"{ c #5E5E5E", +"] c #696969", +"^ c #FCFCFC", +"/ c #F9F9F9", +" ", +" ", +" ........+ ", +" . ........+ ", +" .@. . #++++++++ ", +" .@$%. .. ..........+ ", +".&$*=%..@. -;+++++++++ ", +" .>$*=&@,. ....+ ", +" .>$*')>. !;+++ ", +" .~${{>. .......+ ", +" .@']]>. !^++++++ ", +" .@,>>>>. ", +" ......... ..........+ ", +" ..........+ ", +" /++++++++++ ", +" ....+ ", +" +++++ ", +" ......+ ", +" +++++++ ", +" ........+ ", +" +++++++++ ", +" ", +" ", +" "}; diff --git a/src/musrgui/images/editprevious.xpm b/src/musrgui/images/editprevious.xpm new file mode 100644 index 00000000..6dba0c52 --- /dev/null +++ b/src/musrgui/images/editprevious.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char * editprevious_xpm[] = { +"24 22 20 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #D6D6D6", +"# c #F0F0F0", +"$ c #FDFDFD", +"% c #B1B1B1", +"& c #969696", +"* c #696969", +"= c #FEFEFE", +"- c #A8A8A8", +"; c #888888", +"> c #5E5E5E", +", c #F7F7F7", +"' c #666666", +") c #ACACAC", +"! c #A0A0A0", +"~ c #AEAEAE", +"{ c #3B3B3B", +"] c #4C4C4C", +" ", +" ", +"........+ ", +"........+ ......... ", +"+++++++++ .@@###@. ", +"..........$ .%&*&@. ", +"++++++++++= .-;>&,. ", +"....+ .-;;'),. ", +"+++++ .!~{~'),. ", +".......+ .~..{~'),. ", +"++++++++ .. .{~]. ", +" . .{. ", +"..........$ . ", +"..........+ ", +"+++++++++++ ", +"....+ ", +"+++++ ", +"......+ ", +"+++++++ ", +"........+ ", +"+++++++++ ", +" "}; diff --git a/src/musrgui/images/filereload.xpm b/src/musrgui/images/filereload.xpm new file mode 100644 index 00000000..23bedb11 --- /dev/null +++ b/src/musrgui/images/filereload.xpm @@ -0,0 +1,172 @@ +/* XPM */ +static char * editreload_xpm[] = { +"22 22 147 2", +" c None", +". c #215017", +"+ c #225118", +"@ c #1C3F10", +"# c #1C4110", +"$ c #213B14", +"% c #1A330D", +"& c #141400", +"* c #1D4613", +"= c #2A732F", +"- c #65C284", +"; c #D8F0D6", +"> c #B9E4BD", +", c #82CD91", +"' c #3D8F4B", +") c #477D40", +"! c #417036", +"~ c #1E4917", +"{ c #1B3E0F", +"] c #32A85D", +"^ c #FFFFFF", +"/ c #B8E2BE", +"( c #46B670", +"_ c #2F833C", +": c #112405", +"< c #121600", +"[ c #212106", +"} c #142B0A", +"| c #B2E0B8", +"1 c #47B671", +"2 c #50854A", +"3 c #686868", +"4 c #6E6E6E", +"5 c #101800", +"6 c #CBE9CB", +"7 c #63C284", +"8 c #337F3A", +"9 c #17320C", +"0 c #747474", +"a c #2A6F2B", +"b c #A3DAAE", +"c c #31843E", +"d c #676767", +"e c #7B7B7B", +"f c #296C27", +"g c #E0F3DD", +"h c #63C385", +"i c #46914F", +"j c #142908", +"k c #6D6D6D", +"l c #284919", +"m c #305020", +"n c #2FA057", +"o c #BEE5C1", +"p c #55BD7A", +"q c #32843F", +"r c #192C0B", +"s c #161600", +"t c #2C7F39", +"u c #B0E1B5", +"v c #DFF3DD", +"w c #D4F4D4", +"x c #6FC386", +"y c #419652", +"z c #378843", +"A c #7DCB8F", +"B c #CEECCE", +"C c #2C813A", +"D c #16310C", +"E c #000000", +"F c #171717", +"G c #366D2F", +"H c #32A65C", +"I c #34B464", +"J c #319E52", +"K c #3A924C", +"L c #64C280", +"M c #256022", +"N c #A0A0A0", +"O c #474747", +"P c #191919", +"Q c #2F8F46", +"R c #33B364", +"S c #6AC684", +"T c #5A5A5A", +"U c #B8B8B8", +"V c #848484", +"W c #454545", +"X c #151515", +"Y c #407438", +"Z c #2F8B40", +"` c #2D823B", +" . c #C3C3C3", +".. c #383838", +"+. c #484848", +"@. c #8D8D8D", +"#. c #4C4C4C", +"$. c #B5B5B5", +"%. c #6F6F6F", +"&. c #353535", +"*. c #222222", +"=. c #292929", +"-. c #4D4D4D", +";. c #464646", +">. c #282828", +",. c #9B9B9B", +"'. c #2A2A2A", +"). c #2F2F2F", +"!. c #2E2E2E", +"~. c #717171", +"{. c #2C2C2C", +"]. c #0A0A0A", +"^. c #030303", +"/. c #757575", +"(. c #3C3C3C", +"_. c #515151", +":. c #242424", +"<. c #010101", +"[. c #898989", +"}. c #414141", +"|. c #575757", +"1. c #252525", +"2. c #A3A3A3", +"3. c #3B3B3B", +"4. c #1A1A1A", +"5. c #AFAFAF", +"6. c #6A6A6A", +"7. c #434343", +"8. c #404040", +"9. c #070707", +"0. c #424242", +"a. c #141414", +"b. c #080808", +"c. c #0B0B0B", +"d. c #1C1C1C", +"e. c #797979", +"f. c #828282", +"g. c #505050", +"h. c #1F1F1F", +"i. c #4B4B4B", +"j. c #818181", +"k. c #A5A5A5", +"l. c #5E5E5E", +"m. c #0D0D0D", +"n. c #121212", +"o. c #212121", +"p. c #1D1D1D", +" . + @ # $ % & ", +" * = - ; > , ' ) ! ~ { ", +" * ] ^ / ( _ * : < [ & ~ } ", +" = ^ | 1 2 & & 3 4 & } 5 ", +" * - 6 7 8 9 3 0 } & ", +" a ^ b c & d e & ", +" f g h i j k ", +"& { l m n o p q r s & & ", +"& t u v w x y z A B C D E F ", +" & G H I J K L C M & E N O P ", +" & G Q R S C M & T E U k V W X ", +" & Y Z ` M & E .4 ..+.@.#.P ", +" & G M & E $.%.&.*.=.-.@.;.X ", +" & & >.,.3 W W '.).!.;.~.{.].", +" E E ^.E /.(._.:.<.E E E ", +" E [.}.|.1. ", +" E E 2.3._.4. ", +" E E E 5.6.7.8.9. ", +" E E E E E 5.V 0.+.a. ", +" b.*.c.d.E E e.5.f.g.g.{.9. ", +" E h.i.6.j.k.l.0.g.m.E ", +" ].n.P h.o.p.E "}; diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro index 9c3ea8dc..8648a4ea 100644 --- a/src/musrgui/musrgui.pro +++ b/src/musrgui/musrgui.pro @@ -66,8 +66,12 @@ IMAGES = images/editcopy.xpm \ images/editpaste.xpm \ images/editredo.xpm \ images/editundo.xpm \ + images/editfind.xpm \ + images/editnext.xpm \ + images/editprevious.xpm \ images/filenew.xpm \ images/fileopen.xpm \ + images/filereload.xpm \ images/fileprint.xpm \ images/filesave.xpm \ images/musrasym.xpm \