From ed28e77854fe8d30154514b9053d9239834e8fae Mon Sep 17 00:00:00 2001
From: Werner Schweer <ws.seh.de>
Date: Sun, 27 Aug 2006 11:30:19 +0000
Subject: small updates

---
 Makefile                      |  3 +++
 muse/CMakeLists.txt           |  2 +-
 muse/doc/man/en/man-en.tex    | 16 ++++++++--------
 muse/muse/arranger/canvas.cpp | 22 ++++++++++++++++------
 muse/muse/audio.cpp           |  2 +-
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 091327d7..aa776560 100755
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,9 @@ dist:
 	cd build; make package_source
 	mv build/muse-*.tar.gz .
 
+install:
+	cd build; make install
+
 #
 # this creates a shell archive / installer for
 #     MusE binary
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 3a6f42b5..e924b465 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -293,7 +293,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
   SET(CPACK_STRIP_FILES "bin/muse;bin/grepmidi")
-  SET(CPACK_PACKAGE_EXECUTABLES "muse" "grepmidi")
+  SET(CPACK_PACKAGE_EXECUTABLES "muse" "MusE" "grepmidi" "grepmidi")
   INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
diff --git a/muse/doc/man/en/man-en.tex b/muse/doc/man/en/man-en.tex
index be746129..ec8c9ca0 100644
--- a/muse/doc/man/en/man-en.tex
+++ b/muse/doc/man/en/man-en.tex
@@ -158,7 +158,7 @@
    \startstandardmakeup[page=no]
       \vfill
       \M\ is hosted on SourceForge:\par
-      \type{http://mscore.sourceforge.net/}
+      \type{http://sourceforge.net/projects/lmuse}
       \blank[line]
       This document was created using \pdfTeX\ and the macro package
       \ConTeXt\.
@@ -245,21 +245,20 @@
 
 \chapter{Invoking \M}
    \section{Invoking \M}
-      \M\ is invoked from the command line by typing in:
+      \M\ is invoked from the command line by typing:
 
       \Cmd{muse}
 
       Optionally, you can use command line options of the form:
 
-      \Cmd{muse <options> <midifile>}
+      \Cmd{muse <options> <project-name>}
 
       \definedescription[Mops][location=left,headstyle=bold]
 
       \Mops{\tt <options>:}
             see below for a list of available options.
-      \Mops{\tt <midifile>:}
-            can be either a standard MIDI file or a \M\ file
-            ({\tt *.med, *.med.gz or *.med.bz2}).
+      \Mops{\tt <project-name>:}
+            name of a \M\ project
 
    \section{Command Line Options}
 
@@ -277,9 +276,9 @@
 
       Example:
 
-       \Cmd{muse -i mysong.med}
+       \Cmd{muse -i mysong}
 
-       will add trace midi input and open mysong.med on startup.
+       will add trace midi input and open project mysong on startup.
 
    \section{File types used by \M}
 
@@ -305,3 +304,4 @@
    \completeindex
    \stopappendices
 \stoptext
+
diff --git a/muse/muse/arranger/canvas.cpp b/muse/muse/arranger/canvas.cpp
index 091250d4..2b49e70b 100644
--- a/muse/muse/arranger/canvas.cpp
+++ b/muse/muse/arranger/canvas.cpp
@@ -183,21 +183,22 @@ void PartCanvas::paint(QPainter& p, QRect r)
 
                   QRect pr(x1, y, len, h - partBorderWidth);
                   bool clone = part->isCloned();
-                  QPen pen(Qt::black, partBorderWidth, clone ? Qt::DashLine : Qt::SolidLine);
 
+                  QPen pen(Qt::black, partBorderWidth, clone ? Qt::DashLine : Qt::SolidLine);
+                  QBrush brush(Qt::SolidPattern);
                   if (part->mute()) {
                         pen.setColor(Qt::red);
-                        p.setBrush(Qt::gray);
+                        brush.setColor(Qt::gray);
                         }
                   else if (part->selected()) {
                         pen.setColor(config.partColors[part->colorIndex()]);
-                        p.setBrush(config.selectPartBg);
+                        brush.setColor(config.selectPartBg);
                         }
                   else {
-                        p.setBrush(config.partColors[part->colorIndex()]);
+                        brush.setColor(config.partColors[part->colorIndex()]);
                         }
                   p.setPen(pen);
-
+                  p.setBrush(brush);
                   //
                   // we want to draw the rectangle without transformation
                   // to get equal border width horizontal and vertical
@@ -222,7 +223,16 @@ void PartCanvas::paint(QPainter& p, QRect r)
                   p.drawText(x1 + 3, yy, len - 6,
                      partLabelHeight-1, Qt::AlignVCenter | Qt::AlignLeft,
                      part->name());
+
+                  // redraw border
+                  p.save();
+                  p.resetMatrix();
+                  p.setPen(pen);
+                  p.setBrush(Qt::NoBrush);
+                  p.drawRect(rr);
+                  p.restore();
                   }
+
             p.setPen(QPen(Qt::lightGray, 1, Qt::SolidLine));
             if (i != tl->begin())
 	            p.drawLine(from, y-2, to, y-2);
@@ -254,7 +264,7 @@ void PartCanvas::paint(QPainter& p, QRect r)
       }
 
 //---------------------------------------------------------
-//   drawMidiSubPart
+//   drawMidiPart
 //---------------------------------------------------------
 
 void PartCanvas::drawMidiPart(QPainter& p, Part* mp, int y, int th, int from, int to)
diff --git a/muse/muse/audio.cpp b/muse/muse/audio.cpp
index f27cf6fd..a14e4d47 100644
--- a/muse/muse/audio.cpp
+++ b/muse/muse/audio.cpp
@@ -551,7 +551,7 @@ void Audio::process(unsigned frames)
 void Audio::processMsg(AudioMsg* msg)
       {
 // if (_running)
-      printf("audio process %d\n", msg->id);
+//      printf("audio process %d\n", msg->id);
 
       switch(msg->id) {
             case AUDIO_ROUTEADD:
-- 
cgit v1.2.3