projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed restoration of the panel divider position.
[psensor.git]
/
src
/
ui_pref.c
diff --git
a/src/ui_pref.c
b/src/ui_pref.c
index
3a181c3
..
bbc8927
100644
(file)
--- a/
src/ui_pref.c
+++ b/
src/ui_pref.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
4
jeanfi@gmail.com
+ * Copyright (C) 2010-201
6
jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-60,6
+60,11
@@
void ui_pref_count_visible_toggled_cbk(GtkToggleButton *btn, gpointer data)
config_set_count_visible(gtk_toggle_button_get_active(btn));
}
config_set_count_visible(gtk_toggle_button_get_active(btn));
}
+void ui_pref_sensorlist_position_changed_cbk(GtkComboBox *combo, gpointer data)
+{
+ config_set_sensorlist_position(gtk_combo_box_get_active(combo));
+}
+
GdkRGBA color_to_GdkRGBA(struct color *color)
{
GdkRGBA c;
GdkRGBA color_to_GdkRGBA(struct color *color)
{
GdkRGBA c;
@@
-163,7
+168,8
@@
void ui_pref_dialog_run(struct ui_psensor *ui)
w_sensorlist_pos = GTK_COMBO_BOX
(gtk_builder_get_object(builder, "sensors_list_position"));
w_sensorlist_pos = GTK_COMBO_BOX
(gtk_builder_get_object(builder, "sensors_list_position"));
- gtk_combo_box_set_active(w_sensorlist_pos, cfg->sensorlist_position);
+ gtk_combo_box_set_active(w_sensorlist_pos,
+ config_get_sensorlist_position());
w_autostart = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "autostart"));
w_autostart = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "autostart"));
@@
-177,7
+183,7
@@
void ui_pref_dialog_run(struct ui_psensor *ui)
w_enable_launcher_counter = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "enable_launcher_counter"));
gtk_toggle_button_set_active(w_enable_launcher_counter,
w_enable_launcher_counter = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "enable_launcher_counter"));
gtk_toggle_button_set_active(w_enable_launcher_counter,
-
!cfg->unity_launcher_count_disabled
);
+
config_is_count_visible()
);
if (ui_unity_is_supported()) {
gtk_widget_set_has_tooltip
if (ui_unity_is_supported()) {
gtk_widget_set_has_tooltip
@@
-304,6
+310,8
@@
void ui_pref_dialog_run(struct ui_psensor *ui)
gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled());
gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled());
+ gtk_window_set_transient_for(GTK_WINDOW(diag),
+ GTK_WINDOW(ui->main_window));
gtk_builder_connect_signals(builder, NULL);
result = gtk_dialog_run(diag);
gtk_builder_connect_signals(builder, NULL);
result = gtk_dialog_run(diag);
@@
-337,13
+345,6
@@
void ui_pref_dialog_run(struct ui_psensor *ui)
else
cfg->alpha_channel_enabled = 1;
else
cfg->alpha_channel_enabled = 1;
- cfg->sensorlist_position
- = gtk_combo_box_get_active(w_sensorlist_pos);
-
- cfg->unity_launcher_count_disabled
- = !gtk_toggle_button_get_active
- (w_enable_launcher_counter);
-
cfg->sensor_update_interval
= gtk_spin_button_get_value_as_int(w_s_update_interval);
cfg->sensor_update_interval
= gtk_spin_button_get_value_as_int(w_s_update_interval);
@@
-397,8
+398,6
@@
void ui_pref_dialog_run(struct ui_psensor *ui)
pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));
pthread_mutex_unlock(&ui->sensors_mutex);
pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));
pthread_mutex_unlock(&ui->sensors_mutex);
-
- ui_window_update(ui);
}
g_object_unref(G_OBJECT(builder));
gtk_widget_destroy(GTK_WIDGET(diag));
}
g_object_unref(G_OBJECT(builder));
gtk_widget_destroy(GTK_WIDGET(diag));