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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/timer
From:       Davide Bettio <davide.bettio () kdemail ! net>
Date:       2009-04-20 20:44:14
Message-ID: 1240260254.028763.31332.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 956880 by bettio:

FEATURE: user can hide seconds.


 M  +17 -2     timer.cpp  
 M  +1 -1      timerConfig.ui  


--- trunk/KDE/kdeplasma-addons/applets/timer/timer.cpp #956879:956880
@@ -91,6 +91,12 @@
                                                        << "01:00:00");
     m_title->setVisible(cg.readEntry("showTitle", false));
     m_title->setText(cg.readEntry("title", i18n("Timer")));
+
+    bool hideSeconds = cg.readEntry("hideSeconds", false);
+    m_secondsDigit[0]->setVisible(!hideSeconds);
+    m_secondsDigit[1]->setVisible(!hideSeconds);
+    m_separator[1]->setVisible(!hideSeconds);
+
     m_showMessage = cg.readEntry("showMessage", true);
     m_message = cg.readEntry("message", i18n("Timer Timeout"));
     m_runCommand = cg.readEntry("runCommand", false);
@@ -144,11 +150,12 @@
 
     int appletHeight = (int) contentsRect().height();
     int appletWidth = (int) contentsRect().width();
+    float digits = m_secondsDigit[0]->isVisible() ? 7 : 4.5;
 
-    int h = (appletHeight / 2) * 7 < appletWidth ? appletHeight : ((appletWidth - 6) \
/ 7) * 2; +    int h = (int) ((appletHeight / 2) * digits < appletWidth ? \
appletHeight : ((appletWidth - (digits - 1)) / digits) * 2);  int w = h / 2;
     int y = (int) (contentsRect().y() + (appletHeight - h) / 2);
-    int x = (int) (contentsRect().x() + (appletWidth - w * 7) / 2);
+    int x = (int) (contentsRect().x() + (appletWidth - w * digits) / 2);
 
     m_hoursDigit[0]->setGeometry(x, y, w, h);
     m_hoursDigit[1]->setGeometry(x + w, y, w, h);  
@@ -214,6 +221,7 @@
     ui.showTitleCheckBox->setChecked(m_title->isVisible());
     ui.titleLineEdit->setEnabled(m_title->isVisible());
     ui.titleLineEdit->setText(m_title->text());
+    ui.hideSecondsCheckBox->setChecked(!m_secondsDigit[0]->isVisible());
     ui.showMessageCheckBox->setChecked(m_showMessage);
     ui.messageLineEdit->setEnabled(m_showMessage);
     ui.messageLineEdit->setText(m_message);
@@ -240,6 +248,12 @@
     m_title->setVisible(ui.showTitleCheckBox->isChecked());
     cg.writeEntry("showTitle", m_title->isVisible());
 
+    bool hideSeconds = ui.hideSecondsCheckBox->isChecked();
+    m_secondsDigit[0]->setVisible(!hideSeconds);
+    m_secondsDigit[1]->setVisible(!hideSeconds);
+    m_separator[1]->setVisible(!hideSeconds);
+    cg.writeEntry("hideSeconds", hideSeconds);
+
     m_title->setText(ui.titleLineEdit->text());
     cg.writeEntry("title", m_title->text());
 
@@ -256,6 +270,7 @@
     cg.writeEntry("command", m_command);
 
     createMenuAction();
+    updateConstraints(Plasma::SizeConstraint);
     emit configNeedsSaving();
 }
 
--- trunk/KDE/kdeplasma-addons/applets/timer/timerConfig.ui #956879:956880
@@ -51,7 +51,7 @@
     <widget class="KLineEdit" name="titleLineEdit"/>
    </item>
    <item row="2" column="1">
-    <widget class="QCheckBox" name="checkBox">
+    <widget class="QCheckBox" name="hideSecondsCheckBox">
      <property name="text">
       <string>Hide seconds</string>
      </property>


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