Commit Graph

12374 Commits

Author SHA1 Message Date
Andrew Borodin 7fe85d0bd8 Ticket #2957: broken autocompletion in mcedit
...if system and file charsets are different.

Initial step: refactoring: do actual completion word substitution
outside of editcmd_dialog_completion_show().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-21 09:27:08 +04:00
Andrew Borodin 68d5b0d610 Merge branch '2976_broken_magic_mode'
* 2976_broken_magic_mode:
  Ticket #2976: magic mode is broken in mcview.
2013-03-20 17:02:44 +04:00
Gergely Szász b8208b0514 Ticket #2976: magic mode is broken in mcview.
The bug:
  If we open a file with F3 from panels, then mc uses "file extension"
  style open (e.g. archive.sh) and Format/Raw switching is O.K.

  If we open file in "Raw" mode, or use quick view, mc opens files
  without "file extension" helpers. Format/Raw switching is broken.

  In mcview_load() we check magic_mode and detect "compressed" files.
  If magic mode is on and file is "compressed" we free the current vpath
  and generate a new vpath with "decompress magic", but nothing else.
  So, the file name disappear and we see the raw content.
  After user press F8, mcview reloads the file. Now filename is the "new"
  magic filename. mcview_load() open the file with the decompress "helper"
  (using sfs). We see the uncompressed (parsed) content.
  After user press F8, nothing happend, because original file name is lost.

The solution:
  Remove the old vpath destruction.
  Open the file with "uncopress magic" if magic_mode is on and file is
  "compressed".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-20 17:01:38 +04:00
Andrew Borodin 51a6273fb8 Merge branch '2974_broken_war_opening'
* 2974_broken_war_opening:
  Ticket #2974: broken opening of .war archives.
