Attachment #497128 for bug #630332

Lines 70-76 Link Here

(-)qtiplot-0.9.8.9.orig/qtiplot/src/matrix/MatrixValuesDialog.cpp (-1 / +1 lines)
70	endCol->setRange(1, INT_MAX);	70	endCol->setRange(1, INT_MAX);
71	gl1->addWidget(endCol, 1, 3);	71	gl1->addWidget(endCol, 1, 3);
72		72
73	functions = new QComboBox(false);	73	functions = new QComboBox();
74	functions->addItems(scriptEnv->mathFunctions());	74	functions->addItems(scriptEnv->mathFunctions());
75	btnAddFunction = new QPushButton(tr( "Add &Function" ));	75	btnAddFunction = new QPushButton(tr( "Add &Function" ));
76	btnAddCell = new QPushButton(tr( "Add Ce&ll" ));	76	btnAddCell = new QPushButton(tr( "Add Ce&ll" ));




	QGridLayout *gl2 = new QGridLayout(gb2);
	gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);

	alignHorBox = new QComboBox();
	alignHorBox->insertItem( tr( "Center" ) );
	alignHorBox->insertItem( tr( "Left" ) );
	alignHorBox->insertItem( tr( "Right" ) );
	gl2->addWidget(alignHorBox, 0, 1);

	gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
	alignVertBox = new QComboBox();
	alignVertBox->insertItem( tr( "Center" ) );
	alignVertBox->insertItem( tr( "Top" ) );
	alignVertBox->insertItem( tr( "Bottom" ) );




	l4->setBuddy(boxFirstColor);
	gl2->addWidget(l4, 0, 0);

	boxPiePattern = new PatternBox();
	gl2->addWidget(boxPiePattern, 1, 1);
	gl2->setRowStretch(2, 1);


	hb->addWidget(boxCurveOpacity);
	gl2->addLayout(hb, 1, 1);

	boxPattern = new PatternBox();
	gl2->addWidget(boxPattern, 2, 1);
	
	QLabel *l6 = new QLabel("&" + tr("Pattern"));

    QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
    labelXEnd = new QLabel(tr( "X End" ));
    gl3->addWidget(labelXEnd, 0, 0);
	xEndBox = new QComboBox();
    gl3->addWidget(xEndBox, 0, 1);

	labelYEnd = new QLabel(tr( "Y End" ));
    gl3->addWidget(labelYEnd, 1, 0);
	yEndBox = new  QComboBox();
    gl3->addWidget(yEndBox, 1, 1);

	labelPosition = new QLabel(tr( "Position" ));
    gl3->addWidget(labelPosition, 2, 0);
	vectPosBox = new  QComboBox();
	vectPosBox->addItem(tr("Tail"));
	vectPosBox->addItem(tr("Middle"));
	vectPosBox->addItem(tr("Head"));




	hbox1->addWidget(end);

	QGridLayout *gl1 = new QGridLayout();
	functions = new QComboBox();
	functions->addItems(muParserScripting::functionsList(true));
	gl1->addWidget(functions, 0, 0);
	btnAddFunction = new QPushButton(tr( "Add function" ));
	gl1->addWidget(btnAddFunction, 0, 1);
	boxColumn = new QComboBox();
	gl1->addWidget(boxColumn, 1, 0);
	btnAddCol = new QPushButton(tr( "Add column" ));
	gl1->addWidget(btnAddCol, 1, 1);

Lines 127-133 Link Here

(-)qtiplot-0.9.8.9.orig/qtiplot/src/table/TableDialog.cpp (-1 / +1 lines)
127	labelFormat = new QLabel(tr( "Format:" ));	127	labelFormat = new QLabel(tr( "Format:" ));
128	gl1->addWidget(labelFormat, 2, 0);	128	gl1->addWidget(labelFormat, 2, 0);
129		129
130	formatBox = new QComboBox(false);	130	formatBox = new QComboBox();
131	gl1->addWidget(formatBox, 2, 1);	131	gl1->addWidget(formatBox, 2, 1);
132		132
133	labelNumeric = new QLabel(tr( "Precision:" ));	133	labelNumeric = new QLabel(tr( "Precision:" ));

Return to bug 630332

Lines 954-960 Link Here

