verdnatura
/
hedera-account
Archived
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modificados los formularios para utilizar el SqlBatch.

This commit is contained in:
Alejandro T. Colombini Gómez 2014-07-30 16:15:08 +02:00
parent 81a7bb1008
commit c7e99e03d1
5 changed files with 128 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/email.glade
View File

@ -3,7 +3,7 @@
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="vn" version="1.0"/>
<object class="VnBatch" id="models">
<object class="VnSet" id="models">
<child>
<object class="VnModel" id="model-child">
<property name="sql">SELECT parent, child FROM mail_alias_child WHERE #link</property>
@ -20,7 +20,7 @@
</object>
</child>
</object>
<object class="VnBatch" id="iterators">
<object class="VnSet" id="iterators">
<child>
<object class="VnIterator" id="child">
<property name="model">model-child</property>

134
data/users.glade
View File

@ -3,7 +3,7 @@
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="vn" version="1.0"/>
<object class="VnBatch" id="models">
<object class="VnSet" id="models">
<child>
<object class="VnModel" id="account-combo-model">
<property name="sql">SELECT id, name FROM `group`</property>
@ -61,7 +61,7 @@ FROM `user` u
</object>
</child>
</object>
<object class="VnBatch" id="iterators">
<object class="VnSet" id="iterators">
<child>
<object class="VnIterator" id="users">
<property name="model">users-model</property>
@ -120,6 +120,9 @@ FROM `user` u
<object class="VnColumnEntry" id="column-id">
<property name="title" translatable="yes">Identifier</property>
<property name="column_name">id</property>
<child internal-child="cell">
<object class="GtkCellRendererText" id="column-entry-cell1"/>
</child>
</object>
</child>
<child>
@ -127,18 +130,27 @@ FROM `user` u
<property name="title" translatable="yes">User</property>
<property name="expand">True</property>
<property name="column_name">name</property>
<child internal-child="cell">
<object class="GtkCellRendererText" id="column-entry-cell2"/>
</child>
</object>
</child>
<child>
<object class="VnColumnEntry" id="column-mysql-user">
<property name="title" translatable="yes">MySQL User</property>
<property name="column_name">user</property>
<child internal-child="cell">
<object class="GtkCellRendererText" id="column-entry-cell3"/>
</child>
</object>
</child>
<child>
<object class="VnColumnCheck" id="column-check1">
<property name="title" translatable="yes">Enabled</property>
<property name="column_name">active</property>
<child internal-child="cell">
<object class="GtkCellRendererToggle" id="column-check-cell1"/>
</child>
</object>
</child>
</object>
@ -219,18 +231,6 @@ FROM `user` u
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="VnCheck" id="check1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="iterator">users</property>
<property name="column_name">active</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
@ -264,6 +264,11 @@ FROM `user` u
<property name="iterator">users</property>
<property name="column_name">id</property>
<property name="editable">False</property>
<child internal-child="widget">
<object class="GtkSpinButton" id="spin-widget1">
<property name="can_focus">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -276,6 +281,11 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">users</property>
<property name="column_name">name</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -309,6 +319,28 @@ FROM `user` u
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="VnCheck" id="check1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="iterator">users</property>
<property name="column_name">active</property>
<child internal-child="widget">
<object class="GtkCheckButton" id="check-widget1">
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -350,6 +382,11 @@ FROM `user` u
<property name="iterator">account</property>
<property name="column_name">group_id</property>
<property name="model">account-combo-model</property>
<child internal-child="widget">
<object class="GtkComboBox" id="combo-widget2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -363,6 +400,11 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">account</property>
<property name="column_name">uid</property>
<child internal-child="widget">
<object class="GtkSpinButton" id="spin-widget2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -400,6 +442,12 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">account</property>
<property name="column_name">last_change</property>
<child internal-child="widget">
<object class="GtkToggleButton" id="date-chooser-widget1">
<property name="can_focus">False</property>
<property name="receives_default">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -412,6 +460,12 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">account</property>
<property name="column_name">expire</property>
<child internal-child="widget">
<object class="GtkToggleButton" id="date-chooser-widget2">
<property name="can_focus">False</property>
<property name="receives_default">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -504,9 +558,12 @@ FROM `user` u
<child>
<object class="VnColumnCombo" id="column-combo1">
<property name="title" translatable="yes">Alias</property>
<property name="model">alias-combo-model</property>
<property name="column_name">mail_alias_id</property>
<property name="editable">True</property>
<property name="model">alias-combo-model</property>
<child internal-child="cell">
<object class="GtkCellRendererCombo" id="column-combo-cell1"/>
</child>
</object>
</child>
</object>
@ -607,6 +664,11 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">sip</property>
<property name="column_name">extension</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -619,6 +681,11 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">sip</property>
<property name="column_name">secret</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget3">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -631,6 +698,11 @@ FROM `user` u
<property name="can_focus">False</property>
<property name="iterator">sip</property>
<property name="column_name">callerid</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget4">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -682,6 +754,12 @@ FROM `user` u
</packing>
</child>
</object>
<object class="VnBatch" id="password-batch">
<items>
<item id="user" param="user-id"/>
<item id="pass" param="password-entry"/>
</items>
</object>
<object class="GtkDialog" id="password-dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@ -779,11 +857,16 @@ FROM `user` u
</packing>
</child>
<child>
<object class="GtkEntry" id="password-entry">
<object class="VnEntry" id="password-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
<property name="can_focus">False</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget5">
<property name="can_focus">False</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
@ -791,11 +874,16 @@ FROM `user` u
</packing>
</child>
<child>
<object class="GtkEntry" id="repeat-password">
<object class="VnEntry" id="repeat-password">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
<property name="can_focus">False</property>
<child internal-child="widget">
<object class="GtkEntry" id="entry-widget">
<property name="can_focus">False</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-account (1.0-6) UNRELEASED; urgency=low
hedera-account (1.0-7) UNRELEASED; urgency=low
* Initial Release.

