Skip to content
Permalink
Browse files

Overlay clock: Fix tooltip text and indent.

  • Loading branch information...
Kissaki committed Jul 7, 2013
1 parent 5c87ded commit 63e3fd0389f33a581c1c3155b4ca1beb8240614f
Showing with 7 additions and 11 deletions.
  1. +1 −5 src/mumble/Overlay.ui
  2. +6 −6 src/mumble/OverlayClient.cpp
@@ -153,11 +153,7 @@
<item>
<widget class="QCheckBox" name="qcbShowTime">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Display a simple clock in the overlay&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Display a clock in the overlay showing the current local time (system time).</string>
</property>
<property name="text">
<string>Show Clock</string>
@@ -125,12 +125,12 @@ void OverlayClient::updateFPS() {
}

void OverlayClient::updateTime() {
if (g.s.os.bTime) {
const BasepointPixmap &pm = OverlayTextLine(QString(QLatin1String("%1")).arg(QTime::currentTime().toString()), g.s.os.qfFps).createPixmap(g.s.os.qcFps);
qgpiTime->setPixmap(pm);
qgpiTime->setOffset(-pm.qpBasePoint + QPoint(0, pm.iAscent));
} else {
qgpiTime->setPixmap(QPixmap());
if (g.s.os.bTime) {
const BasepointPixmap &pm = OverlayTextLine(QString(QLatin1String("%1")).arg(QTime::currentTime().toString()), g.s.os.qfFps).createPixmap(g.s.os.qcFps);
qgpiTime->setPixmap(pm);
qgpiTime->setOffset(-pm.qpBasePoint + QPoint(0, pm.iAscent));
} else {
qgpiTime->setPixmap(QPixmap());
}
}

5 comments on commit 63e3fd0

@BKPepe

This comment has been minimized.

Copy link

replied Jul 7, 2013

It would be great, if anybody will upload this latest version to Ubuntu ppa's like mumble snapshot (Where version is outdated than mumble-stable)

@mkrautz

This comment has been minimized.

Copy link
Member

replied Jul 7, 2013

@BKPepe

I have uploaded a build of this to the snapshot PPA, for lucid through saucy. I can't say when they're done building, but you can follow the progress here:

https://launchpad.net/~mumble/+archive/snapshot/+packages

@BKPepe

This comment has been minimized.

Copy link

replied Jul 7, 2013

I didn't expect answer will be so quickly! Thank you!

EDIT:// Builds failed :o(

@mkrautz

This comment has been minimized.

Copy link
Member

replied Jul 7, 2013

I did another upload (of ~ppa2) which should fix the build. Crosses fingers.

@Zuko

This comment has been minimized.

Copy link
Contributor

replied Jul 8, 2013

I didn't notice this html thing ;) (qt designer fault)

Please sign in to comment.
You can’t perform that action at this time.