jepler/tg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tweaks for MSYS

Browse source
This commit is contained in:
Marcello Mamino 2017-06-03 01:06:36 +02:00
parent 1bfd9977bd
commit fecae48d14
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/interface.c
View file

@ -327,11 +327,11 @@ GtkWidget *make_tab_label(char *name, struct output_panel *panel_to_close)
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
if(panel_to_close) {
#ifdef _WIN32
GtkWidget *image = gtk_image_new_from_file("window-close.png");
#else
//#ifdef _WIN32
// GtkWidget *image = gtk_image_new_from_file("window-close.png");
//#else
GtkWidget *image = gtk_image_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_MENU);
#endif
//#endif
GtkWidget *button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button), image);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@ -372,17 +372,17 @@ void handle_snapshot(GtkButton *b, struct main_window *w)
void chooser_set_filters(GtkFileChooser *chooser)
{
GtkFileFilter *all_filter = gtk_file_filter_new();
gtk_file_filter_set_name(all_filter, "All files");
gtk_file_filter_add_pattern(all_filter, "*");
gtk_file_chooser_add_filter(chooser, all_filter);
GtkFileFilter *tgj_filter = gtk_file_filter_new();
gtk_file_filter_set_name(tgj_filter, ".tgj");
gtk_file_filter_add_pattern(tgj_filter, "*.tgj");
gtk_file_chooser_add_filter(chooser, tgj_filter);
//TODO: on win10 seems not to work...
GtkFileFilter *all_filter = gtk_file_filter_new();
gtk_file_filter_set_name(all_filter, "All files");
gtk_file_filter_add_pattern(all_filter, "*");
gtk_file_chooser_add_filter(chooser, all_filter);
// On windows seems not to work...
gtk_file_chooser_set_filter(chooser, tgj_filter);
}
@ -689,11 +689,11 @@ void init_main_window(struct main_window *w)
// Command menu
GtkWidget *command_menu = gtk_menu_new();
GtkWidget *command_menu_button = gtk_menu_button_new();
#ifdef _WIN32
GtkWidget *image = gtk_image_new_from_file("open-menu.png");
#else
//#ifdef _WIN32
// GtkWidget *image = gtk_image_new_from_file("open-menu.png");
//#else
GtkWidget *image = gtk_image_new_from_icon_name("open-menu-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
#endif
//#endif
gtk_button_set_image(GTK_BUTTON(command_menu_button), image);
g_object_set(G_OBJECT(command_menu_button), "direction", GTK_ARROW_DOWN, NULL);
g_object_set(G_OBJECT(command_menu), "halign", GTK_ALIGN_END, NULL);

8
src/serializer.c
View file

@ -104,11 +104,11 @@ int scan_int(FILE *f, int *x)
int serialize_double(FILE *f, double x)
{
#ifdef _WIN32
return 0 > __mingw_fprintf(f, "I%a;\n", x);
#else
//#ifdef _WIN32
// return 0 > __mingw_fprintf(f, "I%a;\n", x);
//#else
return 0 > fprintf(f, "I%a;\n", x);
#endif
//#endif
}
int scan_double(FILE *f, double *x)

4
src/tg.h
View file

@ -27,6 +27,10 @@
#include <gtk/gtk.h>
#include <pthread.h>
#ifdef __CYGWIN__
#define _WIN32
#endif
#define CONFIG_FILE_NAME "tg-timer.ini"
#define FILTER_CUTOFF 3000