kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Element editor: keyboard shortcuts work again.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2031 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2013-02-09 19:07:08 +00:00
parent 47f9c5ebe6
commit af3e9c7c04
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/editor/elementview.cpp
View File

@@ -74,21 +74,6 @@ void ElementView::setScene(ElementScene *s) {
scene_ = s; scene_ = s;
} }
/**
Gere les evenements envoyes a la vue.
Methode reimplentee pour gerer le conflit de raccourcis avec Suppr
(supprimer une partie ou supprimer le caractere suivant)
@param e evenement a gerer
*/
bool ElementView::event(QEvent *e) {
if (e -> type() == QEvent::ShortcutOverride && scene_ -> focusItem()) {
e -> accept();
return(true);
}
return(QGraphicsView::event(e));
}
/** /**
Agrandit le schema (+33% = inverse des -25 % de zoomMoins()) Agrandit le schema (+33% = inverse des -25 % de zoomMoins())
*/ */

1
sources/editor/elementview.h
View File

@@ -42,7 +42,6 @@ class ElementView : public QGraphicsView {
QRectF viewedSceneRect() const; QRectF viewedSceneRect() const;
protected: protected:
bool event(QEvent *);
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *);
void wheelEvent(QWheelEvent *); void wheelEvent(QWheelEvent *);
virtual void drawBackground(QPainter *, const QRectF &); virtual void drawBackground(QPainter *, const QRectF &);

3
sources/editor/parttext.cpp
View File

@@ -541,6 +541,9 @@ void PartText::endEdition() {
setTextCursor(qtc); setTextCursor(qtc);
setEditable(false); setEditable(false);
if (decorator_) {
decorator_ -> setFocus();
}
} }
#ifdef QET_DEBUG_EDITOR_TEXTS #ifdef QET_DEBUG_EDITOR_TEXTS

3
sources/editor/parttextfield.cpp
View File

@@ -520,6 +520,9 @@ void PartTextField::endEdition() {
setTextCursor(qtc); setTextCursor(qtc);
setEditable(false); setEditable(false);
if (decorator_) {
decorator_ -> setFocus();
}
} }
#ifdef QET_DEBUG_EDITOR_TEXTS #ifdef QET_DEBUG_EDITOR_TEXTS