Add theme switching to code editor#1095
Conversation
Really shouldn't be having our own unzip function that uses outdated functions though.
Still needs to list scripts recursively and filter out ones without a script
|
|
||
| mpSourceEditorEdbeeDocument->setText( QString("# Enter your lua code here\n")); | ||
|
|
||
| mudlet::loadEdbeeTheme(mpHost->mEditorTheme, mpHost->mEditorThemeFile); |
There was a problem hiding this comment.
Shouldn't this be done just once when mudlet loads, instead of once per loaded profile?
There was a problem hiding this comment.
Haven't got the code in front of me but dlgTriggerEditor is a class that has an instantiated once per profile - so mpHost->mEditorTheme & mpHost->mEditorThemeFile may be used as non-const references here and could be modified by this call... 😖
There was a problem hiding this comment.
// loads the needed edbee theme from disk for use
bool mudlet::loadEdbeeTheme(const QString &themeName, const QString &themeFile)There was a problem hiding this comment.
Different profiles can use different themes, that's why it loads the profile-specific one.
|
My crash was due to missing updates for Edbee submodule, seems GitCola doesn't handle pulling those automatically so I've switched to SmartGit. |
…to add-theme-switching
|
There are no proper auto-updates - just manual updates when you go to the settings tab. |
|
This is ready to go in its basic implementation now - the only thing left to do is make the theme and script selection less amateurish, but given that we're halfway to a release I'll look into this after I get other necessary things covered off. |
|
@SlySven have a look again now that you've got a newer GCC. Travis build now as well thanks to @keneanung's work. |
|
Initially I thought that it might be because a However the cause is more basic than that, in that Qt do not ship OpenSSL libraries (IIRC there are US export restrictions or sommat like that) and/or Debian no longer use the OpenSSL 1.0 version by default. Anyhow a Stack Exchange "Why is QsslSocket working with Qt 5.3 but not Qt 5.7 on Debian Stretch?" Q&A is right on the mark and once I had installed I have one or two niggles in that changing the white-space / line separator lines in the "Main Display" tab does NOT change the settings in the new "Editor" tab - even though that is supposed to preview - until the dialogue is saved and closed - which is too late to meet the intended usage! @vadi2 @tomcss I have a fix for that in prototype locally but I have spotted that the original end of line and end of paragraph marks that I had used before edbee came along could be incorporated into the edbee editor (with, since Qt 5.7 the option for an end of document marker which I personally had been annoyed about by it's absence from the Qt classes before that version.) I was just investigating whether I could get them into edbee with a little work and pass the enhancement up stream... |
|
Okay, sounds good. We have just a week until the release though, and I'd like to see the theme changing be in there. Since you've started on the getting the preview to show the line endings, I'll leave you to it. |
…ching # Conflicts: # src/Host.cpp # src/dlgProfilePreferences.cpp # src/dlgTriggerEditor.cpp # src/mudlet.cpp
|
@SlySven is there anything theme-switching related that's blocking this from getting in? |
|
See vadi2#6 for a couple of things - after those it will be possible to have different themes in different profile's editors - which can be handy to tell them apart if you are copying stuff from one to the other and want a visual reminder which one is which! 😏 |
|
Note that this branch has a bug in the communi libraries where the same header files are included multiple times from different sub-directories - a fix is already in place elsewhere so there is no point in me dragging it in here as part of my PR onto your PR Vadim. Also note that this updates the commit pulled in as a git sub-module depending on which git repository tools you are using it may need something done in developer's local copies of the submodule in order to resync your local copy of that submodule to the newer one. |
* BugFix: make changed showTabs/Spaces & showLineFeed/Paragraphs immediate Immediate that is in the preview "Editor" widget in the Profile Preference (settings/option) dialog - changes to the main Editor (for all and each profile) are not made until the dialog is closed with a save but as the Editor built into one tab is supposed to be a preview it needs to change as the options are. Note that currently showLineFeeds/Paragraphs is not like the original Qt Text Editor widget - instead it just puts a graphical line between each line of text. I believe it is possible to revise this upstream in the Edbee-lib repository to be more like the LineEnd/Paragraph markings of the original Qt widget but that will take a bit of time to do that I do not have right now. Also note that changing the show tabs / spaces option did not take effect immediately in the Edbee editor widget but I have put forward a bugfix for that which has already been accepted into upstream as: PR edbee/edbee-lib#33 as a fix for: issue edbee/edbee-lib#32 Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Revise: ensure all aspects of edbee settings persist on item change During testing I found that previous changes to the edbee widget set in the profile preferences did not stay when a new Mudlet item was selected in the editor and that a theme setting made in that dialog was routed to ALL profiles instead of the active one. The first of these issues I solved by ensuring all of the Font, the Theme and the two global settings for show tabs/spaces and (the currently misused) linefeed/paragraph marks are all set when dlgTriggerEditor::clearDocument(...) was called. The second was fixed by removing the inappropriate (void) mudlet::setEditorTheme(const QString&) method and the SIGNAL signal_editorThemeChanged(QString); the latter was wired up to a lambda method in the dlgTriggerEditor constructor, what it did was needed but only as a method called by (void) dlgProfilePreferences::slot_save_and_exit() which was named (void) dlgTriggerEditor::setThemeAndOtherSettings(const QString &). Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
|
Big thanks for improving on this! I take it you're happy with the state of affairs in this - will merge. |
* Removed duplicate clear event handlers call * Revert back to dev version. 3.3 here we go! * Adds saveWindowLayout() call to AutoSaveOnExit processing. * Edbee editor implementation (#985) * Added a frame to edbee so it looks nicer * Got utf8 module to load (#1074) (update packaging!) * Modified tooltip for Save and Save Profile to clearly indicate their keyboard shortcuts * Added: shortcut for delete action in editor (#1084) * shortcut added for delete action * Removed redundant edbee config related code (#1091) * Delete TScriptEditorManager.h * Delete TScriptEditorManager.cpp * BugFix: import some fixes by "Zolder" from Mudlet (Realms of Legends) fork import: some Zoilder fixes from the MudletRL fork: * in TBuffer::translateToPlainText(...): make some MXP related code execute only if Host::mFORCE_MXP_NEGOTIATION_OFF is NOT set as well as another condition. * in TBuffer::wrap(...): change a for(...) {...} loop termination condition be a "<" rather than a "<=" test - which sounds like an "off-by-one" error fix-up. * In TTextEdit:updateScreenView(): revise code that seems to prevent the width of a "main" console being set too small and NOT written to the "parent" Host::mScreenWidth variable - the original modification removed such a restriction completely, but I have just lowered the minimum from 100 to 40 and ensured it is always stored both in the local "main" console and to the parent record in the Host class for that console. * In TTextEdit::drawForeground(...): revise the behaviour *I think* when at the point where a console "split" becomes unnecessary... Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Cut down on the length of some variable names (#1086) * Clarified use of QLatin1String * Adding GCC 5 for C++14 requirement (#1098) * Fixed "reset map colors" button to work (#1049) * Fixed "reset map colors" button to work That's a 5 year old bug out of the way! * Change travis configuration to use installed gcc-5 (#1108) * Change travis configuration to use installed gcc-5 * Fixes #1104 (#1109) Thanks to Rick for his prompt response on this * Fixed typo in GeyserLabel.lua Per #1112 * Fix locale to C Enforce uniform locale so scripts don't get tripped up on number representation differences (. vs ,) * IRC client update of UI and logic (#1072) * Add Communi Model & Util libs * Full refactor of IRC Client code & UI This retains the primary functions of the old IRC client but adds many more new IRC commands by default. The UI is slightly more organized and interactive now. * Adds QPointer to IRC Dialog pointer variable. * Update Lua `sendIrc()` slightly. * Added /msg command, Input History, and updated display colors. Input History stores a total of 8 previously entered commands the user can cycle through using the Up Arrow key. The previously include /msg command has been added again. Colors of some messages have been updated for (relatively) easier distinction of message lines. * Updated channel handling. * Fix CMake builds Things needed to fix CMake builds: - communi CMake builds needed `include_directories` explicitly specified - more MOC calls in communi - more explicit dependencies to MOC files in communi - ircmessageformatter must be compiled into mudlet * IRC3 with more Lua features (#1087) Changes IRC client to run with settings given per-profile, making the IRC client more visible and configurable within Lua. This adds configuration options to the settings window in the "Special Options" tab for configuring an IRC client on the host profile which opens the settings window. See the PR summary comment for details on available Lua functions and IRC Client commands. * Add a Code of Conduct (#1110) * Create CODE_OF_CONDUCT.md * Fix for the QMake warnings caused by the IRC library includes. * Finished formatting all filed & added braces (#1115) * Finished formatting all filed & added braces * Re-enabled map load on profile load (#1118) * Re-enabled map load on profile load - disabling it broke scripts that relied on map data w/o the map open * updated assignments. * Event-based gamepad functionality (#1106) * Add theme switching to code editor (#1095) * Fix more Toolbar & Button bugs (#1080) (#1090) * Fix bugs with Buttons & Toolbars. - Fixed change detection for location, orienation, and CSS data. - Buttons are not rendered unless they are part of a group, Toolbar/Menu. - ToolBars whos locations are changed now hide their previous TToolBar or TEasyButtonBar instance as needed. * Fix Buttons being left behind when parent toolbar is deleted. Also allows TAction to use QPointer<T> * Update old sourceforge page links (#1132) (#1134) * Fixed blank command separator to not separate as people expect * Replaced isTempKey, isTempAlias, etc with isTemporary (#1102) * also pushed isFolder() and setIsFolder() to the parent Tree class * Give meaning to encodings (#1107) * Delete dev_README Deleted outdated dev_README file. It also didn't seem to be used all that often, else people would have raised the fact that it's outdated... * Update travis to use Qt 5.9 for compiling (#1141) * Re-add single QT 5.6 build job Since we want to keep sure that the minimal Qt version is still compilable (currently we need at least 5.6), we add a single job for that version. * Refactor: rename QMake project/sub-project files (#1103) * refactor: rename QMake project/sub-project files It is down right confusing having several project files in the Qt IDE which are all labelled "src" - this commit renames the main project file from "src.pro" to "mudlet.pro" and also renames: * the lua_yajl module from src.pri to lua_yajl.pri * the luazip module from src.pri to luazip.pri it also: * adds a new communi.pri file (see below) I also took the liberty of renaming the project resource file from: * mudlet_alpha.qrc to mudlet.qrc (we are well past the alpha stage now!) and sorting a couple of items into the right order. By creating a local project file 3rdparty/communi/communi.pri it is possible to group the three separate but related communi libraries into one - as it happens the effective content of the new file is identical to that of the communi libraries own libcommuni/src/src.pri but it has some notes on how the portion of the upstream library that we are using was picked out of there; how to identify the effect version and how to (hopefully) recreate things if upstream gets revised in the future! By not using the upstream "src.pri"/"src.pro" files we avoid the confusion of having a generic "src" project in the Mudlet project as a whole and it is clearly identify-able as a file from the Mudlet project rather than the sub-project that it pulls into the whole thing... There is an minor nuisance side-effect in that having the main project src.pro file open in a Qt Creator IDE or stored in a session will get confused when this commit takes effect as the file will disappear from the repository - it will be necessary to close the project and open the new src/mudlet.pro project file (and possibly re-enter the build steps) - OTOH the main project will now be identified as "mudlet" in Creator rather than the previous "src". 😄 Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Removed accidental debug echo left in (#1151) * initialize int nIrcPort with dlgIRC::DefaultHostPort value. (#1153) * Removes false from sendIrc() return, ignores command filtering status (#1154) * Removes false from sendIrc() return, ignores command filtering status (not used). * Remove punctuation from lua messages * Improved layout of IRC preferences (#1152) * Fix get map events (#1120) * Adapt addMapEvent error messages to current standard * Fix getMapEvents() The function now returns a proper indexed table of objects that each describe a map event. * Add missing call to set Editor as editable. (#1159) * Fixed tab indent to be two spaces again * Fixed getComputerEncoding in case no key found It'll now return the original value passed - it's way better than returning the wrong value. * Add linux ci deployment (#1128) * Modify files needed for CI deployment of linux builds * Syntax fix in .travis.yml * tar the CI AppImages as well * Add lua sqlite runtime dependency * Unset LD variable for linuxdeployqt * Bugfix: unset LD_LIBRARY_PATH in every codepath * Test: install appmenu-qt5 for global menus * Revert 781ef97 (Install appmenu-qt5) The issue was that the first AppImage used Qt 5.6.2 instead of Qt 5.9 (which is how 3.2 was built and how it is build now after merging development in) * Remove manager again (#1163) * Improved map load output to be condensed down if it's all successful (#1117) OK! Would be happy to see that in as well for maps that take a while to load (>1s). * Re-enable search highlighting (#1096) * Remove mainwindow statusbar (#1162) * Replaced statustips with tooltips in the mapper menu * Removed statusbar * Tagging 3.3.0 * Initial QTextToSpeech additions * Further TTS additions and bugfixes * Wrapping TTS functions in #ifdefs for QT_TTS_LIB * Missing #ifdefs * More misplaced #ifdef lines for TTS functions * More QT_TTS_LIB ifs * Adding QTextToSpeech to cmake lists * Various TTS updates * Adding GetState to TLuaInterpreter.h * Minor fixes * Tts temporary fixes * Exchanging toLatin1 with toUtf8 * Fix cmake TTS module includesion * Install Qt 5.9 TTS module on linux * Use Qt provided definition for enabled modules We don't need (and possibly don't want) to provide our own definition for when a module is enabled. Let's use the Qt provided definition instead. * Output confirmation messages of enabled Qt modules * Use upper case "Gamepad" in output * ttsClearQueue crash fix * Fix for global speech events * Whitespace replacement * Various minor fixes * More minor fixes. * Cleanup: make CMakeList.txt have uniform indenting and adjust CMake message The minimum versions of the Qt TextToSpeech and Gamepad reported in the CMake project files needed tweaking. I have also tried to regularise the indentation in the Mudlet CMake project files to standardise on 2 spaces. Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Reformat: clean up code-loyout of new TTS TLuaInterpreter code Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * BugFix: fixup a switch() in (int) TLuaInterpreter::ttsGetState(lua_State*) This switch was missing "break;" on all the cases and must have been defective without them - for all but the last case extra strings would have been pushed onto the lua stack but as the return value was 1 they may have been discarded... Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Enable Qt 5.9 Windows builds for testing * Deploy Qt 5.9 builds for testing * Fixing double-events for queueing purposes * Added missing symbol * Added missing symbol * Updating tts events to globals and adding voice * Create TTSValues.lua * Adding TTSValues to LuaGlobal * Adding TTSValues to Mudlet project * Update CMakeLists.txt * Update TTSValues.lua * Update Qt to 5.10 for trusty This is needed to hopefully have some TTS backend plugins in Linux * Queueing and crash fixes * Renaming tts funcs * Renaming internal functions * Adding functions for retrieving settings * Fixing typo * Making ttsGetState public * Improve error messages for ttsGetCurrentLine() It can be incredibly frustrating to just get a boolean back as an error message when you don't know what is going on * Update error message to be consistent with the new style * Aligned error messages to be consistent with the new style * Fix ttsClearQueue to return nil+error, not actually error on invalid index * Minor code formatting * Floats to doubles * Update documentation links
Added theme switching to the code editor widget.
This is a very basic implementation: I have plans to improve the blandness of the settings dialog, add resilience for JSON file corruption, and a few other things. However, we can all anticipate theme switching to be a popular feature of 3.3 and so I'd like to get a basic implementation of it merged into
developmentfor testing by others.Please as soon as you can, if there are no blocking issues I'd like to get it merged with minor ones outstanding - I'll fix them in the follow-up PR I'm working on.