Skip to content

Commit ad1b053

Browse files
atari2600timatari2600tim
authored
Merge f4afc37 into f835d94 
2 parents f835d94 + f4afc37 commit ad1b053

File tree

90 files changed

+39803
-42408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+39803
-42408
lines changed

‎.github/workflows/build-mudlet.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: runner.os == 'Linux'
6868
run: |
6969
# Installing packages might fail as the github image becomes outdated
70-
# sudo apt update
70+
sudo apt update
7171
# These aren't available or don't work well in vcpkg
7272
sudo apt install pkg-config libzip-dev libglu1-mesa-dev libpulse-dev libxkbcommon-x11-0 libqt5x11extras5
7373
@@ -77,7 +77,7 @@ jobs:
7777
with:
7878
vcpkgArguments: '@${{env.vcpkgResponseFile}}'
7979
vcpkgDirectory: '${{github.workspace}}/3rdparty/vcpkg'
80-
appendedCacheKey: ${{hashFiles(env.vcpkgResponseFile)}}
80+
appendedCacheKey: ${{hashFiles(env.vcpkgResponseFile)}}-newkey
8181

8282
- name: Build Mudlet
8383
uses: lukka/run-cmake@v2

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ addons:
1212
apt:
1313
sources: &add-sources
1414
- sourceline: 'ppa:beineri/opt-qt-5.11.3-xenial'
15-
- sourceline: 'ppa:beineri/opt-qt-5.12.8-xenial'
15+
- sourceline: 'ppa:beineri/opt-qt-5.12.9-xenial'
1616
- sourceline: 'ppa:ondrej/php' # more-or-less up to date libzip
1717
- sourceline: 'ppa:ubuntu-toolchain-r/test' # gcc 7
1818
packages: &common-packages

‎3rdparty/edbee-lib‎

