Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 1254 → Rev 1255

/branches/Version13x/Scribus/scribus/undogui.cpp
256,6 → 256,7
undoPrefs->set("up_top", top);
undoPrefs->set("up_width", width);
undoPrefs->set("up_height", height);
emit closePalette(false);
}
 
void UndoPalette::insertUndoItem(UndoObject* target, UndoState* state)
/branches/Version13x/Scribus/scribus/undogui.h
388,6 → 388,18
* @param steps How many redo steps to take
*/
void redo(int steps);
/**
* @brief Emitted when redo is requested.
*
* When redo action is done by this class this signal is emitted.
* @param steps How many redo steps to take
*/
void closePalette(bool);
/**
* @brief Emitted when palette is closed.
*
* When the user closes the palette this signal is emitted.
*/
};
 
#endif // UNDOGUI_H
/branches/Version13x/Scribus/scribus/icons/Makefile.am
1,4 → 1,4
EXTRA_DIST = checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png
EXTRA_DIST = checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
169,6 → 169,8
$(INSTALL_DATA) $(srcdir)/revert.png $(prefix)/share/scribus/icons/revert.png
$(INSTALL_DATA) $(srcdir)/addf.png $(prefix)/share/scribus/icons/addf.png
$(INSTALL_DATA) $(srcdir)/removef.png $(prefix)/share/scribus/icons/removef.png
$(INSTALL_DATA) $(srcdir)/launch.png $(prefix)/share/scribus/icons/launch.png
$(INSTALL_DATA) $(srcdir)/launch16.png $(prefix)/share/scribus/icons/launch16.png
$(INSTALL_DATA) $(srcdir)/u_undo.png $(prefix)/share/scribus/icons/u_undo.png
$(INSTALL_DATA) $(srcdir)/u_redo.png $(prefix)/share/scribus/icons/u_redo.png
$(INSTALL_DATA) $(srcdir)/u_undo16.png $(prefix)/share/scribus/icons/u_undo16.png
349,6 → 351,8
-rm -f $(prefix)/share/scribus/icons/ooo_writer.png
-rm -f $(prefix)/share/scribus/icons/ooo_draw.png
-rm -f $(prefix)/share/scribus/icons/vectorgfx.png
-rm -f $(prefix)/share/scribus/icons/launch.png
-rm -f $(prefix)/share/scribus/icons/launch16.png
-rm -f $(prefix)/share/scribus/icons/u_undo.png
-rm -f $(prefix)/share/scribus/icons/u_redo.png
-rm -f $(prefix)/share/scribus/icons/u_undo16.png
/branches/Version13x/Scribus/scribus/scribus.cpp
283,13 → 283,15
scrActions["fileSave"]->addTo(WerkTools2);
scrActions["fileClose"]->addTo(WerkTools2);
scrActions["filePrint"]->addTo(WerkTools2);
scrActions["toolsPreflightVerifier"]->addTo(WerkTools2);
scrActions["fileExportAsPDF"]->addTo(WerkTools2);
/*
scrActions["fileClose"]->setEnabled(false);
scrActions["filePrint"]->setEnabled(false);
scrActions["fileSave"]->setEnabled(false);
scrActions["fileExportAsPDF"]->setEnabled(false);
 
*/
editToolBar = new QToolBar(tr("Edit"), this);
UndoWidget* uWidget = new UndoWidget(editToolBar, "uWidget");
undoManager->registerGui(uWidget);
653,7 → 655,14
SetKeyEntry(43, scrActions["viewShowGrid"]->cleanMenuText(), 0, scrActions["viewShowGrid"]->accel(), "viewShowGrid");
SetKeyEntry(44, scrActions["viewSnapToGrid"]->cleanMenuText(), 0, scrActions["viewSnapToGrid"]->accel(), "viewSnapToGrid");
 
