diff options
| author | leleraffa97@hotmail.it <leleraffa97@hotmail.it> | 2017-08-23 21:18:02 +0200 |
|---|---|---|
| committer | leleraffa97@hotmail.it <leleraffa97@hotmail.it> | 2017-08-23 21:18:02 +0200 |
| commit | 3f92d0e29700fc2da45354a4cf3e3afe5c5245c2 (patch) | |
| tree | cb6def68635ff2b4e4ab30c7e8fdbdf3e730bc05 /sw/linux/src/z80prog | |
| parent | Filesystem struct order (diff) | |
| parent | new programmer interface for linux (diff) | |
| download | z80uPC-3f92d0e29700fc2da45354a4cf3e3afe5c5245c2.tar.gz z80uPC-3f92d0e29700fc2da45354a4cf3e3afe5c5245c2.zip | |
Merge remote-tracking branch 'origin/naopross' into atlas
Diffstat (limited to '')
| -rwxr-xr-x | sw/linux/src/z80prog | bin | 34688 -> 0 bytes | |||
| -rw-r--r-- | sw/programmer/linux/src/z80prog.ui (renamed from sw/linux/src/z80prog.ui) | 43 |
2 files changed, 22 insertions, 21 deletions
diff --git a/sw/linux/src/z80prog b/sw/linux/src/z80prog Binary files differdeleted file mode 100755 index 878683b..0000000 --- a/sw/linux/src/z80prog +++ /dev/null diff --git a/sw/linux/src/z80prog.ui b/sw/programmer/linux/src/z80prog.ui index 3735efa..6c652ec 100644 --- a/sw/linux/src/z80prog.ui +++ b/sw/programmer/linux/src/z80prog.ui @@ -44,7 +44,8 @@ <object class="GtkEntry" id="devpath"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Enter path</property> + <property name="text" translatable="yes">/dev/tty</property> + <property name="placeholder_text" translatable="yes">Enter device path</property> </object> <packing> <property name="expand">True</property> @@ -59,14 +60,14 @@ <property name="width_chars">0</property> <property name="max_width_chars">7</property> <property name="overwrite_mode">True</property> - <property name="placeholder_text" translatable="yes">9600</property> + <property name="placeholder_text" translatable="yes">1200</property> <property name="input_purpose">number</property> <property name="adjustment">baudrateadjust</property> <property name="climb_rate">10</property> <property name="snap_to_ticks">True</property> <property name="numeric">True</property> <property name="update_policy">if-valid</property> - <property name="value">9600</property> + <property name="value">1200</property> </object> <packing> <property name="expand">False</property> @@ -104,7 +105,7 @@ <object class="GtkEntry" id="filepath"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Binary Path</property> + <property name="placeholder_text" translatable="yes">Enter binary path</property> </object> <packing> <property name="expand">True</property> @@ -173,21 +174,21 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="logscrolled"> + <object class="GtkViewport" id="logviewport"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> <child> - <object class="GtkViewport" id="logviewport"> + <object class="GtkExpander" id="logexpander"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="expanded">True</property> + <property name="label_fill">True</property> + <property name="resize_toplevel">True</property> <child> - <object class="GtkExpander" id="logexpander"> + <object class="GtkScrolledWindow" id="logscroller"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="expanded">True</property> - <property name="label_fill">True</property> - <property name="resize_toplevel">True</property> + <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="logview"> <property name="visible">True</property> @@ -198,13 +199,13 @@ <property name="monospace">True</property> </object> </child> - <child type="label"> - <object class="GtkLabel" id="loglabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Logs</property> - </object> - </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="loglabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Logs</property> </object> </child> </object> @@ -213,7 +214,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> </object> |