/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp |
---|
31,6 → 31,7 |
fieldDelimiter = fdelim; |
valueDelimiter = vdelim; |
hasHeader = header; |
useVDelim = usevdelim; |
filename = fname; |
encoding = enc; |
writer = w; |
126,9 → 127,11 |
int start = 0, end = line.length(); |
int fdindex = line.find(fieldDelimiter); |
int vdindex = line.find(valueDelimiter); |
int vdindex = -1; |
if (useVDelim) |
vdindex = line.find(valueDelimiter); |
if ((vdindex == -1)) |
if ((vdindex == -1) && (fdindex != -1)) |
{ |
QStringList l = QStringList::split(fieldDelimiter, line); |
for (uint i = 0; i < l.size(); ++i) |
/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h |
---|
31,6 → 31,7 |
QString fieldDelimiter; |
QString valueDelimiter; |
bool hasHeader; |
bool useVDelim; |
QString filename; |
QString encoding; |
gtWriter *writer; |
/trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.cpp |
---|
29,7 → 29,7 |
vlayout->addWidget(vdlabel,1); |
vdelimCombo = new QComboBox(true, this, "vdelimCombo"); |
QStringList vdList("\""); |
vdList << "'"; // << tr("None"); |
vdList << "'" << tr("None"); |
vdelimCombo->insertStringList(vdList); |
vdelimCombo->setMinimumWidth(120); |
vlayout->addWidget(vdelimCombo,5); |