diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 009e8d4..dc25088 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ @@ -22,7 +23,8 @@ set(SOURCE_FILES set(LIBRARIES ${GTK_LIBRARIES} - pthread) + pthread + vte) add_executable(ubl-settings-video ${SOURCE_FILES}) diff --git a/source/ubl-settings-video-strings.h b/source/ubl-settings-video-strings.h index f15d6ef..cf942d2 100644 --- a/source/ubl-settings-video-strings.h +++ b/source/ubl-settings-video-strings.h @@ -40,4 +40,11 @@ #define MONITOR_ROTATE_INVERTED_PARAMETER _("invert") #define MONITOR_PORT_ERROR_LABEL _("Error: Port must be chosen to save") -#define MONITOR_PORT_SUCCESS_LABEL _("Monitor configuration succeedeed") \ No newline at end of file +#define MONITOR_PORT_SUCCESS_LABEL _("Monitor configuration succeedeed") + +#define GLOBAL_LOAD_SUCCESS _("Global configuration loading succseeded.") +#define LOCAL_LOAD_SUCCESS _("Local configuration loading succseeded.") + +#define GLOBAL_LOCAL_SAVE_SUCCESS _("Local and global configuration saving succseeded.") +#define GLOBAL_SAVE_SUCCESS _("Global configuration saving succseeded.") +#define LOCAL_SAVE_SUCCESS _("Local configuration saving succseeded.") \ No newline at end of file diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 2f0ea9b..944aff4 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -570,20 +570,20 @@ void yon_launch_with_output(char *command){ input.command=command; input.data=output_file; pthread_create(&tid,NULL,(void*)yon_popen,&input); - char **output_strings = NULL; - output_strings = malloc(sizeof(char)); - int i = 0; - char str[1000]; - memset(str, 0, 1000); - while (1){ - if (output){ - if (fgets(str, 1000, output)){ - videoconfig.status_render.text_to_render=str; - videoconfig.status_render.type=BACKGROUND_IMAGE_SUCCESS_TYPE; - _yon_ubl_status_box_render(&videoconfig.status_render); - } - } - } + // char **output_strings = NULL; + // output_strings = malloc(sizeof(char)); + // int i = 0; + // char str[1000]; + // memset(str, 0, 1000); + // while (1){ + // if (output){ + // if (fgets(str, 1000, output)){ + // videoconfig.status_render.text_to_render=str; + // videoconfig.status_render.type=BACKGROUND_IMAGE_SUCCESS_TYPE; + // _yon_ubl_status_box_render(&videoconfig.status_render); + // } + // } + // } } /**void yon_monitor_view_draw_all(GtkWidget *cnt) diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index dcdaae5..b6a02ac 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -1583,7 +1583,7 @@ True True - + True True 5 @@ -1591,10 +1591,10 @@ 1 True - + - + Installed @@ -1664,7 +1664,7 @@ center 5 - + Установить True True @@ -1679,7 +1679,7 @@ - + Удалить True True @@ -1694,7 +1694,7 @@ - + Подробнее True True @@ -1743,19 +1743,20 @@ True True - + True True 5 liststore6 0 + vertical True 2 - + - + Installed @@ -1766,7 +1767,7 @@ - + Package @@ -1777,7 +1778,7 @@ - + Driver @@ -1788,7 +1789,7 @@ - + Description @@ -1799,7 +1800,7 @@ - + Supported Devices @@ -1825,7 +1826,7 @@ center 5 - + Установить True True @@ -1840,7 +1841,7 @@ - + Удалить True True @@ -1855,7 +1856,7 @@ - + Подробнее True True @@ -1936,38 +1937,10 @@ True False - - True - False - start - 75 - appointment-new-symbolic - - - False - True - 0 - + - - True - False - start - start - 10 - 5 - 10 - 5 - 10 - 10 - label - - - False - True - 1 - +