//TOOLS MENU
/*
SetKeyEntry(46, tr("Properties"), viewMpal, 0);
SetKeyEntry(47, tr("Outline"), viewTpal, 0);
SetKeyEntry(48, tr("Scrapbook"), viewBpal, 0);
SetKeyEntry(45, tr("Tools"), toolbarMenuTools, 0);
SetKeyEntry(55, tr("Tooltips"), tip, 0);
*/
//EXTRAS
SetKeyEntry(56, tr("Smart Hyphen"), 0, CTRL+Key_Minus);
SetKeyEntry(57, tr("Align Left"), 0, CTRL+Key_L);
767,6 → 776,7
 
undoPalette = new UndoPalette(this, "undoPalette");
undoManager->registerGui(undoPalette);
connect(undoPalette, SIGNAL(closePalette(bool)), this, SLOT(setUndoPalette(bool)));
 
connect(MaPal, SIGNAL(Schliessen(bool)), this, SLOT(setMapal(bool)));
connect(Mpal, SIGNAL(DocChanged()), this, SLOT(slotDocCh()));
1193,6 → 1203,41
 
void ScribusApp::initToolsMenuActions()
{
//Tool menu
scrActions.insert("toolsProperties", new ScrAction(tr("&Properties"), QKeySequence(), this, "toolsProperties"));
scrActions.insert("toolsOutline", new ScrAction(tr("&Outline"), QKeySequence(), this, "toolsOutline"));
scrActions.insert("toolsScrapbook", new ScrAction(tr("&Scrapbook"), QKeySequence(), this, "toolsScrapbook"));
scrActions.insert("toolsLayers", new ScrAction(tr("&Layers"), QKeySequence(), this, "toolsLayers"));
scrActions.insert("toolsPages", new ScrAction(tr("P&age Palette"), QKeySequence(), this, "toolsPages"));
scrActions.insert("toolsBookmarks", new ScrAction(tr("&Bookmarks"), QKeySequence(), this, "toolsBookmarks"));
scrActions.insert("toolsActionHistory", new ScrAction(tr("Action &History"), QKeySequence(), this, "toolsActionHistory"));
scrActions.insert("toolsPreflightVerifier", new ScrAction(QIconSet(loadIcon("launch16.png"), loadIcon("launch.png")),tr("Preflight &Verifier"), QKeySequence(), this, "toolsPreflightVerifier"));
scrActions.insert("toolsToolbarTools", new ScrAction(tr("&Tools"), QKeySequence(), this, "toolsToolbarTools"));
scrActions.insert("toolsToolbarPDF", new ScrAction(tr("P&DF Tools"), QKeySequence(), this, "toolsToolbarPDF"));
scrActions["toolsProperties"]->setToggleAction(true);
scrActions["toolsOutline"]->setToggleAction(true);
scrActions["toolsScrapbook"]->setToggleAction(true);
scrActions["toolsLayers"]->setToggleAction(true);
scrActions["toolsPages"]->setToggleAction(true);
scrActions["toolsBookmarks"]->setToggleAction(true);
scrActions["toolsActionHistory"]->setToggleAction(true);
scrActions["toolsPreflightVerifier"]->setToggleAction(true);
scrActions["toolsToolbarTools"]->setToggleAction(true);
scrActions["toolsToolbarPDF"]->setToggleAction(true);
connect( scrActions["toolsProperties"], SIGNAL(activated()) , this, SLOT(ToggleMpal()) );
connect( scrActions["toolsOutline"], SIGNAL(activated()) , this, SLOT(ToggleTpal()) );
connect( scrActions["toolsScrapbook"], SIGNAL(activated()) , this, SLOT(ToggleBpal()) );
connect( scrActions["toolsLayers"], SIGNAL(activated()) , this, SLOT(ToggleLpal()) );
connect( scrActions["toolsPages"], SIGNAL(activated()) , this, SLOT(ToggleSepal()) );
connect( scrActions["toolsBookmarks"], SIGNAL(activated()) , this, SLOT(ToggleBookpal()) );
connect( scrActions["toolsActionHistory"], SIGNAL(activated()) , this, SLOT(ToggleUndoPalette()) );
connect( scrActions["toolsPreflightVerifier"], SIGNAL(activated()) , this, SLOT(ToggleCheckPal()) );
connect( scrActions["toolsToolbarTools"], SIGNAL(activated()) , this, SLOT(ToggleTools()) );
connect( scrActions["toolsToolbarPDF"], SIGNAL(activated()) , this, SLOT(TogglePDFTools()) );
}
 
