From 937f7327829f9df867597ffae4ed6e1e11bc0117 Mon Sep 17 00:00:00 2001 From: xavierqet Date: Thu, 1 Nov 2007 23:56:19 +0000 Subject: [PATCH] La couleur des textes est desormais forcee a etre noire Utilisation de boutons radios dans le menu Fenetres git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@201 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- diagramtextitem.cpp | 2 ++ editor/parttext.cpp | 1 + editor/parttextfield.cpp | 1 + qetdiagrameditor.cpp | 2 ++ 4 files changed, 6 insertions(+) diff --git a/diagramtextitem.cpp b/diagramtextitem.cpp index 3652747cb..838d740cc 100644 --- a/diagramtextitem.cpp +++ b/diagramtextitem.cpp @@ -9,6 +9,7 @@ DiagramTextItem::DiagramTextItem(QGraphicsItem *parent, QGraphicsScene *scene) : QGraphicsTextItem(parent, scene) { + setDefaultTextColor(Qt::black); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable); connect(this, SIGNAL(lostFocus()), this, SLOT(setNonFocusable())); } @@ -23,6 +24,7 @@ DiagramTextItem::DiagramTextItem(const QString &text, QGraphicsItem *parent, QGr QGraphicsTextItem(text, parent, scene), previous_text(text) { + setDefaultTextColor(Qt::black); setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable); connect(this, SIGNAL(lostFocus()), this, SLOT(setNonFocusable())); } diff --git a/editor/parttext.cpp b/editor/parttext.cpp index 94306a123..f33770dca 100644 --- a/editor/parttext.cpp +++ b/editor/parttext.cpp @@ -5,6 +5,7 @@ PartText::PartText(QETElementEditor *editor, QGraphicsItem *parent, ElementScene QGraphicsTextItem(parent, scene), CustomElementPart(editor) { + setDefaultTextColor(Qt::black); setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); setPlainText(QObject::tr("T")); infos = new TextEditor(elementEditor(), this); diff --git a/editor/parttextfield.cpp b/editor/parttextfield.cpp index 842746325..918d38d85 100644 --- a/editor/parttextfield.cpp +++ b/editor/parttextfield.cpp @@ -7,6 +7,7 @@ PartTextField::PartTextField(QETElementEditor *editor, QGraphicsItem *parent, QG CustomElementPart(editor), follow_parent_rotations(true) { + setDefaultTextColor(Qt::black); setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); setPlainText(QObject::tr("_")); infos = new TextFieldEditor(elementEditor(), this); diff --git a/qetdiagrameditor.cpp b/qetdiagrameditor.cpp index f53326a88..6efe1ad9d 100644 --- a/qetdiagrameditor.cpp +++ b/qetdiagrameditor.cpp @@ -841,11 +841,13 @@ void QETDiagramEditor::slot_updateWindowsMenu() { prev_window -> setEnabled(windows.count() > 1); if (!windows.isEmpty()) windows_menu -> addSeparator(); + QActionGroup *windows_actions = new QActionGroup(this); for (int i = 0 ; i < windows.size() ; ++ i) { DiagramView *dv = qobject_cast(windows.at(i)); if (!dv) continue; QString dv_title = dv -> windowTitle().left(dv -> windowTitle().length() - 3); QAction *action = windows_menu -> addAction(dv_title); + windows_actions -> addAction(action); action -> setStatusTip(tr("Active la fen\352tre ") + dv_title); action -> setCheckable(true); action -> setChecked(dv == currentDiagram());