Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 17664 → Rev 17665

/trunk/Scribus/scribus/scribusview.cpp
315,7 → 315,7
redrawMarker->hide();
m_canvas->newRedrawPolygon();
m_canvas->resetRenderMode();
m_ScMW->scrActions["viewFitPreview"]->setChecked(m_canvas->m_viewMode.viewAsPreview);
m_ScMW->scrActions["viewPreviewMode"]->setChecked(m_canvas->m_viewMode.viewAsPreview);
// m_SnapCounter = 0;
 
Doc->regionsChanged()->connectObserver(this);
446,7 → 446,7
visualMenu->setCurrentIndex(0);
connect(visualMenu, SIGNAL(activated(int)), this, SLOT(switchPreviewVisual(int)));
}
m_ScMW->scrActions["viewFitPreview"]->setChecked(m_canvas->m_viewMode.viewAsPreview);
m_ScMW->scrActions["viewPreviewMode"]->setChecked(m_canvas->m_viewMode.viewAsPreview);
m_ScMW->scrActions["viewShowMargins"]->setEnabled(!m_canvas->m_viewMode.viewAsPreview);
m_ScMW->scrActions["viewShowFrames"]->setEnabled(!m_canvas->m_viewMode.viewAsPreview);
m_ScMW->scrActions["viewShowLayerMarkers"]->setEnabled(!m_canvas->m_viewMode.viewAsPreview);
/trunk/Scribus/scribus/actionmanager.cpp
599,7 → 599,7
scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0, 200.0));
name="viewFit400";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0, 400.0));
name="viewFitPreview";
name="viewPreviewMode";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 0, 20.0));
name="viewShowMargins";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
637,7 → 637,7
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
// scrActions->insert("viewNewView", new ScrAction("", defaultKey(name), mainWindow));
 
(*scrActions)["viewFitPreview"]->setToggleAction(true);
(*scrActions)["viewPreviewMode"]->setToggleAction(true);
(*scrActions)["viewShowMargins"]->setToggleAction(true);
(*scrActions)["viewShowBleeds"]->setToggleAction(true);
(*scrActions)["viewShowFrames"]->setToggleAction(true);
655,7 → 655,7
(*scrActions)["viewSnapToGuides"]->setToggleAction(true);
(*scrActions)["showMouseCoordinates"]->setToggleAction(true);
 
(*scrActions)["viewFitPreview"]->setChecked(false);
(*scrActions)["viewPreviewMode"]->setChecked(false);
(*scrActions)["viewShowMargins"]->setChecked(true);
(*scrActions)["viewShowBleeds"]->setChecked(true);
(*scrActions)["viewShowFrames"]->setChecked(true);
1177,7 → 1177,7
 
