diff --git a/images/dice.png b/images/dice.png index fbee8bac..61c76841 100644 Binary files a/images/dice.png and b/images/dice.png differ diff --git a/images/random.png b/images/random.png index 9314b572..c67eb31a 100644 Binary files a/images/random.png and b/images/random.png differ diff --git a/ocarina/components/button.py b/ocarina/components/button.py index 522edf20..9f92df32 100644 --- a/ocarina/components/button.py +++ b/ocarina/components/button.py @@ -9,10 +9,10 @@ invite = LS.event.invite class Button(gtk.Button): - def __init__(self, stock, size=gtk.ICON_SIZE_MENU, func=None, show=True): + def __init__(self, stock, func=None, show=True): gtk.Button.__init__(self) self.func = func - img = gtk.image_new_from_stock(stock, size) + img = gtk.image_new_from_stock(stock, gtk.ICON_SIZE_MENU) img.show() self.add(img) self.set_relief(gtk.RELIEF_NONE) @@ -91,28 +91,28 @@ class RewindButton(Button): class OpenButton(Button): def __init__(self): - Button.__init__(self, gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON) + Button.__init__(self, gtk.STOCK_OPEN) def clicked(self, button): from ocarina import fsselect fsselect.run_chooser2(LS.path.files.universal_open) class ClearButton(Button): def __init__(self): - Button.__init__(self, gtk.STOCK_CLEAR, gtk.ICON_SIZE_BUTTON) + Button.__init__(self, gtk.STOCK_CLEAR) def clicked(self, button): from ocarina import body body.cur_page_reset() class ExportButton(Button): def __init__(self): - Button.__init__(self, gtk.STOCK_CONVERT, gtk.ICON_SIZE_BUTTON) + Button.__init__(self, gtk.STOCK_CONVERT) def clicked(self, button): from libsaria.path import backup backup.backup() class GotoButton(Button): def __init__(self): - Button.__init__(self, gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_BUTTON) + Button.__init__(self, gtk.STOCK_JUMP_TO) def clicked(self, button): from ocarina import body body.cur_page_goto() @@ -165,7 +165,7 @@ class VolumeButton(gtk.VolumeButton): def resize(self): image = self.get_children()[0] icon = image.get_icon_name()[0] - image.set_from_icon_name(icon, gtk.ICON_SIZE_BUTTON) + image.set_from_icon_name(icon, gtk.ICON_SIZE_MENU) def changed(self, widget, value): LS.controls.set_volume(value)