Commit Graph

10042 Commits

Author SHA1 Message Date
Andrew Borodin
b9bd749e23 Fixed segfaults in standalone diff viewer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-26 11:44:32 +04:00
Andrew Borodin
8e55efe547 src/diffviewer/ydiff.c: use GLib functions more widely.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-26 11:44:31 +04:00
Slava Zanko
29a1ad784f diffviewer: Added libmc for build depends
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-04-26 11:44:31 +04:00
Andrew Borodin
78032688f5 Added capability to run MC as standalone diff viewer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-26 11:44:31 +04:00
Slava Zanko
9356875400 src/diffviewer/ydiff.c: code indentation & cleanup.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-26 11:44:31 +04:00
Slava Zanko
352617d298 src/diffviewer/ydiff.c: Now used GArray type and g_array_* functions instead of self-written stuff
Signed-off-by: Slava Zanko <slavazanko@gmail.com>

fix g_array_foreach inoperability
As a result of nasty bug g_array_foreach did not call
passed callback for in-array elements

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2010-04-26 11:44:31 +04:00
Ilia Maslakov
329ef3846a Ticket #120 (View diff files)
added src/diffviewer/ydiff.[ch] into project tree
    added entry 'View diff files' into 'Command' menu
    added 'diffviewer' color pairs
    fixed Makefile and configure.am
    added new binding CmdDiffView into '[main]' section
    Big thanx to 'Daniel Borca <dborca@yahoo.com>' for ydiff

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

    Added diffviewer own library

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

    Fixed CFLAGS for diffviewer.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

    changed skins, added section
        [diffviewer]
            added=
            changedline=
            changednew=
            changed=
            removed=
            folder=
            error=

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

Reimplementation of hardcoded shortcuts to keybindings.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-26 11:44:15 +04:00
Kang Bundo
5c5b35ae47 l10n: Updates to Korean (ko) translation
New status: 1039 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-04-25 15:33:12 +00:00
Yury V. Zaytsev
f946551dd4 Merge branch '2127_sh_ext'
* 2127_sh_ext:
  Ticket #2127: updated file extension for "sh"
2010-04-25 14:46:13 +02:00
Michelle Konzack
b3315acf55 Ticket #2127: updated file extension for "sh"
I find it realy annoying, if I put something in my BaSH configs and have
NO syntax hilighting so I have changed the line in Syntax which now
coloriser my BaSH configs nicely...

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-04-25 14:45:44 +02:00
Andrew Borodin
78ed49a78f Merge branch '2149_patchfs_single_line'
* 2149_patchfs_single_line:
  Ticket #2149: patches adding a single line are not shown correctly by patchfs.
2010-04-25 10:08:31 +04:00
David Sterba
2a465cb8b5 Ticket #2149: patches adding a single line are not shown correctly by patchfs.
The problem:

$ cat < test.diff
--- a/foo
+++ b/foo
@@ -0,0 +1 @@
+bar

$ mcview test.diff#patchfs/a/foo.diff
--- a/foo
+++ b/foo

'+bar' line is not shown.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-25 10:07:49 +04:00
Piotr Drąg
3fbb9b1c76 l10n: Updates to Polish (pl) translation
New status: 1039 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-04-25 10:01:40 +04:00
Oleksandr Natalenko
7b277716f0 l10n: Updated Ukrainian (uk) translation to 100%
New status: 1039 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-04-25 10:01:27 +04:00
Yury V. Zaytsev
2aced28060 Refresh PO-files
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-04-23 10:57:36 +02:00
Yury V. Zaytsev
0b9cddeeb7 Merge branch '2146_info_status_label'
* 2146_info_status_label:
  Ticket #2146: Misleading label "Status:" in the Info panel
2010-04-23 10:44:39 +02:00
Yury V. Zaytsev
d26ddb9178 Ticket #2146: Misleading label "Status:" in the Info panel
The info panels shows useful information about the currently selected
file (atime, mtime, ctime for instance). However, the label "Status:"
for ctime is clearly misleading. As we don't have enough space to label
it "Status changed", I suggest to go for "Changed:" instead. I think
this will make it much clearer what this date is all about, as I have
already seen users suggesting that "Status" is a weird label for
"Created", which is obviously not the case.

Also, "Changed" label is consistent with "CHange time" that we use for
column headers in the list mode elsewhere.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-04-23 10:42:38 +02:00
Andrew Borodin
6fca4b04b0 Merge branch '1660_color_keywords'
* 1660_color_keywords:
  Applied MC indentation policy.
  Ticket #1660: color keyword names unification.
2010-04-23 11:54:46 +04:00
Andrew Borodin
b266527c5f Applied MC indentation policy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-23 11:54:25 +04:00
Andrew Borodin
c0c744ba08 Ticket #1660: color keyword names unification.
Changed name of following color keywords:

menu -> menunormal
linestate -> editlinestate

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-22 16:09:52 +04:00
Andrew Borodin
3bfebaacb1 Merge branch '2050_urar_disable_user_cfg'
* 2050_urar_disable_user_cfg:
  Ticket #2050: extfs/urar: disable user/system configuration for list and copyout operations.
2010-04-22 14:00:18 +04:00
Artem S. Tashkinov
07de6670ed Ticket #2050: extfs/urar: disable user/system configuration for list and copyout operations.
My system wide .rarrc contains these switches

switches= -m5 -mdG -r -s -t -ol -tl

So whenever you list the contents of any archive or copy a file out of
it, RAR/UNRAR will traverse *all* sub directories (note -r, recursive
switch) in a current directory trying to find *all* archives with the
same name. So, the net result might be that unrar/rar will extract
the wrong file and spend a lot of time trying to find archives with
the same name.

