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

Commits on Jul 4, 2016

  1. Scale avatar placeholder as necessary

    3vi1 authored and Mark Kieling committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    3b5e219 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Configuration menu
    Copy the full SHA
    7e59147 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Xanthos-Code#108 from 3vi1/gate-upstream

    Improve parsing of gate-related messages.
    Xanthos-Code authored Jul 6, 2016
    Configuration menu
    Copy the full SHA
    1bab67e View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. Configuration menu
    Copy the full SHA
    39c9c5d View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Fix parsing of messages with periods

    3vi1 authored and Mark Kieling committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    72efc9a View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2016

  1. Configuration menu
    Copy the full SHA
    2873ca9 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. add local room name for russian locale

    igor.gritsay authored and Mark Kieling committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    23646a0 View commit details
    Browse the repository at this point in the history
  2. Build without appending the version to the app name

    Mark Kieling committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    b44e8d8 View commit details
    Browse the repository at this point in the history
  3. Bump to 1.2.4

    Mark Kieling committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    e47d350 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. No ascii in source - no good.

    Mark Kieling committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    82759b4 View commit details
    Browse the repository at this point in the history
  2. Spec tuneup

    Mark Kieling committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    c92a9bc View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. Minor fixes:

    * 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
    IslayTzash committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    a3627db View commit details
    Browse the repository at this point in the history
  2. Updates for cygwin & win32 startup - don't try to invoke windows apis…

    … from cygwn, on windows fix taskbar icon
    IslayTzash committed Jan 3, 2017
    Configuration menu
    Copy the full SHA
    c2b8aac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58499f1 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. * Dynamically build Region menus based on quick setup preferences. Re…

    …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.
    IslayTzash committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    1e8c193 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2017

  1. fix broken avatar cache

    IslayTzash committed Jan 14, 2017
    Configuration menu
    Copy the full SHA
    5841fd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2017

  1. 1. Refactor for reload of history from file on startup and on changin…

    …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
    IslayTzash committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    ed06e6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ab34e8 View commit details
    Browse the repository at this point in the history
  3. rename for extension

    IslayTzash committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    dc43202 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f10b25a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7d5822f View commit details
    Browse the repository at this point in the history
  6. be bolder

    IslayTzash authored Jan 15, 2017
    Configuration menu
    Copy the full SHA
    9a63420 View commit details
    Browse the repository at this point in the history
  7. Update SETUP.md

    IslayTzash authored Jan 15, 2017
    Configuration menu
    Copy the full SHA
    0b77606 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5b6e3af View commit details
    Browse the repository at this point in the history
  9. Update SETUP.md

    IslayTzash authored Jan 15, 2017
    Configuration menu
    Copy the full SHA
    2218ea6 View commit details
    Browse the repository at this point in the history
  10. Update SETUP.md

    IslayTzash authored Jan 15, 2017
    Configuration menu
    Copy the full SHA
    a970b99 View commit details
    Browse the repository at this point in the history
  11. Update SETUP.md

    IslayTzash authored Jan 15, 2017
    Configuration menu
    Copy the full SHA
    3c85adb View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2017

  1. Merge remote-tracking branch 'origin/qt4x-dev' into qt5x-dev. Interru…

    …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
    IslayTzash committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    4c8e1f4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ffddc70 View commit details
    Browse the repository at this point in the history
  3. Repeat merge operation that got lost with bad stash. Merge remote-tra…

    …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
    IslayTzash committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    eb9d921 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1eb151e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bd13d9f View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. Configuration menu
    Copy the full SHA
    90e353c View commit details
    Browse the repository at this point in the history
  2. Be more careful with word boundaries in system/ship replacement. Use …

    …normalized system name in URL.
    IslayTzash committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    a7b40a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2017

  1. Fix error:

    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
    IslayTzash committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    c0fecc4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5afd963 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2017

  1. Configuration menu
    Copy the full SHA
    3a92e68 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2017

  1. fix icon cache in python3

    IslayTzash committed Jan 28, 2017
    Configuration menu
    Copy the full SHA
    3f36041 View commit details
    Browse the repository at this point in the history