os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
- << graphics::displayTranslator().find(display_graphics)
+ << graphics::displayTranslator().find(
+ graphics::DisplayType(display_graphics))
<< '\n';
}
if (tag != RC_LAST)
<< '\n';
}
if (tag != RC_LAST)
#define LYXRC_H
#include "paper.h"
#define LYXRC_H
#include "paper.h"
-#include "graphics/GraphicsTypes.h"
#include <iosfwd>
#include <string>
#include <iosfwd>
#include <string>
///
int label_init_length;
///
///
int label_init_length;
///
- graphics::DisplayType display_graphics;
+ ///graphics::DisplayType
+ int display_graphics;
///
bool show_banner;
///
///
bool show_banner;
///
#include "support/Package.h"
#include "support/FileFilterList.h"
#include "support/Package.h"
#include "support/FileFilterList.h"
+#include "graphics/GraphicsTypes.h"
+
#include "frontend_helpers.h"
#include "frontends/alert.h"
#include "frontend_helpers.h"
#include "frontends/alert.h"
setupUi(this);
connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
setupUi(this);
connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
- connect(plaintextRoffED, SIGNAL(textChanged(const QString&)),
+ connect(plaintextRoffED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
: PrefModule(_("Date format"), 0, parent)
{
setupUi(this);
: PrefModule(_("Date format"), 0, parent)
{
setupUi(this);
- connect(DateED, SIGNAL(textChanged(const QString &)),
+ connect(DateED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
connect(keymapCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(keymapCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(firstKeymapED, SIGNAL(textChanged(const QString&)),
+ connect(firstKeymapED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(secondKeymapED, SIGNAL(textChanged(const QString&)),
+ connect(secondKeymapED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
: PrefModule(_("LaTeX"), form, parent)
{
setupUi(this);
: PrefModule(_("LaTeX"), form, parent)
{
setupUi(this);
- connect(latexEncodingED, SIGNAL(textChanged(const QString&)),
+ connect(latexEncodingED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(latexChecktexED, SIGNAL(textChanged(const QString&)),
+ connect(latexChecktexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(latexBibtexED, SIGNAL(textChanged(const QString&)),
+ connect(latexBibtexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(latexIndexED, SIGNAL(textChanged(const QString&)),
+ connect(latexIndexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(latexAutoresetCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(latexAutoresetCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(latexDviPaperED, SIGNAL(textChanged(const QString&)),
+ connect(latexDviPaperED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(latexPaperSizeCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(latexPaperSizeCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
- connect(screenRomanCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_roman(const QString&)));
- connect(screenSansCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_sans(const QString&)));
- connect(screenTypewriterCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_typewriter(const QString&)));
+ connect(screenRomanCO, SIGNAL(activated(QString)),
+ this, SLOT(select_roman(QString)));
+ connect(screenSansCO, SIGNAL(activated(QString)),
+ this, SLOT(select_sans(QString)));
+ connect(screenTypewriterCO, SIGNAL(activated(QString)),
+ this, SLOT(select_typewriter(QString)));
QFontDatabase fontdb;
QStringList families(fontdb.families());
QFontDatabase fontdb;
QStringList families(fontdb.families());
screenSansCO->addItem(*it);
screenTypewriterCO->addItem(*it);
}
screenSansCO->addItem(*it);
screenTypewriterCO->addItem(*it);
}
- connect(screenRomanCO, SIGNAL(activated(const QString&)),
+ connect(screenRomanCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenSansCO, SIGNAL(activated(const QString&)),
+ connect(screenSansCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenTypewriterCO, SIGNAL(activated(const QString&)),
+ connect(screenTypewriterCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(screenZoomSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(screenDpiSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(screenZoomSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(screenDpiSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
- connect(screenTinyED, SIGNAL(textChanged(const QString&)),
+ connect(screenTinyED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenSmallestED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallestED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenSmallerED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenSmallED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenNormalED, SIGNAL(textChanged(const QString&)),
+ connect(screenNormalED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenLargeED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenLargerED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenLargestED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargestED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenHugeED, SIGNAL(textChanged(const QString&)),
+ connect(screenHugeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(screenHugerED, SIGNAL(textChanged(const QString&)),
+ connect(screenHugerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
screenTinyED->setValidator(new QDoubleValidator(screenTinyED));
this, SIGNAL(changed()));
screenTinyED->setValidator(new QDoubleValidator(screenTinyED));
screenHugerED->setText(toqstr(rc.font_sizes[Font::SIZE_HUGER]));
}
screenHugerED->setText(toqstr(rc.font_sizes[Font::SIZE_HUGER]));
}
-void PrefScreenFonts::select_roman(const QString& name)
+
+void PrefScreenFonts::select_roman(const QString & name)
{
screenRomanFE->set(QFont(name), name);
}
{
screenRomanFE->set(QFont(name), name);
}
-void PrefScreenFonts::select_sans(const QString& name)
+void PrefScreenFonts::select_sans(const QString & name)
{
screenSansFE->set(QFont(name), name);
}
{
screenSansFE->set(QFont(name), name);
}
-void PrefScreenFonts::select_typewriter(const QString& name)
+void PrefScreenFonts::select_typewriter(const QString & name)
{
screenTypewriterFE->set(QFont(name), name);
}
{
screenTypewriterFE->set(QFont(name), name);
}
lyx::graphics::DisplayType dtype;
switch (displayGraphicsCO->currentIndex()) {
lyx::graphics::DisplayType dtype;
switch (displayGraphicsCO->currentIndex()) {
- case 3: dtype = lyx::graphics::NoDisplay; break;
- case 2: dtype = lyx::graphics::ColorDisplay; break;
- case 1: dtype = lyx::graphics::GrayscaleDisplay; break;
- case 0: dtype = lyx::graphics::MonochromeDisplay; break;
- default: dtype = lyx::graphics::GrayscaleDisplay;
+ case 3: dtype = graphics::NoDisplay; break;
+ case 2: dtype = graphics::ColorDisplay; break;
+ case 1: dtype = graphics::GrayscaleDisplay; break;
+ case 0: dtype = graphics::MonochromeDisplay; break;
+ default: dtype = graphics::GrayscaleDisplay;
}
rc.display_graphics = dtype;
// FIXME!! The graphics cache no longer has a changeDisplay method.
#if 0
if (old_value != rc.display_graphics) {
}
rc.display_graphics = dtype;
// FIXME!! The graphics cache no longer has a changeDisplay method.
#if 0
if (old_value != rc.display_graphics) {
- lyx::graphics::GCache & gc = lyx::graphics::GCache::get();
+ graphics::GCache & gc = graphics::GCache::get();
gc.changeDisplay();
}
#endif
gc.changeDisplay();
}
#endif
int item = 2;
switch (rc.display_graphics) {
int item = 2;
switch (rc.display_graphics) {
- case lyx::graphics::NoDisplay: item = 3; break;
- case lyx::graphics::ColorDisplay: item = 2; break;
- case lyx::graphics::GrayscaleDisplay: item = 1; break;
- case lyx::graphics::MonochromeDisplay: item = 0; break;
+ case graphics::NoDisplay: item = 3; break;
+ case graphics::ColorDisplay: item = 2; break;
+ case graphics::GrayscaleDisplay: item = 1; break;
+ case graphics::MonochromeDisplay: item = 0; break;
default: break;
}
displayGraphicsCO->setCurrentIndex(item);
default: break;
}
displayGraphicsCO->setCurrentIndex(item);
connect(backupDirPB, SIGNAL(clicked()), this, SLOT(select_backupdir()));
connect(workingDirPB, SIGNAL(clicked()), this, SLOT(select_workingdir()));
connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
connect(backupDirPB, SIGNAL(clicked()), this, SLOT(select_backupdir()));
connect(workingDirPB, SIGNAL(clicked()), this, SLOT(select_workingdir()));
connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
- connect(workingDirED, SIGNAL(textChanged(const QString&)),
+ connect(workingDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(templateDirED, SIGNAL(textChanged(const QString&)),
+ connect(templateDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(backupDirED, SIGNAL(textChanged(const QString&)),
+ connect(backupDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(tempDirED, SIGNAL(textChanged(const QString&)),
+ connect(tempDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(lyxserverDirED, SIGNAL(textChanged(const QString&)),
+ connect(lyxserverDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(pathPrefixED, SIGNAL(textChanged(const QString&)),
+ connect(pathPrefixED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
#else
spellCommandCO->setEnabled(false);
#endif
#else
spellCommandCO->setEnabled(false);
#endif
- connect(altLanguageED, SIGNAL(textChanged(const QString&)),
+ connect(altLanguageED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(escapeCharactersED, SIGNAL(textChanged(const QString&)),
+ connect(escapeCharactersED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(persDictionaryED, SIGNAL(textChanged(const QString&)),
+ connect(persDictionaryED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(compoundWordCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(compoundWordCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SLOT(update_converter()));
connect(convertersLW, SIGNAL(currentRowChanged(int)),
this, SLOT(switch_converter()));
this, SLOT(update_converter()));
connect(convertersLW, SIGNAL(currentRowChanged(int)),
this, SLOT(switch_converter()));
- connect(converterFromCO, SIGNAL(activated(const QString&)),
+ connect(converterFromCO, SIGNAL(activated(QString)),
this, SLOT(converter_changed()));
this, SLOT(converter_changed()));
- connect(converterToCO, SIGNAL(activated(const QString&)),
+ connect(converterToCO, SIGNAL(activated(QString)),
this, SLOT(converter_changed()));
this, SLOT(converter_changed()));
- connect(converterED, SIGNAL(textEdited(const QString&)),
+ connect(converterED, SIGNAL(textEdited(QString)),
this, SLOT(converter_changed()));
this, SLOT(converter_changed()));
- connect(converterFlagED, SIGNAL(textEdited(const QString&)),
+ connect(converterFlagED, SIGNAL(textEdited(QString)),
this, SLOT(converter_changed()));
connect(converterNewPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SLOT(converter_changed()));
connect(converterNewPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(converterModifyPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(converterModifyPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(maxAgeLE, SIGNAL(textEdited(const QString&)),
+ connect(maxAgeLE, SIGNAL(textEdited(QString)),
this, SIGNAL(changed()));
maxAgeLE->setValidator(new QDoubleValidator(maxAgeLE));
this, SIGNAL(changed()));
maxAgeLE->setValidator(new QDoubleValidator(maxAgeLE));
Format const & from = form_->formats().get(converterFromCO->currentIndex());
Format const & to = form_->formats().get(converterToCO->currentIndex());
int const sel = form_->converters().getNumber(from.name(), to.name());
Format const & from = form_->formats().get(converterFromCO->currentIndex());
Format const & to = form_->formats().get(converterToCO->currentIndex());
int const sel = form_->converters().getNumber(from.name(), to.name());
- bool const known = !(sel < 0);
+ bool const known = sel >= 0;
bool const valid = !(converterED->text().isEmpty()
|| from.name() == to.name());
bool const valid = !(converterED->text().isEmpty()
|| from.name() == to.name());
string const new_command(fromqstr(converterED->text()));
string const new_flag(fromqstr(converterFlagED->text()));
string const new_command(fromqstr(converterED->text()));
string const new_flag(fromqstr(converterFlagED->text()));
- bool modified = ((old_command != new_command) || (old_flag != new_flag));
+ bool modified = (old_command != new_command) || (old_flag != new_flag);
converterModifyPB->setEnabled(valid && known && modified);
converterNewPB->setEnabled(valid && !known);
converterModifyPB->setEnabled(valid && known && modified);
converterNewPB->setEnabled(valid && !known);
// PrefFileformats
//
/////////////////////////////////////////////////////////////////////
// PrefFileformats
//
/////////////////////////////////////////////////////////////////////
FormatValidator::FormatValidator(QWidget * parent, Formats const & f)
: QValidator(parent), formats_(f)
{
FormatValidator::FormatValidator(QWidget * parent, Formats const & f)
: QValidator(parent), formats_(f)
{
this, SLOT(setFlags()));
connect(formatsCB->lineEdit(), SIGNAL(editingFinished()),
this, SLOT(updatePrettyname()));
this, SLOT(setFlags()));
connect(formatsCB->lineEdit(), SIGNAL(editingFinished()),
this, SLOT(updatePrettyname()));
- connect(formatsCB->lineEdit(), SIGNAL(textEdited(const QString &)),
+ connect(formatsCB->lineEdit(), SIGNAL(textEdited(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
connect(globalCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(globalCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(languagePackageED, SIGNAL(textChanged(const QString&)),
+ connect(languagePackageED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(startCommandED, SIGNAL(textChanged(const QString&)),
+ connect(startCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(endCommandED, SIGNAL(textChanged(const QString&)),
+ connect(endCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(defaultLanguageCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(defaultLanguageCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(printerAdaptCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(printerAdaptCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(printerCommandED, SIGNAL(textChanged(const QString&)),
+ connect(printerCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerNameED, SIGNAL(textChanged(const QString&)),
+ connect(printerNameED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerPageRangeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPageRangeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerCopiesED, SIGNAL(textChanged(const QString&)),
+ connect(printerCopiesED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerReverseED, SIGNAL(textChanged(const QString&)),
+ connect(printerReverseED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerToPrinterED, SIGNAL(textChanged(const QString&)),
+ connect(printerToPrinterED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerExtensionED, SIGNAL(textChanged(const QString&)),
+ connect(printerExtensionED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerSpoolCommandED, SIGNAL(textChanged(const QString&)),
+ connect(printerSpoolCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerPaperTypeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPaperTypeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerEvenED, SIGNAL(textChanged(const QString&)),
+ connect(printerEvenED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerOddED, SIGNAL(textChanged(const QString&)),
+ connect(printerOddED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerCollatedED, SIGNAL(textChanged(const QString&)),
+ connect(printerCollatedED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerLandscapeED, SIGNAL(textChanged(const QString&)),
+ connect(printerLandscapeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerToFileED, SIGNAL(textChanged(const QString&)),
+ connect(printerToFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerExtraED, SIGNAL(textChanged(const QString&)),
+ connect(printerExtraED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerSpoolPrefixED, SIGNAL(textChanged(const QString&)),
+ connect(printerSpoolPrefixED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(printerPaperSizeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPaperSizeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
TextLabel1, SLOT(setEnabled(bool)));
connect(uiFilePB, SIGNAL(clicked()),
this, SLOT(select_ui()));
TextLabel1, SLOT(setEnabled(bool)));
connect(uiFilePB, SIGNAL(clicked()),
this, SLOT(select_ui()));
- connect(uiFileED, SIGNAL(textChanged(const QString &)),
+ connect(uiFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(restoreCursorCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(restoreCursorCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(bindFilePB, SIGNAL(clicked()),
this, SLOT(select_bind()));
connect(bindFilePB, SIGNAL(clicked()),
this, SLOT(select_bind()));
- connect(bindFileED, SIGNAL(textChanged(const QString &)),
+ connect(bindFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(removePB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(removePB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(nameED, SIGNAL(textChanged(const QString&)),
+ connect(nameED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
- connect(emailED, SIGNAL(textChanged(const QString&)),
+ connect(emailED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
this, SIGNAL(changed()));
}
BOOST_ASSERT(false);
}
if (gparams.display == graphics::DefaultDisplay)
BOOST_ASSERT(false);
}
if (gparams.display == graphics::DefaultDisplay)
- gparams.display = lyxrc.display_graphics;
+ gparams.display = graphics::DisplayType(lyxrc.display_graphics);
// Override the above if we're not using a gui
if (!use_gui)
gparams.display = graphics::NoDisplay;
// Override the above if we're not using a gui
if (!use_gui)
gparams.display = graphics::NoDisplay;
#include "Buffer.h"
#include "graphics/GraphicsParams.h"
#include "Buffer.h"
#include "graphics/GraphicsParams.h"
+#include "graphics/GraphicsTypes.h"
#include "support/convert.h"
#include "support/filetools.h"
#include "support/convert.h"
#include "support/filetools.h"
bool operator==(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
bool operator==(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
- if (left.filename == right.filename &&
+ return left.filename == right.filename &&
left.lyxscale == right.lyxscale &&
left.display == right.display &&
left.scale == right.scale &&
left.lyxscale == right.lyxscale &&
left.display == right.display &&
left.scale == right.scale &&
left.noUnzip == right.noUnzip &&
left.scaleBeforeRotation == right.scaleBeforeRotation &&
left.noUnzip == right.noUnzip &&
left.scaleBeforeRotation == right.scaleBeforeRotation &&
left.bb == right.bb &&
left.clip == right.clip &&
left.bb == right.bb &&
left.clip == right.clip &&
left.rotateOrigin == right.rotateOrigin &&
left.subcaption == right.subcaption &&
left.subcaptionText == right.subcaptionText &&
left.rotateOrigin == right.rotateOrigin &&
left.subcaption == right.subcaption &&
left.subcaptionText == right.subcaptionText &&
- left.special == right.special
- )
- return true;
-
- return false;
+ left.special == right.special;
}
if (display == graphics::DefaultDisplay) {
}
if (display == graphics::DefaultDisplay) {
- pars.display = lyxrc.display_graphics;
+ pars.display = graphics::DisplayType(lyxrc.display_graphics);
} else {
pars.display = display;
}
// Override the above if we're not using a gui
} else {
pars.display = display;
}
// Override the above if we're not using a gui
pars.display = graphics::NoDisplay;
pars.display = graphics::NoDisplay;