steffen
/
testmodbus-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

update, seperate log and status

Browse Source
main
Steffen Pohle 1 year ago
parent 5ab0140ff5
commit 64183638a6
3 changed files with 105 additions and 122 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -1,5 +1,5 @@
.SILENT: help .SILENT: help
VERSION = 0.1.2 VERSION = 0.1.9
-include Makefile.rules -include Makefile.rules

3
client.cc
Unescape View File

@ -82,6 +82,9 @@ void mbcli_cb_show(GtkWidget *widget, gpointer data) {
GtkTextTag *tag_head; GtkTextTag *tag_head;
GtkWidget *textview = GTK_WIDGET(gtk_builder_get_object (_builder_, "cli_RawResult")); GtkWidget *textview = GTK_WIDGET(gtk_builder_get_object (_builder_, "cli_RawResult"));
GtkTextBuffer *textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); GtkTextBuffer *textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
GtkWidget *lbVersion = GTK_WIDGET(gtk_builder_get_object (_builder_, "cli_LabelVersion"));
gtk_label_set_label (GTK_LABEL(lbVersion), "Version: " VERSION);
tag_head = gtk_text_buffer_create_tag (textbuffer, "Head", tag_head = gtk_text_buffer_create_tag (textbuffer, "Head",
"foreground", "green", "style", PANGO_WEIGHT_HEAVY, "family", "Monospace", NULL); "foreground", "green", "style", PANGO_WEIGHT_HEAVY, "family", "Monospace", NULL);

190
testmodbus-client.ui
Unescape View File

@ -127,8 +127,7 @@
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Refresh [ms]: <property name="label" translatable="yes">Refresh [ms]: (&lt; 100 = On Demand)</property>
(&lt; 100 = On Demand)</property>
<property name="justify">right</property> <property name="justify">right</property>
</object> </object>
<packing> <packing>
@ -205,86 +204,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-top">8</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cli_statusbarold">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">8</property>
<property name="margin-right">8</property>
<property name="margin-start">8</property>
<property name="margin-end">8</property>
<property name="margin-top">8</property>
<property name="margin-bottom">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cli_statusbar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">8</property>
<property name="margin-right">8</property>
<property name="margin-start">8</property>
<property name="margin-end">8</property>
<property name="margin-top">1</property>
<property name="margin-bottom">8</property>
<attributes>
<attribute name="style" value="normal"/>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -619,35 +538,38 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkFrame"> <object class="GtkPaned">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label-xalign">0</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="left-padding">12</property> <property name="wide-handle">True</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<placeholder/> <object class="GtkLabel">
</child> <property name="visible">True</property>
<child> <property name="can-focus">False</property>
<placeholder/> <property name="label" translatable="yes">Result</property>
</child> <attributes>
<child> <attribute name="weight" value="bold"/>
<placeholder/> </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="margin-top">4</property>
<property name="margin-bottom">4</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
<object class="GtkTextView" id="cli_RawResult"> <object class="GtkTextView" id="cli_RawResult">
@ -659,23 +581,62 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child> </child>
</object> <child>
</child> <object class="GtkBox">
<child type="label"> <property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Result</property> <property name="label" translatable="yes">Log</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
<attribute name="scale" value="1"/>
</attributes> </attributes>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="margin-top">4</property>
<property name="margin-bottom">4</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTextView" id="cli_LogResult">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@ -684,6 +645,25 @@
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="cli_LabelVersion">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="margin-end">8</property>
<property name="label" translatable="yes">VERSION</property>
<property name="justify">right</property>
<property name="ellipsize">end</property>
<attributes>
<attribute name="style" value="oblique"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>

Write Preview
Loading…
Cancel
Save