diff --git a/scribus/actionmanager.cpp b/scribus/actionmanager.cpp index 7c9cda5a2..c0fb241c9 100644 --- a/scribus/actionmanager.cpp +++ b/scribus/actionmanager.cpp @@ -147,19 +147,14 @@ void ActionManager::initFileMenuActions() scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow)); name = "fileExportAsEPS"; scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow)); - name = "fileExportAsPDF"; - scrActions->insert(name, new ScrAction(im.loadPixmap("acroread16.png"), im.loadPixmap("acroread22.png"), "", defaultKey(name), mainWindow)); //Rest of File Menu -// name = "fileDocSetup"; -// scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-properties.png"), im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow)); name = "fileDocSetup150"; scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-properties.png"), im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow)); -// name = "filePreferences"; -// scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow)); -// (*scrActions)[name]->setMenuRole(QAction::NoRole); name = "filePreferences150"; scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow)); (*scrActions)[name]->setMenuRole(QAction::PreferencesRole); + name = "fileExportAsPDF"; + scrActions->insert(name, new ScrAction(im.loadPixmap("acroread16.png"), im.loadPixmap("acroread22.png"), "", defaultKey(name), mainWindow)); name = "filePrint"; scrActions->insert(name, new ScrAction(im.loadPixmap("16/document-print.png"), im.loadPixmap("22/document-print.png"), "", defaultKey(name), mainWindow)); name = "PrintPreview"; @@ -174,6 +169,7 @@ void ActionManager::initFileMenuActions() connect( (*scrActions)["fileNewFromTemplate"], SIGNAL(triggered()), mainWindow, SLOT(newFileFromTemplate()) ); connect( (*scrActions)["fileOpen"], SIGNAL(triggered()), mainWindow, SLOT(slotFileOpen()) ); connect( (*scrActions)["fileClose"], SIGNAL(triggered()), mainWindow, SLOT(slotFileClose()) ); + connect( (*scrActions)["fileExportAsPDF"], SIGNAL(triggered()), mainWindow, SLOT(SaveAsPDF()) ); connect( (*scrActions)["filePrint"], SIGNAL(triggered()), mainWindow, SLOT(slotFilePrint()) ); connect( (*scrActions)["PrintPreview"], SIGNAL(triggered()), mainWindow, SLOT(printPreview()) ); connect( (*scrActions)["fileSave"], SIGNAL(triggered()), mainWindow, SLOT(slotFileSave()) ); @@ -192,7 +188,6 @@ void ActionManager::initFileMenuActions() //File Export Menu connect( (*scrActions)["fileExportText"], SIGNAL(triggered()), mainWindow, SLOT(SaveText()) ); connect( (*scrActions)["fileExportAsEPS"], SIGNAL(triggered()), mainWindow, SLOT(SaveAsEps()) ); - connect( (*scrActions)["fileExportAsPDF"], SIGNAL(triggered()), mainWindow, SLOT(SaveAsPDF()) ); //The rest are plugins @@ -1497,11 +1492,9 @@ void ActionManager::languageChange() (*scrActions)["fileExportText"]->setTexts( tr("Save &Text...")); (*scrActions)["fileExportAsEPS"]->setTexts( tr("Save as &EPS...")); - (*scrActions)["fileExportAsPDF"]->setTexts( tr("Save as P&DF...")); -// (*scrActions)["fileDocSetup"]->setTexts( tr("Document &Setup (old)...")); (*scrActions)["fileDocSetup150"]->setTexts( tr("Document &Setup...")); -// (*scrActions)["filePreferences"]->setTexts( tr("P&references (old)...")); (*scrActions)["filePreferences150"]->setTexts( tr("P&references...")); + (*scrActions)["fileExportAsPDF"]->setTexts( tr("Produce P&DF...")); (*scrActions)["filePrint"]->setTexts( tr("&Print...")); (*scrActions)["PrintPreview"]->setTexts( tr("Print Previe&w...")); (*scrActions)["fileQuit"]->setTexts( tr("&Quit")); @@ -2070,11 +2063,9 @@ void ActionManager::createDefaultMenus() << "fileImportVector" << "fileExportText" << "fileExportAsEPS" - << "fileExportAsPDF" -// << "fileDocSetup" << "fileDocSetup150" -// << "filePreferences" << "filePreferences150" + << "fileExportAsPDF" << "filePrint" << "PrintPreview" << "fileQuit"; diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp index 07fe6aa5f..90c9cb2ce 100644 --- a/scribus/scribus.cpp +++ b/scribus/scribus.cpp @@ -812,11 +812,11 @@ void ScribusMainWindow::initMenuBar() scrMenuMgr->createMenu("FileExport", tr("&Export"), "File"); scrMenuMgr->addMenuItemString("fileExportText", "FileExport"); scrMenuMgr->addMenuItemString("fileExportAsEPS", "FileExport"); - scrMenuMgr->addMenuItemString("fileExportAsPDF", "FileExport"); scrMenuMgr->addMenuItemString("SEPARATOR", "File"); scrMenuMgr->addMenuItemString("fileDocSetup150", "File"); scrMenuMgr->addMenuItemString("filePreferences150", "File"); scrMenuMgr->addMenuItemString("SEPARATOR", "File"); + scrMenuMgr->addMenuItemString("fileExportAsPDF", "File"); scrMenuMgr->addMenuItemString("filePrint", "File"); if ( ScCore->haveGS() || ScCore->isWinGUI() ) scrMenuMgr->addMenuItemString("PrintPreview", "File");