diff --git a/Makefile b/Makefile index 8b1a16c..5cfec29 100644 --- a/Makefile +++ b/Makefile @@ -100,17 +100,17 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm655 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ echo "$${FILE_PO}"; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done @for SIZE in 16 32 48; do \ - install -dm655 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -dm655 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" + @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/devices/" "com.ublinux.${PKGNAME}.display.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/devices/" "com.ublinux.${PKGNAME}.video-card.svg" @@ -122,7 +122,7 @@ install: check uninstall @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.pkexec.${PKGNAME}.exec.policy" @install -Dm655 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -dm655 "${DESTDIR}${PREFIX}/share/applications" + @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -dm655 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index aea0871..77f3216 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -990,12 +990,13 @@ dictionary *yon_proprieary_get(){ drivers[drivers_found]=yon_char_divide_search(drivers[drivers_found],"\n",-1); for (int i=0;idata,&size,";"); - gtk_list_store_append(list,&iter); - gtk_list_store_set(list,&iter,1,str[0],2,str[1],3,str[2],4,str[3],5,str[4],-1); + printf("%s\n",str[0]); + if (strcmp(str[0],"")!=0&&str[0]){ + gtk_list_store_append(videoconfig.list,&iter); + gtk_list_store_set(videoconfig.list,&iter,1,str[0],2,str[1],3,str[2],4,str[3],5,str[4],-1); + } + else{ + gtk_list_store_append(videoconfig.list2,&iter); + gtk_list_store_set(videoconfig.list2,&iter,1,str[0],2,str[1],3,str[2],4,str[3],5,str[4],-1); + } if (strstr(dict->key," installed")) - gtk_list_store_set(list,&iter,0,1,-1); + gtk_list_store_set(videoconfig.list,&iter,0,1,-1); } } } @@ -1487,6 +1495,7 @@ void yon_setup_widgets(widgets_dict *widgets) gtk_window_set_title(GTK_WINDOW(widgets->MainWindow),TITLE_LABEL); videoconfig.list = GTK_LIST_STORE(gtk_builder_get_object(widgets-> builder, "liststore6")); + videoconfig.list2 = GTK_LIST_STORE(gtk_builder_get_object(widgets-> builder, "liststore1")); gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->proprietaryTreeView),GTK_TREE_MODEL(videoconfig.list)); diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index c4120fe..c7fa092 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -117,6 +117,7 @@ typedef struct proprietary_config proprietary; dictionary *supported_resolutions; GtkListStore *list; + GtkListStore *list2; char *failsafenVidia; char *failsafeATI; int descreteOnly; diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index 6d6de85..20af17d 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -1361,17 +1361,19 @@ False go-bottom-symbolic - - - - - + - - - + + + - + + + + + + + @@ -2203,7 +2205,7 @@ True True 5 - liststore6 + liststore1 0 vertical True