Permalink
Browse files

Fixed - made opentype & samples collection widgets to display in a mo…

…re regular way.
  • Loading branch information...
Pierre Marchand
Pierre Marchand committed Sep 20, 2010
1 parent 15a0705 commit 96115fed8a399f0747efacccabd425239174fe16
Showing with 16 additions and 6 deletions.
  1. +12 −2 src/sampletoolbar.ui
  2. +4 −4 src/samplewidget.cpp
View
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>411</width>
+ <width>511</width>
<height>37</height>
</rect>
</property>
@@ -65,7 +65,7 @@
</property>
</widget>
</item>
- <item row="0" column="4">
+ <item row="0" column="5">
<widget class="QComboBox" name="languageCombo">
<property name="toolTip">
<string>Depending of the font, some scripts
@@ -74,6 +74,16 @@ through some logic (ICU here).</string>
</property>
</widget>
</item>
+ <item row="0" column="4">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Shaping:</string>
+ </property>
+ <property name="buddy">
+ <cstring>languageCombo</cstring>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
View
@@ -91,7 +91,7 @@ SampleWidget::SampleWidget(const QString& fid, QWidget *parent) :
ui->textProgression->setVisible(false);
sampleToolBar = new SampleToolBar(this);
- ui->sampleGridLayout->addWidget(sampleToolBar, 0,0, Qt::AlignRight | Qt::AlignBottom);
+ ui->sampleGridLayout->addWidget(sampleToolBar, 1,0, Qt::AlignRight | Qt::AlignBottom);
sampleNameEditor = new QStyledItemDelegate(ui->sampleTextTree);
@@ -872,8 +872,8 @@ void SampleWidget::slotShowSamples(bool b)
sampleToolBar->toggle(SampleToolBar::OpenTypeButton, false);
}
ui->sampleEditWidget->setAutoFillBackground(true);
- ui->sampleEditWidget->resize(ui->sampleGridLayout->geometry().width() / 2, ui->sampleGridLayout->geometry().height() / 2);
- ui->sampleGridLayout->addWidget(ui->sampleEditWidget, 0,0, Qt::AlignRight | Qt::AlignTop);
+ ui->sampleEditWidget->resize(ui->sampleGridLayout->geometry().width() / 2, ui->sampleGridLayout->geometry().height());
+ ui->sampleGridLayout->addWidget(ui->sampleEditWidget, 0,0, Qt::AlignRight);
}
else
{
@@ -894,7 +894,7 @@ void SampleWidget::slotShowOpenType(bool b)
}
ui->opentypeWidget->setAutoFillBackground(true);
ui->opentypeWidget->resize(ui->sampleGridLayout->geometry().width() / 2, ui->sampleGridLayout->geometry().height());
- ui->sampleGridLayout->addWidget(ui->opentypeWidget, 0,0, Qt::AlignLeft);
+ ui->sampleGridLayout->addWidget(ui->opentypeWidget, 0,0, Qt::AlignRight);
}
else
{

0 comments on commit 96115fe

Please sign in to comment.