Permalink
Browse files

Graphical enhancements.

  • Loading branch information...
1 parent 6cd20fb commit 3f9f9304bb85fdba91c9126006828325b6cf8ce6 Gav Wood committed Sep 7, 2012
Showing with 10 additions and 7 deletions.
  1. +4 −1 Info.ui
  2. +4 −4 RIP.cpp
  3. +1 −1 RIP.h
  4. +1 −1 release.sh
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Info</class>
- <widget class="QWidget" name="Info">
+ <widget class="QFrame" name="Info">
<property name="geometry">
<rect>
<x>0</x>
@@ -13,6 +13,9 @@
<property name="windowTitle">
<string>Rip in Peace</string>
</property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
<layout class="QGridLayout" name="gridLayout">
<item row="4" column="0">
<widget class="QSpinBox" name="setIndex">
View
@@ -45,17 +45,17 @@ inline string tSS(QString const& _s)
static void paintLogo(QPainter& _p, QRect _r, int _degrees = 360, QVector<float> const& _split = QVector<float>(), QColor _back = QColor::fromHsv(0, 128, 192), QColor _fore = QColor::fromHsv(0, 0, 232))
{
- int gs = _split.size() ? 110 : 105;
+ int gs = _split.size() ? 103 : 105;
float wx = _r.width();
float wy = _r.height();
QRect gr = _r.adjusted(wx * .3, wy * .3, -wx * .3, -wy * .3);
QLinearGradient grad(gr.topLeft(), gr.bottomRight());
_p.setRenderHint(QPainter::Antialiasing, true);
_p.setPen(Qt::NoPen);
- grad.setStops(QGradientStops() << QGradientStop(0, _back) << QGradientStop(0.5, _back.lighter(gs)) << QGradientStop(0.51, _back.darker(gs)) << QGradientStop(1, _back));
+ grad.setStops(QGradientStops() << QGradientStop(0, _back) << QGradientStop(_split.size() ? 0.2 : 0.5, _back.lighter(gs)) << QGradientStop(_split.size() ? 0.21 : 0.51, _back.darker(gs)) << QGradientStop(1, _back));
_p.setBrush(grad);
_p.drawEllipse(_r);
- grad.setStops(QGradientStops() << QGradientStop(0, _fore) << QGradientStop(0.5, _fore.lighter(gs)) << QGradientStop(0.51, _fore.darker(gs)) << QGradientStop(1, _fore));
+ grad.setStops(QGradientStops() << QGradientStop(0, _fore) << QGradientStop(_split.size() ? 0.2 : 0.5, _fore.lighter(gs)) << QGradientStop(_split.size() ? 0.21 : 0.51, _fore.darker(gs)) << QGradientStop(1, _fore));
_p.setBrush(grad);
if (_degrees)
_p.drawPie(_r, 90 * 16, -_degrees * 16);
@@ -147,7 +147,7 @@ RIP::RIP():
m_settings = new Settings(this);
m_progressPie = new Progress(this);
- m_popup = new QWidget(0, Qt::WindowStaysOnTopHint|Qt::FramelessWindowHint);
+ m_popup = new QFrame(0, Qt::WindowStaysOnTopHint|Qt::FramelessWindowHint);
m_info.setupUi(m_popup);
m_popup->setEnabled(false);
connect(m_info.presets, SIGNAL(currentIndexChanged(int)), SLOT(updatePreset(int)));
View
@@ -76,7 +76,7 @@ private slots:
virtual void timerEvent(QTimerEvent*);
- QWidget* m_popup;
+ QFrame* m_popup;
Settings* m_settings;
Ui::Info m_info;
View
@@ -23,7 +23,7 @@ echo Cleaning backup files...
find . | grep \~ | xargs rm -f
echo Cleaning others...
-rm release.sh link.sh
+rm release.sh
echo Cleaning versioning...
rm -rf .git .gitignore

0 comments on commit 3f9f930

Please sign in to comment.