mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-20 16:20:52 +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
@@ -21,6 +21,9 @@
|
||||
#include "exportpropertieswidget.h"
|
||||
#include "qeticons.h"
|
||||
|
||||
#include <QPrintPreviewWidget>
|
||||
#include <QPageSetupDialog>
|
||||
|
||||
/**
|
||||
Constructeur
|
||||
@param project Projet a imprimer
|
||||
@@ -33,7 +36,7 @@ QETPrintPreviewDialog::QETPrintPreviewDialog(QETProject *project, QPrinter *prin
|
||||
project_(project),
|
||||
printer_(printer)
|
||||
{
|
||||
setWindowTitle(tr("QElectroTech : Aper\347u avant impression"));
|
||||
setWindowTitle(tr("QElectroTech : Aperçu avant impression"));
|
||||
build();
|
||||
|
||||
connect(preview_, SIGNAL(paintRequested(QPrinter *)), this, SLOT(requestPaint(QPrinter *)));
|
||||
@@ -90,14 +93,14 @@ void QETPrintPreviewDialog::previousPage() {
|
||||
*/
|
||||
void QETPrintPreviewDialog::nextPage() {
|
||||
int preview_next_page = preview_ -> currentPage() + 1;
|
||||
preview_ -> setCurrentPage(qMin(preview_next_page, preview_ -> numPages()));
|
||||
preview_ -> setCurrentPage(qMin(preview_next_page, preview_ -> pageCount()));
|
||||
}
|
||||
|
||||
/**
|
||||
Passe a la derniere page
|
||||
*/
|
||||
void QETPrintPreviewDialog::lastPage() {
|
||||
preview_ -> setCurrentPage(preview_ -> numPages());
|
||||
preview_ -> setCurrentPage(preview_ -> pageCount());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -166,26 +169,26 @@ void QETPrintPreviewDialog::selectNoDiagram() {
|
||||
*/
|
||||
void QETPrintPreviewDialog::build() {
|
||||
preview_ = new QPrintPreviewWidget(printer_);
|
||||
diagrams_label_ = new QLabel(tr("Sch\351mas \340 imprimer\240:"));
|
||||
diagrams_label_ = new QLabel(tr("Schémas à imprimer :"));
|
||||
diagrams_list_ = new DiagramsChooser(project_);
|
||||
diagrams_select_all_ = new QPushButton(tr("Tout cocher"));
|
||||
diagrams_select_none_ = new QPushButton(tr("Tout d\351cocher"));
|
||||
toggle_diagrams_list_ = new QAction(QET::Icons::Diagram, tr("Cacher la liste des sch\351mas"), this);
|
||||
diagrams_select_none_ = new QPushButton(tr("Tout décocher"));
|
||||
toggle_diagrams_list_ = new QAction(QET::Icons::Diagram, tr("Cacher la liste des schémas"), this);
|
||||
toggle_print_options_ = new QAction(QET::Icons::Configure, tr("Cacher les options d'impression"), this);
|
||||
adjust_width_ = new QAction(QET::Icons::ViewFitWidth, tr("Ajuster la largeur"), this);
|
||||
adjust_page_ = new QAction(QET::Icons::ViewFitWindow, tr("Ajuster la page"), this);
|
||||
zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this);
|
||||
zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arrière"), this);
|
||||
zoom_box_ = new QComboBox(this);
|
||||
zoom_in_ = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this);
|
||||
landscape_ = new QAction(QET::Icons::PrintLandscape, tr("Paysage"), this);
|
||||
portrait_ = new QAction(QET::Icons::PrintPortrait, tr("Portrait"), this);
|
||||
first_page_ = new QAction(QET::Icons::ArrowLeftDouble, tr("Premi\350re page"), this);
|
||||
previous_page_ = new QAction(QET::Icons::ArrowLeft, tr("Page pr\351c\351dente"), this);
|
||||
first_page_ = new QAction(QET::Icons::ArrowLeftDouble, tr("Première page"), this);
|
||||
previous_page_ = new QAction(QET::Icons::ArrowLeft, tr("Page précédente"), this);
|
||||
next_page_ = new QAction(QET::Icons::ArrowRight, tr("Page suivante"), this);
|
||||
last_page_ = new QAction(QET::Icons::ArrowRightDouble, tr("Derni\350re page"), this);
|
||||
last_page_ = new QAction(QET::Icons::ArrowRightDouble, tr("Dernière page"), this);
|
||||
single_page_view_ = new QAction(QET::Icons::SinglePage, tr("Afficher une seule page"), this);
|
||||
facing_pages_view_ = new QAction(QET::Icons::PrintTwoPages, tr("Afficher deux pages"), this);
|
||||
all_pages_view_ = new QAction(QET::Icons::PrintAllPages, tr("Afficher un aper\347u de toutes les pages"), this);
|
||||
all_pages_view_ = new QAction(QET::Icons::PrintAllPages, tr("Afficher un aperçu de toutes les pages"), this);
|
||||
page_setup_ = new QAction(QET::Icons::DocumentPrintFrame, tr("Mise en page"), this);
|
||||
|
||||
toggle_diagrams_list_ -> setCheckable(true);
|
||||
@@ -235,16 +238,16 @@ void QETPrintPreviewDialog::build() {
|
||||
use_full_page_ = new QCheckBox(tr("Utiliser toute la feuille"));
|
||||
use_full_page_ -> setChecked(printer_ -> fullPage());
|
||||
use_full_page_label_ = new QLabel(tr(
|
||||
"Si cette option est coch\351e, les marges de la feuille seront "
|
||||
"ignor\351es et toute sa surface sera utilis\351e pour l'impression. "
|
||||
"Cela peut ne pas \352tre support\351 par votre imprimante."
|
||||
"Si cette option est cochée, les marges de la feuille seront "
|
||||
"ignorées et toute sa surface sera utilisée pour l'impression. "
|
||||
"Cela peut ne pas être supporté par votre imprimante."
|
||||
));
|
||||
use_full_page_label_ -> setWordWrap(true);
|
||||
use_full_page_label_ -> setContentsMargins(20, 0, 0, 0);
|
||||
fit_diagram_to_page_ = new QCheckBox(tr("Adapter le sch\351ma \340 la page"));
|
||||
fit_diagram_to_page_ = new QCheckBox(tr("Adapter le schéma à la page"));
|
||||
fit_diagram_to_page_label_ = new QLabel(tr(
|
||||
"Si cette option est coch\351e, le sch\351ma sera agrandi ou "
|
||||
"r\351tr\351ci de fa\347on \340 remplir toute la surface imprimable "
|
||||
"Si cette option est cochée, le schéma sera agrandi ou "
|
||||
"rétréci de façon à remplir toute la surface imprimable "
|
||||
"d'une et une seule page."
|
||||
));
|
||||
fit_diagram_to_page_label_ -> setWordWrap(true);
|
||||
@@ -360,9 +363,9 @@ void QETPrintPreviewDialog::setDiagramsListVisible(bool display) {
|
||||
diagrams_select_none_ -> setVisible(display);
|
||||
|
||||
if (display) {
|
||||
toggle_diagrams_list_ -> setText(tr("Cacher la liste des sch\351mas"));
|
||||
toggle_diagrams_list_ -> setText(tr("Cacher la liste des schémas"));
|
||||
} else {
|
||||
toggle_diagrams_list_ -> setText(tr("Afficher la liste des sch\351mas"));
|
||||
toggle_diagrams_list_ -> setText(tr("Afficher la liste des schémas"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user