[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=04b9a86
The following commit has been merged in the master branch:
commit 04b9a8649bf3c83ff4a5f10fe9bb3afde25b96f5
Author: David Rosca <nowrep at gmail.com>
Date: Wed Sep 16 15:49:07 2015 +0200
Add option to disable keyboard layout switching
Remembering keyboard layout per tab can now be disabled in settings.
It is disabled by default now, because it breaks "per-app layout
switching" of kcm_keyboard and also is a feature that may be confusing
for users.
REVIEW: 125242
---
app/chat-window.cpp | 2 +-
config/behavior/behavior-config.cpp | 11 +++++++++++
config/behavior/behavior-config.h | 2 ++
config/behavior/behavior-config.ui | 24 ++++++++++++++++++++----
lib/text-chat-config.cpp | 17 +++++++++++++++++
lib/text-chat-config.h | 3 +++
6 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index de07445..fdde18d 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -1221,7 +1221,7 @@ void ChatWindow::offerDocumentToChatroom(const Tp::AccountPtr& account, const QS
void ChatWindow::restoreKeyboardLayout(ChatTab *chatTab)
{
- if (!chatTab) {
+ if (!chatTab || !TextChatConfig::instance()->rememberTabKeyboardLayout()) {
return;
}
diff --git a/config/behavior/behavior-config.cpp b/config/behavior/behavior-config.cpp
index c02863f..bbbe79f 100644
--- a/config/behavior/behavior-config.cpp
+++ b/config/behavior/behavior-config.cpp
@@ -60,6 +60,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList& args)
ui->dontLeaveGroupChats->setChecked(m_dontLeaveGroupChats);
connect(ui->dontLeaveGroupChats, SIGNAL(toggled(bool)), this, SLOT(onDontLeaveGroupChatsChanged(bool)));
+ ui->rememberTabKeyboardLayout->setChecked(m_rememberTabKeyboardLayout);
+ connect(ui->rememberTabKeyboardLayout, SIGNAL(toggled(bool)), this, SLOT(onRememberTabKeyboardLayoutChanged(bool)));
+
QStringList nicknameCompletionStyles;
const QString namePlaceholder = ki18nc("Placeholder for contact name in completion suffix selector", "Nickname").toString();
Q_FOREACH(const QString &suffix, BehaviorConfig::nicknameCompletionSuffixes) {
@@ -96,6 +99,7 @@ void BehaviorConfig::load()
m_nicknameCompletionSuffix = TextChatConfig::instance()->nicknameCompletionSuffix();
m_imageShareServiceType = TextChatConfig::instance()->imageShareServiceType();
m_dontLeaveGroupChats = TextChatConfig::instance()->dontLeaveGroupChats();
+ m_rememberTabKeyboardLayout = TextChatConfig::instance()->rememberTabKeyboardLayout();
}
void BehaviorConfig::save()
@@ -107,6 +111,7 @@ void BehaviorConfig::save()
TextChatConfig::instance()->setNicknameCompletionSuffix(m_nicknameCompletionSuffix);
TextChatConfig::instance()->setImageShareServiceName(m_imageShareServiceType);
TextChatConfig::instance()->setDontLeaveGroupChats(m_dontLeaveGroupChats);
+ TextChatConfig::instance()->setRememberTabKeyboardLayout(m_rememberTabKeyboardLayout);
TextChatConfig::instance()->sync();
}
@@ -167,4 +172,10 @@ void BehaviorConfig::onDontLeaveGroupChatsChanged(bool state)
Q_EMIT changed(true);
}
+void BehaviorConfig::onRememberTabKeyboardLayoutChanged(bool state)
+{
+ m_rememberTabKeyboardLayout = state;
+ Q_EMIT changed(true);
+}
+
#include "behavior-config.moc"
diff --git a/config/behavior/behavior-config.h b/config/behavior/behavior-config.h
index 389d3c8..0e7e815 100644
--- a/config/behavior/behavior-config.h
+++ b/config/behavior/behavior-config.h
@@ -53,6 +53,7 @@ private Q_SLOTS:
void onNicknameCompletionStyleChanged(int index);
void onImageSharingServiceChanged(int index);
void onDontLeaveGroupChatsChanged(bool state);
+ void onRememberTabKeyboardLayoutChanged(bool state);
private:
TextChatConfig::TabOpenMode m_openMode;
@@ -60,6 +61,7 @@ private:
bool m_showMeTyping; // show others I am typing
bool m_showOthersTyping; // show me others are typing
bool m_dontLeaveGroupChats;
+ bool m_rememberTabKeyboardLayout;
QString m_nicknameCompletionSuffix;
ShareProvider::ShareService m_imageShareServiceType;
Ui::BehaviorConfigUi *ui;
diff --git a/config/behavior/behavior-config.ui b/config/behavior/behavior-config.ui
index 44c0aa6..4780b45 100644
--- a/config/behavior/behavior-config.ui
+++ b/config/behavior/behavior-config.ui
@@ -7,12 +7,12 @@
<x>0</x>
<y>0</y>
<width>583</width>
- <height>403</height>
+ <height>585</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="newTabGroupBox">
+ <widget class="QGroupBox" name="newTabGroupBox">
<property name="title">
<string>Tabs</string>
</property>
@@ -45,7 +45,7 @@
</widget>
</item>
</layout>
- </widget>
+ </widget>
</item>
<item>
<widget class="QGroupBox" name="scrollbackGroupBox">
@@ -80,7 +80,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="typingGroupBox">
+ <widget class="QGroupBox" name="typingGroupBox">
<property name="title">
<string>User Is Typing</string>
</property>
@@ -212,6 +212,22 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Keyboard Layouts</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="rememberTabKeyboardLayout">
+ <property name="text">
+ <string>Remember keyboard layout for each tab</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/lib/text-chat-config.cpp b/lib/text-chat-config.cpp
index 5cf5f6e..c9fc370 100644
--- a/lib/text-chat-config.cpp
+++ b/lib/text-chat-config.cpp
@@ -38,6 +38,7 @@ public:
bool m_showMeTyping;
bool m_showOthersTyping;
bool m_dontLeaveGroupChats;
+ bool m_rememberTabKeyboardLayout;
QString m_nicknameCompletionSuffix;
ShareProvider::ShareService m_imageShareServiceType;
};
@@ -90,6 +91,8 @@ void TextChatConfig::sync()
behaviorConfig.writeEntry("dontLeaveGroupChats", d->m_dontLeaveGroupChats);
+ behaviorConfig.writeEntry("rememberTabKeyboardLayout", d->m_rememberTabKeyboardLayout);
+
behaviorConfig.sync();
mutex.unlock();
@@ -211,6 +214,18 @@ void TextChatConfig::setDontLeaveGroupChats(bool dontLeaveGroupChats)
mutex.unlock();
}
+bool TextChatConfig::rememberTabKeyboardLayout() const
+{
+ return d->m_rememberTabKeyboardLayout;
+}
+
+void TextChatConfig::setRememberTabKeyboardLayout(bool change)
+{
+ mutex.lock();
+ d->m_rememberTabKeyboardLayout = change;
+ mutex.unlock();
+}
+
TextChatConfig::TextChatConfig() :
d(new TextChatConfigPrivate())
{
@@ -237,6 +252,8 @@ TextChatConfig::TextChatConfig() :
d->m_dontLeaveGroupChats = behaviorConfig.readEntry("dontLeaveGroupChats", false);
+ d->m_rememberTabKeyboardLayout = behaviorConfig.readEntry("rememberTabKeyboardLayout", false);
+
// Imgur is the default image sharing service
int shareServiceType = behaviorConfig.readEntry("imageShareServiceType", static_cast<int>(ShareProvider::Imgur));
d->m_imageShareServiceType = static_cast<ShareProvider::ShareService>(shareServiceType);
diff --git a/lib/text-chat-config.h b/lib/text-chat-config.h
index a02dee6..2741c00 100644
--- a/lib/text-chat-config.h
+++ b/lib/text-chat-config.h
@@ -67,6 +67,9 @@ class KDE_TELEPATHY_CHAT_EXPORT TextChatConfig : QObject
bool dontLeaveGroupChats() const;
void setDontLeaveGroupChats(bool dontLeaveGroupChats);
+ bool rememberTabKeyboardLayout() const;
+ void setRememberTabKeyboardLayout(bool change);
+
private:
TextChatConfig();
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list