dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
3,377 Commits 3 Branches 5 Tags
5372f31be8d4c94b4fef01db8b62a2b7722b96de
Commit Graph

2202 Commits

Author SHA1 Message Date
blitzmann
5372f31be8 Revert "Revert "Merge branch 'master' into wx3"". So many reverts. 
This reverts commit cca7f1112a.
 2015-06-27 21:53:59 -04:00
blitzmann
6d01877d78 Merge branch 'master' into wx3 
Conflicts:
	pyfa.py
 2015-06-27 19:33:12 -04:00
blitzmann
646f3afd27 Fixed oversights 2015-06-27 19:32:21 -04:00
blitzmann
030f22b66f Merge branch 'debugGtk' into wx3 2015-06-27 18:25:31 -04:00
blitzmann
98815f2b85 Fix #307 by moving menu code to spawn event 2015-06-27 18:18:43 -04:00
blitzmann
a4fe3fe142 Fix crash in character editor 2015-06-27 15:56:34 -04:00
blitzmann
5b0857e169 Ensure that resources gauge is not drawn with a width of 0 to make GTK happy 2015-06-27 15:35:22 -04:00
blitzmann
975a414c5f Ensure that SetSize() does not take values less than -1 2015-06-27 14:39:35 -04:00
blitzmann
8a7e69b902 Fix progress dialog stuff. Closes #281 2015-06-25 16:43:39 -04:00
blitzmann
dc035469ed Fix background color for certain panels under Linux 2015-06-25 16:09:56 -04:00
blitzmann
21937c02ff Made it look nicer 2015-06-24 19:53:55 -04:00
blitzmann
7ec78b941e Add help text for why api is disabled, per #269. I may or may not make it look nicer later 2015-06-24 15:10:37 -04:00
blitzmann
da16f6cee7 Fix closing of progress dialogs 2015-06-20 15:00:02 -04:00
blitzmann
f285395e0f Fix black bitmap when dragging fit, closes #303 2015-06-17 19:43:48 -04:00
blitzmann
b54e3aeaf9 See #303 2015-06-16 15:28:23 -04:00
blitzmann
eb2f4991ee Fix search in wx3 (and remove some needless crap... seriously, why was all that there?) 2015-06-04 22:48:46 -05:00
blitzmann
16017a3c31 Remove middle click to open new page, fixing wx3 deprecation warning (didn't seem to work anyway) 2015-06-04 21:01:49 -05:00
blitzmann
e7264108dd Fix #287 2015-05-05 23:23:38 -04:00
blitzmann
2bcbb03c10 Fix #286 and another minor bug related to colors 2015-05-05 22:56:40 -04:00
DarkPhoenix
26bba49193 Work around bug in wxpython 
Button is specified as property in wx docs, but it returns bound method instead of actually being a property
 2015-05-01 16:00:26 +03:00
DarkPhoenix
9482404ca7 Remove setting locale 
Who knows what it may cause, i'm not an wx expert, but wx3 bundled with xc_freeze keeps bitching about it...
 2015-05-01 00:04:35 +03:00
DarkPhoenix
cca7f1112a Revert "Merge branch 'master' into wx3" 
This reverts commit 33a0c10650, reversing
changes made to 2077655694.

Reverting merges fucks up git, but oh well - we probably better merge stuff manually rather than fucking up master with wx3 which is apparently buggy
 2015-04-30 19:47:15 +03:00
DarkPhoenix
2c366faa66 Revert "Remove setting locale" 
This reverts commit 7606bded40.

Reverting all wx3 commits on master
 2015-04-30 19:38:47 +03:00
DarkPhoenix
7606bded40 Remove setting locale 
It causes issues with wx3 on windows
 2015-04-28 23:49:11 +03:00
blitzmann
39c14b62fd Merge branch 'master' into wx3 2015-04-17 17:48:56 -04:00
blitzmann
0bc9264c28 Fix #268 2015-04-08 23:43:56 -04:00
blitzmann
694a2a3d9b Fix #267 2015-03-23 21:21:38 -04:00
blitzmann
6c19f446be Sort import stage results 2015-02-09 22:44:33 -05:00
blitzmann
dc77ee9353 Add import stage to goTo logic, and fixed a bug with search initiating a goTo to the last hx item 2015-02-09 22:05:56 -05:00
blitzmann
6d29fd6bc1 Simplified stage 3 history handling. Fixes: 
* Hitting back button after creating/copying new fit breaks stage
* Importing more than 1 fit while on the search stage and hitting the back button breaks stage
 2015-02-08 21:12:56 -05:00
blitzmann
cbcd5ccca5 Fixed bugs: 
* Importing 1 fit would open stage3 of that ship, but add incorrect history data.
* Deleting fit from search stage caused blank stage most times, fixed this.
 2015-02-08 20:29:54 -05:00
blitzmann
30d2ab23ad Initial support for import stage in shipBrowser. Few bugs, see issue #93 2015-02-08 16:14:52 -05:00
blitzmann
ef62f102bc Fix #256 2015-02-07 21:15:23 -05:00
blitzmann
7b8bb79cbe Fix error when loading previous fits that no longer exist in DB 2015-02-03 15:23:31 -05:00
blitzmann
c861adc5ed Sanity check to importing effect handler 
Tweaks to opening effect files when in debug (support for OS X and Linux)
 2015-02-03 14:07:21 -05:00
blitzmann
675213f20f Fix #252 2015-01-21 11:18:58 -05:00
blitzmann
3a9e1f8b85 Fix XML export 2015-01-17 13:41:49 -05:00
blitzmann
371e33764e Ammo name tooltip added to charge icon 2015-01-13 17:26:56 -05:00
blitzmann
9b8b7aba07 Add module state information to state tooltip 2015-01-12 23:37:40 -05:00
blitzmann
0a6274474e Fixes #204 2015-01-10 21:53:30 -05:00
Ryan Holmes
0ff69068c0 Merge pull request #241 from cockroach/master 
Make tab tooltips optional
 2015-01-10 20:13:35 -06:00
DarkPhoenix
731477b366 Open fit upon importing 2015-01-11 00:43:05 +03:00
blitzmann
059af217aa Fix #246 2015-01-08 15:04:22 -05:00
Ryan Holmes
2a391fa38b Merge pull request #242 from blitzmann/issue-233 
Fix #233
 2015-01-08 13:26:26 -06:00
Ryan Holmes
88b1426fe0 Merge pull request #232 from blitzmann/progress 
Port custom wait dialog to wx.ProgressDialog
 2015-01-08 12:15:05 -06:00
blitzmann
07da5aa861 Resolve #245 - Adding tooltips to fitting columns 2015-01-08 12:39:16 -05:00
blitmann
487f65d62b Fix #233 2015-01-04 17:19:53 -06:00
Stefan Ott
c202aefd2e Reverted accidentally committed change 2015-01-02 17:06:26 +01:00
Stefan Ott
0ed91e4079 Fixed code formatting 2015-01-02 17:04:10 +01:00
Stefan Ott
9c2a667635 Made tab tooltips optional 2015-01-02 16:55:05 +01:00