[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kalzium/src/calculator
From: Luca Tringali <tringalinvent () libero ! it>
Date: 2010-09-17 22:15:50
Message-ID: 20100917221550.B29E9AC888 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1176533 by lucatringali:
Updating protocol to conform to HTTP/1.1
M +7 -1 calculator.cpp
M +2 -0 calculator.h
M +18 -13 calculator.ui
A titrationCalculator.cpp [License: GPL (v2+)]
A titrationCalculator.h [License: GPL (v2+)]
AM titrationCalculator.ui
--- trunk/KDE/kdeedu/kalzium/src/calculator/calculator.cpp #1176532:1176533
@@ -47,7 +47,9 @@
// Add the molecular mass Calculator widget to the user interface
m_moleCalculator = new MolcalcWidget(this);
ui.stack->addWidget(m_moleCalculator);
- // Add the molecular mass Calculator widget to the user interface
+ // Add the titration calculator
+ m_titrationCalculator = new titrationCalculator(this);
+ ui.stack->addWidget(m_titrationCalculator);
#ifdef HAVE_FACILE
// Add the equation balancer widget to the user interface
@@ -91,6 +93,10 @@
else if (!(s.compare(i18n("Nuclear Calculator"))))
ui.stack->setCurrentWidget(m_nuclearCalculator);
+ // Check ititration calculator is selected, show the widget in the user \
interface + else if (!(s.compare(i18n("Titration Calculator"))))
+ ui.stack->setCurrentWidget(m_titrationCalculator);
+
// Check if gas calculator is selected, show the widget in the user interface
else if (!(s.compare(i18n("Gas Calculator"))))
ui.stack->setCurrentWidget(m_gasCalculator);
--- trunk/KDE/kdeedu/kalzium/src/calculator/calculator.h #1176532:1176533
@@ -24,6 +24,7 @@
#include "ui_calculator.h"
#include "nuclearCalculator.h"
+#include "titrationCalculator.h"
#include "gasCalculator.h"
#include "concCalculator.h"
#include "molcalcwidget.h"
@@ -56,6 +57,7 @@
// These are the various calculator widgets that will be added to this \
calculator
nuclearCalculator * m_nuclearCalculator; // The nuclear calculator
+ titrationCalculator * m_titrationCalculator; // The titration calculator
gasCalculator * m_gasCalculator; // The gas calculator
concCalculator * m_concCalculator; // The concentration calculator
MolcalcWidget * m_moleCalculator; // The molecular mass calculator
--- trunk/KDE/kdeedu/kalzium/src/calculator/calculator.ui #1176532:1176533
@@ -74,6 +74,11 @@
<string>Gas Calculator</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Titration Calculator</string>
+ </property>
+ </item>
</widget>
</item>
<item>
@@ -181,19 +186,19 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> \
<html><head><meta name="qrichtext" content="1" \
/><style type="text/css"> p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; \
font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-size:12pt;">Welcome to the Kalzium molecular calculator!<br \
/></span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-size:10pt;">This calculator contains a variety of calculators for \
different tasks performing different \
calculations.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-size:10pt;">You can find the following calculators in \
Kalzium</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"><span style=" font-weight:600;">Molecular \
mass calculator<br /></span> This calculator helps you calculate the \
molecular masses of different molecules.<br />You can specify short form of the \
molecule names add more such aliases.</li>
-<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Concentrations calculator<br /></span>You can \
calculate quantities which include</li>
-<ul type="circle" style="-qt-list-indent: 2;"><li \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">Amount of \
substance </li>
-<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Volume of \
solvent</li>
-<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Concentration of \
substance</li></ul>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:1; text-indent:0px;"> There are a wide \
range of units to choose from and different methods to specify \
quantities.</p>
-<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Nuclear calculator<br /></span>This calculator \
makes use of the nuclear data available in Kalzium to predict the expected masses of \
a material after time.</li>
-<li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Gas calculator<br /></span>This calculator can \
calculate the values of Temperature, pressure, volume, amount of gas etc. for various \
ideal as well as non-ideal gasses.</li>
-<li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Equation Balancer<br /></span>This calculator \
can balance chemical \
equations.</li></ul></body></html></string> \
+</style></head><body style=" font-family:'Arial'; font-size:9pt; \
font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"><span style=" font-family:'DejaVu Sans'; \
font-size:12pt;">Welcome to the Kalzium molecular calculator!<br \
/></span></p> +<p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"><span style=" font-family:'DejaVu Sans'; \
font-size:10pt;">This calculator contains a variety of calculators for \
different tasks performing different calculations.</span></p> +<p \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" \
font-family:'DejaVu Sans'; font-size:10pt;">You can find the following \
calculators in Kalzium</span></p> +<ul style="margin-top: 0px; \
margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: \
1;"><li style=" font-family:'DejaVu Sans';" style=" \
margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Molecular mass calculator<br /></span> This \
calculator helps you calculate the molecular masses of different molecules.<br \
/>You can specify short form of the molecule names add more such \
aliases.</li> +<li style=" font-family:'DejaVu Sans';" \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Concentrations calculator<br /></span>You can \
calculate quantities which include</li> +<ul type="circle" \
style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; \
-qt-list-indent: 2;"><li style=" font-family:'DejaVu Sans';" \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">Amount of substance </li> +<li \
style=" font-family:'DejaVu Sans';" style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">Volume of solvent</li> +<li style=" \
font-family:'DejaVu Sans';" style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">Concentration of substance</li></ul> +<p \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:1; text-indent:0px;"><span style=" \
font-family:'DejaVu Sans';"> There are a wide range of units to choose from \
and different methods to specify quantities.</span></p> +<li \
style=" font-family:'DejaVu Sans';" style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"><span style=" font-weight:600;">Nuclear \
calculator<br /></span>This calculator makes use of the nuclear data \
available in Kalzium to predict the expected masses of a material after \
time.</li> +<li style=" font-family:'DejaVu Sans';" style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" \
font-weight:600;">Gas calculator<br /></span>This calculator can \
calculate the values of Temperature, pressure, volume, amount of gas etc. for various \
ideal as well as non-ideal gasses.</li> +<li style=" \
font-family:'DejaVu Sans';" style=" margin-top:0px; margin-bottom:12px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"><span style=" font-weight:600;">Equation \
Balancer<br /></span>This calculator can balance chemical \
equations.</li></ul></body></html></string> </property>
</widget>
</item>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic