Author: tian
Date: Sun Nov 27 13:39:35 2016
New Revision: 2288
URL: http://svn.gna.org/viewcvs/gcstar?rev=2288&view=rev
Log:
Support list of images when exporting
Modified:
trunk/gcstar/lib/gcstar/GCBackend/GCBackendXmlCommon.pm
trunk/gcstar/lib/gcstar/GCExport/GCExportExternal.pm
trunk/gcstar/lib/gcstar/GCGraphicComponents/GCBasicWidgets.pm
trunk/gcstar/lib/gcstar/GCLang/EN/GCModels/GCbuildingtoys.pm
trunk/gcstar/lib/gcstar/GCLang/FR/GCModels/GCbuildingtoys.pm
trunk/gcstar/lib/gcstar/GCModel.pm
trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm
Modified: trunk/gcstar/lib/gcstar/GCBackend/GCBackendXmlCommon.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCBackend/GCBackendXmlCommon.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCBackend/GCBackendXmlCommon.pm (original)
+++ trunk/gcstar/lib/gcstar/GCBackend/GCBackendXmlCommon.pm Sun Nov 27
13:39:35 2016
@@ -227,6 +227,17 @@
{
$_->{$pic}
= $self->{modelLoader}->transformPicturePath($_->{$pic},
undef, $_, $pic);
+ }
+ foreach my
$pic(@{$self->{modelLoader}->{model}->{fieldsMultiImage}})
+ {
+ use Data::Dumper;
+ next if ! $_->{$pic};
+ foreach my $line(@{$_->{$pic}})
+ {
+ $line->[0] =
$self->{modelLoader}->transformPicturePath($line->[0], undef, $_, $pic);
+ }
+ #$_->{$pic}
+ # = $self->{modelLoader}->transformPicturePath($_->{$pic},
undef, $_, $pic);
}
print $tmpFd ' <item
Modified: trunk/gcstar/lib/gcstar/GCExport/GCExportExternal.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCExport/GCExportExternal.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCExport/GCExportExternal.pm (original)
+++ trunk/gcstar/lib/gcstar/GCExport/GCExportExternal.pm Sun Nov 27
13:39:35 2016
@@ -58,6 +58,7 @@
sub transformPicturePath
{
my ($self, $path, $file, $item, $field) = @_;
+ #GCUtils::printStack(10);
my $newPath = $self->duplicatePicture($path,
$field,
$self->{imageDir},
Modified: trunk/gcstar/lib/gcstar/GCGraphicComponents/GCBasicWidgets.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCGraphicComponents/GCBasicWidgets.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCGraphicComponents/GCBasicWidgets.pm
(original)
+++ trunk/gcstar/lib/gcstar/GCGraphicComponents/GCBasicWidgets.pm Sun Nov
27 13:39:35 2016
@@ -3080,7 +3080,7 @@
$self->{options} = $parent->{options};
$self->{window} = $parent;
- ($widget, undef) = GCBaseWidgets::createWidget($self, $info,
$comparison);
+ ($widget, undef) = GCWidgets::createWidget($self, $info, $comparison);
if ($info->{type} eq 'history text')
{
Modified: trunk/gcstar/lib/gcstar/GCLang/EN/GCModels/GCbuildingtoys.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCLang/EN/GCModels/GCbuildingtoys.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCLang/EN/GCModels/GCbuildingtoys.pm
(original)
+++ trunk/gcstar/lib/gcstar/GCLang/EN/GCModels/GCbuildingtoys.pm Sun Nov
27 13:39:35 2016
@@ -57,6 +57,8 @@
Box => 'Box',
Sealed => 'Sealed',
Manual => 'Instructions manual',
+ NbOwned => 'Number owned',
+ Instructions => 'Electronic instructions',
Comments => 'Comments',
PaidPrice => 'Price paid',
EstimatedPrice => 'Current estimate',
Modified: trunk/gcstar/lib/gcstar/GCLang/FR/GCModels/GCbuildingtoys.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCLang/FR/GCModels/GCbuildingtoys.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCLang/FR/GCModels/GCbuildingtoys.pm
(original)
+++ trunk/gcstar/lib/gcstar/GCLang/FR/GCModels/GCbuildingtoys.pm Sun Nov
27 13:39:35 2016
@@ -54,9 +54,11 @@
Url => 'Page web',
Details => 'Détails',
- Case => 'Boîte',
+ Box => 'Boîte',
Manual => 'Notice',
Sealed => 'Scellée',
+ NbOwned => 'Exemplaires',
+ Instructions => 'Fichier notice',
Comments => 'Commentaires',
PaidPrice => 'Prix',
EstimatedPrice => 'Estimation',
Modified: trunk/gcstar/lib/gcstar/GCModel.pm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCModel.pm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCModel.pm (original)
+++ trunk/gcstar/lib/gcstar/GCModel.pm Sun Nov 27 13:39:35 2016
@@ -350,6 +350,7 @@
my @fieldsImage;
my @fieldsDate;
my @managedImages;
+ my @fieldsMultiImage;
my $name;
foreach (@{$self->{fields}})
{
@@ -371,6 +372,10 @@
push @fieldsImage, $name;
push @managedImages, $name if (exists $_->{imported}) &&
($_->{imported} eq 'true');
}
+ elsif ($_->{type} eq 'images')
+ {
+ push @fieldsMultiImage, $name;
+ }
elsif ($_->{type} eq 'date')
{
push @fieldsDate, $name;
@@ -388,6 +393,7 @@
$self->{managedImages} = \@managedImages;
$self->{fieldsImage} = \@fieldsImage;
$self->{fieldsDate} = \@fieldsDate;
+ $self->{fieldsMultiImage} = \@fieldsMultiImage;
}
sub setFilters
Modified: trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm
URL:
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm?rev=2288&r1=2287&r2=2288&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm (original)
+++ trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm Sun Nov 27 13:39:35 2016
@@ -65,10 +65,6 @@
<group id="minifigs" label="Minifigures"/>
</groups>
- <random>
- <filter field="completion" comparison="lt" numeric="true"
value="100"/>
- </random>
-
<fields lending="false" tags="true">
<field value="id"
type="number"
@@ -166,6 +162,14 @@
init="1"
group="details"
imported="false"/>
+ <field value="nbowned"
+ type="number"
+ label="NbOwned"
+ min="0"
+ max="1000"
+ init="1"
+ group="details"
+ imported="false"/>
<field value="added"
type="date"
label="PanelAdded"
@@ -223,14 +227,15 @@
<filters>
- <group label="General">
+ <group label="SetDescription">
<filter field="name" comparison="contain"/>
- <filter field="platform" comparison="eq" quick="true"/>
- <filter field="genre" comparison="contain"
quick="true"/>
+ <filter field="brand" comparison="eq" quick="true"/>
+ <filter field="theme" comparison="eq" quick="true"/>
</group>
<group label="Details">
- <filter field="rating" comparison="ge" numeric="true"
labelselect="FilterRatingSelect" quick="true"/>
- <filter field="completion" comparison="range"
numeric="true"/>
+ <filter field="box" comparison="eq" quick="true"/>
+ <filter field="sealed" comparison="eq" quick="true"/>
+ <filter field="manual" comparison="eq" quick="true"/>
</group>
</filters>
@@ -276,6 +281,8 @@
</item>
<item type="label" for="rating"
row="1" col="0"/>
<item type="value" for="rating"
row="1" col="1" colspan="1"/>
+ <item type="label"
for="nbowned" row="1" col="4"/>
+ <item type="value"
for="nbowned" row="1" col="5" colspan="1"/>
<item type="label" for="added"
row="2" col="0"/>
<item type="value" for="added"
row="2" col="1" colspan="1"/>
<item type="label"
for="location" row="3" col="0"/>
_______________________________________________
GCstar-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gcstar-commits