void ScribusApp::initExtrasMenuActions()
1386,23 → 1431,21
scrMenuMgr->addMenuItem(scrActions["viewSnapToGuides"], "View");
//Tool menu
toolMenu=new QPopupMenu();
viewMpal = toolMenu->insertItem( tr("&Properties"), this, SLOT(ToggleMpal()));
SetKeyEntry(46, tr("Properties"), viewMpal, 0);
viewTpal = toolMenu->insertItem( tr("&Outline"), this, SLOT(ToggleTpal()));
SetKeyEntry(47, tr("Outline"), viewTpal, 0);
viewBpal = toolMenu->insertItem( tr("&Scrapbook"), this, SLOT(ToggleBpal()));
SetKeyEntry(48, tr("Scrapbook"), viewBpal, 0);
viewLpal = toolMenu->insertItem( tr("&Layers"), this, SLOT(ToggleLpal()));
viewSepal = toolMenu->insertItem( tr("P&age Palette"), this, SLOT(ToggleSepal()));
viewBopal = toolMenu->insertItem( tr("&Bookmarks"), this, SLOT(ToggleBookpal()));
viewUndoPalette = toolMenu->insertItem(tr("Action &History"), this, SLOT(ToggleUndoPalette()));
M_ToolsCheckDoc = toolMenu->insertItem( tr("Preflight Verifier"), this, SLOT(slotCheckDoc()));
toolbarMenuTools = toolMenu->insertItem( tr("&Tools"), this, SLOT(ToggleTools()));
toolbarMenuPDFTools = toolMenu->insertItem( tr("P&DF Tools"), this, SLOT(TogglePDFTools()));
SetKeyEntry(45, tr("Tools"), toolbarMenuTools, 0);
SetKeyEntry(55, tr("Tooltips"), tip, 0);
scrMenuMgr->createMenu("Tools", tr("&Tools"));
scrMenuMgr->addMenuItem(scrActions["toolsProperties"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsOutline"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsScrapbook"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsLayers"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsPages"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsBookmarks"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsActionHistory"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsPreflightVerifier"], "Tools");
scrMenuMgr->addMenuSeparator("Tools");
scrMenuMgr->addMenuItem(scrActions["toolsToolbarTools"], "Tools");
scrMenuMgr->addMenuItem(scrActions["toolsToolbarPDF"], "Tools");
scrActions["toolsPreflightVerifier"]->setEnabled(false);
//Extra menu
extraMenu=new QPopupMenu();
MenID = extraMenu->insertItem( tr("&Manage Pictures"), this, SLOT(StatusPic()));
1444,7 → 1487,7
scrMenuMgr->setMenuEnabled("Page", false);
scrMenuMgr->addMenuToMenuBar("View");
scrMenuMgr->setMenuEnabled("View", false);
menuBar()->insertItem( tr("&Tools"), toolMenu);
scrMenuMgr->addMenuToMenuBar("Tools");
exmn = menuBar()->insertItem( tr("E&xtras"), extraMenu);
menuBar()->setItemEnabled(exmn, 0);
WinMen = menuBar()->insertItem( tr("&Windows"), windowsMenu );
1509,8 → 1552,6
connect(undoManager, SIGNAL(newAction(UndoObject*, UndoState*)),
this, SLOT(refreshUndoRedoItems()));
connect(undoManager, SIGNAL(undoRedoDone()), this, SLOT(refreshUndoRedoItems()));
connect(toolMenu, SIGNAL(aboutToShow()), this, SLOT(refreshUndoRedoItems()));
connect(ColorMenC, SIGNAL(activated(int)), this, SLOT(setItemFarbe(int)));
connect(ShadeMenu, SIGNAL(activated(int)), this, SLOT(setItemShade(int)));
connect(FontMenu, SIGNAL(activated(int)), this, SLOT(setItemFont(int)));
3277,6 → 3318,7
scrActions["fileExportAsEPS"]->setEnabled(true);
scrActions["fileExportAsPDF"]->setEnabled(true);
scrActions["fileImportPage"]->setEnabled(true);
scrActions["toolsPreflightVerifier"]->setEnabled(true);
 
if (scrDLLActions["PrintPreview"])
scrDLLActions["PrintPreview"]->setEnabled(true);
4672,6 → 4714,8
scrActions["editTemplates"]->setEnabled(false);
scrActions["editJavascripts"]->setEnabled(false);
 
scrActions["toolsPreflightVerifier"]->setEnabled(false);
 
extraMenu->setItemEnabled(hyph, 0);
scrMenuMgr->setMenuEnabled("View", false);
menuBar()->setItemEnabled(WinMen, 0);
4726,7 → 4770,7
{
docChecker->buildErrorList(doc);
docChecker->show();
toolMenu->setItemChecked(M_ToolsCheckDoc, true);
scrActions["toolsPreflightVerifier"]->setOn(true);
return;
}
}
5581,7 → 5625,7
Prefs.checkPalSettings.yPosition = docChecker->pos().y();
docChecker->hide();
}
toolMenu->setItemChecked(M_ToolsCheckDoc, visible);
scrActions["toolsPreflightVerifier"]->setOn(visible);
}
 
