Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt5x dev #149

Open
wants to merge 38 commits into
base: develop
Choose a base branch
from
Open

Qt5x dev #149

wants to merge 38 commits into from

Conversation

IslayTzash
Copy link

@IslayTzash IslayTzash commented Jan 18, 2017

Similar to pull request #148 but on Qt5 [develop] stream. I've done less testing here than on the Qt4 branch. The vanilla Qt5 doesn't work so hot here: sound and the panning web view are messed up on Windows 10 with ananconda python.

NOTE: I chose to pull the Qt5 [develop] upstream changes into Qt4 [master] (hand merging Qt4 and version stuff) and then merge that back into my Qt5 develop. This resulted in many fewer collisions, but if a specific fix was delivered to the upstream master Qt4 stream that should not be in Qt5, I may have merged that in.

3vi1 and others added 30 commits July 4, 2016 12:23
Improve parsing of gate-related messages.
* make config variable saves to cache more obvious and for a near infintite life
* retain secondary info line (either sov. info or region) and display in title chat popup for system
* allow view chat popup for systems rendered as squares -- those shown on map but not part of current region
* explicit delete from cache on some errors - when have bad svg cached or bad region name saved
…moved check indicator from region menus as a side effect.

* Move jump bridge and chatroom settings into tabbed File > Settings.
* Add keyboard shortcuts ctrl + / ctrl - / ctrl 0 for zooming,  j to toggle jump bridges.   Ctrl mousewheel zooms (except when focus is in map pane, doh)
* Add quick setup to paste corp / alliance settings all at once.   Make more things configuration settings.
* Add flush cache to File menu.
…g region

    a. Messages now only store a reference to the system name, it is used to find the system on map in viui.py
    b. Add list of all systems with regions as systems.py
    c. Allow mark system / click hyperlink from chat to switch region if system is not in current map.  Will prompt first.
2. Add some missing ship types to evegate.py
3. Prep system list for some common abbreviation & misspellings when we create it rather than at search time
4. Set intel lifetime to 60 minutes, update chate history title to reflect live value.   Expire "knownMessages" when we prune chat history.   TODO: make a config setting.
5. Catching some weird instances of set avatar pixmap where the label object has already been destroyed.   I don't see any real issues in the app.
6. Cleanup parser_functions.py some.   Better ship matching (start & end of ship name for replace).   Changed bad char handling in some places, not sure what value the bad char handler adds - it tends to make test string and original string differ so it's harder to find the replacement.

TODO:
1. startup and region switch may be a little slow.   may need a spinner.
2. make a config setting for intel time to live
…pted stash mid-operation, hope this captured all files :(

# Conflicts:
#	src/vi/amazon_s3.py
#	src/vi/cache/cache.py
#	src/vi/chatparser/chatparser.py
#	src/vi/chatparser/parser_functions.py
#	src/vi/evegate.py
#	src/vi/koschecker.py
#	src/vi/threads.py
#	src/vi/ui/MainWindow.ui
#	src/vi/ui/systemtray.py
#	src/vi/ui/viui.py
#	src/vi/version.py
#	src/vintel.py
#	src/vintel.spec
…cking branch 'origin/develop' into qtx5-dev

# Conflicts:
#	src/vi/cache/cache.py
#	src/vi/chatparser/parser_functions.py
#	src/vi/evegate.py
#	src/vi/filewatcher.py
#	src/vi/threads.py
#	src/vi/ui/MainWindow.ui
#	src/vi/ui/viui.py
#	src/vintel.py
#	src/vintel.spec
01/21 12:56:22| -- Unhandled Exception --
01/21 12:56:22|   File "...\PanningWebView.py", line 140, in acceptNavigationRequest
    return super(PanningWebView, self).acceptNavigationRequest(url, type, isMainFrame)

01/21 12:56:22| <type 'exceptions.TypeError'>: super(type, obj): obj must be an instance or subtype of type
@martinlmccourt
Copy link

This branch starts up (my distro doesn't support qt4) but it can't seem to find my intel channel logs. Any hints?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants