Commit Graph

128 Commits

Author SHA1 Message Date
Romain Failliot bf3a0b11ab Few tweaks in main.py 2021-11-21 02:18:10 -05:00
Romain Failliot 8c981d3019 Extract FileDiffViewer in the widgets module 2021-11-21 01:56:51 -05:00
Romain Failliot bdac88460f Extract ScrolledWindow in the widgets module 2021-11-21 00:15:24 -05:00
Romain Failliot 8b1b7cbe7e Extract dialogs into their own module 2021-11-21 00:02:30 -05:00
Romain Failliot ac88e3dacb Extract Preferences in its own module 2021-11-20 15:50:35 -05:00
Romain Failliot 6f4a5f3250 Extract Resources in its own module 2021-11-20 15:12:30 -05:00
Romain Failliot 812ca1779f Fix lint messages in src/utils.py 2021-11-20 14:20:21 -05:00
Romain Failliot 510cbc1cf3 Fix pylint messages in src/vcs 2021-11-20 12:25:55 -05:00
Romain Failliot db36eee4e3 Convert VCSs and rename to VcsRegistry 2021-11-18 14:52:42 -05:00
Romain Failliot ab25807876 Convert Svk VCS 2021-11-18 14:52:26 -05:00
Romain Failliot 5d6ece84e1 Convert Svn VCS 2021-11-18 14:52:20 -05:00
Romain Failliot f314f46309 Convert Rcs VCS 2021-11-18 14:52:09 -05:00
Romain Failliot 11fd364ef6 Convert Monotone VCS 2021-11-18 14:52:00 -05:00
Romain Failliot 704579bf79 Convert Hg VCS 2021-11-18 14:51:58 -05:00
Romain Failliot 8577984373 Convert Darcs VCS 2021-11-18 14:51:33 -05:00
Romain Failliot 890b202ba6 Convert CVS VCS 2021-11-18 14:51:06 -05:00
Romain Failliot a89f85db7a Convert Bazaar VCS 2021-11-18 14:50:47 -05:00
Romain Failliot b645d2cd38 Modularize VCSs and convert Git VCS 2021-11-18 14:50:28 -05:00
Romain Failliot 08942ea026 Create new utils.logErrorAndDialog function 2021-11-18 12:12:13 -05:00
Romain Failliot 50f0e431ee Add log options: log_print_output and log_print_stack 2021-11-18 12:12:12 -05:00
Creak c43017d6db
Merge pull request #107 from MightyCreak/cleaning
Some tiny cleanings
2021-11-18 12:09:56 -05:00
Romain Failliot 56b75f45b9 Some tiny cleanings 2021-11-18 10:38:59 -05:00
Romain Failliot d1075b5bf5 Fix: error when opening non existing file 2021-11-18 09:58:26 -05:00
Romain Failliot be40411b66 Fix subprocess call from within Flatpak
Fixes #103
2021-11-16 22:48:40 -05:00
Romain Failliot fd3c2bfb92 Start modularizing the code
* The entry point (`__main__`) is in diffuxe.in
* The main (almost all) code is now in main.py
* Some util functions and variables are in utils.py
* Following the same folder structure as with a new project with GNOME
  Builder:
    - `src/` is now just for the code itself
    - `data/` is for the other files (metainfo, desktop, config, ...)
    - `po/` for the translations
    - The Desktop file is renamed with the app ID
    - The `meson.build` files are closer to what GNOME Builder generates
    - More tests for the package (appstream and desktop)
    - Almost all the files in `etc/`, `usr/` are properly handled by
      meson now
    - Just use `gettext.install()` to initialize gettext
    - Remove call to `Gtk.Window.set_default_icon_name()`
