|
|
|
|
@ -121,7 +121,7 @@ void yon_terminal_start(widgets_dict *widgets, char *usr_command){
|
|
|
|
|
env[0]="";
|
|
|
|
|
env[1]=NULL;
|
|
|
|
|
|
|
|
|
|
GtkBuilder *builder=gtk_builder_new_from_file(glade_path);
|
|
|
|
|
GtkBuilder *builder=gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
widgets->TerminalBox = yon_gtk_builder_get_widget(builder, "TerminalBox");
|
|
|
|
|
widgets->TerminalRevealer = yon_gtk_builder_get_widget(builder, "TerminalRevealer");
|
|
|
|
|
widgets->TerminalMoreRevieler = yon_gtk_builder_get_widget(builder, "TerminalMoreRevieler");
|
|
|
|
|
@ -562,7 +562,7 @@ void on_proprietary_get(GtkWidget *notebook, GtkWidget *page, int pagen, gpointe
|
|
|
|
|
void on_monitor_configure(GtkWidget *self,monitor_window *window){
|
|
|
|
|
if(window&&window->config){
|
|
|
|
|
monitor_edit_window *monitors = new(monitor_edit_window);
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
monitors->templateMonitorConfigurationWindow = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationWindow"));
|
|
|
|
|
monitors->mainMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "mainMonitorConfigurationBox"));
|
|
|
|
|
monitors->templateMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationBox"));
|
|
|
|
|
@ -673,7 +673,7 @@ void on_link(GtkWidget *self, char* link, gpointer user_data){
|
|
|
|
|
if (!link)
|
|
|
|
|
link=UBLINUX_WIKI_LINK;
|
|
|
|
|
if (videoconfig.alwaysredirect==0){
|
|
|
|
|
GtkBuilder *builder=gtk_builder_new_from_file(glade_path);
|
|
|
|
|
GtkBuilder *builder=gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
GtkWidget *sureWindow=yon_gtk_builder_get_widget(builder,"HelpSureWindow");
|
|
|
|
|
GtkWidget *readButton=yon_gtk_builder_get_widget(builder,"ReadHelpButton");
|
|
|
|
|
GtkWidget *cancelButton=yon_gtk_builder_get_widget(builder,"CancelHelpButton");
|
|
|
|
|
@ -705,7 +705,7 @@ void on_link(GtkWidget *self, char* link, gpointer user_data){
|
|
|
|
|
*/
|
|
|
|
|
void on_about()
|
|
|
|
|
{
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
GtkWidget *window = yon_gtk_builder_get_widget(builder, "aboutWindow");
|
|
|
|
|
GtkWidget *hideButtonBox = yon_gtk_builder_get_widget(builder, "buttonBoxHide");
|
|
|
|
|
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window), _("UBlinux Video Configuration"));
|
|
|
|
|
@ -1109,7 +1109,6 @@ dictionary *yon_proprieary_get(){
|
|
|
|
|
videoconfig.proprietary=NULL;
|
|
|
|
|
}
|
|
|
|
|
drivers=yon_config_load(get_proprietary_drivers_command,&drivers_size);
|
|
|
|
|
printf("begin loading information\n");
|
|
|
|
|
for (int dr_desc=0;dr_desc<size;dr_desc++){
|
|
|
|
|
for (int dr_foun=0;dr_foun<drivers_size;dr_foun++){
|
|
|
|
|
drivers[dr_foun]=yon_char_divide_search(drivers[dr_foun],"\n",-1);
|
|
|
|
|
@ -1125,13 +1124,11 @@ dictionary *yon_proprieary_get(){
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (videoconfig.proprietary){
|
|
|
|
|
printf("printing information\n");
|
|
|
|
|
yon_gtk_list_store_fill_with_proprietaries(videoconfig.list);
|
|
|
|
|
yon_ubl_status_box_render(videoconfig.status_render,PROPRIETARY_OPETAION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
|
|
|
|
|
} else {
|
|
|
|
|
drivers=yon_config_load(get_proprietary_drivers_local_command,&drivers_size);
|
|
|
|
|
if (drivers){
|
|
|
|
|
printf("%s\n",drivers[0]);
|
|
|
|
|
for (int drivers_found=0;drivers_found<drivers_size;drivers_found++){
|
|
|
|
|
drivers[drivers_found]=yon_char_divide_search(drivers[drivers_found],"\n",-1);
|
|
|
|
|
for (int i=0;i<size;i++){
|
|
|
|
|
@ -1400,7 +1397,7 @@ char *yon_char_parsed_get_resolution(config_str parsed_string, int size){
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void yon_monitor_view_new(monitor_config monitor){
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
monitor_window *window = new(monitor_window);
|
|
|
|
|
window->templateMonitorscreenOverlay=yon_gtk_builder_get_widget(builder,"templateMonitorscreenOverlay");
|
|
|
|
|
window->templateMonitorImage=yon_gtk_builder_get_widget(builder,"templateMonitorImage");
|
|
|
|
|
@ -1531,7 +1528,7 @@ void yon_adapter_window_setup(widgets_dict *widgets){
|
|
|
|
|
* */
|
|
|
|
|
void yon_setup_widgets(widgets_dict *widgets)
|
|
|
|
|
{
|
|
|
|
|
widgets->builder = gtk_builder_new_from_file(glade_path);
|
|
|
|
|
widgets->builder = gtk_builder_new_from_resource(glade_path);
|
|
|
|
|
widgets->appsPackWindow = yon_gtk_builder_get_widget(widgets->builder, "appsPackWindow");
|
|
|
|
|
widgets->appsPackBox = yon_gtk_builder_get_widget(widgets->builder, "appsPackBox");
|
|
|
|
|
widgets->MainWindow = yon_gtk_builder_get_widget(widgets->builder, "MainWindow");
|
|
|
|
|
@ -1727,7 +1724,7 @@ void yon_setup_widgets(widgets_dict *widgets)
|
|
|
|
|
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->ProprietaryDriverColumn), DRIVER_LABEL);
|
|
|
|
|
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->ProprietaryDescriptionColumn), DESCRIPTION_LABEL);
|
|
|
|
|
|
|
|
|
|
yon_ubl_header_setup(widgets->mainHeadOverlay, widgets->headBox, widgets->mainHeadBackgroundImage, banner_path);
|
|
|
|
|
yon_ubl_header_setup_resource(widgets->mainHeadOverlay, widgets->headBox, widgets->mainHeadBackgroundImage, banner_path);
|
|
|
|
|
yon_monitor_view_setup(widgets->mainMonitorVisualConfigurationBox);
|
|
|
|
|
|
|
|
|
|
videoconfig.status_render.icon=widgets->mainStatusIcon;
|
|
|
|
|
@ -1842,7 +1839,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
yon_monitor_set_resolutions();
|
|
|
|
|
yon_adapter_window_setup(&widgets);
|
|
|
|
|
GtkCssProvider *css = gtk_css_provider_new();
|
|
|
|
|
gtk_css_provider_load_from_path(css, CssPath, NULL);
|
|
|
|
|
gtk_css_provider_load_from_resource(css, CssPath);
|
|
|
|
|
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
|
|
|
|
|
GTK_STYLE_PROVIDER(css),
|
|
|
|
|
-1);
|
|
|
|
|
|
