Merge
This commit is contained in:
Juan Ferrer Toribio
parent
eee4aacfaa
commit
7189dd04c9
|
|
@ -358,9 +358,6 @@ gboolean db_iterator_move_previous (DbIterator * self)
|
|||
|
||||
if (db_model_iter_prev (model, iter))
|
||||
move = db_iterator_move_iter (self, iter);
|
||||
else
|
||||
g_warning ("Can't move the cursor to the previous "
|
||||
"row, because there are no more rows.");
|
||||
|
||||
db_iter_free (iter);
|
||||
}
|
||||
|
|
@ -394,9 +391,6 @@ gboolean db_iterator_move_next (DbIterator * self)
|
|||
|
||||
if (db_model_iter_next (model, iter))
|
||||
move = db_iterator_move_iter (self, iter);
|
||||
else
|
||||
g_warning ("Can't move the cursor to the next "
|
||||
"row, because there are no more rows.");
|
||||
|
||||
db_iter_free (iter);
|
||||
}
|
||||
|
|
@ -404,6 +398,7 @@ gboolean db_iterator_move_next (DbIterator * self)
|
|||
move = db_iterator_move_first (self);
|
||||
|
||||
return move;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -427,9 +422,9 @@ gboolean db_iterator_move_to (DbIterator * self, DbIteratorMove move)
|
|||
return db_iterator_move_next (self);
|
||||
case DB_ITERATOR_MOVE_LAST:
|
||||
return db_iterator_move_last (self);
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -778,10 +773,10 @@ gboolean db_iterator_has_pending_operations (DbIterator * self)
|
|||
}
|
||||
|
||||
// Useful methods
|
||||
/*
|
||||
|
||||
static void db_iterator_take_value (DbIterator * self, const gchar * column_name, GValue * value)
|
||||
{
|
||||
db_iterator_set_value (self, const gchar * column_name, value);
|
||||
db_iterator_set_value (self, column_name, value, NULL);
|
||||
gvn_value_free (value);
|
||||
}
|
||||
|
||||
|
|
@ -882,7 +877,6 @@ void db_iterator_set_boxed (DbIterator * self, const gchar * column_name, gpoint
|
|||
|
||||
db_iterator_take_value (self, column_name, gvn_value_new_boxed (value));
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
* db_iterator_is_ready:
|
||||
|
|
|
|||
|
|
@ -115,10 +115,6 @@ gboolean db_iterator_move_to (DbIterator * self, DbIteratorMove move);
|
|||
void db_iterator_refresh (DbIterator * self);
|
||||
const GvnParamSpec * db_iterator_get_spec (DbIterator * self, gint column);
|
||||
gint db_iterator_get_column_index (DbIterator * self, const gchar * name);
|
||||
const GValue * db_iterator_get_value (DbIterator * self, const gchar * column_name);
|
||||
gboolean db_iterator_set_value (DbIterator * self, const gchar * column_name, const GValue * value, GError ** err);
|
||||
const GValue * db_iterator_get_value_by_index (DbIterator * self, gint column);
|
||||
gboolean db_iterator_set_value_by_index (DbIterator * self, gint column, const GValue * value, GError ** err);
|
||||
void db_iterator_delete (DbIterator * self);
|
||||
void db_iterator_insert (DbIterator * self);
|
||||
gint db_iterator_get_nrows (DbIterator * self);
|
||||
|
|
@ -134,4 +130,23 @@ void db_iterator_operations_done (DbIterator * self);
|
|||
void db_iterator_row_num_changed (DbIterator * self);
|
||||
void db_iterator_status_changed (DbIterator * self, gboolean ready);
|
||||
|
||||
const GValue * db_iterator_get_value_by_index (DbIterator * self, gint column);
|
||||
gboolean db_iterator_set_value_by_index (DbIterator * self, gint column, const GValue * value, GError ** err);
|
||||
const GValue * db_iterator_get_value (DbIterator * self, const gchar * column_name);
|
||||
gboolean db_iterator_set_value (DbIterator * self, const gchar * column_name, const GValue * value, GError ** err);
|
||||
gboolean db_iterator_is_null (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_null (DbIterator * self, const gchar * column_name);
|
||||
gboolean db_iterator_get_boolean (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_boolean (DbIterator * self, const gchar * column_name, gboolean value);
|
||||
gint db_iterator_get_int (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_int (DbIterator * self, const gchar * column_name, gint value);
|
||||
glong db_iterator_get_long (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_long (DbIterator * self, const gchar * column_name, glong value);
|
||||
gdouble db_iterator_get_double (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_double (DbIterator * self, const gchar * column_name, gdouble value);
|
||||
const gchar * db_iterator_get_string (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_string (DbIterator * self, const gchar * column_name, const gchar * value);
|
||||
gpointer db_iterator_get_boxed (DbIterator * self, const gchar * column_name);
|
||||
void db_iterator_set_boxed (DbIterator * self, const gchar * column_name, gpointer value);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -11,18 +11,443 @@
|
|||
</items>
|
||||
</object>
|
||||
<object class="VnSet" id="models">
|
||||
<child>
|
||||
<object class="VnModel" id="whs">
|
||||
<property name="sql">SELECT id, name
|
||||
FROM warehouse WHERE reserve ORDER BY name</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnModel" id="items">
|
||||
<property name="sql">CALL vn2008.ubicator_beta (#wh, #date, #filter)</property>
|
||||
<property name="sql">CALL ubicator_beta (#wh, #date, #filter)</property>
|
||||
<property name="batch">batch-items</property>
|
||||
<property name="autoload">False</property>
|
||||
<signal name="status-changed" handler="vn_shelves_on_items_changed" swapped="no"/>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnModel" id="shelves">
|
||||
<property name="sql">SELECT id, name, width, height, max_height, tray_height,
|
||||
first_tray_elevation, tray_density, vspacing, hspacing
|
||||
FROM shelf</property>
|
||||
<property name="update_flags">DB_MODEL_INSERT | DB_MODEL_DELETE | DB_MODEL_UPDATE</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="VnIterator" id="items">
|
||||
<property name="data-model">model-items</property>
|
||||
<property name="remember_selection">False</property>
|
||||
<object class="VnSet" id="iterators">
|
||||
<child>
|
||||
<object class="VnIterator" id="iter-items">
|
||||
<property name="data-model">items</property>
|
||||
<property name="remember_selection">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="GtkDialog" id="shelves-dialog">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="title" translatable="yes">Edit shelves</property>
|
||||
<property name="resizable">False</property>
|
||||
<property name="modal">True</property>
|
||||
<property name="destroy_with_parent">True</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkBox" id="dialog-vbox">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="spacing">2</property>
|
||||
<child internal-child="action_area">
|
||||
<object class="GtkButtonBox" id="dialog-action-area">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="layout_style">center</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="button1">
|
||||
<property name="label" translatable="yes">Close</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<signal name="clicked" handler="vn_shelves_on_close_clicked" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">end</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkGrid" id="dialog-grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="border_width">8</property>
|
||||
<property name="row_spacing">8</property>
|
||||
<property name="column_spacing">8</property>
|
||||
<child>
|
||||
<object class="GtkGrid" id="shelf-grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">6</property>
|
||||
<property name="row_homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-vspacing">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Tray V. spacing:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">8</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-hspacing">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Tray H. spacing:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">7</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-tray-density">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Tray density:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">6</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-tray-elevation">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Tray elevation:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-tray-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Tray height:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-max-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Max. height:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-shelf-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Height:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-shelf-width">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Width:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="vspacing">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">vspacing</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">8</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="hspacing">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">hspacing</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget2">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">7</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="tray-density">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">tray_density</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget4">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">6</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="tray-elevation">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">first_tray_elevation</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget5">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="tray-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">tray_height</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget6">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="shelf-max-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">max_height</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget7">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="shelf-height">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">height</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget8">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="shelf-width">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">width</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="spin-widget9">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnEntry" id="shelf-name">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="column_name">name</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkEntry" id="entry-widget">
|
||||
<property name="can_focus">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-shelf-name">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Name:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnHandler" id="handler1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="show_flags">VN_HANDLER_SHOW_REMOVE | VN_HANDLER_SHOW_ADD</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnHandler" id="handler2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="iterator">iter-shelves</property>
|
||||
<property name="show_flags">VN_HANDLER_SHOW_UNDO | VN_HANDLER_SHOW_SAVE</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow" id="scrolledwindow">
|
||||
<property name="width_request">150</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="shadow_type">in</property>
|
||||
<child>
|
||||
<object class="VnGrid" id="iter-shelves">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="data-model">shelves</property>
|
||||
<property name="mode">on-iter</property>
|
||||
<child internal-child="selection">
|
||||
<object class="GtkTreeSelection" id="grid-selection">
|
||||
<property name="mode">multiple</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnColumnEntry" id="column-shelf">
|
||||
<property name="title" translatable="yes">Configurations</property>
|
||||
<property name="column_name">name</property>
|
||||
<child internal-child="cell">
|
||||
<object class="GtkCellRendererText" id="column-entry-cell"/>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="GtkBox" id="main">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -35,8 +460,8 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="row_spacing">4</property>
|
||||
<property name="column_spacing">5</property>
|
||||
<property name="row_spacing">6</property>
|
||||
<property name="column_spacing">6</property>
|
||||
<property name="row_homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-title">
|
||||
|
|
@ -107,14 +532,13 @@
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="VnSpin" id="wh">
|
||||
<object class="VnCombo" id="wh">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="data-model">whs</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkSpinButton" id="wh-child">
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="numeric">True</property>
|
||||
<object class="GtkComboBox" id="combo-widget1">
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
@ -123,6 +547,18 @@
|
|||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-shelf">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Shelf:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-filter">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -132,6 +568,69 @@
|
|||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-max-amount">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Max. amount:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="spacing">4</property>
|
||||
<child>
|
||||
<object class="VnCombo" id="shelf">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="null">False</property>
|
||||
<property name="data-model">shelves</property>
|
||||
<child internal-child="widget">
|
||||
<object class="GtkComboBox" id="combo-widget">
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="edit-shelves">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Edit shelves and it's dimensions</property>
|
||||
<signal name="clicked" handler="vn_shelves_on_edit_clicked" swapped="no"/>
|
||||
<child>
|
||||
<object class="GtkImage" id="edit-image">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="icon_name">text-editor-symbolic</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -147,18 +646,6 @@
|
|||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label-max-amount">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">1</property>
|
||||
<property name="label" translatable="yes">Max. amount:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -176,7 +663,7 @@
|
|||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">4</property>
|
||||
<property name="top_attach">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -164,11 +164,10 @@
|
|||
<property name="layout_style">expand</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="settings-button">
|
||||
<property name="label">gtk-preferences</property>
|
||||
<property name="label">Preferences</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="use_stock">True</property>
|
||||
<signal name="clicked" handler="vn_login_on_settings_clicked" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -179,11 +178,10 @@
|
|||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="connect">
|
||||
<property name="label">gtk-connect</property>
|
||||
<property name="label">Connect</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="use_stock">True</property>
|
||||
<signal name="clicked" handler="vn_login_on_connect_clicked" swapped="no"/>
|
||||
<accelerator key="Return" signal="clicked"/>
|
||||
<accelerator key="KP_Enter" signal="clicked"/>
|
||||
|
|
@ -232,11 +230,10 @@
|
|||
<property name="layout_style">spread</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="close">
|
||||
<property name="label">gtk-close</property>
|
||||
<property name="label">Close</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="use_stock">True</property>
|
||||
<signal name="clicked" handler="vn_login_on_settings_close_clicked" swapped="no"/>
|
||||
<accelerator key="Return" signal="clicked"/>
|
||||
<accelerator key="KP_Enter" signal="clicked"/>
|
||||
|
|
|
|||
Reference in New Issue