natbib support for citation dialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3425 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2141f6c0672eabe4f054293fb12c721dd8d5ad82..b6dfacae0620fcb8179a3b352873c0c359040e75 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-20  John Levon  <moz@compsoc.man.ac.uk>
+
+       * QCitation.h:
+       * QCitation.C:
+       * QCitationDialog.h:
+       * QCitationDialog.C:
+       * ui/QCitationDialog.ui: natbib fixes
+
 2002-01-19  Edwin Leuven  <leuven@fee.uva.nl>
 
        * QTexinfo.[Ch]: added

diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C
index 0d1770dedaf688a8f6647282e07d4714dcca995e..74c9c71bbd303312c6c2e3272b1a143b1c80067e 100644 (file)
--- a/src/frontends/qt2/QCitation.C
+++ b/src/frontends/qt2/QCitation.C
@@ -48,9 +48,19 @@ QCitation::QCitation(ControlCitation & c)
 
 void QCitation::apply()
 {
-       controller().params().setCmdName("cite");
+       vector<biblio::CiteStyle> const & styles =
+               ControlCitation::getCiteStyles();
+ 
+       int const choice = dialog_->citationStyleCO->currentItem();
+       bool const full  = dialog_->fulllistCB->isChecked();
+       bool const force = dialog_->forceuppercaseCB->isChecked();
+ 
+        string const command =
+                biblio::getCiteCommand(styles[choice], full, force);
+ 
+       controller().params().setCmdName(command);
        controller().params().setContents(getStringFromVector(citekeys));
-       
+ 
        string const after  = dialog_->textAfterED->text().latin1();
        controller().params().setOptions(after);
 }
@@ -83,18 +93,68 @@ void QCitation::build_dialog()
        bc().addReadOnly(dialog_->upPB);
        bc().addReadOnly(dialog_->downPB);
        bc().addReadOnly(dialog_->citationStyleCO);
+       bc().addReadOnly(dialog_->forceuppercaseCB);
+       bc().addReadOnly(dialog_->fulllistCB);
        // add when enabled ! 
        //bc().addReadOnly(dialog_->textBeforeED);
        bc().addReadOnly(dialog_->textAfterED);
 }
 
 
+void QCitation::fillStyles()
+{
+       // style
+       string key;
+
+       if (!citekeys.empty())
+               key = citekeys[0];
+ 
+       dialog_->citationStyleCO->clear();
+       vector<string> const & sty = controller().getCiteStrings(key);
+ 
+       for (vector<string>::const_iterator it = sty.begin();
+               it != sty.end(); ++it) {
+               dialog_->citationStyleCO->insertItem(it->c_str());
+       }
+}
+ 
+
+void QCitation::updateStyle()
+{
+       string const & command = controller().params().getCmdName();
+ 
+       // Find the style of the citekeys
+       vector<biblio::CiteStyle> const & styles =
+               ControlCitation::getCiteStyles();
+        biblio::CitationStyle cs = biblio::getCitationStyle(command);
+ 
+       vector<biblio::CiteStyle>::const_iterator cit =
+               find(styles.begin(), styles.end(), cs.style);
+ 
+       dialog_->citationStyleCO->setCurrentItem(0);
+       dialog_->fulllistCB->setChecked(false); 
+       dialog_->forceuppercaseCB->setChecked(false); 
+ 
+       if (cit != styles.end()) {
+               int const i = int(cit - styles.begin());
+               dialog_->citationStyleCO->setCurrentItem(i);
+               dialog_->fulllistCB->setChecked(cs.full);
+               dialog_->forceuppercaseCB->setChecked(cs.forceUCase);
+       } 
+
+       bool const natbib = controller().usingNatbib();
+       dialog_->citationStyleCO->setEnabled(natbib); 
+       dialog_->fulllistCB->setEnabled(natbib); 
+       dialog_->forceuppercaseCB->setEnabled(natbib); 
+}
+ 
+
 void QCitation::update_contents()
 {
        // Make the list of all available bibliography keys
        bibkeys = biblio::getKeys(controller().bibkeysInfo());
        updateBrowser(dialog_->bibLB, bibkeys);
-       
+
        // Ditto for the keys cited in this inset
        citekeys = getVectorFromString(controller().params().getContents());
        updateBrowser(dialog_->citeLB, citekeys);
@@ -105,8 +165,12 @@ void QCitation::update_contents()
        setCiteButtons(OFF);
 
        dialog_->textAfterED->setText(controller().params().getOptions().c_str());
-}
 
