Merge branch 'master' of github.com:daleclack/testing-repository

This commit is contained in:
daleclack 2021-04-20 21:14:06 +08:00
commit f5d10aa27d
2 changed files with 3 additions and 0 deletions

View File

@ -17,6 +17,7 @@ static GtkWidget *win1_init(GtkWindow *parent){
GtkBuilder *builder=gtk_builder_new_from_resource("/gtk69/win1.ui"); GtkBuilder *builder=gtk_builder_new_from_resource("/gtk69/win1.ui");
win1=(GtkWidget*)gtk_builder_get_object(builder,"win1"); win1=(GtkWidget*)gtk_builder_get_object(builder,"win1");
gtk_window_set_transient_for((GtkWindow*)win1,parent); gtk_window_set_transient_for((GtkWindow*)win1,parent);
gtk_window_set_icon_name((GtkWindow*)win1,"win1");
img_mini=(GtkWidget*)gtk_builder_get_object(builder,"image1"); img_mini=(GtkWidget*)gtk_builder_get_object(builder,"image1");
gtk_image_set_from_icon_name(GTK_IMAGE(img_mini),"window-minimize",GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(img_mini),"window-minimize",GTK_ICON_SIZE_BUTTON);
btn_mini=(GtkWidget*)gtk_builder_get_object(builder,"btn_mini"); btn_mini=(GtkWidget*)gtk_builder_get_object(builder,"btn_mini");

View File

@ -6,6 +6,8 @@ void conf_dialog(GtkWidget *widget,GtkWindow *win){
GtkBuilder *conf_size=gtk_builder_new_from_resource("/gtk69/winsize.ui"); GtkBuilder *conf_size=gtk_builder_new_from_resource("/gtk69/winsize.ui");
GObject *dialog=gtk_builder_get_object(conf_size,"dialog"); GObject *dialog=gtk_builder_get_object(conf_size,"dialog");
gtk_window_set_transient_for(GTK_WINDOW(dialog),win); gtk_window_set_transient_for(GTK_WINDOW(dialog),win);
gtk_window_set_icon_name((GtkWindow*)dialog,"gtk69");
gtk_window_set_title((GtkWindow*)dialog,"Size Config");
g_signal_connect(dialog,"response",G_CALLBACK(conf_response),conf_size); g_signal_connect(dialog,"response",G_CALLBACK(conf_response),conf_size);
//Set default config //Set default config
GtkWidget *btn_width,*btn_height; GtkWidget *btn_width,*btn_height;