Some fixes for ymsgui

This commit is contained in:
2026-08-17 18:59:02 +02:00
parent e43548b7fd
commit f4281020b0
2 changed files with 26 additions and 23 deletions
+21 -19
View File
@@ -42,11 +42,23 @@ cfg = {
'shapedir': 'webgui/shapes'
}
def get_share_dir():
program_dir = os.path.dirname(os.path.abspath(__file__))
source_ui = os.path.join(program_dir, "yms", "ui", "main.ui")
if os.path.isfile(source_ui):
return program_dir
return os.path.join(
os.path.dirname(os.path.dirname(program_dir)),
"share",
"yms"
)
class Frontend():
def __init__(self):
self.uipath = os.path.join(get_share_dir(), "yms", "ui")
builder = Gtk.Builder()
builder.add_from_file("yms/ui/main.ui")
builder.add_from_file(os.path.join(self.uipath, "main.ui"))
builder.connect_signals(self)
self.window = builder.get_object("wnd_main")
gtkutils.init_named_controls(self, builder)
@@ -230,21 +242,6 @@ def create_config(cfgfile):
os.chmod(cfgfile, 0o600)
if __name__ == "__main__":
dialog = Gtk.MessageDialog(
message_type=Gtk.MessageType.QUESTION,
buttons=Gtk.ButtonsType.YES_NO,
text="Are you sure?"
)
image = Gtk.Image.new_from_stock(
Gtk.STOCK_DIALOG_QUESTION,
Gtk.IconSize.DIALOG
)
dialog.set_image(image)
dialog.show_all()
response = dialog.run()
dialog.destroy()
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain('ymsgui', 'locale')
gettext.textdomain('ymsgui')
@@ -262,10 +259,15 @@ if __name__ == "__main__":
else:
cfg['host'] = config.get('DB', 'host')
cfg['db'] = config.get('DB', 'db')
cfg['user'] = config.get('DB', 'user')
cfg['pass'] = config.get('DB', 'pass')
db = database.Database(cfg['host'], cfg['db'])
if db.connect(cfg['user'], cfg['pass']):
connected = False
if cfg['host'] == 'socket':
connected = db.connect_local()
else:
cfg['user'] = config.get('DB', 'user')
cfg['pass'] = config.get('DB', 'pass')
connected = db.connect(cfg['user'], cfg['pass'])
if connected:
app = Frontend()
app.run()
db.disconnect()