commit: 4c6c1aae4d4c8bf1229cfc0a056c84d7195b7f9c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 21:22:08 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 21:22:08 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4c6c1aae
kde-misc/yakuake: Import latest slot 4 from gentoo main tree
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../yakuake/files/yakuake-2.9.9-lastsession.patch | 213 +++++++++++++++++++++
kde-misc/yakuake/metadata.xml | 17 +-
kde-misc/yakuake/yakuake-2.9.9-r3.ebuild | 31 +++
3 files changed, 251 insertions(+), 10 deletions(-)
diff --git a/kde-misc/yakuake/files/yakuake-2.9.9-lastsession.patch
b/kde-misc/yakuake/files/yakuake-2.9.9-lastsession.patch
new file mode 100644
index 0000000..e9e33a9
--- /dev/null
+++ b/kde-misc/yakuake/files/yakuake-2.9.9-lastsession.patch
@@ -0,0 +1,213 @@
+From 4655fb0affb4753eade7d6c92bb699e9d7dd3fb5 Mon Sep 17 00:00:00 2001
+From: Eike Hein <h...@kde.org>
+Date: Mon, 5 Nov 2012 23:06:26 +0100
+Subject: [PATCH] Add an option for keeping the window open after the last
+ session closes.
+
+BUG:308850
+---
+ app/config/behaviorsettings.ui | 107 ++++++++++++++++++++++++-----------------
+ app/config/yakuake.kcfg | 5 ++
+ app/mainwindow.cpp | 2 +-
+ 3 files changed, 68 insertions(+), 46 deletions(-)
+
+diff --git a/app/config/behaviorsettings.ui b/app/config/behaviorsettings.ui
+index 2fce1c7..3759f7b 100644
+--- a/app/config/behaviorsettings.ui
++++ b/app/config/behaviorsettings.ui
+@@ -6,8 +6,8 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>364</width>
+- <height>308</height>
++ <width>356</width>
++ <height>289</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+@@ -20,31 +20,49 @@
+ <string comment="@title:group Group box label">General</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+- <item row="0" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_OpenAfterStart">
++ <item row="6" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_FocusFollowsMouse">
+ <property name="text">
+- <string comment="@option:check">Open window after program
start</string>
++ <string comment="@option:check">Focus terminals when the mouse
pointer is moved over them</string>
+ </property>
+ </widget>
+ </item>
+- <item row="1" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_PollMouse">
++ <item row="4" column="1">
++ <widget class="QCheckBox" name="kcfg_ToggleToFocus">
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="sizePolicy">
++ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
+ <property name="whatsThis">
+- <string comment="@info:whatsthis">If this option is enabled, the
window will automatically open when the mouse pointer is moved to the same edge
of the screen that it would open on when using the shortcut.</string>
++ <string comment="@info:whatsthis">If this option is enabled, the
shortcut normally used to open and retract the window will give it focus,
rather than close it, if it has previously lost focus. Unless the window is set
to show on all virtual desktops, this may cause the window manager to switch to
the virtual desktop it currently resides on.</string>
+ </property>
+ <property name="text">
+- <string comment="@option:check">Open window when the mouse pointer
touches the screen edge</string>
++ <string comment="@option:check">Use Open/Retract action to focus
window</string>
+ </property>
+ </widget>
+ </item>
+- <item row="2" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_KeepOpen">
++ <item row="3" column="1">
++ <widget class="QCheckBox" name="kcfg_KeepAbove">
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="sizePolicy">
++ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
+ <property name="text">
+- <string comment="@option:check">Keep window open when it loses
focus</string>
++ <string comment="@option:check">Keep window above other
windows</string>
+ </property>
+ </widget>
+ </item>
+- <item row="3" column="0">
++ <item row="4" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+@@ -60,23 +78,31 @@
+ </property>
+ </spacer>
+ </item>
+- <item row="3" column="1">
+- <widget class="QCheckBox" name="kcfg_KeepAbove">
+- <property name="enabled">
+- <bool>false</bool>
++ <item row="0" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_OpenAfterStart">
++ <property name="text">
++ <string comment="@option:check">Open window after program
start</string>
+ </property>
+- <property name="sizePolicy">
+- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+- <horstretch>0</horstretch>
+- <verstretch>0</verstretch>
+- </sizepolicy>
++ </widget>
++ </item>
++ <item row="1" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_PollMouse">
++ <property name="whatsThis">
++ <string comment="@info:whatsthis">If this option is enabled, the
window will automatically open when the mouse pointer is moved to the same edge
of the screen that it would open on when using the shortcut.</string>
+ </property>
+ <property name="text">
+- <string comment="@option:check">Keep window above other
windows</string>
++ <string comment="@option:check">Open window when the mouse pointer
touches the screen edge</string>
+ </property>
+ </widget>
+ </item>
+- <item row="4" column="0">
++ <item row="2" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_KeepOpen">
++ <property name="text">
++ <string comment="@option:check">Keep window open when it loses
focus</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+@@ -92,29 +118,10 @@
+ </property>
+ </spacer>
+ </item>
+- <item row="4" column="1">
+- <widget class="QCheckBox" name="kcfg_ToggleToFocus">
+- <property name="enabled">
+- <bool>false</bool>
+- </property>
+- <property name="sizePolicy">
+- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+- <horstretch>0</horstretch>
+- <verstretch>0</verstretch>
+- </sizepolicy>
+- </property>
+- <property name="whatsThis">
+- <string comment="@info:whatsthis">If this option is enabled, the
shortcut normally used to open and retract the window will give it focus,
rather than close it, if it has previously lost focus. Unless the window is set
to show on all virtual desktops, this may cause the window manager to switch to
the virtual desktop it currently resides on.</string>
+- </property>
+- <property name="text">
+- <string comment="@option:check">Use Open/Retract action to focus
window</string>
+- </property>
+- </widget>
+- </item>
+ <item row="5" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_FocusFollowsMouse">
++ <widget class="QCheckBox" name="kcfg_KeepOpenAfterLastSessionCloses">
+ <property name="text">
+- <string comment="@option:check">Focus terminals when the mouse
pointer is moved over them</string>
++ <string extracomment="@option:check">Keep window open after the last
session is closed</string>
+ </property>
+ </widget>
+ </item>
+@@ -152,6 +159,16 @@
+ </item>
+ </layout>
+ </widget>
++ <tabstops>
++ <tabstop>kcfg_OpenAfterStart</tabstop>
++ <tabstop>kcfg_PollMouse</tabstop>
++ <tabstop>kcfg_KeepOpen</tabstop>
++ <tabstop>kcfg_KeepAbove</tabstop>
++ <tabstop>kcfg_ToggleToFocus</tabstop>
++ <tabstop>kcg_KeepOpenAfterLastSessionCloses</tabstop>
++ <tabstop>kcfg_FocusFollowsMouse</tabstop>
++ <tabstop>kcfg_ConfirmQuit</tabstop>
++ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+diff --git a/app/config/yakuake.kcfg b/app/config/yakuake.kcfg
+index e70418b..a71e9b3 100644
+--- a/app/config/yakuake.kcfg
++++ b/app/config/yakuake.kcfg
+@@ -41,6 +41,11 @@
+ <whatsthis context="@info:whatsthis">Whether to keep the application
window open when it loses focus.</whatsthis>
+ <default>true</default>
+ </entry>
++ <entry name="KeepOpenAfterLastSessionCloses" type="Bool">
++ <label context="@label">Keep window open after last session
closes</label>
++ <whatsthis context="@info:whatsthis">Whether to keep the application
window open after the last session is closed.</whatsthis>
++ <default>false</default>
++ </entry>
+ <entry name="ToggleToFocus" type="Bool">
+ <label context="@label">Use open/retract shortcut to focus
window</label>
+ <whatsthis context="@info:whatsthis">Whether the open/retract keyboard
shortcut can be used to focus the application window when it is already
open.</whatsthis>
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 3f51911..22b374d 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -538,7 +538,7 @@ void MainWindow::handleTerminalSilence(Terminal* terminal)
+
+ void MainWindow::handleLastTabClosed()
+ {
+- if (isVisible())
++ if (isVisible() && !Settings::keepOpenAfterLastSessionCloses())
+ toggleWindowState();
+ }
+
+--
+1.8.1.5
+
diff --git a/kde-misc/yakuake/metadata.xml b/kde-misc/yakuake/metadata.xml
index 8b6a585..b8a1e36 100644
--- a/kde-misc/yakuake/metadata.xml
+++ b/kde-misc/yakuake/metadata.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <!-- maintainer-needed -->
- <maintainer>
- <email>cr...@gentoo.org</email>
- </maintainer>
- <longdescription>
- YaKuake is Yet Another Kuake KDE terminal emulator. It drops down no a
- configurable key press (defaults to F12) with a konsole window, supports
- multiple tabs, multiple screens and mouse wheel tab navigation amongst
other
- features.
- </longdescription>
+ <!-- maintainer-needed -->
+ <longdescription>
+ YaKuake is Yet Another Kuake KDE terminal emulator. It drops
down no a
+ configurable key press (defaults to F12) with a konsole window,
supports
+ multiple tabs, multiple screens and mouse wheel tab navigation
amongst other
+ features.
+ </longdescription>
</pkgmetadata>
diff --git a/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
new file mode 100644
index 0000000..3e635f5
--- /dev/null
+++ b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia cs da de el en_GB es et fi fr ga gl hr hu it km ko
+nb nds nl nn pa pl pt pt_BR ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv th tr uk wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
+HOMEPAGE="https://yakuake.kde.org/";
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+ || ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+DOCS=( AUTHORS ChangeLog KDE4FAQ NEWS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-lastsession.patch" )