‎CI/appveyor.after_success.ps1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Script:PublicTestBuild) {
2626
Set-Variable -Name "uri" -Value "https://make.mudlet.org/snapshots/Mudlet-$env:VERSION$env:MUDLET_VERSION_BUILD-windows.zip";
2727
Set-Variable -Name "inFile" -Value "Mudlet-$env:VERSION$env:MUDLET_VERSION_BUILD-windows.zip";
2828
Set-Variable -Name "outFile" -Value "upload-location.txt";
29+
Write-Output "=== Uploading the snapshot build ==="
2930
Invoke-RestMethod -Uri $uri -Method PUT -InFile $inFile -OutFile $outFile;
3031

3132
$DEPLOY_URL = Get-Content -Path $outFile -Raw
3233
} else {
3334
if ($Script:PublicTestBuild) {
35+
36+
$commitDate = Get-Date -date $(git show -s --format=%as)
37+
$yesterdaysDate = $(Get-Date).AddDays(-1).Date
38+
if ($commitDate -lt $yesterdaysDate) {
39+
Write-Output "=== No new commits, aborting public test build generation ==="
40+
exit 0
41+
}
42+
3443
Write-Output "=== Creating a public test build ==="
3544
# Squirrel takes Start menu name from the binary
36-
Rename-Item -Path "$Env:APPVEYOR_BUILD_FOLDER\src\release\mudlet.exe" -NewName "Mudlet PTB.exe"
45+
Rename-Item -Path "$Env:APPVEYOR_BUILD_FOLDER\src\release\mudlet.exe" -NewName "Mudlet PTB.exe"
3746
} else {
3847
Write-Output "=== Creating a release build ==="
3948
Rename-Item -Path "$Env:APPVEYOR_BUILD_FOLDER\src\release\mudlet.exe" -NewName "Mudlet.exe"

‎CI/travis.linux.after_success.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ if { [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${DEPLOY}" = "deploy" ]; } ||
5353
"https://make.mudlet.org/snapshots/Mudlet-${VERSION}${MUDLET_VERSION_BUILD}-linux-x64.AppImage.tar" -O - -q)
5454
else # ptb/release build
5555
if [ "${public_test_build}" == "true" ]; then
56+
57+
commitDate=$(git show -s --format=%as | tr -d '-')
58+
yesterdaysDate=$(date -d "yesterday" '+%F' | tr -d '-')
59+
60+
if [[ "$commitDate" -lt "$yesterdaysDate" ]]; then
61+
echo "== No new commits, aborting public test build generation =="
62+
exit 0
63+
fi
64+
5665
echo "== Creating a public test build =="
5766
else
5867
echo "== Creating a release build =="
@@ -136,4 +145,3 @@ if { [ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${DEPLOY}" = "deploy" ]; } ||
136145
fi
137146
export DEPLOY_URL
138147
fi
139-

‎CI/travis.osx.after_success.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ if [ "${DEPLOY}" = "deploy" ]; then
5151
else # ptb/release build
5252
app="${TRAVIS_BUILD_DIR}/build/Mudlet.app"
5353
if [ "${public_test_build}" == "true" ]; then
54+
55+
commitDate=$(git show -s --format=%as | tr -d '-')
56+
yesterdaysDate=$(date -v-1d '+%F' | tr -d '-')
57+
58+
if [[ "$commitDate" -lt "$yesterdaysDate" ]]; then
59+
echo "== No new commits, aborting public test build generation =="
60+
exit 0
61+
fi
62+
5463
echo "== Creating a public test build =="
5564
mv "$app" "source/build/Mudlet PTB.app"
5665
app="source/build/Mudlet PTB.app"
@@ -122,4 +131,3 @@ if [ "${DEPLOY}" = "deploy" ]; then
122131

123132
export DEPLOY_URL
124133
fi
125-

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ endif()
8383
# IMPORTANT: To insure consistency please ensure the SAME of the first two
8484
# values are also assigned to the "VERSION" and "BUILD" variables in the native
8585
# qmake project file, which is NOW called: ./src/mudlet.pro
86-
set(APP_VERSION 4.8.2)
86+
set(APP_VERSION 4.9.1)
8787
if(DEFINED ENV{MUDLET_VERSION_BUILD} AND NOT $ENV{MUDLET_VERSION_BUILD}
8888
STREQUAL "")
8989
set(APP_BUILD $ENV{MUDLET_VERSION_BUILD})

‎src/.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
/qrc_mudlet_alpha.cpp
2+
/.qmake.stash
3+
/kwallet_interface.h
4+
/kwallet_interface.cpp
5+
/moc_predefs.h
6+

‎src/Host.cpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ Host::Host(int port, const QString& hostname, const QString& login, const QStrin
346346
, mCommandLineBgColor(Qt::black)
347347
, mMapperUseAntiAlias(true)
348348
, mFORCE_MXP_NEGOTIATION_OFF(false)
349+
, mFORCE_CHARSET_NEGOTIATION_OFF(false)
349350
, mpDockableMapWidget()
350351
, mEnableTextAnalyzer(false)
351352
, mTimerDebugOutputSuppressionInterval(QTime())
@@ -379,6 +380,7 @@ Host::Host(int port, const QString& hostname, const QString& login, const QStrin
379380
, mPlayerRoomInnerDiameterPercentage(70)
380381
, mProfileStyleSheet(QString())
381382
, mSearchOptions(dlgTriggerEditor::SearchOption::SearchOptionNone)
383+
, mCompactInputLine(false)
382384
{
383385
// mLogStatus = mudlet::self()->mAutolog;
384386
mLuaInterface.reset(new LuaInterface(this));
@@ -2553,3 +2555,17 @@ std::pair<bool, QString> Host::setMapperTitle(const QString& title)
25532555

25542556
return {true, QString()};
25552557
}
2558+
2559+
void Host::setCompactInputLine(const bool state)
2560+
{
2561+
if (mCompactInputLine != state) {
2562+
mCompactInputLine = state;
2563+
// When the profile is being loaded and the previously saved data is
2564+
// read from the XML file the main TConsole has not been instatiated
2565+
// yet - so must check for it existing first - and ensure the read
2566+
// setting is applied in the constructor for it:
2567+
if (mpConsole && mpConsole->mpButtonMainLayer) {
2568+
mpConsole->mpButtonMainLayer->setVisible(!state);
2569+
}
2570+
}
2571+
}

‎src/Host.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ class Host : public QObject
325325
void getPlayerRoomStyleDetails(quint8& styleCode, quint8& outerDiameter, quint8& innerDiameter, QColor& outerColor, QColor& innerColor);
326326
void setSearchOptions(const dlgTriggerEditor::SearchOptions);
327327
std::pair<bool, QString> setMapperTitle(const QString&);
328+
void setCompactInputLine(const bool state);
329+
bool getCompactInputLine() const { return mCompactInputLine; }
328330

329331

330332
cTelnet mTelnet;
@@ -536,6 +538,7 @@ class Host : public QObject
536538
QColor mCommandLineBgColor;
537539
bool mMapperUseAntiAlias;
538540
bool mFORCE_MXP_NEGOTIATION_OFF;
541+
bool mFORCE_CHARSET_NEGOTIATION_OFF;
539542
QSet<QChar> mDoubleClickIgnore;
540543
QPointer<QDockWidget> mpDockableMapWidget;
541544
bool mEnableTextAnalyzer;
@@ -687,6 +690,9 @@ private slots:
687690
// with a default of 70. NOT USED FOR "Original" style marking (the 0'th
688691
// one):
689692
quint8 mPlayerRoomInnerDiameterPercentage;
693+
694+
// Now a per profile option this one represents the state of this profile:
695+
bool mCompactInputLine;
690696
};
691697

692698
Q_DECLARE_OPERATORS_FOR_FLAGS(Host::DiscordOptionFlags)

0 commit comments

Comments
 (0)