]> git.lyx.org Git - features.git/commitdiff
character dialog with auto-apply ...
authorJohn Levon <levon@movementarian.org>
Sun, 26 Aug 2001 17:49:42 +0000 (17:49 +0000)
committerJohn Levon <levon@movementarian.org>
Sun, 26 Aug 2001 17:49:42 +0000 (17:49 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2590 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt2/ChangeLog
src/frontends/qt2/Dialogs.C
src/frontends/qt2/QCharacter.C
src/frontends/qt2/QCharacter.h
src/frontends/qt2/QCharacterDialog.C
src/frontends/qt2/QCharacterDialog.h
src/frontends/qt2/ui/QCharacterDialog.ui

index 762a22e1f0b1cc9021a848ecf04092b4fd33ea81..c54870554ea096a7b453cfe8318d6731d468f86d 100644 (file)
@@ -1,3 +1,11 @@
+2001-08-26  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Dialogs.C:
+       * QCharacter.[Ch]:
+       * QCharacterDialog.[Ch]:
+       * ui/QcharacterDialog.ui: make work again,
+         add auto-apply feature
 2001-08-26  John Levon  <moz@compsoc.man.ac.uk>
 
        * Dialogs.C:
index ec8556dc43c2716599bbefafa0c2436a2001c007..8534d880fcd035e960d61fd715af17ed26c8e369 100644 (file)
@@ -15,6 +15,7 @@
 #include "QAboutDialog.h"
 #include "QBibitemDialog.h"
 #include "QBibtexDialog.h"
+#include "QCharacterDialog.h"
 #include "QCitationDialog.h"
 #include "QIndexDialog.h"
 #include "QRefDialog.h"
@@ -44,6 +45,7 @@
 #include "controllers/ControlAboutlyx.h"
 #include "controllers/ControlBibitem.h"
 #include "controllers/ControlBibtex.h"
+#include "controllers/ControlCharacter.h"
 #include "controllers/ControlCitation.h"
 #include "controllers/ControlIndex.h"
 #include "controllers/ControlRef.h"
@@ -51,7 +53,6 @@
 #include "controllers/ControlUrl.h" 
 #if 0
 #include "controllers/ControlButtons.h"
-#include "controllers/ControlCharacter.h"
 #include "controllers/ControlCitation.h"
 #include "controllers/ControlERT.h"
 #include "controllers/ControlError.h"
@@ -88,6 +89,7 @@ Dialogs::Dialogs(LyXView * lv)
        add(new GUIAboutlyx<QAbout, Qt2BC>(*lv, *this));
        add(new GUIBibitem<QBibitem, Qt2BC>(*lv, *this));
        add(new GUIBibtex<QBibtex, Qt2BC>(*lv, *this));
+       add(new GUICharacter<QCharacter, Qt2BC>(*lv, *this));
        add(new GUIIndex<QIndex, Qt2BC>(*lv, *this));
        add(new GUIRef<QRef, Qt2BC>(*lv, *this));
        add(new GUIUrl<QURL, Qt2BC>(*lv, *this));
index 07f38fb81a57821de3f00b725475b863fd73115c..5563535ef12e86c58c18a459c9c98e78e38647a5 100644 (file)
 /**
  * \file QCharacter.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
  * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author John Levon <moz@compsoc.man.ac.uk>
  */
 
 #include <config.h>
 
 #include "gettext.h"
-#include "QCharacterDialog.h"
-#include "QCharacter.h"
-#include "bufferview_funcs.h"
-#include "Dialogs.h"
-#include "Liason.h"
-#include "QtLyXView.h"
-#include "buffer.h"
-#include "lyxtext.h"
-#include "language.h"
 #include "support/lstrings.h"
-#include "BufferView.h"
 
-using SigC::slot;
-using Liason::setMinibuffer;
+#include "ControlCharacter.h"
+#include "QCharacterDialog.h"
+#include "QCharacter.h"
+#include "Qt2BC.h"
+#include <qcombobox.h>
+#include <qcheckbox.h>
+#include <qpushbutton.h>
 
-QCharacter::QCharacter(LyXView *v, Dialogs *d)
-       : dialog_(0), lv_(v), d_(d), h_(0), u_(0)
+using namespace character;
+using std::vector;
+typedef Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> > base_class;
+QCharacter::QCharacter(ControlCharacter & c)
+       : base_class(c, _("Character"))
 {
-       d->showCharacter.connect(slot(this, &QCharacter::show));
-       // for LFUN_FREE
-       d->setUserFreeFont.connect(slot(this, &QCharacter::apply));
 }
 
 
-QCharacter::~QCharacter()
+void QCharacter::build_dialog()
 {
-       delete dialog_;
+       dialog_.reset(new QCharacterDialog(this));
+
+       family = getFamilyData();
+       series = getSeriesData();
+       shape  = getShapeData();
+       size   = getSizeData();
+       bar    = getBarData();
+       color  = getColorData();
+       language = getLanguageData();
+
+       for (vector<FamilyPair>::const_iterator cit = family.begin();
+               cit != family.end(); ++cit) {
+               dialog_->familyCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<SeriesPair>::const_iterator cit = series.begin();
+               cit != series.end(); ++cit) {
+               dialog_->seriesCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<ShapePair>::const_iterator cit = shape.begin();
+               cit != shape.end(); ++cit) {
+               dialog_->shapeCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<SizePair>::const_iterator cit = size.begin();
+               cit != size.end(); ++cit) {
+               dialog_->sizeCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<BarPair>::const_iterator cit = bar.begin();
+               cit != bar.end(); ++cit) {
+               dialog_->miscCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<ColorPair>::const_iterator cit = color.begin();
+               cit != color.end(); ++cit) {
+               dialog_->colorCO->insertItem(cit->first.c_str(), -1);
+       }
+       for (vector<string>::const_iterator cit = language.begin();
+               cit != language.end(); ++cit) {
+               dialog_->langCO->insertItem(cit->c_str(), -1);
+       }
+       bc().setOK(dialog_->okPB);
+       bc().setApply(dialog_->applyPB);
+       bc().setCancel(dialog_->closePB);
+       bc().addReadOnly(dialog_->familyCO);
+       bc().addReadOnly(dialog_->seriesCO);
+       bc().addReadOnly(dialog_->sizeCO);
+       bc().addReadOnly(dialog_->shapeCO);
+       bc().addReadOnly(dialog_->miscCO);
+       bc().addReadOnly(dialog_->langCO);
+       bc().addReadOnly(dialog_->colorCO);
+       bc().addReadOnly(dialog_->toggleallCB);
+       bc().addReadOnly(dialog_->autoapplyCB);
 }
 
 
-void QCharacter::apply()
+namespace {
+template<class A, class B>
+int findPos2nd(vector<std::pair<A,B> > const & vec, B const & val)
 {
-       if (!lv_->view()->available() || !dialog_)
-               return;
-
-       LyXFont font = dialog_->getChar();
-
-       if (dialog_->langItem()==1)
-               font.setLanguage(lv_->buffer()->params.language);
-
-       toggleAndShow(lv_->view(), font, dialog_->toggleAll());
-       lv_->view()->setState();
-       lv_->buffer()->markDirty();
-       setMinibuffer(lv_, _("Character set"));
+       vector<std::pair<A,B> >::const_iterator cit = vec.begin();
+       for (; cit != vec.end(); ++cit) {
+               if (cit->second == val)
+                       return int(cit - vec.begin()); 
+       }
+       return 0;
 }
  
-
-void QCharacter::show()
+} // namespace anon
+void QCharacter::update_contents()
 {
-       if (!dialog_) {
-               dialog_ = new QCharacterDialog(this, 0, _("Character Settings"), false);
+       dialog_->familyCO->setCurrentItem(findPos2nd(family, controller().getFamily()));
+       dialog_->seriesCO->setCurrentItem(findPos2nd(series, controller().getSeries()));
+       dialog_->shapeCO->setCurrentItem(findPos2nd(shape, controller().getShape()));
+       dialog_->sizeCO->setCurrentItem(findPos2nd(size, controller().getSize()));
+       dialog_->miscCO->setCurrentItem(findPos2nd(bar, controller().getBar()));
+       dialog_->colorCO->setCurrentItem(findPos2nd(color, controller().getColor()));
+
+       dialog_->toggleallCB->setChecked(controller().getToggleAll());
  
-               // add languages
-               for (Languages::const_iterator cit = languages.begin();
-                       cit != languages.end(); ++cit) {
-                       string const language = cit->second.lang();
-                       dialog_->lang->insertItem(tostr(language).c_str(), -1);
+       string const thelanguage(controller().getLanguage());
+       int i = 0; 
+       for (vector<string>::const_iterator cit = language.begin();
+               cit != language.end(); ++i, ++cit) {
+               if (*cit == thelanguage) {
+                       dialog_->langCO->setCurrentItem(i);
+                       break;
                }
        }
-
-       if (!dialog_->isVisible()) {
-               h_ = d_->hideBufferDependent.connect(slot(this, &QCharacter::hide));
-               u_ = d_->updateBufferDependent.connect(slot(this, &QCharacter::update));
-       }
-
-       dialog_->raise();
-       dialog_->setActiveWindow();
-       update();
-       dialog_->show();
 }
 
  
-void QCharacter::close()
-{
-       h_.disconnect();
-       u_.disconnect();
-}
-
-
-void QCharacter::hide()
-{
-       dialog_->hide();
-       close();
-}
-
-
-void QCharacter::update(bool)
+void QCharacter::apply()
 {
-       if (!lv_->view()->available())
-               return;
-
-       dialog_->setReadOnly(lv_->buffer()->isReadonly());
+       controller().setFamily(family[dialog_->familyCO->currentItem()].second);
+       controller().setSeries(series[dialog_->seriesCO->currentItem()].second);
+       controller().setShape(shape[dialog_->shapeCO->currentItem()].second);
+       controller().setSize(size[dialog_->sizeCO->currentItem()].second);
+       controller().setBar(bar[dialog_->miscCO->currentItem()].second);
+       controller().setColor(color[dialog_->colorCO->currentItem()].second);
+       controller().setLanguage(dialog_->langCO->currentText().latin1());
+   
+       controller().setToggleAll(dialog_->toggleallCB->isChecked());
 }
index 7bee61c4a9dd46ec8d5b6907de499387a680c29a..ec23cc4f28ae0d3e9a978c6bc9ed81ce16f1f589 100644 (file)
@@ -1,61 +1,50 @@
 // -*- C++ -*-
 /**
  * \file QCharacter.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
  *
- * \author Edwin Leuven
+ * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author John Levon <moz@compsoc.man.ac.uk>
  */
 
 #ifndef QCHARACTER_H
 #define QCHARACTER_H
 
-#include "DialogBase.h"
+#include <config.h>
+#include <vector>
+#include "LString.h" 
+#include "Qt2Base.h"
+#include "controllers/character.h" 
 
-class LyXView;
-class Dialogs;
+class ControlCharacter;
 class QCharacterDialog;
 
-class QCharacter : public DialogBase {
-public:
-       ///
-       QCharacter(LyXView *, Dialogs *);
-       ///
-       ~QCharacter();
-
-       /// Apply changes.
-       void apply();
-       /// Close connections.
-       void close();
-
-private:
-
-       /// Show the dialog.
-       void show();
-       /// Hide the dialog.
-       void hide();
-       /// Update the dialog.
-       void update(bool switched = false);
-
-       /// Real GUI implementation.
-       QCharacterDialog * dialog_;
-
-       /// the LyXView we belong to.
-       LyXView * lv_;
-
-       /** Which Dialogs do we belong to?
-        *  Used so we can get at the signals we have to connect to.
-        */
-       Dialogs * d_;
-
-       /// is the buffer readonly?
-       bool readonly;
-
-       /// Hide connection.
-       SigC::Connection h_;
-
-       /// Update connection.
-       SigC::Connection u_;
+class QCharacter :
+       public Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> > 
+{
+       friend class QCharacterDialog;
+public: 
+       QCharacter(ControlCharacter &);
+
+private: 
+       /// Apply changes
+       virtual void apply();
+       /// update
+       virtual void update_contents();
+       /// build the dialog
+       virtual void build_dialog();
+       std::vector<character::FamilyPair> family;
+       std::vector<character::SeriesPair> series;
+       std::vector<character::ShapePair>  shape;
+       std::vector<character::SizePair>   size;
+       std::vector<character::BarPair>    bar;
+       std::vector<character::ColorPair>  color;
+       std::vector<string> language;
 };
 
 #endif // QCHARACTER_H
index e76d3e4fc1f91a15ee49d771986e270468a43ed9..254c48d3d71cca175295d0c8f7e42bf344c4c021 100644 (file)
  */
 
 #include "QCharacterDialog.h"
-#include "lyxtext.h"
-#include "language.h"
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 
-QCharacterDialog::QCharacterDialog(QCharacter * form, QWidget * parent,  const char * name, bool modal, WFlags fl)
-        : QCharacterDialogBase(parent, name, modal, fl), form_(form)
+QCharacterDialog::QCharacterDialog(QCharacter * form)
+       : QCharacterDialogBase(0, 0, false, 0), 
+       form_(form)
 {
-       setCaption(name);
+       connect(okPB, SIGNAL(clicked()),
+               form_, SLOT(slotOK()));
+       connect(applyPB, SIGNAL(clicked()),
+               form_, SLOT(slotApply()));
+       connect(closePB, SIGNAL(clicked()),
+               form_, SLOT(slotClose()));
 }
  
 
-QCharacterDialog::~QCharacterDialog()
+void QCharacterDialog::change_adaptor()
 {
-}
+       form_->changed();
  
-
-LyXFont QCharacterDialog::getChar()
-{
-       LyXFont font(LyXFont::ALL_IGNORE);
-       
-       switch (family->currentItem()) {
-               case 0: font.setFamily(LyXFont::IGNORE_FAMILY); break;
-               case 1: font.setFamily(LyXFont::INHERIT_FAMILY); break;
-               case 2: font.setFamily(LyXFont::ROMAN_FAMILY); break;
-               case 3: font.setFamily(LyXFont::SANS_FAMILY); break;
-               case 4: font.setFamily(LyXFont::TYPEWRITER_FAMILY); break;
-       }
-       
-       switch (series->currentItem()) {
-               case 0: font.setSeries(LyXFont::IGNORE_SERIES); break;
-               case 1: font.setSeries(LyXFont::INHERIT_SERIES); break;
-               case 2: font.setSeries(LyXFont::MEDIUM_SERIES); break;
-               case 3: font.setSeries(LyXFont::BOLD_SERIES); break;
-       }
-       
-       switch (shape->currentItem()) {
-               case 0: font.setShape(LyXFont::IGNORE_SHAPE); break;
-               case 1: font.setShape(LyXFont::INHERIT_SHAPE); break;
-               case 2: font.setShape(LyXFont::UP_SHAPE); break;
-               case 3: font.setShape(LyXFont::ITALIC_SHAPE); break;
-               case 4: font.setShape(LyXFont::SLANTED_SHAPE); break;
-               case 5: font.setShape(LyXFont::SMALLCAPS_SHAPE); break;
-       }
-       
-       switch (size->currentItem()) {
-               case 0: font.setSize(LyXFont::IGNORE_SIZE); break;
-               case 1: font.setSize(LyXFont::INHERIT_SIZE); break;
-               case 2: font.setSize(LyXFont::SIZE_TINY); break;
-               case 3: font.setSize(LyXFont::SIZE_SCRIPT); break;
-               case 4: font.setSize(LyXFont::SIZE_FOOTNOTE); break;
-               case 5: font.setSize(LyXFont::SIZE_SMALL); break;
-               case 6: font.setSize(LyXFont::SIZE_NORMAL); break;
-               case 7: font.setSize(LyXFont::SIZE_LARGE); break;
-               case 8: font.setSize(LyXFont::SIZE_LARGER); break;
-               case 9: font.setSize(LyXFont::SIZE_LARGEST); break;
-               case 10: font.setSize(LyXFont::SIZE_HUGE); break;
-               case 11: font.setSize(LyXFont::SIZE_HUGER); break;
-               case 12: font.setSize(LyXFont::INCREASE_SIZE); break;
-               case 13: font.setSize(LyXFont::DECREASE_SIZE); break;
-       }
-       
-       switch (misc->currentItem()) {
-               case 0: font.setEmph(LyXFont::IGNORE);
-                       font.setUnderbar(LyXFont::IGNORE);
-                       font.setNoun(LyXFont::IGNORE);
-                       // FIXME font.setLatex(LyXFont::IGNORE);
-                       break;
-               case 1: font.setEmph(LyXFont::INHERIT);
-                       font.setUnderbar(LyXFont::INHERIT);
-                       font.setNoun(LyXFont::INHERIT);
-                       // FIXME font.setLatex(LyXFont::INHERIT);
-                       break;
-               case 2: font.setEmph(LyXFont::TOGGLE); break;
-               case 3: font.setUnderbar(LyXFont::TOGGLE); break;
-               case 4: font.setNoun(LyXFont::TOGGLE); break;
-               case 5:  break; // FIXMEfont.setLatex(LyXFont::TOGGLE); break;
-       }
-       
-       switch (color->currentItem()) {
-               case 0: font.setColor(LColor::ignore); break;
-               case 1: font.setColor(LColor::inherit); break;
-               case 2: font.setColor(LColor::none); break;
-               case 3: font.setColor(LColor::black); break;
-               case 4: font.setColor(LColor::white); break;
-               case 5: font.setColor(LColor::red); break;
-               case 6: font.setColor(LColor::green); break;
-               case 7: font.setColor(LColor::blue); break;
-               case 8: font.setColor(LColor::cyan); break;
-               case 9: font.setColor(LColor::magenta); break;
-               case 10: font.setColor(LColor::yellow); break;
-       }
-       
-       int const pos = lang->currentItem();
-       if (pos == 0) {
-               font.setLanguage(ignore_language);
-       } else if (pos != 1) {
-               font.setLanguage(languages.getLanguage(lang->currentText().latin1()));
-       };
-
-       return font;
+       if (!autoapplyCB->isChecked())
+               return;
+
+       // to be really good here, we should set the combos to the values of
+       // the current text, and make it appear as "no change" if the values
+       // stay the same between applys. Might be difficult though wrt to a
+       // moved cursor - jbl
+       form_->slotApply();
+       familyCO->setCurrentItem(0);
+       seriesCO->setCurrentItem(0);
+       sizeCO->setCurrentItem(0);
+       shapeCO->setCurrentItem(0);
+       miscCO->setCurrentItem(0);
+       langCO->setCurrentItem(0);
+       colorCO->setCurrentItem(0); 
 }
 
  
 void QCharacterDialog::closeEvent(QCloseEvent * e)
 {
-       form_->close();
+       form_->slotWMHide();
        e->accept();
 }
-
-void QCharacterDialog::setReadOnly(bool readonly)
-{
-       sizeGB->setEnabled(!readonly);
-       charGB->setEnabled(!readonly);
-       miscGB->setEnabled(!readonly);
-       okPB->setEnabled(!readonly);
-       applyPB->setEnabled(!readonly);
-}
index 235f2f2c26a7c751caef8f74d0d31ecb18f051b7..9b755430e84a79580a4f3e66eb371300a5ba0dc2 100644 (file)
@@ -4,6 +4,7 @@
  * see the file COPYING
  *
  * \author Edwin Leuven
+ * \author John Levon <moz@compsoc.man.ac.uk>
  */
 
 #ifndef QCHARACTERDIALOG_H
@@ -24,24 +25,7 @@ class QCharacterDialog : public QCharacterDialogBase
 { Q_OBJECT
 
 public:
-       QCharacterDialog(QCharacter * form, QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0);
-       ~QCharacterDialog();
-       
-       /// FIXME
-       LyXFont getChar();
-       
-       /// return the currently selected language item
-       int langItem() {
-               return lang->currentItem();
-       };
-       
-       /// return true if toggle all is selected
-       bool toggleAll() {
-               return toggleall->isChecked();
-       };
-       
-       /// set dialog read only
-       void setReadOnly(bool);
+       QCharacterDialog(QCharacter * form);
        
 protected:
        void closeEvent(QCloseEvent * e);
@@ -50,22 +34,7 @@ private:
        QCharacter * form_;
 
 protected slots:
-       
-       void apply_adaptor() {
-               form_->apply();
-       }
-       
-       void cancel_adaptor() {
-               form_->close();
-               hide();
-       }
-       
-       void close_adaptor() {
-               form_->apply();
-               form_->close();
-               hide();
-       }
-
+       void change_adaptor();
 };
 
 #endif // QCHARACTERDIALOG_H
index ab6c1271931e03c0ec383f574f56b67501271aa4..a555aece52b060a0029de78b7f44fbd6e7942538 100644 (file)
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>412</width>
-            <height>291</height>
+            <width>372</width>
+            <height>256</height>
         </rect>
     </property>
     <property stdset="1">
@@ -29,7 +29,7 @@
     <property>
         <name>layoutSpacing</name>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="1" >
-            <class>QGroupBox</class>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>sizeGB</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Never toggled</string>
-            </property>
-            <property>
-                <name>layoutMargin</name>
+                <cstring>Layout6</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
-                    <number>11</number>
+                    <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QLabel</class>
+                    <class>QGroupBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>sizeL</cstring>
+                        <cstring>charGB</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Size:</string>
+                        <name>title</name>
+                        <string>Character</string>
                     </property>
-                </widget>
-                <widget>
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Tiny</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Smallest</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Smaller</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Small</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Normal</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Larger</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Largest</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huge</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huger</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Increase</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Decrease</string>
-                        </property>
-                    </item>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>size</cstring>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="1"  column="1" >
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>miscGB</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Always toggled</string>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>always_toggledL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Misc:</string>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>5</vsizetype>
+                        </sizepolicy>
                     </property>
+                    <property>
+                        <name>layoutMargin</name>
+                    </property>
+                    <grid>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>11</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget row="0"  column="0" >
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>familyLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Family:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>familyCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font family</string>
+                            </property>
+                        </widget>
+                        <widget row="0"  column="1" >
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>familyCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font family</string>
+                            </property>
+                        </widget>
+                        <widget row="1"  column="0" >
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>seriesLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Series:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>seriesCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font series</string>
+                            </property>
+                        </widget>
+                        <widget row="4"  column="0" >
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>langLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Language:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>langCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Language</string>
+                            </property>
+                        </widget>
+                        <widget row="2"  column="1" >
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>shapeCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font shape</string>
+                            </property>
+                        </widget>
+                        <widget row="3"  column="1" >
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>colorCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font color</string>
+                            </property>
+                        </widget>
+                        <widget row="2"  column="0" >
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>shapeLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>S&amp;hape:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>shapeCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font shape</string>
+                            </property>
+                        </widget>
+                        <widget row="1"  column="1" >
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>seriesCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font series</string>
+                            </property>
+                        </widget>
+                        <widget row="3"  column="0" >
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>colorLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>enabled</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Color:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>colorCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Font color</string>
+                            </property>
+                        </widget>
+                        <widget row="4"  column="1" >
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>langCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Language</string>
+                            </property>
+                        </widget>
+                        <widget row="5"  column="1" >
+                            <class>QCheckBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>toggleallCB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Toggle all</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>toggle font on all of the above</string>
+                            </property>
+                        </widget>
+                        <spacer row="6"  column="1" >
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer2</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>orientation</name>
+                                <enum>Vertical</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>sizeType</name>
+                                <enum>Expanding</enum>
+                            </property>
+                            <property>
+                                <name>sizeHint</name>
+                                <size>
+                                    <width>20</width>
+                                    <height>20</height>
+                                </size>
+                            </property>
+                        </spacer>
+                    </grid>
                 </widget>
                 <widget>
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Emph</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Underbar</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Noun</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>LaTeX Mode</string>
-                        </property>
-                    </item>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>misc</cstring>
-                    </property>
+                        <cstring>Layout5</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QGroupBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>sizeGB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>title</name>
+                                <string>Never toggled</string>
+                            </property>
+                            <property>
+                                <name>layoutMargin</name>
+                            </property>
+                            <hbox>
+                                <property stdset="1">
+                                    <name>margin</name>
+                                    <number>11</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>spacing</name>
+                                    <number>6</number>
+                                </property>
+                                <widget>
+                                    <class>QLabel</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>sizeLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>Si&amp;ze:</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>sizeCO</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Font size</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QComboBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>sizeCO</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Font size</string>
+                                    </property>
+                                </widget>
+                            </hbox>
+                        </widget>
+                        <widget>
+                            <class>QGroupBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>miscGB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>title</name>
+                                <string>Always toggled</string>
+                            </property>
+                            <property>
+                                <name>layoutMargin</name>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Other font settings</string>
+                            </property>
+                            <hbox>
+                                <property stdset="1">
+                                    <name>margin</name>
+                                    <number>11</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>spacing</name>
+                                    <number>6</number>
+                                </property>
+                                <widget>
+                                    <class>QLabel</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>miscLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Misc:</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>miscCO</cstring>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QComboBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>miscCO</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Other font settings</string>
+                                    </property>
+                                </widget>
+                            </hbox>
+                        </widget>
+                        <widget>
+                            <class>QCheckBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>autoapplyCB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Auto apply</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Apply each change automatically</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer3</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>orientation</name>
+                                <enum>Vertical</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>sizeType</name>
+                                <enum>Expanding</enum>
+                            </property>
+                            <property>
+                                <name>sizeHint</name>
+                                <size>
+                                    <width>20</width>
+                                    <height>20</height>
+                                </size>
+                            </property>
+                        </spacer>
+                    </vbox>
                 </widget>
             </hbox>
         </widget>
-        <widget row="0"  column="0"  rowspan="3"  colspan="1" >
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>charGB</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Character</string>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
-                </sizepolicy>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>familyL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Family:</string>
-                    </property>
-                </widget>
-                <widget row="0"  column="1" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Roman</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Sans Serif</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Typewriter</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>family</cstring>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>seriesL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Series:</string>
-                    </property>
-                </widget>
-                <widget row="4"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>langL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Language:</string>
-                    </property>
-                </widget>
-                <widget row="2"  column="1" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Upright</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Italic</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Slanted</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Small Caps</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>shape</cstring>
-                    </property>
-                </widget>
-                <widget row="3"  column="1" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Color</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Black</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>White</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Red</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Green</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Blue</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Cyan</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Yellow</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Magenta</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>color</cstring>
-                    </property>
-                </widget>
-                <widget row="2"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>shapeL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Shape:</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="1" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Medium</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Bold</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>series</cstring>
-                    </property>
-                </widget>
-                <widget row="3"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>colorL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>true</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Color:</string>
-                    </property>
-                </widget>
-                <widget row="4"  column="1" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>No Change</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Reset</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>lang</cstring>
-                    </property>
-                </widget>
-                <widget row="5"  column="1" >
-                    <class>QCheckBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>toggleall</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Toggle all</string>
-                    </property>
-                </widget>
-                <spacer row="6"  column="1" >
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Vertical</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-        <spacer row="2"  column="1" >
-            <property>
-                <name>name</name>
-                <cstring>Spacer3</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget row="3"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout9</cstring>
+                <cstring>Layout2</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>applyPB</cstring>
+                        <cstring>okPB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Apply</string>
+                        <string>&amp;OK</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>okPB</cstring>
+                        <cstring>applyPB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;OK</string>
+                        <string>&amp;Apply</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>cancelPB</cstring>
+                        <cstring>closePB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Cancel</string>
+                        <string>&amp;Close</string>
                     </property>
                     <property stdset="1">
                         <name>default</name>
                 </widget>
             </hbox>
         </widget>
-    </grid>
+    </vbox>
 </widget>
 <connections>
     <connection>
-        <sender>cancelPB</sender>
-        <signal>clicked()</signal>
+        <sender>miscCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCharacterDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>sizeCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCharacterDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>familyCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCharacterDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>seriesCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCharacterDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>shapeCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCharacterDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>colorCO</sender>
+        <signal>activated(int)</signal>
         <receiver>QCharacterDialogBase</receiver>
-        <slot>cancel_adaptor()</slot>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>okPB</sender>
-        <signal>clicked()</signal>
+        <sender>langCO</sender>
+        <signal>activated(int)</signal>
         <receiver>QCharacterDialogBase</receiver>
-        <slot>close_adaptor()</slot>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>applyPB</sender>
-        <signal>clicked()</signal>
+        <sender>toggleallCB</sender>
+        <signal>toggled(bool)</signal>
         <receiver>QCharacterDialogBase</receiver>
-        <slot>apply_adaptor()</slot>
+        <slot>change_adaptor()</slot>
     </connection>
-    <slot access="protected">apply_adaptor()</slot>
-    <slot access="protected">cancel_adaptor()</slot>
-    <slot access="protected">close_adaptor()</slot>
+    <slot access="public">change_adaptor()</slot>
 </connections>
 <tabstops>
-    <tabstop>family</tabstop>
-    <tabstop>series</tabstop>
-    <tabstop>shape</tabstop>
-    <tabstop>color</tabstop>
-    <tabstop>lang</tabstop>
-    <tabstop>toggleall</tabstop>
-    <tabstop>size</tabstop>
-    <tabstop>misc</tabstop>
+    <tabstop>familyCO</tabstop>
+    <tabstop>seriesCO</tabstop>
+    <tabstop>shapeCO</tabstop>
+    <tabstop>colorCO</tabstop>
+    <tabstop>langCO</tabstop>
+    <tabstop>toggleallCB</tabstop>
+    <tabstop>sizeCO</tabstop>
+    <tabstop>miscCO</tabstop>
     <tabstop>applyPB</tabstop>
     <tabstop>okPB</tabstop>
-    <tabstop>cancelPB</tabstop>
+    <tabstop>closePB</tabstop>
 </tabstops>
 </UI>