Skip to content

Commit

Permalink
oscplot.c: replace deprecated gtk3 function
Browse files Browse the repository at this point in the history 
use gtk_tool_button_set_icon_name instead of gtk_tool_button_set_stock_id
fix indent

Signed-off-by: Cristina Suteu <[email protected]>
  • Loading branch information
@cristina-suteu
cristina-suteu committed Jan 8, 2024
1 parent 8d6d3ca commit 4209939
Showing 1 changed file with 52 additions and 57 deletions.
109 changes: 52 additions & 57 deletions oscplot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1074,10 +1074,10 @@ static void do_fft(Transform *tr)
avg = (double)settings->fft_avg;
if (avg && avg != 128 )
avg = 1.0f / avg;
if(settings->window_correction)
pwr_offset = settings->fft_pwr_off + window_function_offset(settings->fft_win);
if (settings->window_correction)
pwr_offset = settings->fft_pwr_off + window_function_offset(settings->fft_win);
else
pwr_offset = settings->fft_pwr_off;
pwr_offset = settings->fft_pwr_off;

for (j = 0; j <= MAX_MARKERS; j++) {
maxX[j] = 0;
Expand Down Expand Up @@ -1312,9 +1312,9 @@ static void do_fft_for_spectrum(Transform *tr)
avg = 1.0f / avg;

if(settings->window_correction)
pwr_offset = settings->fft_pwr_off + window_function_offset(settings->fft_win);
pwr_offset = settings->fft_pwr_off + window_function_offset(settings->fft_win);
else
pwr_offset = settings->fft_pwr_off;
pwr_offset = settings->fft_pwr_off;

for (i = 0, k = 0; i < fft->m; ++i) {
if ((unsigned)i < settings->fft_lower_clipping_limit || (unsigned)i >= settings->fft_upper_clipping_limit)
Expand Down Expand Up @@ -5406,7 +5406,7 @@ int osc_plot_ini_read_handler (OscPlot *plot, int line, const char *section,
gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, "labelYMax")));
gtk_widget_hide(priv->y_axis_min);
gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, "labelYMin")));
}
}
} else if (MATCH_NAME("user_y_axis_max"))
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->y_axis_max), atof(value));
else if (MATCH_NAME("user_y_axis_min"))
Expand Down Expand Up @@ -6645,40 +6645,39 @@ static void plot_trigger_settings_cb(GtkMenuItem *menuitem, OscPlot *plot)

static void channel_color_settings_cb(GtkMenuItem *menuitem, OscPlot *plot)
{
// TO DO : update glade files to match new ColorChooserDialog
OscPlotPrivate *priv = plot->priv;
PlotChn *settings;
GtkWidget *color_dialog;
//GtkWidget *colorsel;
GdkRGBA *color;
GtkTreeView *treeview;
GtkTreeModel *model;
GtkTreeIter iter;
GdkPixbuf *color_icon;
gboolean selected;
gint response;

treeview = GTK_TREE_VIEW(priv->channel_list_view);
model = gtk_tree_view_get_model(treeview);
selected = tree_get_selected_row_iter(treeview, &iter);
if (!selected)
return;
gtk_tree_model_get(model, &iter, CHANNEL_SETTINGS, &settings,
CHANNEL_COLOR_ICON, &color_icon, -1);
color = &settings->graph_color;

color_dialog = gtk_color_chooser_dialog_new("Channel Graph Color Selection", NULL);

response = gtk_dialog_run(GTK_DIALOG(color_dialog));
gtk_widget_hide(color_dialog);
if (response != GTK_RESPONSE_OK)
return;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(color_dialog), color);

/* Change icon color */
channel_color_icon_set_color(color_icon, color);

gtk_widget_destroy(color_dialog);
// TO DO : update glade files to match new ColorChooserDialog
OscPlotPrivate *priv = plot->priv;
PlotChn *settings;
GtkWidget *color_dialog;
GdkRGBA *color;
GtkTreeView *treeview;
GtkTreeModel *model;
GtkTreeIter iter;
GdkPixbuf *color_icon;
gboolean selected;
gint response;

treeview = GTK_TREE_VIEW(priv->channel_list_view);
model = gtk_tree_view_get_model(treeview);
selected = tree_get_selected_row_iter(treeview, &iter);
if (!selected)
return;
gtk_tree_model_get(model, &iter, CHANNEL_SETTINGS, &settings,
CHANNEL_COLOR_ICON, &color_icon, -1);
color = &settings->graph_color;

color_dialog = gtk_color_chooser_dialog_new("Channel Graph Color Selection", NULL);

response = gtk_dialog_run(GTK_DIALOG(color_dialog));
gtk_widget_hide(color_dialog);
if (response != GTK_RESPONSE_OK)
return;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(color_dialog), color);

/* Change icon color */
channel_color_icon_set_color(color_icon, color);

gtk_widget_destroy(color_dialog);
}

static void channel_math_settings_cb(GtkMenuItem *menuitem, OscPlot *plot)
Expand Down Expand Up @@ -6861,28 +6860,25 @@ static void show_capture_options_toggled_cb(GtkCheckMenuItem *menu_item, OscPlot
if (gtk_check_menu_item_get_active(menu_item)) {
gtk_window_get_size(GTK_WINDOW(priv->window), &priv->size.width, &priv->size.height);
gtk_widget_show(plot->priv->capture_options_box);
} else {
gtk_widget_hide(plot->priv->capture_options_box);
} else {
gtk_widget_hide(plot->priv->capture_options_box);
gtk_window_resize(GTK_WINDOW(priv->window), priv->size.width, priv->size.height);
}
}

static void fullscreen_changed_cb(GtkWidget *widget, OscPlot *plot)
{
// TO DO: handle the fullscreen through the window manager
OscPlotPrivate *priv = plot->priv;
//GtkWidget *img;


if (priv->fullscreen_state) {
gtk_window_unfullscreen(GTK_WINDOW(priv->window));
gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(priv->fullscreen_button), "gtk-fullscreen");
gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menu_fullscreen), "Fullscreen");
} else {
gtk_window_fullscreen(GTK_WINDOW(priv->window));
gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(priv->fullscreen_button), "gtk-leave-fullscreen");
gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menu_fullscreen), "Leave Fullscreen");
}
OscPlotPrivate *priv = plot->priv;
if (priv->fullscreen_state) {
gtk_window_unfullscreen(GTK_WINDOW(priv->window));
gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(priv->fullscreen_button), "gtk-fullscreen");
gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menu_fullscreen), "Fullscreen");
} else {
gtk_window_fullscreen(GTK_WINDOW(priv->window));
gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(priv->fullscreen_button), "gtk-leave-fullscreen");
gtk_menu_item_set_label(GTK_MENU_ITEM(priv->menu_fullscreen), "Leave Fullscreen");
}
}

static gboolean window_state_event_cb(GtkWidget *widget, GdkEventWindowState *event, OscPlot *plot)
Expand Down Expand Up @@ -7076,8 +7072,7 @@ static void create_plot(OscPlot *plot)
g_error_free(err);
gtk_css_provider_load_from_path(GTK_CSS_PROVIDER(plot->priv->provider),OSC_STYLE_FILE_PATH"styles.css",NULL);
}

//gtk_css_provider_load_from_path(GTK_CSS_PROVIDER(plot->priv->provider),"styles.css",NULL);

gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER(plot->priv->provider), GTK_STYLE_PROVIDER_PRIORITY_USER);
style_context = gtk_widget_get_style_context(GTK_WIDGET(priv->databox));
gtk_style_context_add_class(style_context,"data_box");
Expand Down

0 comments on commit 4209939

Please sign in to comment.