1
1

4221 Коммитов

Автор SHA1 Сообщение Дата
Andrew Borodin
4bfd6436c5 Change hotkey for "Search for content" and "All charsets" checkboxes
...to resolve conflict with input line shortcut.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-05 12:08:58 +03:00
Andrew Borodin
bac6d60f46 Ticket #2407: crash of mc when chdir to find file.
Don't use content if "Search for content" checkbox is off.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-05 12:08:58 +03:00
Andrew Borodin
50ba1adca4 Ticket #2405: fixed key event handling in "Listing mode" dialog.
Typing 'u' in "User defined mode" input line, the "User defined"
radio-button is checked instead of putting the 'u' letter
into the input line.

Bug was introduced in 80d34ca6256e6a95a15b480cf5f3cae642fe5b2d.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-02 21:55:12 +03:00
Yury V. Zaytsev
267ec33b2a Applied MC indentation policy
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-11-02 09:34:07 +01:00
Yury V. Zaytsev
d6f2d82618 Fixed up several comments
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-11-02 09:34:07 +01:00
Andrew Borodin
ed5cc99fed Optimization: don't process search handlers too often
Miscellaneous changes:

    * Create search handlers before search session and destroy afterwards.
    * Get rid of goto operator in do_search() functon.
    * Fixed handling of DLG_VALIDATE message.
    * Type accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-02 09:34:07 +01:00
Andrew Borodin
6a36a33b33 Optimization: don't destroy the "Find file" dialog before call "Tree" one
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-02 09:34:06 +01:00
Andrew Borodin
8d3bbf3b26 Content search options can be disabled using "Search for content" checkbox
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-02 09:34:06 +01:00
Yury V. Zaytsev
e07bb515f3 Reorganized "Find File" checkboxes
Made "Find recursively" and "Search for content" appear the
first, as they are completely logically independent and influence the
way the strings entered in the corresponding fields are used.

"Using shell patterns" and "Regular expression" come next, as
they set a similar property of the fields. Same goes for the "Case
sensitive" and "All charsets" group.

"Skip hidden" and the rest close the show up.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-02 09:34:06 +01:00
Yury V. Zaytsev
b68bef2cb6 Take into account the value of the "Search for content" checkbox
If "Search for content" checkbox is enabled, then content_pattern is
initialized as usual. Otherwise, it's forcibly set to NULL.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-11-02 09:34:06 +01:00
Yury V. Zaytsev
1b260e6773 Ticket #2046: Added "Search for content" checkbox to the Find File dialog
This checkbox allows to define whether the "Content" field should be
taken into account or not when performing file search. The checkbox
remembers its state across sessions.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2010-11-02 09:34:06 +01:00
Andrew Borodin
0908c8baea Ticket #2404: added forgotten shotrcuts of mcedit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-01 21:31:24 +03:00
Slava Zanko
a0d69353e8 Code cleanup for avoid compiler warnings
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-11-01 15:48:38 +02:00
Andrew Borodin
4aec2187e1 Ticket #1894: sort order should not mix hidden files with others.
In case sensitive sort, the order of files and directories is following:
hidden dirs
dirs
hidden files
files

In case insensitive mode, directories are mixed and files are mixed too:
dirs (hidden and not are mixed)
files (hidden and not are mixed).

This commit defines the sort order independently of case sensitivity:
hidden dirs
dirs
hidden files
files

Files in UTF-8 locale require special handling: leading dot must not be
processed in g_utf8_casefold() funcion.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-01 15:02:57 +03:00
Andrew Borodin
4c40d57508 (edit_set_filename): expand tilde while setting file name.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-01 13:54:39 +03:00
Andrew Borodin
8088fe9b66 Ticket #2398: tilde is not treated as home directory in editor "Save As" dialog.
(edit_get_save_file_as): return file name with expanded tilde.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-11-01 13:54:39 +03:00
Andrew Borodin
8be556abc5 Declarations of use_dash() and rotate_dash() were moved form lib/util.h to src/layout.h.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-27 18:10:50 +04:00
Ilia Maslakov
8b46518619 Apply code identation policy.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-10-27 18:10:50 +04:00
Ilia Maslakov
3ba4abac41 Ticket #2268 (FISH: hide panels before connecting)
FISH: now hide the panel before connecting.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-27 18:10:49 +04:00
Andrew Borodin
185d5fc359 Install help files into /usr/share/mc/help instead of /usr/share/mc.
Optimisation of language-specific help file creating.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:25:59 +04:00
Andrew Borodin
280194ec15 Install hint files into /usr/share/mc/hints instead of /usr/share/mc.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:25:59 +04:00
Andrew Borodin
bfbac0c5d8 Reimplemened codepages storage using GPtrArray.
Added capability to load codepage list from /usr/share/mc/mc.charsets
and /etc/mc/mc.charsets and merge them then.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:25:53 +04:00
Andrew Borodin
245f465d6e Install mc.charsets into /usr/share/mc instead of /etc/mc.
Renamed CHARSETS_INDEX macro to CHARSETS_LIST.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:15:37 +04:00
Andrew Borodin
1c3aae85ec Minor optimization of [Special dirs] handling.
(tree_store_rescan): use g_list_foreach() to free content of list.
(process_special_dirs): get rid of extra memory allocation.
(should_skip_directory): type accuracy and variable intializations.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:15:37 +04:00
Andrew Borodin
fed3d099c3 Install mc.lib into /usr/share/mc instead of /etc/mc.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:15:37 +04:00
Andrew Borodin
51f28528f6 Ticket #1424: install some files into /usr/share/mc instead of /etc/mc.
RPMLint shows the following warnings:
mc.i586: W: conffile-without-noreplace-flag /etc/mc/Syntax
mc.i586: W: conffile-without-noreplace-flag /etc/mc/mc.lib
mc.i586: W: conffile-without-noreplace-flag /etc/mc/mc.charsets

