Changeset 10844

Timestamp:

02/20/10 00:41:25 (2 years ago)

Author:

azawawi

Message:

Display configuration store name when it is default and 'User' is now called 'Overriden'.

File:

• trunk/Padre/lib/Padre/Wx/Dialog/Advanced.pm (modified) (6 diffs)

trunk/Padre/lib/Padre/Wx/Dialog/Advanced.pm

@@ -326 +326 @@
         $text =
               $name . ";"
-            . ( $pref->{is_default} ? Wx::gettext('Default') : Wx::gettext('User') ) . ";"
+            . ( $pref->{is_default} ? $pref->{store_name} : Wx::gettext('Overriden') ) . ";"
             . $pref->{type_name} . ";"
             . $pref->{value};
@@ -433 +433 @@
     $self->{default_value}->SetLabel( $self->_displayed_value( $type, $value ) );
     $self->{button_reset}->Enable( not $is_default );
-    $list->SetItem( $index, 1, $is_default ? Wx::gettext('Default') : Wx::gettext('User') );
+    $list->SetItem( $index, 1, $is_default ? $pref->{store_name} : Wx::gettext('Overriden') );
     $list->SetItem( $index, 3, $self->_displayed_value( $type, $value ) );
     $self->_set_item_bold_font( $index, not $is_default );
@@ -557 +557 @@
 
         # Add the setting to the list control
-        my $setting    = $preferences->{$name};
-        my $is_default = $setting->{is_default};
+        my $pref    = $preferences->{$name};
+        my $is_default = $pref->{is_default};
 
         $list->InsertStringItem( ++$index, $name );
-        if ($is_default) {
-            $list->SetItem( $index, 1, Wx::gettext('Default') );
-        } else {
-            $list->SetItem( $index, 1, Wx::gettext('User') );
-        }
-        $list->SetItem( $index, 2, $setting->{type_name} );
-        $list->SetItem( $index, 3, $self->_displayed_value( $setting->{type}, $setting->{value} ) );
+        $list->SetItem( $index, 1, $is_default ? $pref->{store_name} : Wx::gettext('Overriden') );
+        $list->SetItem( $index, 2, $pref->{type_name} );
+        $list->SetItem( $index, 3, $self->_displayed_value( $pref->{type}, $pref->{value} ) );
 
         # Alternating table colors
@@ -604 +600 @@
 
         # Skip PROJECT settings
+        my $store = $setting->store;
         next if $setting->store == Padre::Constant::PROJECT;
 
@@ -616 +613 @@
         my $default    = $setting->default;
         my $is_default = $self->_is_default( $type, $value, $default );
-
+        my $store_name = ($store == Padre::Constant::HUMAN) ? Wx::gettext('User') : Wx::gettext('Host');
         $self->{preferences}->{$name} = {
             'is_default' => $is_default,
@@ -622 +619 @@
             'type'       => $type,
             'type_name'  => $type_name,
+            'store_name' => $store_name,
             'value'      => $value,
             'original'   => $value,