void ScribusApp::ToggleCheckPal()
5608,7 → 5652,7
void ScribusApp::setUndoPalette(bool visible)
{
visible ? undoPalette->show() : undoPalette->hide();
toolMenu->setItemChecked(viewUndoPalette, visible);
scrActions["toolsActionHistory"]->setOn(visible);
}
 
void ScribusApp::setMpal(bool visible)
5624,7 → 5668,7
Prefs.mPaletteSettings.yPosition = Mpal->pos().y();
Mpal->hide();
}
toolMenu->setItemChecked(viewMpal, visible);
scrActions["toolsProperties"]->setOn(visible);
}
 
void ScribusApp::ToggleMpal()
5646,7 → 5690,7
Prefs.treePalSettings.yPosition = Tpal->pos().y();
Tpal->hide();
}
toolMenu->setItemChecked(viewTpal, visible);
scrActions["toolsOutline"]->setOn(visible);
}
 
void ScribusApp::ToggleTpal()
5671,7 → 5715,7
Prefs.scrapPalSettings.height = ScBook->size().height();
ScBook->hide();
}
toolMenu->setItemChecked(viewBpal, visible);
scrActions["toolsScrapbook"]->setOn(visible);
}
 
void ScribusApp::ToggleBpal()
5695,7 → 5739,7
Prefs.layerPalSettings.yPosition = Lpal->pos().y();
Lpal->hide();
}
toolMenu->setItemChecked(viewLpal, visible);
scrActions["toolsLayers"]->setOn(visible);
}
 
void ScribusApp::ToggleLpal()
5719,7 → 5763,7
Prefs.SepalN = Sepal->PageView->Namen;
Sepal->hide();
}
toolMenu->setItemChecked(viewSepal, visible);
scrActions["toolsPages"]->setOn(visible);
}
 
void ScribusApp::ToggleSepal()
5741,7 → 5785,7
Prefs.bookmPalSettings.yPosition = BookPal->pos().y();
BookPal->hide();
}
toolMenu->setItemChecked(viewBopal, visible);
scrActions["toolsBookmarks"]->setOn(visible);
}
 
void ScribusApp::ToggleBookpal()
5768,7 → 5812,7
WerkTools->hide();
WerkTools->Sichtbar = false;
}
toolMenu->setItemChecked(toolbarMenuTools, visible);
scrActions["toolsToolbarTools"]->setOn(visible);
}
 
void ScribusApp::ToggleTools()
5788,7 → 5832,7
WerkToolsP->hide();
WerkToolsP->Sichtbar = false;
}
toolMenu->setItemChecked(toolbarMenuPDFTools, visible);
scrActions["toolsToolbarPDF"]->setOn(visible);
}
 
