Changeset 7934
- Timestamp:
- 2006-06-25 12:56:31 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
picard/branches/UITweaks1/picard/ui/mdatapanel.py
r7266 r7934 65 65 localTrackNumEditId = wx.NewId() 66 66 localDateEditId = wx.NewId() 67 localTrackNum SpinId = wx.NewId()67 localTrackNumEditId = wx.NewId() 68 68 localLookupButtonId = wx.NewId() 69 69 … … 88 88 wx.EVT_TEXT_ENTER(self, localArtistComboId, self.OnEnter) 89 89 wx.EVT_TEXT_ENTER(self, localTrackEditId, self.OnEnter) 90 wx.EVT_ SPINCTRL(self, localTrackNumSpinId, self.OnTrackNumChanged)90 wx.EVT_TEXT(self, localTrackNumEditId, self.OnTrackNumChanged) 91 91 wx.EVT_TEXT(self, localDateEditId, self.OnChanged) 92 92 wx.EVT_TEXT(self, localAlbumComboId, self.OnChanged) … … 110 110 self.localAlbumCombo = wx.TextCtrl(self.localPanel, -1, "", wx.DefaultPosition, 111 111 wx.DefaultSize, style=wx.TE_PROCESS_ENTER) 112 113 #self.localArtistCombo = wx.ComboBox(self.localPanel, localArtistComboId, "", wx.DefaultPosition,114 # wx.DefaultSize, ['Recent artists will eventually be listed here.'],115 # wx.CB_DROPDOWN | wx.TE_PROCESS_ENTER)116 #self.localAlbumCombo = wx.ComboBox(self.localPanel, localAlbumComboId, "", wx.DefaultPosition,117 # wx.DefaultSize, ['Recent albums will eventually be listed here.'],118 # wx.CB_DROPDOWN | wx.TE_PROCESS_ENTER)119 112 self.localTrackEdit = wx.TextCtrl(self.localPanel, localTrackEditId, style=wx.TE_PROCESS_ENTER) 120 121 self.localTrackNumSpin = wx.SpinCtrl(self.localPanel, localTrackNumSpinId, "", 122 min=1, max=99, size=(50, -1), style = wx.TE_PROCESS_ENTER) 113 self.localTrackNumEdit = wx.TextCtrl(self.localPanel, localTrackNumEditId, "", size=(50, -1), style=wx.TE_PROCESS_ENTER) 123 114 self.localDurationEdit = wx.TextCtrl(self.localPanel, -1, "", size=(50, -1), style=wx.TE_READONLY) 124 115 self.localDateEdit = wx.TextCtrl(self.localPanel, localDateEditId, "", size=(80, -1)) … … 139 130 140 131 hSizer = wx.BoxSizer(wx.HORIZONTAL) 141 hSizer.Add(self.localTrackNum Spin, 1, 0)132 hSizer.Add(self.localTrackNumEdit, 0, 0) 142 133 hSizer.Add(wx.StaticText(self.localPanel, -1, _("Time") + ":"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 3) 143 hSizer.Add(self.localDurationEdit, 1, 0)134 hSizer.Add(self.localDurationEdit, 0, 0) 144 135 hSizer.Add(wx.StaticText(self.localPanel, -1, _("Release Date") + ":"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 3) 145 hSizer.Add(self.localDateEdit, 1, 0)136 hSizer.Add(self.localDateEdit, 0, 0) 146 137 hSizer.Add(self.localLookupButton, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 10) 147 138 … … 169 160 170 161 hSizer = wx.BoxSizer(wx.HORIZONTAL) 171 hSizer.Add(self.serverTrackNumEdit, 1, 0)162 hSizer.Add(self.serverTrackNumEdit, 0, 0) 172 163 hSizer.Add(wx.StaticText(self.serverPanel, -1, _("Time") + ":"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 3) 173 hSizer.Add(self.serverDurationEdit, 1, 0)164 hSizer.Add(self.serverDurationEdit, 0, 0) 174 165 hSizer.Add(wx.StaticText(self.serverPanel, -1, _("Release Date") + ":"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 3) 175 hSizer.Add(self.serverDateEdit, 1, 0)166 hSizer.Add(self.serverDateEdit, 0, 0) 176 167 hSizer.Add(self.serverLookupButton, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 10) 177 168 … … 253 244 self.localAlbumCombo.GetValue(), 254 245 self.localTrackEdit.GetValue(), 255 self.localTrackNum Spin.GetValue(),246 self.localTrackNumEdit.GetValue(), 256 247 ldata.duration, fileName, puid) 257 248 … … 268 259 self.localAlbumCombo.GetValue(), 269 260 self.localTrackEdit.GetValue(), 270 self.localTrackNum Spin.GetValue(),261 self.localTrackNumEdit.GetValue(), 271 262 ldata.duration, fileName, puid) 272 263 … … 350 341 mdata.album = self.localAlbumCombo.GetValue() 351 342 mdata.track = self.localTrackEdit.GetValue() 352 mdata.trackNum = self.localTrackNumSpin.GetValue()343 mdata.trackNum = int(self.localTrackNumEdit.GetValue()) 353 344 self.setReleaseDate(mdata, self.localDateEdit.GetValue()) 354 345 tpTrack.setServerMetadata(mdata) … … 376 367 mdata.album = self.localAlbumCombo.GetValue() 377 368 mdata.track = self.localTrackEdit.GetValue() 378 mdata.trackNum = self.localTrackNumSpin.GetValue()369 mdata.trackNum = int(self.localTrackNumEdit.GetValue()) 379 370 self.setReleaseDate(mdata, self.localDateEdit.GetValue()) 380 371 tpTrack.setLocalMetadata(mdata) … … 399 390 self.localAlbumCombo.Enable(state) 400 391 self.localTrackEdit.Enable(state) 401 self.localTrackNum Spin.Enable(state)392 self.localTrackNumEdit.Enable(state) 402 393 self.localDurationEdit.Enable(state) 403 394 self.localDateEdit.Enable(state) … … 420 411 self.localTrackEdit.Clear() 421 412 self.localDurationEdit.Clear() 422 self.localTrackNum Spin.SetValue(0)413 self.localTrackNumEdit.Clear() 423 414 self.localDateEdit.Clear() 424 415 … … 523 514 self.localDurationEdit.SetValue("") 524 515 self.localTrackEdit.SetValue("") 525 self.localTrackNum Spin.SetValue(0)516 self.localTrackNumEdit.SetValue("") 526 517 self.localDateEdit.SetValue("") 527 518 … … 569 560 self.localDurationEdit.SetValue(u"%d:%02d" % ((mdata.duration / 60000), 570 561 ((mdata.duration % 60000) / 1000))) 571 self.localTrackNum Spin.SetValue(mdata.trackNum)562 self.localTrackNumEdit.SetValue(str(mdata.trackNum)) 572 563 self.localDateEdit.SetValue(self.getReleaseDate(mdata)) 573 564 … … 623 614 self.localDurationEdit.SetValue(u"%d:%02d" % ((mdata.duration / 60000), 624 615 ((mdata.duration % 60000) / 1000))) 625 self.localTrackNum Spin.SetValue(mdata.trackNum)616 self.localTrackNumEdit.SetValue(str(mdata.trackNum)) 626 617 self.localDateEdit.SetValue(self.getReleaseDate(mdata)) 627 618 self.frame.setStatusText(fileName)
