#!/usr/bin/perl -w
#
# Clawsker :: A Claws Mail Tweaker
-# $Id$
#
use strict;
-use encoding 'utf8';
+use utf8;
use Glib qw(TRUE FALSE);
use Gtk2 -init;
use POSIX qw(setlocale);
use Locale::gettext;
+use Encode;
+use Digest::MD5 qw(md5_hex);
my $NAME = 'clawsker';
my $PREFIX = '@PREFIX@';
$xla =~ s/\{$key\}/$par{$key}/g;
}
}
- return $xla;
+ return decode_utf8($xla);
}
# default messages
ab_frame => _('Addressbook'),
mem_frame => _('Memory'),
- msgview_frame => _('Message view'),
+ msgview_frame => _('Message View'),
log_frame => _('Log window'),
dnd_frame => _('Drag \'n\' drop'),
ssl_frame => _('Secure Sockets Layer'),
stripes_frame => _('Coloured stripes'),
sbar_frame => _('Scroll bars'),
mlist_frame => _('Message List'),
+ mview_frame => _('Message View'),
+ compo_frame => _('Compose window'),
netm_frame => _('NetworkManager'),
+ diff_frame => _('Viewing patches'),
l_oth_use_dlg => _('Use detached address book edit dialogue'),
h_oth_use_dlg => _('If true use a separate dialogue to edit a person\'s details. Otherwise will use a form embedded in the address book\'s main window.'),
l_gui_v_scroll_show => _('Show always'),
l_gui_v_scroll_auto => _('Automatic'),
l_gui_v_scroll_hide => _('Hide always'),
+ l_gui_from_show => _('From column displays'),
+ h_gui_from_show => _('Selects the data displayed in the From column of the Message List: name, address or both'),
+ l_gui_from_show_name => _('Name only'),
+ l_gui_from_show_addr => _('Address only'),
+ l_gui_from_show_both => _('Both name and address'),
l_gui_strip_off => _('Coloured lines contrast'),
h_gui_strip_off => _('Specify the value to use when creating alternately coloured lines in tree view components. The smaller the value, the less visible the difference in the alternating colours of the lines.'),
- l_gui_cursor_v => _('Show Cursor in message view'),
- h_gui_cursor_v => _('Display the cursor in the message view.'),
+ l_gui_cursor_v => _('Show cursor'),
+ h_gui_cursor_v => _('Display the cursor in the Message View.'),
l_gui_toolbar_d => _('Detachable toolbars'),
h_gui_toolbar_d => _('Show handles in the toolbars.'),
l_gui_strip_all => _('Use stripes in all tree view components'),
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.'),
+ 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_gui_margin_co => _('Show compose margin'),
- h_gui_margin_co => _('Shows a small margin in the compose view.'),
+ h_gui_margin_co => _('Shows a small margin in the Compose View.'),
+ l_gui_mview_date => _('Don\'t display localized date'),
+ h_gui_mview_date => _('Toggles localization of date format in Message View'),
+ l_gui_zero_char => _('Zero replacement character'),
+ h_gui_zero_char => _('Replaces \'0\' with the given character in Folder List'),
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.'),
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'),
+ l_beh_out_ascii => _('Outgoing 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_beh_pp_unsel => _('Primary paste unselects selection'),
h_beh_pp_unsel => _('Controls how pasting using middle-click changes the selected text and insertion point.'),
+ l_beh_inline_at => _('Show inline attachments'),
+ h_beh_inline_at => _('Allows hiding inline attachments already shown in mail structure view'),
l_col_emphasis => _('X-Mailer header'),
h_col_emphasis => _('The colour used for the X-Mailer line when its value is Claws Mail.'),
l_col_log_warn => _('Warnings'),
h_col_log_warn => _('Colour for warning messages in log window.'),
+ l_col_diff_add => _('Added lines'),
+ h_col_diff_add => _('Colour for added lines in patches.'),
+ l_col_diff_del => _('Deleted lines'),
+ h_col_diff_del => _('Colour for deleted lines in patches.'),
+ l_col_diff_hunk => _('Hunk lines'),
+ h_col_diff_hunk => _('Color for hunk headers in patches.'),
+
l_win_x => _('X position'),
h_win_x => _('X coordinate for window\'s top-left corner.'),
l_win_y => _('Y position'),
$$dataref = $widget->get_text ();
}
+sub handle_nchar_value {
+ my ($widget, $event, $dataref, $minlen) = @_;
+ $_ = substr ($widget->get_text (), 0, $minlen);
+ $widget->set_text ($_);
+ $$dataref = $_;
+}
+
sub gdk_color_from_str {
my ($str) = @_;
my ($rr, $gg, $bb) = (0, 0 ,0);
$errordlg->destroy;
}
+sub claws_is_running() {
+ my $emsg = "$xl::s{e_error}$xl::s{e_running}";
+ log_message ($emsg);
+ error_dialog ($emsg);
+ return FALSE;
+}
+
sub check_claws_not_running() {
my $socket = (not $ALTCONFIGDIR)? "/tmp/": $CONFIGDIR;
$socket .= "claws-mail-$<";
- -S $socket and do {
- my $emsg = "$xl::s{e_error}$xl::s{e_running}";
- log_message ($emsg);
- error_dialog ($emsg);
- return FALSE;
- };
- return TRUE;
+ -S $socket and return &claws_is_running;
+ # since 3.9.0cvs36
+ my $lockdir = "/tmp/claws-mail-$<";
+ -d $lockdir and do {
+ $_ = $CONFIGDIR;
+ s/\/$//;
+ $socket = "$lockdir/" . md5_hex($_);
+ -S $socket and return &claws_is_running;
+ };
+ return TRUE;
}
sub check_rc_file() {
}
sub set_widget_sens() {
- my ($wdgt, $minver) = @_;
- $wdgt->set_sensitive (&version_greater_or_equal ($CLAWSV, $minver));
+ my ($wdgt, $versions) = @_;
+ my @ver = split(/,/, $versions);
+ if ($#ver == 1) {
+ $wdgt->set_sensitive (
+ &version_greater_or_equal ($CLAWSV, $ver[0])
+ and &version_greater_or_equal ($ver[1], $CLAWSV)
+ );
+ } else {
+ $wdgt->set_sensitive (&version_greater_or_equal ($CLAWSV, $ver[0]));
+ }
}
# graphic element creation
my $pagei = int (($type[2] - $type[1]) / 10);
my $gentry = Gtk2::SpinButton->new_with_range ($type[1], $type[2], $pagei);
$gentry->set_numeric (TRUE);
+ $gentry->set_value ($HPVALUE{$name});
$$hash{$key}[GUI] = $gentry;
$gentry->signal_connect('value-changed' => sub {
my ($w, $e) = @_;
return $hbox;
}
+sub new_text_box_for_nchar {
+ my ($hash, $key) = @_;
+ my $name = $$hash{$key}[NAME];
+ my $label = $$hash{$key}[LABEL];
+ my @type = split (/,/, $$hash{$key}[TYPE]); # char,minlen,maxlen
+ my $hbox = Gtk2::HBox->new (FALSE, 5);
+ my $glabel = Gtk2::Label->new ($label);
+ my $gentry = Gtk2::Entry->new ();
+ $gentry->set_max_length($type[2]) if defined ($type[2]);
+ $gentry->set_width_chars(int ($type[2]) + 2) if defined ($type[2]);
+ $gentry->set_text ($HPVALUE{$name});
+ $$hash{$key}[GUI] = $gentry;
+ $gentry->signal_connect('key-release-event' => sub {
+ my ($w, $e) = @_;
+ &handle_nchar_value($w, $e, \$HPVALUE{$name}, $type[1]);
+ });
+ &set_widget_hint ($gentry, $$hash{$key}[DESC]);
+ &set_widget_sens ($gentry, $$hash{$key}[CMVER]);
+ $glabel->set_sensitive ($gentry->sensitive);
+ $hbox->pack_start ($glabel, FALSE, FALSE, HBOX_SPC);
+ $hbox->pack_start ($gentry, FALSE, FALSE, HBOX_SPC);
+ #
+ return $hbox;
+}
+
sub new_color_button_for {
my ($hash, $key) = @_;
my $name = $$hash{$key}[NAME];
'0',
undef,
],
+ from_show => [
+ 'summary_from_show',
+ $xl::s{l_gui_from_show},
+ $xl::s{h_gui_from_show},
+ '0=l_gui_from_show_name;1=l_gui_from_show_addr;2=l_gui_from_show_both',
+ '3.7.10',
+ '0',
+ undef,
+ ],
strip_off => [
'stripes_color_offset',
$xl::s{l_gui_strip_off},
$xl::s{h_gui_strip_off},
- 'int,0,10000', # no idea what this number means
+ 'int,0,40000', # no idea what this number means
'0.0.0',
'4000',
undef,
$xl::s{l_gui_margin_co},
$xl::s{h_gui_margin_co},
'bool',
- '3.7.6.7'
+ '3.7.6.7',
+ '0',
+ undef,
+ ],
+ mview_date => [
+ 'msgview_date_format',
+ $xl::s{l_gui_mview_date},
+ $xl::s{h_gui_mview_date},
+ 'bool',
+ '3.7.8.42',
+ '0',
+ undef,
+ ],
+ zero_char => [
+ 'zero_replacement_char',
+ $xl::s{l_gui_zero_char},
+ $xl::s{h_gui_zero_char},
+ 'char,1,1',
+ '2.8.1.77',
'0',
undef,
],
my $gf = Gtk2::VBox->new (FALSE, 5);
$gf->set_border_width (PAGE_SPC);
- my $cb_no_markup = &new_check_button_for (\%pr::gui, 'no_markup');
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');
- my $cb_margin_co = &new_check_button_for (\%pr::gui, 'margin_co');
+ my $tb_zero_char = &new_text_box_for_nchar (\%pr::gui, 'zero_char');
$gf->pack_start (&new_subpage_frame (
&new_vbox_pack (
$gf->pack_start (&new_subpage_frame (
&new_vbox_pack (
&new_check_button_for (\%pr::gui, 'b_unread'),
- &new_check_button_for (\%pr::gui, 'swp_from')),
+ &new_check_button_for (\%pr::gui, 'swp_from'),
+ &new_check_button_for (\%pr::gui, 'two_linev'),
+ &new_selection_box_for (\%pr::gui, 'from_show')),
$xl::s{mlist_frame}, 'not-packed'),
FALSE, FALSE, FRAME_SPC);
- $gf->pack_start ($cb_no_markup, FALSE, FALSE, 0);
+ $gf->pack_start (&new_subpage_frame (
+ &new_hbox_pack (
+ &new_check_button_for (\%pr::gui, 'cursor_v'),
+ &new_check_button_for (\%pr::gui, 'mview_date')),
+ $xl::s{mview_frame}, 'not-packed'),
+ FALSE, FALSE, FRAME_SPC);
+ $gf->pack_start (&new_subpage_frame (
+ &new_hbox_pack (
+ &new_check_button_for (\%pr::gui, 'no_markup'),
+ &new_check_button_for (\%pr::gui, 'margin_co')),
+ $xl::s{compo_frame}, 'not-packed'),
+ FALSE, FALSE, FRAME_SPC);
$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 ($cb_margin_co, FALSE, FALSE, 0);
$gf->pack_start (&new_subpage_frame (
&new_vbox_pack (
&new_check_button_for (\%pr::gui, 'h_scroll'),
&new_selection_box_for (\%pr::gui, 'v_scroll')),
$xl::s{sbar_frame}, 'not-packed'),
FALSE, FALSE, FRAME_SPC);
+ $gf->pack_start ($tb_zero_char, FALSE, FALSE, 0);
return $gf;
}
'0',
undef,
],
+ inline_at => [
+ 'show_inline_attachments',
+ $xl::s{l_beh_inline_at},
+ $xl::s{h_beh_inline_at},
+ 'bool',
+ '3.7.8.48',
+ '1',
+ undef,
+ ],
);
sub new_behaviour_page() {
&new_check_button_for (\%pr::beh, 'use_utf8'),
&new_check_button_for (\%pr::beh, 'dangerous'),
&new_check_button_for (\%pr::beh, 'out_ascii'),
- &new_check_button_for (\%pr::beh, 'pp_unsel')),
+ &new_check_button_for (\%pr::beh, 'pp_unsel'),
+ &new_check_button_for (\%pr::beh, 'inline_at')),
$xl::s{msgs_frame}, 'not-packed'),
FALSE, FALSE, FRAME_SPC);
'#af0000',
undef,
],
+ diff_add => [
+ 'diff_added_color',
+ $xl::s{l_col_diff_add},
+ $xl::s{h_col_diff_add},
+ 'color',
+ '3.8.0.54',
+ '#008b8b',
+ undef,
+ ],
+ diff_del => [
+ 'diff_deleted_color',
+ $xl::s{l_col_diff_del},
+ $xl::s{h_col_diff_del},
+ 'color',
+ '3.8.0.54',
+ '#6a5acd',
+ undef,
+ ],
+ diff_hunk => [
+ 'diff_hunk_color',
+ $xl::s{l_col_diff_hunk},
+ $xl::s{h_col_diff_hunk},
+ 'color',
+ '3.8.0.54',
+ '#a52a2a',
+ undef,
+ ],
);
sub new_colours_page() {
&new_color_button_for (\%pr::col, 'log_msg'),
&new_color_button_for (\%pr::col, 'log_out'),
&new_color_button_for (\%pr::col, 'log_warn')),
- $xl::s{log_frame}, 'not-packed')
+ $xl::s{log_frame}, 'not-packed'),
+ &new_subpage_frame (
+ &new_vbox_pack (
+ &new_color_button_for (\%pr::col, 'diff_add'),
+ &new_color_button_for (\%pr::col, 'diff_del'),
+ &new_color_button_for (\%pr::col, 'diff_hunk')),
+ $xl::s{diff_frame}, 'not-packed')
);
}
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.";
- my $year = "2007-2010";
+ my $year = "2007-2014";
my $holder = "Ricardo Mones <ricardo\@mones.org>";
- my $url = "http://www.claws-mail.org/clawsker";
+ my $url = "http://www.claws-mail.org/clawsker.php";
my $dialog = Gtk2::MessageDialog->new_with_markup ($parent,
[qw/modal destroy-with-parent/],
projects / clawsker.git / blobdiff