2013-03-20 16:57:32 +04:00
Andrew Borodin 2f06f513e4 Ticket #2974: broken opening of .war archives.
Widely used java web application .war archives are are .jar archives
which is essentially a zip archive with manifest file being the first
entry.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-20 16:57:03 +04:00
Andrew Borodin 5cbef94bac Fix format specifications in po/ru.po.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-12 14:21:38 +04:00
Andrew Borodin 68609b79b0 Code indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-12 14:05:10 +04:00
Andrew Borodin a7b619a90d Merge branch '2944_cleanup'
* 2944_cleanup: (35 commits)
  Update all po/*.po files.
  Rename keymap files to be with .keymap suffix.
  (mc_config_new_or_override_file): minor optimization.
  Refactoring: use GString instead of "struct selection".
  (edit_translate_key): move from editkeys.c into editwidget.c
  Sync with gnulib 62bb7a8bf95807d6339e1e17fc0d21c319b280a2.
  Code refactoring in tests.
  Adjust look'n'feel of editor options dialog window.
  Clarify EN and RU man pages: list command line options alphabetically.
  (overwrite_query_dialog): adjust dialog size.
  Clarify widget redraw in runtime.
  (size_trunc_len): support automatic maximum unit for specified size.
  Fix formatting in manual pages.
  Fix wrapper location in description of -P/printwd option.
  (edit_insert_over): move from src/editor/editcmd.c into src/editor/edit.c.
  (edit_insert_column_of_text_from_file): refactoring:
  (edit_get_byte): refactoring: use edit_get_byte_ptr().
  Code refactoring in tests.
  Grammar fix in English man-page.
  (init_panelize): support --disable-nls.
  ...
2013-03-12 13:32:03 +04:00
Andrew Borodin 86a9627187 Update all po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-12 13:31:40 +04:00
Andrew Borodin ff2483e4b3 Rename keymap files to be with .keymap suffix.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:51 +04:00
Andrew Borodin 705afe88c0 (mc_config_new_or_override_file): minor optimization.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:51 +04:00
Andrew Borodin 2254b24008 Refactoring: use GString instead of "struct selection".
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:51 +04:00
Andrew Borodin 18cc9ac0dd (edit_translate_key): move from editkeys.c into editwidget.c
...and remove editkeys.c since it is empty.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin a85fc3367e Sync with gnulib 62bb7a8bf95807d6339e1e17fc0d21c319b280a2.
* src/filemanager/lib/mountlist.c: port to HP NonStop.
(hasmntopt) [!HAVE_HASMNTOPT]: New function.
(MNT_IGNORE) [MNTOPT_IGNORE]: Use it.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Slava Zanko 79ee80c201 Code refactoring in tests.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:19 +04:00
Andrew Borodin b3bc856974 Adjust look'n'feel of editor options dialog window.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 3037d88587 Clarify EN and RU man pages: list command line options alphabetically.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 6787221c15 (overwrite_query_dialog): adjust dialog size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 30959e0b7d Clarify widget redraw in runtime.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin ef94b84eaf (size_trunc_len): support automatic maximum unit for specified size.
Fix typos.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 22f0cac4ea Fix formatting in manual pages.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 3715c5254c Fix wrapper location in description of -P/printwd option.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin f1316549a2 (edit_insert_over): move from src/editor/editcmd.c into src/editor/edit.c.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin 17ceb233b0 (edit_insert_column_of_text_from_file): refactoring:
* move from src/editor/editcmd.c into src/editor/edit.c and make static;
  * rename to edit_insert_column_from_file;
  * make some refactoring.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin ef35db06d2 (edit_get_byte): refactoring: use edit_get_byte_ptr().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Slava Zanko 1bd438923d Code refactoring in tests.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:19 +04:00
Vladislav Petrov 0fbb469c42 Grammar fix in English man-page.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:19 +04:00
Andrew Borodin 556192bd4a (init_panelize): support --disable-nls.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin c52003ec43 More use SELECTED_IS_PANEL define.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin f6a5241e18 (mcview_scroll_to_cursor): make static.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin 2f25803ce2 Sync with gnulib 47f4ca8fe9506254200028c8a8c5fffbf1bf1161
Don't consider "devtmpfs" as dummy.

* src/filemanager/mountlist.c (ME_DUMMY_0): Remove "devtmpfs"
as there is storage associcated with it.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin 9b0b017201 (input_update): minor optimization: don't call str_term_width2() twice.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin 0d26829289 (mc_defines_destroy): use g_strfreev.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Slava Zanko 063d5a134f Code refactoring in tests.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:18 +04:00
Slava Zanko c984447f8e Rename vfs_path_cmp() to vfs_path_equals()
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:18 +04:00
Andrew Borodin 8454f12f8f Ticket #2954: fix typo: occured -> occurred.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin 3ecfeb04da Get rid of g_return_* macros in file operation routines
...since they produce warnings about non-created UI and clutter screen
up.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin 907b7cce5d doc/man/ru/mc.1.in: fix formatting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Slava Zanko 61fb6e33b3 Code refactoring in tests.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:18 +04:00
Slava Zanko 0e3550594f Create tests/mctest.h with useful inline macros
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:18 +04:00
Andrew Borodin bbf84a02e4 (check_progress_buttons): redraw file progress dialog
...after step from "Suspend" state to "Skip" one.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin c521ca12d5 Don't close the file progress dialog after press on "Skip" button.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:17 +04:00
Slava Zanko 5f99213a5e Ticket #2944: Prepare for release mc-4.8.8
Code indentation in tests.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:17 +04:00
Andrew Borodin 4bbeaf9f38 Merge branch '2101_skip_directory_scanning'
* 2101_skip_directory_scanning:
  Update all po/*.po files.
  While scanning directories, print directory counter and size
  Refactoring of directory size calculation.
  Handle "Skip" button in directory scanning status dialog.
  Ticket #2101: allow skip directory scanning before file operations.
2013-03-09 15:55:15 +04:00
Andrew Borodin 92e36fb79e Update all po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:51:08 +04:00
Andrew Borodin 96d8539e3a While scanning directories, print directory counter and size
...in addition to directory name.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:28 +04:00
Andrew Borodin b0062fd8cd Refactoring of directory size calculation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:28 +04:00
Andrew Borodin ad2ca88bb9 Handle "Skip" button in directory scanning status dialog.
Don't show total size, number and time values of file operations
if directory scanning was skipped before.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:27 +04:00
Andrew Borodin f0d34a2500 Ticket #2101: allow skip directory scanning before file operations.
* (compute_dir_size_create_ui): add "Skip" button to the "Directory
  scanning" progress dialog.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:27 +04:00
infinitum 430e1f9d35 Ticket #2855: add syntax highlighting for JAL and LKR files.
The Jal is a programming language used in PIC microcontrollers.

The lkr files determines how the gplink program works. The gplink
is part of gputils and creates PIC microcontroller program.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 11:10:40 +04:00