+       fillStyles();
+ 
+       updateStyle();
+}
+ 
 
 void QCitation::updateBrowser(QListBox* browser,
                                  vector<string> const & keys) const

diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h
index 248337f71432a25ca89a6b0a69bfb748e706ca0c..63979386f1d13f7c04b8402868ca972fe76039aa 100644 (file)
--- a/src/frontends/qt2/QCitation.h
+++ b/src/frontends/qt2/QCitation.h
@@ -48,6 +48,12 @@ private:
        /// Update dialog before/whilst showing it.
        virtual void update_contents();
 
+       /// fill the styles combo
+       void fillStyles();
+ 
+       /// set the styles combo
+       void updateStyle();
+ 
        void updateBrowser(QListBox *, std::vector<string> const &) const;
        ///
        void setBibButtons(State) const;

diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui
index b1e079c2d14ab0f43e566315f06ac51fb1b65e2e..c51a9a501d935d84660e4e202e6287b7b3da8229 100644 (file)
--- a/src/frontends/qt2/ui/QCitationDialog.ui
+++ b/src/frontends/qt2/ui/QCitationDialog.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>427</width>
-            <height>585</height>
+            <width>522</width>
+            <height>365</height>
         </rect>
     </property>
     <property stdset="1">
@@ -34,9 +34,9 @@
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout24</cstring>
+                <cstring>Layout17</cstring>
             </property>
-            <grid>
+            <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -45,13 +45,13 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget row="1"  column="1" >
+                <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout1</cstring>
+                        <cstring>Layout24</cstring>
                     </property>
-                    <vbox>
+                    <grid>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
@@ -60,287 +60,441 @@
                             <name>spacing</name>
                             <number>6</number>
                         </property>
-                        <widget>
-                            <class>QPushButton</class>
+                        <widget row="1"  column="1" >
+                            <class>QLayoutWidget</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>addPB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string></string>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>pixmap</name>
-                                <pixmap>image0</pixmap>
-                            </property>
-                            <property>
-                                <name>toolTip</name>
-                                <string>Add the selected citation</string>
-                            </property>
+                                <cstring>Layout1</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>QPushButton</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>addPB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>0</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string></string>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>pixmap</name>
+                                        <pixmap>image0</pixmap>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Add the selected citation</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QPushButton</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>delPB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>0</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string></string>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>pixmap</name>
+                                        <pixmap>image1</pixmap>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Remove the selected citation</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QPushButton</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>upPB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>0</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string></string>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>pixmap</name>
+                                        <pixmap>image2</pixmap>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Move the selected citation up</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QPushButton</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>downPB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>0</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string></string>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>pixmap</name>
+                                        <pixmap>image3</pixmap>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Move the selected citation down</string>
+                                    </property>
+                                </widget>
+                            </vbox>
                         </widget>
-                        <widget>
-                            <class>QPushButton</class>
+                        <widget row="0"  column="2" >
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>delPB</cstring>
+                                <cstring>bibliographyKeysLA</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string></string>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>pixmap</name>
-                                <pixmap>image1</pixmap>
-                            </property>
-                            <property>
-                                <name>toolTip</name>
-                                <string>Remove the selected citation</string>
+                                <string>Bibliography keys</string>
                             </property>
                         </widget>
-                        <widget>
-                            <class>QPushButton</class>
+                        <widget row="0"  column="0" >
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>upPB</cstring>
+                                <cstring>insetKeysLA</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string></string>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
+                                <string>Inset keys</string>
                             </property>
+                        </widget>
+                        <widget row="1"  column="2" >
+                            <class>QListBox</class>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>New Item</string>
+                                </property>
+                            </item>
                             <property stdset="1">
-                                <name>pixmap</name>
-                                <pixmap>image2</pixmap>
+                                <name>name</name>
+                                <cstring>bibLB</cstring>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Move the selected citation up</string>
+                                <string>Available citation keys</string>
                             </property>
                         </widget>
-                        <widget>
-                            <class>QPushButton</class>
+                        <widget row="1"  column="0" >
+                            <class>QListBox</class>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>New Item</string>
+                                </property>
+                            </item>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>downPB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string></string>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
+                                <cstring>citeLB</cstring>
                             </property>
                             <property stdset="1">
