| [qet] [840] Rapatriement dans la branche 0.3 des revisions 833 a 839. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 840
Author: xavier
Date: 2010-01-10 21:22:52 +0100 (Sun, 10 Jan 2010)
Log Message:
-----------
Rapatriement dans la branche 0.3 des revisions 833 a 839.
Modified Paths:
--------------
branches/0.3/sources/borderinset.cpp
branches/0.3/sources/diagram.cpp
branches/0.3/sources/diagramprintdialog.cpp
branches/0.3/sources/diagramschooser.cpp
branches/0.3/sources/diagramschooser.h
branches/0.3/sources/qetprintpreviewdialog.cpp
branches/0.3/sources/qetprintpreviewdialog.h
Property Changed:
----------------
branches/0.3/sources/
branches/0.3/sources/aboutqet.cpp
branches/0.3/sources/aboutqet.h
branches/0.3/sources/borderinset.cpp
branches/0.3/sources/borderinset.h
branches/0.3/sources/conductor.cpp
branches/0.3/sources/conductor.h
branches/0.3/sources/conductorprofile.cpp
branches/0.3/sources/conductorprofile.h
branches/0.3/sources/conductorproperties.cpp
branches/0.3/sources/conductorproperties.h
branches/0.3/sources/conductorpropertieswidget.cpp
branches/0.3/sources/conductorpropertieswidget.h
branches/0.3/sources/conductorsegment.cpp
branches/0.3/sources/conductorsegment.h
branches/0.3/sources/conductorsegmentprofile.h
branches/0.3/sources/configdialog.cpp
branches/0.3/sources/configdialog.h
branches/0.3/sources/configpages.cpp
branches/0.3/sources/configpages.h
branches/0.3/sources/customelement.cpp
branches/0.3/sources/customelement.h
branches/0.3/sources/diagram.cpp
branches/0.3/sources/diagram.h
branches/0.3/sources/diagramcommands.cpp
branches/0.3/sources/diagramcommands.h
branches/0.3/sources/diagramcontent.cpp
branches/0.3/sources/diagramcontent.h
branches/0.3/sources/diagramprintdialog.cpp
branches/0.3/sources/diagramprintdialog.h
branches/0.3/sources/diagramtextitem.cpp
branches/0.3/sources/diagramtextitem.h
branches/0.3/sources/diagramview.cpp
branches/0.3/sources/diagramview.h
branches/0.3/sources/element.cpp
branches/0.3/sources/element.h
branches/0.3/sources/elementdefinition.cpp
branches/0.3/sources/elementdefinition.h
branches/0.3/sources/elementdeleter.cpp
branches/0.3/sources/elementdeleter.h
branches/0.3/sources/elementdialog.cpp
branches/0.3/sources/elementdialog.h
branches/0.3/sources/elementscategorieslist.cpp
branches/0.3/sources/elementscategorieslist.h
branches/0.3/sources/elementscategorieswidget.cpp
branches/0.3/sources/elementscategorieswidget.h
branches/0.3/sources/elementscategory.cpp
branches/0.3/sources/elementscategory.h
branches/0.3/sources/elementscategorydeleter.cpp
branches/0.3/sources/elementscategorydeleter.h
branches/0.3/sources/elementscategoryeditor.cpp
branches/0.3/sources/elementscategoryeditor.h
branches/0.3/sources/elementscollection.cpp
branches/0.3/sources/elementscollection.h
branches/0.3/sources/elementscollectionitem.h
branches/0.3/sources/elementslocation.cpp
branches/0.3/sources/elementslocation.h
branches/0.3/sources/elementspanel.cpp
branches/0.3/sources/elementspanel.h
branches/0.3/sources/elementspanelwidget.cpp
branches/0.3/sources/elementspanelwidget.h
branches/0.3/sources/elementtextitem.cpp
branches/0.3/sources/elementtextitem.h
branches/0.3/sources/exportdialog.cpp
branches/0.3/sources/exportdialog.h
branches/0.3/sources/fileelementdefinition.cpp
branches/0.3/sources/fileelementdefinition.h
branches/0.3/sources/fileelementscategory.cpp
branches/0.3/sources/fileelementscategory.h
branches/0.3/sources/fileelementscollection.cpp
branches/0.3/sources/fileelementscollection.h
branches/0.3/sources/fixedelement.cpp
branches/0.3/sources/fixedelement.h
branches/0.3/sources/hotspoteditor.cpp
branches/0.3/sources/hotspoteditor.h
branches/0.3/sources/insetproperties.cpp
branches/0.3/sources/insetproperties.h
branches/0.3/sources/insetpropertieswidget.cpp
branches/0.3/sources/insetpropertieswidget.h
branches/0.3/sources/main.cpp
branches/0.3/sources/nameslist.cpp
branches/0.3/sources/nameslist.h
branches/0.3/sources/nameslistwidget.cpp
branches/0.3/sources/nameslistwidget.h
branches/0.3/sources/newelementwizard.cpp
branches/0.3/sources/newelementwizard.h
branches/0.3/sources/orientationset.cpp
branches/0.3/sources/orientationset.h
branches/0.3/sources/orientationsetwidget.cpp
branches/0.3/sources/orientationsetwidget.h
branches/0.3/sources/projectview.cpp
branches/0.3/sources/projectview.h
branches/0.3/sources/qet.cpp
branches/0.3/sources/qet.h
branches/0.3/sources/qetapp.cpp
branches/0.3/sources/qetapp.h
branches/0.3/sources/qetarguments.cpp
branches/0.3/sources/qetarguments.h
branches/0.3/sources/qetdiagrameditor.cpp
branches/0.3/sources/qetdiagrameditor.h
branches/0.3/sources/qetproject.cpp
branches/0.3/sources/qetproject.h
branches/0.3/sources/qetsingleapplication.cpp
branches/0.3/sources/qetsingleapplication.h
branches/0.3/sources/qettabbar.cpp
branches/0.3/sources/qettabbar.h
branches/0.3/sources/qettabwidget.cpp
branches/0.3/sources/qettabwidget.h
branches/0.3/sources/qgimanager.cpp
branches/0.3/sources/qgimanager.h
branches/0.3/sources/recentfiles.cpp
branches/0.3/sources/recentfiles.h
branches/0.3/sources/terminal.cpp
branches/0.3/sources/terminal.h
branches/0.3/sources/xmlelementdefinition.cpp
branches/0.3/sources/xmlelementdefinition.h
branches/0.3/sources/xmlelementscategory.cpp
branches/0.3/sources/xmlelementscategory.h
branches/0.3/sources/xmlelementscollection.cpp
branches/0.3/sources/xmlelementscollection.h
Property changes on: branches/0.3/sources
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/sources:833-839
Property changes on: branches/0.3/sources/aboutqet.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/aboutqet.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/0.3/sources/borderinset.cpp
===================================================================
--- branches/0.3/sources/borderinset.cpp 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/borderinset.cpp 2010-01-10 20:22:52 UTC (rev 840)
@@ -268,7 +268,7 @@
qp -> drawText(inset_date, Qt::AlignVCenter | Qt::AlignLeft, QString(tr(" Date : %1", "inset content")).arg(bi_date.toString("dd/MM/yyyy")));
qp -> drawRect(inset_title);
- qp -> drawText(inset_title, Qt::AlignVCenter | Qt::AlignCenter, QString(tr("Titre du document : %1", "inset content")).arg(bi_title));
+ qp -> drawText(inset_title, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(bi_title));
qp -> drawRect(inset_file);
qp -> drawText(inset_file, Qt::AlignVCenter | Qt::AlignLeft, QString(tr(" Fichier : %1", "inset content")).arg(bi_filename));
Property changes on: branches/0.3/sources/borderinset.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/borderinset.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductor.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductor.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorprofile.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorprofile.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorproperties.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorproperties.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorpropertieswidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorpropertieswidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorsegment.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorsegment.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/conductorsegmentprofile.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/configdialog.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/configdialog.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/configpages.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/configpages.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/customelement.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/customelement.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/0.3/sources/diagram.cpp
===================================================================
--- branches/0.3/sources/diagram.cpp 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/diagram.cpp 2010-01-10 20:22:52 UTC (rev 840)
@@ -111,11 +111,13 @@
int g_y = (int)ceil(r.y());
while (g_y % yGrid) ++ g_y;
+ QPolygon points;
for (int gx = g_x ; gx < limite_x ; gx += xGrid) {
for (int gy = g_y ; gy < limite_y ; gy += yGrid) {
- p -> drawPoint(gx, gy);
+ points << QPoint(gx, gy);
}
}
+ p -> drawPoints(points);
}
if (use_border) border_and_inset.draw(p, margin, margin);
Property changes on: branches/0.3/sources/diagram.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagram.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramcommands.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramcommands.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramcontent.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramcontent.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/0.3/sources/diagramprintdialog.cpp
===================================================================
--- branches/0.3/sources/diagramprintdialog.cpp 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/diagramprintdialog.cpp 2010-01-10 20:22:52 UTC (rev 840)
@@ -121,7 +121,12 @@
}
// Apercu avant impression
+#if defined Q_WS_X11
+ // suite a quelques soucis avec xfwm, on se contente d'une fenetre sous X11
+ QETPrintPreviewDialog preview_dialog(project_, printer_, parentWidget(), Qt::Window);
+#else
QETPrintPreviewDialog preview_dialog(project_, printer_, parentWidget());
+#endif
connect(
&preview_dialog,
SIGNAL(paintRequested(const QList<Diagram *> &, bool, const ExportProperties, QPrinter *)),
Property changes on: branches/0.3/sources/diagramprintdialog.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramprintdialog.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/0.3/sources/diagramschooser.cpp
===================================================================
--- branches/0.3/sources/diagramschooser.cpp 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/diagramschooser.cpp 2010-01-10 20:22:52 UTC (rev 840)
@@ -25,15 +25,23 @@
@param parent QWidget parent de ce widget
*/
DiagramsChooser::DiagramsChooser(QETProject *project, QWidget *parent) :
- QFrame(parent),
+ QScrollArea(parent),
project_(project),
+ widget0_(0),
vlayout0_(0)
{
setFrameShadow(QFrame::Sunken);
setFrameShape(QFrame::StyledPanel);
setLineWidth(3);
setMidLineWidth(3);
+
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
+
updateList();
+
+ setWidget(widget0_);
}
/**
@@ -163,7 +171,6 @@
diagrams_.insert(diagram, checkbox);
vlayout0_ -> addWidget(checkbox, 0, Qt::AlignLeft | Qt::AlignTop);
}
- vlayout0_ -> addStretch();
}
/**
@@ -172,5 +179,9 @@
void DiagramsChooser::buildLayout() {
if (vlayout0_) return;
vlayout0_ = new QVBoxLayout();
- setLayout(vlayout0_);
+ widget0_ = new QWidget();
+ widget0_ -> setLayout(vlayout0_);
+ widget0_ -> setMinimumSize(170, 0);
+ widget0_ -> setMaximumSize(470, 10000);
+ widget0_ -> setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
}
Modified: branches/0.3/sources/diagramschooser.h
===================================================================
--- branches/0.3/sources/diagramschooser.h 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/diagramschooser.h 2010-01-10 20:22:52 UTC (rev 840)
@@ -24,7 +24,7 @@
Cette classe represente un widget permettant de choisir 0 a n schemas parmi
ceux d'un projet.
*/
-class DiagramsChooser : public QFrame {
+class DiagramsChooser : public QScrollArea {
Q_OBJECT
// constructeurs, destructeur
@@ -55,6 +55,7 @@
// attributs
private:
QETProject *project_;
+ QWidget *widget0_;
QVBoxLayout *vlayout0_;
QHash<Diagram *, QCheckBox *> diagrams_;
};
Property changes on: branches/0.3/sources/diagramtextitem.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramtextitem.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramview.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/diagramview.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/element.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/element.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdefinition.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdefinition.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdeleter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdeleter.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdialog.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementdialog.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorieslist.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorieslist.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorieswidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorieswidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategory.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategory.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorydeleter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategorydeleter.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategoryeditor.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscategoryeditor.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscollection.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscollection.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementscollectionitem.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementslocation.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementslocation.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementspanel.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementspanel.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementspanelwidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementspanelwidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementtextitem.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/elementtextitem.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/exportdialog.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/exportdialog.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementdefinition.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementdefinition.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementscategory.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementscategory.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementscollection.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fileelementscollection.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fixedelement.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/fixedelement.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/hotspoteditor.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/hotspoteditor.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/insetproperties.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/insetproperties.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/insetpropertieswidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/insetpropertieswidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/main.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/nameslist.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/nameslist.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/nameslistwidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/nameslistwidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/newelementwizard.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/newelementwizard.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/orientationset.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/orientationset.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/orientationsetwidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/orientationsetwidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/projectview.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/projectview.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qet.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qet.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetapp.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetapp.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetarguments.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetarguments.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetdiagrameditor.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetdiagrameditor.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/0.3/sources/qetprintpreviewdialog.cpp
===================================================================
--- branches/0.3/sources/qetprintpreviewdialog.cpp 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/qetprintpreviewdialog.cpp 2010-01-10 20:22:52 UTC (rev 840)
@@ -41,7 +41,7 @@
connect(diagrams_list_, SIGNAL(selectionChanged()), preview_, SLOT(updatePreview()));
connect(diagrams_list_, SIGNAL(selectionChanged()), this, SLOT(checkDiagramsCount()));
- setWindowState(Qt::WindowMaximized);
+ setWindowState(windowState() | Qt::WindowMaximized);
}
/**
@@ -149,12 +149,28 @@
}
/**
+ Selectionne tous les schemas
+*/
+void QETPrintPreviewDialog::selectAllDiagrams() {
+ diagrams_list_ -> setSelectedAllDiagrams(true);
+}
+
+/**
+ Deselectionne tous les schemas
+*/
+void QETPrintPreviewDialog::selectNoDiagram() {
+ diagrams_list_ -> setSelectedAllDiagrams(false);
+}
+
+/**
Met en place le dialogue
*/
void QETPrintPreviewDialog::build() {
preview_ = new QPrintPreviewWidget(printer_);
diagrams_label_ = new QLabel(tr("Sch\351mas \340 imprimer\240:"));
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);
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);
@@ -245,6 +261,8 @@
buttons_ -> addButton(new QPushButton(QET::Icons::DocumentPrint, tr("Imprimer")), QDialogButtonBox::AcceptRole);
buttons_ -> addButton(QDialogButtonBox::Cancel);
+ connect(diagrams_select_all_, SIGNAL(released()), this, SLOT(selectAllDiagrams()));
+ connect(diagrams_select_none_, SIGNAL(released()), this, SLOT(selectNoDiagram()));
connect(toggle_diagrams_list_, SIGNAL(toggled(bool)), this, SLOT(setDiagramsListVisible(bool)));
connect(toggle_print_options_, SIGNAL(toggled(bool)), this, SLOT(setPrintOptionsVisible(bool)));
connect(adjust_width_, SIGNAL(triggered()), preview_, SLOT(fitToWidth()));
@@ -286,6 +304,8 @@
vlayout2_ -> addWidget(diagrams_label_);
vlayout2_ -> addWidget(diagrams_list_);
+ vlayout2_ -> addWidget(diagrams_select_all_);
+ vlayout2_ -> addWidget(diagrams_select_none_);
hlayout0_ -> addLayout(vlayout2_);
hlayout0_ -> addWidget(preview_);
Modified: branches/0.3/sources/qetprintpreviewdialog.h
===================================================================
--- branches/0.3/sources/qetprintpreviewdialog.h 2010-01-10 20:11:04 UTC (rev 839)
+++ branches/0.3/sources/qetprintpreviewdialog.h 2010-01-10 20:22:52 UTC (rev 840)
@@ -57,6 +57,8 @@
void fitDiagramToPage(bool);
void zoomIn();
void zoomOut();
+ void selectAllDiagrams();
+ void selectNoDiagram();
// attributs
private:
@@ -70,6 +72,8 @@
QPrintPreviewWidget *preview_;
QLabel *diagrams_label_;
DiagramsChooser *diagrams_list_;
+ QPushButton *diagrams_select_all_;
+ QPushButton *diagrams_select_none_;
QAction *toggle_diagrams_list_;
QAction *toggle_print_options_;
QAction *adjust_width_;
Property changes on: branches/0.3/sources/qetproject.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetproject.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetsingleapplication.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qetsingleapplication.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qettabbar.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qettabbar.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qettabwidget.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qettabwidget.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qgimanager.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/qgimanager.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/recentfiles.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/recentfiles.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/terminal.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/terminal.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementdefinition.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementdefinition.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementscategory.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementscategory.h
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementscollection.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/0.3/sources/xmlelementscollection.h
___________________________________________________________________
Deleted: svn:mergeinfo
-