OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added version info label in the lower right corner

Browse Source
This commit is contained in:
Pål Hagen
2015-06-24 13:45:39 +02:00
parent fddef6d32c
commit 38b40423d8
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/UserInterface/RiuViewer.cpp
+24 -1
View File
@@ -76,6 +76,8 @@ const double RI_MIN_NEARPLANE_DISTANCE = 0.1;
/// ///
//================================================================================================== //==================================================================================================
#include "RiaBaseDefs.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -126,6 +128,18 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_InfoLabel->setFrameShape(QFrame::Box); m_InfoLabel->setFrameShape(QFrame::Box);
m_showInfoText = true; m_showInfoText = true;
// Version info label
m_versionInfoLabel = new QLabel();
m_versionInfoLabel->setFrameShape(QFrame::NoFrame);
m_versionInfoLabel->setAlignment(Qt::AlignRight);
m_versionInfoLabel->setText(QString("%1 v%2").arg(RI_APPLICATION_NAME, RiaApplication::getVersionStringApp(false)));
QPalette versionInfoPalette = p;
QColor versionInfoLabelColor = p.color(QPalette::Window);
versionInfoLabelColor.setAlpha(0);
versionInfoPalette.setColor(QPalette::Window, versionInfoLabelColor);
m_versionInfoLabel->setPalette(versionInfoPalette);
// Animation progress bar // Animation progress bar
m_animationProgress = new QProgressBar(); m_animationProgress = new QProgressBar();
m_animationProgress->setPalette(p); m_animationProgress->setPalette(p);
@@ -332,7 +346,16 @@ void RiuViewer::paintOverlayItems(QPainter* painter)
{ {
m_histogramWidget->resize(columnWidth, 40); m_histogramWidget->resize(columnWidth, 40);
m_histogramWidget->render(painter,QPoint(columnPos, yPos)); m_histogramWidget->render(painter,QPoint(columnPos, yPos));
yPos += m_InfoLabel->height() + margin; yPos += m_histogramWidget->height() + margin;
}
if (m_showInfoText)
{
QSize size(m_versionInfoLabel->sizeHint().width(), m_versionInfoLabel->sizeHint().height());
QPoint pos(this->width() - size.width() - margin, this->height() - size.height() - margin);
m_versionInfoLabel->resize(size.width(), size.height());
m_versionInfoLabel->render(painter, pos);
yPos += size.height() + margin;
} }
} }
ApplicationCode/UserInterface/RiuViewer.h
+1
View File
@@ -83,6 +83,7 @@ private:
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event);
QLabel* m_InfoLabel; QLabel* m_InfoLabel;
QLabel* m_versionInfoLabel;
bool m_showInfoText;; bool m_showInfoText;;
QProgressBar* m_animationProgress; QProgressBar* m_animationProgress;