void ActionManager::disconnectNewViewActions()
{
disconnect( (*scrActions)["viewFitPreview"], 0, 0, 0);
disconnect( (*scrActions)["viewPreviewMode"], 0, 0, 0);
disconnect( (*scrActions)["toolsZoomIn"], 0, 0, 0);
disconnect( (*scrActions)["toolsZoomOut"], 0, 0, 0);
disconnect( (*scrActions)["itemImageIsVisible"], 0, 0, 0);
1198,7 → 1198,7
{
if (currView==NULL)
return;
connect( (*scrActions)["viewFitPreview"], SIGNAL(triggered()), currView, SLOT(togglePreview()) );
connect( (*scrActions)["viewPreviewMode"], SIGNAL(triggered()), currView, SLOT(togglePreview()) );
connect( (*scrActions)["toolsZoomIn"], SIGNAL(triggered()) , currView, SLOT(slotZoomIn()) );
connect( (*scrActions)["toolsZoomOut"], SIGNAL(triggered()) , currView, SLOT(slotZoomOut()) );
connect( (*scrActions)["itemConvertToBezierCurve"], SIGNAL(triggered()), currView, SLOT(ToBezierFrame()) );
1518,7 → 1518,7
(*scrActions)["viewFit100"]->setTexts( tr("&100%"));
(*scrActions)["viewFit200"]->setTexts( tr("&200%"));
(*scrActions)["viewFit400"]->setTexts( tr("&400%"));
(*scrActions)["viewFitPreview"]->setTexts( tr("Preview Mode"));
(*scrActions)["viewPreviewMode"]->setTexts( tr("Preview Mode"));
(*scrActions)["viewShowMargins"]->setTexts( tr("Show &Margins"));
(*scrActions)["viewShowBleeds"]->setTexts( tr("Show Bleeds"));
(*scrActions)["viewShowFrames"]->setTexts( tr("Show &Frames"));
1696,7 → 1696,7
defKeys.insert("fileImportText", Qt::CTRL+Qt::Key_I);
defKeys.insert("fileImportImage", Qt::CTRL+Qt::Key_I);
defKeys.insert("filePrint", QKeySequence::Print);
defKeys.insert("PrintPreview", Qt::CTRL+Qt::ALT+Qt::Key_P);
defKeys.insert("fileExportAsPDF", Qt::CTRL+Qt::SHIFT+Qt::Key_P);
defKeys.insert("fileQuit", Qt::CTRL+Qt::Key_Q);
//Edit Menu
defKeys.insert("editUndoAction", QKeySequence::Undo);
1732,6 → 1732,7
//View Menu
defKeys.insert("viewFitInWindow", Qt::CTRL+Qt::Key_0);
defKeys.insert("viewFit100", Qt::CTRL+Qt::Key_1);
defKeys.insert("viewPreviewMode", Qt::CTRL+Qt::ALT+Qt::Key_P);
defKeys.insert("viewShowRulers", Qt::CTRL+Qt::SHIFT+Qt::Key_R);
defKeys.insert("viewShowContextMenu", Qt::Key_Menu); //Context menu key on Windows. Do we have one to use on Linux/OSX? Super_L ?
 
2088,7 → 2089,7
<< "viewFit100"
<< "viewFit200"
<< "viewFit400"
<< "viewFitPreview"
<< "viewPreviewMode"
<< "viewShowMargins"
<< "viewShowBleeds"
<< "viewShowFrames"
/trunk/Scribus/scribus/scribus.cpp
961,7 → 961,7
scrMenuMgr->addMenuItem(scrActions["viewFit200"], "View", false);
scrMenuMgr->addMenuItem(scrActions["viewFit400"], "View", false);
scrMenuMgr->addMenuSeparator("View");
scrMenuMgr->addMenuItem(scrActions["viewFitPreview"], "View", true);
scrMenuMgr->addMenuItem(scrActions["viewPreviewMode"], "View", true);
scrMenuMgr->addMenuSeparator("View");
scrMenuMgr->addMenuItem(scrActions["viewShowMargins"], "View", true);
scrMenuMgr->addMenuItem(scrActions["viewShowBleeds"], "View", true);
/trunk/Scribus/resources/keysets/scribus15.xml
15,7 → 15,7
<function shortcut="" name="PathFinder"/>
<function shortcut="" name="PathStroker"/>
<function shortcut="" name="Picture Browser"/>
<function shortcut="Ctrl+Alt+P" name="PrintPreview"/>
<function shortcut="" name="PrintPreview"/>
<function shortcut="Ctrl+Alt+S" name="SaveAsDocumentTemplate"/>
<function shortcut="" name="ShortWords"/>
<function shortcut="" name="Subdivide"/>
57,7 → 57,7
<function shortcut="" name="fileDocSetup"/>
<function shortcut="" name="fileDocSetup150"/>
<function shortcut="" name="fileExportAsEPS"/>
<function shortcut="" name="fileExportAsPDF"/>
<function shortcut="Ctrl+Shift+P" name="fileExportAsPDF"/>
<function shortcut="" name="fileExportText"/>
<function shortcut="" name="fileImportAppendText"/>
<function shortcut="Ctrl+I" name="fileImportImage"/>
263,7 → 263,7
<function shortcut="" name="viewFit50"/>
<function shortcut="" name="viewFit75"/>
<function shortcut="Ctrl+0" name="viewFitInWindow"/>
<function shortcut="" name="viewFitPreview"/>
<function shortcut="Ctrl+Alt+P" name="viewPreviewMode"/>
<function shortcut="" name="viewFitWidth"/>
<function shortcut="" name="viewRulerMode"/>
<function shortcut="" name="viewShowBaseline"/>
/trunk/Scribus/resources/keysets/pagestream.xml
259,7 → 259,7
<function shortcut="" name="viewFit50" />
<function shortcut="" name="viewFit75" />
<function shortcut="Ctrl+0" name="viewFitInWindow" />
<function shortcut="" name="viewFitPreview" />
<function shortcut="" name="viewPreviewMode" />
<function shortcut="" name="viewFitWidth" />
<function shortcut="" name="viewRulerMode" />
<function shortcut="" name="viewShowBaseline" />
/trunk/Scribus/resources/keysets/pageplusx3.xml
259,7 → 259,7
<function shortcut="" name="viewFit50" />
<function shortcut="" name="viewFit75" />
<function shortcut="Ctrl+0" name="viewFitInWindow" />
<function shortcut="Ctrl+Shift+G" name="viewFitPreview" />
<function shortcut="Ctrl+Shift+G" name="viewPreviewMode" />
<function shortcut="" name="viewFitWidth" />
<function shortcut="" name="viewRulerMode" />
<function shortcut="" name="viewShowBaseline" />
/trunk/Scribus/resources/keysets/icalamus.xml
259,7 → 259,7
<function shortcut="" name="viewFit50" />
<function shortcut="" name="viewFit75" />
<function shortcut="Ctrl+0" name="viewFitInWindow" />
<function shortcut="" name="viewFitPreview" />
<function shortcut="" name="viewPreviewMode" />
<function shortcut="" name="viewFitWidth" />
<function shortcut="" name="viewRulerMode" />
<function shortcut="" name="viewShowBaseline" />
/trunk/Scribus/resources/keysets/scribus13.xml
259,7 → 259,7
<function shortcut="" name="viewFit50"/>
<function shortcut="" name="viewFit75"/>
<function shortcut="Ctrl+0" name="viewFitInWindow"/>
<function shortcut="" name="viewFitPreview"/>
<function shortcut="" name="viewPreviewMode"/>
<function shortcut="" name="viewFitWidth"/>
<function shortcut="" name="viewRulerMode"/>
<function shortcut="" name="viewShowBaseline"/>