Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristhofer Travieso <cristhofert97@gmail.com>2012-08-21 23:36:49 (GMT)
committer Cristhofer Travieso <cristhofert97@gmail.com>2012-08-21 23:36:49 (GMT)
commit7ba762de6cb34b6a89e7f9a8dcd40e813f28ce03 (patch)
treebf93a0a1c583e3984eb44bd704a894f6da271570
parent0c036d78f7fc127c619e7df5c61f6cb077d1409e (diff)
Remove temperature
-rw-r--r--activity.py9
-rw-r--r--convert.py5
-rwxr-xr-xconvertline.py2
3 files changed, 1 insertions, 15 deletions
diff --git a/activity.py b/activity.py
index 01c6cd1..8973e2d 100644
--- a/activity.py
+++ b/activity.py
@@ -123,21 +123,12 @@ class ConvertActivity(activity.Activity):
self._speed_btn.props.icon_name = 'speed'
self._speed_btn.props.group = self._lenght_btn
- self._temp_btn = RadioToolButton()
- self._temp_btn.connect('clicked',
- lambda w: self._update_combo(convert.temp))
- self._temp_btn.set_tooltip('Temperature')
- self._temp_btn.props.icon_name = 'temp'
- self._temp_btn.props.group = self._lenght_btn
-
toolbarbox.toolbar.insert(self._lenght_btn, -1)
toolbarbox.toolbar.insert(self._volume_btn, -1)
toolbarbox.toolbar.insert(self._area_btn, -1)
toolbarbox.toolbar.insert(self._weight_btn, -1)
toolbarbox.toolbar.insert(self._speed_btn, -1)
- toolbarbox.toolbar.insert(self._temp_btn, -1)
- #
separator = gtk.SeparatorToolItem()
separator.set_expand(True)
separator.set_draw(False)
diff --git a/convert.py b/convert.py
index a99b43b..8fe8fd4 100644
--- a/convert.py
+++ b/convert.py
@@ -66,11 +66,6 @@ volume = {'Meter3': (1, 1), 'Foot3': (0.0283168, 35.31472482766414),
'Gallon': (0.00378541, 264.172176857989)
}
-temp = {'Celsius': (1, 1),
- 'Kelvin': (274.15, 272.15),
- 'Farenheit': (33.8, -17.22222222)
- }
-
speed = {'Kilometers/Hour': (1, 1),
'Centimeter/Minute': (0.000679856115108, 1470.8994709),
'Centimeter/Second': (0.0359712230216, 27.8),
diff --git a/convertline.py b/convertline.py
index f8ab161..8fc3c13 100755
--- a/convertline.py
+++ b/convertline.py
@@ -24,7 +24,7 @@ import convert
estado = True
-dic = convert.temp
+dic = convert.lenght
while estado:
os.system('clear')