[QGIS Commit] r8635 - in branches/advanced_printing_branch:
images/themes/default src/app src/app/composer src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Jun 10 04:28:49 EDT 2008
Author: mhugent
Date: 2008-06-10 04:28:48 -0400 (Tue, 10 Jun 2008)
New Revision: 8635
Added:
branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.h
branches/advanced_printing_branch/src/ui/qgscomposerlabelwidgetbase.ui
Removed:
branches/advanced_printing_branch/src/ui/qgscomposerlabelbase.ui
Modified:
branches/advanced_printing_branch/images/themes/default/mActionGroupItems.png
branches/advanced_printing_branch/images/themes/default/mActionUngroupItems.png
branches/advanced_printing_branch/src/app/CMakeLists.txt
branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
branches/advanced_printing_branch/src/app/composer/qgscomposeritemgroup.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.h
branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp
branches/advanced_printing_branch/src/app/composer/qgscomposition.cpp
branches/advanced_printing_branch/src/ui/CMakeLists.txt
Log:
Separated composer label into item and widget. Font scaling does not work correct at the moment
Modified: branches/advanced_printing_branch/images/themes/default/mActionGroupItems.png
===================================================================
(Binary files differ)
Modified: branches/advanced_printing_branch/images/themes/default/mActionUngroupItems.png
===================================================================
(Binary files differ)
Modified: branches/advanced_printing_branch/src/app/CMakeLists.txt
===================================================================
--- branches/advanced_printing_branch/src/app/CMakeLists.txt 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/CMakeLists.txt 2008-06-10 08:28:48 UTC (rev 8635)
@@ -59,6 +59,7 @@
composer/qgscomposeritem.cpp
composer/qgscomposeritemgroup.cpp
composer/qgscomposerlabel.cpp
+ composer/qgscomposerlabelwidget.cpp
composer/qgscomposerpicture.cpp
composer/qgscomposermap.cpp
composer/qgscomposermapwidget.cpp
@@ -118,7 +119,7 @@
qgsvectorlayerproperties.h
composer/qgscomposer.h
- composer/qgscomposerlabel.h
+ composer/qgscomposerlabelwidget.h
composer/qgscomposermap.h
composer/qgscomposermapwidget.h
composer/qgscomposerpicture.h
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -29,14 +29,12 @@
QgsComposerItem::QgsComposerItem(QGraphicsItem* parent): QGraphicsRectItem(0), mBoundingResizeRectangle(0), mFrame(true)
{
mPlotStyle = QgsComposition::Preview;
- setAcceptsHoverEvents(true);
setFlag(QGraphicsItem::ItemIsSelectable, true);
}
QgsComposerItem::QgsComposerItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem* parent): QGraphicsRectItem(0, 0, width, height, parent), mBoundingResizeRectangle(0), mFrame(true)
{
mPlotStyle = QgsComposition::Preview;
- setAcceptsHoverEvents(true);
setFlag(QGraphicsItem::ItemIsSelectable, true);
QTransform t;
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h 2008-06-10 08:28:48 UTC (rev 8635)
@@ -46,7 +46,7 @@
};
QgsComposerItem(QGraphicsItem* parent = 0);
- QgsComposerItem(qreal x, qreal y, qreal width, qreal height,QGraphicsItem* parent = 0);
+ QgsComposerItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem* parent = 0);
virtual ~QgsComposerItem();
/** \brief Set plot style */
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritemgroup.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritemgroup.cpp 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritemgroup.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -124,6 +124,8 @@
void QgsComposerItemGroup::setSceneRect(const QRectF& rectangle)
{
+ //calculate values between 0 and 1 for boundaries of all contained items, depending on their positions in the item group rectangle.
+ //then position the item boundaries in the new item group rect such that these values are the same
double xLeftCurrent = transform().dx();
double xRightCurrent = xLeftCurrent + rect().width();
double yTopCurrent = transform().dy();
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -14,7 +14,62 @@
* (at your option) any later version. *
* *
***************************************************************************/
+
#include "qgscomposerlabel.h"
+#include <QPainter>
+
+QgsComposerLabel::QgsComposerLabel( QgsComposition *composition, int id): QgsComposerItem(0)
+{
+ mId = id;
+}
+
+QgsComposerLabel::~QgsComposerLabel()
+{
+ //todo
+}
+
+void QgsComposerLabel::paint(QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget)
+{
+ if(!painter)
+ {
+ return;
+ }
+
+ if(plotStyle() == QgsComposition::Preview)
+ {
+ painter->setFont(mFont);
+ }
+ else
+ {
+ //scale font
+ QFont outputFont(mFont);
+ double dpiPaintDevice = (painter->device()->logicalDpiX() + painter->device()->logicalDpiY()) / 2;
+ outputFont.setPointSizeF(mFont.pointSizeF() * 25.4 / dpiPaintDevice);
+ painter->setFont(outputFont);
+ }
+ painter->drawText(rect(), Qt::AlignLeft, mText, 0);
+
+ drawFrame(painter);
+ if(isSelected())
+ {
+ drawSelectionBoxes(painter);
+ }
+}
+
+void QgsComposerLabel::setFontSize(double size)
+{
+ mFont.setPointSizeF(size);
+}
+
+void QgsComposerLabel::adjustSizeToText()
+{
+ //find out width and hight mText and set bounding box to it
+ QFontMetricsF fontInfo(mFont);
+ setSceneRect(QRectF(transform().dx(), transform().dy(), fontInfo.width(mText), fontInfo.xHeight()));
+}
+
+#if 0
+#include "qgscomposerlabel.h"
#include "qgsproject.h"
#include <QGraphicsScene>
@@ -360,3 +415,5 @@
{
return true;
}
+
+#endif //0
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.h 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.h 2008-06-10 08:28:48 UTC (rev 8635)
@@ -17,94 +17,34 @@
#ifndef QGSCOMPOSERLABEL_H
#define QGSCOMPOSERLABEL_H
-#include "ui_qgscomposerlabelbase.h"
#include "qgscomposeritem.h"
-#include <QAbstractGraphicsShapeItem>
-#include <QFont>
-#include <QPen>
-#include <QPolygon>
-#include <QRect>
-#include <QString>
-class QgsComposition;
-class QDomNode;
-class QDomDocument;
-
-/** \class QgsComposerLabel
- * \brief Object representing label.
- */
-// NOTE: QgsComposerLabelBase must be first, otherwise does not compile
-//class QgsComposerLabel : public QgsComposerLabelBase, public QCanvasRectangle, public QgsComposerItem
-class QgsComposerLabel : public QWidget, private Ui::QgsComposerLabelBase, public QgsComposerItem
+class QgsComposerLabel: public QgsComposerItem
{
- Q_OBJECT
+ public:
+ QgsComposerLabel( QgsComposition *composition, int id);
+ ~QgsComposerLabel();
-public:
- /** \brief Constructor. Settings are written to project.
- * \param id object id
- * \param fontSize font size in typographic points!
- */
- QgsComposerLabel( QgsComposition *composition, int id, int x, int y, QString text, int fontSize = 0 );
+ /** \brief Reimplementation of QCanvasItem::paint*/
+ void paint (QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget);
- /** \brief Constructor. Settings are read from project.
- * \param id object id
- */
- QgsComposerLabel( QgsComposition *composition, int id );
+ /**resizes the widget such that the text fits to the item. Keeps top left point*/
+ void adjustSizeToText();
- ~QgsComposerLabel();
-
- // Reimplement QgsComposerItem:
- void setSelected( bool s );
- bool selected( void );
- QWidget *options ( void );
- bool writeSettings ( void );
- bool readSettings ( void );
- bool removeSettings ( void );
- bool writeXML( QDomNode & node, QDomDocument & document, bool temp = false );
- bool readXML( QDomNode & node );
-
- /** \brief Reimplementation of QGraphicsItem::paint() - draw on canvas */
- void paint ( QPainter*, const QStyleOptionGraphicsItem*, QWidget* );
-
- QPolygonF areaPoints() const;
-
- QRectF calculateBoundingRect ( void ) const;
-
- /** \brief Set values in GUI to current values */
- void setOptions ( void );
-
-public slots:
- // Open font dialog
- void on_mFontButton_clicked();
-
- void on_mTextEdit_textChanged();
-
- // Box settings changed
- void on_mBoxCheckBox_clicked();
-
-private:
- // Pointer to composition
- QgsComposition *mComposition;
-
-
-
- // Text
+ QString text() {return mText;}
+ void setText(const QString& text){mText = text;}
+ QFont font() {return mFont;}
+ void setFont(const QFont& f){mFont = f;}
+ void setFontSize(double size);
+
+ private:
+ // Text
QString mText;
- // Font. Font size in typographic points!
+ // Font
QFont mFont;
+};
- // Pen
- QPen mPen;
+#endif
- // Margin in box
- int mMargin;
- // Draw box around the label
- bool mBox;
-
- // Box buffer
- double mBoxBuffer;
-};
-
-#endif
Added: branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.cpp (rev 0)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -0,0 +1,81 @@
+/***************************************************************************
+ qgscomposerlabelwidget.cpp
+ --------------------------
+ begin : June 10, 2008
+ copyright : (C) 2008 by Marco Hugentobler
+ email : marco dot hugentobler at karto dot baug dot ethz dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+
+#include "qgscomposerlabelwidget.h"
+#include "qgscomposerlabel.h"
+#include <QFontDialog>
+#include <QWidget>
+
+QgsComposerLabelWidget::QgsComposerLabelWidget(QgsComposerLabel* label): QWidget(), mComposerLabel(label)
+{
+ setupUi(this);
+ if(mComposerLabel)
+ {
+ mTextEdit->setText(mComposerLabel->text());
+ bool frame = mComposerLabel->frame();
+ if(frame)
+ {
+ mBoxCheckBox->setCheckState(Qt::Checked);
+ }
+ else
+ {
+ mBoxCheckBox->setCheckState(Qt::Unchecked);
+ }
+ }
+}
+
+void QgsComposerLabelWidget::on_mTextEdit_textChanged()
+{
+ if(mComposerLabel)
+ {
+ mComposerLabel->setText(mTextEdit->toPlainText());
+ mComposerLabel->update();
+ }
+}
+
+void QgsComposerLabelWidget::on_mFontButton_clicked()
+{
+ if(mComposerLabel)
+ {
+ bool ok;
+ QFont newFont = QFontDialog::getFont(&ok, mComposerLabel->font(), this);
+ if(ok)
+ {
+ mComposerLabel->setFont(newFont);
+ mComposerLabel->update();
+ }
+ }
+}
+
+void QgsComposerLabelWidget::on_mBoxCheckBox_stateChanged(int state)
+{
+ if(mComposerLabel)
+ {
+ if(state == Qt::Checked)
+ {
+ mComposerLabel->setFrame(true);
+ }
+ else
+ {
+ mComposerLabel->setFrame(false);
+ }
+ mComposerLabel->update();
+ }
+}
+
+
+
Added: branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.h (rev 0)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlabelwidget.h 2008-06-10 08:28:48 UTC (rev 8635)
@@ -0,0 +1,41 @@
+/***************************************************************************
+ qgscomposerlabelwidget.h
+ ------------------------
+ begin : June 10, 2008
+ copyright : (C) 2008 by Marco Hugentobler
+ email : marco dot hugentobler at karto dot baug dot ethz dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * 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. *
+ * *
+ ***************************************************************************/
+
+#ifndef QGSCOMPOSERLABELWIDGET
+#define QGSCOMPOSERLABELWIDGET
+
+#include "ui_qgscomposerlabelwidgetbase.h"
+
+class QgsComposerLabel;
+
+/**A widget to enter text, font size, box yes/no for composer labels*/
+class QgsComposerLabelWidget: public QWidget, private Ui::QgsComposerLabelWidgetBase
+{
+ Q_OBJECT
+ public:
+ QgsComposerLabelWidget(QgsComposerLabel* label);
+
+ public slots:
+ void on_mTextEdit_textChanged();
+ void on_mFontButton_clicked();
+ void on_mBoxCheckBox_stateChanged(int state);
+
+ private:
+ QgsComposerLabel* mComposerLabel;
+};
+
+#endif //QGSCOMPOSERLABELWIDGET
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerview.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -34,7 +34,8 @@
{
mComposer = composer;
setResizeAnchor ( QGraphicsView::AnchorViewCenter );
- setMouseTracking(true);
+ setMouseTracking(true);
+ viewport()->setMouseTracking ( true );
}
void QgsComposerView::mousePressEvent(QMouseEvent* e)
Modified: branches/advanced_printing_branch/src/app/composer/qgscomposition.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposition.cpp 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposition.cpp 2008-06-10 08:28:48 UTC (rev 8635)
@@ -21,6 +21,7 @@
#include "qgscomposeritem.h"
#include "qgscomposeritemgroup.h"
#include "qgscomposerlabel.h"
+#include "qgscomposerlabelwidget.h"
#include "qgscomposermap.h"
#include "qgscomposermapwidget.h"
@@ -35,6 +36,7 @@
#include <QGraphicsRectItem>
#include <QMatrix>
#include <QMessageBox>
+#include <QMouseEvent>
#include <iostream>
#include <math.h>
@@ -258,25 +260,49 @@
mComposer->showItemOptions(selectedItem);
}
break;
- }
+ }
case AddMap:
#ifdef QGISDEBUG
std::cerr << "AddMap" << std::endl;
#endif
- if ( mToolStep == 0 ) {
- mRectangleItem = new QGraphicsRectItem( p.x(), p.y(), 0, 0, 0, mCanvas );//null parent
- mRectangleItem->setBrush( Qt::NoBrush );
- mRectangleItem->setPen( QPen(QColor(0,0,0), 0) );
- mRectangleItem->setZValue(100);
- mRectangleItem->show();
- mToolStep = 1;
- }
+ if ( mToolStep == 0 )
+ {
+ mRectangleItem = new QGraphicsRectItem( p.x(), p.y(), 0, 0, 0, mCanvas );//null parent
+ mRectangleItem->setBrush( Qt::NoBrush );
+ mRectangleItem->setPen( QPen(QColor(0,0,0), 0) );
+ mRectangleItem->setZValue(100);
+ mRectangleItem->show();
+ mToolStep = 1;
+ }
#ifdef QGISDEBUG
std::cerr << "mToolStep = " << mToolStep << std::endl;
#endif
break;
+ case AddLabel:
+ if(mToolStep == 0)
+ {
+ QgsComposerLabel* newLabelItem = new QgsComposerLabel(this, mNextItemId++);
+ newLabelItem->setText("Quantum GIS");
+ newLabelItem->adjustSizeToText();
+ newLabelItem->setSceneRect(QRectF(p.x(), p.y(), newLabelItem->rect().width(), newLabelItem->rect().height()));
+ newLabelItem->setZValue(60);
+
+ QgsComposerLabelWidget* newLabelWidget = new QgsComposerLabelWidget(newLabelItem);
+
+ mComposer->addItem(newLabelItem, newLabelWidget);
+ mItems.push_back(newLabelItem);
+ canvas()->addItem(newLabelItem);
+ newLabelItem->setSelected ( true );
+ mCanvas->update();
+ mComposer->showItemOptions(newLabelItem);
+ mSelectedItem = newLabelItem;
+ newLabelItem->show();
+ mToolStep = 1;
+ setTool(Select);
+ }
+ break;
/* //other items besides map disabled for the moment
case AddVectorLegend:
{
@@ -295,26 +321,6 @@
mCanvas->update();
}
break;
-
- case AddLabel:
- {
- mNewCanvasItem->setPos(p);
-
- QgsComposerLabel *lab = dynamic_cast <QgsComposerLabel*> (mNewCanvasItem);
- lab->writeSettings();
- mItems.push_back(lab);
- mNewCanvasItem = 0;
- mComposer->selectItem(); // usually just one ???
-
- // Select and show options
- lab->setSelected ( true );
- mComposer->showItemOptions ( lab->options() );
- mSelectedItem = dynamic_cast <QGraphicsItem*> (lab);
-
- mCanvas->update();
- }
- break;
-
case AddScalebar:
{
mNewCanvasItem->setPos(p);
@@ -724,7 +730,6 @@
void QgsComposition::setTool ( Tool tool )
{
// Stop old in progress
- mView->viewport()->setMouseTracking ( false ); // stop mouse tracking
if ( mSelectedItem ) {
QgsComposerItem *coi = dynamic_cast <QgsComposerItem *> (mSelectedItem);
coi->setSelected ( false );
@@ -758,17 +763,18 @@
mView->viewport()->setMouseTracking ( true ); // to recieve mouse move
}
- else if ( tool == AddLabel ) {
+ /*else if ( tool == AddLabel ) {
if ( mNewCanvasItem ) delete mNewCanvasItem;
// Create new object outside the visible area
- QgsComposerLabel *lab = new QgsComposerLabel ( this, mNextItemId++, -1000, -1000, tr("Label"), (int) (mPaperHeight/20));
+ //QgsComposerLabel *lab = new QgsComposerLabel ( this, mNextItemId++, -1000, -1000, tr("Label"), (int) (mPaperHeight/20));
+
- mNewCanvasItem = dynamic_cast <QGraphicsItem *> (lab);
- mComposer->showItemOptions(lab);
+ //mNewCanvasItem = dynamic_cast <QGraphicsItem *> (lab);
+ //mComposer->showItemOptions(lab);
mView->viewport()->setMouseTracking ( true ); // to recieve mouse move
- }
+ }*/
else if ( tool == AddScalebar ) {
if ( mNewCanvasItem ) delete mNewCanvasItem;
Modified: branches/advanced_printing_branch/src/ui/CMakeLists.txt
===================================================================
--- branches/advanced_printing_branch/src/ui/CMakeLists.txt 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/ui/CMakeLists.txt 2008-06-10 08:28:48 UTC (rev 8635)
@@ -7,7 +7,7 @@
qgsattributetablebase.ui
qgsbookmarksbase.ui
qgscomposerbase.ui
- qgscomposerlabelbase.ui
+ qgscomposerlabelwidgetbase.ui
qgscomposermapwidgetbase.ui
qgscomposerpicturebase.ui
qgscomposerscalebarbase.ui
Deleted: branches/advanced_printing_branch/src/ui/qgscomposerlabelbase.ui
===================================================================
--- branches/advanced_printing_branch/src/ui/qgscomposerlabelbase.ui 2008-06-09 17:12:09 UTC (rev 8634)
+++ branches/advanced_printing_branch/src/ui/qgscomposerlabelbase.ui 2008-06-10 08:28:48 UTC (rev 8635)
@@ -1,84 +0,0 @@
-<ui version="4.0" >
- <class>QgsComposerLabelBase</class>
- <widget class="QWidget" name="QgsComposerLabelBase" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>215</width>
- <height>341</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle" >
- <string>Label Options</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QTextEdit" name="mTextEdit" >
- <property name="lineWrapMode" >
- <enum>QTextEdit::NoWrap</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="mFontButton" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Font</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="mBoxCheckBox" >
- <property name="text" >
- <string>Box</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>197</width>
- <height>71</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <tabstops>
- <tabstop>mFontButton</tabstop>
- <tabstop>mBoxCheckBox</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
Copied: branches/advanced_printing_branch/src/ui/qgscomposerlabelwidgetbase.ui (from rev 8627, branches/advanced_printing_branch/src/ui/qgscomposerlabelbase.ui)
===================================================================
--- branches/advanced_printing_branch/src/ui/qgscomposerlabelwidgetbase.ui (rev 0)
+++ branches/advanced_printing_branch/src/ui/qgscomposerlabelwidgetbase.ui 2008-06-10 08:28:48 UTC (rev 8635)
@@ -0,0 +1,89 @@
+<ui version="4.0" >
+ <class>QgsComposerLabelWidgetBase</class>
+ <widget class="QWidget" name="QgsComposerLabelWidgetBase" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>215</width>
+ <height>341</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle" >
+ <string>Label Options</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
+ <item>
+ <widget class="QTextEdit" name="mTextEdit" >
+ <property name="lineWrapMode" >
+ <enum>QTextEdit::NoWrap</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="mFontButton" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Font</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="mBoxCheckBox" >
+ <property name="text" >
+ <string>Box</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>197</width>
+ <height>71</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <tabstops>
+ <tabstop>mFontButton</tabstop>
+ <tabstop>mBoxCheckBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
More information about the QGIS-commit
mailing list