Il 22/07/2011 18:47, Pavel Sanda ha scritto:
Tommaso Cucinotta wrote:
I dropped the new patch on #3205, so that we don't forget about it.
its uncomfortable to comment on the patches coming in gzip form, i.e.
the chances to get some reaction is smaller this way.
pavel
because it contained binary sample files (.odt, ...). Let me attach to
this message
the part without them.
Thanks,
T.
Index: lib/external_templates
===================================================================
--- lib/external_templates (revisione 39362)
+++ lib/external_templates (copia locale)
@@ -44,6 +44,7 @@
HelpTextEnd
InputFormat "gnumeric"
FileFilter "*.{gnumeric,ods,xls}"
+ Sample "sample.gnumeric,sample.ods"
AutomaticProduction true
Format LaTeX
Product "\\def\\inputGnumericTable{}\\input{$$AbsOrRelPathMaster$$Basename.tex}"
@@ -376,6 +377,7 @@
HelpTextEnd
InputFormat dia
FileFilter "*.dia"
+ Sample "sample.dia"
AutomaticProduction true
# LyX has hard-coded support for these transformations
Transform Rotate
Index: lib/configure.py
===================================================================
--- lib/configure.py (revisione 39362)
+++ lib/configure.py (copia locale)
@@ -458,6 +458,9 @@
checkViewerEditor('a Dia viewer and editor', ['dia'],
rc_entry = [r'\Format dia dia DIA "" "%%" "%%" "vector"'])
#
+ checkViewerEditor('an OpenOffice Calc viewer and editor', ['oocalc'],
+ rc_entry = [r'\Format ods ods ODS "" "%%" "%%" "vector"'])
+ #
checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
rc_entry = [r'\Format agr agr Grace "" "%%" "%%" "vector"'])
#
Index: src/insets/ExternalTemplate.cpp
===================================================================
--- src/insets/ExternalTemplate.cpp (revisione 39362)
+++ src/insets/ExternalTemplate.cpp (copia locale)
@@ -303,6 +303,20 @@
}
+static void readSamples(std::map<string,string> & samples, string s) {
+ size_t pos = 0, new_pos;
+ do {
+ new_pos = s.find(",", pos);
+ if (new_pos == string::npos)
+ new_pos = s.length();
+ string fname = s.substr(pos, new_pos - pos);
+ string ext = FileName(fname).extension();
+ LYXERR(Debug::EXTERNAL, "adding sample mapping: " << ext << " => " << fname);
+ samples[ext] = fname;
+ pos = new_pos + 1;
+ } while (pos < s.length());
+}
+
void Template::readTemplate(Lexer & lex)
{
enum {
@@ -314,7 +328,8 @@
TO_PREVIEW,
TO_TRANSFORM,
TO_FORMAT,
- TO_END
+ TO_END,
+ TO_SAMPLE
};
LexerKeyword templateoptiontags[] = {
@@ -325,6 +340,7 @@
{ "helptext", TO_HELPTEXT },
{ "inputformat", TO_INPUTFORMAT },
{ "preview", TO_PREVIEW },
+ { "sample", TO_SAMPLE },
{ "templateend", TO_END },
{ "transform", TO_TRANSFORM }
};
@@ -387,6 +403,11 @@
case TO_END:
return;
+ case TO_SAMPLE:
+ lex.next(true);
+ readSamples(samples, lex.getString());
+ break;
+
default:
lex.printError("external::Template::readTemplate: "
"Wrong tag: $$Token");
Index: src/insets/ExternalTemplate.h
===================================================================
--- src/insets/ExternalTemplate.h (revisione 39362)
+++ src/insets/ExternalTemplate.h (copia locale)
@@ -68,6 +68,8 @@
PreviewMode preview_mode;
/// A collection of transforms that we can use to transform the data.
std::vector<TransformID> transformIds;
+ /// Map from extensions to pathnames of corresponding sample empty files
+ std::map<std::string,std::string> samples;
/// This is the information needed to support a specific output format
class Format {
Index: src/frontends/qt4/ui/ExternalUi.ui
===================================================================
--- src/frontends/qt4/ui/ExternalUi.ui (revisione 39362)
+++ src/frontends/qt4/ui/ExternalUi.ui (copia locale)
@@ -1,107 +1,108 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>ExternalUi</class>
- <widget class="QDialog" name="ExternalUi" >
- <property name="geometry" >
+ <widget class="QDialog" name="ExternalUi">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>386</width>
- <height>453</height>
+ <height>491</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string/>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QTabWidget" name="tab" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tab">
+ <property name="toolTip">
<string/>
</property>
- <property name="currentIndex" >
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="filetab" >
- <attribute name="title" >
+ <widget class="QWidget" name="filetab">
+ <attribute name="title">
<string>F&ile</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="fileED" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="fileED">
+ <property name="toolTip">
<string>Filename</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="fileLA" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="fileLA">
+ <property name="toolTip">
<string>Filename</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&File:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>fileED</cstring>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="browsePB" >
- <property name="toolTip" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="browsePB">
+ <property name="toolTip">
<string>Select a file</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Browse...</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3" >
- <widget class="QCheckBox" name="draftCB" >
- <property name="text" >
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="draftCB">
+ <property name="text">
<string>&Draft</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3" >
- <widget class="QGroupBox" name="GroupBox3" >
- <property name="title" >
+ <item row="1" column="0" colspan="3">
+ <widget class="QGroupBox" name="GroupBox3">
+ <property name="title">
<string>&Template</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="0" colspan="2" >
- <widget class="QTextBrowser" name="externalTB" />
+ <item row="1" column="0" colspan="3">
+ <widget class="QTextBrowser" name="externalTB"/>
</item>
- <item row="0" column="1" >
+ <item row="0" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -109,75 +110,85 @@
</property>
</spacer>
</item>
- <item row="0" column="0" >
- <widget class="QComboBox" name="externalCO" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <item row="0" column="0">
+ <widget class="QComboBox" name="externalCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Available templates</string>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="createPB">
+ <property name="text">
+ <string>Create...</string>
+ </property>
+ <property name="toolTip">
+ <string>Create file from empty template (specify name first)</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="lyxviewtab" >
- <attribute name="title" >
+ <widget class="QWidget" name="lyxviewtab">
+ <attribute name="title">
<string>LaTe&X and LyX options</string>
</attribute>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>9</number>
</property>
<item>
- <widget class="QGroupBox" name="optionsGB" >
- <property name="title" >
+ <widget class="QGroupBox" name="optionsGB">
+ <property name="title">
<string>LaTeX Options</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="extraED" />
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="extraED"/>
</item>
- <item row="0" column="1" >
- <widget class="QLabel" name="optionLA" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QLabel" name="optionLA">
+ <property name="text">
<string>O&ption:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>extraED</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QComboBox" name="extraFormatCO" />
+ <item row="1" column="0">
+ <widget class="QComboBox" name="extraFormatCO"/>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="formatLA" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="formatLA">
+ <property name="text">
<string>Forma&t:</string>
</property>
- <property name="textFormat" >
+ <property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>extraFormatCO</cstring>
</property>
</widget>
@@ -186,61 +197,61 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="displayGB" >
- <property name="toolTip" >
+ <widget class="QGroupBox" name="displayGB">
+ <property name="toolTip">
<string>Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog).</string>
</property>
- <property name="title" >
+ <property name="title">
<string>&Show in LyX</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>true</bool>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="scaleLA" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="scaleLA">
+ <property name="toolTip">
<string>Percentage to scale by in LyX</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Sca&le on Screen (%):</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>displayscaleED</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="displayscaleED" >
- <property name="enabled" >
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="displayscaleED">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Percentage to scale by in LyX</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="0" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -253,10 +264,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>81</width>
<height>196</height>
@@ -266,41 +277,41 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="sizetab" >
- <attribute name="title" >
+ <widget class="QWidget" name="sizetab">
+ <attribute name="title">
<string>Si&ze and Rotation</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="rotationGB" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="rotationGB">
+ <property name="title">
<string>Rotate</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="1" >
+ <item row="0" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -308,59 +319,59 @@
</property>
</spacer>
</item>
- <item row="0" column="0" >
- <layout class="QGridLayout" >
- <property name="margin" >
+ <item row="0" column="0">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="angleED" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="angleED">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Angle to rotate image by</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="originLA" >
- <property name="toolTip" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="originLA">
+ <property name="toolTip">
<string>The origin of the rotation</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Ori&gin:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>originCO</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="originCO" >
- <property name="toolTip" >
+ <item row="1" column="1">
+ <widget class="QComboBox" name="originCO">
+ <property name="toolTip">
<string>The origin of the rotation</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="angleLA" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="angleLA">
+ <property name="toolTip">
<string>Angle to rotate image by</string>
</property>
- <property name="text" >
+ <property name="text">
<string>A&ngle:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>angleED</cstring>
</property>
</widget>
@@ -370,82 +381,82 @@
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="scaleGB" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="scaleGB">
+ <property name="title">
<string>Scale</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="2" >
- <widget class="LengthCombo" name="heightUnitCO" />
+ <item row="1" column="2">
+ <widget class="LengthCombo" name="heightUnitCO"/>
</item>
- <item row="0" column="2" >
- <widget class="LengthCombo" name="widthUnitCO" />
+ <item row="0" column="2">
+ <widget class="LengthCombo" name="widthUnitCO"/>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="heightED" >
- <property name="enabled" >
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="heightED">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Height of image in output</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="widthED" >
- <property name="enabled" >
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="widthED">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Width of image in output</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="widthLA" >
- <property name="enabled" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="widthLA">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>&Width:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>widthED</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QCheckBox" name="aspectratioCB" >
- <property name="enabled" >
+ <item row="2" column="1" colspan="2">
+ <widget class="QCheckBox" name="aspectratioCB">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Maintain aspect ratio with largest dimension</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Maintain aspect ratio</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="heightLA" >
- <property name="enabled" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="heightLA">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>&Height:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>heightED</cstring>
</property>
</widget>
@@ -453,84 +464,84 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="cropGB" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="cropGB">
+ <property name="title">
<string>Crop</string>
</property>
- <property name="flat" >
+ <property name="flat">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" colspan="2" >
- <widget class="QCheckBox" name="clipCB" >
- <property name="toolTip" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="clipCB">
+ <property name="toolTip">
<string>Clip to bounding box values</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Clip to &bounding box</string>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="lbLA" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="lbLA">
+ <property name="text">
<string>&Left bottom:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>xlED</cstring>
</property>
</widget>
</item>
- <item row="2" column="3" >
- <widget class="QLineEdit" name="ytED" />
+ <item row="2" column="3">
+ <widget class="QLineEdit" name="ytED"/>
</item>
- <item row="1" column="1" >
- <widget class="QLabel" name="xLA" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QLabel" name="xLA">
+ <property name="text">
<string>x</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="rtLA" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="rtLA">
+ <property name="text">
<string>Right &top:</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>xrED</cstring>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QPushButton" name="getbbPB" >
- <property name="toolTip" >
+ <item row="0" column="3">
+ <widget class="QPushButton" name="getbbPB">
+ <property name="toolTip">
<string>Get bounding box from the (EPS) file</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Get from File</string>
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2" >
- <widget class="QLineEdit" name="xlED" >
- <property name="toolTip" >
+ <item row="3" column="1" colspan="2">
+ <widget class="QLineEdit" name="xlED">
+ <property name="toolTip">
<string/>
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="0" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>43</width>
<height>18</height>
@@ -538,18 +549,18 @@
</property>
</spacer>
</item>
- <item row="3" column="3" >
- <widget class="QLineEdit" name="ybED" />
+ <item row="3" column="3">
+ <widget class="QLineEdit" name="ybED"/>
</item>
- <item row="1" column="3" >
- <widget class="QLabel" name="yLA" >
- <property name="text" >
+ <item row="1" column="3">
+ <widget class="QLabel" name="yLA">
+ <property name="text">
<string>y</string>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QLineEdit" name="xrED" />
+ <item row="2" column="1" colspan="2">
+ <widget class="QLineEdit" name="xrED"/>
</item>
</layout>
</widget>
@@ -558,23 +569,23 @@
</widget>
</widget>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="1" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -583,34 +594,34 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="okPB" >
- <property name="text" >
+ <widget class="QPushButton" name="okPB">
+ <property name="text">
<string>&OK</string>
</property>
- <property name="default" >
+ <property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="applyPB" >
- <property name="text" >
+ <widget class="QPushButton" name="applyPB">
+ <property name="text">
<string>&Apply</string>
</property>
- <property name="default" >
+ <property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="closePB" >
- <property name="text" >
+ <widget class="QPushButton" name="closePB">
+ <property name="text">
<string>&Close</string>
</property>
- <property name="autoDefault" >
+ <property name="autoDefault">
<bool>false</bool>
</property>
- <property name="default" >
+ <property name="default">
<bool>false</bool>
</property>
</widget>
@@ -640,7 +651,7 @@
<tabstop>closePB</tabstop>
</tabstops>
<includes>
- <include location="local" >qt_i18n.h</include>
+ <include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>
Index: src/frontends/qt4/GuiExternal.h
===================================================================
--- src/frontends/qt4/GuiExternal.h (revisione 39362)
+++ src/frontends/qt4/GuiExternal.h (copia locale)
@@ -41,6 +41,7 @@
void sizeChanged();
void templateChanged();
void widthUnitChanged();
+ void createClicked();
private:
///
Index: src/frontends/qt4/GuiExternal.cpp
===================================================================
--- src/frontends/qt4/GuiExternal.cpp (revisione 39362)
+++ src/frontends/qt4/GuiExternal.cpp (copia locale)
@@ -16,6 +16,7 @@
#include "FuncRequest.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "Length.h"
#include "LyXRC.h"
@@ -27,6 +28,8 @@
#include "graphics/GraphicsCacheItem.h"
#include "graphics/GraphicsImage.h"
+#include "frontends/alert.h"
+
#include "support/convert.h"
#include "support/filetools.h"
#include "support/lstrings.h"
@@ -43,6 +46,7 @@
#include <QPushButton>
#include <QTabWidget>
#include <QTextBrowser>
+#include <QFile>
using namespace std;
using namespace lyx::support;
@@ -110,6 +114,8 @@
this, SLOT(change_adaptor()));
connect(browsePB, SIGNAL(clicked()),
this, SLOT(browseClicked()));
+ connect(createPB, SIGNAL(clicked()),
+ this, SLOT(createClicked()));
connect(externalCO, SIGNAL(activated(QString)),
this, SLOT(templateChanged()));
connect(extraED, SIGNAL(textChanged(QString)),
@@ -266,8 +272,66 @@
}
+void GuiExternal::createClicked()
+{
+ int const choice = externalCO->currentIndex();
+ external::Template const & templ = getTemplate(choice);
+ LASSERT(!templ.samples.empty(), /**/);
+ FileName fname(fromqstr(fileED->text()));
+ string sample_name;
+ if (templ.samples.size() == 1)
+ sample_name = templ.samples.begin()->second;
+ else if (fname.extension().empty()) {
+ frontend::Alert::warning(_("Warning"), _("More than one sample template available. Please, specify desired extension to disambiguate."));
+ return;
+ } else {
+ map<string,string>::const_iterator it = templ.samples.find(fname.extension());
+ if (it == templ.samples.end()) {
+ frontend::Alert::warning(_("Warning"), _("Supplied extension not recognized among available ones for the given template."));
+ return;
+ }
+ sample_name = it->second;
+ }
+
+ QString const sample_qname = toqstr(sample_name);
+ FileName sample_fname = libFileSearch(toqstr("samples"), sample_qname);
+ LASSERT(sample_fname.exists(), /**/);
+
+ LASSERT(!fromqstr(fileED->text()).empty(), /**/);
+ FileName dest_fname(FileName(fromqstr(bufferFilePath())), fromqstr(fileED->text()));
+ if (dest_fname.exists()) {
+ int overwrite = frontend::Alert::prompt(
+ _("Overwrite ?"), _("File exists. Replace with empty template ?"),
+ 0, 1, _("&Yes"), _("&No"));
+ if (overwrite != 0)
+ return;
+ }
+ sample_fname.copyTo(dest_fname);
+ frontend::Alert::information(_("Information"), bformat(_("Empty file created from template: %1$s"), from_utf8(dest_fname.realPath())));
+}
+
+
void GuiExternal::change_adaptor()
{
+ int const choice = externalCO->currentIndex();
+ external::Template const & templ = getTemplate(choice);
+ string fname = fromqstr(fileED->text());
+ string ext = FileName(fname).extension();
+ if (templ.samples.empty() || fname.empty())
+ createPB->setEnabled(false);
+ else
+ createPB->setEnabled(true);
+ if (!ext.empty()) {
+ for (int i = 0; i < externalCO->count(); ++i) {
+ external::Template const & templ = getTemplate(i);
+ map<string,string>::const_iterator it = templ.samples.find(ext);
+ if (it != templ.samples.end()) {
+ externalCO->setCurrentIndex(i);
+ updateTemplate();
+ break;
+ }
+ }
+ }
changed();
}
@@ -337,6 +401,18 @@
{
updateTemplate();
changed();
+ int const choice = externalCO->currentIndex();
+ external::Template const & templ = getTemplate(choice);
+ string fname = fromqstr(fileED->text());
+ if (templ.samples.size() > 0 && fname.length() > 0) {
+ string ext = FileName(fname).extension();
+ if (templ.samples.find(ext) == templ.samples.end()) {
+ ext = templ.samples.begin()->first;
+ fname = support::changeExtension(fname, ext);
+ fileED->setText(toqstr(fname));
+ }
+ }
+ change_adaptor();
}