* Website now points to https://mightycreak.github.io/diffuse/
2021-11-16 17:48:34 -05:00
Romain Failliot dfbe91d086 New SVG icon 2021-01-11 14:08:18 -05:00
freddii 14a21830ab fixed typing mistakes 2020-12-28 20:48:44 +01:00
Romain Failliot 4cd8943e10 Add .desktop translations in .po files 2020-12-08 14:07:26 -05:00
Romain Failliot 7bdd796223 Add MetaInfo file
Changed app-id to io.github.mightycreak.Diffuse
2020-12-05 15:52:29 -05:00
Romain Failliot 839e41d97b Set up files for 0.6.0 2020-11-29 13:04:05 -05:00
Romain Failliot b12f4612a5 Add meson build system 2020-08-13 15:30:33 -04:00
Romain Failliot c4a4687f58 Remove 'u' before strings
Python is UTF-8 by default.
2020-07-18 18:11:17 -04:00
Creak 45039d3e43
Merge pull request #58 from MightyCreak/remove-interpolation-operator
Remove some interpolation operators
2020-07-18 18:07:09 -04:00
Creak ac8f443758
Merge pull request #59 from MightyCreak/adapt-icons-to-scale-factor
Create icons using the window scale factor
2020-07-18 18:06:44 -04:00
Romain Failliot b5ae53e79e Bump to v0.5.0 2020-07-18 17:51:25 -04:00
Romain Failliot 8a2374b153 Create icons using the window scale factor 2020-07-03 19:16:21 -04:00
Romain Failliot 476825c6fe Remove some interpolation operators
Keeping the one used in translations for now.
2020-07-01 22:33:44 -04:00
Romain Failliot 80667da3a5 Fix error when using '-m' in an SVN repo 2020-07-01 19:53:30 -04:00
Romain Failliot 59b27958bf Fix pylint errors and warnings
Had to silence errors with dynamic members in Gtk.Dialog.
2020-07-01 16:37:45 -04:00
Romain Failliot 0574db26f6 Fix drag'n'drop not working
Fixes #14
2020-06-30 17:36:42 -04:00
Romain Failliot 4955bc9351 Remove unnecessary translations
The names and emails, and only translate "Copyright" from the copyright
sentence.
2020-06-29 15:03:19 -04:00
Romain Failliot c5b0dc19a0 fix: add search for the RCS directory
Fixes #28

It is actually a bug in the original repo (subversion), introduced by
revision 420 [1], thus introduced after the latest 0.4.8 release.

The refactoring in r420 removed the search for an 'RCS' directory
alongside the targeted file.

[1] https://sourceforge.net/p/diffuse/code/420/tree/trunk/src/usr/bin/diffuse?diff=51a4cccb2718464e57aae5f1:419
2020-06-22 19:35:00 -04:00
Romain Failliot 8161553965 Fix indentation 2020-06-22 19:24:13 -04:00
Thomas Neele f0dee29ebd Fixed deprecated use of Gtk.Dialog.__init__() in two places 2020-06-15 09:52:33 +02:00
Thomas Neele 5228edfd74 Use Gtk.Label.set_{x,y}align() 2020-06-15 09:43:11 +02:00
Thomas Neele c7361cdd73 Fix deprecation warnings in dialogs 2020-06-11 16:58:36 +02:00
Thomas Neele 680104ed5c Resolve several deprecation warnings 2020-06-11 16:58:28 +02:00
Romain Failliot c11064801a Update copyrights and translation strings 2020-05-21 15:45:15 -04:00
Like Ma 9f261cea7b Fix incorrect conversion.
Traceback (most recent call last):
  File "/usr/bin/diffuse", line 5592, in im_retrieve_surrounding_cb
    im.set_surrounding(s, len(s), n)
TypeError: Must be string, not bytes
2020-05-08 02:20:51 +08:00
Romain Failliot ff18e4a342 Fix deprecation warnings for Gtk.Widget.render_icon
[Gtk.Widget.render_icon](https://lazka.github.io/pgi-docs/#Gtk-3.0/classes/Widget.html#Gtk.Widget.render_icon)
has been deprecated since 3.0.

The replacement solution is to use Gtk.IconTheme.load_icon.

Most of `Gtk.STOCK_*` value are deprecated:
* `Gtk.STOCK_NEW` is now "document-new"
* `Gtk.STOCK_GO_FORWARD` is now "go-next"
* `Gtk.STOCK_GO_BACK` is now "go-previous"
2020-03-28 18:41:06 -04:00
Romain Failliot c1b88634e5 Fix deprecation warning about Gdk.Screen
[Gdk.Screen.width()](https://lazka.github.io/pgi-docs/#Gdk-3.0/classes/Screen.html#Gdk.Screen.width)
and [.height()](https://lazka.github.io/pgi-docs/#Gdk-3.0/classes/Screen.html#Gdk.Screen.height)
are deprecated since 3.22.

The equivalent solution is to get the first monitor of the default
display.
2020-03-28 18:06:23 -04:00
Romain Failliot 0b4ff56fcc Update copyright years 2020-03-28 17:55:44 -04:00
Derek Scherger 6bdefa3ca2 fix a bunch of PyGTK+3 deprecation warnings 2020-03-26 23:52:35 -04:00
Uffe Jakobsen 90ff95300f Fix diffuse VCS-integration functionality
python3 popen streams return byte-strings that needs to be decoded into strings
2020-03-19 10:56:14 +01:00
Andrey Grozin c32c314d44 Synced up to 440; ruby.syntax fixed 2020-02-04 19:40:05 +07:00
Romain Failliot c46506f1d6 Fix encoding detection. 2016-08-26 08:20:29 -04:00
Romain Failliot 6dc1dcda02 Hack to fix the resize bug.
Disable the column # display, will need to refactor the entire
ScrolledWindow class, which is planned anyway.
2016-08-18 08:36:07 -04:00
Romain Failliot 28a008ac0b Change GTK base class of some classes.
* Gtk.Table is obsolete, using Gtk.Grid instead.
* Gtk.HBox is obsolete, using Gtk.Box instead.
2016-08-18 08:36:07 -04:00
Romain Failliot 9723b5c6bc Ellipsize the filename if too long
Fix #9
2016-07-26 00:02:03 -04:00
Romain Failliot e77d60fd1d Use a Gtk.Grid instead of a Gtk.Table. 2016-07-25 20:35:16 -04:00
Romain Failliot b058926c52 Rename FileDiffViewer.map to FileDiffViewer.diffmap 2016-07-25 20:30:27 -04:00
Romain Failliot 01daf905f3 Bump to version 0.5.0 (still in alpha) 2016-07-21 04:00:22 -04:00
Romain Failliot 44ab735ca9 Convert to true GTK 3.0.
* Remove GTK compatibility layer
* Use GTK 3.0 GObject Introspection API.
2016-07-09 17:38:29 -04:00
Romain Failliot 5152459838 Fix Preference window. 2016-07-09 00:15:41 -04:00
Romain Failliot f5f8320da0 Fix SearchDialog (Ctrl+F) issues 2016-07-09 00:15:40 -04:00
Romain Failliot fa9907ac45 Fix problem when editing unexistent lines 2016-07-09 00:15:40 -04:00
Romain Failliot 61131837d3 Fix pasting issues 2016-07-09 00:15:40 -04:00
Romain Failliot 155affe741 Fix SpinButton error in N-way merge. 2016-07-09 00:15:40 -04:00
Romain Failliot 721a8d04fe Fix ComboBox error in the FileChooserDialog. 2016-07-09 00:15:40 -04:00
Romain Failliot 70b030acb9 Fix clipboard error when selecting text. 2016-07-09 00:15:40 -04:00
Romain Failliot 18328c98c3 First pass for GTK 3 and Python 3.
Still some bugs to fix but we can diff files.
Need tests with non-utf8 files.
2016-07-09 00:15:31 -04:00
Romain Failliot 4d54a00041 [svn merge][r426] Updated C++ syntax highlighting to terminate strings at newline characters.
Also fixed a bug that prevented the '--no-rcfile' and '--rcfile' command line
options from being used with other options.
2016-07-09 00:08:17 -04:00
Romain Failliot 2aecb941d7 [svn merge][r425] Made Diffuse's resource file parsing robust against installation paths with pattern matching characters.
pattern matching characters.
2016-07-09 00:08:08 -04:00
Romain Failliot 15e441f172 [svn merge][r424] Added support for Git submodules. 2016-07-08 23:13:50 -04:00
Romain Failliot e85f059d70 Standardize events.
Use more standard "-" instead of "_" for the event names.
2016-07-04 23:00:18 -04:00
Romain Failliot 08a450851a Add Romain Failliot in the copyright lines. 2016-07-03 13:18:38 -04:00
Romain Failliot a8de43b00f Easy fixes for Python3 2016-07-03 13:14:12 -04:00
Romain Failliot ba7f8868fc First commit
Original Diffuse source code from sourceforge.
Version 0.4.8 + some further changes.
2015-11-21 12:57:32 -05:00