anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 02:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Citation dialog redesign

Browse Source
This commit is contained in:
Juergen Spitzmueller 2016-10-21 22:03:19 +02:00
parent 98eeaceb5e
commit 54248a6e98
4 changed files with 391 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/frontends/qt4/GuiCitation.cpp
View File

@ -16,6 +16,7 @@
#include "GuiCitation.h" #include "GuiCitation.h"
#include "GuiApplication.h"
#include "GuiSelectionManager.h" #include "GuiSelectionManager.h"
#include "LyXToolBox.h" #include "LyXToolBox.h"
#include "qt_helpers.h" #include "qt_helpers.h"
@ -34,6 +35,7 @@
#include "support/lstrings.h" #include "support/lstrings.h"
#include <QCloseEvent> #include <QCloseEvent>
#include <QMenu>
#include <QSettings> #include <QSettings>
#include <QShowEvent> #include <QShowEvent>
#include <QVariant> #include <QVariant>
@ -93,6 +95,36 @@ GuiCitation::GuiCitation(GuiView & lv)
{ {
setupUi(this); setupUi(this);
// The filter bar
filter_ = new FancyLineEdit(this);
#if QT_VERSION >= 0x040600
filter_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "svgz,png"));
filter_->setButtonVisible(FancyLineEdit::Right, true);
filter_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
filter_->setAutoHideButton(FancyLineEdit::Right, true);
#endif
#if QT_VERSION >= 0x040700
filter_->setPlaceholderText(qt_("All avail. citations"));
#endif
filterBarL->addWidget(filter_, 0);
findKeysLA->setBuddy(filter_);
// Add search options as button menu
regexp_ = new QAction(qt_("Regular e&xpression"), this);
regexp_->setCheckable(true);
casesense_ = new QAction(qt_("Case se&nsitive"), this);
casesense_->setCheckable(true);
instant_ = new QAction(qt_("Search as you &type"), this);
instant_->setCheckable(true);
instant_->setChecked(true);
QMenu * searchOpts = new QMenu(this);
searchOpts->addAction(regexp_);
searchOpts->addAction(casesense_);
searchOpts->addAction(instant_);
searchOptionsPB->setMenu(searchOpts);
connect(citationStyleCO, SIGNAL(activated(int)), connect(citationStyleCO, SIGNAL(activated(int)),
this, SLOT(on_citationStyleCO_currentIndexChanged(int))); this, SLOT(on_citationStyleCO_currentIndexChanged(int)));
connect(fulllistCB, SIGNAL(clicked()), connect(fulllistCB, SIGNAL(clicked()),
@ -103,8 +135,6 @@ GuiCitation::GuiCitation(GuiView & lv)
this, SLOT(updateStyles())); this, SLOT(updateStyles()));
connect(textAfterED, SIGNAL(textChanged(QString)), connect(textAfterED, SIGNAL(textChanged(QString)),
this, SLOT(updateStyles())); this, SLOT(updateStyles()));
connect(findLE, SIGNAL(returnPressed()),
this, SLOT(on_searchPB_clicked()));
connect(textBeforeED, SIGNAL(returnPressed()), connect(textBeforeED, SIGNAL(returnPressed()),
this, SLOT(on_okPB_clicked())); this, SLOT(on_okPB_clicked()));
connect(textAfterED, SIGNAL(returnPressed()), connect(textAfterED, SIGNAL(returnPressed()),
@ -119,7 +149,20 @@ GuiCitation::GuiCitation(GuiView & lv)
connect(selectionManager, SIGNAL(okHook()), connect(selectionManager, SIGNAL(okHook()),
this, SLOT(on_okPB_clicked())); this, SLOT(on_okPB_clicked()));
setFocusProxy(availableLV); connect(filter_, SIGNAL(rightButtonClicked()),
this, SLOT(resetFilter()));
connect(filter_, SIGNAL(textEdited(QString)),
this, SLOT(filterChanged(QString)));
connect(filter_, SIGNAL(returnPressed()),
this, SLOT(filterPressed()));
connect(regexp_, SIGNAL(triggered()),
this, SLOT(regexChanged()));
connect(casesense_, SIGNAL(triggered()),
this, SLOT(caseChanged()));
connect(instant_, SIGNAL(triggered(bool)),
this, SLOT(instantChanged(bool)));
setFocusProxy(filter_);
} }
@ -152,42 +195,12 @@ void GuiCitation::applyView()
void GuiCitation::showEvent(QShowEvent * e) void GuiCitation::showEvent(QShowEvent * e)
{ {
findLE->clear(); filter_->clear();
availableLV->setFocus(); availableLV->setFocus();
// Set the minimal size of the QToolbox. Without this, the size of the
// QToolbox is only determined by values in the ui file (e.g. computed by
// qtcreator) and therefore causes portability and localisation issues. Note
// that the page widgets must have a layout with layoutSizeContraint =
// SetMinimumSize or similar. KNOWN ISSUE: the calculations are incorrect
// the first time the dialog is shown. This problem is mitigated by the fact
// that LyX remembers the dialog sizes between sessions.
QSize minimum_size = QSize(0,0);
// Compute the max of the minimal sizes of the pages
QWidget * page;
for (int i = 0; (page = citationTB->widget(i)); ++i)
minimum_size = minimum_size.expandedTo(page->minimumSizeHint());
// Add the height of the tabs
if (citationTB->currentWidget())
minimum_size.rheight() += citationTB->height() -
citationTB->currentWidget()->height();
citationTB->setMinimumSize(minimum_size);
DialogView::showEvent(e); DialogView::showEvent(e);
} }
void GuiCitation::on_citationTB_currentChanged(int i)
{
if (i == 0)
findLE->setFocus();
else if (citationStyleCO->isEnabled())
citationStyleCO->setFocus();
else
textAfterED->setFocus();
}
void GuiCitation::on_okPB_clicked() void GuiCitation::on_okPB_clicked()
{ {
applyView(); applyView();
@ -212,6 +225,7 @@ void GuiCitation::on_applyPB_clicked()
void GuiCitation::on_restorePB_clicked() void GuiCitation::on_restorePB_clicked()
{ {
init(); init();
updateFilterHint();
} }
@ -355,9 +369,11 @@ void GuiCitation::updateInfo(BiblioInfo const & bi, QModelIndex const & idx)
{ {
if (!idx.isValid() || bi.empty()) { if (!idx.isValid() || bi.empty()) {
infoML->document()->clear(); infoML->document()->clear();
infoML->setToolTip(qt_("Displays a sketchy preview if a citation is selected above"));
return; return;
} }
infoML->setToolTip(qt_("Sketchy preview of the selected citation"));
QString const keytxt = toqstr( QString const keytxt = toqstr(
bi.getInfo(qstring_to_ucs4(idx.data().toString()), documentBuffer(), true)); bi.getInfo(qstring_to_ucs4(idx.data().toString()), documentBuffer(), true));
infoML->document()->setHtml(keytxt); infoML->document()->setHtml(keytxt);
@ -390,8 +406,9 @@ void GuiCitation::findText(QString const & text, bool reset)
else else
entry_type = entries[index]; entry_type = entries[index];
bool const case_sentitive = caseCB->checkState(); bool const case_sentitive = casesense_->isChecked();
bool const reg_exp = regexCB->checkState(); bool const reg_exp = regexp_->isChecked();
findKey(bi, text, onlyKeys, field, entry_type, findKey(bi, text, onlyKeys, field, entry_type,
case_sentitive, reg_exp, reset); case_sentitive, reg_exp, reset);
//FIXME //FIXME
@ -405,13 +422,13 @@ void GuiCitation::findText(QString const & text, bool reset)
void GuiCitation::on_fieldsCO_currentIndexChanged(int /*index*/) void GuiCitation::on_fieldsCO_currentIndexChanged(int /*index*/)
{ {
findText(findLE->text(), true); findText(filter_->text(), true);
} }
void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/) void GuiCitation::on_entriesCO_currentIndexChanged(int /*index*/)
{ {
findText(findLE->text(), true); findText(filter_->text(), true);
} }
@ -425,43 +442,58 @@ void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
} }
void GuiCitation::on_findLE_textChanged(const QString & text) void GuiCitation::filterChanged(const QString & text)
{ {
bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked);
searchPB->setDisabled(text.isEmpty() || searchAsWeGo);
if (!text.isEmpty()) { if (!text.isEmpty()) {
if (searchAsWeGo) if (instant_->isChecked())
findText(findLE->text()); findText(filter_->text());
return; return;
} }
findText(findLE->text()); findText(filter_->text());
findLE->setFocus(); filter_->setFocus();
}
void GuiCitation::on_searchPB_clicked()
{
findText(findLE->text(), true);
} }
void GuiCitation::on_caseCB_stateChanged(int) void GuiCitation::filterPressed()
{ {
findText(findLE->text()); findText(filter_->text(), true);
} }
void GuiCitation::on_regexCB_stateChanged(int) void GuiCitation::resetFilter()
{ {
findText(findLE->text()); filter_->setText(QString());
findText(filter_->text(), true);
} }
void GuiCitation::on_asTypeCB_stateChanged(int) void GuiCitation::caseChanged()
{ {
bool const searchAsWeGo = (asTypeCB->checkState() == Qt::Checked); findText(filter_->text());
searchPB->setDisabled(findLE->text().isEmpty() || searchAsWeGo); }
if (searchAsWeGo)
findText(findLE->text(), true);
void GuiCitation::regexChanged()
{
findText(filter_->text());
}
void GuiCitation::updateFilterHint()
{
QString const hint = instant_->isChecked() ?
qt_("Enter string to filter the list of available citations") :
qt_("Enter string to filter the list of available citations and press <Enter>");
filter_->setToolTip(hint);
}
void GuiCitation::instantChanged(bool checked)
{
if (checked)
findText(filter_->text(), true);
updateFilterHint();
} }
@ -785,11 +817,11 @@ void GuiCitation::saveSession() const
Dialog::saveSession(); Dialog::saveSession();
QSettings settings; QSettings settings;
settings.setValue( settings.setValue(
sessionKey() + "/regex", regexCB->isChecked()); sessionKey() + "/regex", regexp_->isChecked());
settings.setValue( settings.setValue(
sessionKey() + "/casesensitive", caseCB->isChecked()); sessionKey() + "/casesensitive", casesense_->isChecked());
settings.setValue( settings.setValue(
sessionKey() + "/autofind", asTypeCB->isChecked()); sessionKey() + "/autofind", instant_->isChecked());
} }
@ -797,12 +829,10 @@ void GuiCitation::restoreSession()
{ {
Dialog::restoreSession(); Dialog::restoreSession();
QSettings settings; QSettings settings;
regexCB->setChecked( regexp_->setChecked(settings.value(sessionKey() + "/regex").toBool());
settings.value(sessionKey() + "/regex").toBool()); casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
caseCB->setChecked( instant_->setChecked(settings.value(sessionKey() + "/autofind").toBool());
settings.value(sessionKey() + "/casesensitive").toBool()); updateFilterHint();
asTypeCB->setChecked(
settings.value(sessionKey() + "/autofind").toBool());
} }

