[gevice] show/hide more data in diagram
- From: Alejandro Valdes Jimenez <avaldes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gevice] show/hide more data in diagram
- Date: Tue, 28 Jul 2009 16:44:15 +0000 (UTC)
commit 5f6b995f8bedcfb9bf7f73aa13690b5422ede100
Author: Alejandro Valdes jimenez <avaldes amvj in utalca cl>
Date: Tue Jul 28 12:34:50 2009 -0400
show/hide more data in diagram
ChangeLog | 8 +
data/glade/gevice.glade | 690 +++++++++++++++++++++++------------------------
src/gevice.py | 5 +-
src/gevicedatabase.py | 5 +-
src/gevicediagram.py | 24 +-
src/gevicemodel.py | 11 +-
6 files changed, 362 insertions(+), 381 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b37cc05..2147906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-28 Alejandro Valdes jimenez <avaldes gnome org>
+
+ * data/glade/gevice.glade: remove viewport (notebook)
+ * src/gevice.py:
+ * src/gevicedatabase.py:
+ * src/gevicediagram.py: show/hide more data in diagram
+ * src/gevicemodel.py:
+
2009-07-05 Alejandro Valdes Jimenez <avaldes gnome org>
* TODO: added file with pending jobs.
diff --git a/data/glade/gevice.glade b/data/glade/gevice.glade
index 7580aeb..3c1eb36 100644
--- a/data/glade/gevice.glade
+++ b/data/glade/gevice.glade
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Tue Jul 28 12:32:11 2009 -->
<glade-interface>
- <!-- interface-requires gtk+ 2.16 -->
- <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="window_main">
<property name="width_request">700</property>
<property name="height_request">500</property>
<property name="title" translatable="yes">Gevice</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox_main">
<property name="visible">True</property>
@@ -29,11 +29,10 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkVBox" id="vboxterminal">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
<child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
@@ -47,9 +46,6 @@
</packing>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
</widget>
</child>
@@ -58,9 +54,9 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">Device</property>
<property name="resizable">False</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
@@ -77,64 +73,78 @@
<property name="column_spacing">2</property>
<property name="row_spacing">2</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkEntry" id="entry_comment_device">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Name</property>
+ <property name="label" translatable="yes" context="yes">Comment</property>
</widget>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name_device">
+ <widget class="GtkEntry" id="entry_serial_device">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Link</property>
+ <property name="label" translatable="yes" context="yes">Serial</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_link">
+ <widget class="GtkComboBox" id="combo_model">
<property name="visible">True</property>
<property name="items" translatable="yes" context="yes"></property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">IP</property>
+ <property name="label" translatable="yes" context="yes">Model</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
@@ -153,94 +163,78 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Model</property>
+ <property name="label" translatable="yes" context="yes">IP</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_model">
+ <widget class="GtkComboBox" id="combo_link">
<property name="visible">True</property>
<property name="items" translatable="yes" context="yes"></property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Serial</property>
+ <property name="label" translatable="yes" context="yes">Link</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_serial_device">
+ <widget class="GtkEntry" id="entry_name_device">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Comment</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_comment_device">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes" context="yes">Name</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -249,32 +243,31 @@
<property name="spacing">5</property>
<child>
<widget class="GtkButton" id="button_cancel_device">
- <property name="label" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_accept_device">
- <property name="label" context="yes">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-ok</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -291,9 +284,9 @@
<property name="border_width">5</property>
<property name="title" translatable="yes" context="yes">Preferences</property>
<property name="resizable">False</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child>
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
@@ -309,61 +302,61 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_model">
- <property name="label" translatable="yes" context="yes">Model</property>
+ <widget class="GtkCheckButton" id="checkbutton_comments">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Comment</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_ip">
- <property name="label" translatable="yes" context="yes">IP</property>
+ <widget class="GtkCheckButton" id="checkbutton_serial">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Serial</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_serial">
- <property name="label" translatable="yes" context="yes">Serial</property>
+ <widget class="GtkCheckButton" id="checkbutton_ip">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">IP</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_comments">
- <property name="label" translatable="yes" context="yes">Comment</property>
+ <widget class="GtkCheckButton" id="checkbutton_model">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Model</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
@@ -377,19 +370,19 @@
<property name="label" translatable="yes" context="yes">View</property>
</widget>
<packing>
- <property name="tab_fill">False</property>
<property name="type">tab</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
<widget class="GtkTreeView" id="treeview_users">
<property name="visible">True</property>
@@ -398,35 +391,33 @@
</widget>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
<widget class="GtkButton" id="button_add_user">
- <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="use_stock">True</property>
<property name="xalign">0.50999999046325684</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_rem_user">
- <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -452,9 +443,9 @@
<property name="label" translatable="yes" context="yes">Lists of users</property>
</widget>
<packing>
+ <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
@@ -474,29 +465,39 @@
<property name="n_columns">3</property>
<property name="column_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkButton" id="button_forecolor">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Background</property>
+ <property name="can_focus">True</property>
+ <property name="label" context="yes">gtk-select-color</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkButton" id="button_backcolor">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Text color</property>
+ <property name="can_focus">True</property>
+ <property name="label" context="yes">gtk-select-color</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_backcolor">
+ <widget class="GtkEntry" id="entry_forecolor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
@@ -504,12 +505,14 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_forecolor">
+ <widget class="GtkEntry" id="entry_backcolor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
@@ -517,40 +520,28 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_backcolor">
- <property name="label" context="yes">gtk-select-color</property>
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes" context="yes">Text color</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_forecolor">
- <property name="label" context="yes">gtk-select-color</property>
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes" context="yes">Background</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
@@ -567,9 +558,9 @@
<property name="label" translatable="yes" context="yes">Colors</property>
</widget>
<packing>
+ <property name="type">tab</property>
<property name="position">3</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
@@ -579,27 +570,26 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_link_diag">
- <property name="label" translatable="yes" context="yes">Link</property>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton_ip_diag">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">IP</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkbutton_model_diag">
- <property name="label" translatable="yes" context="yes">Model</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Model</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -609,18 +599,19 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_ip_diag">
- <property name="label" translatable="yes" context="yes">IP</property>
+ <widget class="GtkCheckButton" id="checkbutton_link_diag">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Link</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
- </child>
- <child>
- <placeholder/>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
</child>
</widget>
<packing>
@@ -633,9 +624,9 @@
<property name="label" translatable="yes" context="yes">Diagram</property>
</widget>
<packing>
+ <property name="type">tab</property>
<property name="position">4</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
@@ -645,28 +636,35 @@
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkEntry" id="entry_host">
+ <widget class="GtkLabel" id="label24">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">User database</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_dbase">
+ <widget class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Database</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Host</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkEntry" id="entry_user_dbase">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -679,32 +677,25 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Host</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkEntry" id="entry_dbase">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Database</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label24">
+ <widget class="GtkEntry" id="entry_host">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">User database</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
@@ -719,9 +710,9 @@
<property name="label" translatable="yes" context="yes">Database</property>
</widget>
<packing>
+ <property name="type">tab</property>
<property name="position">5</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
@@ -730,6 +721,13 @@
<property name="border_width">5</property>
<property name="n_columns">2</property>
<child>
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Separator</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkEntry" id="entry_csvseparator">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -739,13 +737,6 @@
<property name="right_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Separator</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">6</property>
@@ -758,16 +749,15 @@
<property name="label" translatable="yes" context="yes">CSV</property>
</widget>
<packing>
+ <property name="type">tab</property>
<property name="position">6</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -775,17 +765,16 @@
<property name="visible">True</property>
<child>
<widget class="GtkButton" id="button_close_prefer">
- <property name="label" context="yes">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-close</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -803,7 +792,7 @@
<property name="border_width">5</property>
<property name="title" translatable="yes" context="yes">Generate diagram</property>
<property name="resizable">False</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
@@ -820,7 +809,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -866,7 +854,6 @@ svg</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -875,32 +862,31 @@ svg</property>
<property name="spacing">5</property>
<child>
<widget class="GtkButton" id="button_diagram_cancel">
- <property name="label" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_diagram_generate">
- <property name="label" context="yes">gtk-convert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-convert</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -917,7 +903,7 @@ svg</property>
<property name="border_width">5</property>
<property name="title" translatable="yes" context="yes">Find</property>
<property name="resizable">False</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
@@ -928,25 +914,22 @@ svg</property>
<property name="spacing">5</property>
<child>
<widget class="GtkRadioButton" id="radiobutton_namedevice">
- <property name="label" translatable="yes" context="yes">Device name</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Device name</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkRadioButton" id="radiobutton_ip">
- <property name="label" translatable="yes" context="yes">IP</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">IP</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_namedevice</property>
@@ -957,11 +940,11 @@ svg</property>
</child>
<child>
<widget class="GtkRadioButton" id="radiobutton_serial">
- <property name="label" translatable="yes" context="yes">Serial</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes" context="yes">Serial</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_namedevice</property>
@@ -974,7 +957,6 @@ svg</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -989,7 +971,6 @@ svg</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -1017,32 +998,31 @@ svg</property>
<property name="spacing">5</property>
<child>
<widget class="GtkButton" id="button_find_cancel">
- <property name="label" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_find_find">
- <property name="label" context="yes">gtk-find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-find</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -1058,7 +1038,7 @@ svg</property>
<widget class="GtkWindow" id="window_database">
<property name="title" translatable="yes" context="yes">Connect to database</property>
<property name="modal">True</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
@@ -1072,40 +1052,43 @@ svg</property>
<property name="column_spacing">10</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkEntry" id="entry_passwd_dbase">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Host:</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Database:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_user_dbase">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">User database:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_dbase">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Password:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -1119,49 +1102,43 @@ svg</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkLabel" id="label_dbase">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Password:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkLabel" id="label_user_dbase">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">User database:</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkEntry" id="entry_passwd_dbase">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Database:</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label25">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Host:</property>
- </widget>
- </child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox11">
@@ -1170,32 +1147,31 @@ svg</property>
<property name="spacing">5</property>
<child>
<widget class="GtkButton" id="button_connect_cancel">
- <property name="label" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_connect_dbase">
- <property name="label" context="yes">gtk-connect</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-connect</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -1208,18 +1184,18 @@ svg</property>
</child>
</widget>
<widget class="GtkWindow" id="window_maintainer">
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="default_width">350</property>
<property name="default_height">300</property>
<child>
<widget class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
<widget class="GtkTreeView" id="treeview">
<property name="visible">True</property>
@@ -1229,9 +1205,6 @@ svg</property>
</widget>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox10">
@@ -1242,46 +1215,49 @@ svg</property>
</child>
<child>
<widget class="GtkButton" id="button_close">
- <property name="label" translatable="yes" context="yes">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-close</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_add">
- <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_rem">
- <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
@@ -1296,18 +1272,18 @@ svg</property>
</child>
</widget>
<widget class="GtkWindow" id="window_maintainer1">
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="default_width">350</property>
<property name="default_height">300</property>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <widget class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
<widget class="GtkTreeView" id="treeview1">
<property name="visible">True</property>
@@ -1317,9 +1293,6 @@ svg</property>
</widget>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox12">
@@ -1330,46 +1303,49 @@ svg</property>
</child>
<child>
<widget class="GtkButton" id="button_close1">
- <property name="label" translatable="yes" context="yes">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-close</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_add1">
- <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-add</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_rem1">
- <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-remove</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
@@ -1386,7 +1362,7 @@ svg</property>
<widget class="GtkWindow" id="window_model">
<property name="title" translatable="yes" context="yes">New Model</property>
<property name="modal">True</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
@@ -1399,29 +1375,29 @@ svg</property>
<property name="column_spacing">5</property>
<property name="row_spacing">2</property>
<child>
- <widget class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Model</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkComboBox" id="combobox_mark">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Type</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label21">
+ <widget class="GtkComboBox" id="combobox_type">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Mark</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1437,36 +1413,35 @@ svg</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_type">
+ <widget class="GtkLabel" id="label21">
<property name="visible">True</property>
+ <property name="label" translatable="yes" context="yes">Mark</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_mark">
+ <widget class="GtkLabel" id="label18">
<property name="visible">True</property>
+ <property name="label" translatable="yes" context="yes">Type</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" context="yes">Model</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -1474,32 +1449,33 @@ svg</property>
<property name="visible">True</property>
<child>
<widget class="GtkButton" id="button_cancel">
- <property name="label" translatable="yes" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_ok">
- <property name="label" translatable="yes" context="yes">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="label" translatable="yes" context="yes">gtk-ok</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -1515,7 +1491,7 @@ svg</property>
<widget class="GtkWindow" id="window_database_save">
<property name="title" translatable="yes" context="yes">Save model to database</property>
<property name="modal">True</property>
- <property name="window_position">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
<widget class="GtkVBox" id="vbox11">
<property name="visible">True</property>
@@ -1529,40 +1505,43 @@ svg</property>
<property name="column_spacing">10</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkEntry" id="entry_passwd_dbase1">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Host:</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Database:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_user_dbase1">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">User database:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_dbase1">
+ <widget class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes" context="yes">Password:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -1576,49 +1555,43 @@ svg</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label22">
+ <widget class="GtkLabel" id="label_dbase1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Password:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkLabel" id="label_user_dbase1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">User database:</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkEntry" id="entry_passwd_dbase1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Database:</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" context="yes">Host:</property>
- </widget>
- </child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox6">
@@ -1627,32 +1600,31 @@ svg</property>
<property name="spacing">5</property>
<child>
<widget class="GtkButton" id="button_connect_cancel1">
- <property name="label" context="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="button_connect_dbase1">
- <property name="label" context="yes">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" context="yes">gtk-save</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
diff --git a/src/gevice.py b/src/gevice.py
index ab7f984..ad159d6 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -247,6 +247,7 @@ class Gevice:
self.vbox_main = glade_file.get_widget ("vbox_main")
self.hpaned = glade_file.get_widget ("hpaned")
self.vboxtreeview = glade_file.get_widget ("vboxtreeview")
+ self.vboxterminal = glade_file.get_widget ("vboxterminal")
self.notebook = glade_file.get_widget ("notebook")
# add treeview to vboxtreeview
@@ -583,9 +584,9 @@ class Gevice:
def on_toggle_terminal (gevice,action):
if (action.get_active() == True):
- gevice.notebook.show()
+ gevice.vboxterminal.show()
else:
- gevice.notebook.hide ()
+ gevice.vboxterminal.hide ()
def create_about_dialog (self):
authors = ('Alejandro Valdes Jimenez [avaldes gnome org]','')
diff --git a/src/gevicedatabase.py b/src/gevicedatabase.py
index bc94cc7..0df56ad 100644
--- a/src/gevicedatabase.py
+++ b/src/gevicedatabase.py
@@ -293,10 +293,7 @@ class GeviceDatabase:
if rows:
for row in rows:
iter = liststore.append ()
- liststore.set (
- iter,
- config.COLUMN_NAME_TYPE_LINK_DEV2,row[0],
- config.COLUMN_ID_TYPE_LINK_DEV2,row[1])
+ liststore.set (iter,config.COLUMN_NAME_TYPE_LINK_DEV2,row[0],config.COLUMN_ID_TYPE_LINK_DEV2,row[1])
return liststore
else:
diff --git a/src/gevicediagram.py b/src/gevicediagram.py
index 2515f52..0a9c816 100644
--- a/src/gevicediagram.py
+++ b/src/gevicediagram.py
@@ -65,13 +65,15 @@ class GeviceDiagram:
self.prog = self.combobox_program.get_active_text()
i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
- name = gevice.gmodel.treestore.get(i["iter"],config.COLUMN_NAME_DEV)
- ###name = self.join_name(i["iter"],gevice)
+ ###name = gevice.gmodel.treestore.get(i["iter"],config.COLUMN_NAME_DEV)
+ name = self.join_name(i["iter"],gevice)
self.iterfirst = i["iter"]
- self.print_child (gevice,i["iter"],name[0])
+ ###self.print_child (gevice,i["iter"],name[0])
+ self.print_child (gevice,i["iter"],name)
- file = config.DEFAULT_TMP + name[0] + "." + self.form
+ ###file = config.DEFAULT_TMP + name[0] + "." + self.form
+ file = config.DEFAULT_TMP + name + "." + self.form
self.A.draw(file,format=self.form,prog=self.prog)
# show diagram with eog (FIXME: call to default viewer)
@@ -84,16 +86,16 @@ class GeviceDiagram:
config.COLUMN_NAME_MODEL_DEV,
config.COLUMN_ID_TYPE_LINK_DEV)
- ###pix_link,name_link = gevice.gmodel.get_data_of_link_from_key (type_link,gevice)
+ pix_link,name_link = gevice.gmodel.get_data_of_link_from_key (type_link,gevice)
- ###if (gevice.gpref.diagip):
- ### name = name + '[' + ip + ']'
+ if (gevice.gpref.diagip):
+ name = name + '(' + ip + ')'
- ###if (gevice.gpref.diagmodel):
- ### name = name + '[' + model + ']'
+ if (gevice.gpref.diagmodel):
+ name = name + '(' + model + ')'
- ###if (gevice.gpref.diaglink):
- ### name = name + '[' + name_link + ']'
+ if (gevice.gpref.diaglink):
+ name = name + '(' + name_link + ')'
return name
diff --git a/src/gevicemodel.py b/src/gevicemodel.py
index 6e20393..7035eb2 100644
--- a/src/gevicemodel.py
+++ b/src/gevicemodel.py
@@ -157,18 +157,19 @@ class GeviceModel:
return None,None
def get_data_of_link_from_key (self,key,gevice):
- iter = gevice.list_links.get_iter_first()
+ links = gevice.gdbase.get_list_of_links (gevice)
+ iter = links.get_iter_first()
while (iter):
- id = gevice.list_links.get_value(iter,config.COLUMN_ID_LINK)
+ id = links.get_value(iter,1)
if str(key) == str(id):
- pix = gevice.list_links.get_value(iter,config.COLUMN_PIXBUF_LINK)
- name = gevice.list_links.get_value(iter,config.COLUMN_NAME_LINK)
+ pix = links.get_value(iter,1)
+ name = links.get_value(iter,0)
return pix,name
- iter = gevice.list_links.iter_next(iter)
+ iter = links.iter_next(iter)
return None,None
def expand_treeview (self,flag):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
