Changeset 10854
- Timestamp:
- 02/20/10 02:01:31 (6 months ago)
- Files:
-
- 1 modified
-
trunk/Padre/lib/Padre/Wx/Dialog/Advanced.pm (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Padre/lib/Padre/Wx/Dialog/Advanced.pm
r10852 r10854 123 123 124 124 # Boolean value radio button fields 125 $self->{true} = Wx::RadioButton->new( $self, -1, Wx::gettext('True') );125 $self->{true} = Wx::RadioButton->new( $self, -1, Wx::gettext('True') ); 126 126 $self->{false} = Wx::RadioButton->new( $self, -1, Wx::gettext('False') ); 127 127 $self->{true}->Hide; … … 186 186 # Bottom preference value setter sizer 187 187 my $value_sizer = Wx::BoxSizer->new(Wx::wxHORIZONTAL); 188 $value_sizer->Add( $value_label, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );189 $value_sizer->Add( $self->{value}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 );188 $value_sizer->Add( $value_label, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 189 $value_sizer->Add( $self->{value}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 190 190 $value_sizer->Add( $self->{true}, 1, Wx::wxALIGN_CENTER_VERTICAL | Wx::wxEXPAND, 5 ); 191 $value_sizer->Add( $self->{false}, 1, Wx::wxALIGN_CENTER_VERTICAL,5 );192 $value_sizer->Add( $self->{button_set}, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );193 $value_sizer->Add( $self->{button_reset}, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );191 $value_sizer->Add( $self->{false}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 192 $value_sizer->Add( $self->{button_set}, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 193 $value_sizer->Add( $self->{button_reset}, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 194 194 195 195 # Sizer for default value and options … … 198 198 $info_sizer->Add( $self->{default_value}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 199 199 $info_sizer->AddSpacer(5); 200 $info_sizer->Add( $options_label, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );200 $info_sizer->Add( $options_label, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 201 201 $info_sizer->Add( $self->{options}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 ); 202 202 … … 209 209 # Create the main vertical sizer 210 210 my $vsizer = Wx::BoxSizer->new(Wx::wxVERTICAL); 211 $vsizer->Add( $filter_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 );212 $vsizer->Add( $self->{list}, 1, Wx::wxALL | Wx::wxEXPAND, 3 );213 $vsizer->Add( $value_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 );214 $vsizer->Add( $info_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 );211 $vsizer->Add( $filter_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 ); 212 $vsizer->Add( $self->{list}, 1, Wx::wxALL | Wx::wxEXPAND, 3 ); 213 $vsizer->Add( $value_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 ); 214 $vsizer->Add( $info_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 ); 215 215 $vsizer->AddSpacer(5); 216 216 $vsizer->Add( $button_sizer, 0, Wx::wxALIGN_RIGHT, 5 ); … … 402 402 my $type = $pref->{type}; 403 403 404 my $is_boolean = ( $pref->{type} == Padre::Constant::BOOLEAN) ? 1 : 0;405 if ($is_boolean) {404 my $is_boolean = ( $pref->{type} == Padre::Constant::BOOLEAN ) ? 1 : 0; 405 if ($is_boolean) { 406 406 $self->{true}->SetValue( $pref->{value} ); 407 407 $self->{false}->SetValue( not $pref->{value} ); … … 409 409 $self->{value}->SetValue( $self->_displayed_value( $type, $pref->{value} ) ); 410 410 } 411 $self->{value}->Show( not $is_boolean);411 $self->{value}->Show( not $is_boolean ); 412 412 $self->{true}->Show($is_boolean); 413 413 $self->{false}->Show($is_boolean); 414 414 $self->Layout; 415 415 416 416 $self->{default_value}->SetLabel( $self->_displayed_value( $type, $pref->{default} ) ); 417 417 … … 464 464 my $is_default = $pref->{is_default}; 465 465 466 if ($type == Padre::Constant::BOOLEAN) {467 $self->{true}->SetValue( $value);466 if ( $type == Padre::Constant::BOOLEAN ) { 467 $self->{true}->SetValue($value); 468 468 $self->{false}->SetValue( not $value ); 469 469 } else { … … 514 514 515 515 #Set the value to the user input 516 my $type = $pref->{type}; 517 my $value = ($type == Padre::Constant::BOOLEAN) 516 my $type = $pref->{type}; 517 my $value = 518 ( $type == Padre::Constant::BOOLEAN ) 518 519 ? $self->{true}->GetValue 519 520 : $self->{value}->GetValue; 520 521 my $default_value = $pref->{default}; 521 my $is_default = $self->_is_default( $type, $value, $default_value );522 my $is_default = $self->_is_default( $type, $value, $default_value ); 522 523 523 524 $pref->{value} = $value;
