Skip to content

Commit

Permalink
german translation update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Feb 19, 2013
1 parent 69a919d commit 0fbea19
Show file tree
Hide file tree
Showing 12 changed files with 1,391 additions and 1,849 deletions.
74 changes: 38 additions & 36 deletions doc/TRANSLATORS
View file

Large diffs are not rendered by default.

3,104 changes: 1,322 additions & 1,782 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/core/composer/qgscomposeritem.sip
View file
Expand Up @@ -257,7 +257,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;

/**Like the above, but with a rectangle for multiline text*/
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignement = Qt::AlignLeft, Qt::AlignmentFlag valignement = Qt::AlignTop ) const;
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop ) const;

/**Returns the font width in millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE*/
double textWidthMillimeters( const QFont& font, const QString& text ) const;
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsdecorationgrid.cpp
View file
Expand Up @@ -694,7 +694,7 @@ void QgsDecorationGrid::drawText( QPainter* p, double x, double y, const QString
p->restore();
}

void QgsDecorationGrid::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignement, Qt::AlignmentFlag valignment ) const
void QgsDecorationGrid::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment ) const
{
QFont textFont = scaledFontPixelSize( font );

Expand All @@ -705,7 +705,7 @@ void QgsDecorationGrid::drawText( QPainter* p, const QRectF& rect, const QString
p->setFont( textFont );
double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;
p->scale( scaleFactor, scaleFactor );
p->drawText( scaledRect, halignement | valignment | Qt::TextWordWrap, text );
p->drawText( scaledRect, halignment | valignment | Qt::TextWordWrap, text );
p->restore();
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdecorationgrid.h
View file
Expand Up @@ -221,7 +221,7 @@ class QgsDecorationGrid: public QgsDecorationItem
to work around the Qt font bug)*/
void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;
/**Like the above, but with a rectangle for multiline text*/
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignement = Qt::AlignLeft, Qt::AlignmentFlag valignement = Qt::AlignTop ) const;
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop ) const;
/**Returns the font width in millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE*/
double textWidthMillimeters( const QFont& font, const QString& text ) const;
/**Returns the font height of a character in millimeters. */
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposeritem.cpp
View file
Expand Up @@ -872,7 +872,7 @@ void QgsComposerItem::drawText( QPainter* p, double x, double y, const QString&
p->restore();
}

void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignement, Qt::AlignmentFlag valignment ) const
void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment ) const
{
QFont textFont = scaledFontPixelSize( font );

Expand All @@ -883,7 +883,7 @@ void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString&
p->setFont( textFont );
double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;
p->scale( scaleFactor, scaleFactor );
p->drawText( scaledRect, halignement | valignment | Qt::TextWordWrap, text );
p->drawText( scaledRect, halignment | valignment | Qt::TextWordWrap, text );
p->restore();
}
void QgsComposerItem::drawArrowHead( QPainter* p, double x, double y, double angle, double arrowHeadWidth ) const
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposeritem.h
View file
Expand Up @@ -223,7 +223,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;

/**Like the above, but with a rectangle for multiline text*/
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignement = Qt::AlignLeft, Qt::AlignmentFlag valignement = Qt::AlignTop ) const;
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop ) const;

/**Returns the font width in millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE*/
double textWidthMillimeters( const QFont& font, const QString& text ) const;
Expand Down
14 changes: 7 additions & 7 deletions src/core/composer/qgscomposerlegend.cpp
View file
Expand Up @@ -157,20 +157,20 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
// For multicolumn center if we stay in totalWidth, otherwise allign to left
// and expand total width. With single column keep alligned to left be cause
// it looks better alligned with items bellow instead of centered
Qt::AlignmentFlag halignement;
Qt::AlignmentFlag halignment;
if ( mColumnCount > 1 && titleSize.width() + 2 * mBoxSpace < size.width() )
{
halignement = Qt::AlignHCenter;
halignment = Qt::AlignHCenter;
point.rx() = mBoxSpace + size.rwidth() / 2;
}
else
{
halignement = Qt::AlignLeft;
halignment = Qt::AlignLeft;
point.rx() = mBoxSpace;
size.rwidth() = qMax( titleSize.width() + 2 * mBoxSpace, size.width() );
}
point.ry() = mBoxSpace;
drawTitle( painter, point, halignement );
drawTitle( painter, point, halignment );
}