First step: install Syntax into /usr/share/mc instead of /etc/mc.
This also fixes the impossibility of editing of system-wide Syntax file
in mcedit under root (menu Options->Syntax file->System Wide).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-19 18:15:37 +04:00
Egmont Koblinger
1256af2269 Ticket #2395: scroll down the panel contents by mouse dragging.
Start mc, and make sure that at least one of the two displayed
directiories contains so many files that they cannot all be displayed
at once.

Click in this panel and hold the mouse button pressed, and then move
your mouse downwards. As you pass beyond the bottom of this list, it
should start scrolling.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-18 20:45:51 +04:00
Andrew Borodin
e4105c1e72 Ticket #2324: fix of syntax highlighting lost after manual change.
Also some type accuracy is provided.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-18 15:10:27 +04:00
Slava Zanko
f53ed400fb Merge branch '2170_separate_colors'
* 2170_separate_colors:
  Newly added colorpair names now described in man-page
  Ticket #2170: Color collisions
2010-10-13 13:23:25 +03:00
Egmont Koblinger
aa9cb6d320 Ticket #2170: Color collisions
Midnight Commander's color/skin engine often reuses the same color definition for multiple elements on the UI.
This unnecessarily limits the possibilities when playing with colors.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-13 13:21:10 +03:00
Slava Zanko
5ed7f49eee Added default keybind for CK_DiffViewCmd command
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-12 13:13:11 +03:00
Andrew Borodin
10949329a7 Fixed signed and unsigned comparisons in viewer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-11 11:00:29 +03:00
Andrew Borodin
fe2c50cc19 Ticket 2356: viewer segfaults on ARM platform because type mismatches of printf arguments.
Fixed type mismatches of printf arguments in viewer;

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-11 11:00:29 +03:00
Slava Zanko
89b905d83b Added doxygen documentation for touched functions.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-10-11 10:39:37 +03:00
Slava Zanko
a8aa5cf678 Added definition MC_MAXFILENAMELEN for specify maximum file lenght.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-10-11 10:38:30 +03:00
Andrew Borodin
504bd05729 Ticket #2365: enhancement of quick search.
Double pressing of C-s runs the quick search using previous search pattern.

Usage example:

1. Press C-s
2. Make quick search with some pattern.
3. Stop quick search with any way.
4. Press C-s. The empty search line will be shown.
5. Press C-s again. The previous pattern will be shown and will be used
in current quick search.

English and Russian man pages are updated.

Thanks Alexey Losich (E.L.K) for the initial patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-11 10:38:29 +03:00
Andrew Borodin
7f119ffbbc Ticket #1785: fix of editor default color usage.
(this_try_alloc_color_pair): if foreground and background editor colors
are undefined in syntax, the NORMAL_COLOR is used. This is wrong.
EDITOR_NORMAL_COLOR mut be used instead.

(edit_status): cleanup: remove useless color change.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-10-06 12:15:45 +03:00
Andrew Borodin
329f473d32 Highlight selected item of WRadio using widget width not item width.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-28 20:51:57 +04:00
Andrew Borodin
64b126fabf Ticket #2362: width of WCheck and WRadio widgets are initialized incorrectly.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-28 20:51:57 +04:00
Ilia Maslakov
3013a364b0 Merge commit 'origin/2287_persistent_bookmarks'
* commit 'origin/2287_persistent_bookmarks':
  Fix in lib/logging.c for proper work on 64-bit platforms.
  Change of bookmark drawing.
  Fixed memory leak: destroy serialization bookmarks if file position is not saved.
  Use GArray for bookmarks instead of raw array.
  Minor optimization, type accuracy, includes fix.
  Ticket #2287 (mcedit: persistent bookmarks)
2010-09-28 18:33:53 +04:00
Ilia Maslakov
0c7f4c2494 Change of bookmark drawing.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-09-28 14:12:32 +04:00
Andrew Borodin
34bee19937 Fixed memory leak: destroy serialization bookmarks if file position is not saved.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-28 14:12:28 +04:00
Andrew Borodin
ec8d6f0751 Get rid of some '#ifdef ENABLE_VFS' conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:44:20 +04:00
Andrew Borodin
c36a810c09 Fix of file panel encoding change w/o VFS support.
Now --disable-vfs doesn't mean the total disabling of VFS.
With --disable-vfs option, the localfs module is built
to use the change of file panel encoding.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:43:43 +04:00
Slava Zanko
ac85fdd350 Minor changes: added doxy-comments for functions:
- is_supported_encoding();
- panel_new();
- panel_new_with_dir();
- panel_change_encoding().

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-09-27 21:35:11 +04:00
Andrew Borodin
5007553299 Remove only supported encodings from path.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:34:40 +04:00
Andrew Borodin
2a47d77351 Don't add current encoding to path again.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:33:16 +04:00
Andrew Borodin
aff8e42d64 Created macro VFS_ENCODING_PREFIX for "#enc:" encoding prefix.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:33:16 +04:00
Andrew Borodin
c0384e0b6b When cd to "..", remove encoding at the end of path.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:33:16 +04:00
Andrew Borodin
f7ee6f8cf2 Added codepage member to the WPanel struct.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:33:16 +04:00