Updating the 64 bit windows branch to bring in changes from the development one#5311
Merged
SlySven merged 536 commits intoMudlet:64Bit_Windowsfrom Aug 3, 2021
Merged
Updating the 64 bit windows branch to bring in changes from the development one#5311SlySven merged 536 commits intoMudlet:64Bit_Windowsfrom
SlySven merged 536 commits intoMudlet:64Bit_Windowsfrom
Conversation
Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
replace prettywrite with inspect to avoid crashes or stackoverflow in Geyser * make inspect global + replace prettywrite in miniconsole display * alias prettywrite
Co-authored-by: Piotr Wilczynski <piotr.wilczynski@bisnode.com>
* Clarify message over movable tabs * Update src/mudlet.cpp Co-authored-by: Kebap <kebap_spam@gmx.net> Co-authored-by: Kebap <kebap_spam@gmx.net>
* Downgrade to GCC 7 from 9 * Update .github/workflows/build-mudlet.yml Co-authored-by: Stephen Lyons <slysven@virginmedia.com> Co-authored-by: Stephen Lyons <slysven@virginmedia.com>
* Generate changelog for macOS builds * Show generated changlog in appveyor builds
This is so that a crowd sourced map might be edited in a collaborative manner. The first stage is to make sufficient of the entire map details be exported/imported in a modular (by area) fashion. Include Lua functions `exportJsonMap(pathFileName)` and `importJsonMap(pathFileName)` to perform the whole map export and import functions. Also, rename `(QMultiMap<int, QPair<int, int>>) TArea::exits` to: `TArea::mAreaExits` because the old name was such a common word in our source code it was hard to find the uses of this member. This format has been constructed so as to not mention the most common, or default values for some items - so as to minimise details that have to be included on the basis they can be assumed when reconstructing them on the other end. On the other hand the whole file is compressible so for storage (but not for diff/git work) archiving / compressing the file is recommended! For instance a binary map file I have is 18.6MB which produced a 25.8MB JSON file which I was able to compress down to 2.9MB - obviously this is *very* content dependent, so other's Miles-May-Vary... As the export process is not that fast include a progress dialogue that shows how many areas, map labels and rooms have been processed into the JSON format. For a 20K room map with 40 odd areas and around 800 map labels (which are awkward to convert to a text-like form) this can take 30 seconds on my 1.8GHz 4 Core PC! CodeFactor had a recommendation about a constant that I was using to set the dimension of a `char[]` (array) - it felt a compile time `constexpr` was a better thing to use. Revised to make Cancel button work in big areas: Although the existing code would abort at the end of an area, for some humongous maps with a few very large areas it is also a good idea to check for the cancel button being pressed each time the progress bar is updated. Renamed `(QMap<int, int>) TMap::envColors` to `TMap::mEnvColors` and `(QMap<int, QColor>) Tmap::customEnvColors` to `TMap::mCustomEnvColors` so that it is clearer that they are members of the `TMap` class. Add alpha component to end of list of (now four) 0 to 255 integer values returned by `getCustomEnvColorTable()` - as the corresponding setter does allow one to be provided. Move initialisers for TMap, TRoomDB, TRoom and TArea to header file where possible. As per Issue Mudlet#4578. Move the default and unnamed area names from TRoomDB to TMap - as it made setting them up easier (though one of them does need to be initialised before the normal TRoomDB instance associated with the TMap is itself initialised. This meant putting these private members near the top of the header file even though we normally put private ones down the bottom. Refactor: move JSON colour writing/reading code from TArea/TRoom to TMap The code is common to all three classes so can be shared. At the same time make it explicit in the key as to whether there is an alpha component so the colour is a 24Bit opaque one or a 32Bit one with transparency. Revise: peer-review items and other tweaks Note that this revises the format version to be 1.000 (ready for release) so, although the format has not changed, any recent files produced during evaluation will need to be hand edited to change the line: "formatVersion": 0.003, to: "formatVersion": 1.000, in order to read them now. Switch to "range based" for-loops for some of the JSON additions. Fixup: ensure partially built new TRoomDB is destroyed if reading aborted Not doing this would cause a resource leak if the abort button was clicked during importation of a Json map file. Revise: disable writing out Room highlighting details It has been pointed out that the binary map format does not save the room highlighting details either - so replicate that behaviour for the moment. Signed-off-by: Stephen Lyons <slysven@virginmedia.com> Co-authored-by: Vadim Peretokin <vperetokin@gmail.com>
* Cleanup stray debug statements * Revert accidental change
…info are added (Mudlet#4787) Co-authored-by: Piotr Wilczynski <piotr.wilczynski@bisnode.com>
Made a trivial change to cause rebuild (as origin commit had a component that caused the CI to not be run): take out unneeded `QStringLiteral` wrappers around perfectly usable raw C strings. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Co-authored-by: Stephen Lyons <slysven@virginmedia.com>
…t#4816) fixes copying only one letter if a word by doubleclick or a whole line by triple click is selected
* Set XCode to 11.3 which is what we used in Travis * Set CMAKE_OSX_DEPLOYMENT_TARGET correctly * Correct CMakeLists * Fix syntax * Up to latest available XCode
* repair setPopup api * improve setPopup error message * revert change probably a copy/paste fail
Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
Co-authored-by: Stephen Lyons <slysven@virginmedia.com>
Co-authored-by: Piotr Wilczynski <piotr.wilczynski@bisnode.com>
This should close Mudlet#5248 which looks to have been introduced by my Mudlet#3948 from last July. It failed to accommodate the custom icon code from a couple of years ago done by Mudlet#2814. Basically the problem was that I removed storage of the profile name from the "display text" for the `QTreeWidgetItem`s in the profile connection dialogue. It was moved to a UserRole stored in the item's data area so that it was stored but not shown under the item and just showed the icon. However the custom icon code was still looking at the item's `text()` which now, of course, is empty! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
* New translations mudlet.ts (Russian) * New translations mudlet.ts (French) * New translations mudlet.ts (Spanish) * New translations mudlet.ts (German) * New translations mudlet.ts (Greek) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Dutch) * New translations mudlet.ts (Polish) * New translations mudlet.ts (Portuguese) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Traditional) * New translations mudlet.ts (Portuguese, Brazilian) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (Pirate English) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (German)
Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
Fix 2 typos in JSON map export Closes Mudlet#5265. Signed-off by: Stephen Lyons <slysven@virginmedia.com> Authored by: atari2600tim <29287358+atari2600tim@users.noreply.github.com>
Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
* Update development with 4.12.0 release * Re-instate -dev
Ubuntu 16.04 is EOL and breaks for building.
* (autocommit) Updated autocompletion data * (autocommit) Updated autocompletion data Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
…udlet#5280) * Refactor the shortcut adjustments out - not sure why the action text has no tr() anymore but it still works..! * Join Functions, If to Switch, Shortcut indirection - removing "unset" function in lieu of an optional bool parameter in "set" - reworking if/else cascade into a nice switch for readability - even more readabily: drop much repeated code & set shortcut once at the end * Revert shortcut indirection - This could otherwise drop shortcuts from ALL taskbar items. While this seems fair for now, it could have unintended consequences later. So stay as is for now. * Also use setShortcuts during toolbar creation * Define toolbar2 items in order of display * Mention new shortcuts in tool-tips * Mention new shortcuts in tool-tips * Finally set toolbar2 shortcuts * Add header data * Add header data * Undo switch, c++ can't handle strings * Stupid ; * Forgot ) as well * tr() necessary after all * move comment before function * inverse logic * typo * use inversed logic
This was suggested by the Discord User Kaylee#0064 in the mudlet-development channel on 2021/06/11T18:56Z. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
* (autocommit) Updated text for translation Co-authored-by: mudlet-machine-account <mudlet-machine-account@users.noreply.github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Conflicts attempted to be resolved in:
* .appveyor.yml
* CI/travis.linux.after_success.sh
* CI/travis.osx.after_success.sh - it was desirable to replace the bogus
`! -z` argument to the shell's `test` (i.e. `[`) with the equivalent `-n`
when importing the `development` branch version that uses
`$MACOS_SIGNING_PASS` instead of the previous `$CERT_PW`.
* src/mudlet.pro - some files have gained a mention though they have not
been **changed** in any way - these are (relative to the `/src` directory):
* ../.github/workflows/update-geyser-docs.yml
* ../CI/generate-ptb-changelog.lua
* ../CI/travis.validate_deployment.sh
* ../CI/update-autocompletion.lua
* ../translations/lua/translated/mudlet-lua_??_??.json (15 files)
* ./icons/mudlet_{|dev|ptb}.ic{n|co} - (6 files)
Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
|
Hey there! Thanks for helping Mudlet improve. 🌟 Test versionsYou can directly test the changes here:
No need to install anything - just unzip and run. |
The new packages (3.5.0-1) are borked so we need to use the previous version (2.4.4-2). Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
... otherwise the process hangs waiting for a y/n response! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
vadi2
approved these changes
Jul 10, 2021
Member
vadi2
left a comment
There was a problem hiding this comment.
Sure, no harm, if anything we'll do the review when merging into development.
Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This should pull in all the changes in
developmentsince I created the64-bit_Windowsbranch into the latter. Give that this is NOT the development branch i was a little unclear on how to update the branch on the main Mudlet server - and it seemed that doing a PR from my repo seemed the simplest. As such it is not clear that this needs the review/approval process before it gets merged but I am not sure how to bypass that...Signed-off by: Stephen Lyons slysven@virginmedia.com