> I obviously did. Sorry. I'm still not entirely convinced.
i was thinking like the attached...
Index: src/frontends/qt4/QParagraph.cpp =================================================================== --- src/frontends/qt4/QParagraph.cpp (revision 18850) +++ src/frontends/qt4/QParagraph.cpp (working copy) @@ -50,7 +50,6 @@ connect(applyPB, SIGNAL(clicked()), form_, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), form_, SLOT(slotClose())); connect(restorePB, SIGNAL(clicked()), form_, SLOT(slotRestore())); - connect(alignDefaultCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(alignJustRB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(alignLeftRB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(alignRightRB, SIGNAL(clicked()), this, SLOT(change_adaptor())); @@ -77,9 +76,9 @@ " items is used." )); - radioMap[LYX_ALIGN_BLOCK] = alignJustRB; - radioMap[LYX_ALIGN_LEFT] = alignLeftRB; - radioMap[LYX_ALIGN_RIGHT] = alignRightRB; + radioMap[LYX_ALIGN_BLOCK] = alignJustRB; + radioMap[LYX_ALIGN_LEFT] = alignLeftRB; + radioMap[LYX_ALIGN_RIGHT] = alignRightRB; radioMap[LYX_ALIGN_CENTER] = alignCenterRB; } @@ -105,35 +104,44 @@ void QParagraphDialog::checkAlignmentRadioButtons() { - if (alignDefaultCB->isChecked()) { - QPRadioMap::const_iterator it = radioMap.begin(); - for (; it != radioMap.end(); ++it) - it->second->setDisabled(true); - } else { - LyXAlignment alignPossible = form_->controller().alignPossible(); - QPRadioMap::const_iterator it = radioMap.begin(); - for (; it != radioMap.end(); ++it) - it->second->setEnabled(it->first & alignPossible); + LyXAlignment const alignPossible = form_->controller().alignPossible(); + LyXAlignment const defaultAlignment = form_->controller().alignDefault(); + QPRadioMap::iterator it = radioMap.begin(); + for (; it != radioMap.end(); ++it) { + it->second->setEnabled((it->first & alignPossible) || + (it->first == LYX_ALIGN_LAYOUT)); + string label; + switch (it->first) { + case LYX_ALIGN_BLOCK: + label = "Justified"; + break; + case LYX_ALIGN_LEFT: + label = "Left"; + break; + case LYX_ALIGN_CENTER: + label = "Center"; + break; + case LYX_ALIGN_RIGHT: + label = "Right"; + break; + } + + if (it->first == defaultAlignment) + label += " (Default)"; + + it->second->setText(qt_(label)); } } -void QParagraphDialog::on_alignDefaultCB_toggled(bool) -{ - checkAlignmentRadioButtons(); - alignmentToRadioButtons(); -} - - void QParagraphDialog::alignmentToRadioButtons(LyXAlignment align) { - if (align == LYX_ALIGN_LAYOUT) - align = form_->controller().alignDefault(); - QPRadioMap::const_iterator it = radioMap.begin(); for (;it != radioMap.end(); ++it) { if (align == it->first) { + it->second->blockSignals(true); it->second->setChecked(true); + it->second->blockSignals(false); return; } } @@ -145,18 +153,18 @@ LyXAlignment QParagraphDialog::getAlignmentFromDialog() { - if (alignDefaultCB->isChecked()) - return LYX_ALIGN_LAYOUT; + LyXAlignment const defaultAlignment = form_->controller().alignDefault(); LyXAlignment alignment = LYX_ALIGN_NONE; QPRadioMap::const_iterator it = radioMap.begin(); for (; it != radioMap.end(); ++it) { if (it->second->isChecked()) { - alignment = it->first; + if (it->first == defaultAlignment) + alignment = LYX_ALIGN_LAYOUT; + else + alignment = it->first; break; } } - if (alignment == form_->controller().alignDefault()) - return LYX_ALIGN_LAYOUT; return alignment; } @@ -243,15 +251,8 @@ } // alignment - LyXAlignment newAlignment = params.align(); - LyXAlignment defaultAlignment = controller().alignDefault(); - bool alignmentIsDefault = - newAlignment == LYX_ALIGN_LAYOUT || newAlignment == defaultAlignment; - dialog_->alignDefaultCB->blockSignals(true); - dialog_->alignDefaultCB->setChecked(alignmentIsDefault); - dialog_->alignDefaultCB->blockSignals(false); dialog_->checkAlignmentRadioButtons(); - dialog_->alignmentToRadioButtons(newAlignment); + dialog_->alignmentToRadioButtons(params.align()); //indentation bool const canindent = controller().canIndent(); Index: src/frontends/qt4/QParagraph.h =================================================================== --- src/frontends/qt4/QParagraph.h (revision 18850) +++ src/frontends/qt4/QParagraph.h (working copy) @@ -49,8 +49,6 @@ void change_adaptor(); /// void enableLinespacingValue(int); - /// - void on_alignDefaultCB_toggled(bool); }; Index: src/frontends/qt4/ui/ParagraphUi.ui =================================================================== --- src/frontends/qt4/ui/ParagraphUi.ui (revision 18850) +++ src/frontends/qt4/ui/ParagraphUi.ui (working copy) @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>373</width> - <height>203</height> + <width>346</width> + <height>226</height> </rect> </property> <property name="sizePolicy" > @@ -36,76 +36,14 @@ <property name="spacing" > <number>6</number> </property> - <item row="4" column="0" colspan="2" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="3" column="0" > + <widget class="QCheckBox" name="indentCB" > + <property name="text" > + <string>Indent &Paragraph</string> </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QPushButton" name="restorePB" > - <property name="text" > - <string>&Restore</string> - </property> - <property name="autoDefault" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="okPB" > - <property name="text" > - <string>&OK</string> - </property> - <property name="autoDefault" > - <bool>false</bool> - </property> - <property name="default" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="applyPB" > - <property name="text" > - <string>&Apply</string> - </property> - <property name="autoDefault" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="closePB" > - <property name="text" > - <string>&Close</string> - </property> - <property name="autoDefault" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> + </widget> </item> - <item row="3" column="1" > + <item row="2" column="0" > <widget class="QGroupBox" name="labelwidthGB" > <property name="enabled" > <bool>false</bool> @@ -113,6 +51,12 @@ <property name="title" > <string>Label Width</string> </property> + <property name="flat" > + <bool>true</bool> + </property> + <property name="checked" > + <bool>false</bool> + </property> <layout class="QGridLayout" > <property name="margin" > <number>11</number> @@ -143,53 +87,53 @@ </layout> </widget> </item> - <item row="1" column="1" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> + <item row="1" column="0" > + <widget class="QGroupBox" name="aligmentGB" > + <property name="title" > + <string>Alignment</string> </property> - <property name="spacing" > - <number>6</number> + <property name="flat" > + <bool>true</bool> </property> - <item> - <widget class="QCheckBox" name="indentCB" > - <property name="text" > - <string>Indent &Paragraph</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="0" column="0" > + <widget class="QRadioButton" name="alignJustRB" > + <property name="text" > + <string>&Justified</string> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QRadioButton" name="alignCenterRB" > + <property name="text" > + <string>&Center</string> + </property> + </widget> + </item> + <item row="0" column="2" > + <widget class="QRadioButton" name="alignRightRB" > + <property name="text" > + <string>&Right</string> + </property> + </widget> + </item> + <item row="0" column="3" > + <widget class="QRadioButton" name="alignLeftRB" > + <property name="text" > + <string>&Left</string> + </property> + </widget> + </item> + </layout> + </widget> </item> - <item row="2" column="1" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>249</width> - <height>31</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="1" > + <item row="0" column="0" > <layout class="QHBoxLayout" > <property name="margin" > <number>0</number> @@ -245,63 +189,74 @@ </item> </layout> </item> - <item rowspan="4" row="0" column="0" > - <widget class="QGroupBox" name="aligmentGB" > - <property name="title" > - <string>Alignment</string> + <item row="4" column="0" > + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QCheckBox" name="alignDefaultCB" > - <property name="font" > - <font> - <weight>50</weight> - <italic>true</italic> - <bold>false</bold> - <kerning>true</kerning> - </font> - </property> - <property name="text" > - <string>&Default</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="alignJustRB" > - <property name="text" > - <string>&Justified</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="alignLeftRB" > - <property name="text" > - <string>&Left</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="alignRightRB" > - <property name="text" > - <string>&Right</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="alignCenterRB" > - <property name="text" > - <string>&Center</string> - </property> - </widget> - </item> - </layout> - </widget> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QPushButton" name="restorePB" > + <property name="text" > + <string>&Restore</string> + </property> + <property name="autoDefault" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="okPB" > + <property name="text" > + <string>&OK</string> + </property> + <property name="autoDefault" > + <bool>false</bool> + </property> + <property name="default" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="applyPB" > + <property name="text" > + <string>&Apply</string> + </property> + <property name="autoDefault" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="closePB" > + <property name="text" > + <string>&Close</string> + </property> + <property name="autoDefault" > + <bool>false</bool> + </property> + </widget> + </item> + </layout> </item> </layout> </widget>