Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiPrefs.cpp

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 985e948b01fcffb27e463e4526b2f4ce98b4aa0f..1b781fb45a7fbe8251b0a6bb12d7a3a6d446f751 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -210,9 +210,10 @@ QString browseRelFile(QString const & filename, QString const & refpath,
 
 namespace frontend {
 
-string const catOutput = N_("Output");
 string const catLookAndFeel = N_("Look & Feel");
+string const catEditing = N_("Editing");
 string const catLanguage = N_("Language Settings");
+string const catOutput = N_("Output");
 string const catFiles = N_("File Handling");
 
 static int findPos_helper(QStringList const & vec, QString const & val)
@@ -385,7 +386,7 @@ void PrefDate::update(LyXRC const & rc)
 /////////////////////////////////////////////////////////////////////
 
 PrefInput::PrefInput(GuiPreferences * form, QWidget * parent)
-       : PrefModule(qt_(catLookAndFeel), qt_("Keyboard/Mouse"), form, parent)
+       : PrefModule(qt_(catEditing), qt_("Keyboard/Mouse"), form, parent)
 {
        setupUi(this);
 
@@ -460,7 +461,7 @@ void PrefInput::on_keymapCB_toggled(bool keymap)
 /////////////////////////////////////////////////////////////////////
 
 PrefCompletion::PrefCompletion(GuiPreferences * form, QWidget * parent)
-       : PrefModule(qt_(catLookAndFeel), qt_("Input Completion"), form, parent)
+       : PrefModule(qt_(catEditing), qt_("Input Completion"), form, parent)
 {
        setupUi(this);
 
@@ -1837,8 +1838,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form, QWidget * parent)
                this, SIGNAL(changed()));
        connect(tooltipCB, SIGNAL(toggled(bool)),
                this, SIGNAL(changed()));
-       connect(useBundledCB, SIGNAL(toggled(bool)),
-               this, SIGNAL(changed()));
        lastfilesSB->setMaximum(maxlastfiles);
 }
 
@@ -1854,7 +1853,6 @@ void PrefUserInterface::apply(LyXRC & rc) const
        rc.num_lastfiles = lastfilesSB->value();
        rc.use_tooltip = tooltipCB->isChecked();
        rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
-       rc.use_bundled_format = useBundledCB->isChecked();
 }
 
 
@@ -1873,7 +1871,6 @@ void PrefUserInterface::update(LyXRC const & rc)
        lastfilesSB->setValue(rc.num_lastfiles);
        tooltipCB->setChecked(rc.use_tooltip);
        openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
-       useBundledCB->setChecked(rc.use_bundled_format);
 }
 
 
@@ -1891,7 +1888,7 @@ void PrefUserInterface::select_ui()
 /////////////////////////////////////////////////////////////////////
 
 PrefEdit::PrefEdit(GuiPreferences * form, QWidget * parent)
