Applications
/
ubl-settings-video
10
0
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#5) from develop into master

Browse Source 
Reviewed-on: YanTheKaller/ubl-settings-video#5
pull/9/head
Ivan Dmitrievich Yartsev 3 years ago
parent a664dff3bb a8a324789f
commit 80c0824985
4 changed files with 44 additions and 62 deletions
Show Stats Download Patch File Download Diff File

4
source/CMakeLists.txt
Unescape View File

@ -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})

9
source/ubl-settings-video-strings.h
Unescape View File

@ -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")
#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.")

28
source/ubl-settings-video.c
Unescape View File

@ -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)

65
ubl-settings-video.glade
Unescape View File

@ -1583,7 +1583,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<child>
<object class="GtkTreeView" id="propriearyTreeView">
<object class="GtkTreeView" id="proprietaryTreeView">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-top">5</property>
@ -1591,10 +1591,10 @@
<property name="search-column">1</property>
<property name="enable-tree-lines">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection" id="proprietaryTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<object class="GtkTreeViewColumn" id="proprietartInstalledColumn">
<property name="title" translatable="yes">Installed</property>
<child>
<object class="GtkCellRendererToggle"/>
@ -1664,7 +1664,7 @@
<property name="valign">center</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton">
<object class="GtkButton" id="proprietaryInstallButton">
<property name="label" translatable="yes"> Установить</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1679,7 +1679,7 @@
</packing>
</child>
<child>
<object class="GtkButton">
<object class="GtkButton" id="proprietaryDeleteButton">
<property name="label" translatable="yes"> Удалить</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1694,7 +1694,7 @@
</packing>
</child>
<child>
<object class="GtkButton">
<object class="GtkButton" id="proprietaryInfoButton">
<property name="label" translatable="yes"> Подробнее</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1743,19 +1743,20 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<child>
<object class="GtkTreeView" id="propriearyTreeView1">
<object class="GtkTreeView" id="driversTreeView">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-top">5</property>
<property name="model">liststore6</property>
<property name="search-column">0</property>
<property name="enable-grid-lines">vertical</property>
<property name="enable-tree-lines">True</property>
<property name="tooltip-column">2</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection" id="driversTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<object class="GtkTreeViewColumn" id="driverInstalledColumn">
<property name="title" translatable="yes">Installed</property>
<child>
<object class="GtkCellRendererToggle"/>
@ -1766,7 +1767,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="ProprietaryPackageColumn1">
<object class="GtkTreeViewColumn" id="driverPackageColumn">
<property name="title" translatable="yes">Package</property>
<child>
<object class="GtkCellRendererText"/>
@ -1777,7 +1778,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="ProprietaryDriverColumn1">
<object class="GtkTreeViewColumn" id="driverDriverColumn">
<property name="title" translatable="yes">Driver</property>
<child>
<object class="GtkCellRendererText"/>
@ -1788,7 +1789,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="ProprietaryDescriptionColumn1">
<object class="GtkTreeViewColumn" id="driverDescriptionColumn">
<property name="title" translatable="yes">Description</property>
<child>
<object class="GtkCellRendererText"/>
@ -1799,7 +1800,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="ProprietarySupportedColumn1">
<object class="GtkTreeViewColumn" id="driverSupportedColumn">
<property name="title" translatable="yes">Supported Devices</property>
<child>
<object class="GtkCellRendererText"/>
@ -1825,7 +1826,7 @@
<property name="valign">center</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton">
<object class="GtkButton" id="driversInstallButton">
<property name="label" translatable="yes"> Установить</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1840,7 +1841,7 @@
</packing>
</child>
<child>
<object class="GtkButton">
<object class="GtkButton" id="driversDeleteButton">
<property name="label" translatable="yes"> Удалить</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1855,7 +1856,7 @@
</packing>
</child>
<child>
<object class="GtkButton">
<object class="GtkButton" id="driversInfoButton">
<property name="label" translatable="yes"> Подробнее</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -1936,38 +1937,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="pixel-size">75</property>
<property name="icon-name">appointment-new-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
<placeholder/>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin-left">10</property>
<property name="margin-right">5</property>
<property name="margin-start">10</property>
<property name="margin-end">5</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
<placeholder/>
</child>
</object>
</child>

Write Preview
Loading…
Cancel
Save