Amelioration de la gestion de l'agrandissement des dialogues

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@240 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-12-19 21:44:43 +00:00
parent a3de8c7d2e
commit 2ad72279a2
7 changed files with 21 additions and 10 deletions

View File

@@ -43,7 +43,7 @@ ConductorPropertiesWidget::ConductorPropertiesWidget(const ConductorProperties &
/// construit l'interface du widget /// construit l'interface du widget
void ConductorPropertiesWidget::buildInterface() { void ConductorPropertiesWidget::buildInterface() {
setFixedSize(380, 280); setMinimumSize(380, 280);
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);

View File

@@ -25,7 +25,6 @@
ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent) { ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent) {
setWindowTitle(tr("Configurer QElectroTech")); setWindowTitle(tr("Configurer QElectroTech"));
setMinimumSize(900, 400);
// liste des pages // liste des pages
pages_list = new QListWidget(); pages_list = new QListWidget();

View File

@@ -605,6 +605,10 @@ void DiagramView::dialogEditInfos() {
diagram_size_box_layout.addWidget(columns_width, 0, 2); diagram_size_box_layout.addWidget(columns_width, 0, 2);
diagram_size_box_layout.addWidget(ds2, 1, 0); diagram_size_box_layout.addWidget(ds2, 1, 0);
diagram_size_box_layout.addWidget(columns_height, 1, 1); diagram_size_box_layout.addWidget(columns_height, 1, 1);
diagram_size_box_layout.setColumnStretch(0, 1);
diagram_size_box_layout.setColumnStretch(1, 1);
diagram_size_box_layout.setColumnStretch(2, 1);
diagram_size_box_layout.setColumnStretch(3, 500);
InsetPropertiesWidget *inset_infos = new InsetPropertiesWidget(inset, false, &popup); InsetPropertiesWidget *inset_infos = new InsetPropertiesWidget(inset, false, &popup);
@@ -617,6 +621,7 @@ void DiagramView::dialogEditInfos() {
QVBoxLayout layout_v(&popup); QVBoxLayout layout_v(&popup);
layout_v.addWidget(diagram_size_box); layout_v.addWidget(diagram_size_box);
layout_v.addWidget(inset_infos); layout_v.addWidget(inset_infos);
layout_v.addStretch();
layout_v.addWidget(&boutons); layout_v.addWidget(&boutons);
// si le dialogue est accepte // si le dialogue est accepte
if (popup.exec() == QDialog::Accepted) { if (popup.exec() == QDialog::Accepted) {
@@ -775,6 +780,7 @@ void DiagramView::editConductor(Conductor *edited_conductor) {
conductor_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'un conducteur")); conductor_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'un conducteur"));
QVBoxLayout *dialog_layout = new QVBoxLayout(&conductor_dialog); QVBoxLayout *dialog_layout = new QVBoxLayout(&conductor_dialog);
dialog_layout -> addWidget(cpw); dialog_layout -> addWidget(cpw);
dialog_layout -> addStretch();
QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
dialog_layout -> addWidget(dbb); dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept())); connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept()));

View File

@@ -589,7 +589,7 @@ void ElementScene::slot_editOrientations() {
// cree un dialogue // cree un dialogue
QDialog dialog_ori; QDialog dialog_ori;
dialog_ori.setModal(true); dialog_ori.setModal(true);
dialog_ori.setFixedSize(400, 260); dialog_ori.setMinimumSize(400, 260);
dialog_ori.setWindowTitle(tr("\311diter les orientations")); dialog_ori.setWindowTitle(tr("\311diter les orientations"));
QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog_ori); QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog_ori);
@@ -608,7 +608,7 @@ void ElementScene::slot_editOrientations() {
QCheckBox *ic_checkbox = new QCheckBox(tr("Autoriser les connexions internes")); QCheckBox *ic_checkbox = new QCheckBox(tr("Autoriser les connexions internes"));
ic_checkbox -> setChecked(internal_connections); ic_checkbox -> setChecked(internal_connections);
dialog_layout -> addWidget(ic_checkbox); dialog_layout -> addWidget(ic_checkbox);
dialog_layout -> addStretch();
// ajoute deux boutons au dialogue // ajoute deux boutons au dialogue
QDialogButtonBox *dialog_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox *dialog_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
dialog_layout -> addWidget(dialog_buttons); dialog_layout -> addWidget(dialog_buttons);
@@ -635,7 +635,7 @@ void ElementScene::slot_editNames() {
// cree un dialogue // cree un dialogue
QDialog dialog; QDialog dialog;
dialog.setModal(true); dialog.setModal(true);
dialog.setFixedSize(400, 330); dialog.setMinimumSize(400, 330);
dialog.setWindowTitle(tr("\311diter les noms")); dialog.setWindowTitle(tr("\311diter les noms"));
QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog); QVBoxLayout *dialog_layout = new QVBoxLayout(&dialog);

View File

@@ -90,7 +90,7 @@ void ElementsPanelWidget::newElement() {
*/ */
void ElementsPanelWidget::newCategory() { void ElementsPanelWidget::newCategory() {
QDialog new_category_dialog; QDialog new_category_dialog;
new_category_dialog.setFixedSize(480, 280); new_category_dialog.setMinimumSize(480, 280);
new_category_dialog.setWindowTitle(tr("Gestionnaire de cat\351gories")); new_category_dialog.setWindowTitle(tr("Gestionnaire de cat\351gories"));
QVBoxLayout *layout = new QVBoxLayout(&new_category_dialog); QVBoxLayout *layout = new QVBoxLayout(&new_category_dialog);

View File

@@ -33,8 +33,9 @@ ExportDialog::ExportDialog(Diagram *dia, QWidget *parent) : QDialog(parent) {
diagram_ratio = (qreal)diagram_size.width() / (qreal)diagram_size.height(); diagram_ratio = (qreal)diagram_size.width() / (qreal)diagram_size.height();
dontchangewidth = dontchangeheight = false; dontchangewidth = dontchangeheight = false;
// la taille du dialogue est fixee // la taille minimale du dialogue est fixee
setFixedSize(800, 360); setMinimumSize(800, 360);
resize(minimumSize());
setWindowTitle(tr("Exporter")); setWindowTitle(tr("Exporter"));
// le dialogue comporte deux boutons // le dialogue comporte deux boutons
@@ -52,6 +53,8 @@ ExportDialog::ExportDialog(Diagram *dia, QWidget *parent) : QDialog(parent) {
layout -> addWidget(leftPart(), 0, 0); layout -> addWidget(leftPart(), 0, 0);
layout -> addWidget(rightPart(), 0, 1); layout -> addWidget(rightPart(), 0, 1);
layout -> addWidget(buttons, 1, 1); layout -> addWidget(buttons, 1, 1);
layout -> setColumnStretch(0, 1);
layout -> setColumnStretch(1, 500);
setTabOrder(keep_aspect_ratio, buttons); setTabOrder(keep_aspect_ratio, buttons);
@@ -200,6 +203,7 @@ QWidget *ExportDialog::leftPart() {
/* un cadre permettant de specifier les options de l'image finale */ /* un cadre permettant de specifier les options de l'image finale */
vboxLayout -> addWidget(setupOptionsGroupBox()); vboxLayout -> addWidget(setupOptionsGroupBox());
vboxLayout -> addStretch();
// ordre des input selectionnes avec la touche tab // ordre des input selectionnes avec la touche tab
setTabOrder(filename, button_browse); setTabOrder(filename, button_browse);
@@ -222,7 +226,7 @@ QWidget *ExportDialog::rightPart() {
// la partie droite contient une GroupBox intitulee "Apercu" // la partie droite contient une GroupBox intitulee "Apercu"
QGroupBox *groupbox_preview = new QGroupBox(tr("Aper\347u"), this); QGroupBox *groupbox_preview = new QGroupBox(tr("Aper\347u"), this);
groupbox_preview -> setFixedWidth(390); groupbox_preview -> setMinimumWidth(390);
QHBoxLayout *hboxlayout1 = new QHBoxLayout(groupbox_preview); QHBoxLayout *hboxlayout1 = new QHBoxLayout(groupbox_preview);
hboxlayout1 -> setMargin(0); hboxlayout1 -> setMargin(0);

View File

@@ -29,7 +29,7 @@ InsetPropertiesWidget::InsetPropertiesWidget(const InsetProperties &inset, bool
QVBoxLayout *this_layout = new QVBoxLayout(this); QVBoxLayout *this_layout = new QVBoxLayout(this);
this_layout -> setContentsMargins(0, 0, 0, 0); this_layout -> setContentsMargins(0, 0, 0, 0);
QGroupBox *inset_infos = new QGroupBox(tr("Informations du cartouche"), this); QGroupBox *inset_infos = new QGroupBox(tr("Informations du cartouche"), this);
inset_infos -> setMinimumWidth(300); inset_infos -> setMinimumSize(300, 260);
this_layout -> addWidget(inset_infos); this_layout -> addWidget(inset_infos);
inset_title = new QLineEdit(this); inset_title = new QLineEdit(this);
@@ -53,6 +53,8 @@ InsetPropertiesWidget::InsetPropertiesWidget(const InsetProperties &inset, bool
layout_date -> addWidget(inset_current_date, 1, 0); layout_date -> addWidget(inset_current_date, 1, 0);
layout_date -> addWidget(inset_fixed_date, 2, 0); layout_date -> addWidget(inset_fixed_date, 2, 0);
layout_date -> addWidget(inset_date, 2, 1); layout_date -> addWidget(inset_date, 2, 1);
layout_date -> setColumnStretch(0, 1);
layout_date -> setColumnStretch(1, 500);
inset_filename = new QLineEdit(this); inset_filename = new QLineEdit(this);
inset_folio = new QLineEdit(this); inset_folio = new QLineEdit(this);