2
src/email.vala
View File

@ -19,7 +19,7 @@ using Gtk;
public class Vn.EMail : Vn.Form
{
public override void open (Gtk.Builder builder)
public override void open ()
{
}
}

28
src/users.vala
View File

@ -20,14 +20,14 @@ public class Vn.Users : Vn.Form
{
private unowned Gvn.Param user_id;
private unowned Gtk.Dialog password_dialog;
private unowned Gtk.Entry password_entry;
private unowned Gtk.Entry repeat_password;
private unowned Vn.Entry password_entry;
private unowned Vn.Entry repeat_password;
public override void open (Gtk.Builder builder)
public override void open ()
{
user_id = get ("user-id") as Gvn.Param;
password_entry = get ("password-entry") as Gtk.Entry;
repeat_password = get ("repeat-password") as Gtk.Entry;
password_entry = get ("password-entry") as Vn.Entry;
repeat_password = get ("repeat-password") as Vn.Entry;
password_dialog = get ("password-dialog") as Gtk.Dialog;
password_dialog.add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
password_dialog.add_button (_("Apply"), Gtk.ResponseType.ACCEPT);
@ -46,8 +46,8 @@ public class Vn.Users : Vn.Form
else
infobar.hide ();
repeat_password.text = "";
password_entry.text = "";
repeat_password.value = "";
password_entry.value = "";
password_entry.grab_focus ();
}
@ -64,19 +64,17 @@ public class Vn.Users : Vn.Form
{
if (response_id == Gtk.ResponseType.ACCEPT)
{
string pass = password_entry.text;
var password = password_entry.value.get_string (),
repeat = repeat_password.value.get_string ();
if (pass == "")
if (password == "")
reset_dialog (_("The password can't be empty."));
else if (pass != repeat_password.text)
else if (password != repeat)
reset_dialog (_("Passwords do not match."));
else
{
var batch = new Sql.Batch ();
batch.add_from_param ("user", user_id);
batch.add_from_value ("pass", typeof (string), pass);
string query = "SELECT user_set_password (#user, #pass)";
var batch = get ("password-batch") as Sql.Batch;
var query = "SELECT user_set_password (#user, #pass)";
conn.query_async (query, batch, on_password_changed);
}
}