r19179 by craig - #10217: Remove the missing ghostscript warning. Do not include the Print Preview, Barcode menus, or ps export if it is missing
scribus-commit
scribus-commit at lists.scribus.net
Tue Jun 3 21:26:52 UTC 2014
Author: craig
Date: Tue Jun 3 21:26:52 2014
New Revision: 19179
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19179
Log:
#10217: Remove the missing ghostscript warning. Do not include the Print Preview, Barcode menus, or ps export if it is missing
Modified:
trunk/Scribus/scribus/appmodehelper.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19179&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Tue Jun 3 21:26:52 2014
@@ -102,6 +102,7 @@
(*scrActions)["fileSaveAs"]->setEnabled(b2);
(*scrActions)["fileExportAsEPS"]->setEnabled(b2);
(*scrActions)["fileExportAsPDF"]->setEnabled(b2);
+ if ( ScCore->haveGS() || ScCore->isWinGUI() )
(*scrActions)["PrintPreview"]->setEnabled(b2);
(*scrActions)["toolsPDFPushButton"]->setEnabled(b2);
(*scrActions)["toolsPDFRadioButton"]->setEnabled(b2);
@@ -146,7 +147,8 @@
(*scrActions)["fileSaveAs"]->setEnabled(b2);
(*scrActions)["fileExportAsEPS"]->setEnabled(b2);
(*scrActions)["fileExportAsPDF"]->setEnabled(b2);
- (*scrActions)["PrintPreview"]->setEnabled(b2);
+ if ( ScCore->haveGS() || ScCore->isWinGUI() )
+ (*scrActions)["PrintPreview"]->setEnabled(b2);
(*scrActions)["toolsPDFPushButton"]->setEnabled(b2);
(*scrActions)["toolsPDFRadioButton"]->setEnabled(b2);
(*scrActions)["toolsPDFTextField"]->setEnabled(b2);
@@ -188,7 +190,8 @@
(*scrActions)["fileRevert"]->setEnabled(b2);
(*scrActions)["fileDocSetup150"]->setEnabled(b2);
(*scrActions)["filePrint"]->setEnabled(b2);
- (*scrActions)["PrintPreview"]->setEnabled(b2);
+ if ( ScCore->haveGS() || ScCore->isWinGUI() )
+ (*scrActions)["PrintPreview"]->setEnabled(b2);
(*scrActions)["toolsPDFPushButton"]->setEnabled(b2);
(*scrActions)["toolsPDFRadioButton"]->setEnabled(b2);
(*scrActions)["toolsPDFTextField"]->setEnabled(b2);
@@ -414,7 +417,8 @@
(*scrActions)["fileRevert"]->setEnabled(false);
(*scrActions)["fileCollect"]->setEnabled(false);
(*scrActions)["fileClose"]->setEnabled(false);
- (*scrActions)["PrintPreview"]->setEnabled(false);
+ if ( ScCore->haveGS() || ScCore->isWinGUI() )
+ (*scrActions)["PrintPreview"]->setEnabled(false);
if ((*scrActions)["SaveAsDocumentTemplate"])
(*scrActions)["SaveAsDocumentTemplate"]->setEnabled(false);
(*scrActions)["fileExportAsPDF"]->setEnabled(false);
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19179&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp Tue Jun 3 21:26:52 2014
@@ -7,6 +7,7 @@
#include "barcode.h"
#include "barcodegenerator.h"
+#include "scribuscore.h"
#include "scribusstructs.h"
#include "util_icon.h"
@@ -21,9 +22,12 @@
{
m_actionInfo.name = "BarcodeGenerator";
m_actionInfo.text = tr("Barcode");
- m_actionInfo.menu = "Insert";
- m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
- m_actionInfo.toolbar = "Tools";
+ if (ScCore->haveGS())
+ {
+ m_actionInfo.menu = "Insert";
+ m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
+ m_actionInfo.toolbar = "Tools";
+ }
m_actionInfo.icon1 = loadIcon("16/insert-barcode.png");
m_actionInfo.icon2 = loadIcon("22/insert-barcode.png");
m_actionInfo.enabledOnStartup = false;
@@ -42,7 +46,7 @@
Q_CHECK_PTR(about);
about->authors = QString::fromUtf8("Terry Burton - <tez at terryburton.co.uk>, Petr Van\xc4\x9bk <petr at scribus.info>");
about->shortDescription = tr("Scribus frontend for Pure PostScript Barcode Writer");
- about->description = "Barcode Writer in Pure PostScript is an award-winning open source barcode maker, as used by NASA, that facilitates the printing of all major barcode symbologies entirely within level 2 PostScript, ideal for variable data printing. The complete process of generating printed barcodes is performed entirely within the printer (or print system) so that it is no longer the responsibility of your application or a library. There is no need for any barcode fonts and the flexibility offered by direct PostScript means you can avoid re-implementing barcode generator code, or migrating to new libraries, whenever your project language needs change.\nhttp://www.terryburton.co.uk/barcodewriter/";
+ about->description = "Barcode Writer in Pure PostScript is an award-winning open source barcode maker, as used by NASA, that facilitates the printing of all major barcode symbologies entirely within level 2 PostScript, ideal for variable data printing. The complete process of generating printed barcodes is performed entirely within the printer (or print system) so that it is no longer the responsibility of your application or a library. There is no need for any barcode fonts and the flexibility offered by direct PostScript means you can avoid re-implementing barcode generator code, or migrating to new libraries, whenever your project language needs change.\nhttp://www.terryburton.co.uk/barcodewriter/ . Hence, this plugin requires Ghostscript to be installed on your system.";
about->version = "Backend: 2014-01-30";
// about->releaseDate
about->copyright = QString::fromUtf8("Backend: Copyright (c) 2004-2014 Terry Burton - tez at terryburton.co.uk\nFrontend: Copyright (c) 2005 Petr Van\xc4\x9bk - petr at scribus.info");
@@ -58,7 +62,7 @@
bool Barcode::run(ScribusDoc* doc, QString /*target*/ )
{
- if (!doc)
+ if (!doc || !ScCore->haveGS())
return false;
BarcodeGenerator *bg = new BarcodeGenerator();
Q_CHECK_PTR(bg);
Modified: trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19179&path=/trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp Tue Jun 3 21:26:52 2014
@@ -94,6 +94,8 @@
void ImportPSPlugin::registerFormats()
{
+ if (!ScCore->haveGS())
+ return;
FileFormat fmt(this);
fmt.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::EPS); // Human readable name
fmt.formatId = 0;
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19179&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Jun 3 21:26:52 2014
@@ -777,7 +777,8 @@
scrMenuMgr->addMenuItemString("filePreferences150", "File");
scrMenuMgr->addMenuItemString("SEPARATOR", "File");
scrMenuMgr->addMenuItemString("filePrint", "File");
- scrMenuMgr->addMenuItemString("PrintPreview", "File");
+ if ( ScCore->haveGS() || ScCore->isWinGUI() )
+ scrMenuMgr->addMenuItemString("PrintPreview", "File");
scrMenuMgr->addMenuItemString("SEPARATOR", "File");
scrMenuMgr->addMenuItemString("fileQuit", "File");
@@ -7484,6 +7485,7 @@
int ScribusMainWindow::ShowSubs()
{
bool showGSHelp=false;
+ /*
if (!ScCore->haveGS())
{
QMessageBox mb(this);
@@ -7507,7 +7509,7 @@
if (i==QMessageBox::Help)
showGSHelp=true;
}
-
+*/
propertiesPalette->startup();
outlinePalette->startup();
scrapbookPalette->startup();
@@ -7547,6 +7549,8 @@
void ScribusMainWindow::doPrintPreview()
{
+ if (!( ScCore->haveGS() || ScCore->isWinGUI() ))
+ return;
if (docCheckerPalette->isIgnoreEnabled())
{
docCheckerPalette->hide();
More information about the scribus-commit
mailing list