That's why I strongly suggest disabling user/system configuration
for archive list and copyout operations (note the added -cfg switch).

I have contacted Eugene Roshal and he said that he won't disable -r switch
for extract and archive list operations, so, we can only fix this problem
on our side.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-22 10:18:46 +04:00
Andrew Borodin
3e78317ce0 Merge branch '2049_urar_localized_filenames'
* 2049_urar_localized_filenames:
  Ticket #2049: extfs/urar doesn't correctly shows localized filenames in RAR archives.
2010-04-22 10:05:22 +04:00
Artem S. Tashkinov
8bdd7bc764 Ticket #2049: extfs/urar doesn't correctly shows localized filenames in RAR archives.
There's no need to export LC_ALL.

Signee-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-20 16:56:41 +04:00
Andrew Borodin
a8096e77ff Merge branch '1648_corners_ncurses_fix'
* 1648_corners_ncurses_fix:
  Ticket #1648: fixed frame corners for NCurses screen library.
2010-04-20 15:56:33 +04:00
Andrew Borodin
7161567ea8 Ticket #1648: fixed frame corners for NCurses screen library.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-14 14:38:22 +04:00
Sergei Trofimovich
bccf55731a Merge branch '2134_am_silent_rules'
* 2134_am_silent_rules:
  Minor grammar/spelling issues.
  Ticket #2134: configure.ac: add support for AM_SILENT_RULES
2010-04-10 12:54:13 +03:00
Yury V. Zaytsev
5ed43370a7 Minor grammar/spelling issues. 2010-04-10 12:53:55 +03:00
Sergei Trofimovich
690950e1b8 Ticket #2134: configure.ac: add support for AM_SILENT_RULES
Inspired by http://www.flameeyes.eu/autotools-mythbuster/automake/silent.html
Conditionally enabling AM_SILENT_RULES if supported

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2010-04-10 12:53:55 +03:00
George Vasilakos
f593976635 l10n: Updates to Greek (el) translation
Transmitted-via: Transifex (www.transifex.net)
2010-04-08 20:22:25 +00:00
Freespacer
9c7f3476f6 l10n: Updates to German (de) translation
Transmitted-via: Transifex (www.transifex.net)
2010-04-07 16:57:09 +00:00
Ilia Maslakov
f0b5497730 Merge branch '2081_edit_overwrite_fix'
* 2081_edit_overwrite_fix:
  Ticket #2081 (editor: incorrect overwrite text after input utf-8 chars)
2010-04-06 15:11:57 +04:00
Ilia Maslakov
51401d441f Ticket #2081 (editor: incorrect overwrite text after input utf-8 chars)
fixed input multibyte chars in overwrite editor mode (remove character only when the first byte is inserted).
    thanx to Egmont Koblinger <egmont@gmail.com> for original patch and ticket.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-06 15:08:30 +04:00
Andrew Borodin
e1afcf372c Merge branch '1648_single_boxes'
* 1648_single_boxes:
  Applied MC indentation policy.
  Merged tty_draw_double_box() function into tty_draw_box() one.
  Draw menu using double lines.
  Renamed frame symbol names.
  Added capability to draw single or double lines.
  Created new function: tty_draw_double_box().
  Fixed tty_print_alt_char() function for NCurses.
  Ticket #1648: implemented single-line boxes.
2010-04-06 11:19:42 +04:00
Andrew Borodin
a708b5c514 Applied MC indentation policy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 11:16:11 +04:00
Andrew Borodin
b0be11acd5 Merged tty_draw_double_box() function into tty_draw_box() one.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Ilia Maslakov
279375b418 Draw menu using double lines.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-06 10:30:58 +04:00
Andrew Borodin
4e57b599cc Renamed frame symbol names.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Andrew Borodin
9a145a88ce Added capability to draw single or double lines.
Fixed tty_print_alt_char() to draw single or double vertical
or horizintal lines.
Added argument to tty_print_one_hline() and tty_print_one_vline()
functions to draw single or double lines.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Andrew Borodin
cc2f5670ec Created new function: tty_draw_double_box().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Andrew Borodin
be3b0119da Fixed tty_print_alt_char() function for NCurses.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Sergei E. Ovsyannikov
d8fb069e85 Ticket #1648: implemented single-line boxes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 10:30:58 +04:00
Andrew Borodin
3c19b9f002 Merge branch '2121_dir_symlink'
* 2121_dir_symlink:
  Applied MC indentation policy.
  compute_dir_size() function  now respect 'follow symlinks' option
  Ticket #2121: don't calculate directory size if directory is symlink.
2010-04-06 09:52:25 +04:00
Andrew Borodin
bdc0878379 Applied MC indentation policy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 09:50:33 +04:00
Slava Zanko
e36552d574 compute_dir_size() function now respect 'follow symlinks' option
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-04-06 09:40:20 +04:00
Andrew Borodin
69a8796e47 Ticket #2121: don't calculate directory size if directory is symlink.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-06 09:40:20 +04:00
Mikhail S. Pobolovets
6f6ea1bc88 Normalized formating for syntax files
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2010-04-04 19:24:13 +03:00
Mikhail S. Pobolovets
5112cdc727 Asm syntax: redundant rules removed and some missed registers added
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2010-04-04 16:36:49 +03:00
Mikhail S. Pobolovets
ae517852b0 Merge branch 'master' of ssh://styx@midnight-commander.org:22/git/mc 2010-04-04 13:46:58 +03:00
Andrew Borodin
9b41d62d0a Merge branch '1909_extfs_read_archive_fix'
* 1909_extfs_read_archive_fix:
  Ticlet #1909: fix of extfs_read_archive() function.
2010-04-03 11:10:47 +04:00