-                                <name>pixmap</name>
-                                <pixmap>image3</pixmap>
+                                <name>selectionMode</name>
+                                <enum>Single</enum>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Move the selected citation down</string>
+                                <string>Citations currently selected</string>
                             </property>
                         </widget>
-                    </vbox>
-                </widget>
-                <widget row="0"  column="2" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bibliographyKeysLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Bibliography keys</string>
-                    </property>
+                    </grid>
                 </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
+                <widget>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>insetKeysLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Inset keys</string>
+                        <cstring>Layout16</cstring>
                     </property>
-                </widget>
-                <widget row="1"  column="2" >
-                    <class>QListBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>New Item</string>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
                         </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bibLB</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Available citation keys</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QListBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>New Item</string>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
                         </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>citeLB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>selectionMode</name>
-                        <enum>Single</enum>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Citations currently selected</string>
-                    </property>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout13</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>QLabel</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>infoLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>Info</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QMultiLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>infoML</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>focusPolicy</name>
+                                        <enum>NoFocus</enum>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>wordWrap</name>
+                                        <enum>WidgetWidth</enum>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>readOnly</name>
+                                        <bool>true</bool>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Citation entry</string>
+                                    </property>
+                                </widget>
+                            </vbox>
+                        </widget>
+                        <widget>
+                            <class>QGroupBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>GroupBox4</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>title</name>
+                                <string>Search</string>
+                            </property>
+                            <vbox>
+                                <property stdset="1">
+                                    <name>margin</name>
+                                    <number>11</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>spacing</name>
+                                    <number>6</number>
+                                </property>
+                                <widget>
+                                    <class>QLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>searchED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Search the available citations</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QLayoutWidget</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>Layout37</cstring>
+                                    </property>
+                                    <hbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QCheckBox</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>searchTypeCB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>Regular E&amp;xpression</string>
+                                            </property>
+                                            <property>
+                                                <name>toolTip</name>
+                                                <string>Interpret search entry as a regular expression</string>
+                                            </property>
+                                        </widget>
+                                        <spacer>
+                                            <property>
+                                                <name>name</name>
+                                                <cstring>Spacer2_2</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>orientation</name>
+                                                <enum>Horizontal</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>
+                                            <class>QPushButton</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>previousPB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>&amp;Previous</string>
+                                            </property>
+                                        </widget>
+                                    </hbox>
+                                </widget>
+                                <widget>
+                                    <class>QLayoutWidget</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>Layout38</cstring>
+                                    </property>
+                                    <hbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QCheckBox</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>searchCaseCB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>&amp;Case sensitive</string>
+                                            </property>
+                                            <property>
+                                                <name>toolTip</name>
+                                                <string>Make the search case-sensitive</string>
+                                            </property>
+                                        </widget>
+                                        <spacer>
+                                            <property>
+                                                <name>name</name>
+                                                <cstring>Spacer3_2</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>orientation</name>
+                                                <enum>Horizontal</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>
+                                            <class>QPushButton</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>nextPB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>&amp;Next</string>
+                                            </property>
+                                        </widget>
+                                    </hbox>
+                                </widget>
+                            </vbox>
+                        </widget>
+                    </vbox>
                 </widget>
-            </grid>
-        </widget>
-        <spacer>
-            <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>
-        <widget>
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>infoLA</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Info</string>
-            </property>
-        </widget>
-        <widget>
-            <class>QMultiLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>infoML</cstring>
-            </property>
-            <property stdset="1">
-                <name>wordWrap</name>
-                <enum>WidgetWidth</enum>
-            </property>
-            <property stdset="1">
-                <name>readOnly</name>
-                <bool>true</bool>
-            </property>
-            <property stdset="1">
-                <name>focusPolicy</name>
-                <enum>NoFocus</enum>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Citation entry</string>
-            </property>
+            </hbox>
         </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>
         <widget>
-            <class>QGroupBox</class>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>GroupBox4</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Search</string>
+                <cstring>Layout18</cstring>
             </property>
-            <vbox>
+            <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>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>searchED</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Search the available citations</string>
-                    </property>
-                </widget>
                 <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout37</cstring>
+                        <cstring>Layout19</cstring>
                     </property>
-                    <hbox>
+                    <vbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
@@ -350,61 +504,64 @@
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QCheckBox</class>
+                            <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>searchTypeCB</cstring>
+                                <cstring>citationStyleLA</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Regular E&amp;xpression</string>
-                            </property>
-                            <property>
-                                <name>toolTip</name>
-                                <string>Interpret search entry as a regular expression</string>
+                                <string>Citation style</string>
                             </property>
                         </widget>
