Fix the tab ordering of GuiDocument components.

[lyx.git] / src / frontends / qt4 / GuiExternal.cpp

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index 73cabd0c2467612d0b986ddb434c191d7acdd3b1..94decc7b3b9978f3c69dc3c980c14f054fc17c08 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -80,6 +80,8 @@ char const * const origin_gui_strs[] = {
 
 external::Template getTemplate(int i)
 {
+       if (external::TemplateManager::get().getTemplates().empty())
+               return Template();
        external::TemplateManager::Templates::const_iterator i1
                = external::TemplateManager::get().getTemplates().begin();
        advance(i1, i);
@@ -197,7 +199,7 @@ GuiExternal::GuiExternal(GuiView & lv)
        i1 = external::TemplateManager::get().getTemplates().begin();
        i2 = external::TemplateManager::get().getTemplates().end();
        for (; i1 != i2; ++i1)
-               externalCO->addItem(qt_(i1->second.lyxName));
+               externalCO->addItem(qt_(i1->second.guiName));
 
        // Fill the origins combo
        for (size_t i = 0; i != sizeof(origins) / sizeof(origins[0]); ++i)
@@ -294,7 +296,7 @@ void GuiExternal::getbbClicked()
        if (filename.empty())
                return;
 
-       FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilepath())));
+       FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilePath())));
 
        // try to get it from the file, if possible
        string bb = readBB_from_PSFile(abs_file);
@@ -458,7 +460,7 @@ static void getCrop(external::ClipData & data,
 void GuiExternal::updateContents()
 {
        string const name =
-               params_.filename.outputFilename(fromqstr(bufferFilepath()));
+               params_.filename.outputFileName(fromqstr(bufferFilePath()));
        fileED->setText(toqstr(name));
 
        int index = 0;
@@ -510,21 +512,19 @@ void GuiExternal::updateTemplate()
        TransformIDs::const_iterator tr_begin = transformIds.begin();
        TransformIDs::const_iterator const tr_end = transformIds.end();
 
-       bool found = std::find(tr_begin, tr_end, external::Rotate) != tr_end;
-       rotationGB->setEnabled(found);
+       bool rotate = std::find(tr_begin, tr_end, external::Rotate) != tr_end;
+       rotationGB->setEnabled(rotate);
 
-       found = std::find(tr_begin, tr_end, external::Resize) != tr_end;
-       scaleGB->setEnabled(found);
+       bool resize = std::find(tr_begin, tr_end, external::Resize) != tr_end;
+       scaleGB->setEnabled(resize);
 
-       found = std::find(tr_begin, tr_end, external::Clip) != tr_end;
-       cropGB->setEnabled(found);
+       bool clip = std::find(tr_begin, tr_end, external::Clip) != tr_end;
+       cropGB->setEnabled(clip);
 
-       tab->setTabEnabled(tab->indexOf(sizetab),
-               rotationGB->isEnabled()
-               || scaleGB->isEnabled()
-               || cropGB->isEnabled());
+       sizetab->setEnabled(rotate || resize || clip);
+       tab->setTabEnabled(tab->indexOf(sizetab), rotate || resize || clip);
 
-       found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
+       bool found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
        optionsGB->setEnabled(found);
 
        bool scaled = displayGB->isChecked() && displayGB->isEnabled() &&
@@ -568,7 +568,7 @@ void GuiExternal::updateTemplate()
 
 void GuiExternal::applyView()
 {
-       params_.filename.set(fromqstr(fileED->text()), fromqstr(bufferFilepath()));
+       params_.filename.set(fromqstr(fileED->text()), fromqstr(bufferFilePath()));
        params_.settemplate(getTemplate(externalCO->currentIndex()).lyxName);
 
        params_.draft = draftCB->isChecked();
@@ -623,7 +623,14 @@ static QStringList templateFilters(QString const & template_name)
        external::Template const * const et_ptr =
                etm.getTemplateByName(fromqstr(template_name));
 
-       return fileFilters(et_ptr ? toqstr(et_ptr->fileRegExp) : QString());
+       string filter;
+       if (et_ptr && et_ptr->fileRegExp != "" && et_ptr->fileRegExp != "*") {
+               filter += et_ptr->guiName;
+               filter += " (";
+               filter += et_ptr->fileRegExp;
+               filter += ")";
+       }
+       return fileFilters(toqstr(filter));
 }
 
 
@@ -631,13 +638,13 @@ QString GuiExternal::browse(QString const & input,
                                     QString const & template_name) const
 {
        QString const title = qt_("Select external file");
-       QString const bufpath = bufferFilepath();
+       QString const bufpath = bufferFilePath();
        QStringList const filter = templateFilters(template_name);
 
        QString const label1 = qt_("Documents|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
 
-       return browseRelFile(input, bufpath, title, filter, false, label1, dir1);
+       return browseRelToParent(input, bufpath, title, filter, false, label1, dir1);
 }