Merge tag 'upstream/1.7.1'

Upstream version 1.7.1

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/gcstar/GCItemsLists/GCListOptions.pm b/lib/gcstar/GCItemsLists/GCListOptions.pm
index c41084b..f473319 100644
--- a/lib/gcstar/GCItemsLists/GCListOptions.pm
+++ b/lib/gcstar/GCItemsLists/GCListOptions.pm
@@ -145,6 +145,9 @@ use Gtk2;
     sub initValues
     {
         my $self = shift;
+        $self->{groupByOption}->setModel($self->{parent}->{model});
+        $self->{secondarySortOption}->setModel($self->{parent}->{model});
+
         $self->{resizeImgList}->set_active($self->{optionsManager}->resizeImgList);
         $self->{animateImgList}->set_active($self->{optionsManager}->animateImgList);
         $self->{columns}->set_value($self->{optionsManager}->columns);
@@ -213,6 +216,7 @@ use Gtk2;
         #my $self  = $class->SUPER::new(0,0);
         
         $self->{optionsManager} = $optionsManager;
+        $self->{parent} = $parent;
         $self->{lang} = $parent->{lang};
 
 #        $self->set_row_spacings($GCUtils::halfMargin);
@@ -384,12 +388,16 @@ use Gtk2;
     {
         my $self = shift;
         
+        $self->{groupByOption}->setModel($self->{parent}->{model});
+        $self->{secondarySortOption}->setModel($self->{parent}->{model});
+        
         $self->{imgSizeOption}->setValue($self->{optionsManager}->detailImgSize);
         $self->{groupByOption}->setValue($self->{optionsManager}->groupBy);
         $self->{secondarySortOption}->setValue($self->{optionsManager}->secondarySort);
         $self->{groupedFirst}->setValue($self->{optionsManager}->groupedFirst);
         $self->{addCount}->setValue($self->{optionsManager}->addCount);
         
+        $self->{fieldsSelection}->setModel($self->{parent}->{model});
         my @tmpFieldsArray = split m/\|/, $self->{optionsManager}->details;
         $self->{fieldsSelection}->setListFromIds(\@tmpFieldsArray);
 
@@ -435,6 +443,7 @@ use Gtk2;
 
         $self->{lang} = $parent->{lang};
         $self->{optionsManager} = $optionsManager;
+        $self->{parent} = $parent;
 
         bless ($self, $class);