Compare commits

...

2 Commits

View File

@ -131,7 +131,7 @@ class BuypeebApp:
msgbox.destroy()
return response
def entryBox(self, title, text, allow_cancel = True):
def entryBox(self, title, text, allow_cancel = True, prefilled: str = ""):
# thanks to https://ardoris.wordpress.com/2008/07/05/pygtk-text-entry-dialog/
entrybox = Gtk.MessageDialog(
parent = self.window,
@ -144,6 +144,7 @@ class BuypeebApp:
entrybox.set_markup(text)
entry = Gtk.Entry()
entry.set_text(prefilled)
entry.connect("activate", self.entryBoxResponse, entrybox, Gtk.ResponseType.OK) # allow for pressing enter instead of clicking OK
entrybox.vbox.pack_end(entry, True, True, 0)
@ -173,7 +174,7 @@ class BuypeebApp:
# print(self.settings.watchlist)
for id, item in self.settings.watchlist.items():
if item.ready:
self.items.append([item.name, item.price_jpy(), item.price_aud(self.rate), "...", id])
self.items.append([item.name if item.name is not None else "", item.price_jpy(), item.price_aud(self.rate), "...", id])
else:
name = item.name
if name == None:
@ -190,9 +191,9 @@ class BuypeebApp:
treeIter = Gtk.TreeModel.get_iter(self.items, listing.path)
if item_list != None:
for i in range(0, 4):
self.items.set(treeIter, i, item_list[i])
self.items.set(treeIter, i, item_list[i] if item_list[0] is not None else "")
else:
self.items.set(treeIter, 0, item.name)
self.items.set(treeIter, 0, item.name if item.name is not None else "")
if item.ready:
self.items.set(treeIter, 1, item.price_jpy())
self.items.set(treeIter, 2, item.price_aud())
@ -277,11 +278,10 @@ class BuypeebApp:
def btnSelectedRenameClicked(self, widget):
item = self.settings.watchlist[self.selected]
name = self.entryBox("Rename", f"Enter a new name for \"{item.name}\".")
if name:
name = self.entryBox("Rename", f"Enter a new name for \"{item.name}\".", True, item.name)
if name and item.name != name:
item.name = name
self.updateListItem(item.id)
self.updateListItem(item.id)
def btnSelectedRemoveClicked(self, widget):
del self.settings.watchlist[self.selected]