mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-19 14:50:53 +01:00
Merge Qt5 branch sources folder to trunk
-Cette ligne, et les suivantes ci-dessous, seront ignorées-- M sources/aboutqet.cpp M sources/bordertitleblock.cpp M sources/conductorproperties.h M sources/configdialog.cpp M sources/configpages.cpp M sources/configpages.h M sources/createdxf.h M sources/diagram.cpp M sources/diagram.h M sources/diagramcommands.cpp M sources/diagramcommands.h M sources/diagramprintdialog.cpp M sources/diagramprintdialog.h M sources/diagramschooser.cpp M sources/diagramschooser.h M sources/diagramview.cpp M sources/diagramview.h M sources/dvevent/dveventaddimage.cpp M sources/dvevent/dveventaddshape.cpp M sources/editor/arceditor.cpp M sources/editor/arceditor.h M sources/editor/editorcommands.cpp M sources/editor/editorcommands.h M sources/editor/elementitemeditor.h M sources/editor/elementprimitivedecorator.cpp M sources/editor/elementscene.cpp M sources/editor/elementscene.h M sources/editor/elementview.cpp M sources/editor/ellipseeditor.cpp M sources/editor/ellipseeditor.h M sources/editor/esevent/eseventaddtext.cpp M sources/editor/esevent/eseventaddtextfield.cpp M sources/editor/esevent/eseventinterface.cpp M sources/editor/graphicspart/customelementpart.h M sources/editor/graphicspart/parttext.cpp M sources/editor/graphicspart/parttext.h M sources/editor/graphicspart/parttextfield.cpp M sources/editor/graphicspart/parttextfield.h M sources/editor/lineeditor.cpp M sources/editor/lineeditor.h M sources/editor/polygoneditor.cpp M sources/editor/qetelementeditor.cpp M sources/editor/qetelementeditor.h M sources/editor/rectangleeditor.cpp M sources/editor/rectangleeditor.h M sources/editor/styleeditor.cpp M sources/editor/styleeditor.h M sources/editor/terminaleditor.cpp M sources/editor/terminaleditor.h M sources/editor/texteditor.cpp M sources/editor/texteditor.h M sources/editor/textfieldeditor.cpp M sources/editor/textfieldeditor.h M sources/editor/ui/elementpropertieseditorwidget.cpp M sources/elementdefinition.cpp M sources/elementdeleter.cpp M sources/elementdeleter.h M sources/elementdialog.cpp M sources/elementscategorieslist.h M sources/elementscategorieswidget.cpp M sources/elementscategorieswidget.h M sources/elementscategory.cpp M sources/elementscategorydeleter.cpp M sources/elementscategorydeleter.h M sources/elementscategoryeditor.cpp M sources/elementscategoryeditor.h M sources/elementscollection.cpp M sources/elementscollectioncache.cpp M sources/elementspanel.cpp M sources/elementspanel.h M sources/elementspanelwidget.cpp M sources/elementspanelwidget.h M sources/elementtextsmover.h M sources/exportdialog.cpp M sources/exportdialog.h M sources/exportproperties.cpp M sources/exportpropertieswidget.cpp M sources/exportpropertieswidget.h M sources/genericpanel.cpp M sources/integrationmoveelementshandler.cpp M sources/integrationmoveelementshandler.h M sources/interactivemoveelementshandler.cpp M sources/nameslistwidget.cpp M sources/nameslistwidget.h M sources/newelementwizard.cpp M sources/newelementwizard.h M sources/nomenclature.cpp M sources/nomenclature.h M sources/projectconfigpages.cpp M sources/projectview.cpp M sources/projectview.h M sources/qet.cpp M sources/qetapp.cpp M sources/qetapp.h M sources/qetdiagrameditor.cpp M sources/qetdiagrameditor.h M sources/qetgraphicsitem/conductor.cpp M sources/qetgraphicsitem/conductortextitem.cpp M sources/qetgraphicsitem/customelement.cpp M sources/qetgraphicsitem/diagramimageitem.cpp M sources/qetgraphicsitem/diagramtextitem.cpp M sources/qetgraphicsitem/diagramtextitem.h M sources/qetgraphicsitem/element.cpp M sources/qetgraphicsitem/ghostelement.cpp M sources/qetgraphicsitem/qetshapeitem.cpp M sources/qetgraphicsitem/terminal.cpp M sources/qetgraphicsitem/terminal.h M sources/qeticons.cpp M sources/qeticons.h M sources/qetmainwindow.cpp M sources/qetmessagebox.cpp M sources/qetmessagebox.h M sources/qetprintpreviewdialog.cpp M sources/qetprintpreviewdialog.h M sources/qetproject.cpp M sources/qetsingleapplication.cpp M sources/qettabbar.h M sources/qfilenameedit.cpp M sources/qtextorientationspinboxwidget.cpp M sources/qtextorientationspinboxwidget.h M sources/qtextorientationwidget.cpp M sources/qtextorientationwidget.h M sources/richtext/richtexteditor.cpp M sources/richtext/richtexteditor_p.h M sources/richtext/ui_addlinkdialog.h M sources/titleblock/dimensionwidget.h M sources/titleblock/gridlayoutanimation.h M sources/titleblock/helpercell.h M sources/titleblock/integrationmovetemplateshandler.cpp M sources/titleblock/integrationmovetemplateshandler.h M sources/titleblock/qettemplateeditor.cpp M sources/titleblock/qettemplateeditor.h M sources/titleblock/templatecellsset.h M sources/titleblock/templatecellwidget.cpp M sources/titleblock/templatecellwidget.h M sources/titleblock/templatecommands.cpp M sources/titleblock/templatedeleter.cpp M sources/titleblock/templatedeleter.h M sources/titleblock/templatelocationchooser.cpp M sources/titleblock/templatelocationchooser.h M sources/titleblock/templatelocationsaver.cpp M sources/titleblock/templatelocationsaver.h M sources/titleblock/templatelogomanager.cpp M sources/titleblock/templatelogomanager.h M sources/titleblock/templateview.cpp M sources/titleblock/templatevisualcell.h M sources/titleblockcell.cpp M sources/titleblocktemplate.cpp M sources/treecoloranimation.h M sources/ui/conductorpropertieswidget.cpp M sources/ui/diagrampropertiesdialog.cpp M sources/ui/diagramselection.cpp M sources/ui/dialogautonum.cpp M sources/ui/dialogwaiting.cpp M sources/ui/elementpropertieswidget.cpp M sources/ui/elementselectorwidget.cpp M sources/ui/linksingleelementwidget.cpp M sources/ui/masterpropertieswidget.cpp M sources/ui/potentialtextsdialog.cpp M sources/ui/projectpropertiesdialog.cpp M sources/ui/selectautonumw.cpp M sources/ui/titleblockpropertieswidget.cpp M sources/ui/xrefpropertieswidget.cpp M sources/undocommand/changeelementinformationcommand.cpp git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3783 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
@@ -234,7 +234,7 @@ int ProjectView::tryClosingDiagrams() {
|
||||
if (title.isEmpty()) title = "QElectroTech ";
|
||||
|
||||
int close_dialog = QMessageBox::question(this, title,
|
||||
tr("Le projet \340 \351t\351 modifi\351.\n"
|
||||
tr("Le projet à été modifié.\n"
|
||||
"Voulez-vous enregistrer les modifications ?"),
|
||||
QMessageBox::Save | QMessageBox::Discard
|
||||
| QMessageBox::Cancel,
|
||||
@@ -260,7 +260,7 @@ QString ProjectView::askUserForFilePath(bool assign) {
|
||||
this,
|
||||
tr("Enregistrer sous", "dialog title"),
|
||||
project_ -> currentDir(),
|
||||
tr("Sch\351ma QElectroTech (*.qet)", "filetypes allowed when saving a diagram file")
|
||||
tr("Schéma QElectroTech (*.qet)", "filetypes allowed when saving a diagram file")
|
||||
);
|
||||
|
||||
// if no filepath is provided, return an empty string
|
||||
@@ -282,7 +282,7 @@ QString ProjectView::askUserForFilePath(bool assign) {
|
||||
view is not associated to any project.
|
||||
*/
|
||||
QETResult ProjectView::noProjectResult() const {
|
||||
QETResult no_project(tr("aucun projet affich\351", "error message"), false);
|
||||
QETResult no_project(tr("aucun projet affiché", "error message"), false);
|
||||
return(no_project);
|
||||
}
|
||||
|
||||
@@ -366,10 +366,10 @@ void ProjectView::removeDiagram(DiagramView *diagram_view) {
|
||||
|
||||
|
||||
//Ask confirmation to user.
|
||||
int answer = QET::MessageBox::question(
|
||||
int answer = QET::QetMessageBox::question(
|
||||
this,
|
||||
tr("Supprimer le sch\351ma ?", "message box title"),
|
||||
tr("\312tes-vous s\373r de vouloir supprimer ce sch\351ma du projet ? Ce changement est irr\351versible.", "message box content"),
|
||||
tr("Supprimer le schéma ?", "message box title"),
|
||||
tr("Êtes-vous s\373r de vouloir supprimer ce schéma du projet ? Ce changement est irréversible.", "message box content"),
|
||||
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel,
|
||||
QMessageBox::No
|
||||
);
|
||||
@@ -581,7 +581,7 @@ void ProjectView::exportProject() {
|
||||
if (!project_) return;
|
||||
|
||||
ExportDialog ed(project_, parentWidget());
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_OS_MAC
|
||||
ed.setWindowFlags(Qt::Sheet);
|
||||
#endif
|
||||
ed.exec();
|
||||
@@ -668,7 +668,7 @@ int ProjectView::cleanProject() {
|
||||
|
||||
// s'assure que le schema n'est pas en lecture seule
|
||||
if (project_ -> isReadOnly()) {
|
||||
QET::MessageBox::critical(
|
||||
QET::QetMessageBox::critical(
|
||||
this,
|
||||
tr("Projet en lecture seule", "message box title"),
|
||||
tr("Ce projet est en lecture seule. Il n'est donc pas possible de le nettoyer.", "message box content")
|
||||
@@ -677,9 +677,9 @@ int ProjectView::cleanProject() {
|
||||
}
|
||||
|
||||
// construit un petit dialogue pour parametrer le nettoyage
|
||||
QCheckBox *clean_tbt = new QCheckBox(tr("Supprimer les mod\350les de cartouche inutilis\351s dans le projet"));
|
||||
QCheckBox *clean_elements = new QCheckBox(tr("Supprimer les \351l\351ments inutilis\351s dans le projet"));
|
||||
QCheckBox *clean_categories = new QCheckBox(tr("Supprimer les cat\351gories vides"));
|
||||
QCheckBox *clean_tbt = new QCheckBox(tr("Supprimer les modèles de cartouche inutilisés dans le projet"));
|
||||
QCheckBox *clean_elements = new QCheckBox(tr("Supprimer les éléments inutilisés dans le projet"));
|
||||
QCheckBox *clean_categories = new QCheckBox(tr("Supprimer les catégories vides"));
|
||||
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
|
||||
clean_tbt -> setChecked(true);
|
||||
@@ -687,7 +687,7 @@ int ProjectView::cleanProject() {
|
||||
clean_categories -> setChecked(true);
|
||||
|
||||
QDialog clean_dialog(parentWidget());
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_OS_MAC
|
||||
clean_dialog.setWindowFlags(Qt::Sheet);
|
||||
#endif
|
||||
|
||||
@@ -727,7 +727,7 @@ int ProjectView::cleanProject() {
|
||||
Initialize actions for this widget.
|
||||
*/
|
||||
void ProjectView::initActions() {
|
||||
add_new_diagram_ = new QAction(QET::Icons::Add, tr("Ajouter un sch\351ma"), this);
|
||||
add_new_diagram_ = new QAction(QET::Icons::Add, tr("Ajouter un schéma"), this);
|
||||
connect(add_new_diagram_, SIGNAL(triggered()), this, SLOT(addNewDiagram()));
|
||||
}
|
||||
|
||||
@@ -742,7 +742,7 @@ void ProjectView::initWidgets() {
|
||||
fallback_widget_ = new QWidget();
|
||||
fallback_label_ = new QLabel(
|
||||
tr(
|
||||
"Ce projet ne contient aucun sch\351ma",
|
||||
"Ce projet ne contient aucun schéma",
|
||||
"label displayed when a project contains no diagram"
|
||||
)
|
||||
);
|
||||
@@ -775,7 +775,7 @@ void ProjectView::initLayout() {
|
||||
fallback_widget_layout_ -> addWidget(fallback_label_);
|
||||
|
||||
layout_ = new QVBoxLayout(this);
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_OS_MAC
|
||||
layout_ -> setContentsMargins(0, 8, 0, 0);
|
||||
#else
|
||||
layout_ -> setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
Reference in New Issue
Block a user