[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:22:46 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0bbc5fd
The following commit has been merged in the master branch:
commit 0bbc5fd3ed19332b3d8d7a6ea3478555eeb49917
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Fri Sep 28 15:29:15 2012 +0100
Remove useless format toolbar
It has been unused for over a year
Reviwed-by: Martin Klapetek
---
lib/chat-widget.cpp | 40 ------------------------
lib/chat-widget.h | 1 -
lib/chat-widget.ui | 87 -----------------------------------------------------
3 files changed, 128 deletions(-)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index cb5dc79..f4aa86e 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -63,7 +63,6 @@ public:
/** Stores whether the channel is ready with all contacts upgraded*/
bool chatviewlInitialised;
Tp::ChannelChatState remoteContactChatState;
- QAction *showFormatToolbarAction;
bool isGroupChat;
QString title;
QString contactName;
@@ -103,25 +102,9 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
KGlobal::locale()->insertCatalog(QLatin1String("ktpchat"));
d->chatviewlInitialised = false;
- d->showFormatToolbarAction = new QAction(i18n("Show format options"), this);
d->isGroupChat = (channel->targetHandleType() == Tp::HandleTypeContact ? false : true);
d->ui.setupUi(this);
- d->ui.formatToolbar->show();
- d->ui.formatColor->setText(QString());
- d->ui.formatColor->setIcon(KIcon(QLatin1String("format-text-color")));
-
- d->ui.formatBold->setText(QString());
- d->ui.formatBold->setIcon(KIcon(QLatin1String("format-text-bold")));
-
- d->ui.formatItalic->setText(QString());
- d->ui.formatItalic->setIcon(KIcon(QLatin1String("format-text-italic")));
-
- d->ui.formatUnderline->setText(QString());
- d->ui.formatUnderline->setIcon(KIcon(QLatin1String("format-text-underline")));
-
- d->ui.insertEmoticon->setText(QString());
- d->ui.insertEmoticon->setIcon(KIcon(QLatin1String("face-smile")));
// connect channel signals
setupChannelSignals();
@@ -173,27 +156,11 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
//set the title of this chat.
d->title = info.chatName();
- //format toolbar visibility
- d->showFormatToolbarAction->setCheckable(true);
- connect(d->showFormatToolbarAction, SIGNAL(toggled(bool)),
- d->ui.formatToolbar, SLOT(setVisible(bool)));
- d->ui.sendMessageBox->addAction(d->showFormatToolbarAction);
-
- //FIXME load whether to show/hide by default from config file (do per account)
- bool formatToolbarIsVisible = false;
- d->ui.formatToolbar->setVisible(formatToolbarIsVisible);
- d->showFormatToolbarAction->setChecked(formatToolbarIsVisible);
loadSpellCheckingOption();
d->pausedStateTimer = new QTimer(this);
d->pausedStateTimer->setSingleShot(true);
- //connect signals/slots from format toolbar
- connect(d->ui.formatColor, SIGNAL(released()), SLOT(onFormatColorReleased()));
- connect(d->ui.formatBold, SIGNAL(toggled(bool)), d->ui.sendMessageBox, SLOT(setFontBold(bool)));
- connect(d->ui.formatItalic, SIGNAL(toggled(bool)), d->ui.sendMessageBox, SLOT(setFontItalic(bool)));
- connect(d->ui.formatUnderline, SIGNAL(toggled(bool)), d->ui.sendMessageBox, SLOT(setFontUnderline(bool)));
-
// make the sendMessageBox a focus proxy for the chatview
d->ui.chatArea->setFocusProxy(d->ui.sendMessageBox);
connect(d->ui.sendMessageBox, SIGNAL(returnKeyPressed()), SLOT(sendMessage()));
@@ -1016,13 +983,6 @@ void ChatWidget::findPreviousTextInChat(const QString& text, QWebPage::FindFlags
d->ui.chatArea->findText(text, flags);
}
-void ChatWidget::onFormatColorReleased()
-{
- QColor color;
- KColorDialog::getColor(color,this);
- d->ui.sendMessageBox->setTextColor(color);
-}
-
void ChatWidget::setSpellDictionary(const QString &dict)
{
d->ui.sendMessageBox->setSpellCheckingLanguage(dict);
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 2370e31..30a24e0 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -166,7 +166,6 @@ private Q_SLOTS:
void findTextInChat(const QString &text, QWebPage::FindFlags flags);
void findNextTextInChat(const QString &text, QWebPage::FindFlags flags);
void findPreviousTextInChat(const QString &text, QWebPage::FindFlags flags);
- void onFormatColorReleased();
void onHistoryFetched(const QList<AdiumThemeContentInfo> &messages);
void onChatPausedTimerExpired();
void currentPresenceChanged(const Tp::Presence &presence);
diff --git a/lib/chat-widget.ui b/lib/chat-widget.ui
index cf6128f..0985f9c 100644
--- a/lib/chat-widget.ui
+++ b/lib/chat-widget.ui
@@ -37,93 +37,6 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="formatToolbar" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
- </property>
- <property name="topMargin">
- <number>4</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="formatColor">
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string notr="true">Colour</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="formatBold">
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string notr="true">B</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="formatItalic">
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string notr="true">I</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="formatUnderline">
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string notr="true">U</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="insertEmoticon">
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string notr="true">:-)</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<widget class="ChatSearchBar" name="searchBar" native="true"/>
</item>
<item>
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list