bc().addReadOnly(dialog_->styleED);
bc().addReadOnly(dialog_->stylePB);
bc().addReadOnly(dialog_->bibtocCB);
bc().addReadOnly(dialog_->styleED);
bc().addReadOnly(dialog_->stylePB);
bc().addReadOnly(dialog_->bibtocCB);
+ bc().addReadOnly(dialog_->databasePB);
+ bc().addReadOnly(dialog_->deletePB);
while (!bibs.empty()) {
bibs = split(bibs, bib, ',');
while (!bibs.empty()) {
bibs = split(bibs, bib, ',');
- dialog_->databaseLB->inSort(frontStrip(strip(bib)).c_str());
+ bib = frontStrip(strip(bib));
+ if (!bib.empty())
+ dialog_->databaseLB->inSort(bib.c_str());
}
string bibtotoc = "bibtotoc";
}
string bibtotoc = "bibtotoc";
} else
dialog_->bibtocCB->setChecked(false);
} else
dialog_->bibtocCB->setChecked(false);
+ dialog_->deletePB->setEnabled(false);
dialog_->styleED->setEnabled(false);
dialog_->stylePB->setEnabled(false);
dialog_->styleED->setEnabled(false);
dialog_->stylePB->setEnabled(false);
- if (bibstyle == "plain")
+ if (bibstyle == "plain" || bibstyle.empty())
dialog_->styleCO->setCurrentItem(0);
else if (bibstyle == "unsrt")
dialog_->styleCO->setCurrentItem(1);
dialog_->styleCO->setCurrentItem(0);
else if (bibstyle == "unsrt")
dialog_->styleCO->setCurrentItem(1);
dialog_->styleED->setEnabled(true);
dialog_->stylePB->setEnabled(true);
dialog_->styleED->setText(bibstyle.c_str());
dialog_->styleED->setEnabled(true);
dialog_->stylePB->setEnabled(true);
dialog_->styleED->setText(bibstyle.c_str());
- if (bibstyle.empty())
- dialog_->styleCO->setCurrentItem(0);
- else
- dialog_->styleCO->setCurrentItem(4);
+ dialog_->styleCO->setCurrentItem(4);
for (unsigned int i = 0; i < dialog_->databaseLB->count(); ++i) {
dbs += dialog_->databaseLB->text(i).latin1();
if (i != dialog_->databaseLB->count())
for (unsigned int i = 0; i < dialog_->databaseLB->count(); ++i) {
dbs += dialog_->databaseLB->text(i).latin1();
if (i != dialog_->databaseLB->count())
}
controller().params().setContents(dbs);
}
controller().params().setContents(dbs);
bool QBibtex::isValid()
{
bool QBibtex::isValid()
{
- return dialog_->databaseLB->count() != 0;
+ return dialog_->databaseLB->count() != 0 &&
+ !(dialog_->styleCO->currentItem() == 4 && string(dialog_->styleED->text()).empty());
{
QString file = QFileDialog::getOpenFileName(QString::null,
_("BibTeX style files (*.bst)"), this, 0, _("Select a BibTeX style"));
{
QString file = QFileDialog::getOpenFileName(QString::null,
_("BibTeX style files (*.bst)"), this, 0, _("Select a BibTeX style"));
- lyxerr << "HELLO" << std::endl;
- lyxerr << "MONKEYS" << std::endl;
styleED->setText(ChangeExtension(OnlyFilename(file.latin1()), "").c_str());
form_->changed();
}
styleED->setText(ChangeExtension(OnlyFilename(file.latin1()), "").c_str());
form_->changed();
}
void QBibtexDialog::addPressed()
{
void QBibtexDialog::addPressed()
{
- string file(QFileDialog::getOpenFileName(QString::null,
- _("BibTeX database files (*.bib)"), this, 0, _("Select a BibTeX database to add")).latin1());
- if (!file.empty()) {
+ QString file = QFileDialog::getOpenFileName(QString::null,
+ _("BibTeX database files (*.bib)"), this, 0, _("Select a BibTeX database to add"));
+ if (!file.isNull()) {
// FIXME: check duplicates
// FIXME: check duplicates
- databaseLB->insertItem(ChangeExtension(file, "").c_str());
+ databaseLB->insertItem(ChangeExtension(file.latin1(), "").c_str());
+void QBibtexDialog::deletePressed()
+{
+ databaseLB->removeItem(databaseLB->currentItem());
+}
+
+
void QBibtexDialog::styleChanged(const QString & sel)
{
void QBibtexDialog::styleChanged(const QString & sel)
{
- if (string(_("Other ...")) == sel.latin1() && !form_->readOnly()) {
+ if (form_->readOnly())
+ return;
+
+ if (string(_("Other ...")) == sel.latin1()) {
styleED->setEnabled(true);
stylePB->setEnabled(true);
} else {
styleED->setEnabled(true);
stylePB->setEnabled(true);
} else {
+void QBibtexDialog::databaseChanged()
+{
+ deletePB->setEnabled(!form_->readOnly() && databaseLB->currentItem() != -1);
+}
+
+
void QBibtexDialog::closeEvent(QCloseEvent *e)
{
form_->slotWMHide();
void QBibtexDialog::closeEvent(QCloseEvent *e)
{
form_->slotWMHide();
virtual void change_adaptor();
virtual void browsePressed();
virtual void addPressed();
virtual void change_adaptor();
virtual void browsePressed();
virtual void addPressed();
+ virtual void deletePressed();
virtual void styleChanged(const QString &);
virtual void styleChanged(const QString &);
+ virtual void databaseChanged();
void QExternalDialog::browseClicked()
{
void QExternalDialog::browseClicked()
{
- string file(QFileDialog::getOpenFileName(QString::null,
- _("External material (*)"), this, 0, _("Select external material")).latin1());
- if (!file.empty()) {
- fileED->setText(file.c_str());
+ QString file = QFileDialog::getOpenFileName(QString::null,
+ _("External material (*)"), this, 0, _("Select external material"));
+ if (!file.isNull()) {
+ fileED->setText(file.latin1());
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
#include "ControlThesaurus.h"
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
#include "ControlThesaurus.h"
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
dialog_.reset(new QThesaurusDialog(this));
bc().setCancel(dialog_->closePB);
dialog_.reset(new QThesaurusDialog(this));
bc().setCancel(dialog_->closePB);
+ bc().setApply(dialog_->replacePB);
bc().addReadOnly(dialog_->replaceED);
bc().addReadOnly(dialog_->replacePB);
}
bc().addReadOnly(dialog_->replaceED);
bc().addReadOnly(dialog_->replacePB);
}
#ifndef QTHESAURUS_H
#define QTHESAURUS_H
#ifndef QTHESAURUS_H
#define QTHESAURUS_H
+#ifdef __GNUG__
+#pragma interface
+#endif
+
#include "Qt2Base.h"
class ControlThesaurus;
class QThesaurusDialog;
#include "Qt2Base.h"
class ControlThesaurus;
class QThesaurusDialog;
-class QThesaurus :
- public Qt2CB<ControlThesaurus, Qt2DB<QThesaurusDialog> >
+///
+class QThesaurus
+ : public Qt2CB<ControlThesaurus, Qt2DB<QThesaurusDialog> >
friend class QThesaurusDialog;
friend class QThesaurusDialog;
QThesaurus(ControlThesaurus &);
QThesaurus(ControlThesaurus &);
private:
/// Apply changes
private:
/// Apply changes
+ virtual void apply() {};
/// update
virtual void update_contents();
/// build the dialog
/// update
virtual void update_contents();
/// build the dialog
void QThesaurusDialog::selectionChanged(const QString & str)
{
void QThesaurusDialog::selectionChanged(const QString & str)
{
+ if (form_->readOnly())
+ return;
+
string const entry(str.latin1());
string const entry(str.latin1());
- entryED->setText(entry.c_str());
+ replaceED->setText(entry.c_str());
+ replacePB->setEnabled(true);
+ form_->changed();
+}
+
+
+void QThesaurusDialog::selectionClicked(const QString & str)
+{
+ selectionChanged(str);
+ entryED->setText(str);
virtual void entryChanged();
virtual void replaceClicked();
virtual void selectionChanged(const QString &);
virtual void entryChanged();
virtual void replaceClicked();
virtual void selectionChanged(const QString &);
+ virtual void selectionClicked(const QString &);
protected:
virtual void closeEvent(QCloseEvent * e);
protected:
virtual void closeEvent(QCloseEvent * e);
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \
+ -I${top_builddir}/src/frontends/qt2 \
${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \
$(BOOST_INCLUDES)
include ../Makefile.dialogs
${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \
$(BOOST_INCLUDES)
include ../Makefile.dialogs
libqt2moc_la_SOURCES := FileDialog_private_moc.C \
emptytable_moc.C \
Qt2Base_moc.C \
$(MOCDIALOGS)
libqt2moc_la_SOURCES := FileDialog_private_moc.C \
emptytable_moc.C \
Qt2Base_moc.C \
$(MOCDIALOGS)
DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core
ETAGS_ARGS = --lang=c++
DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core
ETAGS_ARGS = --lang=c++
%_moc.C: ../%.h
$(MOC) -o $@ $<
%_moc.C: ../%.h
$(MOC) -o $@ $<
<height>407</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<height>407</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
+ <string>Bibtex</string>
</property>
<vbox>
<property stdset="1">
</property>
<vbox>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<name>spacing</name>
<number>6</number>
</property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>databaseLA</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Databases</string>
+ </property>
+ <property stdset="1">
+ <name>alignment</name>
+ <set>AlignTop|AlignLeft</set>
+ </property>
+ <property>
+ <name>buddy</name>
+ <cstring>databaseCO</cstring>
+ </property>
+ <property>
+ <name>toolTip</name>
+ <string>BibTeX database to use</string>
+ </property>
+ <property>
+ <name>vAlign</name>
+ </property>
+ </widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout13</cstring>
+ <cstring>Layout10</cstring>
<property stdset="1">
<name>margin</name>
<number>0</number>
<property stdset="1">
<name>margin</name>
<number>0</number>
<number>6</number>
</property>
<widget>
<number>6</number>
</property>
<widget>
+ <class>QListBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>New Item</string>
+ </property>
+ </item>
<property stdset="1">
<name>name</name>
<property stdset="1">
<name>name</name>
- <cstring>databaseLA</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Databases</string>
- </property>
- <property>
- <name>buddy</name>
- <cstring>databaseCO</cstring>
+ <cstring>databaseLB</cstring>
</property>
<property stdset="1">
</property>
<property stdset="1">
- <name>alignment</name>
- <set>AlignTop|AlignLeft</set>
+ <name>enabled</name>
+ <bool>true</bool>
</property>
<property>
<name>toolTip</name>
</property>
<property>
<name>toolTip</name>
- <string>BibTeX database to use</string>
- </property>
- <property>
- <name>vAlign</name>
+ <string>Available BibTeX databases</string>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout12</cstring>
+ <cstring>Layout9</cstring>
<property stdset="1">
<name>margin</name>
<number>0</number>
<property stdset="1">
<name>margin</name>
<number>0</number>
<number>6</number>
</property>
<widget>
<number>6</number>
</property>
<widget>
- <class>QListBox</class>
- <item>
- <property>
- <name>text</name>
- <string>New Item</string>
- </property>
- </item>
+ <class>QPushButton</class>
<property stdset="1">
<name>name</name>
<property stdset="1">
<name>name</name>
- <cstring>databaseLB</cstring>
+ <cstring>databasePB</cstring>
</property>
<property stdset="1">
</property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <name>text</name>
+ <string>&Add ...</string>
+ </property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>false</bool>
</property>
<property>
<name>toolTip</name>
</property>
<property>
<name>toolTip</name>
- <string>Available BibTeX databases</string>
+ <string>Add a BibTeX database file</string>
</property>
</widget>
<widget>
</property>
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>QPushButton</class>
<property stdset="1">
<name>name</name>
<property stdset="1">
<name>name</name>
- <cstring>Layout11</cstring>
+ <cstring>deletePB</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>&Delete</string>
+ </property>
+ <property>
+ <name>toolTip</name>
+ <string>Remove the selected database</string>
- <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>databasePB</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>&Add ...</string>
- </property>
- <property stdset="1">
- <name>autoDefault</name>
- <bool>false</bool>
- </property>
- <property>
- <name>toolTip</name>
- <string>Add a BibTeX database file</string>
- </property>
- </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>
- </vbox>
+ <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>
+ </vbox>
</widget>
<widget>
<class>QLayoutWidget</class>
</widget>
<widget>
<class>QLayoutWidget</class>
<receiver>QBibtexDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
<receiver>QBibtexDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
+ <connection>
+ <sender>deletePB</sender>
+ <signal>clicked()</signal>
+ <receiver>QBibtexDialogBase</receiver>
+ <slot>deletePressed()</slot>
+ </connection>
+ <connection>
+ <sender>databaseLB</sender>
+ <signal>selectionChanged()</signal>
+ <receiver>QBibtexDialogBase</receiver>
+ <slot>databaseChanged()</slot>
+ </connection>
<slot access="public">addPressed()</slot>
<slot access="public">browsePressed()</slot>
<slot access="public">change_adaptor()</slot>
<slot access="public">addPressed()</slot>
<slot access="public">browsePressed()</slot>
<slot access="public">change_adaptor()</slot>
+ <slot access="public">deletePressed()</slot>
+ <slot access="public">databaseChanged()</slot>
<slot access="public">styleChanged(const QString &)</slot>
</connections>
</UI>
<slot access="public">styleChanged(const QString &)</slot>
</connections>
</UI>
<height>442</height>
</rect>
</property>
<height>442</height>
</rect>
</property>
</property>
<widget>
<class>QListBox</class>
</property>
<widget>
<class>QListBox</class>
- <item>
- <property>
- <name>text</name>
- <string>New Item</string>
- </property>
- </item>
<property stdset="1">
<name>name</name>
<cstring>verbsLB</cstring>
<property stdset="1">
<name>name</name>
<cstring>verbsLB</cstring>
</property>
<widget>
<class>QListBox</class>
</property>
<widget>
<class>QListBox</class>
- <item>
- <property>
- <name>text</name>
- <string>New Item</string>
- </property>
- </item>
<property stdset="1">
<name>name</name>
<cstring>adjectivesLB</cstring>
<property stdset="1">
<name>name</name>
<cstring>adjectivesLB</cstring>
</property>
<widget>
<class>QListBox</class>
</property>
<widget>
<class>QListBox</class>
- <item>
- <property>
- <name>text</name>
- <string>New Item</string>
- </property>
- </item>
<property stdset="1">
<name>name</name>
<cstring>adverbsLB</cstring>
<property stdset="1">
<name>name</name>
<cstring>adverbsLB</cstring>
</property>
<widget>
<class>QListBox</class>
</property>
<widget>
<class>QListBox</class>
- <item>
- <property>
- <name>text</name>
- <string>New Item</string>
- </property>
- </item>
<property stdset="1">
<name>name</name>
<cstring>otherLB</cstring>
<property stdset="1">
<name>name</name>
<cstring>otherLB</cstring>
</property>
<property>
<name>buddy</name>
</property>
<property>
<name>buddy</name>
- <cstring>selectionED</cstring>
+ <cstring>replaceED</cstring>
</property>
<property>
<name>toolTip</name>
</property>
<property>
<name>toolTip</name>
<receiver>QThesaurusDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
<receiver>QThesaurusDialogBase</receiver>
<slot>change_adaptor()</slot>
</connection>
+ <connection>
+ <sender>entryED</sender>
+ <signal>returnPressed()</signal>
+ <receiver>QThesaurusDialogBase</receiver>
+ <slot>entryChanged()</slot>
+ </connection>
+ <connection>
+ <sender>replacePB</sender>
+ <signal>clicked()</signal>
+ <receiver>QThesaurusDialogBase</receiver>
+ <slot>replaceClicked()</slot>
+ </connection>
<connection>
<sender>nounsLB</sender>
<connection>
<sender>nounsLB</sender>
- <signal>selected(const QString&)</signal>
+ <signal>highlighted(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
+ <connection>
+ <sender>nounsLB</sender>
+ <signal>selected(const QString&)</signal>
+ <receiver>QThesaurusDialogBase</receiver>
+ <slot>selectionClicked(const QString &)</slot>
+ </connection>
<connection>
<sender>verbsLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<connection>
<sender>verbsLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
+ <slot>selectionClicked(const QString &)</slot>
+ </connection>
+ <connection>
+ <sender>verbsLB</sender>
+ <signal>highlighted(const QString&)</signal>
+ <receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
<sender>adjectivesLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
<sender>adjectivesLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
+ <slot>selectionClicked(const QString &)</slot>
+ </connection>
+ <connection>
+ <sender>adjectivesLB</sender>
+ <signal>highlighted(const QString&)</signal>
+ <receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
<sender>adverbsLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
<sender>adverbsLB</sender>
<signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
- <slot>selectionChanged(const QString &)</slot>
+ <slot>selectionClicked(const QString &)</slot>
</connection>
<connection>
</connection>
<connection>
- <sender>otherLB</sender>
- <signal>selected(const QString&)</signal>
+ <sender>adverbsLB</sender>
+ <signal>highlighted(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
<receiver>QThesaurusDialogBase</receiver>
<slot>selectionChanged(const QString &)</slot>
</connection>
<connection>
- <sender>entryED</sender>
- <signal>returnPressed()</signal>
+ <sender>otherLB</sender>
+ <signal>selected(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<receiver>QThesaurusDialogBase</receiver>
- <slot>entryChanged()</slot>
+ <slot>selectionClicked(const QString &)</slot>
</connection>
<connection>
</connection>
<connection>
- <sender>replacePB</sender>
- <signal>clicked()</signal>
+ <sender>otherLB</sender>
+ <signal>highlighted(const QString&)</signal>
<receiver>QThesaurusDialogBase</receiver>
<receiver>QThesaurusDialogBase</receiver>
- <slot>replaceClicked()</slot>
+ <slot>selectionChanged(const QString &)</slot>
</connection>
<slot access="public">change_adaptor()</slot>
<slot access="public">entryChanged()</slot>
</connection>
<slot access="public">change_adaptor()</slot>
<slot access="public">entryChanged()</slot>
+ <slot access="public">selectionClicked(const QString &)</slot>
<slot access="public">replaceClicked()</slot>
<slot access="public">selectionChanged(const QString &)</slot>
</connections>
<slot access="public">replaceClicked()</slot>
<slot access="public">selectionChanged(const QString &)</slot>
</connections>