diff --git a/clipboardbackend.cpp b/clipboardbackend.cpp index 0897ea82b9d4ce975fdbfbb70a9577f7c78941f1..2bed83f8bfe2e60918ea592c0683b9297370aba9 100644 --- a/clipboardbackend.cpp +++ b/clipboardbackend.cpp @@ -22,6 +22,7 @@ // kysdk #include +#include ClipboardBackend::ClipboardBackend(QObject *parent) : QObject{parent} @@ -209,10 +210,13 @@ void ClipboardBackend::monitorShortCut() void ClipboardBackend::showContentMenu() { emit contentMenuVisibleChanged(true); - QWindowList m_windowList = qGuiApp->allWindows(); - foreach (QWindow *window, m_windowList) { - if (window->title() == "Function Menu Window"){ - kdk::WindowManager::self()->setOpenUnderCursor(window); + if (m_isWayland){ + QWindowList m_windowList = qGuiApp->allWindows(); + foreach (QWindow *window, m_windowList) { + if (window->title() == "Function Menu Window"){ + kdk::WindowManager::self()->setOpenUnderCursor(window); + UkuiShellManager::getInstance()->removeHeaderBar(window); + } } } } @@ -220,7 +224,14 @@ void ClipboardBackend::showContentMenu() void ClipboardBackend::showClipboardWindow() { emit clipboardWindowVisibleChanged(true); - + if (m_isWayland){ + QWindowList m_windowList = qGuiApp->allWindows(); + foreach (QWindow *window, m_windowList) { + if (window->title() == "Preview Window"){ + UkuiShellManager::getInstance()->removeHeaderBar(window); + } + } + } } void ClipboardBackend::pasteClicked() const diff --git a/ukui-clipboard_bo_CN.ts b/ukui-clipboard_bo_CN.ts index 92c80d2411038338a5cfa29a9de420ac4e17e897..78452a2038cc61f011f013c0fa340a2ca43ff429 100644 --- a/ukui-clipboard_bo_CN.ts +++ b/ukui-clipboard_bo_CN.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_de.ts b/ukui-clipboard_de.ts index 95153babea152edc3c8b8671eab6e95dc14ede02..ff8a7c20d95f5a1f6c1062e8dabf36294297ebd6 100644 --- a/ukui-clipboard_de.ts +++ b/ukui-clipboard_de.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_es.ts b/ukui-clipboard_es.ts index cbebf484c0e453b8fb7b624bce3e444438bc29a2..a630a252def46fbd937be26182af87b837b37ccf 100644 --- a/ukui-clipboard_es.ts +++ b/ukui-clipboard_es.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_fr.ts b/ukui-clipboard_fr.ts index 5f0e41dcbfd39f8d4509ea6c3e4bd3d7f288eaf7..321db3d1dc8fdf551cabe5843a72ccb1f52307fb 100644 --- a/ukui-clipboard_fr.ts +++ b/ukui-clipboard_fr.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_kk.ts b/ukui-clipboard_kk.ts index 4b9eec206c69140946d1c190a74160f174c4ebeb..73a39eb33637fd02bf286b6eed5d82061b507746 100644 --- a/ukui-clipboard_kk.ts +++ b/ukui-clipboard_kk.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_ky.ts b/ukui-clipboard_ky.ts index 22ced3d579d35fb57f08cda166dcd6b0b62c1b9a..d0ee63f3c858683ae79f4d5aa2920f1dec4d69c9 100644 --- a/ukui-clipboard_ky.ts +++ b/ukui-clipboard_ky.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_mn.ts b/ukui-clipboard_mn.ts index 1d6f6ab23d322386cff958417bafca7d35f70b8b..7444e8fad1a9aab5828dd6429616a60018fffae4 100644 --- a/ukui-clipboard_mn.ts +++ b/ukui-clipboard_mn.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_ug.ts b/ukui-clipboard_ug.ts index f50e4344dfb4781134e1caf4648d1824bcde9edc..adf41ee10026e8437efa5d8f2de85f1135f20c75 100644 --- a/ukui-clipboard_ug.ts +++ b/ukui-clipboard_ug.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/ukui-clipboard_zh_CN.ts b/ukui-clipboard_zh_CN.ts index 14f87d38861c35f5cc1d4a10d45fad046738d124..4c1fc724b048e3e322ad7b4ce3d6794e9191ee87 100644 --- a/ukui-clipboard_zh_CN.ts +++ b/ukui-clipboard_zh_CN.ts @@ -4,25 +4,25 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location 已成功复制，请到对应处粘贴 - - + + text recognition convert text 识别为文本 - - + + convert to picture 转为截图 - + convert to plaintext 转为纯文本 @@ -31,10 +31,10 @@ 原始粘贴 - - - - + + + + original paste 原始粘贴 diff --git a/ukui-clipboard_zh_Hant.ts b/ukui-clipboard_zh_Hant.ts index b6f0ae7eb4817829ef469e56f22d55c5955fd5a4..1dd4bb36b943b5b0f42e1b80464752ed5028bceb 100644 --- a/ukui-clipboard_zh_Hant.ts +++ b/ukui-clipboard_zh_Hant.ts @@ -4,33 +4,33 @@ ClipboardBackend - + Successfully copied, please paste at the corresponding location - - + + text recognition convert text - - + + convert to picture - + convert to plaintext - - - - + + + + original paste diff --git a/windowsettings.cpp b/windowsettings.cpp index e338a8a840e3e7802a60b788872bfbffc198b218..39171399a158ad0881d1e362056388cfb2aec1ca 100644 --- a/windowsettings.cpp +++ b/windowsettings.cpp @@ -58,9 +58,7 @@ void WindowSettings::removeTitleBar() return; } - if (m_isWayland) { - UKUIDecorationManager::getInstance()->removeHeaderBar(window); - } else { + if (!m_isWayland) { MotifWmHints hints; hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; hints.functions = MWM_FUNC_ALL;