mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Added a new base class RSTextEdit with placeholder for Qt < 5.2
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e5f0e6fcc7
commit
6c3a6f161f
@ -492,6 +492,9 @@ border-image: url(:/images/closepressed.png)
|
|||||||
<height>30</height>
|
<height>30</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="placeholderText">
|
||||||
|
<string>Type a message here</string>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include <retroshare/rspeers.h>
|
#include <retroshare/rspeers.h>
|
||||||
|
|
||||||
MimeTextEdit::MimeTextEdit(QWidget *parent)
|
MimeTextEdit::MimeTextEdit(QWidget *parent)
|
||||||
: QTextEdit(parent), mCompleter(0)
|
: RSTextEdit(parent), mCompleter(0)
|
||||||
{
|
{
|
||||||
mCompleterKeyModifiers = Qt::ControlModifier;
|
mCompleterKeyModifiers = Qt::ControlModifier;
|
||||||
mCompleterKey = Qt::Key_Space;
|
mCompleterKey = Qt::Key_Space;
|
||||||
@ -52,7 +52,7 @@ bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return QTextEdit::canInsertFromMimeData(source);
|
return RSTextEdit::canInsertFromMimeData(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MimeTextEdit::insertFromMimeData(const QMimeData* source)
|
void MimeTextEdit::insertFromMimeData(const QMimeData* source)
|
||||||
@ -75,7 +75,7 @@ void MimeTextEdit::insertFromMimeData(const QMimeData* source)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return QTextEdit::insertFromMimeData(source);
|
return RSTextEdit::insertFromMimeData(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MimeTextEdit::setCompleter(QCompleter *completer)
|
void MimeTextEdit::setCompleter(QCompleter *completer)
|
||||||
@ -126,7 +126,7 @@ void MimeTextEdit::focusInEvent(QFocusEvent *e)
|
|||||||
if (mCompleter)
|
if (mCompleter)
|
||||||
mCompleter->setWidget(this);
|
mCompleter->setWidget(this);
|
||||||
|
|
||||||
QTextEdit::focusInEvent(e);
|
RSTextEdit::focusInEvent(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MimeTextEdit::keyPressEvent(QKeyEvent *e)
|
void MimeTextEdit::keyPressEvent(QKeyEvent *e)
|
||||||
@ -154,7 +154,7 @@ void MimeTextEdit::keyPressEvent(QKeyEvent *e)
|
|||||||
}
|
}
|
||||||
isShortcut |= mForceCompleterShowNextKeyEvent;
|
isShortcut |= mForceCompleterShowNextKeyEvent;
|
||||||
if (!mCompleter || !isShortcut) // do not process the shortcut when we have a completer
|
if (!mCompleter || !isShortcut) // do not process the shortcut when we have a completer
|
||||||
QTextEdit::keyPressEvent(e);
|
RSTextEdit::keyPressEvent(e);
|
||||||
|
|
||||||
if (!mCompleter) return; //Nothing else to do if not mCompleter initialized
|
if (!mCompleter) return; //Nothing else to do if not mCompleter initialized
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ void MimeTextEdit::keyPressEvent(QKeyEvent *e)
|
|||||||
mCompleter->complete(cr); // popup it up!
|
mCompleter->complete(cr); // popup it up!
|
||||||
|
|
||||||
if (mCompleter->completionCount()==0 && isShortcut){
|
if (mCompleter->completionCount()==0 && isShortcut){
|
||||||
QTextEdit::keyPressEvent(e);// Process the key if no match
|
RSTextEdit::keyPressEvent(e);// Process the key if no match
|
||||||
}
|
}
|
||||||
mForceCompleterShowNextKeyEvent = false;
|
mForceCompleterShowNextKeyEvent = false;
|
||||||
}
|
}
|
||||||
|
@ -22,10 +22,10 @@
|
|||||||
#ifndef MIMETEXTEDIT_H
|
#ifndef MIMETEXTEDIT_H
|
||||||
#define MIMETEXTEDIT_H
|
#define MIMETEXTEDIT_H
|
||||||
|
|
||||||
#include <QTextEdit>
|
|
||||||
#include <QCompleter>
|
#include <QCompleter>
|
||||||
|
#include "RSTextEdit.h"
|
||||||
|
|
||||||
class MimeTextEdit : public QTextEdit
|
class MimeTextEdit : public RSTextEdit
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
57
retroshare-gui/src/gui/common/RSTextEdit.cpp
Normal file
57
retroshare-gui/src/gui/common/RSTextEdit.cpp
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/****************************************************************
|
||||||
|
*
|
||||||
|
* RetroShare is distributed under the following license:
|
||||||
|
*
|
||||||
|
* Copyright (C) 2014, RetroShare Team
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
* Boston, MA 02110-1301, USA.
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
#include <QPainter>
|
||||||
|
|
||||||
|
#include "RSTextEdit.h"
|
||||||
|
|
||||||
|
RSTextEdit::RSTextEdit(QWidget *parent)
|
||||||
|
: QTextEdit(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#if QT_VERSION < 0x050200
|
||||||
|
void RSTextEdit::setPlaceholderText(const QString &text)
|
||||||
|
{
|
||||||
|
mPlaceholderText = text;
|
||||||
|
viewport()->repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
void RSTextEdit::paintEvent(QPaintEvent *event)
|
||||||
|
{
|
||||||
|
QTextEdit::paintEvent(event);
|
||||||
|
|
||||||
|
if (!mPlaceholderText.isEmpty() && document()->isEmpty()) {
|
||||||
|
QWidget *vieportWidget = viewport();
|
||||||
|
QPainter painter(vieportWidget);
|
||||||
|
|
||||||
|
QPen pen = painter.pen();
|
||||||
|
QColor color = pen.color();
|
||||||
|
color.setAlpha(128);
|
||||||
|
pen.setColor(color);
|
||||||
|
painter.setPen(pen);
|
||||||
|
|
||||||
|
const int margin = int(document()->documentMargin());
|
||||||
|
painter.drawText(viewport()->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, mPlaceholderText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
50
retroshare-gui/src/gui/common/RSTextEdit.h
Normal file
50
retroshare-gui/src/gui/common/RSTextEdit.h
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/****************************************************************
|
||||||
|
*
|
||||||
|
* RetroShare is distributed under the following license:
|
||||||
|
*
|
||||||
|
* Copyright (C) 2014, RetroShare Team
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
* Boston, MA 02110-1301, USA.
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
#ifndef RSTEXTEDIT_H
|
||||||
|
#define RSTEXTEDIT_H
|
||||||
|
|
||||||
|
#include <QTextEdit>
|
||||||
|
|
||||||
|
class RSTextEdit : public QTextEdit
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
RSTextEdit(QWidget *parent = 0);
|
||||||
|
|
||||||
|
#if QT_VERSION < 0x050200
|
||||||
|
void setPlaceholderText(const QString &text);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
protected:
|
||||||
|
#if QT_VERSION < 0x050200
|
||||||
|
virtual void paintEvent(QPaintEvent *event);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private:
|
||||||
|
#if QT_VERSION < 0x050200
|
||||||
|
QString mPlaceholderText;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // RSTEXTEDIT_H
|
@ -1497,6 +1497,10 @@ Double click lobbies to enter and chat.</source>
|
|||||||
<source>Search Box</source>
|
<source>Search Box</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Type a message here</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>CircleWidget</name>
|
<name>CircleWidget</name>
|
||||||
|
@ -450,6 +450,7 @@ HEADERS += rshare.h \
|
|||||||
gui/common/GroupDefs.h \
|
gui/common/GroupDefs.h \
|
||||||
gui/common/Emoticons.h \
|
gui/common/Emoticons.h \
|
||||||
gui/common/RSListWidgetItem.h \
|
gui/common/RSListWidgetItem.h \
|
||||||
|
gui/common/RSTextEdit.h \
|
||||||
gui/common/RSPlainTextEdit.h \
|
gui/common/RSPlainTextEdit.h \
|
||||||
gui/common/RSTreeWidget.h \
|
gui/common/RSTreeWidget.h \
|
||||||
gui/common/RSTreeWidgetItem.h \
|
gui/common/RSTreeWidgetItem.h \
|
||||||
@ -749,6 +750,7 @@ SOURCES += main.cpp \
|
|||||||
gui/common/GroupDefs.cpp \
|
gui/common/GroupDefs.cpp \
|
||||||
gui/common/Emoticons.cpp \
|
gui/common/Emoticons.cpp \
|
||||||
gui/common/RSListWidgetItem.cpp \
|
gui/common/RSListWidgetItem.cpp \
|
||||||
|
gui/common/RSTextEdit.cpp \
|
||||||
gui/common/RSPlainTextEdit.cpp \
|
gui/common/RSPlainTextEdit.cpp \
|
||||||
gui/common/RSTreeWidget.cpp \
|
gui/common/RSTreeWidget.cpp \
|
||||||
gui/common/RSTreeWidgetItem.cpp \
|
gui/common/RSTreeWidgetItem.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user