[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kronometer/test2] /: Removed splitters and dividers from stopwatch display
From:       Elvis Angelaccio <elvis.angelaccio () kdemail ! net>
Date:       2014-04-16 10:57:23
Message-ID: E1WaNWt-0005cn-EJ () scm ! kde ! org
[Download RAW message or body]

Git commit 54fcd900ef2b7d1cab7fd050d50ab02f24a1c439 by Elvis Angelaccio.
Committed on 16/04/2014 at 10:57.
Pushed by elvisangelaccio into branch 'test2'.

Removed splitters and dividers from stopwatch display

M  +29   -61   qtimedisplay.cpp
M  +4    -16   qtimedisplay.h

http://commits.kde.org/kronometer/54fcd900ef2b7d1cab7fd050d50ab02f24a1c439

diff --git a/qtimedisplay.cpp b/qtimedisplay.cpp
index 841dba1..0811c74 100644
--- a/qtimedisplay.cpp
+++ b/qtimedisplay.cpp
@@ -22,7 +22,7 @@
 #include <KLocale>
 
 #include <QLabel>
-#include <QBoxLayout>
+#include <QGridLayout>
 #include <QSplitter>
 
 namespace
@@ -30,36 +30,14 @@ namespace
     const QString FRAME_STYLE = "QFrame {background-clip: content; background: %1; \
color: %2}";  }
 
-QTimeDisplay::QTimeDisplay(QWidget *parent) : QWidget(parent), displayTime(0, 0)
+QTimeDisplay::QTimeDisplay(QWidget *parent) : QFrame(parent), displayTime(0, 0)
 {
-    displayLayout = new QHBoxLayout(this);
-
-    splitter = new QSplitter(this);
-    splitter->setOrientation(Qt::Horizontal);
-    splitter->setChildrenCollapsible(false);
-
-    hourFrame = new QFrame(splitter);
-    minFrame = new QFrame(splitter);
-    secFrame = new QFrame(splitter);
-    fracFrame = new QFrame(splitter);
-    hourFrame->setFrameShape(QFrame::StyledPanel);
-    hourFrame->setFrameShadow(QFrame::Sunken);
-    minFrame->setFrameShape(QFrame::StyledPanel);
-    minFrame->setFrameShadow(QFrame::Sunken);
-    secFrame->setFrameShape(QFrame::StyledPanel);
-    secFrame->setFrameShadow(QFrame::Sunken);
-    fracFrame->setFrameShape(QFrame::StyledPanel);
-    fracFrame->setFrameShadow(QFrame::Sunken);
-
-    hourLayout = new QVBoxLayout(hourFrame);
-    minLayout = new QVBoxLayout(minFrame);
-    secLayout = new QVBoxLayout(secFrame);
-    fracLayout = new QVBoxLayout(fracFrame);
-
-    hourHeader = new QLabel(hourFrame);
-    minHeader = new QLabel(minFrame);
-    secHeader = new QLabel(secFrame);
-    fracHeader = new QLabel(fracFrame);
+    displayLayout = new QGridLayout(this);
+
+    hourHeader = new QLabel(this);
+    minHeader = new QLabel(this);
+    secHeader = new QLabel(this);
+    fracHeader = new QLabel(this);
     hourHeader->setAlignment(Qt::AlignCenter);
     minHeader->setAlignment(Qt::AlignCenter);
     secHeader->setAlignment(Qt::AlignCenter);
@@ -73,10 +51,10 @@ QTimeDisplay::QTimeDisplay(QWidget *parent) : QWidget(parent), \
displayTime(0, 0)  secHeader->setTextInteractionFlags(Qt::TextSelectableByMouse);
     fracHeader->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
-    hourLabel = new QLabel(hourFrame);
-    minLabel = new QLabel(minFrame);
-    secLabel = new QLabel(secFrame);
-    fracLabel = new QLabel(fracFrame);
+    hourLabel = new QLabel(this);
+    minLabel = new QLabel(this);
+    secLabel = new QLabel(this);
+    fracLabel = new QLabel(this);
 
     hourLabel->setAlignment(Qt::AlignCenter);
     minLabel->setAlignment(Qt::AlignCenter);
@@ -91,31 +69,27 @@ QTimeDisplay::QTimeDisplay(QWidget *parent) : QWidget(parent), \
displayTime(0, 0)  secLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
     fracLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
-    hourLayout->addWidget(hourHeader);
-    hourLayout->addWidget(hourLabel);
-    minLayout->addWidget(minHeader);
-    minLayout->addWidget(minLabel);
-    secLayout->addWidget(secHeader);
-    secLayout->addWidget(secLabel);
-    fracLayout->addWidget(fracHeader);
-    fracLayout->addWidget(fracLabel);
-
-    splitter->addWidget(hourFrame);
-    splitter->addWidget(minFrame);
-    splitter->addWidget(secFrame);
-    splitter->addWidget(fracFrame);
-
-    displayLayout->addWidget(splitter);
+    displayLayout->addWidget(hourHeader, 0, 0);
+    displayLayout->addWidget(hourLabel, 1, 0);
+    displayLayout->addWidget(minHeader, 0, 1);
+    displayLayout->addWidget(minLabel, 1, 1);
+    displayLayout->addWidget(secHeader, 0, 2);
+    displayLayout->addWidget(secLabel, 1, 2);
+    displayLayout->addWidget(fracHeader, 0, 3);
+    displayLayout->addWidget(fracLabel, 1, 3);
+
+    setFrameShadow(QFrame::Sunken);
+    setFrameShape(QFrame::StyledPanel);
 }
 
 void QTimeDisplay::setTimeFormat(const QTimeFormat &format)
 {
     timeFormat = format;
 
-    hourFrame->setVisible(timeFormat.isHourEnabled());
-    minFrame->setVisible(timeFormat.isMinEnabled());
-    secFrame->setVisible(timeFormat.isSecEnabled());
-    fracFrame->setVisible(timeFormat.isSecFracEnabled());
+//    hourFrame->setVisible(timeFormat.isHourEnabled());
+//    minFrame->setVisible(timeFormat.isMinEnabled());
+//    secFrame->setVisible(timeFormat.isSecEnabled());
+//    fracFrame->setVisible(timeFormat.isSecFracEnabled());
 
     if (timeFormat.isSecFracEnabled()) {
         if (timeFormat.isMSecEnabled()) {
@@ -160,20 +134,14 @@ void QTimeDisplay::setBackgroundColor(const QColor& color)
 {
     backgroundColor = color;
 
-    hourFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    minFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    secFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    fracFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
textColor.name())); +    setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
textColor.name()));  }
 
 void QTimeDisplay::setTextColor(const QColor& color)
 {
     textColor = color;
 
-    hourFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    minFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    secFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
                textColor.name()));