-       : PrefModule(qt_(catLookAndFeel), qt_("Editing"), form, parent)
+       : PrefModule(qt_(catEditing), qt_("Control"), form, parent)
 {
        setupUi(this);
 
@@ -1963,7 +1960,7 @@ GuiShortcutDialog::GuiShortcutDialog(QWidget * parent) : QDialog(parent)
 
 
 PrefShortcuts::PrefShortcuts(GuiPreferences * form, QWidget * parent)
-       : PrefModule(qt_(catLookAndFeel), qt_("Shortcuts"), form, parent)
+       : PrefModule(qt_(catEditing), qt_("Shortcuts"), form, parent)
 {
        setupUi(this);
 
@@ -2046,23 +2043,23 @@ void PrefShortcuts::updateShortcutsTW()
        shortcutsTW->clear();
 
        editItem_ = new QTreeWidgetItem(shortcutsTW);
-       editItem_->setText(0, toqstr("Cursor, Mouse and Editing functions"));
+       editItem_->setText(0, qt_("Cursor, Mouse and Editing functions"));
        editItem_->setFlags(editItem_->flags() & ~Qt::ItemIsSelectable);
 
        mathItem_ = new QTreeWidgetItem(shortcutsTW);
-       mathItem_->setText(0, toqstr("Mathematical Symbols"));
+       mathItem_->setText(0, qt_("Mathematical Symbols"));
        mathItem_->setFlags(mathItem_->flags() & ~Qt::ItemIsSelectable);
        
        bufferItem_ = new QTreeWidgetItem(shortcutsTW);
-       bufferItem_->setText(0, toqstr("Buffer and Window"));
+       bufferItem_->setText(0, qt_("Buffer and Window"));
        bufferItem_->setFlags(bufferItem_->flags() & ~Qt::ItemIsSelectable);
        
        layoutItem_ = new QTreeWidgetItem(shortcutsTW);
-       layoutItem_->setText(0, toqstr("Font, Layouts and Textclasses"));
+       layoutItem_->setText(0, qt_("Font, Layouts and Textclasses"));
        layoutItem_->setFlags(layoutItem_->flags() & ~Qt::ItemIsSelectable);
 
        systemItem_ = new QTreeWidgetItem(shortcutsTW);
-       systemItem_->setText(0, toqstr("System and Miscellaneous"));
+       systemItem_->setText(0, qt_("System and Miscellaneous"));
        systemItem_->setFlags(systemItem_->flags() & ~Qt::ItemIsSelectable);
 
        // listBindings(unbound=true) lists all bound and unbound lfuns
@@ -2119,11 +2116,11 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
        FuncCode action = lfun.action;
        string const action_name = lyxaction.getActionName(action);
        QString const lfun_name = toqstr(from_utf8(action_name) 
-                       + " " + lfun.argument());
+                       + ' ' + lfun.argument());
        QString const shortcut = toqstr(seq.print(KeySequence::ForGui));
        item_type item_tag = tag;
 
-       QTreeWidgetItem * newItem = NULL;
+       QTreeWidgetItem * newItem = 0;
        // for unbind items, try to find an existing item in the system bind list
        if (tag == UserUnbind) {
                QList<QTreeWidgetItem*> const items = shortcutsTW->findItems(lfun_name, 
@@ -2138,13 +2135,13 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
                // unmatched removed?).
                if (!newItem) {
                        item_tag = UserExtraUnbind;
-                       return NULL;
+                       return 0;
                }
        }
        if (!newItem) {
                switch(lyxaction.getActionType(action)) {
                case LyXAction::Hidden:
-                       return NULL;
+                       return 0;
                case LyXAction::Edit:
                        newItem = new QTreeWidgetItem(editItem_);
                        break;
@@ -2184,9 +2181,9 @@ void PrefShortcuts::on_shortcutsTW_itemSelectionChanged()
        
        item_type tag = static_cast<item_type>(items[0]->data(0, Qt::UserRole).toInt());
        if (tag == UserUnbind)
-               removePB->setText(toqstr("Restore"));
+               removePB->setText(qt_("Res&tore"));
        else
-               removePB->setText(toqstr("Remove"));
+               removePB->setText(qt_("Remo&ve"));
 }
 
 
@@ -2241,7 +2238,7 @@ void PrefShortcuts::on_removePB_pressed()
                        // but add an user unbind item
                        user_unbind_.bind(shortcut, func);
                        setItemType(items[i], UserUnbind);
-                       removePB->setText(toqstr("Restore"));
+                       removePB->setText(qt_("Res&tore"));
                        break;
                }
                case UserBind: {
@@ -2261,7 +2258,7 @@ void PrefShortcuts::on_removePB_pressed()
                        // become System again.
                        user_unbind_.unbind(shortcut, func);
                        setItemType(items[i], System);
-                       removePB->setText(toqstr("Remove"));
+                       removePB->setText(qt_("Remo&ve"));
                        break;
                }
                case UserExtraUnbind: {
@@ -2445,7 +2442,7 @@ GuiPreferences::GuiPreferences(GuiView & lv)
 
 void GuiPreferences::add(PrefModule * module)
 {
-       BOOST_ASSERT(module);
+       LASSERT(module, /**/);
        if (module->category().isEmpty())
                prefsPS->addPanel(module, module->title());
        else