-                        <spacer>
-                            <property>
-                                <name>name</name>
-                                <cstring>Spacer2_2</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Horizontal</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>
-                            <class>QPushButton</class>
+                            <class>QComboBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>previousPB</cstring>
+                                <cstring>citationStyleCO</cstring>
                             </property>
                             <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;Previous</string>
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>3</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                </sizepolicy>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Natbib citation style to use</string>
                             </property>
                         </widget>
-                    </hbox>
+                    </vbox>
                 </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer16</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</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>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout38</cstring>
+                        <cstring>Layout17</cstring>
                     </property>
-                    <hbox>
+                    <vbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
@@ -417,81 +574,43 @@
                             <class>QCheckBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>searchCaseCB</cstring>
+                                <cstring>fulllistCB</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>&amp;Case sensitive</string>
+                                <string>&amp;Full author list</string>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Make the search case-sensitive</string>
+                                <string>List all authors</string>
                             </property>
                         </widget>
-                        <spacer>
-                            <property>
-                                <name>name</name>
-                                <cstring>Spacer3_2</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Horizontal</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>
-                            <class>QPushButton</class>
+                            <class>QCheckBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>nextPB</cstring>
+                                <cstring>forceuppercaseCB</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>&amp;Next</string>
+                                <string>Force &amp;upper case</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Force upper case in citation</string>
                             </property>
                         </widget>
-                    </hbox>
+                    </vbox>
                 </widget>
-            </vbox>
+            </hbox>
         </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer1</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>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout25</cstring>
+                <cstring>Layout14</cstring>
             </property>
-            <hbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -500,75 +619,22 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QLabel</class>
+                <widget row="1"  column="1" >
+                    <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>citationStyleLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Citation style</string>
+                        <cstring>textAfterED</cstring>
                     </property>
-                </widget>
-                <widget>
-                    <class>QComboBox</class>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>citationStyleCO</cstring>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>FIXME</string>
-                    </property>
-                </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer8</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</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>
-            </hbox>
-        </widget>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout9</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</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>textBeforeLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Text before</string>
+                        <string>Text to place after citation</string>
                     </property>
                 </widget>
                 <widget row="1"  column="0" >
@@ -588,20 +654,27 @@
                         <name>name</name>
                         <cstring>textBeforeED</cstring>
                     </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
                     <property>
                         <name>toolTip</name>
                         <string>Text to place before citation</string>
                     </property>
                 </widget>
-                <widget row="1"  column="1" >
-                    <class>QLineEdit</class>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>textAfterED</cstring>
+                        <cstring>textBeforeLA</cstring>
                     </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Text to place after citation</string>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Text before</string>
                     </property>
                 </widget>
             </grid>
@@ -663,14 +736,14 @@
                         <name>text</name>
                         <string>OK</string>
                     </property>
-                    <property stdset="1">
-                        <name>default</name>
-                        <bool>false</bool>
-                    </property>
                     <property stdset="1">
                         <name>autoDefault</name>
                         <bool>true</bool>
                     </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -765,12 +838,6 @@
         <receiver>QCitationDialogBase</receiver>
         <slot>changed_adaptor()</slot>
     </connection>
-    <connection>
-        <sender>citationStyleCO</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QCitationDialogBase</receiver>
-        <slot>changed_adaptor()</slot>
-    </connection>
     <connection>
         <sender>citeLB</sender>
         <signal>highlighted(int)</signal>
@@ -795,6 +862,24 @@
         <receiver>QCitationDialogBase</receiver>
         <slot>slotBibSelected(int)</slot>
     </connection>
+    <connection>
+        <sender>fulllistCB</sender>
+        <signal>clicked()</signal>
+        <receiver>QCitationDialogBase</receiver>
+        <slot>changed_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>forceuppercaseCB</sender>
+        <signal>clicked()</signal>
+        <receiver>QCitationDialogBase</receiver>
+        <slot>changed_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>citationStyleCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QCitationDialogBase</receiver>
+        <slot>changed_adaptor()</slot>
+    </connection>
     <slot access="public">changed_adaptor()</slot>
     <slot access="public">slotBibSelected(int)</slot>
     <slot access="protected">slotAddClicked()</slot>