1
1

26 Коммитов

Автор SHA1 Сообщение Дата
Andrew Borodin
aa0d96bd8b Ticket #1646: removed leading and trailing spaces in i18n resources.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-06-07 21:42:46 +04:00
Ilia Maslakov
a4e4378861 initial step to do mark in inpun fields
added selection with mouse

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

    Code cleanup: make visibility of some functions as static

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

fixed skins

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-05-27 22:26:59 +03:00
Ilia Maslakov
c94da73c54 Ticket #2182 (fix incorrect tab size)
fixed incorrect tab size

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-05-14 11:48:45 +04:00
Ilia Maslakov
823387a793 Removed hardcoded hotkeys in dialog.c Replaced keymap's initialization from main.c into setup.c
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

Collect keybind-related variables in src/keybind.[ch] files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-05-07 15:02:11 +04:00
Andrew Borodin
fbf2dd73c4 Updated Russian translation.
Fixed width of diff options dialog.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-05-05 21:40:20 +04:00
Slava Zanko
8f48bf2aec Fixed errors and warnings in compilation stage.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-05-05 16:24:14 +04:00
Andrew Borodin
4cea5be1ac Ticket #2097: clean up before 4.7.2 release.
Split assignments and conditions. Type accuracy. Minor optimization.

Thanks Vit Rosin for original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-05-05 16:23:51 +04:00
Daniel Borca
bc0ad94461 ydiff.c: minor fix for more pretty show diff.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-30 08:44:08 +04:00
Andrew Borodin
744d61ba03 Optimization of Diff Viewer construction and destruction.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-27 12:16:05 +04:00
Ilia Maslakov
93247568d0 added diff options dialog
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-27 12:16:04 +04:00
Ilia Maslakov
185a6f67f7 added save/load diffview options.
little fixes in the options dialog

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-27 12:16:04 +04:00
Andrew Borodin
e045279dbc Modified destroying of WDiff widget.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-27 12:16:04 +04:00
Andrew Borodin
6c3e3715f8 Repaint screen after encoding change.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-27 12:16:03 +04:00
Andrew Borodin
29cab775c7 Minor clean up.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-27 12:16:03 +04:00
Slava Zanko
14fa0ea1e2 Added usage of search engine.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-04-27 12:16:03 +04:00
Ilia Maslakov
e5dc79a441 added merge mechanism
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-27 12:15:41 +04:00
Andrew Borodin
f356d83972 Fixes of button bar handling.
Implemented handling of mouse actions in button bar.
Fixed vertical size of Diff Viewer widget.
DiffHelp action was added. F1 button was assigned for it.
Fixed some key bindings.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-04-26 11:44:33 +04:00
Ilia Maslakov
bc03546f3a little fixup and optimization
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-26 11:44:32 +04:00
Ilia Maslakov
103e9f9613 fixed display utf-8 text in 8-bit locale
fixed display 8-bit text in utf-8 locale

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-26 11:44:32 +04:00
Ilia Maslakov
d60be3ca56 initial step to multiple encodings support and select codeset.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2010-04-26 11:44:32 +04:00
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
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