void ScribusApp::TogglePDFTools()
7950,7 → 7994,7
{
docChecker->buildErrorList(doc);
docChecker->show();
toolMenu->setItemChecked(M_ToolsCheckDoc, true);
scrActions["toolsPreflightVerifier"]->setOn(true);
return;
}
}
8026,7 → 8070,7
{
docChecker->buildErrorList(doc);
docChecker->show();
toolMenu->setItemChecked(M_ToolsCheckDoc, true);
scrActions["toolsPreflightVerifier"]->setOn(true);
return;
}
}
9127,11 → 9171,12
if (scrActions[Prefs.KeyActions[a].actionName])
scrActions[Prefs.KeyActions[a].actionName]->setAccel(Prefs.KeyActions[a].KeyID);
}
/*
for (a = 45; a < 49; ++a)
{
toolMenu->setAccel(Prefs.KeyActions[a].KeyID, Prefs.KeyActions[a].MenuID);
}
*/
extraMenu->setAccel(Prefs.KeyActions[50].KeyID, Prefs.KeyActions[50].MenuID);
extraMenu->setAccel(Prefs.KeyActions[51].KeyID, Prefs.KeyActions[51].MenuID);
for (a = 52; a < 56; ++a)
9139,8 → 9184,8
helpMenu->setAccel(Prefs.KeyActions[a].KeyID, Prefs.KeyActions[a].MenuID);
}
//CB itemMenu->setAccel(Prefs.KeyActions[61].KeyID, Prefs.KeyActions[61].MenuID);
toolMenu->setAccel(Prefs.KeyActions[62].KeyID, Prefs.KeyActions[62].MenuID);
toolMenu->setAccel(Prefs.KeyActions[66].KeyID, Prefs.KeyActions[66].MenuID);
//CB toolMenu->setAccel(Prefs.KeyActions[62].KeyID, Prefs.KeyActions[62].MenuID);
//CB toolMenu->setAccel(Prefs.KeyActions[66].KeyID, Prefs.KeyActions[66].MenuID);
//CBitemMenu->setAccel(Prefs.KeyActions[67].KeyID, Prefs.KeyActions[67].MenuID);
//CBitemMenu->setAccel(Prefs.KeyActions[68].KeyID, Prefs.KeyActions[68].MenuID);
//CB TODO fileMenu->setAccel(Prefs.KeyActions[18].KeyID, Prefs.KeyActions[18].MenuID);
9243,7 → 9288,7
 
void ScribusApp::refreshUndoRedoItems()
{
toolMenu->setItemChecked(viewUndoPalette, undoPalette->isVisible());
scrActions["toolsActionHistory"]->setOn(undoPalette->isVisible());
scrActions["editUndoAction"]->setEnabled(undoManager->hasUndoActions());
scrActions["editRedoAction"]->setEnabled(undoManager->hasRedoActions());
}
9909,7 → 9954,7
scanDocument();
docChecker->buildErrorList(doc);
docChecker->show();
toolMenu->setItemChecked(M_ToolsCheckDoc, true);
scrActions["toolsPreflightVerifier"]->setOn(true);
}
 
void ScribusApp::scanDocument()
/branches/Version13x/Scribus/scribus/scribus.h
204,10 → 204,7
int UniCinC;
QString UniCinS;
 
//int M_FileNew;
//int M_FilePrint;
//int M_FileSaveAs;
//int M_FileQuit;
 
QMap<QString, QStringList> InstLang;
QMap<QString,QString> LangTransl;
FileWatcher* fileWatcher;
591,6 → 588,10
int viewSepal;
int viewBopal;
int viewUndoPalette;
//int M_FileNew;
//int M_FilePrint;
//int M_FileSaveAs;
//int M_FileQuit;
//int M_FileClose;
//int M_FileImportGetText;
//int M_FileImportPages;
630,7 → 631,7
/** @brief Tells if an arrow key is pressed down */
bool _arrowKeyDown;
QPopupMenu *helpMenu;
QPopupMenu *toolMenu;
//QPopupMenu *toolMenu;
QPopupMenu *extraMenu;
//QPopupMenu *importMenu;
//QPopupMenu *exportMenu;