#include "KeySequence.h"
#include "Language.h"
#include "LyXAction.h"
+#include "LyX.h"
#include "PanelStack.h"
#include "paper.h"
#include "Session.h"
FileDialog::Result result;
if (save)
- result = dlg.save(lastPath, filters, onlyFilename(filename));
+ result = dlg.save(lastPath, filters, onlyFileName(filename));
else
- result = dlg.open(lastPath, filters, onlyFilename(filename));
+ result = dlg.open(lastPath, filters, onlyFileName(filename));
return result.second;
}
// FIXME UNICODE
QString const label1 = qt_("System files|#S#s");
QString const dir1 =
- toqstr(addName(package().system_support().absFilename(), fromqstr(dir)));
+ toqstr(addName(package().system_support().absFileName(), fromqstr(dir)));
QString const label2 = qt_("User files|#U#u");
QString const dir2 =
- toqstr(addName(package().user_support().absFilename(), fromqstr(dir)));
+ toqstr(addName(package().user_support().absFileName(), fromqstr(dir)));
QString const result = browseFile(toqstr(
- libFileSearch(dir, name, ext).absFilename()),
+ libFileSearch(dir, name, ext).absFileName()),
title, filters, false, dir1, dir2, QString(), QString(), dir1);
// remove the extension if it is the default one
noextresult = result;
// remove the directory, if it is the default one
- QString const file = onlyFilename(noextresult);
- if (toqstr(libFileSearch(dir, file, ext).absFilename()) == result)
+ QString const file = onlyFileName(noextresult);
+ if (toqstr(libFileSearch(dir, file, ext).absFileName()) == result)
return file;
else
return noextresult;
dlg.setButton2(label2, dir2);
FileDialog::Result const result =
- dlg.opendir(lastPath, onlyFilename(pathname));
+ dlg.opendir(lastPath, onlyFileName(pathname));
return result.second;
}
this, SIGNAL(changed()));
connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
+ connect(overwriteCO, SIGNAL(activated(int)),
+ this, SIGNAL(changed()));
connect(dviCB, SIGNAL(editTextChanged(QString)),
this, SIGNAL(changed()));
connect(pdfCB, SIGNAL(editTextChanged(QString)),
dviCB->addItem("");
dviCB->addItem("xdvi -sourceposition $$n:$$t $$o");
dviCB->addItem("yap -1 -s $$n$$t $$o");
+ dviCB->addItem("okular --unique $$o#src:$$n$$t");
+ dviCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"evince -p %{page+1} $$o\"");
pdfCB->addItem("");
pdfCB->addItem("CMCDDE SUMATRA control [ForwardSearch(\\\"$$o\\\",\\\"$$t\\\",$$n,0,0,1)]");
- pdfCB->addItem("synctex view -i $$n:1:$$t -o $$o -x \"xpdf -raise -remote $$t.tmp $$o %{page+1}\"");
+ pdfCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"xpdf -raise -remote $$t.tmp $$o %{page+1}\"");
+ pdfCB->addItem("okular --unique $$o#src:$$n$$t");
+ pdfCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"evince -p %{page+1} $$o\"");
+ pdfCB->addItem("/Applications/Skim.app/Contents/SharedSupport/displayline $$n $$o $$t");
}
rc.plaintext_linelen = plaintextLinelengthSB->value();
rc.forward_search_dvi = fromqstr(dviCB->currentText());
rc.forward_search_pdf = fromqstr(pdfCB->currentText());
+
+ switch (overwriteCO->currentIndex()) {
+ case 0:
+ rc.export_overwrite = NO_FILES;
+ break;
+ case 1:
+ rc.export_overwrite = MAIN_FILE;
+ break;
+ case 2:
+ rc.export_overwrite = ALL_FILES;
+ break;
+ }
}
plaintextLinelengthSB->setValue(rc.plaintext_linelen);
dviCB->setEditText(toqstr(rc.forward_search_dvi));
pdfCB->setEditText(toqstr(rc.forward_search_pdf));
+
+ switch (rc.export_overwrite) {
+ case NO_FILES:
+ overwriteCO->setCurrentIndex(0);
+ break;
+ case MAIN_FILE:
+ overwriteCO->setCurrentIndex(1);
+ break;
+ case ALL_FILES:
+ overwriteCO->setCurrentIndex(2);
+ break;
+ }
}
void PrefConverters::updateButtons()
{
+ if (form_->formats().size() == 0)
+ return;
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());
void PrefFileformats::on_formatsCB_currentIndexChanged(int i)
{
+ if (form_->formats().size() == 0)
+ return;
int const nr = formatsCB->itemData(i).toInt();
Format const f = form_->formats().get(nr);
this, SIGNAL(changed()));
connect(uiLanguageCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
+ connect(defaultDecimalPointLE, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
uiLanguageCO->clear();
rc.language_command_end = fromqstr(endCommandED->text());
rc.gui_language = fromqstr(
uiLanguageCO->itemData(uiLanguageCO->currentIndex()).toString());
+ rc.default_decimal_point = fromqstr(defaultDecimalPointLE->text());
}
languagePackageED->setText(toqstr(rc.language_package));
startCommandED->setText(toqstr(rc.language_command_begin));
endCommandED->setText(toqstr(rc.language_command_end));
+ defaultDecimalPointLE->setText(toqstr(rc.default_decimal_point));
int pos = uiLanguageCO->findData(toqstr(rc.gui_language));
uiLanguageCO->blockSignals(true);
{
rc.bind_file = internal_path(fromqstr(bindFileED->text()));
// write user_bind and user_unbind to .lyx/bind/user.bind
- FileName bind_dir(addPath(package().user_support().absFilename(), "bind"));
+ FileName bind_dir(addPath(package().user_support().absFileName(), "bind"));
if (!bind_dir.exists() && !bind_dir.createDirectory(0777)) {
lyxerr << "LyX could not create the user bind directory '"
<< bind_dir << "'. All user-defined key bindings will be lost." << endl;
<< bind_dir << "'. All user-defined key bindings will be lost." << endl;
return;
}
- FileName user_bind_file(bind_dir.absFilename() + "/user.bind");
+ FileName user_bind_file(bind_dir.absFileName() + "/user.bind");
user_unbind_.write(user_bind_file.toFilesystemEncoding(), false, true);
user_bind_.write(user_bind_file.toFilesystemEncoding(), true, false);
// immediately apply the keybindings. Why this is not done before?