(-)qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/dialogs/PlotDialog.cpp (-5 / +5 lines)
954	l4->setBuddy(boxFirstColor);	954	l4->setBuddy(boxFirstColor);
955	gl2->addWidget(l4, 0, 0);	955	gl2->addWidget(l4, 0, 0);
956		956
957	boxPiePattern = new PatternBox(false);	957	boxPiePattern = new PatternBox();
958	gl2->addWidget(boxPiePattern, 1, 1);	958	gl2->addWidget(boxPiePattern, 1, 1);
959	gl2->setRowStretch(2, 1);	959	gl2->setRowStretch(2, 1);
960		960
Lines 1337-1343 Link Here
1337	hb->addWidget(boxCurveOpacity);	1337	hb->addWidget(boxCurveOpacity);
1338	gl2->addLayout(hb, 1, 1);	1338	gl2->addLayout(hb, 1, 1);
1339		1339
1340	boxPattern = new PatternBox(false);	1340	boxPattern = new PatternBox();
1341	gl2->addWidget(boxPattern, 2, 1);	1341	gl2->addWidget(boxPattern, 2, 1);
1342		1342
1343	QLabel *l6 = new QLabel("&" + tr("Pattern"));	1343	QLabel *l6 = new QLabel("&" + tr("Pattern"));
Lines 2126-2142 Link Here
2126	QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);	2126	QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
2127	labelXEnd = new QLabel(tr( "X End" ));	2127	labelXEnd = new QLabel(tr( "X End" ));
2128	gl3->addWidget(labelXEnd, 0, 0);	2128	gl3->addWidget(labelXEnd, 0, 0);
2129	xEndBox = new QComboBox(false);	2129	xEndBox = new QComboBox();
2130	gl3->addWidget(xEndBox, 0, 1);	2130	gl3->addWidget(xEndBox, 0, 1);
2131		2131
2132	labelYEnd = new QLabel(tr( "Y End" ));	2132	labelYEnd = new QLabel(tr( "Y End" ));
2133	gl3->addWidget(labelYEnd, 1, 0);	2133	gl3->addWidget(labelYEnd, 1, 0);
2134	yEndBox = new QComboBox( false);	2134	yEndBox = new QComboBox();
2135	gl3->addWidget(yEndBox, 1, 1);	2135	gl3->addWidget(yEndBox, 1, 1);
2136		2136
2137	labelPosition = new QLabel(tr( "Position" ));	2137	labelPosition = new QLabel(tr( "Position" ));
2138	gl3->addWidget(labelPosition, 2, 0);	2138	gl3->addWidget(labelPosition, 2, 0);
2139	vectPosBox = new QComboBox( false);	2139	vectPosBox = new QComboBox();
2140	vectPosBox->addItem(tr("Tail"));	2140	vectPosBox->addItem(tr("Tail"));
2141	vectPosBox->addItem(tr("Middle"));	2141	vectPosBox->addItem(tr("Middle"));
2142	vectPosBox->addItem(tr("Head"));	2142	vectPosBox->addItem(tr("Head"));

Lines 69-82 Link Here

(-)qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/dialogs/LayerDialog.cpp (-2 / +2 lines)
69	QGridLayout *gl2 = new QGridLayout(gb2);	69	QGridLayout *gl2 = new QGridLayout(gb2);
70	gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);	70	gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
71		71
72	alignHorBox = new QComboBox( false );	72	alignHorBox = new QComboBox();
73	alignHorBox->insertItem( tr( "Center" ) );	73	alignHorBox->insertItem( tr( "Center" ) );
74	alignHorBox->insertItem( tr( "Left" ) );	74	alignHorBox->insertItem( tr( "Left" ) );
75	alignHorBox->insertItem( tr( "Right" ) );	75	alignHorBox->insertItem( tr( "Right" ) );
76	gl2->addWidget(alignHorBox, 0, 1);	76	gl2->addWidget(alignHorBox, 0, 1);
77		77
78	gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );	78	gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
79	alignVertBox = new QComboBox( false );	79	alignVertBox = new QComboBox();
80	alignVertBox->insertItem( tr( "Center" ) );	80	alignVertBox->insertItem( tr( "Center" ) );
81	alignVertBox->insertItem( tr( "Top" ) );	81	alignVertBox->insertItem( tr( "Top" ) );
82	alignVertBox->insertItem( tr( "Bottom" ) );	82	alignVertBox->insertItem( tr( "Bottom" ) );

Lines 72-83 Link Here

(-)qtiplot-0.9.8.9.orig/qtiplot/src/table/SetColValuesDialog.cpp (-2 / +2 lines)
72	hbox1->addWidget(end);	72	hbox1->addWidget(end);
73		73
74	QGridLayout *gl1 = new QGridLayout();	74	QGridLayout *gl1 = new QGridLayout();
75	functions = new QComboBox(false);	75	functions = new QComboBox();
76	functions->addItems(muParserScripting::functionsList(true));	76	functions->addItems(muParserScripting::functionsList(true));
77	gl1->addWidget(functions, 0, 0);	77	gl1->addWidget(functions, 0, 0);
78	btnAddFunction = new QPushButton(tr( "Add function" ));	78	btnAddFunction = new QPushButton(tr( "Add function" ));
79	gl1->addWidget(btnAddFunction, 0, 1);	79	gl1->addWidget(btnAddFunction, 0, 1);
80	boxColumn = new QComboBox(false);	80	boxColumn = new QComboBox();
81	gl1->addWidget(boxColumn, 1, 0);	81	gl1->addWidget(boxColumn, 1, 0);
82	btnAddCol = new QPushButton(tr( "Add column" ));	82	btnAddCol = new QPushButton(tr( "Add column" ));
83	gl1->addWidget(btnAddCol, 1, 1);	83	gl1->addWidget(btnAddCol, 1, 1);