[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/kexi/plugins/forms
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2006-12-29 0:40:56
Message-ID: 1167352856.283135.16240.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 617398 by staniek:

Forms
- "Assign Action" dialog - minor layout fixes

2.0: merged



 M  +14 -11    kexiactionselectiondialog.cpp  


--- branches/koffice/1.6/koffice/kexi/plugins/forms/kexiactionselectiondialog.cpp \
#617397:617398 @@ -386,6 +386,8 @@
 	ActionToExecuteListView* actionToExecuteListView;
 	QLabel *actionToExecuteLbl;
 	QWidget *secondAnd3rdColumnMainWidget;
+	QGridLayout *glyr;
+	QGridLayout *secondAnd3rdColumnGrLyr;
 	QWidgetStack *secondAnd3rdColumnStack, *secondColumnStack;
 	bool hideActionToExecuteListView;
 };
@@ -421,13 +423,13 @@
     - for displaying objects, the stack contains secondAnd3rdColumnMainWidget \
                QWidget and QGridLayout *secondAnd3rdColumnGrLyr
 	 - kactionPageWidget contains only a QVBoxLayout and label+kactionListView
 */
-	QGridLayout *glyr = new QGridLayout(mainWidget, 2, 2, KDialog::marginHint(), \
                KDialog::spacingHint());
-	glyr->setRowStretch(1, 1);
+	d->glyr = new QGridLayout(mainWidget, 2, 2, KDialog::marginHint(), \
KDialog::spacingHint()); +	d->glyr->setRowStretch(1, 1);
 
 	// 1st column: action types
 	d->actionCategoriesListView = new ActionCategoriesListView(mainWidget);
 	d->actionCategoriesListView->setSizePolicy(QSizePolicy::Fixed, \
                QSizePolicy::Minimum);
-	glyr->addWidget(d->actionCategoriesListView, 1, 0);
+	d->glyr->addWidget(d->actionCategoriesListView, 1, 0);
 	connect( d->actionCategoriesListView, SIGNAL(selectionChanged(QListViewItem*)), 
 		this, SLOT(slotActionCategorySelected(QListViewItem*)));
 
@@ -435,22 +437,22 @@
 	lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 	lbl->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	lbl->setAlignment(Qt::AlignTop|Qt::AlignLeft|Qt::WordBreak);
-	glyr->addWidget(lbl, 0, 0, Qt::AlignTop|Qt::AlignLeft);
+	d->glyr->addWidget(lbl, 0, 0, Qt::AlignTop|Qt::AlignLeft);
 	
 	// widget stack for 2nd and 3rd column
 	d->secondAnd3rdColumnStack = new QWidgetStack(mainWidget);
 	d->secondAnd3rdColumnStack->setSizePolicy(QSizePolicy::Minimum, \
                QSizePolicy::Minimum);
-	glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, \
Qt::AlignTop|Qt::AlignLeft); \
+	d->glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, \
Qt::AlignTop|Qt::AlignLeft);  
 	d->secondAnd3rdColumnMainWidget = new QWidget(d->secondAnd3rdColumnStack);
 	d->secondAnd3rdColumnMainWidget->setSizePolicy(QSizePolicy::Minimum, \
                QSizePolicy::Minimum);
-	QGridLayout *secondAnd3rdColumnGrLyr = new \
                QGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, 0, \
                KDialog::spacingHint());
-	secondAnd3rdColumnGrLyr->setRowStretch(1, 2);
+	d->secondAnd3rdColumnGrLyr = new QGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, \
0, KDialog::spacingHint()); +	d->secondAnd3rdColumnGrLyr->setRowStretch(1, 2);
 	d->secondAnd3rdColumnStack->addWidget(d->secondAnd3rdColumnMainWidget);
 
 	// 2nd column: list of actions/objects
 	d->objectsListView = new KexiBrowser(d->secondAnd3rdColumnMainWidget, d->mainWin, \
                0/*features*/);
-	secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0);
+	d->secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0);
 	connect(d->objectsListView, SIGNAL(selectionChanged(KexiPart::Item*)),
 		this, SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
 
@@ -458,7 +460,7 @@
 	d->selectActionToBeExecutedLbl->setSizePolicy(QSizePolicy::Minimum, \
QSizePolicy::Fixed);  \
d->selectActionToBeExecutedLbl->setAlignment(Qt::AlignTop|Qt::AlignLeft|Qt::WordBreak);
  d->selectActionToBeExecutedLbl->setMinimumHeight(d->selectActionToBeExecutedLbl->fontMetrics().height()*2);
                
-	secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, \
Qt::AlignTop|Qt::AlignLeft); \
+	d->secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, \
Qt::AlignTop|Qt::AlignLeft);  
 	d->emptyWidget = new QWidget(d->secondAnd3rdColumnStack);
 	d->secondAnd3rdColumnStack->addWidget(d->emptyWidget);
@@ -472,19 +474,20 @@
 		this, SLOT(slotActionToExecuteItemExecuted(QListViewItem*)));
 	connect(d->actionToExecuteListView, SIGNAL(selectionChanged(QListViewItem*)),
 		this, SLOT(slotActionToExecuteItemSelected(QListViewItem*)));
-	secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1);
+	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1);
 
 	d->actionToExecuteLbl = new QLabel(d->actionToExecuteListView, 
 		i18n("Action to execute:"), d->secondAnd3rdColumnMainWidget);
 	d->actionToExecuteLbl->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteLbl->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 	d->actionToExecuteLbl->setAlignment(Qt::AlignTop|Qt::AlignLeft|Qt::WordBreak);
-	secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, \
Qt::AlignTop|Qt::AlignLeft); \
+	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, \
Qt::AlignTop|Qt::AlignLeft);  
 	// temporary show all sections to avoid resizing the dialog in the future
 	d->actionCategoriesListView->selectAction("table");
 	d->setActionToExecuteSectionVisible(true);
 	adjustSize();
+	resize(QMAX(700, width()), QMAX(450, height()));
 	d->actionToExecuteListView->updateWidth();
 
 	bool ok;


[prev in list] [next in list] [prev in thread] [next in thread]