| [qet] [2394] Merge trunk sources files to branch 0.4 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 2394
Author: scorpio810
Date: 2013-07-25 11:21:46 +0200 (Thu, 25 Jul 2013)
Log Message:
-----------
Merge trunk sources files to branch 0.4
Modified Paths:
--------------
branches/0.4/ico/splash.png
branches/0.4/sources/aboutqet.cpp
branches/0.4/sources/aboutqet.h
branches/0.4/sources/basicmoveelementshandler.cpp
branches/0.4/sources/basicmoveelementshandler.h
branches/0.4/sources/borderproperties.cpp
branches/0.4/sources/borderproperties.h
branches/0.4/sources/borderpropertieswidget.cpp
branches/0.4/sources/borderpropertieswidget.h
branches/0.4/sources/bordertitleblock.cpp
branches/0.4/sources/bordertitleblock.h
branches/0.4/sources/closediagramsdialog.cpp
branches/0.4/sources/closediagramsdialog.h
branches/0.4/sources/conductor.cpp
branches/0.4/sources/conductor.h
branches/0.4/sources/conductorautonumerotation.cpp
branches/0.4/sources/conductorprofile.cpp
branches/0.4/sources/conductorprofile.h
branches/0.4/sources/conductorproperties.cpp
branches/0.4/sources/conductorproperties.h
branches/0.4/sources/conductorpropertieswidget.cpp
branches/0.4/sources/conductorpropertieswidget.h
branches/0.4/sources/conductorsegment.cpp
branches/0.4/sources/conductorsegment.h
branches/0.4/sources/conductorsegmentprofile.h
branches/0.4/sources/conductortextitem.cpp
branches/0.4/sources/conductortextitem.h
branches/0.4/sources/configdialog.cpp
branches/0.4/sources/configdialog.h
branches/0.4/sources/configpages.cpp
branches/0.4/sources/configpages.h
branches/0.4/sources/customelement.cpp
branches/0.4/sources/customelement.h
branches/0.4/sources/diagram.cpp
branches/0.4/sources/diagram.h
branches/0.4/sources/diagramcommands.cpp
branches/0.4/sources/diagramcommands.h
branches/0.4/sources/diagramcontent.cpp
branches/0.4/sources/diagramcontent.h
branches/0.4/sources/diagramcontext.cpp
branches/0.4/sources/diagramcontext.h
branches/0.4/sources/diagramposition.cpp
branches/0.4/sources/diagramposition.h
branches/0.4/sources/diagramprintdialog.cpp
branches/0.4/sources/diagramprintdialog.h
branches/0.4/sources/diagramschooser.cpp
branches/0.4/sources/diagramschooser.h
branches/0.4/sources/diagramtextitem.h
branches/0.4/sources/diagramview.cpp
branches/0.4/sources/diagramview.h
branches/0.4/sources/editor/arceditor.cpp
branches/0.4/sources/editor/arceditor.h
branches/0.4/sources/editor/customelementgraphicpart.cpp
branches/0.4/sources/editor/customelementgraphicpart.h
branches/0.4/sources/editor/customelementpart.cpp
branches/0.4/sources/editor/customelementpart.h
branches/0.4/sources/editor/editorcommands.cpp
branches/0.4/sources/editor/editorcommands.h
branches/0.4/sources/editor/elementcontent.h
branches/0.4/sources/editor/elementitemeditor.cpp
branches/0.4/sources/editor/elementitemeditor.h
branches/0.4/sources/editor/elementscene.cpp
branches/0.4/sources/editor/elementscene.h
branches/0.4/sources/editor/elementview.cpp
branches/0.4/sources/editor/elementview.h
branches/0.4/sources/editor/ellipseeditor.cpp
branches/0.4/sources/editor/ellipseeditor.h
branches/0.4/sources/editor/lineeditor.cpp
branches/0.4/sources/editor/lineeditor.h
branches/0.4/sources/editor/partarc.cpp
branches/0.4/sources/editor/partarc.h
branches/0.4/sources/editor/partellipse.cpp
branches/0.4/sources/editor/partellipse.h
branches/0.4/sources/editor/partline.cpp
branches/0.4/sources/editor/partline.h
branches/0.4/sources/editor/partpolygon.cpp
branches/0.4/sources/editor/partpolygon.h
branches/0.4/sources/editor/partrectangle.cpp
branches/0.4/sources/editor/partrectangle.h
branches/0.4/sources/editor/partterminal.cpp
branches/0.4/sources/editor/partterminal.h
branches/0.4/sources/editor/parttext.cpp
branches/0.4/sources/editor/parttext.h
branches/0.4/sources/editor/parttextfield.cpp
branches/0.4/sources/editor/parttextfield.h
branches/0.4/sources/editor/polygoneditor.cpp
branches/0.4/sources/editor/polygoneditor.h
branches/0.4/sources/editor/qetelementeditor.cpp
branches/0.4/sources/editor/qetelementeditor.h
branches/0.4/sources/editor/rectangleeditor.cpp
branches/0.4/sources/editor/rectangleeditor.h
branches/0.4/sources/editor/styleeditor.cpp
branches/0.4/sources/editor/styleeditor.h
branches/0.4/sources/editor/terminaleditor.cpp
branches/0.4/sources/editor/terminaleditor.h
branches/0.4/sources/editor/texteditor.cpp
branches/0.4/sources/editor/texteditor.h
branches/0.4/sources/editor/textfieldeditor.cpp
branches/0.4/sources/editor/textfieldeditor.h
branches/0.4/sources/element.cpp
branches/0.4/sources/element.h
branches/0.4/sources/elementdefinition.cpp
branches/0.4/sources/elementdefinition.h
branches/0.4/sources/elementdeleter.cpp
branches/0.4/sources/elementdeleter.h
branches/0.4/sources/elementdialog.cpp
branches/0.4/sources/elementdialog.h
branches/0.4/sources/elementscategorieslist.cpp
branches/0.4/sources/elementscategorieslist.h
branches/0.4/sources/elementscategorieswidget.cpp
branches/0.4/sources/elementscategorieswidget.h
branches/0.4/sources/elementscategory.cpp
branches/0.4/sources/elementspanelwidget.cpp
branches/0.4/sources/hotspoteditor.cpp
branches/0.4/sources/qet.h
branches/0.4/sources/qetproject.cpp
branches/0.4/sources/ui/numparteditorw.cpp
branches/0.4/sources/ui/numparteditorw.h
branches/0.4/sources/ui/numparteditorw.ui
branches/0.4/sources/ui/selectautonumw.cpp
Modified: branches/0.4/ico/splash.png
===================================================================
(Binary files differ)
Modified: branches/0.4/sources/aboutqet.cpp
===================================================================
--- branches/0.4/sources/aboutqet.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/aboutqet.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
// Titre, taille, comportement...
setWindowTitle(tr("\300 propos de QElectrotech", "window title"));
setMinimumWidth(680);
- setMinimumHeight(350);
+ setMinimumHeight(690);
setModal(true);
// Trois onglets
@@ -93,7 +93,7 @@
QLabel *about = new QLabel(
tr("QElectroTech, une application de r\351alisation de sch\351mas \351lectriques.", "about tab, description line") +
"<br><br>" +
- tr("\251 2006-2012 Les d\351veloppeurs de QElectroTech", "about tab, developers line") +
+ tr("\251 2006-2013 Les d\351veloppeurs de QElectroTech", "about tab, developers line") +
"<br><br>"
"<a href=\"http://qelectrotech.org/\";>http://qelectrotech.org/</a>"
"<br><br>" +
@@ -135,6 +135,7 @@
addAuthor(translators, "Paweł Śmiech", "pawel32640@xxxxxxxxx", tr("Traduction en polonais"));
addAuthor(translators, "Markus Budde", "markus.budde@xxxxxxx", tr("Traduction en allemand"));
addAuthor(translators, "Jonas Stein", "news@xxxxxxxxxxxxx", tr("Traduction en allemand"));
+ addAuthor(translators, "Noah Braden", "", tr("Traduction en allemand"));
addAuthor(translators, "Gabi Mandoc", "gabriel.mandoc@xxxxxx", tr("Traduction en roumain"));
addAuthor(translators, "Alessandro Conti", "dr.slump@xxxxxxxxxxxx", tr("Traduction en italien"));
addAuthor(translators, "Silvio", "silvio@xxxxxxxxxxxxxxxx", tr("Traduction en italien"));
Modified: branches/0.4/sources/aboutqet.h
===================================================================
--- branches/0.4/sources/aboutqet.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/aboutqet.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/basicmoveelementshandler.cpp
===================================================================
--- branches/0.4/sources/basicmoveelementshandler.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/basicmoveelementshandler.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/basicmoveelementshandler.h
===================================================================
--- branches/0.4/sources/basicmoveelementshandler.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/basicmoveelementshandler.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/borderproperties.cpp
===================================================================
--- branches/0.4/sources/borderproperties.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/borderproperties.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/borderproperties.h
===================================================================
--- branches/0.4/sources/borderproperties.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/borderproperties.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/borderpropertieswidget.cpp
===================================================================
--- branches/0.4/sources/borderpropertieswidget.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/borderpropertieswidget.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/borderpropertieswidget.h
===================================================================
--- branches/0.4/sources/borderpropertieswidget.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/borderpropertieswidget.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/bordertitleblock.cpp
===================================================================
--- branches/0.4/sources/bordertitleblock.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/bordertitleblock.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/bordertitleblock.h
===================================================================
--- branches/0.4/sources/bordertitleblock.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/bordertitleblock.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/closediagramsdialog.cpp
===================================================================
--- branches/0.4/sources/closediagramsdialog.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/closediagramsdialog.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/closediagramsdialog.h
===================================================================
--- branches/0.4/sources/closediagramsdialog.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/closediagramsdialog.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductor.cpp
===================================================================
--- branches/0.4/sources/conductor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductor.h
===================================================================
--- branches/0.4/sources/conductor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorautonumerotation.cpp
===================================================================
--- branches/0.4/sources/conductorautonumerotation.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorautonumerotation.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -58,7 +58,8 @@
void ConductorAutoNumerotation::numerate() {
if (!conductor_) return;
if (conductor_list.size() >= 1 ) numeratePotential();
- else numerateNewConductor();
+ else if (conductor_ -> properties().type == ConductorProperties::Multi) numerateNewConductor();
+ else return;
}
/**
Modified: branches/0.4/sources/conductorprofile.cpp
===================================================================
--- branches/0.4/sources/conductorprofile.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorprofile.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorprofile.h
===================================================================
--- branches/0.4/sources/conductorprofile.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorprofile.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorproperties.cpp
===================================================================
--- branches/0.4/sources/conductorproperties.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorproperties.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorproperties.h
===================================================================
--- branches/0.4/sources/conductorproperties.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorproperties.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorpropertieswidget.cpp
===================================================================
--- branches/0.4/sources/conductorpropertieswidget.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorpropertieswidget.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorpropertieswidget.h
===================================================================
--- branches/0.4/sources/conductorpropertieswidget.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorpropertieswidget.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorsegment.cpp
===================================================================
--- branches/0.4/sources/conductorsegment.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorsegment.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorsegment.h
===================================================================
--- branches/0.4/sources/conductorsegment.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorsegment.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductorsegmentprofile.h
===================================================================
--- branches/0.4/sources/conductorsegmentprofile.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductorsegmentprofile.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductortextitem.cpp
===================================================================
--- branches/0.4/sources/conductortextitem.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductortextitem.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/conductortextitem.h
===================================================================
--- branches/0.4/sources/conductortextitem.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/conductortextitem.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/configdialog.cpp
===================================================================
--- branches/0.4/sources/configdialog.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/configdialog.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/configdialog.h
===================================================================
--- branches/0.4/sources/configdialog.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/configdialog.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/configpages.cpp
===================================================================
--- branches/0.4/sources/configpages.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/configpages.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/configpages.h
===================================================================
--- branches/0.4/sources/configpages.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/configpages.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/customelement.cpp
===================================================================
--- branches/0.4/sources/customelement.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/customelement.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/customelement.h
===================================================================
--- branches/0.4/sources/customelement.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/customelement.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagram.cpp
===================================================================
--- branches/0.4/sources/diagram.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagram.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagram.h
===================================================================
--- branches/0.4/sources/diagram.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagram.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramcommands.cpp
===================================================================
--- branches/0.4/sources/diagramcommands.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcommands.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -601,18 +601,13 @@
rotateElement(e, elements_to_rotate[e]);
}
foreach(DiagramTextItem *dti, texts_to_rotate) {
- //ConductorTextItem have got a default rotation propertie
- //so we apply specific undo method for him
+ //ConductorTextItem have a default rotation angle, we apply a specific treatment
if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(dti)) {
- cti -> forceRotateByUser(previous_rotate_by_user_);
- //previous_rotate_by_user is false mean the rotation is propertie rotation
- if (previous_rotate_by_user_ == false) {cti -> parentConductor() ->adjustTextItemPosition();}
- else {cti -> rotateBy(-applied_rotation_angle_);}
+ cti -> forceRotateByUser(previous_rotate_by_user_[cti]);
+ (cti -> wasRotateByUser()) ? cti -> rotateBy(-appliedRotationAngle()) :
+ cti -> parentConductor() -> adjustTextItemPosition();
}
- //this isn't a ConductorTextItem
- else {
- dti -> rotateBy(-applied_rotation_angle_);
- }
+ else {dti -> rotateBy(-applied_rotation_angle_);}
}
}
@@ -622,8 +617,9 @@
rotateElement(e, e -> orientation().next());
}
foreach(DiagramTextItem *dti, texts_to_rotate) {
+ //we grab the previous rotation by user of each ConductorTextItem
if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(dti)) {
- previous_rotate_by_user_ = cti -> wasRotateByUser();
+ previous_rotate_by_user_.insert(cti, cti -> wasRotateByUser());
cti -> forceRotateByUser(true);
}
dti -> rotateBy(applied_rotation_angle_);
@@ -685,9 +681,6 @@
texts_to_rotate(previous_state),
applied_rotation_angle_(applied_rotation)
{
- foreach(DiagramTextItem *text, texts_to_rotate.keys()) {
- if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) previous_rotate_by_user_ = cti -> wasRotateByUser();
- }
defineCommandName();
}
@@ -702,7 +695,6 @@
applied_rotation_angle_(applied_rotation)
{
foreach(DiagramTextItem *text, texts) {
- if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) previous_rotate_by_user_ = cti -> wasMovedByUser();
texts_to_rotate.insert(text, text -> rotationAngle());
}
defineCommandName();
@@ -719,9 +711,8 @@
*/
void RotateTextsCommand::undo() {
foreach(DiagramTextItem *text, texts_to_rotate.keys()) {
- if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) {
- cti -> forceRotateByUser(previous_rotate_by_user_);
- }
+ if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text))
+ cti -> forceRotateByUser(previous_rotate_by_user_[cti]);
text -> setRotationAngle(texts_to_rotate[text]);
}
}
@@ -732,7 +723,8 @@
void RotateTextsCommand::redo() {
foreach(DiagramTextItem *text, texts_to_rotate.keys()) {
if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) {
- previous_rotate_by_user_ = cti -> wasRotateByUser();
+ //we grab the previous rotation by user of each ConductorTextItem
+ previous_rotate_by_user_.insert(cti, cti -> wasRotateByUser());
cti -> forceRotateByUser(true);
}
text -> setRotationAngle(applied_rotation_angle_);
Modified: branches/0.4/sources/diagramcommands.h
===================================================================
--- branches/0.4/sources/diagramcommands.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcommands.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -323,7 +323,8 @@
QList<DiagramTextItem *> texts_to_rotate;
/// angle of rotation to be applied to text items
qreal applied_rotation_angle_;
- bool previous_rotate_by_user_;
+ /// previous state of each conductor text item
+ QHash<ConductorTextItem *, bool> previous_rotate_by_user_;
};
/**
@@ -353,7 +354,8 @@
QHash<DiagramTextItem *, double> texts_to_rotate;
/// angle of rotation of all text items after the command
double applied_rotation_angle_;
- bool previous_rotate_by_user_;
+ /// previous state of each conductor text item
+ QHash<ConductorTextItem *, bool> previous_rotate_by_user_;
};
/**
Modified: branches/0.4/sources/diagramcontent.cpp
===================================================================
--- branches/0.4/sources/diagramcontent.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcontent.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramcontent.h
===================================================================
--- branches/0.4/sources/diagramcontent.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcontent.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramcontext.cpp
===================================================================
--- branches/0.4/sources/diagramcontext.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcontext.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramcontext.h
===================================================================
--- branches/0.4/sources/diagramcontext.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramcontext.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramposition.cpp
===================================================================
--- branches/0.4/sources/diagramposition.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramposition.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramposition.h
===================================================================
--- branches/0.4/sources/diagramposition.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramposition.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramprintdialog.cpp
===================================================================
--- branches/0.4/sources/diagramprintdialog.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramprintdialog.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramprintdialog.h
===================================================================
--- branches/0.4/sources/diagramprintdialog.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramprintdialog.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramschooser.cpp
===================================================================
--- branches/0.4/sources/diagramschooser.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramschooser.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramschooser.h
===================================================================
--- branches/0.4/sources/diagramschooser.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramschooser.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramtextitem.h
===================================================================
--- branches/0.4/sources/diagramtextitem.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramtextitem.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/diagramview.cpp
===================================================================
--- branches/0.4/sources/diagramview.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramview.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -40,10 +40,7 @@
#include "qtextorientationspinboxwidget.h"
#include <QGraphicsObject>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsSceneMouseEvent>
-
/**
Constructeur
@param diagram Schema a afficher ; si diagram vaut 0, un nouveau Diagram est utilise
@@ -1258,27 +1255,24 @@
* @param pos
* @return
*/
-DiagramImageItem *DiagramView::addDiagramImageAtPos(const QPointF &pos) {
+IndependentTextItem *DiagramView::addDiagramImageAtPos(const QPointF &pos) {
if (!isInteractive() || scene -> isReadOnly()) return(0);
- /*addImage();
+
+ addImage();
QGraphicsPixmapItem *pixItem = new QGraphicsPixmapItem( QPixmap::fromImage(image_to_add_) );
- pixItem->setFlag(QGraphicsItem::ItemIsMovable,true);
- pixItem->setFlag(QGraphicsItem::ItemIsSelectable,true);
- pixItem->setCursor(Qt::PointingHandCursor);
- scene ->addItem(pixItem);*/
-
-// cree un nouveau champ image
- DiagramImageItem *Imageitem = new DiagramImageItem( QPixmap::fromImage(image_to_add_) );
-
- // le place a la position pos en gerant l'annulation
- //scene -> undoStack().push(new AddImageCommand(scene, Imageitem, pos));
+ scene ->addItem( pixItem );
+
+/*// cree un nouveau champ de texte
+IndependentTextItem *iti = new IndependentTextItem("_");
+
+// le place a la position pos en gerant l'annulation
+scene -> undoStack().push(new AddTextCommand(scene, iti, pos));
adjustSceneRect();
-
- // emet le signal ImageAdded
- emit(ImageAdded(false));
-
- return(Imageitem);
+
+ // emet le signal textAdded
+emit(textAdded(false));
+ return(iti);*/
}
/**
Modified: branches/0.4/sources/diagramview.h
===================================================================
--- branches/0.4/sources/diagramview.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/diagramview.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/arceditor.cpp
===================================================================
--- branches/0.4/sources/editor/arceditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/arceditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/arceditor.h
===================================================================
--- branches/0.4/sources/editor/arceditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/arceditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/customelementgraphicpart.cpp
===================================================================
--- branches/0.4/sources/editor/customelementgraphicpart.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/customelementgraphicpart.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/customelementgraphicpart.h
===================================================================
--- branches/0.4/sources/editor/customelementgraphicpart.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/customelementgraphicpart.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/customelementpart.cpp
===================================================================
--- branches/0.4/sources/editor/customelementpart.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/customelementpart.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/customelementpart.h
===================================================================
--- branches/0.4/sources/editor/customelementpart.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/customelementpart.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/editorcommands.cpp
===================================================================
--- branches/0.4/sources/editor/editorcommands.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/editorcommands.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/editorcommands.h
===================================================================
--- branches/0.4/sources/editor/editorcommands.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/editorcommands.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementcontent.h
===================================================================
--- branches/0.4/sources/editor/elementcontent.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementcontent.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementitemeditor.cpp
===================================================================
--- branches/0.4/sources/editor/elementitemeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementitemeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementitemeditor.h
===================================================================
--- branches/0.4/sources/editor/elementitemeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementitemeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementscene.cpp
===================================================================
--- branches/0.4/sources/editor/elementscene.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementscene.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementscene.h
===================================================================
--- branches/0.4/sources/editor/elementscene.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementscene.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementview.cpp
===================================================================
--- branches/0.4/sources/editor/elementview.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementview.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/elementview.h
===================================================================
--- branches/0.4/sources/editor/elementview.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/elementview.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/ellipseeditor.cpp
===================================================================
--- branches/0.4/sources/editor/ellipseeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/ellipseeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/ellipseeditor.h
===================================================================
--- branches/0.4/sources/editor/ellipseeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/ellipseeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/lineeditor.cpp
===================================================================
--- branches/0.4/sources/editor/lineeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/lineeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/lineeditor.h
===================================================================
--- branches/0.4/sources/editor/lineeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/lineeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partarc.cpp
===================================================================
--- branches/0.4/sources/editor/partarc.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partarc.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partarc.h
===================================================================
--- branches/0.4/sources/editor/partarc.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partarc.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partellipse.cpp
===================================================================
--- branches/0.4/sources/editor/partellipse.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partellipse.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partellipse.h
===================================================================
--- branches/0.4/sources/editor/partellipse.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partellipse.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partline.cpp
===================================================================
--- branches/0.4/sources/editor/partline.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partline.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partline.h
===================================================================
--- branches/0.4/sources/editor/partline.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partline.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partpolygon.cpp
===================================================================
--- branches/0.4/sources/editor/partpolygon.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partpolygon.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partpolygon.h
===================================================================
--- branches/0.4/sources/editor/partpolygon.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partpolygon.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partrectangle.cpp
===================================================================
--- branches/0.4/sources/editor/partrectangle.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partrectangle.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partrectangle.h
===================================================================
--- branches/0.4/sources/editor/partrectangle.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partrectangle.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partterminal.cpp
===================================================================
--- branches/0.4/sources/editor/partterminal.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partterminal.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/partterminal.h
===================================================================
--- branches/0.4/sources/editor/partterminal.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/partterminal.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/parttext.cpp
===================================================================
--- branches/0.4/sources/editor/parttext.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/parttext.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/parttext.h
===================================================================
--- branches/0.4/sources/editor/parttext.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/parttext.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/parttextfield.cpp
===================================================================
--- branches/0.4/sources/editor/parttextfield.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/parttextfield.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/parttextfield.h
===================================================================
--- branches/0.4/sources/editor/parttextfield.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/parttextfield.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/polygoneditor.cpp
===================================================================
--- branches/0.4/sources/editor/polygoneditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/polygoneditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/polygoneditor.h
===================================================================
--- branches/0.4/sources/editor/polygoneditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/polygoneditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/qetelementeditor.cpp
===================================================================
--- branches/0.4/sources/editor/qetelementeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/qetelementeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/qetelementeditor.h
===================================================================
--- branches/0.4/sources/editor/qetelementeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/qetelementeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/rectangleeditor.cpp
===================================================================
--- branches/0.4/sources/editor/rectangleeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/rectangleeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/rectangleeditor.h
===================================================================
--- branches/0.4/sources/editor/rectangleeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/rectangleeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/styleeditor.cpp
===================================================================
--- branches/0.4/sources/editor/styleeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/styleeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -29,14 +29,13 @@
part(p)
{
// couleur
- color = new QButtonGroup(this);
- color -> addButton(black_color = new QRadioButton(tr("Noir", "element part color")), CustomElementGraphicPart::BlackColor);
- color -> addButton(white_color = new QRadioButton(tr("Blanc", "element part color")), CustomElementGraphicPart::WhiteColor);
- color -> addButton(green_color = new QRadioButton(tr("Vert", "element part color")), CustomElementGraphicPart::GreenColor);
- color -> addButton(red_color = new QRadioButton(tr("Rouge", "element part color")), CustomElementGraphicPart::RedColor);
- color -> addButton(blue_color = new QRadioButton(tr("Bleu", "element part color")), CustomElementGraphicPart::BlueColor);
+ outline_color = new QComboBox(this);
+ outline_color -> addItem(tr("Noir", "element part color"), CustomElementGraphicPart::BlackColor);
+ outline_color -> addItem(tr("Blanc", "element part color"), CustomElementGraphicPart::WhiteColor);
+ outline_color -> addItem(tr("Vert", "element part color"), CustomElementGraphicPart::GreenColor);
+ outline_color -> addItem(tr("Rouge", "element part color"), CustomElementGraphicPart::RedColor);
+ outline_color -> addItem(tr("Bleu", "element part color"), CustomElementGraphicPart::BlueColor);
-
// style
style = new QButtonGroup(this);
style -> addButton(normal_style = new QRadioButton(tr("Normal", "element part line style")), CustomElementGraphicPart::NormalStyle);
@@ -52,13 +51,13 @@
weight -> addButton(normal_weight = new QRadioButton(tr("Normale", "element part weight")), CustomElementGraphicPart::NormalWeight);
// remplissage
- filling = new QButtonGroup(this);
- filling -> addButton(no_filling = new QRadioButton(tr("Aucun", "element part filling")), CustomElementGraphicPart::NoneFilling );
- filling -> addButton(black_filling = new QRadioButton(tr("Noir", "element part filling")), CustomElementGraphicPart::BlackFilling);
- filling -> addButton(white_filling = new QRadioButton(tr("Blanc", "element part filling")), CustomElementGraphicPart::WhiteFilling);
- filling -> addButton(green_filling = new QRadioButton(tr("Vert", "element part filling")), CustomElementGraphicPart::GreenFilling);
- filling -> addButton(red_filling = new QRadioButton(tr("Rouge", "element part filling")), CustomElementGraphicPart::RedFilling);
- filling -> addButton(blue_filling = new QRadioButton(tr("Bleu", "element part filling")), CustomElementGraphicPart::BlueFilling);
+ filling_color = new QComboBox (this);
+ filling_color -> addItem(tr("Aucun", "element part filling"), CustomElementGraphicPart::NoneFilling);
+ filling_color -> addItem(tr("Noir", "element part filling"), CustomElementGraphicPart::BlackFilling);
+ filling_color -> addItem(tr("Blanc", "element part filling"), CustomElementGraphicPart::WhiteFilling);
+ filling_color -> addItem(tr("Vert", "element part filling"), CustomElementGraphicPart::GreenFilling);
+ filling_color -> addItem(tr("Rouge", "element part filling"), CustomElementGraphicPart::RedFilling);
+ filling_color -> addItem(tr("Bleu", "element part filling"), CustomElementGraphicPart::BlueFilling);
// antialiasing
antialiasing = new QCheckBox(tr("Antialiasing"));
@@ -66,18 +65,16 @@
updateForm();
main_layout = new QVBoxLayout();
- main_layout -> addWidget(antialiasing);
+ main_layout -> setMargin(0);
- main_layout -> addWidget(new QLabel("<u>" + tr("Trait :") + "</u> "));
+ main_layout -> addWidget(new QLabel("<u>" + tr("Apparence :") + "</u> "));
QHBoxLayout *color_layout = new QHBoxLayout();
- color_layout -> addWidget(new QLabel(tr("Couleur : ")));
- color_layout -> addWidget(black_color);
- color_layout -> addWidget(white_color);
- color_layout -> addWidget(green_color);
- color_layout -> addWidget(red_color);
- color_layout -> addWidget(blue_color);
- color_layout -> addStretch();
+ color_layout -> addWidget(new QLabel(tr("Contour :")), 0, Qt::AlignRight);
+ color_layout -> addWidget(outline_color);
+ color_layout -> addSpacing(10);
+ color_layout -> addWidget(new QLabel(tr("Remplissage :")), 0, Qt::AlignRight);
+ color_layout -> addWidget(filling_color);
main_layout -> addLayout(color_layout);
QHBoxLayout *style_layout = new QHBoxLayout();
@@ -96,21 +93,13 @@
weight_layout -> addWidget(normal_weight);
weight_layout -> addStretch();
main_layout -> addLayout(weight_layout);
-
- main_layout -> addWidget(new QLabel("<u>" + tr("Remplissage :") + "</u> "));
-
- QHBoxLayout *filling_layout = new QHBoxLayout();
- filling_layout -> addWidget(no_filling);
- filling_layout -> addWidget(black_filling);
- filling_layout -> addWidget(white_filling);
- filling_layout -> addWidget(green_filling);
- filling_layout -> addWidget(red_filling);
- filling_layout -> addWidget(blue_filling);
- filling_layout -> addStretch();
- main_layout -> addLayout(filling_layout);
-
+ main_layout -> addWidget(antialiasing);
+
+ main_layout -> addSpacing(10);
+ main_layout -> addWidget(new QLabel("<u>" + tr("G\351om\351trie :") + "</u> "));
main_layout -> addStretch();
+
setLayout(main_layout);
}
@@ -127,7 +116,7 @@
part -> setAntialiased(antialiasing -> isChecked());
// applique la couleur
- part -> setColor(static_cast<CEGP::Color>(color -> checkedId()));
+ part -> setColor(static_cast<CEGP::Color>(outline_color -> currentIndex()));
// applique le style
part -> setLineStyle(static_cast<CEGP::LineStyle>(style -> checkedId()));
@@ -136,19 +125,19 @@
part -> setLineWeight(static_cast<CEGP::LineWeight>(weight -> checkedId()));
// applique le remplissage
- part -> setFilling(static_cast<CEGP::Filling>(filling -> checkedId()));
+ part -> setFilling(static_cast<CEGP::Filling>(filling_color -> currentIndex()));
}
/// Met a jour l'antialiasing et cree un objet d'annulation
void StyleEditor::updatePartAntialiasing() { addChangePartCommand(tr("style antialiasing"), part, "antialias", antialiasing -> isChecked()); }
/// Met a jour la couleur du trait et cree un objet d'annulation
-void StyleEditor::updatePartColor() { addChangePartCommand(tr("style couleur"), part, "color", color -> checkedId()); }
+void StyleEditor::updatePartColor() { addChangePartCommand(tr("style couleur"), part, "color", outline_color -> currentIndex());}
/// Met a jour le style du trait et cree un objet d'annulation
void StyleEditor::updatePartLineStyle() { addChangePartCommand(tr("style ligne"), part, "line-style", style -> checkedId()); }
/// Met a jour l'epaisseur du trait et cree un objet d'annulation
void StyleEditor::updatePartLineWeight() { addChangePartCommand(tr("style epaisseur"), part, "line-weight", weight -> checkedId()); }
/// Met a jour la couleur de fond et cree un objet d'annulation
-void StyleEditor::updatePartFilling() { addChangePartCommand(tr("style remplissage"), part, "filling", filling -> checkedId()); }
+void StyleEditor::updatePartFilling() { addChangePartCommand(tr("style remplissage"), part, "filling", filling_color -> currentIndex());}
/**
Met a jour le formulaire d'edition
@@ -160,7 +149,7 @@
antialiasing -> setChecked(part -> antialiased());
// lit la couleur
- color -> button(part -> color()) -> setChecked(true);
+ outline_color -> setCurrentIndex(part -> color());
// lit le style
style -> button(part -> lineStyle()) -> setChecked(true);
@@ -169,7 +158,7 @@
weight -> button(part -> lineWeight()) -> setChecked(true);
// lit le remplissage
- filling -> button(part -> filling()) -> setChecked(true);
+ filling_color -> setCurrentIndex(part -> filling());
activeConnections(true);
}
@@ -208,16 +197,16 @@
*/
void StyleEditor::activeConnections(bool active) {
if (active) {
- connect(color, SIGNAL(buttonClicked(int)), this, SLOT(updatePartColor()));
+ connect (outline_color, SIGNAL(activated(int)), this, SLOT(updatePartColor()));
connect(style, SIGNAL(buttonClicked(int)), this, SLOT(updatePartLineStyle()));
connect(weight, SIGNAL(buttonClicked(int)), this, SLOT(updatePartLineWeight()));
- connect(filling, SIGNAL(buttonClicked(int)), this, SLOT(updatePartFilling()));
+ connect(filling_color, SIGNAL(activated(int)), this, SLOT(updatePartFilling()));
connect(antialiasing, SIGNAL(stateChanged(int)), this, SLOT(updatePartAntialiasing()));
} else {
- disconnect(color, SIGNAL(buttonClicked(int)), this, SLOT(updatePartColor()));
+ disconnect(outline_color, SIGNAL(activated(int)), this, SLOT(updatePartColor()));
disconnect(style, SIGNAL(buttonClicked(int)), this, SLOT(updatePartLineStyle()));
disconnect(weight, SIGNAL(buttonClicked(int)), this, SLOT(updatePartLineWeight()));
- disconnect(filling, SIGNAL(buttonClicked(int)), this, SLOT(updatePartFilling()));
+ disconnect(filling_color, SIGNAL(activated(int)), this, SLOT(updatePartFilling()));
disconnect(antialiasing, SIGNAL(stateChanged(int)), this, SLOT(updatePartAntialiasing()));
}
}
Modified: branches/0.4/sources/editor/styleeditor.h
===================================================================
--- branches/0.4/sources/editor/styleeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/styleeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -40,11 +40,12 @@
private:
CustomElementGraphicPart *part;
QVBoxLayout *main_layout;
- QButtonGroup *color, *style, *weight, *filling;
+ QButtonGroup *style, *weight;
QRadioButton *black_color, *white_color, *normal_style, *dashed_style, *dashdotted_style, *dotted_style, *green_color, *red_color, *blue_color;
QRadioButton *none_weight, *thin_weight, *normal_weight, *no_filling;
QRadioButton *black_filling, *white_filling, *green_filling, *red_filling, *blue_filling;
QCheckBox *antialiasing;
+ QComboBox *filling_color, *outline_color;
// methods
public:
Modified: branches/0.4/sources/editor/terminaleditor.cpp
===================================================================
--- branches/0.4/sources/editor/terminaleditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/terminaleditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/terminaleditor.h
===================================================================
--- branches/0.4/sources/editor/terminaleditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/terminaleditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/texteditor.cpp
===================================================================
--- branches/0.4/sources/editor/texteditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/texteditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/texteditor.h
===================================================================
--- branches/0.4/sources/editor/texteditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/texteditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/textfieldeditor.cpp
===================================================================
--- branches/0.4/sources/editor/textfieldeditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/textfieldeditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/editor/textfieldeditor.h
===================================================================
--- branches/0.4/sources/editor/textfieldeditor.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/editor/textfieldeditor.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/element.cpp
===================================================================
--- branches/0.4/sources/element.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/element.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/element.h
===================================================================
--- branches/0.4/sources/element.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/element.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdefinition.cpp
===================================================================
--- branches/0.4/sources/elementdefinition.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdefinition.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdefinition.h
===================================================================
--- branches/0.4/sources/elementdefinition.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdefinition.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdeleter.cpp
===================================================================
--- branches/0.4/sources/elementdeleter.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdeleter.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdeleter.h
===================================================================
--- branches/0.4/sources/elementdeleter.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdeleter.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdialog.cpp
===================================================================
--- branches/0.4/sources/elementdialog.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdialog.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementdialog.h
===================================================================
--- branches/0.4/sources/elementdialog.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementdialog.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementscategorieslist.cpp
===================================================================
--- branches/0.4/sources/elementscategorieslist.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementscategorieslist.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementscategorieslist.h
===================================================================
--- branches/0.4/sources/elementscategorieslist.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementscategorieslist.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementscategorieswidget.cpp
===================================================================
--- branches/0.4/sources/elementscategorieswidget.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementscategorieswidget.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementscategorieswidget.h
===================================================================
--- branches/0.4/sources/elementscategorieswidget.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementscategorieswidget.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementscategory.cpp
===================================================================
--- branches/0.4/sources/elementscategory.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementscategory.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1,5 +1,5 @@
/*
- Copyright 2006-2012 Xavier Guerrin
+ Copyright 2006-2013 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
Modified: branches/0.4/sources/elementspanelwidget.cpp
===================================================================
--- branches/0.4/sources/elementspanelwidget.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/elementspanelwidget.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -79,7 +79,9 @@
copy_elements_ = new QAction(QET::Icons::CopyFile, tr("Copier dans cette cat\351gorie"), this);
cancel_elements_ = new QAction(QET::Icons::Cancel, tr("Annuler"), this);
erase_textfield = new QAction(QET::Icons::EditClearLocationBar, tr("Effacer le filtre"), this);
-
+
+ reload -> setShortcut(Qt::Key_F5);
+
// initialise le champ de texte pour filtrer avec une disposition horizontale
QLabel *filter_label = new QLabel(tr("Filtrer : "), this);
filter_textfield = new QLineEdit(this);
Modified: branches/0.4/sources/hotspoteditor.cpp
===================================================================
--- branches/0.4/sources/hotspoteditor.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/hotspoteditor.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -71,6 +71,11 @@
hotspot_sync = new QCheckBox(tr("D\351placer l'\351l\351ment avec le hotspot"));
hotspot_sync -> setChecked(true);
+ // TODO setvisible to disable checkbox hotspot_sync
+ // one for remove bug in element editor after un move hotspot_sync, selection is not focused on primitives
+ // two is not specialy used
+ // and for future auto boudinrect hotspot
+ hotspot_sync -> setVisible(false);
connect(sb_width, SIGNAL(valueChanged(int)), this, SLOT(updateHotspotLimits()));
connect(sb_height, SIGNAL(valueChanged(int)), this, SLOT(updateHotspotLimits()));
Modified: branches/0.4/sources/qet.h
===================================================================
--- branches/0.4/sources/qet.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/qet.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -26,7 +26,7 @@
/// QElectroTech version (as string, used to mark projects and elements XML documents)
const QString version = "0.3";
/// QElectroTech displayed version
- const QString displayedVersion = "0.3";
+ const QString displayedVersion = "0.3b";
QString license();
/// Orientation (used for electrical elements and their terminals)
enum Orientation {North, East, South, West};
Modified: branches/0.4/sources/qetproject.cpp
===================================================================
--- branches/0.4/sources/qetproject.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/qetproject.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -1146,7 +1146,8 @@
NamesList names;
const QChar russian_data[24] = { 0x0418, 0x043C, 0x043F, 0x043E, 0x0440, 0x0442, 0x0438, 0x0440, 0x043E, 0x0432, 0x0430, 0x043D, 0x043D, 0x044B, 0x0435, 0x0020, 0x044D, 0x043B, 0x0435, 0x043C, 0x0435, 0x043D, 0x0442, 0x044B };
-
+ const QChar greek_data[18] = { 0x0395, 0x03b9, 0x03c3, 0x03b7, 0x03b3, 0x03bc, 0x03ad, 0x03bd, 0x03b1, 0x0020, 0x03c3, 0x03c4, 0x03bf, 0x03b9, 0x03c7, 0x03b5, 0x03af, 0x03b1 };
+
names.addName("fr", "\311l\351ments import\351s");
names.addName("en", "Imported elements");
names.addName("es", "Elementos importados");
@@ -1154,6 +1155,7 @@
names.addName("cs", "Zaveden\351 prvky");
names.addName("pl", "Elementy importowane");
names.addName("it", "Elementi importati");
+ names.addName("el", QString(greek_data, 18));
return(names);
}
Modified: branches/0.4/sources/ui/numparteditorw.cpp
===================================================================
--- branches/0.4/sources/ui/numparteditorw.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/ui/numparteditorw.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -11,7 +11,7 @@
intValidator (new QIntValidator(0,99999,this))
{
ui -> setupUi(this);
- setType(NumPartEditorW::unit);
+ setType(NumPartEditorW::unit, true);
}
/**
@@ -26,13 +26,13 @@
ui -> setupUi(this);
//if @context contains nothing build with default value
- if(context.size()==0) setType(NumPartEditorW::unit);
+ if(context.size()==0) setType(NumPartEditorW::unit, true);
else {
QStringList strl = context.itemAt(i);
- if (strl.at(0)=="unit") setType(NumPartEditorW::unit);
- else if (strl.at(0)=="ten") setType(NumPartEditorW::ten);
- else if (strl.at(0)=="hundred") setType(NumPartEditorW::hundred);
+ if (strl.at(0)=="unit") setType(NumPartEditorW::unit, true);
+ else if (strl.at(0)=="ten") setType(NumPartEditorW::ten, true);
+ else if (strl.at(0)=="hundred") setType(NumPartEditorW::hundred, true);
else if (strl.at(0)=="string") setType(NumPartEditorW::string);
else if (strl.at(0)== "folio") setType(NumPartEditorW::folio);
ui -> value_field -> setText(strl.at(1));
@@ -55,16 +55,42 @@
*/
NumerotationContext NumPartEditorW::toNumContext() {
NumerotationContext nc;
+ QString type_str;
+ switch (type_) {
+ case unit:
+ type_str = "unit";
+ break;
+ case ten:
+ type_str = "ten";
+ break;
+ case hundred:
+ type_str = "hundred";
+ break;
+ case string:
+ type_str = "string";
+ break;
+ case folio:
+ type_str = "folio";
+ break;
+ }
nc.addValue(type_str, ui -> value_field -> displayText(), ui -> increase_spinBox -> value());
return nc;
}
/**
+ * @brief NumPartEditorW::isValid
+ * @return true if value field isn't empty or if type is folio
+ */
+bool NumPartEditorW::isValid() {
+ if (type_ != folio && ui -> value_field -> text().isEmpty()) return false;
+ return true;
+}
+
+/**
* @brief NumPartEditorW::on_type_combo_activated
* Action when user change the type comboBox
*/
void NumPartEditorW::on_type_combo_activated(int index) {
- emit changed();
switch (index) {
case unit:
setType(unit);
@@ -82,61 +108,55 @@
setType(folio);
break;
};
+ emit changed();
}
/**
* @brief NumPartEditorW::on_value_field_textChanged
* emit changed when @value_field text changed
*/
-void NumPartEditorW::on_value_field_textChanged() {
+void NumPartEditorW::on_value_field_textEdited() {
emit changed();
}
/**
* @brief NumPartEditorW::on_increase_spinBox_valueChanged
- *emit changed when @increase_spinBox value changed
+ * emit changed when @increase_spinBox value changed
*/
void NumPartEditorW::on_increase_spinBox_valueChanged() {
- emit changed();
+ if (!ui -> value_field -> text().isEmpty()) emit changed();
}
/**
* @brief NumPartEditorW::setType
* Set good behavior by type @t
+ * @param t, type used
+ * @param fnum, force the behavior of numeric type
*/
-void NumPartEditorW::setType(NumPartEditorW::type t) {
+void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
ui -> type_combo -> setCurrentIndex(t);
- ui -> value_field -> clear();
- ui -> increase_spinBox -> setValue(1);
- switch (t) {
- case unit:
- ui -> value_field -> setEnabled(true);
- ui ->value_field -> setValidator(intValidator);
- ui -> increase_spinBox -> setEnabled(true);
- type_str = "unit";
- break;
- case ten:
- ui -> value_field -> setEnabled(true);
- ui ->value_field -> setValidator(intValidator);
- ui -> increase_spinBox -> setEnabled(true);
- type_str = "ten";
- break;
- case hundred:
- ui -> value_field -> setEnabled(true);
- ui ->value_field -> setValidator(intValidator);
- ui -> increase_spinBox -> setEnabled(true);
- type_str = "hundred";
- break;
- case string:
+
+ //if @t is a numeric type and preview type @type_ isn't a numeric type
+ //or @fnum is true, we set numeric behavior
+ if ( ((t==unit || t==ten || t==hundred) && (type_==string || type_==folio)) || fnum) {
+ ui -> value_field -> clear();
+ ui -> value_field -> setEnabled(true);
+ ui -> value_field -> setValidator(intValidator);
+ ui -> increase_spinBox -> setEnabled(true);
+ ui -> increase_spinBox -> setValue(1);
+ }
+ //@t isn't a numeric type
+ else if (t==string || t==folio) {
+ ui -> value_field -> clear();
+ ui -> increase_spinBox -> setDisabled(true);
+ if (t==string) {
ui -> value_field -> setValidator(0);
ui -> value_field -> setEnabled(true);
- ui -> increase_spinBox -> setDisabled(true);
- type_str = "string";
- break;
- case folio:
+ }
+ else if (t==folio) {
ui -> value_field -> setDisabled(true);
ui -> increase_spinBox -> setDisabled(true);
- type_str = "folio";
- break;
- };
+ }
+ }
+ type_= t;
}
Modified: branches/0.4/sources/ui/numparteditorw.h
===================================================================
--- branches/0.4/sources/ui/numparteditorw.h 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/ui/numparteditorw.h 2013-07-25 09:21:46 UTC (rev 2394)
@@ -5,6 +5,11 @@
#include <QValidator>
#include "numerotationcontext.h"
+/**
+ *This class represent a single part num widget. By this widget, we can define and edit
+ *how the num auto must work .
+ *This widget is called by selectautonumw.
+ */
namespace Ui {
class NumPartEditorW;
}
@@ -21,12 +26,14 @@
enum type {unit,ten,hundred,string,folio};
NumerotationContext toNumContext();
+ bool isValid ();
+
private slots:
void on_type_combo_activated(int);
- void on_value_field_textChanged();
+ void on_value_field_textEdited();
void on_increase_spinBox_valueChanged();
- void setType (NumPartEditorW::type t);
+ void setType (NumPartEditorW::type t, bool=false);
signals:
void changed ();
@@ -34,7 +41,7 @@
private:
Ui::NumPartEditorW *ui;
QValidator *intValidator;
- QString type_str;
+ type type_;
};
Modified: branches/0.4/sources/ui/numparteditorw.ui
===================================================================
--- branches/0.4/sources/ui/numparteditorw.ui 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/ui/numparteditorw.ui 2013-07-25 09:21:46 UTC (rev 2394)
@@ -26,17 +26,17 @@
</property>
<item>
<property name="text">
- <string>Unité</string>
+ <string>Chiffre 1</string>
</property>
</item>
<item>
<property name="text">
- <string>Dizaine</string>
+ <string>Chiffre 01</string>
</property>
</item>
<item>
<property name="text">
- <string>Centaine</string>
+ <string>Chiffre 001</string>
</property>
</item>
<item>
Modified: branches/0.4/sources/ui/selectautonumw.cpp
===================================================================
--- branches/0.4/sources/ui/selectautonumw.cpp 2013-07-22 03:13:02 UTC (rev 2393)
+++ branches/0.4/sources/ui/selectautonumw.cpp 2013-07-25 09:21:46 UTC (rev 2394)
@@ -72,7 +72,7 @@
* Action on add_button, add a @NumPartEditor
*/
void SelectAutonumW::on_add_button_clicked() {
- applyEnable();
+ applyEnable(false);
NumPartEditorW *part = new NumPartEditorW(this);
connect (part, SIGNAL(changed()), this, SLOT(applyEnable()));
num_part_list_ << part;
@@ -84,13 +84,13 @@
* Action on remove button, remove the last @NumPartEditor
*/
void SelectAutonumW::on_remove_button_clicked() {
- applyEnable();
//remove if @num_part_list contains more than one item
if (num_part_list_.size() > 1) {
NumPartEditorW *part = num_part_list_.takeLast();
disconnect(part, SIGNAL(changed()), this, SLOT(applyEnable()));
delete part;
}
+ applyEnable();
}
/**
@@ -112,12 +112,32 @@
int answer = ui -> buttonBox -> buttonRole(button);
switch (answer) {
- //reset the displayed context to default context of @diagram_chooser.
+ //reset the displayed context to default context of @diagram_chooser.
case QDialogButtonBox::ResetRole:
on_diagram_chooser_activated();
applyEnable(false);
break;
- //apply the context in the diagram displayed by @diagram_chooser.
+ //help dialog
+ case QDialogButtonBox::HelpRole:
+ QMessageBox::information (this, tr("Autonum\351rotation", "title window"),
+ tr("C'est ici que vous pouvez d\351finir la mani\350re dont sera num\351rot\351 les nouveaux conducteurs.\n"
+ "-Chaque Folio poss\350de sa propre m\351thode de num\351rotation.\n"
+ "-Une num\351rotation est compos\351e d'une variable minimum.\n"
+ "-Vous pouvez ajouter ou supprimer une variable de num\351rotation par le biais des boutons - et +.\n"
+ "-Une variable de num\351rotation comprant: un type, une valeur et une incr\351mentation.\n"
+
+ "\n-les types \"Chiffre 1\", \"Chiffre 01\" et \"Chiffre 001\", repr\351sente un type num\351rique d\351finie dans le champs \"Valeur\", "
+ "qui s'incr\351mente \340 chaque nouveau conducteur de la valeur du champ \"Incr\351mentation\".\n"
+ "-\"Chiffre 01\" et \"Chiffre 001\", sont respectivement repr\351sent\351 sur le sch\351ma par deux et trois digits minimum.\n"
+ "Si le chiffre d\351finie dans le champs Valeur poss\351de moins de digits que le type choisit,"
+ "celui-ci sera pr\351c\351d\351 par un ou deux 0 afin de respecter son type.\n"
+
+ "\n-Le type \"Texte\", repr\351sente un texte fixe.\nLe champs \"Incr\351mentation\" n'est pas utilis\351.\n"
+
+ "\n-Le type \"N\260 folio\" repr\351sente le n\260 du folio en cours.\nLes autres champs ne sont pas utilis\351s.",
+ "help dialog about the autonumerotation"));
+
+ //apply the context in the diagram displayed by @diagram_chooser.
case QDialogButtonBox::ApplyRole:
NumerotationContext nc = toNumContext();
diagram_list.at(ui -> diagram_chooser -> currentIndex()) -> setNumerotation(Diagram::Conductors, nc);
@@ -131,5 +151,11 @@
* enable/disable the apply button
*/
void SelectAutonumW::applyEnable(bool b) {
- ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(b);
+ if (b){
+ bool valid= true;
+ foreach (NumPartEditorW *npe, num_part_list_) if (!npe -> isValid()) valid= false;
+ ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(valid);
+ }
+ else
+ ui -> buttonBox -> button(QDialogButtonBox::Apply) -> setEnabled(b);
}