@@ -142,100 +142,91 @@ property_toggled_cb(GtkWidget *widget, gpointer name)
142142static void
143143spin_button_changed_cb (GtkWidget * widget , gpointer name )
144144{
145- MultiloadApplet * ma ;
146- gint value ;
147- gint prop_type , i ;
148-
149- ma = g_object_get_data (G_OBJECT (widget ), "MultiloadApplet" );
150- prop_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget ), "prop_type" ));
151- value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget ));
152-
153- /* FIXME: the first toggle button to be checked/dechecked does not work, but after that everything is cool. what gives? */
154- g_settings_set_uint (ma -> settings , (gchar * )name , value );
155- g_settings_set_uint (ma -> settings , (gchar * )name , value );
156-
157- switch (prop_type )
158- {
159- case PROP_SPEED :
160- {
161- for (i = 0 ; i < NGRAPHS ; i ++ )
162- {
163- load_graph_stop (ma -> graphs [i ]);
164- ma -> graphs [i ]-> speed = value ;
165- if (ma -> graphs [i ]-> visible )
166- load_graph_start (ma -> graphs [i ]);
167- }
168-
169- break ;
170- }
171- case PROP_SIZE :
172- {
173- for (i = 0 ; i < NGRAPHS ; i ++ )
174- {
175- ma -> graphs [i ]-> size = value ;
176-
177- if (ma -> graphs [i ]-> orient )
178- gtk_widget_set_size_request (
179- ma -> graphs [i ]-> main_widget ,
180- ma -> graphs [i ]-> pixel_size ,
181- ma -> graphs [i ]-> size );
182- else
183- gtk_widget_set_size_request (
184- ma -> graphs [i ]-> main_widget ,
185- ma -> graphs [i ]-> size ,
186- ma -> graphs [i ]-> pixel_size );
187- }
188-
189- break ;
190- case PROP_NET_THRESHOLD1 :
191- {
192- if (value >= ma -> graphs [2 ]-> net_threshold2 )
193- {
194- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
195- (gdouble )g_settings_get_uint (ma -> settings , "netthreshold2" ) - 1 );
196- ma -> graphs [2 ]-> net_threshold1 = g_settings_get_uint (ma -> settings , "netthreshold2" ) - 1 ;
197- }
145+ MultiloadApplet * ma ;
146+ gint value ;
147+ gint prop_type , i ;
148+
149+ ma = g_object_get_data (G_OBJECT (widget ), "MultiloadApplet" );
150+ prop_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget ), "prop_type" ));
151+ value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget ));
152+
153+ /* FIXME: the first toggle button to be checked/dechecked does not work, but after that everything is cool. what gives? */
154+ g_settings_set_uint (ma -> settings , (gchar * )name , value );
155+ g_settings_set_uint (ma -> settings , (gchar * )name , value );
156+
157+ switch (prop_type )
158+ {
159+ case PROP_SPEED :
160+ for (i = 0 ; i < NGRAPHS ; i ++ )
161+ {
162+ load_graph_stop (ma -> graphs [i ]);
163+ ma -> graphs [i ]-> speed = value ;
164+ if (ma -> graphs [i ]-> visible )
165+ load_graph_start (ma -> graphs [i ]);
166+ }
167+
168+ break ;
169+
170+ case PROP_SIZE :
171+ for (i = 0 ; i < NGRAPHS ; i ++ )
172+ {
173+ ma -> graphs [i ]-> size = value ;
174+
175+ if (ma -> graphs [i ]-> orient )
176+ gtk_widget_set_size_request (
177+ ma -> graphs [i ]-> main_widget ,
178+ ma -> graphs [i ]-> pixel_size ,
179+ ma -> graphs [i ]-> size );
198180 else
199- ma -> graphs [2 ]-> net_threshold1 = value ;
200-
201- break ;
202- }
203- case PROP_NET_THRESHOLD2 :
204- {
205- if (value >= ma -> graphs [2 ]-> net_threshold3 )
206- {
207- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
208- (gdouble )g_settings_get_uint (ma -> settings , "netthreshold3" ) - 1 );
209- ma -> graphs [2 ]-> net_threshold2 = g_settings_get_uint (ma -> settings , "netthreshold3" ) - 1 ;
210- }
211- else if (value <= ma -> graphs [2 ]-> net_threshold1 )
212- {
213- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
214- (gdouble )g_settings_get_uint (ma -> settings , "netthreshold1" ) + 1 );
215- ma -> graphs [2 ]-> net_threshold2 = g_settings_get_uint (ma -> settings , "netthreshold1" ) + 1 ;
216- }
217- else
218- ma -> graphs [2 ]-> net_threshold2 = value ;
219-
220- break ;
221- }
222- case PROP_NET_THRESHOLD3 :
223- {
224- if (value <= ma -> graphs [2 ]-> net_threshold2 )
225- {
226- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
227- (gdouble )g_settings_get_uint (ma -> settings , "netthreshold2" ) + 1 );
228- ma -> graphs [2 ]-> net_threshold3 = g_settings_get_uint (ma -> settings , "netthreshold2" ) + 1 ;
229- }
230- else
231- ma -> graphs [2 ]-> net_threshold3 = value ;
232- break ;
233- }
181+ gtk_widget_set_size_request (
182+ ma -> graphs [i ]-> main_widget ,
183+ ma -> graphs [i ]-> size ,
184+ ma -> graphs [i ]-> pixel_size );
185+ }
186+ break ;
234187
235- }
236- default :
237- g_assert_not_reached ();
238- }
188+ case PROP_NET_THRESHOLD1 :
189+ if (value >= ma -> graphs [2 ]-> net_threshold2 )
190+ {
191+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
192+ (gdouble )g_settings_get_uint (ma -> settings , "netthreshold2" ) - 1 );
193+ ma -> graphs [2 ]-> net_threshold1 = g_settings_get_uint (ma -> settings , "netthreshold2" ) - 1 ;
194+ }
195+ else
196+ ma -> graphs [2 ]-> net_threshold1 = value ;
197+ break ;
198+
199+ case PROP_NET_THRESHOLD2 :
200+ if (value >= ma -> graphs [2 ]-> net_threshold3 )
201+ {
202+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
203+ (gdouble )g_settings_get_uint (ma -> settings , "netthreshold3" ) - 1 );
204+ ma -> graphs [2 ]-> net_threshold2 = g_settings_get_uint (ma -> settings , "netthreshold3" ) - 1 ;
205+ }
206+ else if (value <= ma -> graphs [2 ]-> net_threshold1 )
207+ {
208+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
209+ (gdouble )g_settings_get_uint (ma -> settings , "netthreshold1" ) + 1 );
210+ ma -> graphs [2 ]-> net_threshold2 = g_settings_get_uint (ma -> settings , "netthreshold1" ) + 1 ;
211+ }
212+ else
213+ ma -> graphs [2 ]-> net_threshold2 = value ;
214+
215+ break ;
216+
217+ case PROP_NET_THRESHOLD3 :
218+ if (value <= ma -> graphs [2 ]-> net_threshold2 )
219+ {
220+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget ),
221+ (gdouble )g_settings_get_uint (ma -> settings , "netthreshold2" ) + 1 );
222+ ma -> graphs [2 ]-> net_threshold3 = g_settings_get_uint (ma -> settings , "netthreshold2" ) + 1 ;
223+ }
224+ else
225+ ma -> graphs [2 ]-> net_threshold3 = value ;
226+ break ;
227+ default :
228+ g_assert_not_reached ();
229+ }
239230
240231 return ;
241232}
0 commit comments