Author: mike
Date: 2012-02-06 09:59:44 -0800 (Mon, 06 Feb 2012)
New Revision: 452
Log:
Cleanup, better Mac OS X support, better icons.
Added:
trunk/fldiff/fldiff.app/
trunk/fldiff/fldiff.app/Contents/
trunk/fldiff/fldiff.app/Contents/Info.plist
trunk/fldiff/fldiff.app/Contents/MacOS/
trunk/fldiff/fldiff.app/Contents/PkgInfo
trunk/fldiff/fldiff.app/Contents/Resources/
trunk/fldiff/fldiff.app/Contents/Resources/fldiff.icns
trunk/fldiff/fldiff.opacity
Modified:
trunk/fldiff/
trunk/fldiff/.depend
trunk/fldiff/CHANGES
trunk/fldiff/DiffView.h
trunk/fldiff/DiffWindow.cxx
trunk/fldiff/Makefile.in
trunk/fldiff/fldiff.cxx
trunk/fldiff/fldiff.list.in
trunk/fldiff/fldiff.png
trunk/fldiff/fldiff.readme
Property changes on: trunk/fldiff
___________________________________________________________________
Name: svn:ignore
- configure
config.status
config.log
Makefile
*.exe
*.ilk
*.cache
*.list
+ configure
config.status
config.log
Makefile
fldiff
*.exe
*.ilk
*.cache
*.list
Modified: trunk/fldiff/.depend
===================================================================
--- trunk/fldiff/.depend 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/.depend 2012-02-06 17:59:44 UTC (rev 452)
@@ -1,9 +1,11 @@
-# DO NOT DELETE
-
-DiffChooser.o: DiffChooser.h FavoritesMenu.h FavoritesWindow.h
-DiffOpenWindow.o: DiffOpenWindow.h DiffChooser.h FavoritesMenu.h
-DiffView.o: DiffView.h
-DiffWindow.o: DiffWindow.h DiffView.h
-FavoritesMenu.o: FavoritesMenu.h
-FavoritesWindow.o: FavoritesWindow.h
-fldiff.o: DiffWindow.h DiffView.h
+DiffChooser.o: DiffChooser.cxx DiffChooser.h FavoritesMenu.h \
+ FavoritesWindow.h
+DiffOpenWindow.o: DiffOpenWindow.cxx DiffOpenWindow.h DiffChooser.h \
+ FavoritesMenu.h
+DiffView.o: DiffView.cxx DiffView.h PtProcess.h
+DiffWindow.o: DiffWindow.cxx DiffWindow.h DiffView.h DiffOpenWindow.h \
+ DiffChooser.h FavoritesMenu.h
+FavoritesMenu.o: FavoritesMenu.cxx FavoritesMenu.h
+FavoritesWindow.o: FavoritesWindow.cxx FavoritesWindow.h
+PtProcess.o: PtProcess.cxx PtProcess.h
+fldiff.o: fldiff.cxx DiffWindow.h DiffView.h
Modified: trunk/fldiff/CHANGES
===================================================================
--- trunk/fldiff/CHANGES 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/CHANGES 2012-02-06 17:59:44 UTC (rev 452)
@@ -1,6 +1,15 @@
-CHANGES - 2006-11-13
+CHANGES - 2012-02-06
--------------------
+v2012.0
+
+ - Added view menu and options to toggle line numbers and
+ "ignore whitespace" preferences for the current window.
+ - Added "go to line" function.
+ - Reload Diff now remembers the scroll position.
+ - New icons, better Mac OS X support.
+
+
v1.1
- Now use the GTK+ scheme, when available.
@@ -9,6 +18,7 @@
- Clicking on the scrollbar's down arrow would cause
fldiff to crash if the diff fit in the window.
+
v1.0.1
- Clicking on "cancel" in the open/compare dialog would
@@ -17,6 +27,7 @@
dialog did not refresh the file list for that
directory.
+
v1.0
- First stable release.
Modified: trunk/fldiff/DiffView.h
===================================================================
--- trunk/fldiff/DiffView.h 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/DiffView.h 2012-02-06 17:59:44 UTC (rev 452)
@@ -104,7 +104,7 @@
char *selection();
int selection_length();
void showline(int l);
- void showlinenum(bool b) { showlinenum_ = b; }
+ void showlinenum(bool b) { showlinenum_ = b; redraw(); }
bool showlinenum() const { return (showlinenum_); }
void ignoreblanks(bool b) { ignoreblanks_ = b; }
bool ignoreblanks() const { return (ignoreblanks_); }
Modified: trunk/fldiff/DiffWindow.cxx
===================================================================
--- trunk/fldiff/DiffWindow.cxx 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/DiffWindow.cxx 2012-02-06 17:59:44 UTC (rev 452)
@@ -1127,7 +1127,9 @@
DiffWindow::rediff_cb(Fl_Menu_Bar *m, // I - Menubar
DiffWindow *dw) // I - Window
{
+ int topline = dw->view_.topline();
dw->view_.load(dw->file1_, dw->file2_);
+ dw->view_.showline(topline);
}
@@ -1248,6 +1250,7 @@
DiffWindow *dw) // I - Window
{
dw->ignoreblanks(!dw->ignoreblanks());
+ rediff_cb(m, dw);
}
Modified: trunk/fldiff/Makefile.in
===================================================================
--- trunk/fldiff/Makefile.in 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/Makefile.in 2012-02-06 17:59:44 UTC (rev 452)
@@ -3,7 +3,7 @@
#
# Makefile for fldiff, a graphical diff program.
#
-# Copyright 2005 by Michael Sweet
+# Copyright 2005-2012 by Michael Sweet
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License v2 as published
@@ -20,6 +20,7 @@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir = @datadir@
+datarootdir = @datarootdir@
mandir = @mandir@
docdir = @docdir@
desktopdir = @desktopdir@
@@ -59,17 +60,35 @@
$(RM) *.bck
$(RM) *~
-depend:
- makedepend -Y -f .depend $(OBJS:.o=.cxx)
-
distclean: clean
$(RM) -r autom4te*
+ $(RM) -r clang
$(RM) config.*
$(RM) configure
+depend:
+ $(CXX) -MM $(ALL_CFLAGS) $(OBJS:.o=.cxx) >.depend
+
+#
+# Run the clang.llvm.org static code analysis tool on the C sources.
+# (at least checker-231 is required for scan-build to work this way)
+#
+
+.PHONY: clang
+clang:
+ $(RM) -r clang
+ scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
+
install: @INSTALLDESKTOP@
$(MKDIR) $(BUILDROOT)$(bindir)
- cp fldiff $(BUILDROOT)$(bindir)
+ if test `uname` = Darwin; then \
+ $(RM) -r $(BUILDROOT)$(BINDIR)/fldiff.app; \
+ cp -r fldiff.app $(BUILDROOT)$(bindir); \
+ $(RM) $(BUILDROOT)$(BINDIR)/fldiff; \
+ ln -s fldiff.app/Contents/MacOS/fldiff $(BUILDROOT)$(BINDIR); \
+ else \
+ cp fldiff $(BUILDROOT)$(bindir); \
+ fi
$(MKDIR) $(BUILDROOT)$(mandir)/man1
cp fldiff.man $(BUILDROOT)$(mandir)/man1/fldiff.1
$(MKDIR) $(BUILDROOT)$(docdir)
@@ -93,8 +112,12 @@
# Build the fldiff program...
fldiff: $(OBJS) Makefile
+ $(RM) $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- $(FLTKCONFIG) --post $@
+ if test `uname` = Darwin; then \
+ mv $@ fldiff.app/Contents/MacOS; \
+ ln -s fldiff.app/Contents/MacOS/$@ .; \
+ fi
$(OBJS): Makefile
Added: trunk/fldiff/fldiff.app/Contents/Info.plist
===================================================================
--- trunk/fldiff/fldiff.app/Contents/Info.plist (rev 0)
+++ trunk/fldiff/fldiff.app/Contents/Info.plist 2012-02-06 17:59:44 UTC (rev
452)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="0.9">
+ <dict>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+
+ <key>CFBundleExecutable</key>
+ <string>fldiff</string>
+
+ <key>CFBundleIdentifier</key>
+ <string>org.fltk.fldiff</string>
+
+ <key>CFBundleVersion</key>
+ <string>2012.0</string>
+
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2005-2012 by Michael Sweet</string>
+
+ <key>CFAppleHelpAnchor</key>
+ <string>help</string>
+
+ <key>CFBundleName</key>
+ <string>fldiff</string>
+
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+
+ <key>CFBundleSignature</key>
+ <string>FLDF</string>
+
+ <key>CFBundleIconFile</key>
+ <string>fldiff.icns</string>
+
+ <key>CFBundleShortVersionString</key>
+ <string>2012.0</string>
+
+ <key>CFBundleGetInfoString</key>
+ <string>2012.0, Copyright 2005-2012 by Michael Sweet</string>
+ </dict>
+</plist>
Property changes on: trunk/fldiff/fldiff.app/Contents/MacOS
___________________________________________________________________
Name: svn:ignore
+ fldiff
Added: trunk/fldiff/fldiff.app/Contents/PkgInfo
===================================================================
--- trunk/fldiff/fldiff.app/Contents/PkgInfo (rev 0)
+++ trunk/fldiff/fldiff.app/Contents/PkgInfo 2012-02-06 17:59:44 UTC (rev
452)
@@ -0,0 +1 @@
+FLDFFldf
Added: trunk/fldiff/fldiff.app/Contents/Resources/fldiff.icns
===================================================================
(Binary files differ)
Property changes on: trunk/fldiff/fldiff.app/Contents/Resources/fldiff.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/fldiff/fldiff.cxx
===================================================================
--- trunk/fldiff/fldiff.cxx 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/fldiff.cxx 2012-02-06 17:59:44 UTC (rev 452)
@@ -37,7 +37,7 @@
// Use POSIX locale for all commands...
- putenv("LANG=C");
+ setenv("LANG", "C", 1);
// Use the GTK+ scheme...
Fl::scheme("gtk+");
Modified: trunk/fldiff/fldiff.list.in
===================================================================
--- trunk/fldiff/fldiff.list.in 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/fldiff.list.in 2012-02-06 17:59:44 UTC (rev 452)
@@ -3,7 +3,7 @@
#
# EPM list file for fldiff.
#
-# Copyright 2005 by Michael Sweet
+# Copyright 2005-2012 by Michael Sweet
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License v2 as published
@@ -26,6 +26,7 @@
$exec_prefix=@exec_prefix@
$bindir=@bindir@
$datadir=@datadir@
+$datarootdir=@datarootdir@
$mandir=@mandir@
$docdir=@docdir@
$desktopdir=@desktopdir@
Added: trunk/fldiff/fldiff.opacity
===================================================================
(Binary files differ)
Property changes on: trunk/fldiff/fldiff.opacity
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/fldiff/fldiff.png
===================================================================
(Binary files differ)
Modified: trunk/fldiff/fldiff.readme
===================================================================
--- trunk/fldiff/fldiff.readme 2012-02-06 16:43:26 UTC (rev 451)
+++ trunk/fldiff/fldiff.readme 2012-02-06 17:59:44 UTC (rev 452)
@@ -1,8 +1,6 @@
-fldiff is a graphical diff program that shows the differences
-between two files/directories, or a file/directory and a CVS or
-Subversion repository.
+fldiff is a graphical diff program that shows the differences between two
+files/directories, or a file/directory and a CVS or Subversion repository.
-fldiff is copyright 2005 by Michael Sweet and is free software
-provided under the terms of the GNU General Public License v2.
-Please report any problems and suggestions on the fltk.general
-newsgroup.
+fldiff is copyright 2005-2012 by Michael Sweet and is free software provided
+under the terms of the GNU General Public License v2. Please report any
+problems and suggestions on the fltk.general newsgroup.
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
