Сделал запуск главного окна

pull/24/head
Igor Belitskiy 2 years ago
parent 70c38db5cb
commit 1ed325dad1

@ -1,5 +1,11 @@
#include "controler.h" #include "controler.h"
config_u_g_p cfg_u_g_p;
config_general cfg_general;
main_window cfg_main_gui;
custom_window cfg_custom_gui;
config_settings_gui main_config;
void fill_tree_view_u_g_p(custom_window* _config_gui, config_u_g_p* _config, int start, int flag_gui_add) { void fill_tree_view_u_g_p(custom_window* _config_gui, config_u_g_p* _config, int start, int flag_gui_add) {
GtkTreeModel *model = GTK_TREE_MODEL(_config_gui->list); GtkTreeModel *model = GTK_TREE_MODEL(_config_gui->list);
if (flag_gui_add == 0) { if (flag_gui_add == 0) {
@ -61,25 +67,26 @@ void fill_tree_view_u_g(custom_window* _config_gui, config_u_g_p* _config, int
void load_system_cfg() { void load_system_cfg() {
cfg_u_g_p->flag_load = 0; cfg_u_g_p.flag_load = 0;
load_template_load_cfg(cfg_u_g_p, CMD_LOAD_SYSTEM); load_template_load_cfg(&cfg_u_g_p, CMD_LOAD_SYSTEM);
yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL, BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL, BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void load_global_cfg() { void load_global_cfg() {
cfg_u_g_p->flag_load = 1; cfg_u_g_p.flag_load = 1;
load_template_load_cfg(cfg_u_g_p, CMD_LOAD_GLOBAL); load_template_load_cfg(&cfg_u_g_p, CMD_LOAD_GLOBAL);
yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void control_event(main_window* _config_main_gui, custom_window* _config_custom_gui) { void control_event(main_window* _config_main_gui, custom_window* _config_custom_gui) {
g_signal_connect(G_OBJECT(_config_main_gui->LoadLocalMenuItem), "activate", G_CALLBACK(load_system_cfg), NULL); g_signal_connect(G_OBJECT(_config_main_gui->LoadLocalMenuItem), "activate", G_CALLBACK(load_system_cfg), NULL);
g_signal_connect(G_OBJECT(_config_main_gui->LoadGlobalMenuItem), "activate", G_CALLBACK(load_global_cfg), NULL);
} }
int main(int argc, char *argv[]){ int main(int argc, char *argv[]){
local=setlocale(LC_ALL, ""); local=setlocale(LC_ALL, "");
textdomain (LocaleName); textdomain (LocaleName);
config_init(); config_init(&main_config);
int option_index=0; int option_index=0;
int show_help=0; int show_help=0;
int debug_mode=0; int debug_mode=0;
@ -153,8 +160,8 @@ int main(int argc, char *argv[]){
gtk_init(&argc,&argv); gtk_init(&argc,&argv);
main_window *widgets = setup_window(cfg_main_gui); main_window *widgets = setup_window(&cfg_main_gui);
//control_event(&cfg_main_gui, &cfg_custom_gui); control_event(widgets, &cfg_custom_gui);
yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path); yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel); yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel);

@ -1,6 +1,6 @@
#include "ubl-settings-diskquota.h" #include "ubl-settings-diskquota.h"
config_settings_gui* _main_config;
//signal emmit handlers - no header initialization //signal emmit handlers - no header initialization
@ -31,7 +31,7 @@ void yon_open_browser(GtkWidget *self, char *link){
* Открывает окно подтверждение перехода по ссылке [link]. * Открывает окно подтверждение перехода по ссылке [link].
*/ */
void on_open_documentation_confirmation(GtkWidget *self, char *link){ void on_open_documentation_confirmation(GtkWidget *self, char *link){
if (main_config.always_open_documentation==0){ if (_main_config->always_open_documentation==0){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
documentation_confirmation_window *widgets = malloc(sizeof(documentation_confirmation_window)); documentation_confirmation_window *widgets = malloc(sizeof(documentation_confirmation_window));
widgets->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow"); widgets->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow");
@ -112,20 +112,21 @@ void yon_load_proceed(char *command){
// standard functions // standard functions
void config_init(){ void config_init(config_settings_gui* main_config){
main_config.always_open_documentation=0; _main_config = main_config;
main_config.win_height=0; _main_config->always_open_documentation=0;
main_config.win_width=0; _main_config->win_height=0;
main_config.win_pos_x=0; _main_config->win_width=0;
main_config.win_pos_y=0; _main_config->win_pos_x=0;
main_config.socket_id=-1; _main_config->win_pos_y=0;
main_config.save_socket_id=-1; _main_config->socket_id=-1;
main_config.load_socket_id=-1; _main_config->save_socket_id=-1;
main_config.lock_help=0; _main_config->load_socket_id=-1;
main_config.lock_help=0; _main_config->lock_help=0;
main_config.lock_load_global=0; _main_config->lock_help=0;
main_config.lock_save_global=0; _main_config->lock_load_global=0;
main_config.lock_save_local=0; _main_config->lock_save_global=0;
_main_config->lock_save_local=0;
} }
main_window *setup_window(main_window* widgets){ main_window *setup_window(main_window* widgets){
@ -164,14 +165,14 @@ main_window *setup_window(main_window* widgets){
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem);
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
if (main_config.lock_load_global == 1){ if (_main_config->lock_load_global == 1){
gtk_widget_set_sensitive(widgets->LoadGlobalMenuItem,0); gtk_widget_set_sensitive(widgets->LoadGlobalMenuItem,0);
} }
if (main_config.lock_save_global == 1){ if (_main_config->lock_save_global == 1){
gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,0); gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0); gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
} }
if (main_config.lock_save_local == 1){ if (_main_config->lock_save_local == 1){
gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,0); gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0); gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
} }

@ -103,13 +103,9 @@ typedef struct {
typedef char* string; typedef char* string;
static string version_application=""; static string version_application="";
static config_u_g_p* cfg_u_g_p = NULL;
static config_general* cfg_general = NULL;
static main_window* cfg_main_gui = NULL;
static custom_window* cfg_custom_gui = NULL;
static config_settings_gui main_config;
main_window *setup_window(main_window* widgets);
main_window *setup_window(main_window* widgets);
void on_about(); void on_about();
void yon_open_browser(GtkWidget *self, char *link); void yon_open_browser(GtkWidget *self, char *link);
void on_close_subwindow(GtkWidget *self); void on_close_subwindow(GtkWidget *self);
@ -119,5 +115,5 @@ void yon_load_proceed(char *command);
void event(main_window *widgets); void event(main_window *widgets);
void on_link(GtkWidget *self, char* uri, gpointer user_data); void on_link(GtkWidget *self, char* uri, gpointer user_data);
void config_init(); void config_init(config_settings_gui* main_config);
#endif #endif

Binary file not shown.

@ -6086,6 +6086,7 @@ limitation
<object class="GtkHeaderBar" id="headerBar"> <object class="GtkHeaderBar" id="headerBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child type="title"> <child type="title">
<object class="GtkLabel" id="headerTopic"> <object class="GtkLabel" id="headerTopic">
<property name="visible">True</property> <property name="visible">True</property>

Loading…
Cancel
Save