Merge branch 'master' of github.com:/pokerth/pokerth

This commit is contained in:
lotodore
2013-12-19 11:09:22 +01:00
32 changed files with 24475 additions and 22508 deletions
+1 -1
View File
@@ -434,7 +434,7 @@ void MyAvatarLabel::paintEvent(QPaintEvent*)
// brush.setAlpha(130);
painter.setBrush(brush);
painter.setRenderHint(QPainter::Antialiasing);
painter.drawEllipse(1, 1, 10, 10);
painter.drawEllipse(1, 39, 10, 10);
}
}
}
@@ -342,7 +342,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_showPingStateInAvatar">
<property name="text">
<string>Show multicolor network state display in the avatar</string>
<string>Show network state color on the avatar</string>
</property>
</widget>
</item>
+1 -1
View File
@@ -347,7 +347,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_showPingStateInAvatar">
<property name="text">
<string>Show multicolor network state display in the corner of the avatar</string>
<string>Show network state color in the corner of the avatar</string>
</property>
</widget>
</item>