[chronojump] Fixes on encoderConfiguration apply
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixes on encoderConfiguration apply
- Date: Mon, 9 Jan 2017 16:00:22 +0000 (UTC)
commit b18466b93d6a609f57728f8bea00345a425bb744
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jan 9 16:51:43 2017 +0100
Fixes on encoderConfiguration apply
src/gui/encoderConfiguration.cs | 46 ++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/src/gui/encoderConfiguration.cs b/src/gui/encoderConfiguration.cs
index beaab07..878aac1 100644
--- a/src/gui/encoderConfiguration.cs
+++ b/src/gui/encoderConfiguration.cs
@@ -432,7 +432,7 @@ public class EncoderConfigurationWindow
}
if(! found)
- ec.d = ec.list_d[0]; //selected value is the first //TODO: change
this and use the value in main gui
+ ec.d = ec.list_d[0];
}
else
ec.d = (double) spin_d.Value;
@@ -656,35 +656,43 @@ public class EncoderConfigurationWindow
//TODO: button_apply sensitive only when name != "" && != of the others
void on_button_apply_clicked (object o, EventArgs args)
{
- apply(true, true);
+ apply(true);
}
- private void apply(bool updateSQL, bool updateGUI)
+ private void apply(bool updateGUI)
{
- if(updateSQL)
- {
- string selectedName = getSelectedName();
- if(selectedName == "")
- return;
+ //useful fo update SQL
+ string selectedOldName = getSelectedName();
+ if(selectedOldName == "")
+ return;
- //save_update when changing any value
- //and when exiting with ok dialogMessage asking for save
+ string newName = entry_save_name.Text;
+ if(newName != selectedOldName)
+ {
+ /*
+ * if name has changed, then check if newname already exists on database
+ * if exists add _copy recursively
+ */
+ newName = SqliteEncoderConfiguration.IfNameExistsAddSuffix(newName,
Catalog.GetString("copy"));
+ }
+ //update entry_save_name if needed
+ if(newName != entry_save_name.Text)
+ entry_save_name.Text = newName;
- //update SQL
- EncoderConfiguration econfOnGUI = GetAcceptedValues();
- EncoderConfigurationSQLObject econfSO = new EncoderConfigurationSQLObject(-1,
- encoderGI, true, entry_save_name.Text.ToString(),
- econfOnGUI, entry_save_description.Text.ToString());
+ //update SQL
+ EncoderConfiguration econfOnGUI = GetAcceptedValues();
+ EncoderConfigurationSQLObject econfSO = new EncoderConfigurationSQLObject(-1,
+ encoderGI, true, newName,
+ econfOnGUI, entry_save_description.Text.ToString());
- SqliteEncoderConfiguration.Update(false, encoderGI, selectedName, econfSO);
- }
+ SqliteEncoderConfiguration.Update(false, encoderGI, selectedOldName, econfSO);
if(updateGUI)
{
TreeModel model;
TreeIter iter = new TreeIter();
treeview_select.Selection.GetSelected (out model, out iter);
- store.SetValue (iter, colName, entry_save_name.Text);
+ store.SetValue (iter, colName, newName);
store.SetValue (iter, colDescription, entry_save_description.Text);
}
}
@@ -809,7 +817,7 @@ public class EncoderConfigurationWindow
private void on_button_close_clicked (object o, EventArgs args)
{
- apply(true, false);
+ apply(false);
//managed on gui/encoder.cs
EncoderConfigurationWindowBox.encoder_configuration.Hide();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]