Skip to content

E
eepm-play-gui
Commit dd326b0e authored by Roman Alifanov's avatar Roman Alifanov
Browse files
Options

increased the width of the logdialog

parent 39910e3d
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 83 deletions
src/tools/command_runner.py
View file @ dd326b0e
...@@ -64,6 +64,7 @@ class CommandRunner: ...@@ -64,6 +64,7 @@ class CommandRunner:
self.dialog.question_button_2.add_css_class("destructive-action") self.dialog.question_button_2.add_css_class("destructive-action")
self.dialog.question_button_1.add_css_class("suggested-action") self.dialog.question_button_1.add_css_class("suggested-action")
self.dialog.question_revealer.set_visible(True)
self.dialog.question_revealer.set_reveal_child(True) self.dialog.question_revealer.set_reveal_child(True)
def read_output(self, fd): def read_output(self, fd):
...@@ -75,6 +76,7 @@ class CommandRunner: ...@@ -75,6 +76,7 @@ class CommandRunner:
self.append_log(cleaned_output) self.append_log(cleaned_output)
self.dialog.question_revealer.set_reveal_child(False) self.dialog.question_revealer.set_reveal_child(False)
self.dialog.question_revealer.set_visible(False)
self.handle_question(cleaned_output, fd) self.handle_question(cleaned_output, fd)
else: else:
break break
......
src/widgets/logdialog.cmb
View file @ dd326b0e
<?xml version='1.0' encoding='UTF-8' standalone='no'?> <?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd"> <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
<cambalache-project version="0.92.0" target_tk="gtk-4.0"> <cambalache-project version="0.94.0" target_tk="gtk-4.0">
<ui> <ui>
(1,1,"logdialog.ui","logdialog.ui",None,None,None,None,None,None,None) (1,1,"logdialog.ui","logdialog.ui",None,None,None,None,None,None,None)
</ui> </ui>
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
</ui_library> </ui_library>
<object> <object>
(1,1,"AdwDialog","LogDialog",None,None,None,None,0,None,None), (1,1,"AdwDialog","LogDialog",None,None,None,None,0,None,None),
(1,2,"AdwClamp",None,1,None,None,None,0,None,None), (1,3,"GtkBox",None,1,None,None,None,0,None,None),
(1,3,"GtkBox",None,2,None,None,None,0,None,None),
(1,4,"GtkScrolledWindow",None,3,None,None,None,0,None,None), (1,4,"GtkScrolledWindow",None,3,None,None,None,0,None,None),
(1,5,"GtkTextView","logdialog_textview",4,None,None,None,0,None,None), (1,5,"GtkTextView","logdialog_textview",4,None,None,None,0,None,None),
(1,6,"GtkRevealer","question_revealer",3,None,None,None,1,None,None), (1,6,"GtkRevealer","question_revealer",3,None,None,None,1,None,None),
...@@ -27,19 +26,13 @@ ...@@ -27,19 +26,13 @@
</object> </object>
<object_property> <object_property>
(1,1,"AdwDialog","can-close","false",0,None,None,None,None,None,None,None,None), (1,1,"AdwDialog","can-close","false",0,None,None,None,None,None,None,None,None),
(1,1,"AdwDialog","follows-content-size","true",0,None,None,None,None,None,None,None,None), (1,1,"AdwDialog","content-width","1000",None,None,None,None,None,None,None,None,None),
(1,1,"AdwDialog","title","Лог выполнения",0,None,None,None,None,None,None,None,None), (1,1,"AdwDialog","title","Лог выполнения",0,None,None,None,None,None,None,None,None),
(1,2,"AdwClamp","maximum-size","500",0,None,None,None,None,None,None,None,None),
(1,2,"GtkWidget","margin-bottom","12",0,None,None,None,None,None,None,None,None),
(1,2,"GtkWidget","margin-end","12",0,None,None,None,None,None,None,None,None),
(1,2,"GtkWidget","margin-start","12",0,None,None,None,None,None,None,None,None),
(1,2,"GtkWidget","margin-top","12",0,None,None,None,None,None,None,None,None),
(1,3,"GtkBox","spacing","12",0,None,None,None,None,None,None,None,None), (1,3,"GtkBox","spacing","12",0,None,None,None,None,None,None,None,None),
(1,3,"GtkOrientable","orientation","vertical",0,None,None,None,None,None,None,None,None), (1,3,"GtkOrientable","orientation","vertical",0,None,None,None,None,None,None,None,None),
(1,4,"GtkScrolledWindow","hscrollbar-policy","never",0,None,None,None,None,None,None,None,None), (1,4,"GtkScrolledWindow","hscrollbar-policy","never",0,None,None,None,None,None,None,None,None),
(1,4,"GtkWidget","height-request","300",0,None,None,None,None,None,None,None,None), (1,4,"GtkWidget","height-request","300",0,None,None,None,None,None,None,None,None),
(1,4,"GtkWidget","vexpand","true",0,None,None,None,None,None,None,None,None), (1,4,"GtkWidget","vexpand","true",0,None,None,None,None,None,None,None,None),
(1,4,"GtkWidget","width-request","198",0,None,None,None,None,None,None,None,None),
(1,5,"GtkTextView","cursor-visible","false",0,None,None,None,None,None,None,None,None), (1,5,"GtkTextView","cursor-visible","false",0,None,None,None,None,None,None,None,None),
(1,5,"GtkTextView","editable","false",0,None,None,None,None,None,None,None,None), (1,5,"GtkTextView","editable","false",0,None,None,None,None,None,None,None,None),
(1,5,"GtkTextView","input-purpose","terminal",0,None,None,None,None,None,None,None,None), (1,5,"GtkTextView","input-purpose","terminal",0,None,None,None,None,None,None,None,None),
......
src/widgets/logdialog.py
View file @ dd326b0e
...@@ -17,6 +17,7 @@ class LogDialog(Adw.Dialog): ...@@ -17,6 +17,7 @@ class LogDialog(Adw.Dialog):
self.win = win self.win = win
def run(self, command, on_done): def run(self, command, on_done):
self.question_revealer.set_visible(False)
self.present(self.win) self.present(self.win)
# Создание и передача функции обратного вызова для обновления UI # Создание и передача функции обратного вызова для обновления UI
runner = CommandRunner() runner = CommandRunner()
......
src/widgets/logdialog.ui
View file @ dd326b0e
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.92.0 --> <!-- Created with Cambalache 0.94.1 -->
<interface> <interface>
<!-- interface-name logdialog.ui --> <!-- interface-name logdialog.ui -->
<requires lib="adwaita" version="1.0"/> <requires lib="adwaita" version="1.0"/>
...@@ -7,101 +7,91 @@ ...@@ -7,101 +7,91 @@
<requires lib="libadwaita" version="1.5"/> <requires lib="libadwaita" version="1.5"/>
<template class="LogDialog" parent="AdwDialog"> <template class="LogDialog" parent="AdwDialog">
<property name="can-close">false</property> <property name="can-close">false</property>
<property name="follows-content-size">true</property> <property name="content-width">1000</property>
<property name="title">Лог выполнения</property> <property name="title">Лог выполнения</property>
<child> <child>
<object class="AdwClamp"> <object class="GtkBox">
<property name="margin-bottom">12</property> <property name="orientation">vertical</property>
<property name="margin-end">12</property> <property name="spacing">12</property>
<property name="margin-start">12</property>
<property name="margin-top">12</property>
<property name="maximum-size">500</property>
<child> <child>
<object class="GtkBox"> <object class="GtkScrolledWindow">
<property name="orientation">vertical</property> <property name="height-request">300</property>
<property name="spacing">12</property> <property name="hscrollbar-policy">never</property>
<property name="vexpand">true</property>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkTextView" id="logdialog_textview">
<property name="height-request">300</property> <property name="can-focus">False</property>
<property name="hscrollbar-policy">never</property> <property name="can-target">False</property>
<property name="vexpand">true</property> <property name="cursor-visible">false</property>
<property name="width-request">198</property> <property name="editable">false</property>
<child> <property name="focus-on-click">False</property>
<object class="GtkTextView" id="logdialog_textview"> <property name="input-purpose">terminal</property>
<property name="can-focus">False</property> <property name="monospace">True</property>
<property name="can-target">False</property> <property name="wrap-mode">word-char</property>
<property name="cursor-visible">false</property>
<property name="editable">false</property>
<property name="focus-on-click">False</property>
<property name="input-purpose">terminal</property>
<property name="monospace">True</property>
<property name="wrap-mode">word-char</property>
</object>
</child>
</object> </object>
</child> </child>
<child> </object>
<object class="GtkRevealer" id="question_revealer"> </child>
<property name="child"> <child>
<object class="AdwClamp"> <object class="GtkRevealer" id="question_revealer">
<property name="margin-bottom">12</property> <property name="child">
<property name="margin-end">12</property> <object class="AdwClamp">
<property name="margin-start">12</property> <property name="margin-bottom">12</property>
<property name="margin-top">12</property> <property name="margin-end">12</property>
<property name="margin-start">12</property>
<property name="margin-top">12</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="question_label">
<property name="halign">center</property>
<property name="justify">center</property>
<property name="label">question_label</property>
<property name="margin-bottom">12</property>
<property name="valign">center</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
<style>
<class name="title-4"/>
</style>
</object>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkLabel" id="question_label"> <object class="GtkListBox">
<property name="halign">center</property> <property name="hexpand">True</property>
<property name="justify">center</property> <child>
<property name="label">question_label</property> <object class="AdwButtonRow" id="question_button_1">
<property name="margin-bottom">12</property> <property name="title">n</property>
<property name="valign">center</property> </object>
<property name="wrap">True</property> </child>
<property name="wrap-mode">word-char</property>
<style> <style>
<class name="title-4"/> <class name="boxed-list"/>
</style> </style>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkListBox">
<property name="spacing">12</property> <property name="hexpand">True</property>
<child>
<object class="GtkListBox">
<property name="hexpand">True</property>
<child>
<object class="AdwButtonRow" id="question_button_1">
<property name="title">n</property>
</object>
</child>
<style>
<class name="boxed-list"/>
</style>
</object>
</child>
<child> <child>
<object class="GtkListBox"> <object class="AdwButtonRow" id="question_button_2">
<property name="hexpand">True</property> <property name="title">Y</property>
<child>
<object class="AdwButtonRow" id="question_button_2">
<property name="title">Y</property>
</object>
</child>
<style>
<class name="boxed-list"/>
</style>
</object> </object>
</child> </child>
<style>
<class name="boxed-list"/>
</style>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
</object> </object>
</property> </child>
</object> </object>
</child> </property>
</object> </object>
</child> </child>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment