1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
|
gtkdiff 1.0.2
General Information
===================
Gtkdiff is a diff front-end program using GTK+(GNOME).
Installation
============
See the file 'INSTALL' for instructions.
Copyright
=========
GPL applies all portions of the code I wrote. Please see COPYING file.
Usage
=====
To execute, e.g.
gtkdiff [--geometry 800x600] [from-file(dir)] [to-file(dir)]
Then,
use menus(menu-bar and right-click menu).
That is all you can do.
Note: As long as text-wrap is on, many navigation features are disabled. Therefore, I suggest you to set text-wrap off as default, and set it on only when you need it.
gtkdiff-rcs is a simple shell script that launches gtkdiff for RCS files.
You can see its usage by seeing script itself, or by gtkdiff-rcs --help.
The implemented features are only what I need, so it might lack what you need.
If a fancy RCS-frontend program appears, gtkdiff-rcs becomes obsolete.
Features
========
* It has two view modes, one-pane and two-panes.
* Support directory diff.
* Easy navigation across differences.
About GNOME
===========
After gtkdiff-0.8.0, it requires GNOME(gnome-libs).
If you can't install GNOME to your machine, try gtkdiff-0.7.0.
gtkdiff-0.7.0 is the last version that doesn't require GNOME.
Although gtkdiff-0.7.0 will not be maintained, the basic features are almost implemented.
About colors
============
You can sepcify the colors of differences on text widget and overview widget.
Other colors are specified by rc file.
If you think it is a bad design, let me know.
On some environments(I guess it depends on 'theme'), it might happen that you can't see slider on overview widget. I think while gtkdiff reads its rc file, described below, it might not happen.
About rc file
=============
rc file is installed in $datadir/gtkdiff/gtkdiffrc, e.g. /usr/local/share/gtkdiff/gtkdiffrc.
gtkdiff will search its rc file as following order,
1. ./.gtkdiffrc [current directory]
2. $HOME/.gtkdiffrc [home directory]
3. $datadir/gtkdiff/gtkdiffrc
Once a file found, gtkdiff doesn't continue searching other rc files.
The reason that I override the fonts by its own rc file, is to specify fixed-width fonts.
As a result, even if you set your default font as fontset, it's overridden.
Therefore, if you want to see Japanese characters, you need to modify your rc file.
Platform specific info
======================
On RedHat6.0, you will see the following message,
Gtk-CRITICAL **: file gtkwidget.c: line 1592 (gtk_widget_map): assertion `GTK_WIDGET_VISIBLE (widget) == TRUE' failed.
This is a gtk+-1.2.3 library's problem.
Please update it to gtk+-1.2.x (x >= 4), or ignore the message.
On other systems, you will see it if you're using gtk+-1.2.3.
How to report bugs etc.
=======================
Please send e-mail to the following address.
inoue@ainet.or.jp
If you put "gtkdiff" at the subject, it would help me.
URL
===
http://www.ainet.or.jp/~inoue/software/gtkdiff/index.html (Japanese)
http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html (English)
|