25
src/frontends/qt4/GuiCitation.h
View File

@ -17,6 +17,7 @@
#include "DialogView.h" #include "DialogView.h"
#include "ui_CitationUi.h" #include "ui_CitationUi.h"
#include "FancyLineEdit.h"
#include "insets/InsetCommandParams.h" #include "insets/InsetCommandParams.h"
@ -44,19 +45,19 @@ public:
~GuiCitation(); ~GuiCitation();
private Q_SLOTS: private Q_SLOTS:
void on_citationTB_currentChanged(int i);
void on_okPB_clicked(); void on_okPB_clicked();
void on_cancelPB_clicked(); void on_cancelPB_clicked();
void on_restorePB_clicked(); void on_restorePB_clicked();
void on_applyPB_clicked(); void on_applyPB_clicked();
void on_searchPB_clicked(); void filterPressed();
void on_findLE_textChanged(const QString & text); void filterChanged(const QString & text);
void on_fieldsCO_currentIndexChanged(int index); void on_fieldsCO_currentIndexChanged(int index);
void on_entriesCO_currentIndexChanged(int index); void on_entriesCO_currentIndexChanged(int index);
void on_citationStyleCO_currentIndexChanged(int index); void on_citationStyleCO_currentIndexChanged(int index);
void on_caseCB_stateChanged(int); void resetFilter();
void on_regexCB_stateChanged(int); void caseChanged();
void on_asTypeCB_stateChanged(int); void regexChanged();
void instantChanged(bool checked);
void changed(); void changed();
/// set the citation keys, mark as changed /// set the citation keys, mark as changed
void setCitedKeys(); void setCitedKeys();
@ -106,6 +107,8 @@ private:
void updateFormatting(CitationStyle currentStyle); void updateFormatting(CitationStyle currentStyle);
/// ///
void updateControls(BiblioInfo const & bi); void updateControls(BiblioInfo const & bi);
/// Set the appropriate hinting text on the filter bar
void updateFilterHint();
/// ///
void init(); void init();
/// Clear selected keys /// Clear selected keys
@ -151,6 +154,16 @@ private:
/// the like, so it should be avoided. /// the like, so it should be avoided.
BiblioInfo const & bibInfo() const; BiblioInfo const & bibInfo() const;
/// contains the search box
FancyLineEdit * filter_;
/// Regexp action
QAction * regexp_;
/// Case sensitive action
QAction * casesense_;
/// Search as you type action
QAction * instant_;
/// last used citation style /// last used citation style
int style_; int style_;
/// ///