-    fracFrame->setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
textColor.name())); +    setStyleSheet(FRAME_STYLE.arg(backgroundColor.name(), \
textColor.name()));  }
 
 void QTimeDisplay::showHeaders(bool show)
diff --git a/qtimedisplay.h b/qtimedisplay.h
index 369221a..23792f7 100644
--- a/qtimedisplay.h
+++ b/qtimedisplay.h
@@ -20,13 +20,11 @@
 #ifndef QTIMEDISPLAY_H
 #define QTIMEDISPLAY_H
 
-#include <QWidget>
+#include <QFrame>
 #include <QTime>
 
 class QSplitter;
-class QHBoxLayout;
-class QVBoxLayout;
-class QFrame;
+class QGridLayout;
 class QLabel;
 
 #include "qtimeformat.h"
@@ -36,7 +34,7 @@ class QLabel;
  * This custom widget implements a "digital" display for a time, formatted according \
                to a certain format.
  * This widget can be connected to a generic "time source" producing the time to be \
                displayed.
  */
-class QTimeDisplay : public QWidget
+class QTimeDisplay : public QFrame
 {
     Q_OBJECT
 
@@ -108,17 +106,7 @@ public slots:
 
 private:
 
-    QSplitter *splitter;
-    QHBoxLayout *displayLayout;
-    QVBoxLayout *hourLayout;
-    QVBoxLayout *minLayout;
-    QVBoxLayout *secLayout;
-    QVBoxLayout *fracLayout;
-
-    QFrame *hourFrame;
-    QFrame *minFrame;
-    QFrame *secFrame;
-    QFrame *fracFrame;
+    QGridLayout *displayLayout;
 
     QLabel *hourHeader;
     QLabel *minHeader;


[prev in list] [next in list] [prev in thread] [next in thread]