mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 20:50:34 +01:00
Folio List: XML save/open added. When Application starts, folio list is not added
so that user gets the option to choose whether he wants to add folio list or not. Bug remaining: - When open project file with folio_list present, folio list sheets are at the end, not at the beginning. - Possibly many others. Thorough testing required. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2847 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -305,7 +305,7 @@ void ProjectView::addNewDiagram() {
|
||||
DiagramView *new_diagram_view = new DiagramView(new_diagram);
|
||||
addDiagram(new_diagram_view);
|
||||
|
||||
if (project_ -> diagrams().size() % 58 == 1 && DiagramFolioList::folioList_quantity != 0)
|
||||
if (project_ -> diagrams().size() % 58 == 1 && project_ -> getFolioSheetsQuantity() != 0)
|
||||
addNewDiagramFolioList();
|
||||
showDiagram(new_diagram_view);
|
||||
}
|
||||
@@ -340,11 +340,7 @@ void ProjectView::addDiagram(DiagramView *diagram, bool front) {
|
||||
tabs_ -> addTab(diagram, QET::Icons::Diagram, diagram -> title());
|
||||
diagram -> setFrameStyle(QFrame::Plain | QFrame::NoFrame);
|
||||
|
||||
// Add diagram type is a folio list then add it just after the last folio list in project, else add it at the back.
|
||||
//if (DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(diagram))
|
||||
//diagrams_.insert(DiagramFolioList::folioList_quantity, diagram);
|
||||
//else
|
||||
diagrams_ << diagram;
|
||||
diagrams_ << diagram;
|
||||
|
||||
rebuildDiagramsMap();
|
||||
connect(diagram, SIGNAL(showDiagram(Diagram*)), this, SLOT(showDiagram(Diagram*)));
|
||||
@@ -356,11 +352,9 @@ void ProjectView::addDiagram(DiagramView *diagram, bool front) {
|
||||
// signal diagram was added
|
||||
emit(diagramAdded(diagram));
|
||||
// move tab to front if wanted
|
||||
if (front) { //DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(diagram ->diagram())) {
|
||||
//int tabCount = tabs_ -> count();
|
||||
//for (int i = 0; i < (tabCount-1) - (DiagramFolioList::folioList_quantity-1); i++)
|
||||
//moveDiagramUp(diagram);
|
||||
tabs_->moveTab(tabs_->count()-1, DiagramFolioList::folioList_quantity-1);
|
||||
if (front) {
|
||||
tabs_->moveTab(tabs_->count()-1, project_ -> getFolioSheetsQuantity()-1);
|
||||
//diagram -> diagram() -> project() -> setFolioSheetsQuantity(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -431,7 +425,6 @@ void ProjectView::removeDiagram(Diagram *diagram) {
|
||||
void ProjectView::showDiagram(DiagramView *diagram) {
|
||||
if (!diagram) return;
|
||||
tabs_ -> setCurrentWidget(diagram);
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user