[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
Andrei Zavada
johnhommer at gmail.com
Fri Nov 16 00:50:48 UTC 2012
The following commit has been merged in the master branch:
commit 7e961f2e21cb9294eee09e0503c02326f9ebfadd
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Wed Nov 7 01:43:47 2012 +0200
lose AZAmendment2
diff --git a/data/mf.glade b/data/mf.glade
index 3aef98b..88e2289 100644
--- a/data/mf.glade
+++ b/data/mf.glade
@@ -81,11 +81,9 @@
<child>
<object class="GtkButton" id="bMFReset">
<property name="label" translatable="yes">R_eset</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
@@ -98,11 +96,9 @@
<child>
<object class="GtkCheckButton" id="eMFLiveUpdate">
<property name="label" translatable="yes">Live _update</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
@@ -117,11 +113,9 @@
<child>
<object class="GtkButton" id="bMFRun">
<property name="label" translatable="yes">_Run</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
</object>
@@ -141,11 +135,9 @@
<child>
<object class="GtkCheckButton" id="eMFHighlightNREM">
<property name="label" translatable="yes">_NREM</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -160,11 +152,9 @@
<child>
<object class="GtkCheckButton" id="eMFHighlightREM">
<property name="label" translatable="yes">RE_M</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -178,11 +168,9 @@
<child>
<object class="GtkCheckButton" id="eMFHighlightWake">
<property name="label" translatable="yes">_Wake</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -228,12 +216,10 @@
</child>
<child>
<object class="GtkScaleButton" id="eMFSmooth">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_stock">True</property>
<property name="focus_on_click">False</property>
@@ -270,12 +256,10 @@
</child>
<child>
<object class="GtkToolButton" id="bMFAccept">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="border_width">5</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">toolbutton</property>
<property name="stock_id">gtk-apply</property>
<accelerator key="Return" signal="clicked" modifiers="GDK_MOD1_MASK"/>
@@ -296,11 +280,9 @@
<child>
<object class="GtkCheckButton" id="eMFDB1">
<property name="label" translatable="yes">DB1</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -315,11 +297,9 @@
<child>
<object class="GtkCheckButton" id="eMFDB2">
<property name="label" translatable="yes">DB2</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -334,12 +314,10 @@
<child>
<object class="GtkCheckButton" id="eMFAZ1">
<property name="label" translatable="yes">AZ1</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -354,12 +332,10 @@
<child>
<object class="GtkCheckButton" id="eMFAZ2">
<property name="label" translatable="yes">AZ2</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="no_show_all">True</property>
<property name="relief">none</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -886,13 +862,11 @@
<child>
<object class="GtkCheckButton" id="eMFClassicFit">
<property name="label" translatable="yes">_Classic fit</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="tooltip_markup" translatable="yes">Do a traditional exponotial curve fit</property>
<property name="margin_right">10</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/src/ui/mw/mw-construct.cc b/src/ui/mw/mw-construct.cc
index db88ce7..c8969d5 100644
--- a/src/ui/mw/mw-construct.cc
+++ b/src/ui/mw/mw-construct.cc
@@ -461,11 +461,9 @@ SExpDesignUIWidgets ()
!AGH_GBGETOBJ (GtkCheckButton, eCtlParamDBAmendment1) ||
!AGH_GBGETOBJ (GtkCheckButton, eCtlParamDBAmendment2) ||
!AGH_GBGETOBJ (GtkCheckButton, eCtlParamAZAmendment1) ||
- !AGH_GBGETOBJ (GtkCheckButton, eCtlParamAZAmendment2) ||
!AGH_GBGETOBJ (GtkLabel, lCtlParamDBAmendment1) ||
!AGH_GBGETOBJ (GtkLabel, lCtlParamDBAmendment2) ||
!AGH_GBGETOBJ (GtkLabel, lCtlParamAZAmendment1) ||
- !AGH_GBGETOBJ (GtkLabel, lCtlParamAZAmendment2) ||
!AGH_GBGETOBJ (GtkRadioButton, eCtlParamScoreUnscoredAsWake) ||
!AGH_GBGETOBJ (GtkSpinButton, eCtlParamNSWAPpBeforeSimStart) ||
!AGH_GBGETOBJ (GtkSpinButton, eCtlParamReqScoredPercent) )
@@ -480,9 +478,6 @@ SExpDesignUIWidgets ()
g_signal_connect( eCtlParamAZAmendment1, "toggled",
(GCallback)eCtlParamAZAmendment1_toggled_cb,
this);
- g_signal_connect( eCtlParamAZAmendment2, "toggled",
- (GCallback)eCtlParamAZAmendment2_toggled_cb,
- this);
// ------------- eTunable_*
using namespace agh::ach;
diff --git a/src/ui/mw/mw-settings_cb.cc b/src/ui/mw/mw-settings_cb.cc
index 5fcf648..8377c08 100644
--- a/src/ui/mw/mw-settings_cb.cc
+++ b/src/ui/mw/mw-settings_cb.cc
@@ -184,8 +184,9 @@ tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer us
__adjust_tunables_up( ED);
ED.W_Vtunables.up();
ED.W_V2.up();
- for ( auto& t : {ED.eCtlParamDBAmendment1, ED.eCtlParamDBAmendment2,
- ED.eCtlParamAZAmendment1, ED.eCtlParamAZAmendment2} ) {
+ for ( auto& t : {ED.eCtlParamDBAmendment1,
+ ED.eCtlParamDBAmendment2,
+ ED.eCtlParamAZAmendment1} ) {
g_signal_emit_by_name( t, "toggled");
g_signal_emit_by_name( t, "toggled");
}
@@ -254,16 +255,6 @@ eCtlParamAZAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
? "<small>Compute <i>gc</i> per-episode</small>"
: "<small>Assume <i>gc</i> is not variable across episodes</small>");
}
-extern "C"
-void
-eCtlParamAZAmendment2_toggled_cb( GtkToggleButton *button, gpointer userdata)
-{
- auto& ED = *(SExpDesignUI*)userdata;
- gtk_label_set_markup( ED.lCtlParamAZAmendment2,
- gtk_toggle_button_get_active( button)
- ? "<small>(has no effect yet)</small>"
- : "<small>(reserved)</small>");
-}
// eof
diff --git a/src/ui/mw/mw-widgets.hh b/src/ui/mw/mw-widgets.hh
index cf67239..b2e0740 100644
--- a/src/ui/mw/mw-widgets.hh
+++ b/src/ui/mw/mw-widgets.hh
@@ -202,10 +202,10 @@ struct SExpDesignUIWidgets {
*eCtlParamReqScoredPercent;
GtkCheckButton
*eCtlParamDBAmendment1, *eCtlParamDBAmendment2,
- *eCtlParamAZAmendment1, *eCtlParamAZAmendment2;
+ *eCtlParamAZAmendment1;
GtkLabel
*lCtlParamDBAmendment1, *lCtlParamDBAmendment2,
- *lCtlParamAZAmendment1, *lCtlParamAZAmendment2;
+ *lCtlParamAZAmendment1;
GtkRadioButton
*eCtlParamScoreUnscoredAsWake;
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 9603885..53ffd87 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -240,7 +240,6 @@ SExpDesignUI (aghui::SSessionChooser *parent,
W_V2.reg( eCtlParamDBAmendment1, &ED->ctl_params0.DBAmendment1);
W_V2.reg( eCtlParamDBAmendment2, &ED->ctl_params0.DBAmendment2);
W_V2.reg( eCtlParamAZAmendment1, &ED->ctl_params0.AZAmendment1);
- W_V2.reg( eCtlParamAZAmendment2, &ED->ctl_params0.AZAmendment2);
W_V2.reg( eCtlParamNSWAPpBeforeSimStart, (int*)&ED->ctl_params0.swa_laden_pages_before_SWA_0);
W_V2.reg( eCtlParamReqScoredPercent, &ED->ctl_params0.req_percent_scored);
W_V2.reg( eCtlParamScoreUnscoredAsWake, &ED->ctl_params0.ScoreUnscoredAsWake);
diff --git a/src/ui/mw/mw_cb.hh b/src/ui/mw/mw_cb.hh
index 6f63bf7..a0ba564 100644
--- a/src/ui/mw/mw_cb.hh
+++ b/src/ui/mw/mw_cb.hh
@@ -99,7 +99,6 @@ void bExpDesignChooserRemove_clicked_cb( GtkButton*, gpointer);
void eCtlParamDBAmendment1_toggled_cb( GtkToggleButton*, gpointer);
void eCtlParamDBAmendment2_toggled_cb( GtkToggleButton*, gpointer);
void eCtlParamAZAmendment1_toggled_cb( GtkToggleButton*, gpointer);
-void eCtlParamAZAmendment2_toggled_cb( GtkToggleButton*, gpointer);
void bMainCloseThatSF_clicked_cb( GtkButton*, gpointer);
--
Sleep experiment manager
More information about the debian-med-commit
mailing list