//adjust box if width or height is to small
Expand Down Expand Up @@ -198,7 +198,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
return size;
}

QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::AlignmentFlag halignement )
QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::AlignmentFlag halignment )
{
QSizeF size( 0, 0 );
if ( mTitle.isEmpty() ) return size;
Expand All @@ -215,11 +215,11 @@ QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::Align
double width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;
double height = fontAscentMillimeters( mTitleFont ) + fontDescentMillimeters( mTitleFont );

double left = halignement == Qt::AlignLeft ? point.x() : point.x() - width / 2;
double left = halignment == Qt::AlignLeft ? point.x() : point.x() - width / 2;

QRectF rect( left, y, width, height );

if ( painter ) drawText( painter, rect, *titlePart, mTitleFont, halignement, Qt::AlignVCenter );
if ( painter ) drawText( painter, rect, *titlePart, mTitleFont, halignment, Qt::AlignVCenter );

size.rwidth() = qMax( width, size.width() );

Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerlegend.h
View file
Expand Up @@ -227,7 +227,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem

QgsComposerLegend(); //forbidden

QSizeF drawTitle( QPainter* painter = 0, QPointF point = QPointF(), Qt::AlignmentFlag halignement = Qt::AlignLeft );
QSizeF drawTitle( QPainter* painter = 0, QPointF point = QPointF(), Qt::AlignmentFlag halignment = Qt::AlignLeft );

/**Draws a group item and all subitems
* Returns list of sizes of layers and groups including this group.
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgsnumericscalebarstyle.h
View file
Expand Up @@ -40,7 +40,7 @@ class CORE_EXPORT QgsNumericScaleBarStyle: public QgsScaleBarStyle
/**Returns the text for the scale bar or an empty string in case of error*/
QString scaleText() const;

/**Store last width (in mm) to keep alignement to left/middle/right side*/
/**Store last width (in mm) to keep alignment to left/middle/right side*/
mutable double mLastScaleBarWidth;
};

Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgscompositionwidgetbase.ui
View file
Expand Up @@ -467,7 +467,7 @@
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mAlignmentSnapGroupCheckBox">
<property name="title">
<string>Snap to alignements</string>
<string>Snap to alignments</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand Down
28 changes: 14 additions & 14 deletions src/ui/qgslabelingguibase.ui
View file
Expand Up @@ -494,7 +494,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="1">
Expand Down Expand Up @@ -564,7 +564,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="0">
Expand Down Expand Up @@ -724,7 +724,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
Expand Down Expand Up @@ -1220,7 +1220,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="1">
Expand Down Expand Up @@ -1468,7 +1468,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="5">
Expand Down Expand Up @@ -1633,7 +1633,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
Expand Down Expand Up @@ -1768,7 +1768,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>labelsettings</string>
<string notr="true">labelsettings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
Expand Down Expand Up @@ -2015,7 +2015,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>advanced</string>
<string notr="true">advanced</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
Expand Down Expand Up @@ -2078,7 +2078,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>advanced</string>
<string notr="true">advanced</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="leftMargin">
Expand Down Expand Up @@ -2835,7 +2835,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>advanced</string>
<string notr="true">advanced</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<item row="2" column="0">
Expand Down Expand Up @@ -3110,7 +3110,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>datadefined</string>
<string notr="true">datadefined</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
Expand Down Expand Up @@ -3165,7 +3165,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>datadefined</string>
<string notr="true">datadefined</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="5" column="1">
Expand Down Expand Up @@ -3272,7 +3272,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>datadefined</string>
<string notr="true">datadefined</string>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<item row="1" column="1">
Expand Down Expand Up @@ -3351,7 +3351,7 @@
<bool>true</bool>
</property>
<property name="syncGroup" stdset="0">
<string>datadefined</string>
<string notr="true">datadefined</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="11" column="0">
Expand Down

0 comments on commit 0fbea19

Please sign in to comment.