On 04/04/2014 05:50 PM, D. Michael McIntyre wrote:
Prompted by that concern, I took a deeper glance. There are problems
with this I don't have time to discuss at the moment. Better just leave
it on the desk a couple more days until I get a breather.
Ok. I applied just the src (and README) changes and it appears to
work fine for my limited testing. I only have Evince installed, so it
barfed on mupdf as expected, but took evince without problems.
Attached is my reduced patch.
Ted.
diff -Nuar rosegarden-14.02-orig/README rosegarden-14.02-new/README
--- rosegarden-14.02-orig/README 2014-03-03 06:59:36.000000000 -0500
+++ rosegarden-14.02-new/README 2014-04-04 15:25:03.000000000 -0400
@@ -77,7 +77,7 @@
- General MIDI soft synth (TiMidity + Freepats or better)
- LilyPond
- - Okular, Evince, or Acroread
+ - MuPDF, ePDFView, Okular, Evince, or Acroread
- lpr or lp
- QjackCtl (JACK Audio Connection Kit - Qt GUI Interface)
- FLAC
diff -Nuar rosegarden-14.02-orig/src/gui/configuration/GeneralConfigurationPage.cpp rosegarden-14.02-new/src/gui/configuration/GeneralConfigurationPage.cpp
--- rosegarden-14.02-orig/src/gui/configuration/GeneralConfigurationPage.cpp 2014-03-03 06:58:56.000000000 -0500
+++ rosegarden-14.02-new/src/gui/configuration/GeneralConfigurationPage.cpp 2014-04-04 15:21:51.000000000 -0400
@@ -343,9 +343,11 @@
m_pdfViewer = new QComboBox(frame);
connect(m_pdfViewer, SIGNAL(activated(int)), this, SLOT(slotModified()));
- m_pdfViewer->addItem(tr("Okular (KDE 4.x)"), 0);
- m_pdfViewer->addItem(tr("Evince (GNOME)"), 1);
- m_pdfViewer->addItem(tr("Adobe Acrobat Reader (non-free)"),2);
+ m_pdfViewer->addItem(tr("MuPDF"), 0);
+ m_pdfViewer->addItem(tr("ePDFView"), 1);
+ m_pdfViewer->addItem(tr("Okular (KDE 4.x)"), 2);
+ m_pdfViewer->addItem(tr("Evince (GNOME)"), 3);
+ m_pdfViewer->addItem(tr("Adobe Acrobat Reader (non-free)"),4);
m_pdfViewer->setToolTip(tr("Used to preview generated LilyPond output"));
layout->addWidget(m_pdfViewer, row, 1, 1, 3);
diff -Nuar rosegarden-14.02-orig/src/gui/configuration/GeneralConfigurationPage.h rosegarden-14.02-new/src/gui/configuration/GeneralConfigurationPage.h
--- rosegarden-14.02-orig/src/gui/configuration/GeneralConfigurationPage.h 2014-03-03 06:58:56.000000000 -0500
+++ rosegarden-14.02-new/src/gui/configuration/GeneralConfigurationPage.h 2014-04-04 15:21:43.000000000 -0400
@@ -61,6 +61,8 @@
enum PdfViewer
{
+ MuPDF,
+ ePDFView,
Okular,
Evince,
Acroread,
diff -Nuar rosegarden-14.02-orig/src/gui/general/LilyPondProcessor.cpp rosegarden-14.02-new/src/gui/general/LilyPondProcessor.cpp
--- rosegarden-14.02-orig/src/gui/general/LilyPondProcessor.cpp 2014-03-03 06:59:03.000000000 -0500
+++ rosegarden-14.02-new/src/gui/general/LilyPondProcessor.cpp 2014-04-04 15:23:42.000000000 -0400
@@ -229,11 +229,13 @@
// reason why my copy of acroread is normally chmod -x so the script
// ancestor of this class wouldn't pick it up against my wishes)
switch (pdfViewerIndex) {
- case 0: pdfViewer = "okular"; break;
- case 1: pdfViewer = "evince"; break;
- case 2: pdfViewer = "acroread"; break;
- case 3: pdfViewer = "kpdf";
- default: pdfViewer = "kpdf"; // just because I'm still currently on KDE3
+ case 0: pdfViewer = "mupdf"; break;
+ case 1: pdfViewer = "epdfview"; break;
+ case 2: pdfViewer = "okular"; break;
+ case 3: pdfViewer = "evince"; break;
+ case 4: pdfViewer = "acroread"; break;
+ case 5: pdfViewer = "kpdf";
+ default: pdfViewer = "mupdf"; // cuz it's open-source and desktop-independent
}
switch (filePrinterIndex) {
------------------------------------------------------------------------------
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
