diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-09-03 00:22:37 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-09-03 08:59:34 +0200 |
commit | 7739e1a02dd40a78b4e02c01b1d7087bdfc83291 (patch) | |
tree | 0b529c889377df900ebc54a3ad333f29a68518fd /source/kde | |
parent | 50cb4bf29437db95a1f034741d6bdc2b70f1550d (diff) | |
download | current-7739e1a02dd40a78b4e02c01b1d7087bdfc83291.tar.gz |
Fri Sep 3 00:22:37 UTC 202120210903002237
a/hwdata-0.351-noarch-1.txz: Upgraded.
d/strace-5.14-x86_64-1.txz: Upgraded.
kde/akonadi-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-tools-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-contacts-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-import-wizard-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-mime-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-notes-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadi-search-21.08.1-x86_64-1.txz: Upgraded.
kde/akonadiconsole-21.08.1-x86_64-1.txz: Upgraded.
kde/akregator-21.08.1-x86_64-1.txz: Upgraded.
kde/analitza-21.08.1-x86_64-1.txz: Upgraded.
kde/ark-21.08.1-x86_64-1.txz: Upgraded.
kde/artikulate-21.08.1-x86_64-1.txz: Upgraded.
kde/audiocd-kio-21.08.1-x86_64-1.txz: Upgraded.
kde/baloo-widgets-21.08.1-x86_64-1.txz: Upgraded.
kde/blinken-21.08.1-x86_64-1.txz: Upgraded.
kde/bomber-21.08.1-x86_64-1.txz: Upgraded.
kde/bovo-21.08.1-x86_64-1.txz: Upgraded.
kde/calendarsupport-21.08.1-x86_64-1.txz: Upgraded.
kde/calligra-3.2.1-x86_64-11.txz: Rebuilt.
Recompiled against poppler-21.09.0.
kde/cantor-21.08.1-x86_64-1.txz: Upgraded.
kde/cervisia-21.08.1-x86_64-1.txz: Upgraded.
kde/dolphin-21.08.1-x86_64-1.txz: Upgraded.
kde/dolphin-plugins-21.08.1-x86_64-1.txz: Upgraded.
kde/dragon-21.08.1-x86_64-1.txz: Upgraded.
kde/elisa-21.08.1-x86_64-1.txz: Upgraded.
kde/eventviews-21.08.1-x86_64-1.txz: Upgraded.
kde/ffmpegthumbs-21.08.1-x86_64-1.txz: Upgraded.
kde/filelight-21.08.1-x86_64-1.txz: Upgraded.
kde/granatier-21.08.1-x86_64-1.txz: Upgraded.
kde/grantlee-editor-21.08.1-x86_64-1.txz: Upgraded.
kde/grantleetheme-21.08.1-x86_64-1.txz: Upgraded.
kde/gwenview-21.08.1-x86_64-1.txz: Upgraded.
kde/incidenceeditor-21.08.1-x86_64-1.txz: Upgraded.
kde/itinerary-21.08.1-x86_64-1.txz: Upgraded.
kde/juk-21.08.1-x86_64-1.txz: Upgraded.
kde/k3b-21.08.1-x86_64-1.txz: Upgraded.
kde/kaddressbook-21.08.1-x86_64-1.txz: Upgraded.
kde/kalarm-21.08.1-x86_64-1.txz: Upgraded.
kde/kalarmcal-21.08.1-x86_64-1.txz: Upgraded.
kde/kalgebra-21.08.1-x86_64-1.txz: Upgraded.
kde/kalzium-21.08.1-x86_64-1.txz: Upgraded.
kde/kamera-21.08.1-x86_64-1.txz: Upgraded.
kde/kamoso-21.08.1-x86_64-1.txz: Upgraded.
kde/kanagram-21.08.1-x86_64-1.txz: Upgraded.
kde/kapman-21.08.1-x86_64-1.txz: Upgraded.
kde/kapptemplate-21.08.1-x86_64-1.txz: Upgraded.
kde/kate-21.08.1-x86_64-1.txz: Upgraded.
kde/katomic-21.08.1-x86_64-1.txz: Upgraded.
kde/kbackup-21.08.1-x86_64-1.txz: Upgraded.
kde/kblackbox-21.08.1-x86_64-1.txz: Upgraded.
kde/kblocks-21.08.1-x86_64-1.txz: Upgraded.
kde/kbounce-21.08.1-x86_64-1.txz: Upgraded.
kde/kbreakout-21.08.1-x86_64-1.txz: Upgraded.
kde/kbruch-21.08.1-x86_64-1.txz: Upgraded.
kde/kcachegrind-21.08.1-x86_64-1.txz: Upgraded.
kde/kcalc-21.08.1-x86_64-1.txz: Upgraded.
kde/kcalutils-21.08.1-x86_64-1.txz: Upgraded.
kde/kcharselect-21.08.1-x86_64-1.txz: Upgraded.
kde/kcolorchooser-21.08.1-x86_64-1.txz: Upgraded.
kde/kcron-21.08.1-x86_64-1.txz: Upgraded.
kde/kde-dev-scripts-21.08.1-x86_64-1.txz: Upgraded.
kde/kde-dev-utils-21.08.1-x86_64-1.txz: Upgraded.
kde/kdebugsettings-21.08.1-x86_64-1.txz: Upgraded.
kde/kdeconnect-kde-21.08.1-x86_64-1.txz: Upgraded.
kde/kdeedu-data-21.08.1-x86_64-1.txz: Upgraded.
kde/kdegraphics-mobipocket-21.08.1-x86_64-1.txz: Upgraded.
kde/kdegraphics-thumbnailers-21.08.1-x86_64-1.txz: Upgraded.
kde/kdenetwork-filesharing-21.08.1-x86_64-1.txz: Upgraded.
kde/kdenlive-21.08.1-x86_64-1.txz: Upgraded.
kde/kdepim-addons-21.08.1-x86_64-1.txz: Upgraded.
kde/kdepim-runtime-21.08.1-x86_64-1.txz: Upgraded.
kde/kdesdk-kioslaves-21.08.1-x86_64-1.txz: Upgraded.
kde/kdesdk-thumbnailers-21.08.1-x86_64-1.txz: Upgraded.
kde/kdf-21.08.1-x86_64-1.txz: Upgraded.
kde/kdialog-21.08.1-x86_64-1.txz: Upgraded.
kde/kdiamond-21.08.1-x86_64-1.txz: Upgraded.
kde/keditbookmarks-21.08.1-x86_64-1.txz: Upgraded.
kde/kfilemetadata-5.85.0-x86_64-2.txz: Rebuilt.
Recompiled against poppler-21.09.0.
kde/kfind-21.08.1-x86_64-1.txz: Upgraded.
kde/kfloppy-21.08.1-x86_64-1.txz: Upgraded.
kde/kfourinline-21.08.1-x86_64-1.txz: Upgraded.
kde/kgeography-21.08.1-x86_64-1.txz: Upgraded.
kde/kget-21.08.1-x86_64-1.txz: Upgraded.
kde/kgoldrunner-21.08.1-x86_64-1.txz: Upgraded.
kde/kgpg-21.08.1-x86_64-1.txz: Upgraded.
kde/khangman-21.08.1-x86_64-1.txz: Upgraded.
kde/khelpcenter-21.08.1-x86_64-1.txz: Upgraded.
kde/kidentitymanagement-21.08.1-x86_64-1.txz: Upgraded.
kde/kig-21.08.1-x86_64-1.txz: Upgraded.
kde/kigo-21.08.1-x86_64-1.txz: Upgraded.
kde/kile-2.9.93-x86_64-11.txz: Rebuilt.
Recompiled against poppler-21.09.0.
kde/killbots-21.08.1-x86_64-1.txz: Upgraded.
kde/kimagemapeditor-21.08.1-x86_64-1.txz: Upgraded.
kde/kimap-21.08.1-x86_64-1.txz: Upgraded.
kde/kio-extras-21.08.1-x86_64-1.txz: Upgraded.
kde/kio-gdrive-21.08.1-x86_64-1.txz: Upgraded.
kde/kipi-plugins-21.08.1-x86_64-1.txz: Upgraded.
kde/kirigami-gallery-21.08.1-x86_64-1.txz: Upgraded.
kde/kiriki-21.08.1-x86_64-1.txz: Upgraded.
kde/kiten-21.08.1-x86_64-1.txz: Upgraded.
kde/kitinerary-21.08.1-x86_64-1.txz: Upgraded.
kde/kjumpingcube-21.08.1-x86_64-1.txz: Upgraded.
kde/kldap-21.08.1-x86_64-1.txz: Upgraded.
kde/kleopatra-21.08.1-x86_64-1.txz: Upgraded.
kde/klickety-21.08.1-x86_64-1.txz: Upgraded.
kde/klines-21.08.1-x86_64-1.txz: Upgraded.
kde/kmag-21.08.1-x86_64-1.txz: Upgraded.
kde/kmahjongg-21.08.1-x86_64-1.txz: Upgraded.
kde/kmail-21.08.1-x86_64-1.txz: Upgraded.
kde/kmail-account-wizard-21.08.1-x86_64-1.txz: Upgraded.
kde/kmailtransport-21.08.1-x86_64-1.txz: Upgraded.
kde/kmbox-21.08.1-x86_64-1.txz: Upgraded.
kde/kmime-21.08.1-x86_64-1.txz: Upgraded.
kde/kmines-21.08.1-x86_64-1.txz: Upgraded.
kde/kmix-21.08.1-x86_64-1.txz: Upgraded.
kde/kmousetool-21.08.1-x86_64-1.txz: Upgraded.
kde/kmouth-21.08.1-x86_64-1.txz: Upgraded.
kde/kmplot-21.08.1-x86_64-1.txz: Upgraded.
kde/knavalbattle-21.08.1-x86_64-1.txz: Upgraded.
kde/knetwalk-21.08.1-x86_64-1.txz: Upgraded.
kde/knights-21.08.1-x86_64-1.txz: Upgraded.
kde/knotes-21.08.1-x86_64-1.txz: Upgraded.
kde/kolf-21.08.1-x86_64-1.txz: Upgraded.
kde/kollision-21.08.1-x86_64-1.txz: Upgraded.
kde/kolourpaint-21.08.1-x86_64-1.txz: Upgraded.
kde/kompare-21.08.1-x86_64-1.txz: Upgraded.
kde/konqueror-21.08.1-x86_64-1.txz: Upgraded.
kde/konquest-21.08.1-x86_64-1.txz: Upgraded.
kde/konsole-21.08.1-x86_64-1.txz: Upgraded.
kde/kontact-21.08.1-x86_64-1.txz: Upgraded.
kde/kontactinterface-21.08.1-x86_64-1.txz: Upgraded.
kde/kontrast-21.08.1-x86_64-1.txz: Upgraded.
kde/konversation-21.08.1-x86_64-1.txz: Upgraded.
kde/kopeninghours-21.08.1-x86_64-1.txz: Upgraded.
kde/kopete-21.08.1-x86_64-1.txz: Upgraded.
kde/korganizer-21.08.1-x86_64-1.txz: Upgraded.
kde/kosmindoormap-21.08.1-x86_64-1.txz: Upgraded.
kde/kpat-21.08.1-x86_64-1.txz: Upgraded.
kde/kpimtextedit-21.08.1-x86_64-1.txz: Upgraded.
kde/kpkpass-21.08.1-x86_64-1.txz: Upgraded.
kde/kpmcore-21.08.1-x86_64-1.txz: Upgraded.
kde/kpublictransport-21.08.1-x86_64-1.txz: Upgraded.
kde/kqtquickcharts-21.08.1-x86_64-1.txz: Upgraded.
kde/krdc-21.08.1-x86_64-1.txz: Upgraded.
kde/kreversi-21.08.1-x86_64-1.txz: Upgraded.
kde/krfb-21.08.1-x86_64-1.txz: Upgraded.
kde/krita-4.4.8-x86_64-2.txz: Rebuilt.
Recompiled against poppler-21.09.0.
kde/kross-interpreters-21.08.1-x86_64-1.txz: Upgraded.
kde/kruler-21.08.1-x86_64-1.txz: Upgraded.
kde/kshisen-21.08.1-x86_64-1.txz: Upgraded.
kde/ksirk-21.08.1-x86_64-1.txz: Upgraded.
kde/ksmtp-21.08.1-x86_64-1.txz: Upgraded.
kde/ksnakeduel-21.08.1-x86_64-1.txz: Upgraded.
kde/kspaceduel-21.08.1-x86_64-1.txz: Upgraded.
kde/ksquares-21.08.1-x86_64-1.txz: Upgraded.
kde/ksudoku-21.08.1-x86_64-1.txz: Upgraded.
kde/ksystemlog-21.08.1-x86_64-1.txz: Upgraded.
kde/kteatime-21.08.1-x86_64-1.txz: Upgraded.
kde/ktimer-21.08.1-x86_64-1.txz: Upgraded.
kde/ktnef-21.08.1-x86_64-1.txz: Upgraded.
kde/ktorrent-21.08.1-x86_64-1.txz: Upgraded.
kde/ktouch-21.08.1-x86_64-1.txz: Upgraded.
kde/kturtle-21.08.1-x86_64-1.txz: Upgraded.
kde/kubrick-21.08.1-x86_64-1.txz: Upgraded.
kde/kwalletmanager-21.08.1-x86_64-1.txz: Upgraded.
kde/kwave-21.08.1-x86_64-1.txz: Upgraded.
kde/kwordquiz-21.08.1-x86_64-1.txz: Upgraded.
kde/libgravatar-21.08.1-x86_64-1.txz: Upgraded.
kde/libkcddb-21.08.1-x86_64-1.txz: Upgraded.
kde/libkcompactdisc-21.08.1-x86_64-1.txz: Upgraded.
kde/libkdcraw-21.08.1-x86_64-1.txz: Upgraded.
kde/libkdegames-21.08.1-x86_64-1.txz: Upgraded.
kde/libkdepim-21.08.1-x86_64-1.txz: Upgraded.
kde/libkeduvocdocument-21.08.1-x86_64-1.txz: Upgraded.
kde/libkexiv2-21.08.1-x86_64-1.txz: Upgraded.
kde/libkgapi-21.08.1-x86_64-1.txz: Upgraded.
kde/libkipi-21.08.1-x86_64-1.txz: Upgraded.
kde/libkleo-21.08.1-x86_64-1.txz: Upgraded.
kde/libkmahjongg-21.08.1-x86_64-1.txz: Upgraded.
kde/libkomparediff2-21.08.1-x86_64-1.txz: Upgraded.
kde/libksane-21.08.1-x86_64-1.txz: Upgraded.
kde/libksieve-21.08.1-x86_64-1.txz: Upgraded.
kde/libktorrent-21.08.1-x86_64-1.txz: Upgraded.
kde/lokalize-21.08.1-x86_64-1.txz: Upgraded.
kde/lskat-21.08.1-x86_64-1.txz: Upgraded.
kde/mailcommon-21.08.1-x86_64-1.txz: Upgraded.
kde/mailimporter-21.08.1-x86_64-1.txz: Upgraded.
kde/marble-21.08.1-x86_64-1.txz: Upgraded.
kde/markdownpart-21.08.1-x86_64-1.txz: Upgraded.
kde/mbox-importer-21.08.1-x86_64-1.txz: Upgraded.
kde/messagelib-21.08.1-x86_64-1.txz: Upgraded.
kde/minuet-21.08.1-x86_64-1.txz: Upgraded.
kde/okular-21.08.1-x86_64-1.txz: Upgraded.
kde/palapeli-21.08.1-x86_64-1.txz: Upgraded.
kde/parley-21.08.1-x86_64-1.txz: Upgraded.
kde/partitionmanager-21.08.1-x86_64-1.txz: Upgraded.
kde/picmi-21.08.1-x86_64-1.txz: Upgraded.
kde/pim-data-exporter-21.08.1-x86_64-1.txz: Upgraded.
kde/pim-sieve-editor-21.08.1-x86_64-1.txz: Upgraded.
kde/pimcommon-21.08.1-x86_64-1.txz: Upgraded.
kde/poxml-21.08.1-x86_64-1.txz: Upgraded.
kde/print-manager-21.08.1-x86_64-1.txz: Upgraded.
kde/rocs-21.08.1-x86_64-1.txz: Upgraded.
kde/skanlite-21.08.1-x86_64-1.txz: Upgraded.
kde/spectacle-21.08.1-x86_64-1.txz: Upgraded.
kde/step-21.08.1-x86_64-1.txz: Upgraded.
kde/svgpart-21.08.1-x86_64-1.txz: Upgraded.
kde/sweeper-21.08.1-x86_64-1.txz: Upgraded.
kde/umbrello-21.08.1-x86_64-1.txz: Upgraded.
kde/yakuake-21.08.1-x86_64-1.txz: Upgraded.
kde/zeroconf-ioslave-21.08.1-x86_64-1.txz: Upgraded.
l/gdbm-1.21-x86_64-1.txz: Upgraded.
l/glib2-2.68.4-x86_64-3.txz: Rebuilt.
/etc/profile.d/libglib2.csh: Don't use bash syntax. Thanks to theodore.s.
l/poppler-21.09.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/python-pillow-8.3.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/akonadi-search | 2 | ||||
-rw-r--r-- | source/kde/kde/build/akonadiconsole | 2 | ||||
-rw-r--r-- | source/kde/kde/build/calligra | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kfilemetadata | 2 | ||||
-rw-r--r-- | source/kde/kde/build/khelpcenter | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kile | 2 | ||||
-rw-r--r-- | source/kde/kde/build/konsole | 2 | ||||
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rw-r--r-- | source/kde/kde/build/skanlite | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/konsole.patch | 3 | ||||
-rw-r--r-- | source/kde/kde/patch/konsole/konsole_fix_toolbar.patch | 156 |
11 files changed, 9 insertions, 168 deletions
diff --git a/source/kde/kde/build/akonadi-search b/source/kde/kde/build/akonadi-search index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/akonadi-search +++ b/source/kde/kde/build/akonadi-search @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/akonadiconsole b/source/kde/kde/build/akonadiconsole index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/akonadiconsole +++ b/source/kde/kde/build/akonadiconsole @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index f599e28b..b4de3947 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -10 +11 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/khelpcenter b/source/kde/kde/build/khelpcenter index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/khelpcenter +++ b/source/kde/kde/build/khelpcenter @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index f599e28b..b4de3947 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -10 +11 diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole index 00750edc..d00491fd 100644 --- a/source/kde/kde/build/konsole +++ b/source/kde/kde/build/konsole @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/skanlite b/source/kde/kde/build/skanlite index 00750edc..d00491fd 100644 --- a/source/kde/kde/build/skanlite +++ b/source/kde/kde/build/skanlite @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/patch/konsole.patch b/source/kde/kde/patch/konsole.patch deleted file mode 100644 index 34dfbe26..00000000 --- a/source/kde/kde/patch/konsole.patch +++ /dev/null @@ -1,3 +0,0 @@ -# Fix KXmlGUI toolbars; and Konsole MainWindow size - https://invent.kde.org/utilities/konsole/-/merge_requests/457 -cat $CWD/patch/konsole/konsole_fix_toolbar.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch b/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch deleted file mode 100644 index 6071db5e..00000000 --- a/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch +++ /dev/null @@ -1,156 +0,0 @@ ---- ./src/MainWindow.h.orig 2021-08-04 16:48:59.000000000 -0500 -+++ ./src/MainWindow.h 2021-08-19 19:24:14.000000000 -0500 -@@ -200,6 +200,7 @@ - bool _menuBarInitialVisibility; - bool _menuBarInitialVisibilityApplied; - bool _blurEnabled = false; -+ bool _isSavedUiState = false; - }; - } - ---- ./src/MainWindow.cpp.orig 2021-08-04 16:48:59.000000000 -0500 -+++ ./src/MainWindow.cpp 2021-08-19 19:24:14.000000000 -0500 -@@ -11,12 +11,12 @@ - #include <QMouseEvent> - #include <QMenu> - #include <QMenuBar> --#include <QStatusBar> - - // KDE - #include <KAcceleratorManager> - #include <KActionCollection> - #include <KActionMenu> -+#include <KCrash> - #include <KIconUtils> - #include <KShortcutsDialog> - #include <KLocalizedString> -@@ -56,6 +56,8 @@ - #include "terminalDisplay/TerminalDisplay.h" - #include "widgets/ViewContainer.h" - -+#include <konsoledebug.h> -+ - using namespace Konsole; - - MainWindow::MainWindow() : -@@ -68,13 +70,22 @@ - _menuBarInitialVisibility(true), - _menuBarInitialVisibilityApplied(false) - { -- if (!KonsoleSettings::saveGeometryOnExit()) { -+ KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -+ KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow")); -+ const bool isGroup = cg.exists(); -+ if (isGroup) { -+ const QString stateConfig = cg.readEntry(QStringLiteral("State")); -+ -+ // If "stateConfig" is empty then this is the very first run, -+ // i.e. no konsolerc file in $HOME -+ _isSavedUiState = !stateConfig.isEmpty(); -+ } -+ -+ if (isGroup && !KonsoleSettings::saveGeometryOnExit()) { - // If we are not using the global Konsole save geometry on exit, - // remove all geometry data from [MainWindow] in Konsolerc, so KWin will - // manage it directly -- KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -- KConfigGroup group = konsoleConfig->group("MainWindow"); -- QMap<QString, QString> configEntries = group.entryMap(); -+ QMap<QString, QString> configEntries = cg.entryMap(); - QMapIterator<QString, QString> i(configEntries); - - while (i.hasNext()) { -@@ -91,7 +102,7 @@ - || i.key().contains(QLatin1String(" YPosition")) - #endif - ) { -- group.deleteEntry(i.key()); -+ cg.deleteEntry(i.key()); - } - } - } -@@ -103,7 +114,7 @@ - - // create view manager - _viewManager = new ViewManager(this, actionCollection()); -- connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close); -+ connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close); - connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this, - &Konsole::MainWindow::activeViewChanged); - connect(_viewManager, &Konsole::ViewManager::unplugController, this, -@@ -129,8 +140,10 @@ - // in terminal applications - KAcceleratorManager::setNoAccel(menuBar()); - -- // create menus -- createGUI(); -+ constexpr KXmlGuiWindow::StandardWindowOptions guiOpts = ToolBar | Keys | Save | Create; -+ const QString xmlFile = componentName() + QLatin1String("ui.rc"); // Typically "konsoleui.rc" -+ // The "Create" flag will make it call createGUI() -+ setupGUI(guiOpts, xmlFile); - - // remember the original menu accelerators for later use - rememberMenuAccelerators(); -@@ -146,11 +159,7 @@ - connect(KonsoleSettings::self(), &Konsole::KonsoleSettings::configChanged, this, - &Konsole::MainWindow::applyKonsoleSettings); - -- -- // KXMLGui is making the status bar always visible, we need to fix in a proper way. -- if (statusBar() != nullptr) { -- statusBar()->installEventFilter(this); -- } -+ KCrash::initialize(); - } - - void MainWindow::updateUseTransparency() -@@ -889,7 +898,15 @@ - #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0) - KWindowEffects::enableBlurBehind(winId(), blur); - #else -- KWindowEffects::enableBlurBehind(windowHandle(), blur); -+ // Set the WA_NativeWindow attribute to force the creation of the QWindow. -+ // Without this QWidget::windowHandle() returns 0. -+ // See https://phabricator.kde.org/D23108 -+ setAttribute(Qt::WA_NativeWindow); -+ if (QWindow *window = windowHandle()) { -+ KWindowEffects::enableBlurBehind(window, blur); -+ } else { -+ qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled."; -+ } - #endif - } - } -@@ -935,9 +952,14 @@ - menuBar()->setVisible(_menuBarInitialVisibility); - _toggleMenuBarAction->setChecked(_menuBarInitialVisibility); - _menuBarInitialVisibilityApplied = true; -- if (!KonsoleSettings::saveGeometryOnExit()) { -- resize(sizeHint()); -- } -+ } -+ -+ if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) { -+ // Delay resizing to here, so that the other parts of the UI -+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc) -+ // have been created and TabbedViewContainer::sizeHint() returns -+ // a usuable size. -+ resize(sizeHint()); - } - - // Call parent method -@@ -971,13 +993,7 @@ - default: ; - } - } -- if (qobject_cast<QStatusBar*>(obj) != nullptr) { -- switch(event->type()) { -- case QEvent::Show: statusBar()->hide(); break; -- default: return true; -- } -- return true; -- } -+ - return KXmlGuiWindow::eventFilter(obj, event); - } - |