610
src/frontends/qt4/ui/CitationUi.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>590</width> <width>614</width>
<height>506</height> <height>506</height>
</rect> </rect>
</property> </property>
@ -16,65 +16,124 @@
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4" rowstretch="1,0,0"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="availableKeysLA"> <widget class="QLabel" name="findKeysLA">
<property name="text"> <property name="text">
<string>A&amp;vailable Citations:</string> <string>&amp;Filter:</string>
</property> </property>
<property name="buddy"> <property name="alignment">
<cstring>availableLV</cstring> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <layout class="QHBoxLayout" name="filterBarL"/>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="selectedKeysLA">
<property name="text">
<string>S&amp;elected Citations:</string>
</property>
<property name="buddy">
<cstring>selectedLV</cstring>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QComboBox" name="fieldsCO">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select the fields on which the filter applies</string>
</property>
<property name="maxVisibleItems">
<number>16</number>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>All fields</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="entriesCO">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select the entry types on which the filter applies</string>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>All entry types</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QPushButton" name="searchOptionsPB">
<property name="toolTip">
<string>Click for more filter options</string>
</property>
<property name="text">
<string>O&amp;ptions</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QListView" name="availableLV"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="editTriggers"> <item>
<set>QAbstractItemView::NoEditTriggers</set> <widget class="QLabel" name="availableKeysLA">
</property> <property name="text">
</widget> <string>A&amp;vailable Citations:</string>
</property>
<property name="buddy">
<cstring>availableLV</cstring>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="availableLV">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="spacerLA"/>
</item>
<item> <item>
<widget class="QPushButton" name="addPB"> <widget class="QPushButton" name="addPB">
<property name="toolTip"> <property name="toolTip">
@ -130,8 +189,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff/> <normaloff>.</normaloff>.</iconset>
</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -154,8 +212,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
<normaloff/> <normaloff>.</normaloff>.</iconset>
</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -165,11 +222,25 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QListView" name="selectedLV"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="editTriggers"> <item>
<set>QAbstractItemView::NoEditTriggers</set> <widget class="QLabel" name="selectedKeysLA">
</property> <property name="text">
</widget> <string>Selected &amp;Citations:</string>
</property>
<property name="buddy">
<cstring>selectedLV</cstring>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="selectedLV">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
@ -184,6 +255,9 @@
<property name="acceptDrops"> <property name="acceptDrops">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="toolTip">
<string/>
</property>
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -193,293 +267,155 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="lyx::frontend::LyXToolBox" name="citationTB"> <widget class="QGroupBox" name="FormattingGB">
<property name="sizePolicy"> <property name="title">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <string>Formatting</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="accessibleName"> <layout class="QGridLayout" name="gridLayout_2">
<string/> <item row="0" column="0">
</property> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="currentIndex"> <item>
<number>1</number> <layout class="QVBoxLayout" name="verticalLayout_5">
</property> <item>
<widget class="QWidget" name="page"> <widget class="QLabel" name="citationStyleLA">
<attribute name="label"> <property name="text">
<string>&amp;Search Citation</string> <string>Citation st&amp;yle:</string>
</attribute> </property>
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1,0,0,0,0"> <property name="buddy">
<property name="sizeConstraint"> <cstring>citationStyleCO</cstring>
<enum>QLayout::SetMinimumSize</enum> </property>
</property> </widget>
<item row="0" column="0"> </item>
<widget class="QLabel" name="findKeysLA"> <item>
<property name="text"> <widget class="QLabel" name="textBeforeLA">
<string>Searc&amp;h:</string> <property name="text">
</property> <string>Text &amp;before:</string>
<property name="alignment"> </property>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <property name="buddy">
</property> <cstring>textBeforeED</cstring>
<property name="buddy"> </property>
<cstring>findLE</cstring> </widget>
</property> </item>
</widget> </layout>
</item> </item>
<item row="0" column="1" colspan="4"> <item>
<widget class="QLineEdit" name="findLE"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="toolTip"> <item>
<string>Enter the text to search for and press Enter or click the button to search</string> <widget class="QComboBox" name="citationStyleCO">
</property> <property name="sizePolicy">
<property name="text"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<string/> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item row="0" column="5"> <property name="toolTip">
<widget class="QPushButton" name="searchPB"> <string>Citation style to use, if different styles are provided</string>
<property name="enabled"> </property>
<bool>false</bool> </widget>
</property> </item>
<property name="toolTip"> <item>
<string>Click or press Enter in the search box to search</string> <layout class="QHBoxLayout" name="horizontalLayout_2">
</property> <item>
<property name="text"> <widget class="QLineEdit" name="textBeforeED">
<string>&amp;Search</string> <property name="toolTip">
</property> <string>Text that precedes the reference (e.g., &quot;cf.&quot;)</string>
<property name="autoDefault"> </property>
<bool>false</bool> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QLabel" name="textAfterLA">
<item row="1" column="0"> <property name="text">
<widget class="QLabel" name="fieldsLA"> <string>&amp;Text after:</string>
<property name="text"> </property>
<string>Search &amp;field:</string> <property name="buddy">
</property> <cstring>textAfterED</cstring>
<property name="buddy"> </property>
<cstring>fieldsCO</cstring> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QLineEdit" name="textAfterED">
<item row="1" column="1"> <property name="toolTip">
<widget class="QComboBox" name="fieldsCO"> <string>Text that follows the reference (e.g., pages)</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> </widget>
<horstretch>0</horstretch> </item>
<verstretch>0</verstretch> </layout>
</sizepolicy> </item>
</property> </layout>
<property name="maxVisibleItems"> </item>
<number>16</number> </layout>
</property> </item>
<property name="insertPolicy"> <item row="1" column="0">
<enum>QComboBox::NoInsert</enum> <layout class="QHBoxLayout">
</property> <property name="spacing">
<property name="sizeAdjustPolicy"> <number>6</number>
<enum>QComboBox::AdjustToContents</enum> </property>
</property> <property name="leftMargin">
<item> <number>0</number>
<property name="text"> </property>
<string>All fields</string> <property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
</item> <property name="sizeHint" stdset="0">
</widget> <size>
</item> <width>21</width>
<item row="1" column="2"> <height>26</height>
<spacer> </size>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QCheckBox" name="regexCB">
<property name="text">
<string>Regular e&amp;xpression</string>
</property>
</widget>
</item>
<item row="1" column="4" colspan="2">
<widget class="QCheckBox" name="caseCB">
<property name="text">
<string>Case se&amp;nsitive</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="entriesLA">
<property name="text">
<string>Entry t&amp;ypes:</string>
</property>
<property name="buddy">
<cstring>entriesCO</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="entriesCO">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>All entry types</string>
</property> </property>
</item> </spacer>
</widget> </item>
</item> <item>
<item row="2" column="2"> <widget class="QCheckBox" name="forceuppercaseCB">
<spacer> <property name="toolTip">
<property name="orientation"> <string>Force upper case in names (&quot;Del Piero&quot;, not &quot;del Piero&quot;)</string>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="text">
<property name="sizeHint" stdset="0"> <string>Force upcas&amp;ing</string>
<size> </property>
<width>40</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QCheckBox" name="fulllistCB">
</spacer> <property name="toolTip">
</item> <string>Always list all authors (rather than using &quot;et al.&quot;)</string>
<item row="2" column="4" colspan="2"> </property>
<widget class="QCheckBox" name="asTypeCB"> <property name="text">
<property name="text"> <string>All aut&amp;hors</string>
<string>Search as you &amp;type</string> </property>
</property> </widget>
</widget> </item>
</item> </layout>
</layout> </item>
</widget> </layout>
<widget class="QWidget" name="page_2">
<attribute name="label">
<string>For&amp;matting</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="citationStyleLA">
<property name="text">
<string>Citation st&amp;yle:</string>
</property>
<property name="buddy">
<cstring>citationStyleCO</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3">
<widget class="QComboBox" name="citationStyleCO">
<property name="toolTip">
<string>Natbib citation style to use</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textBeforeLA">
<property name="text">
<string>Text &amp;before:</string>
</property>
<property name="buddy">
<cstring>textBeforeED</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="textBeforeED">
<property name="toolTip">
<string>Text to place before citation</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="textAfterLA">
<property name="text">
<string>&amp;Text after:</string>
</property>
<property name="buddy">
<cstring>textAfterED</cstring>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="textAfterED">
<property name="toolTip">
<string>Text to place after citation</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>26</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="fulllistCB">
<property name="toolTip">
<string>List all authors</string>
</property>
<property name="text">
<string>&amp;Full author list</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="forceuppercaseCB">
<property name="toolTip">
<string>Force upper case in citation</string>
</property>
<property name="text">
<string>Force u&amp;pper case</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -542,28 +478,26 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>lyx::frontend::LyXToolBox</class>
<extends>QToolBox</extends>
<header>LyXToolBox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>fieldsCO</tabstop>
<tabstop>entriesCO</tabstop>
<tabstop>searchOptionsPB</tabstop>
<tabstop>availableLV</tabstop> <tabstop>availableLV</tabstop>
<tabstop>selectedLV</tabstop>
<tabstop>addPB</tabstop> <tabstop>addPB</tabstop>
<tabstop>deletePB</tabstop> <tabstop>deletePB</tabstop>
<tabstop>upPB</tabstop> <tabstop>upPB</tabstop>
<tabstop>downPB</tabstop> <tabstop>downPB</tabstop>
<tabstop>selectedLV</tabstop> <tabstop>citationStyleCO</tabstop>
<tabstop>infoML</tabstop> <tabstop>textBeforeED</tabstop>
<tabstop>fulllistCB</tabstop> <tabstop>textAfterED</tabstop>
<tabstop>forceuppercaseCB</tabstop> <tabstop>forceuppercaseCB</tabstop>
<tabstop>fulllistCB</tabstop>
<tabstop>restorePB</tabstop> <tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop> <tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop> <tabstop>applyPB</tabstop>
<tabstop>cancelPB</tabstop> <tabstop>cancelPB</tabstop>
<tabstop>infoML</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local">qt_i18n.h</include> <include location="local">qt_i18n.h</include>

2
status.22x
View File

@ -24,6 +24,8 @@ What's new
- The title bar is now set according to platform UI. Read-only and - The title bar is now set according to platform UI. Read-only and
version control are shown by indicators in the status bar. version control are shown by indicators in the status bar.
- The citation dialog has been redesigned, following user suggestions.
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION