Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
358 Commits 1 Branch 0 Tags 5.6 MiB
Commit Graph

358 Commits

Author SHA1 Message Date
Creak b60785ee76
Merge pull request #37 from likema/fix-bytes-type 
Fix incorrect conversion.
 2020-05-07 15:47:41 -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
Stefan Eilemann 8de1c93afa Fix install python version 2020-05-04 09:50:49 +02:00
Creak b4fd348fb5
Merge pull request #34 from MightyCreak/add-source-code-conventions 
Add source code conventions
 2020-03-29 11:51:47 -04:00
Romain Failliot a8d8d6f199 Update changelog 2020-03-29 11:51:21 -04:00
Romain Failliot 0cd6e20275 Add .editorconfig file 2020-03-29 11:47:47 -04:00
Romain Failliot 42c73f9af4 Add .gitignore file 2020-03-29 11:47:47 -04:00
Creak 825cf752f9
Merge pull request #33 from MightyCreak/fix-changelog-urls 
Fix CHANGELOG urls
 2020-03-29 11:47:04 -04:00
Romain Failliot 1f47367125 Fix CHANGELOG urls 2020-03-29 11:44:49 -04:00
Creak 675563a401
Merge pull request #32 from MightyCreak/convert-changelog 
Convert ChangeLog to the standard "Keep a Changelog"
 2020-03-29 11:35:29 -04:00
Romain Failliot ef8454dcb1 Convert ChangeLog to the standard "Keep a Changelog" 
See: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 2020-03-29 11:34:05 -04:00
Creak e52bad8537
Merge pull request #30 from MightyCreak/reduce-gtk-warnings 
Reduce GTK deprecation warnings
 2020-03-28 18:42:27 -04: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
Creak b1f70363ab
Merge pull request #29 from MightyCreak/fix-gtk-deprecation-warnings 
Fix a bunch of PyGTK+3 deprecation warnings
 2020-03-26 23:53:28 -04:00
Derek Scherger 6bdefa3ca2 fix a bunch of PyGTK+3 deprecation warnings 2020-03-26 23:52:35 -04:00
Creak ce4e0e7046
Merge pull request #27 from uffejakobsen/uj_vcs_fixes 
Fix diffuse VCS-integration functionality
 2020-03-26 23:43:59 -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
Creak 813d6e7bba
Merge pull request #23 from grozin/master 
make install.py py3 compatible
 2020-02-10 07:34:37 -05:00
Andrey Grozin a9ed7ec430 make install.py py3 compatible 2020-02-08 22:32:18 +07:00
Creak fd505ae695
Merge pull request #22 from grozin/master 
Synced up to 440; ruby.syntax fixed
 2020-02-06 08:37:37 -05:00
Andrey Grozin c32c314d44 Synced up to 440; ruby.syntax fixed 2020-02-04 19:40:05 +07:00
Romain Failliot b45cded779 Add missing DLL libp11-kit-0.dll 
* Fixes #17
* Bump to version alpha 7
 2016-10-24 08:29:12 -04:00
Romain Failliot 5f5ec53e05 Bump to alpha 6 
There was apparently a problem with the executable in the installer.
Retrying with a fresh new build.
 2016-09-08 19:45:19 -04:00
Romain Failliot 681cb3cadd Bump to alpha.5 2016-08-26 12:29:35 -04:00
Romain Failliot c46506f1d6 Fix encoding detection. 2016-08-26 08:20:29 -04:00
Romain Failliot 67d801da79 Fix installer. 
* v0.5.0-alpha.4
* Create a directory in the start menu
* Install dir is now just "Diffuse"
* Set an icon for the uninstaller
 2016-08-18 13:28:01 -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 5cbaec21f8 Bump to alpha.3 for the installer 2016-07-26 04:14:58 -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 6365966205 Fix and improve executable generation for Windows 
* Bump to v0.5.0-alpha.2
* Now it really works on Windows!
* Filtering the DLLs pulled with the executable, reducing the total size
  of the app from 170MB to 60MB.
* Adding the Diffuse icon to the .exe.
 2016-07-22 03:46:50 -04:00
Romain Failliot 01daf905f3 Bump to version 0.5.0 (still in alpha) 2016-07-21 04:00:22 -04:00
Romain Failliot c543615f62 New cxfreeze setup and Inno Setup scripts for v0.5. 2016-07-21 03:59:53 -04:00
Creak b882151aea Conversion to Python 3 and GTK 3 
There probably must be some bugs left, but all the features seem to work properly.
Fix #4
Fix #5
 2016-07-09 17:47:00 -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