← Back to branch summary

~showard314/ubuntu/utopic/qtiplot/utopic_1311721

« back to all changes in this revision

Viewing changes to qtiplot/src/plot2D/dialogs/TextDialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Howard
  • Date: 2011-05-07 17:00:26 UTC
  • mfrom: (1.1.9 upstream) (2.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110507170026-77wvcv8uc6955fff
http://bugs.debian.org/599450
http://bugs.debian.org/587669
https://launchpad.net/bugs/184307
* moved debian/build.conf into debian/patches/03_build_conf.patch
  to track changes to build.conf between releases. Updated
  debian/rules accordingly.
* New upstream release. (Closes: #599450)
* Refreshed patches.
* debian/control B-D on libalglib-dev, libtamuanova-dev,
  libqtexengine-dev
* debian/rules allows for parallel builds
* Byte compile python modules with dh_python2, removed debian/*.post{rm,inst}
  dropped dependency on depricated python-central (Closes: #587669)
* Added shared-mime-info xml data in debian/qtiplot.sharedmimeinfo
  (LP: #184307)
* 04_qwtplot3d_static.patch added to build a modified static
  library of qwt3dplot
* 05_link_gl2ps.patch added to use Debian gl2ps library.
* Policy 3.9.2, no changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
qtiplot/src/plot2D/dialogs/TextDialog.cpp
69
69
        colorBtn = new ColorButton();
70
70
        topLayout->addWidget(colorBtn, 0, 1);
71
71
 
72
 
        topLayout->addWidget(new QLabel(tr("Font")), 1, 0);
73
 
 
74
72
        buttonFont = new QPushButton(tr( "&Font" ));
75
 
        topLayout->addWidget(buttonFont, 1, 1);
 
73
        buttonFont->setIcon(QIcon(":/font.png"));
 
74
        topLayout->addWidget(buttonFont, 0, 2);
76
75
 
77
 
        topLayout->addWidget(new QLabel(tr("Alignment")), 2, 0);
 
76
        topLayout->addWidget(new QLabel(tr("Alignment")), 1, 0);
78
77
        alignmentBox = new QComboBox();
79
78
        alignmentBox->addItem( tr( "Center" ) );
80
79
        alignmentBox->addItem( tr( "Left" ) );
81
80
        alignmentBox->addItem( tr( "Right" ) );
82
 
        topLayout->addWidget(alignmentBox, 2, 1);
 
81
        topLayout->addWidget(alignmentBox, 1, 1);
83
82
 
84
83
        if (type == AxisTitle){
85
 
                topLayout->addWidget(new QLabel(tr("Distance to axis")), 3, 0);
 
84
                topLayout->addWidget(new QLabel(tr("Distance to axis")), 2, 0);
86
85
                distanceBox = new QSpinBox();
87
86
                distanceBox->setRange(0, 1000);
88
 
                topLayout->addWidget(distanceBox, 3, 1);
 
87
                topLayout->addWidget(distanceBox, 2, 1);
89
88
                invertTitleBox = new QCheckBox(tr("&Inverted"));
90
89
                invertTitleBox->hide();
91
90
                connect(invertTitleBox, SIGNAL(toggled(bool)), this, SLOT(apply()));
92
 
                topLayout->addWidget(invertTitleBox, 4, 1);
 
91
                topLayout->addWidget(invertTitleBox, 1, 2);
93
92
        }
94
93
 
95
 
        topLayout->setColumnStretch(2, 1);
 
94
        topLayout->setColumnStretch(3, 1);
96
95
 
97
96
    QVBoxLayout *vl = new QVBoxLayout();
98
97
    buttonApply = new QPushButton(tr( "&Apply to..." ));