Changeset 156
- Timestamp:
- 01/16/08 00:34:02 (1 year ago)
- Files:
-
- pytrainer/trunk/glade/pytrainer.glade (modified) (5 diffs)
- pytrainer/trunk/pytrainer/gui/windowprofile.py (modified) (3 diffs)
- pytrainer/trunk/pytrainer/main.py (modified) (1 diff)
- pytrainer/trunk/pytrainer/profile.py (modified) (2 diffs)
- pytrainer/trunk/pytrainer/record.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/glade/pytrainer.glade
r155 r156 7883 7883 7884 7884 <child> 7885 <widget class="GtkEntry" id=" entry346">7885 <widget class="GtkEntry" id="newmetentry"> 7886 7886 <property name="visible">True</property> 7887 7887 <property name="can_focus">True</property> … … 7932 7932 7933 7933 <child> 7934 <widget class="GtkEntry" id=" entry347">7934 <widget class="GtkEntry" id="newweightentry"> 7935 7935 <property name="visible">True</property> 7936 7936 <property name="can_focus">True</property> … … 8452 8452 8453 8453 <child> 8454 <widget class="GtkEntry" id="e ntry345">8454 <widget class="GtkEntry" id="editmetentry"> 8455 8455 <property name="visible">True</property> 8456 8456 <property name="can_focus">True</property> … … 8501 8501 8502 8502 <child> 8503 <widget class="GtkEntry" id="e ntry348">8503 <widget class="GtkEntry" id="editweightentry"> 8504 8504 <property name="visible">True</property> 8505 8505 <property name="can_focus">True</property> … … 8922 8922 <property name="border_width">5</property> 8923 8923 <property name="visible">True</property> 8924 <property name="destroy_with_parent"> False</property>8925 <property name="name" translatable="yes">pytraine </property>8924 <property name="destroy_with_parent">True</property> 8925 <property name="name" translatable="yes">pytrainer</property> 8926 8926 <property name="copyright" translatable="yes">(c) Fiz Vazquez <vud1@sindominio.net></property> 8927 8927 <property name="comments" translatable="yes">Track sporting activities and performance</property> pytrainer/trunk/pytrainer/gui/windowprofile.py
r151 r156 162 162 def on_newsport_accept_clicked(self,widget): 163 163 sport = self.newsportentry.get_text() 164 self.parent.addNewSport(sport) 164 met = self.newmetentry.get_text() 165 weight = self.newweightentry.get_text() 166 self.parent.addNewSport(sport,met,weight) 165 167 self.parent.actualize_mainsportlist() 166 168 self.on_switch_page(None,None,2) … … 195 197 sport = selected.get_value(iter,0) 196 198 self.sportnameedit.set_text(sport) 199 name,met,weight = self.parent.getSportInfo(sport) 197 200 self.editsportentry.set_text(sport) 201 self.editweightentry.set_text(str(weight)) 202 self.editmetentry.set_text(str(met)) 198 203 self.hidesportsteps() 199 204 self.editsport.show() … … 204 209 oldnamesport = self.sportnameedit.get_text() 205 210 newnamesport = self.editsportentry.get_text() 206 self.parent.updateSport(oldnamesport,newnamesport) 211 newmetsport = self.editmetentry.get_text() 212 newweightsport = self.editweightentry.get_text() 213 self.parent.updateSport(oldnamesport,newnamesport,newmetsport,newweightsport) 207 214 self.parent.actualize_mainsportlist() 208 215 self.on_switch_page(None,None,2) pytrainer/trunk/pytrainer/main.py
r148 r156 52 52 self.data_path = data_path 53 53 #configuration 54 self.version ="1.5.0 "54 self.version ="1.5.0.1" 55 55 self.conf = checkConf() 56 56 #preparamos la ventana principal pytrainer/trunk/pytrainer/profile.py
r54 r156 77 77 return connection 78 78 79 def addNewSport(self,sport ):80 sport = [sport ]81 self.ddbb.insert("sports","name ",sport)79 def addNewSport(self,sport,weight,met): 80 sport = [sport,met,weight] 81 self.ddbb.insert("sports","name,met,weight",sport) 82 82 83 83 def delSport(self,sport): … … 87 87 self.ddbb.delete("sports","id_sports=\"%d\""%id_sport) 88 88 89 def updateSport(self,oldnamesport,newnamesport): 90 self.ddbb.update("sports","name",[newnamesport],"name=\"%s\""%oldnamesport) 89 def updateSport(self,oldnamesport,newnamesport,newmetsport,newweightsport): 90 self.ddbb.update("sports","name,weight,met",[newnamesport,newmetsport,newweightsport],"name=\"%s\""%oldnamesport) 91 92 def getSportInfo(self,namesport): 93 return self.ddbb.select("sports","name,weight,met","name=\"%s\""%namesport)[0] 91 94 92 95 def build_ddbb(self): pytrainer/trunk/pytrainer/record.py
r155 r156 54 54 except: 55 55 pass 56 if self.configuration.getOption("version")<="1.5 ":56 if self.configuration.getOption("version")<="1.5.0": 57 57 self.ddbb.addweightandmet2ddbb() 58 58 if self.configuration.getOption("version")<version:
