fix alt folder concat, undefined properties in checkboxes warning

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index 546f47108203d28d92ce473704e02c4f069eefde..6e17806f02c534a3399ec246d46aea6f726ffec2 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -74,10 +74,11 @@ along with this program.  If not, see E<lt>http://www.gnu.org/licenses/E<gt>.
 =cut
 
 use strict;
-use POSIX qw(setlocale);
-use Locale::gettext;
+use encoding 'utf8';
 use Glib qw(TRUE FALSE);
 use Gtk2 -init;
+use POSIX qw(setlocale);
+use Locale::gettext;
 
 my $NAME = 'clawsker';
 my $PREFIX = '@PREFIX@';
@@ -166,6 +167,8 @@ sub _ {
     h_gui_strip_all => _('Enable alternately coloured lines in all tree view components.'),
     l_gui_strip_sum => _('Use stripes in Folder List and Message List'),
     h_gui_strip_sum => _('Enable alternately coloured lines in message list and folder list'),
+    l_gui_two_line_v => _('2 lines per Message List item in 3-column layout'),
+    h_gui_two_line_v => _('Spread Message List information over two lines when using the three column mode'),
 
     l_beh_hover_t => _('Drag \'n\' drop hover timeout (ms)'),
     h_beh_hover_t => _('Time in milliseconds that will cause a folder tree to expand when the mouse cursor is held over it during drag and drop.'),
@@ -187,6 +190,8 @@ sub _ {
     h_beh_use_utf8 => _('Use UTF-8 encoding for broken mails instead of current locale.'),
     l_beh_warn_dnd => _('Warn on drag \'n\' drop'),
     h_beh_warn_dnd => _('Display a confirmation dialogue on drag \'n\' drop of folders.'),
+    l_beh_out_ascii => _('Ougoing messages fallback to ASCII'),
+    h_beh_out_ascii => _('If content allows, ASCII will be used to encode outgoing messages, otherwise the user-defined encoding is enforced always.'),
 
     l_col_emphasis => _('X-Mailer header'),
     h_col_emphasis => _('The colour used for the X-Mailer line when its value is Claws Mail.'),
@@ -366,7 +371,9 @@ sub new_check_button_for {
     my $hbox = Gtk2::HBox->new (FALSE, 5);
     my $cb = Gtk2::CheckButton->new ($label);
     $$hash{$key}[GUI] = $cb;
-    $cb->set_active ($HPVALUE{$name} eq '1');
+    if (defined ($HPVALUE{$name})) {
+        $cb->set_active ($HPVALUE{$name} eq '1');
+    }
     $cb->signal_connect (clicked => sub {
             my ($w, $e) = @_;
            &handle_bool_value($w, $e, \$HPVALUE{$name});
@@ -623,6 +630,15 @@ sub new_other_page() {
        '1',
        undef,
     ],
+    two_linev => [
+        'two_line_vertical',
+       $xl::s{l_gui_two_line_v},
+       $xl::s{h_gui_two_line_v},
+       'bool',
+       '3.4.0.7',
+       '0',
+       undef,
+    ],
 );
 
 sub new_gui_page() {
@@ -662,6 +678,7 @@ sub new_gui_page() {
     my $cb_dot_lines = &new_check_button_for (\%pr::gui, 'dot_lines'); 
     my $cb_cursor_v = &new_check_button_for (\%pr::gui, 'cursor_v');
     my $cb_toolbar_d = &new_check_button_for (\%pr::gui, 'toolbar_d');
+    my $cb_two_linev = &new_check_button_for (\%pr::gui, 'two_linev');
 
     $gf->pack_start ($stripes_frame, FALSE, FALSE, FRAME_SPC);
     $gf->pack_start ($mlist_frame, FALSE, FALSE, FRAME_SPC);
@@ -669,6 +686,7 @@ sub new_gui_page() {
     $gf->pack_start ($cb_dot_lines, FALSE, FALSE, 0);
     $gf->pack_start ($cb_cursor_v, FALSE, FALSE, 0);
     $gf->pack_start ($cb_toolbar_d, FALSE, FALSE, 0);
+    $gf->pack_start ($cb_two_linev, FALSE, FALSE, 0);
     $gf->pack_start ($sbar_frame, FALSE, FALSE, FRAME_SPC);
 
     return $gf;
@@ -765,6 +783,15 @@ sub new_gui_page() {
        '1',
        undef,
     ],
+    out_ascii => [
+        'outgoing_fallback_to_ascii',
+       $xl::s{l_beh_out_ascii},
+       $xl::s{h_beh_out_ascii},
+       'bool',
+       '3.4.0.37',
+       '1',
+       undef,
+    ],
 );
 
 sub new_behaviour_page() {
@@ -797,12 +824,14 @@ sub new_behaviour_page() {
     my $cb_parts_rw = &new_check_button_for (\%pr::beh, 'parts_rw');
     my $cb_use_utf8 = &new_check_button_for (\%pr::beh, 'use_utf8');
     my $cb_dangerous = &new_check_button_for (\%pr::beh, 'dangerous');
+    my $cb_out_ascii = &new_check_button_for (\%pr::beh, 'out_ascii');
     my $vb2 = Gtk2::VBox->new (FALSE, 5);    
     $vb2->set_border_width (PAGE_SPC);
     $vb2->pack_start ($cb_flowed, FALSE, FALSE, 0);
     $vb2->pack_start ($cb_parts_rw, FALSE, FALSE, 0);
     $vb2->pack_start ($cb_use_utf8, FALSE, FALSE, 0);
     $vb2->pack_start ($cb_dangerous, FALSE, FALSE, 0);
+    $vb2->pack_start ($cb_out_ascii, FALSE, FALSE, 0);
     $msgs_frame->add ($vb2);
 
     $bf->pack_start ($dnd_frame, FALSE, FALSE, FRAME_SPC);
@@ -962,6 +991,8 @@ sub parse_command_line() {
                &command_line_fatal ($xl::s{e_notadir})
                    unless -d $ARGV[$arg];
                $CONFIGDIR = $ARGV[$arg];
+               $CONFIGDIR .= "/" 
+                   unless ($CONFIGDIR =~ /.*\/$/);
                $ALTCONFIGDIR = TRUE;
                last;
            };