Conversation
Remove dead code.
Debugging improvements in telnet code.
These settings are based on the agreements reached in pull request #81.
Update clang-format options.
Update versions for new releases.
Fix for loading lua values where an empty stack could be accessed and cause a seg fault.
Explicitly require lua 5.1.
See http://tintin.sourceforge.net/msdp: "client - IAC SB MSDP MSDP_VAR "SEND" MSDP_VAL "AREA NAME" MSDP_VAL "ROOM NAME" IAC SE"
* Applied MCCP toggling patch from Michael See https://bugs.launchpad.net/mudlet/+bug/1119884/+attachment/4836759/+files/mudlet-copyover.patch (cherry picked from commit 08657f9) * Minor comments cleanup (cherry picked from commit c154ef5)
With this change, we can get rid of the run_mudlet helper script in the macOS app bundle
This is ANOTHER attempt to get the Command Up and Down for buttons restored to Mudlet to get the release_30 branch ready for release. Previous attempts got bogged down in trying to do too much in one swell foop. This provides the minimum IMHO to get the missing functionality back and to fix a significant bug in the previous handling of toolbars that were inserted into modules. It is not everything that is wanted for the final release but represents a functional package of changes that are hopefully possible to swallow in one chunk. It DOES NOT fix the behaviour of push-down buttons not sending the right thing on every press - I am still investigating that urgently (I do have some ideas); also the layout in the editor when some elements have been necessarily been hidden is not perfect. I have got a solution for that but it is better wrapped up in a separate (series of) commit(s). Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Not much to say really! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
(release_30) Modify the package.cpath for MacOS as well
…UpAndDownRedux_modulesWithToolbars * (release_30)BugFix_buttonCommandUpAndDownRedux_modulesWithToolBars This is ANOTHER attempt to get the Command Up and Down for buttons restored to Mudlet to get the release_30 branch ready for release. Previous attempts got bogged down in trying to do too much in one swell foop. This provides the minimum IMHO to get the missing functionality back and to fix a significant bug in the previous handling of toolbars that were inserted into modules. It is not everything that is wanted for the final release but represents a functional package of changes that are hopefully possible to swallow in one chunk. It DOES NOT fix the behaviour of push-down buttons not sending the right thing on every press - I am still investigating that urgently (I do have some ideas); also the layout in the editor when some elements have been necessarily been hidden is not perfect. I have got a solution for that but it is better wrapped up in a separate (series of) commit(s). Squashed in a second commit to fix a single character textual typo in main one Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
…awing (#432) As per http://bugs.launchpad.net/mudlet/+bug/1369041 the built-in dialog button that some OS/Window systems provide did close the dialog but did not cancel the custom line drawing process. This fixes the matter by connecting the reject() signal that the button produces to code to clean up. During debugging this it became clear that: if the custom line dialog was being displayed but before the user had selected the exit to draw the line for, it was possible to click on the map and add points to create a line; this would be for a custom line with an Empty exit name which should not be permitted. To prevent this a flag "mDialogLock" was added to the class to prevent the mouse events that would draw or modify a custom line from proceeding until the custom line dialog had been used or cancelled. Signed-off-by: Stephen Lyons <slysven@virginmedia.com> (cherry picked from commit 07c6a3e)
…ument Removes one bit of cruft that will be involved in area I am working on. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
The mudlet class is a singleton and there are means to get it thoughout the application so it is pointless to pass it as an argument to a function purely so it can be passed to another function. This commit refactors the code to use the global value directly where needed - which includes an area of code that this series of commits affect. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
…hods Further decrufting. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
Revised: (void)TAction::execute() to always send the string associated with the "down" command for a non-push down button. This fixes: https://bugs.launchpad.net/mudlet/+bug/1673672 "Disabling button up still keeps the command toggle". It also clearly sets TConsole::mButtonState to 1 if the button is up or 2 if it is down, as per: http://wiki.mudlet.org/w/Manual:Lua_Functions#getButtonState . Steps are also taken to ensure a non-pushdown button is never left in a "down" state. Refactored: (int)TAction::mButtonState ==> (bool)TAction::mButtonState now true is used to indicate the button is in the pushed-down state - there did appear to be some confusion about this in the past with 0,1 AND 2 being used in various places. BugFix: Disabled buttons are now hidden on floating toolbars as expected {I do have future plans to allow the option for a button to be present but "greyed-out" if disabled in the future...!} Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
(release 30)BugFix: fix mButtonState behaviour for non-Push-Down "Buttons"
Finally! 4 years worth the wait :)
keneanung
approved these changes
Mar 25, 2017
Member
Author
|
@SlySven this is already all of the code that is in |
SlySven
approved these changes
Mar 26, 2017
SlySven
added a commit
to SlySven/Mudlet
that referenced
this pull request
Oct 11, 2021
…ditors I can't see how to share a single set of index definitions between the `dlgRoomExit` class and the `exitstreewidget` one - the latter is a base class on which the former depends but getting the one to inherit from the other is beyond me... As it happens I spotted the need for the second set when I reviewed `(void) ExitsTreeWidget::keyPressEvent(QKeyEvent*)` and spotted that I had not revised it to close the correct persistent editors in PR Mudlet#439 seven years ago! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven
added a commit
to SlySven/Mudlet
that referenced
this pull request
Oct 11, 2021
…ditors I can't see how to share a single set of index definitions between the `dlgRoomExit` class and the `exitstreewidget` one - the latter is a base class on which the former depends but getting the one to inherit from the other is beyond me... As it happens I spotted the need for the second set when I reviewed `(void) ExitsTreeWidget::keyPressEvent(QKeyEvent*)` and spotted that I had not revised it to close the correct persistent editors in the merge commit 83db9f9 (part of PR Mudlet#439) seven years ago! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven
added a commit
that referenced
this pull request
Oct 13, 2021
…xits (#5505) This will make changing/adding the columns easier as part of what was created as the draft (and to be replaced) PR #5308 - that is to be broken up into smaller, easier to digest, chunks! 8-) There is a single set of constants which are defined in the `exitstreewidget` class but used also by the `dlgRoomExit` one by virtue of making it a friend of the former. As it happens I spotted the need for both classes to have these constants when I reviewed `(void) ExitsTreeWidget::keyPressEvent(QKeyEvent*)` and spotted that I had not revised it to close the correct persistent editors in the merge commit 83db9f9 (part of PR #439) seven years ago! This will make changing/adding the columns easier as part of what was Revised slightly (converted an empty switch "default:" case from a `;` to a `{}`) to placate the CodeFactor god/daemon...! Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven
added a commit
to SlySven/Mudlet
that referenced
this pull request
Apr 5, 2022
There are files now in Mudlet that seem to have been forgotten from being added to these variables so they can be seen in Qt Creator, they are: * OTHER_FILES: * ./.devcontainer/Dockerfile (added by Mudlet#4087) * ./.devcontainer/devcontainer.json (added by Mudlet#4087) * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Mudlet#4088) * ./.github/workflows/generate-changelog.yml (added by Mudlet#6006) * ./CI/appveyor.validate_deployment.ps1 (added by Mudlet#3493) * ./CI/generate-changelog.lua (renamed from ./CI/generate-ptb-changelog.lua by Mudlet#6002, that file created by Mudlet#3517) * ./CI/travis.validate_deployment.sh (added by Mudlet#3493) * ./CI/update-autocompletion.lua (added by Mudlet#3452) * ./dangerfile.js (added by Mudlet#5489) * ./docker/.env.template (added by Mudlet#5047) * DISTFILES: * ./.clang-tidy (added by Mudlet#4858) * ./cmake/FindLua51.cmake (added by Mudlet#3167) * ./cmake/FindSparkle.cmake (added Mudlet#3477) * ./cmake/FindZZIPLIB.cmake (added by Mudlet#3630) * ./cmake/IncludeOptionalModule.cmake (added by Mudlet#3174) * ./cmake/InitGitSubmodule.cmake (added by Mudlet#3171) The following files have gone away: * OTHER_FILES: * ./.github/workflows/whitespace-linter.yml (removed by Mudlet#4152) * ./.travis.yml (removed by Mudlet#5611) * ./README (renamed to ./dev_README by Mudlet#439, removed by Mudlet#1169) Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven
added a commit
that referenced
this pull request
Apr 5, 2022
…les (#6037) This PR had three commits: * The first commit just sorts in a case insensitive manner the files in the OTHER_FILES and DISTFILES QMake variables. This is a precursor to making changes to them. * The second swaps some files between QMake OTHER_FILES and DISTFILES variables. Technically the latter are for files that are needed to go into a source tarball that the traditional GNU 'make dist' operation would produce. As such it does not seem reasonable to include CI/CB control files in it. Conversely the run-time LUA files that Mudlet needs definitely should be included and so this commit moves them from the OTHER_FILES variable, whose contents are merely files that we want to show up in the Qt Creator IDE so they can be seen, searched and edited from there. * The third changes the contents of QMake OTHER_FILES and DISTFILES variables as there are files now in Mudlet that seem to have been forgotten from being added to these variables so they can be seen in Qt Creator, they are: * OTHER_FILES: * ./.devcontainer/Dockerfile (added by Setup Mudlet for C++ Github Codespace #4087) * ./.devcontainer/devcontainer.json (added by Setup Mudlet for C++ Github Codespace #4087) * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Open Mudlet remotely using Github Codespaces #4088) * ./.github/workflows/generate-changelog.yml (added by Infrastructure: add workflow to create changelog from the web #6006) * ./CI/appveyor.validate_deployment.ps1 (added by Add updater validation to linux/macos/windows release builds #3493) * ./CI/generate-changelog.lua (renamed from ./CI/generate-ptb-changelog.lua by Infrastucture: update changelog generator to handle releases as well #6002, that file created by Add a changelog generator for PTB releases #3517) * ./CI/travis.validate_deployment.sh (added by Add updater validation to linux/macos/windows release builds #3493) * ./CI/update-autocompletion.lua (added by Add action for automatic updates of Mudlet's autocompletion #3452) * ./dangerfile.js (added by Infrastructure: danger checks in JS #5489) * ./docker/.env.template (added by Docker development support #5047) * DISTFILES: * ./.clang-tidy (added by Add automated check to verify improvements against Mudlet's C++ style guide #4858) * ./cmake/FindLua51.cmake (added by Modernize cmake files (part 1) #3167) * ./cmake/FindSparkle.cmake (added Improve cmake osx #3477) * ./cmake/FindZZIPLIB.cmake (added by Build Mudlet for macOS with Github Actions #3630) * ./cmake/IncludeOptionalModule.cmake (added by Cmake improve optional module check #3174) * ./cmake/InitGitSubmodule.cmake (added by Cmake improve git submodule initialization #3171) Also, the following files have gone away: * OTHER_FILES: * ./.github/workflows/whitespace-linter.yml (removed by Delete whitespace-linter action #4152) * ./.travis.yml (removed by Infrastructure: delete .travis.yml #5611) * ./README (renamed to ./dev_README by Release 3.0 merge into master #439, removed by Merge 3.3.0 development into master #1169) 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.
We can finally update the
masterbranch, which is for released code, with 3.0.Let's consider setting
masterto be the default again after this as well, sincedevelopmentonly became default after we didn't have a final for many years.Plaintext diff, fully expanded, courtesy of Debian: https://launchpadlibrarian.net/312387002/mudlet_1%3A2.1-2_1%3A3.0.0-1ppa3.diff.gz
Note: this is not The Merge. That is release_30 into development, while this is master.