BeeDiff - www.linux-apps.com

BeeDiff

Developer Tools

Source (link to git-repo or to original if based on someone elses unmodified work): Add the source-code for this project on git.opendesktop.org

0

Score 85%

Description:

BeeDiff (beediff) is a program with graphical user interface (GUI) for comparing and merging files.
User have a possibilty to work with two text files. Every one is in separate panel. Panels are side by side.
All differences of both textes are highlighted in colors.
Operation buttons (merge, remove) are located direct inside compared textes in appropriate positions.
Program is user friendly, very simply and efficient.

Last changelog:

10 years ago

It is added new configuration option. Now readed text can be treaded as coded in UTF8.
(Default text is treaded as coded in local 8 bit.)

floaiza
10 years ago

Compilation using Debian 4R3 fails:

QBtConfig.cpp: In member function ‘void QBtConfig::read_data()’:
QBtConfig.cpp:204: error: ‘class QColor’ has no member named ‘lighter’
make: *** [tmp/QBtConfig.o] Error 1
strip: 'beediff': No such file
install: cannot stat `beediff': No such file or directory

piotrpsz
10 years ago

Your probles is, your qt library to old.

BorgQueen
10 years ago

Nope no sponsors, that would have been great. I'm currently introducing linux to my business clients now (I run a small business out of my home, but I do mostly pro-bono (free) work for kids and the like. Once I get a following I have a list of people creating software that I will pitch sponsorship for. I'll add you to the list.

I do appreciate your time, thanks for considering it.

BorgQueen
10 years ago

Can this be adapted to compare Open Docs for both OOo and Koffice? I do a lot of writing, from fiction to manuals and found that beediff is perfect for comparing diff versions of the same doc, but I'm limited to plain text.

This app has a great deal of potential outside of programming (as well as in). This would make an excellent editor's tool!

Consider that your snow job and hope you will consider my feature request :).

srog
10 years ago

Good program !

BeeDiff is working fine in the Kubuntu Intrepid Ibex (alpha-5).

piotrpsz
10 years ago

> Good program !
Thanks :)

> BeeDiff is working fine in the Kubuntu Intrepid Ibex (alpha-5).
Super :)

rgfree
10 years ago

Like someone here has already written, I especially like that the buttons are right where the changes are. This is much better than say KDiff3 where you have to do everything via a toolbar. I'm currently using Meld (one of the few GNOME apps I use regularly) because I think its usability is superior to anything else but it is hardly improved anymore, unfortunately. BeeDiff looks promising indeed, but (I have only looked at the screenshots at the moment I have to admit) I'm missing whole directory compare like in Meld. And I wonder - does it have UTF-8 support? I cannot use Kompare because of that. It destroys all files I'm trying to edit.

ofdarkness
10 years ago

Cant compile it when running the install script on kubuntu 64bit hardy

Quote:"BtStringTool.cpp:1: fel: CPU:n du valde stödjer inte instruktionsuppsättningen x86-64
BtStringTool.cpp:1: fel: CPU:n du valde stödjer inte instruktionsuppsättningen x86-64"

in translation it goes somthing like:
BtStringTool.cpp:1:error the selected cpu dossent support x86-64..

piotrpsz
10 years ago

In project file beediff.pro you must delete a line: QMAKE_CXXFLAGS = -march=pentium.

In next release will be correct.

shakin
10 years ago

The install script doesn't work in OpenSuse because Suse's qt4 version of qmake is simply named 'qmake', not 'qmake-qt4'.

Perhaps the install script should fall back to qmake if qmake-qt4 isn't available.

BorgQueen
10 years ago

This app is really moving along nicely. Thanks.

piotrpsz
10 years ago

thx :)

phodju
10 years ago

Hi,

I like this app a alot already! : ) What I have been missing for a long time is a 3-way diff/merge tool like meld but on top of QT. I can see that BeeDiff could be finally the one : ) Do you think it would be worth of implementing it in BeeDiff? Kompare had plans for this, but it seems they're not proceeding with it.

Thanks for the great app and keep up the good work!

Br,
Petri

piotrpsz
10 years ago

I'm thinking about 3-way merge :)

piotr

phodju
10 years ago

Great! Thanks!

BorgQueen
10 years ago

Improving nicely. Sweet and simple.
Very useful.
Thanks.

drcux
10 years ago

http://packman.links2linux.de/package/beediff

piotrpsz
10 years ago

:) thx

BorgQueen
10 years ago

I finally got around to building it. Very nice app. Clean and simple. Well done.

piotrpsz
10 years ago

:) thanks
This is a first release.

BorgQueen
10 years ago

Off to a blinking good start I'd say.
I'm one the Ark Linux people. We would be very happy if you could join us on freenode at #arklinux. We are always looking for devel who think sweet and simple (did that come out right?).

Hope to see you there.

gecko
10 years ago

isn't it the same as kompare?

piotrpsz
10 years ago

Yes, is similar.
But kompare is KDE library and Qt depentent.
BeeDiff is only Qt dependent.

piotr.

xylo
10 years ago

If I would be ask for the difference between your application and Kompare, I would say that BeeDiff is more userfriendly when you want to apply changes. Kompare is a good diff viewer but it's not very comfortable when you want to use the mouse. BeeDiff has exactly the feature I've search for: buttons (right there where the differences are) to apply changes to left/right side or to delete changes. And that's very useful.

Because of that, it has become my favorite diff application now :)
So thanks for BeeDiff.

But even kompare has useful features, like the configuration of keyboard shortcuts which is part of the KDE libraries. Is there a special reason why you are not using them?

piotrpsz
10 years ago

> ...
> Because of that, it has become my
> favorite diff application now :)
> So thanks for BeeDiff.

Thanks. This is very nice :)

> But even kompare has useful features,
> like the configuration of keyboard
> shortcuts which is part of the KDE
> libraries.
> Is there a special reason why you are
> not using them?

No. I don't implement this shortcuts because I don't know it.

10 years ago

It is added new configuration option. Now readed text can be treaded as coded in UTF8.
(Default text is treaded as coded in local 8 bit.)

13 100

File (click to download)	Version	Description	Packagetype	Architecture	Downloads	Date	Filesize	DL	OCS-Install