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

Reviewed-on: YanTheKaller/ubl-settings-video#3
pull/6/head
commit 792fc019f0

1
.gitignore vendored

@ -5,3 +5,4 @@ ubl-settings-video.glade~
compile/ compile/
ubl-settings-video_ru.po~ ubl-settings-video_ru.po~
ubl-settings-video-n.pot ubl-settings-video-n.pot
vgcore.*

@ -87,6 +87,7 @@ uninstall:
@$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf" @$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images"
@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
@if [ -z ${DESTDIR} ]; then \ @if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
@ -99,29 +100,31 @@ install: check uninstall
@echo "Install ..." @echo "Install ..."
@for FILE_PO in $(wildcard *.po); do \ @for FILE_PO in $(wildcard *.po); do \
LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ install -dm655 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
echo "$${FILE_PO}"; \ echo "$${FILE_PO}"; \
msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
done done
@for SIZE in 16 32 48; do \ @for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ install -dm655 "${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"; \ 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 done
@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -dm655 "${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/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}.display.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm655 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
@install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -dm655 "${DESTDIR}${PREFIX}/share/applications"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} @install -dm655 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}-banner.png" @install -dm655 "${DESTDIR}${PREFIX}/share/${PKGNAME}/images"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}-banner.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/csv/" "resolutions.csv"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/csv/" "video-drivers.csv"
@if [ -z ${DESTDIR} ]; then \ @if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \

@ -1,5 +1,5 @@
# ubl-settings-video # ubl-settings-video
# Видеокарта/Экран # Настройки видеоадаптера и дисплея
# Build # Build
In order to build ubl-settings-video you will need: In order to build ubl-settings-video you will need:

@ -0,0 +1,27 @@
640x480 ,4:3,VGA
800x480 ,5:3,WVGA
800x600 ,4:3,SVGA
854x480 ,16:9,FWVGA
960x540 ,19:9,qHD
1024x600,128:75,WSVGA
1024x768,4:3,XGA
1152x864,4:3,XGA+
1200x600,2:1,WXVGA
1280x720,16:9,HD
1280x768,5:3,WSGA
1280x1024,5:4,SXGA
1440x900,16:10,WXGA+
1400x1050,4:3,SXGA+
1440x1080,4:3,HDV 1080
1536x960,16:10,XJXGA
1536x1024,3:2,WSXGA
1600x900,16:9,HD+
1600x1024,25:16,WSXGA
1600x1200,4:3,UXGA
1680x1050,16:10,WSXGA+
1920x1080,16:9,FHD
1920x1200,16:10,WUXGA
2048x1080,19:10,2K DCI
2048x1152,16:9,QWXGA
2560x1080,21:9,UWHD
2560x1440,16:9,QHD
1 640x480 4:3 VGA
2 800x480 5:3 WVGA
3 800x600 4:3 SVGA
4 854x480 16:9 FWVGA
5 960x540 19:9 qHD
6 1024x600 128:75 WSVGA
7 1024x768 4:3 XGA
8 1152x864 4:3 XGA+
9 1200x600 2:1 WXVGA
10 1280x720 16:9 HD
11 1280x768 5:3 WSGA
12 1280x1024 5:4 SXGA
13 1440x900 16:10 WXGA+
14 1400x1050 4:3 SXGA+
15 1440x1080 4:3 HDV 1080
16 1536x960 16:10 XJXGA
17 1536x1024 3:2 WSXGA
18 1600x900 16:9 HD+
19 1600x1024 25:16 WSXGA
20 1600x1200 4:3 UXGA
21 1680x1050 16:10 WSXGA+
22 1920x1080 16:9 FHD
23 1920x1200 16:10 WUXGA
24 2048x1080 19:10 2K DCI
25 2048x1152 16:9 QWXGA
26 2560x1080 21:9 UWHD
27 2560x1440 16:9 QHD

@ -17,9 +17,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
set(SOURCE_FILES set(SOURCE_FILES
ubl-settings-video.c ubl-settings-video.c
ubl-settings-video.h
ubl-utils.c ubl-utils.c
ubl-utils.h) )
set(LIBRARIES set(LIBRARIES
${GTK_LIBRARIES} ${GTK_LIBRARIES}

@ -0,0 +1,43 @@
#define PARAMETER_DEFAULT_LABEL _("Default settings")
#define MONITOR_LABEL _("Monitor ")
#define SETTINGS_VIDEO_TITLE_LABEL _("Video adapter and display settings")
#define MONITOR_PORT_LABEL _("Port: ")
#define MONITOR_RESOLUTION_LABEL _("Resolution (px): ")
#define MONITOR_FREQUENCY_LABEL _("Frequency (Hz): ")
#define MONITOR_ROTATION_LABEL _("Rotation: ")
#define MONITOR_POSITION_LABEL _("Position: ")
#define MONITOR_SWITCH_OFF_LABEL _("Do not switch off display")
#define MONITOR_CVT_LABEL _("Create modeline for current resolution with CVT")
#define MONITOR_REDUCED_LABEL _("Use \"CVT Reduced Blanking\"")
#define MONITOR_GTF_LABEL _("Create modeline for current resolution with GTF")
#define MONITOR_MANUALLY_LABEL _("Configure manually through parameter line: ")
#define MONITOR_MAIN_DISPLAY_LABEL _("Main display")
#define MONITOR_UNSUPPORTED_LABEL _("Show unsupported")
#define MONITOR_ENABLED_LABEL _("Enabled")
#define MONITOR_LEFT_LABEL _("Left")
#define MONITOR_RIGHT_LABEL _("Right")
#define MONITOR_INVERTED_LABEL _("Inverted")
#define MONITOR_LEFT_POS_LABEL _("Left of")
#define MONITOR_RIGHT_POS_LABEL _("Right of")
#define MONITOR_ABOVE_POS_LABEL _("Above")
#define MONITOR_BELOW_POS_LABEL _("Below ")
#define MONITOR_NO_ROTATION_LABEL _("No rotation")
#define MONITOR_SAVE_LABEL _("Save")
#define MONITOR_CANCEL_LABEL _("Cancel")
#define MONITOR_CHOOSE_PORT_LABEL _("Choose port to configure")
#define MONITOR_POSITION_LEFT_PARAMETER _("lo:")
#define MONITOR_POSITION_RIGHT_PARAMETER _("ro:")
#define MONITOR_POSITION_ABOVE_PARAMETER _("ab:")
#define MONITOR_POSITION_BELOW_PARAMETER _("be:")
#define MONITOR_ROTATE_PARAMETER _("rotate:")
#define MONITOR_ROTATE_NORMAL_PARAMETER _("normal")
#define MONITOR_ROTATE_LEFT_PARAMETER _("left")
#define MONITOR_ROTATE_RIGHT_PARAMETER _("right")
#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")

File diff suppressed because it is too large Load Diff

@ -8,12 +8,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "ubl-utils.h" #include "ubl-utils.h"
#include "ubl-settings-video-strings.h"
#ifndef UBL_SETINGS_VIDEO_H #ifndef UBL_SETINGS_VIDEO_H
#define UBL_SETINGS_VIDEO_H #define UBL_SETINGS_VIDEO_H
#define icon_name "com.ublinux.ubl-settings-video" #define icon_name "com.ublinux.ubl-settings-video"
#define banner_path "/usr/share/ubl-settings-video/ui/ubl-settings-video-banner.png" #define banner_path "/usr/share/ubl-settings-video/images/ubl-settings-video-banner.png"
#define glade_path "/usr/share/ubl-settings-video/ui/ubl-settings-video.glade" #define glade_path "/usr/share/ubl-settings-video/ui/ubl-settings-video.glade"
#define LocalePath "/usr/share/locale" #define LocalePath "/usr/share/locale"
@ -25,17 +26,41 @@
#define StatusSaveGlobalFailed _("Saving to global configuration Succeeded") #define StatusSaveGlobalFailed _("Saving to global configuration Succeeded")
#define StatusSaveLocalFailed _("Saving to local configuration Succeeded") #define StatusSaveLocalFailed _("Saving to local configuration Succeeded")
#define get_ports_command "xrandr |grep -E \"^[A-Z0-9]* connected\" |cut -d' ' -f1" #define get_ports_command "xrandr |grep -E \"*connected\" |cut -d' ' -f1"
#define get_resolutions_command "xrandr |grep -noP \"\\d+x+\\d+\""
#define get_resolution_ports_command "xrandr |grep -nwP \"connected\" |grep -oE \"[0-9a-zA-Z:]{1,10} connected\" |grep -oE \"[0-9a-zA-Z:]{1,10} \""
#define get_proprietary_drivers_command "cut -d, -f1- /usr/share/ubl-settings-video/csv/video-drivers.csv | grep -E \"-\""
#define get_resolutions_supportable_command "cut -d, -f1- /usr/share/ubl-settings-video/csv/resolutions.csv |sed 's/,/ /g'"
#define get_frequences_command "xrandr |grep -v -n \"[a-z][a-z]\" |sed 's/ * / /g' |cut -d' ' -f1,3-"
#define load_drivers_command "/usr/bin/ubconfig --default --source " #define load_drivers_command "/usr/bin/ubconfig --default --source "
#define load_drivers_global_command "/usr/bin/ubconfig --default --source global get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN " #define load_drivers_global_command "/usr/bin/ubconfig --default --source global get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
#define save_drivers_global_command "/usr/bin/ubconfig --target global set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s " #define save_drivers_global_command "/usr/bin/ubconfig --target global set video "
#define load_drivers_local_command "/usr/bin/ubconfig --default --source system get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN " #define load_drivers_local_command "/usr/bin/ubconfig --default --source system get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
#define save_drivers_local_command "/usr/bin/ubconfig --target system set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s " #define save_drivers_local_command "pkexec /usr/bin/ubconfig --target system set video "
#define remove_drivers_global_command "/usr/bin/ubconfig --target system remove video "
#define remove_drivers_local_command "/usr/bin/ubconfig --target global remove video "
#define install_proprietary_command "pkexec pacman -Sy --noconfirm "
#define delete_proprietary_command "pkexec pacman -R --noconfirm "
#define get_info_proprietary_command "pamac-manager --details="
#define get_version_proprietary_command "grep \"VERSION_ID=\" /etc/os-release | cut -d= -f2"
#define XORG_MONITOR(port) yon_char_get_augumented(" XORG_MONITOR[",yon_char_get_augumented(port,"] "))
char *local; char *local;
@ -43,36 +68,70 @@ typedef char* string;
string version_application = "1.0"; string version_application = "1.0";
#define _(String) gettext(String)
typedef dictionary* monitor_config;
typedef dictionary* proprietary_config;
typedef dictionary* monitor_view;
#define _(String) gettext(String)
typedef struct { typedef struct {
config_str line;
int size;
} resolution_supported;
typedef struct
{
config_str loaded_config;
int configsize;
int autoChooseDrivers; int autoChooseDrivers;
dictionary *videoconfig; monitor_view monitor_visuals;
dictionary *monitors; monitor_config monitors;
char *proprietary; proprietary_config proprietary;
dictionary *supported_resolutions;
GtkListStore *list;
char *failsafenVidia; char *failsafenVidia;
char *failsafeATI; char *failsafeATI;
int descreteOnly; int descreteOnly;
char *optirun; char *optirun;
char *primusrun; char *primusrun;
int gapfix; int gapfix;
int optiorprimus; config_str ports;
apps *applist; int portssize;
int appsize; config_str resolutions;
int resolutionssize;
render_data status_render;
} config; } config;
typedef struct {
typedef struct
{
int main; int main;
int enable;
int position;
char *position_port;
char *port; char *port;
char *resolution; char *resolution;
char *resolutionCapabilities; config_str resolutionCapabilities;
char *frequency; char *frequency;
char *rotation; int rotation;
char *stringparameters; char *stringparameters;
int dpms;
int resolution_size;
int cvt;
int reduced;
int gtf;
int show_usupported;
} monitorconfig; } monitorconfig;
typedef struct { typedef struct {
GtkWidget *combo;
GtkWidget *tree;
} combo_tree;
typedef struct
{
dictionary *monitors; dictionary *monitors;
dictionary *overlays; dictionary *overlays;
GtkBuilder *builder; GtkBuilder *builder;
@ -143,42 +202,110 @@ typedef struct {
GtkWidget *templateMonitorConfigurationParameterLineEntry; GtkWidget *templateMonitorConfigurationParameterLineEntry;
GtkWidget *templateMonitorConfigurationDoNotSwitchOffLabel; GtkWidget *templateMonitorConfigurationDoNotSwitchOffLabel;
GtkWidget *templateMonitorConfigurationDoNotSwitchOffCheck; GtkWidget *templateMonitorConfigurationDoNotSwitchOffCheck;
GtkWidget *proprietaryTreeView;
GtkWidget *proprietaryInfoButton;
GtkWidget *proprietaryDeleteButton;
GtkWidget *proprietaryInstallButton;
GtkTreeSelection *proprietaryTreeSelection;
GtkWidget *driversTreeView;
GtkWidget *driversInfoButton;
GtkWidget *driversDeleteButton;
GtkWidget *driversInstallButton;
GtkTreeSelection *driversTreeSelection;
GtkTreeViewColumn *proprietartInstalledColumn;
GtkTreeViewColumn *ProprietaryPackageColumn;
GtkTreeViewColumn *ProprietaryDriverColumn;
GtkTreeViewColumn *ProprietaryDescriptionColumn;
GtkTreeViewColumn *ProprietarySupportedColumn;
GtkTreeViewColumn *driverInstalledColumn;
GtkTreeViewColumn *driverPackageColumn;
GtkTreeViewColumn *driverDriverColumn;
GtkTreeViewColumn *driverDescriptionColumn;
GtkTreeViewColumn *driverSupportedColumn;
} widgets_dict; } widgets_dict;
typedef struct { typedef struct
{
GtkWidget *templateMonitorConfigurationWindow; GtkWidget *templateMonitorConfigurationWindow;
GtkWidget *mainMonitorConfigurationBox;
GtkWidget *templateMonitorConfigurationBox; GtkWidget *templateMonitorConfigurationBox;
GtkWidget *templateMonitorConfigurationMonitorLabel; GtkWidget *templateMonitorConfigurationEnableCheck;
GtkWidget *templateMonitorConfigurationPortLabel;
GtkWidget *templateMonitorConfigurationPortCombo;
GtkWidget *templateMonitorConfigurationMainCheck;
GtkWidget *templateMonitorConfigurationResolutionLabel; GtkWidget *templateMonitorConfigurationResolutionLabel;
GtkWidget *templateMonitorConfigurationResolutionCombo; GtkWidget *templateMonitorConfigurationResolutionCombo;
GtkWidget *templateMonitorConfigurationShowUnsupportedCheck;
GtkWidget *templateMonitorConfigurationFrequencyLabel; GtkWidget *templateMonitorConfigurationFrequencyLabel;
GtkWidget *templateMonitorConfigurationFrequencyCombo; GtkWidget *templateMonitorConfigurationFrequencyCombo;
GtkWidget *templateMonitorConfigurationRotationCombo;
GtkWidget *templateMonitorConfigurationRotationLabel; GtkWidget *templateMonitorConfigurationRotationLabel;
GtkWidget *templateMonitorConfigurationMainRadio; GtkWidget *templateMonitorConfigurationRotationCombo;
GtkWidget *templateMonitorConfigurationPositionLabel;
GtkWidget *templateMonitorConfigurationPositionPosCombo;
GtkWidget *templateMonitorConfigurationPositionPortCombo;
GtkWidget *templateMonitorConfigurationDoNotSwitchOffCheck;
GtkWidget *templateMonitorConfigurationModelineCVTCheck;
GtkWidget *templateMonitorConfigurationUseCVTReducedCheck;
GtkWidget *templateMonitorConfigurationModelineGTFCheck;
GtkWidget *templateMonitorConfigurationParameterLineCheck; GtkWidget *templateMonitorConfigurationParameterLineCheck;
GtkWidget *templateMonitorConfigurationParameterLineEntry; GtkWidget *templateMonitorConfigurationParameterLineEntry;
GtkWidget *templateMonitorConfigurationDoNotSwitchOffLabel;
GtkWidget *templateMonitorConfigurationDoNotSwitchOffCheck;
GtkWidget *templateMonitorConfigurationCancelButton; GtkWidget *templateMonitorConfigurationCancelButton;
GtkWidget *templateMonitorConfigurationSaveButton; GtkWidget *templateMonitorConfigurationSaveButton;
dictionary *config;
} monitor_edit_window;
typedef struct {
GtkWidget *templateMonitorscreenOverlay; GtkWidget *templateMonitorscreenOverlay;
GtkWidget *templateMonitorImage;
GtkWidget *templateMonitorInfoBox; GtkWidget *templateMonitorInfoBox;
GtkWidget *templateMonitorInfoNameLabel; GtkWidget *templateMonitorInfoNameLabel;
GtkWidget *templateMonitorInfoResolutionLabel; GtkWidget *templateMonitorInfoResolutionLabel;
GtkWidget *templateMonitorDeleteButton;
GtkWidget *templateMonitorSwitchButton;
GtkWidget *templateMonitorInfoConfigureButton; GtkWidget *templateMonitorInfoConfigureButton;
dictionary *curconfig; GtkWidget *templateMonitorInfoAddButton;
} MonitorSettings; monitor_config config;
} monitor_window;
typedef struct
{
GtkWidget *window;
GtkWidget *propriearyTreeView;
GtkTreeViewColumn *ProprietaryDriverColumn;
GtkTreeViewColumn *ProprietaryDescriptionColumn;
GtkListStore *list;
GtkWidget *ProprietaryCloseButton;
GtkWidget *ProprietaryAcceptButton;
} driver_window;
int yon_check_for_monitors();
MonitorSettings *yon_setup_monitor_settings();
dictionary *yon_dictionary_pack_monitors(MonitorSettings *monitors, int size);
dictionary *yon_dictionary_pack_overlays(MonitorSettings *monitors, int size);
void on_closed_configuration(GtkWidget *self, MonitorSettings *monitors);
void on_save_configuration(GtkWidget self, MonitorSettings *monitors);
// void on_closed_configuration(GtkWidget *self, MonitorSettings *monitors);
// void on_save_configuration(GtkWidget self, MonitorSettings *monitors);
void yon_parse_monitor();
void on_config_fill_interface(widgets_dict *widgets);
void yon_update_config(widgets_dict *widgets);
void on_configuration_save_global(GtkWidget *self, widgets_dict *widgets);
void on_configuration_save__local_global(GtkWidget *self, widgets_dict *widgets);
void on_configuration_save__local(GtkWidget *self, widgets_dict *widgets);
void yon_config_monitor_string_parse(char *parameters, int *size);
int yon_char_get_if_resolution(char *parsed_string);
void yon_monitor_set_resolutions();
monitor_config yon_monitor_config_new(char *port);
void yon_monitor_config_update(monitorconfig* monitor, char *port, char *config_string);
void yon_monitor_view_new(monitor_config monitor);
// void on_confugure_monitor_settings(GtkWidget *self, MonitorSettings *settings);
void yon_monitor_view_draw_all(GtkWidget *cnt);
void on_monitor_configure(GtkWidget *self,monitor_window *window);
void on_monitor_add(GtkWidget *self,monitor_window *window);
void on_monitor_switch(GtkWidget *self,monitor_window *window);
void on_monitor_delete(GtkWidget *self,monitor_view windowd);
void yon_monitor_view_update();
void yon_monitor_window_update(monitor_edit_window *window);
char *yon_monitor_make_string(monitorconfig* config);
#endif #endif

@ -1,14 +1,16 @@
#include "ubl-utils.h" #include "ubl-utils.h"
#ifndef UBL_UTILS #ifndef UBL_UTILS
typedef enum { typedef enum
{
DICTIONARY_ACTION_WIDGETS_TYPE, DICTIONARY_ACTION_WIDGETS_TYPE,
DICTIONARY_IVGRAPHICALS_TYPE, DICTIONARY_IVGRAPHICALS_TYPE,
DICTIONARY_OTHER_TYPE DICTIONARY_OTHER_TYPE
} DICT_TYPE; } DICT_TYPE;
typedef struct dictionary { typedef struct dictionary
{
char *key; char *key;
void *data; void *data;
struct dictionary *next; struct dictionary *next;
@ -17,7 +19,8 @@ typedef struct dictionary {
DICT_TYPE data_type; DICT_TYPE data_type;
} dictionary; } dictionary;
typedef struct apps{ typedef struct apps
{
char *Name; char *Name;
int Type; int Type;
char *Categories; char *Categories;
@ -27,13 +30,15 @@ typedef struct apps{
int DualPluggable; int DualPluggable;
} apps; } apps;
typedef struct { typedef struct
{
char *command; char *command;
int *exitcode; int *exitcode;
} thread_output; } thread_output;
#ifdef __GTK_H__ #ifdef __GTK_H__
typedef struct IVGrapgicals{ typedef struct IVGrapgicals
{
char *sectionName; char *sectionName;
char *categories; char *categories;
GtkListStore *LV; GtkListStore *LV;
@ -46,14 +51,14 @@ typedef struct IVGrapgicals{
#endif #endif
#endif #endif
// dictionary functions // dictionary functions
/** /**[EN]
* yon_dictionary_create_empty: * yon_dictionary_create_empty():
* Creates and returns empty dictionary * Creates and returns empty dictionary
*/ */
dictionary *yon_dictionary_create_empty(){ dictionary *yon_dictionary_create_empty()
{
dictionary *dict = malloc(sizeof(dictionary)); dictionary *dict = malloc(sizeof(dictionary));
dict->data = NULL; dict->data = NULL;
dict->key = NULL; dict->key = NULL;
@ -64,12 +69,16 @@ dictionary *yon_dictionary_create_empty(){
return dict; return dict;
} }
void yon_dictionary_switch_to_last(dictionary **dict){ void yon_dictionary_switch_to_last(dictionary **dict)
{
if ((*dict)->next != NULL) if ((*dict)->next != NULL)
for ((*dict)=(*dict)->first;(*dict)->next!=NULL;(*dict)=(*dict)->next){} for ((*dict) = (*dict)->first; (*dict)->next != NULL; (*dict) = (*dict)->next)
{
}
} }
dictionary * yon_dictionary_create_conneced(dictionary *targetdict){ dictionary *yon_dictionary_create_conneced(dictionary *targetdict)
{
targetdict = yon_dictionary_get_last(targetdict); targetdict = yon_dictionary_get_last(targetdict);
targetdict->next = yon_dictionary_create_empty(); targetdict->next = yon_dictionary_create_empty();
targetdict->next->prev = targetdict; targetdict->next->prev = targetdict;
@ -78,25 +87,35 @@ dictionary * yon_dictionary_create_conneced(dictionary *targetdict){
return targetdict->next; return targetdict->next;
} }
dictionary *yon_dictionary_get_last(dictionary *dict){ dictionary *yon_dictionary_get_last(dictionary *dict)
{
dictionary *dct = NULL; dictionary *dct = NULL;
for (dct=dict->first;dct->next!=NULL;dct=dct->next){} for (dct = dict->first; dct->next != NULL; dct = dct->next)
{
}
return dct; return dct;
} }
dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){ dictionary *yon_dictionary_switch_places(dictionary *dict, int aim)
if (aim<0){ {
if (dict->prev){ if (aim < 0)
if (dict->prev->prev){ {
if (dict->prev)
{
if (dict->prev->prev)
{
dictionary *next = dict->next, *prev = dict->prev, *preprev = prev->prev; dictionary *next = dict->next, *prev = dict->prev, *preprev = prev->prev;
if (next){ if (next)
{
preprev->next = dict; preprev->next = dict;
dict->prev = preprev; dict->prev = preprev;
dict->next = prev; dict->next = prev;
prev->prev = dict; prev->prev = dict;
prev->next = next; prev->next = next;
next->prev = prev; next->prev = prev;
} else { }
else
{
preprev->next = dict; preprev->next = dict;
dict->prev = preprev; dict->prev = preprev;
dict->next = prev; dict->next = prev;
@ -104,16 +123,21 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){
prev->next = NULL; prev->next = NULL;
} }
return prev; return prev;
} else { }
else
{
dictionary *next = dict->next, *prev = dict->prev; dictionary *next = dict->next, *prev = dict->prev;
if (next){ if (next)
{
yon_dictionary_make_first(dict); yon_dictionary_make_first(dict);
dict->prev = NULL; dict->prev = NULL;
dict->next = prev; dict->next = prev;
prev->prev = dict; prev->prev = dict;
prev->next = next; prev->next = next;
next->prev = prev; next->prev = prev;
} else { }
else
{
dict->prev = NULL; dict->prev = NULL;
dict->next = prev; dict->next = prev;
prev->prev = dict; prev->prev = dict;
@ -122,18 +146,25 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){
return prev; return prev;
} }
} }
} else if (aim>0){ }
if (dict->next){ else if (aim > 0)
if (dict->next->next){ {
if (dict->next)
{
if (dict->next->next)
{
dictionary *next = dict->next, *prev = dict->prev, *afnext = next->next; dictionary *next = dict->next, *prev = dict->prev, *afnext = next->next;
if (prev){ if (prev)
{
prev->next = next; prev->next = next;
next->prev = prev; next->prev = prev;
next->next = dict; next->next = dict;
dict->prev = next; dict->prev = next;
dict->next = afnext; dict->next = afnext;
afnext->prev = dict; afnext->prev = dict;
} else { }
else
{
yon_dictionary_make_first(next); yon_dictionary_make_first(next);
next->prev = NULL; next->prev = NULL;
next->next = dict; next->next = dict;
@ -142,15 +173,20 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){
afnext->prev = dict; afnext->prev = dict;
} }
return next; return next;
} else { }
else
{
dictionary *next = dict->next, *prev = dict->prev; dictionary *next = dict->next, *prev = dict->prev;
if (prev){ if (prev)
{
prev->next = next; prev->next = next;
next->prev = prev; next->prev = prev;
next->next = dict; next->next = dict;
dict->prev = next; dict->prev = next;
dict->next = NULL; dict->next = NULL;
} else { }
else
{
next->prev = NULL; next->prev = NULL;
next->next = dict; next->next = dict;
dict->prev = next; dict->prev = next;
@ -161,15 +197,24 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){
} }
} }
void yon_dictionary_make_first(dictionary *dict){ void yon_dictionary_make_first(dictionary *dict)
for (dictionary *dct=dict->first;dct!=NULL;dct=dct->next){ {
for (dictionary *dct = dict->first; dct != NULL; dct = dct->next)
{
dct->first = dict; dct->first = dict;
} }
} }
void yon_dictionary_make_nth(dictionary *dict, int nth){ void yon_dictionary_make_nth(dictionary *dict, int nth)
{
dictionary *dct = dict->first; dictionary *dct = dict->first;
for (int i=0;i<nth;i++){if (dct==NULL) return; else dct=dct->next;} for (int i = 0; i < nth; i++)
{
if (dct == NULL)
return;
else
dct = dct->next;
}
yon_dictionary_rip(dict); yon_dictionary_rip(dict);
dictionary *prev = dct->prev; dictionary *prev = dct->prev;
prev->next = dict; prev->next = dict;
@ -178,7 +223,8 @@ void yon_dictionary_make_nth(dictionary *dict, int nth){
dct->prev = dict; dct->prev = dict;
} }
dictionary *yon_dictionary_create_with_data(char *key, void *data){ dictionary *yon_dictionary_create_with_data(char *key, void *data)
{
dictionary *dct = yon_dictionary_create_empty(); dictionary *dct = yon_dictionary_create_empty();
dct->key = yon_char_new(key); dct->key = yon_char_new(key);
dct->data = data; dct->data = data;
@ -186,7 +232,8 @@ dictionary *yon_dictionary_create_with_data(char *key, void *data){
return dct; return dct;
} }
dictionary *yon_dictionary_create_with_data_connected(dictionary *dict, char *key, void *data){ dictionary *yon_dictionary_create_with_data_connected(dictionary *dict, char *key, void *data)
{
dictionary *dct = yon_dictionary_create_conneced(dict); dictionary *dct = yon_dictionary_create_conneced(dict);
dct->key = yon_char_new(key); dct->key = yon_char_new(key);
dct->data = data; dct->data = data;
@ -194,7 +241,8 @@ dictionary *yon_dictionary_create_with_data_connected(dictionary *dict, char *ke
return dct; return dct;
} }
dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect){ dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect)
{
dictionary *dict = yon_dictionary_get_last(old); dictionary *dict = yon_dictionary_get_last(old);
dict->next = toconnect; dict->next = toconnect;
toconnect->prev = dict; toconnect->prev = dict;
@ -202,10 +250,13 @@ dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect){
return toconnect; return toconnect;
} }
dictionary *yon_dictionary_find(dictionary **dict, char *key){ dictionary *yon_dictionary_find(dictionary **dict, char *key)
{
dictionary *dct = *dict; dictionary *dct = *dict;
for (dictionary *pointer=dct->first;pointer!=NULL;pointer=pointer->next){ for (dictionary *pointer = dct->first; pointer != NULL; pointer = pointer->next)
if (strcmp(pointer->key,key)==0){ {
if (strcmp(pointer->key, key) == 0)
{
*dict = pointer; *dict = pointer;
return pointer; return pointer;
} }
@ -213,25 +264,33 @@ dictionary *yon_dictionary_find(dictionary **dict, char *key){
return NULL; return NULL;
} }
dictionary *yon_dictionary_rip(dictionary *dict)
dictionary *yon_dictionary_rip(dictionary *dict){ {
if (!dict->next){ if (!dict->next)
{
dictionary *prev = dict->prev; dictionary *prev = dict->prev;
if (prev){ if (prev)
{
prev->next = NULL; prev->next = NULL;
return prev; return prev;
} else return dict;
} }
else if (!dict->prev){ else
return dict;
}
else if (!dict->prev)
{
dictionary *next = dict->next; dictionary *next = dict->next;
if (next){ if (next)
{
yon_dictionary_make_first(next); yon_dictionary_make_first(next);
next->prev = NULL; next->prev = NULL;
return next; return next;
} }
else return dict; else
return dict;
} }
else { else
{
dictionary *next = dict->next, *prev = dict->prev; dictionary *next = dict->next, *prev = dict->prev;
next->prev = prev; next->prev = prev;
prev->next = next; prev->next = next;
@ -239,24 +298,33 @@ dictionary *yon_dictionary_rip(dictionary *dict){
} }
} }
dictionary *yon_dictionary_get_nth(dictionary *dict, int place){ dictionary *yon_dictionary_get_nth(dictionary *dict, int place)
{
if (dict){
dict = dict->first; dict = dict->first;
int i = 0; int i = 0;
for (i = 0; i < place; i++) for (i = 0; i < place; i++)
if (dict->next) if (dict->next)
dict = dict->next; dict = dict->next;
else break; else
if (i==place) return dict; break;
else return NULL; if (i == place)
return dict;
else
return NULL;
} else return NULL;
} }
// char functions // char functions
/** /**[EN]
*
* creates new char string by combining two char strings. * creates new char string by combining two char strings.
*/ */
char *yon_char_get_augumented(char *source, char *append){ char *yon_char_get_augumented(char *source, char *append)
if (source&&append){ {
if (source && append)
{
int size = strlen(source) + strlen(append) + 1; int size = strlen(source) + strlen(append) + 1;
char *final = malloc(size); char *final = malloc(size);
memset(final, 0, size); memset(final, 0, size);
@ -265,36 +333,63 @@ char *yon_char_get_augumented(char *source, char *append){
else else
sprintf(final, "%s%s", source, append); sprintf(final, "%s%s", source, append);
return final; return final;
} else }
else
return NULL; return NULL;
} }
/** /**[EN]
*
* creates new char string by copying another char. * creates new char string by copying another char.
*/ */
char *yon_char_new(char *chr){ char *yon_char_new(char *chr)
{
if (chr){
char *newchar = malloc(strlen(chr) + 1); char *newchar = malloc(strlen(chr) + 1);
memset(newchar, 0, strlen(chr) + 1); memset(newchar, 0, strlen(chr) + 1);
memcpy(newchar, chr, strlen(chr)); memcpy(newchar, chr, strlen(chr));
return newchar; return newchar;
} else
return NULL;
} }
/** // char *yon_char_unite(char *source, ...)
char *yon_char_unite(char *source, ...){
va_list arglist;
char *new_char=NULL;
char *unite_char=NULL;
new_char=yon_char_new(source);
va_start(arglist,source);
unite_char = va_arg(arglist,char*);
while(unite_char){
new_char = yon_char_get_augumented(new_char,unite_char);
unite_char = va_arg(arglist,char*);
}
va_end(arglist);
return new_char;
}
/**[EN]
*
* cuts source string by size length from startpos position. * cuts source string by size length from startpos position.
*/ */
char *yon_cut(char *source, int size, int startpos){ char *yon_cut(char *source, int size, int startpos)
{
char *cut = NULL; char *cut = NULL;
cut = malloc(size + 1); cut = malloc(size + 1);
memset(cut, 0, size + 1); memset(cut, 0, size + 1);
memcpy(cut, source + startpos, size); memcpy(cut, source + startpos, size);
return cut; return cut;
} }
/** /**[EN]
*
* divides source string in dividepos position, * divides source string in dividepos position,
* returning left part of divided string and * returning left part of divided string and
* inserting right part to source string. * inserting right part to source string.
*/ */
char *yon_char_divide(char *source, int dividepos){ char *yon_char_divide(char *source, int dividepos)
{
char *cut = malloc(dividepos + 1); char *cut = malloc(dividepos + 1);
memset(cut, 0, dividepos + 1); memset(cut, 0, dividepos + 1);
memcpy(cut, source, dividepos); memcpy(cut, source, dividepos);
@ -306,26 +401,51 @@ char *yon_char_divide(char *source, int dividepos){
return cut; return cut;
} }
/** /**[EN]
* searches string dividepos in source string and divides it, * char *yon_char_divide_search(char *source, char *dividepos, int delete_divider)
* searches string [dividepos] in [source] string and divides it,
* returning left part of divided string and * returning left part of divided string and
* inserting right part to source string. * inserting right part to [source] string.
* if delete_divider is 0, left part will contain delete_divider substring, else * if [delete_divider] is 0, left part will contain [delete_divider] substring, else
* it will stay in right part. * if [delete_divider] is 1 it will stay in right part, else
* if [delete_divider] is -1 it will be deleted from string.
*
* [RU]
* char *yon_char_divide_search(char *source, char *dividepos, int delete_divider)
* Ищет строку [dividepos] в строке [source] и делит её в этом месте,
* возвращая левую часть разделённой строки и устанавливает в [source] правую часть.
* Если [delete_divider] равен 0, [dividepos] останется в левой строке, иначе
* если [delete_divider] равен 1, [dividepos] останется в правой строке, иначе
* если [delete_divider] равен -1, [dividepos] удаляется из строки.
*/ */
char *yon_char_divide_search(char *source, char* dividepos, int delete_divider){ char *yon_char_divide_search(char *source, char *dividepos, int delete_divider)
{
if (source&&dividepos){
char *cut = strstr(source, dividepos); char *cut = strstr(source, dividepos);
if (cut)
{
int leng = strlen(source) - strlen(cut); int leng = strlen(source) - strlen(cut);
cut = yon_char_divide(source, leng); cut = yon_char_divide(source, leng);
return cut; return cut;
} }
/** else
* converts int to char. return source;
}
}
/**[EN]
* char *yon_char_from_int(int int_to_convert)
* converts int to char*.
*
* [RU]
* char *yon_char_from_int(int int_to_convert)
* Конвертирует int в char*
*/ */
char *yon_char_from_int(int int_to_convert){ char *yon_char_from_int(int int_to_convert)
{
int i = 1; int i = 1;
float convert_check = (float)int_to_convert; float convert_check = (float)int_to_convert;
for (i=1;convert_check>10;i++){ for (i = 1; convert_check > 10; i++)
{
convert_check = convert_check / 10; convert_check = convert_check / 10;
} }
char *ch = malloc(i * sizeof(char) + 1); char *ch = malloc(i * sizeof(char) + 1);
@ -333,10 +453,69 @@ char *yon_char_from_int(int int_to_convert){
return ch; return ch;
} }
/**[EN]
* char **yon_char_parse(char *parameters, int *size, char *divider)
* Parses string [parameters], divided by [divider],
* then returns parsed string array and sets [size] to
* size of returned array
*/
char **yon_char_parse(char *parameters, int *size, char *divider){
char **string=NULL;
int i=1;
string=malloc(sizeof(char*));
char *paramline=yon_char_new(parameters);
char *param;
while ((param=yon_char_divide_search(paramline,divider,1))){
string=realloc(string,sizeof(char*)*i);
string[i-1]=yon_char_new(param);
i++;
if (strcmp(param,paramline)==0) break;
}
string=realloc(string,sizeof(char*)*i);
string[i-1]=yon_char_new(paramline);
i++;
printf("%d\n",i);
*size=i-1;
return string;
}
char **yon_char_parsed_shrink(char **char_string, int *size, int item_to_delete){
char **new_char_parsed=NULL;
new_char_parsed=malloc(sizeof(char*)*(*size)-2);
int sz=0;
for (int i=0;i<*size-2;i++){
if (i!=item_to_delete){
new_char_parsed[i]=yon_char_new(char_string[i]);
sz++;
}
}
*size=sz;
return new_char_parsed;
}
/**[EN]
*
* Checks if [parameters] string array of length [size]
* has [param] element;
*/
int yon_char_parsed_check_exist(char **parameters, int size, char *param){
for (int i=0;i<size;i++){
if (parameters[i]){
if (strcmp(parameters[i],param)==0)
return i;
} else return -1;
}
return -1;
}
// parsing functions // parsing functions
apps *yon_apps_scan_and_parse_desktops(int *sizef){ apps *yon_apps_scan_and_parse_desktops(int *sizef)
{
int size = 0; int size = 0;
struct apps *applist; struct apps *applist;
{ {
@ -359,23 +538,36 @@ apps *yon_apps_scan_and_parse_desktops(int *sizef){
GError *err = NULL; GError *err = NULL;
g_key_file_load_from_file(gfile, path, G_KEY_FILE_KEEP_TRANSLATIONS, NULL); g_key_file_load_from_file(gfile, path, G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
char *Type = g_key_file_get_string(gfile, "Desktop Entry", "Type", &err); char *Type = g_key_file_get_string(gfile, "Desktop Entry", "Type", &err);
if (err){ if (err)
{
printf("%s\n", err->message); printf("%s\n", err->message);
} }
if (strcmp(Type,"Application")==0) tempapp.Type=1; else if (strcmp(Type,"pyApplication")==0) tempapp.Type=2; else continue; if (strcmp(Type, "Application") == 0)
tempapp.Type = 1;
else if (strcmp(Type, "pyApplication") == 0)
tempapp.Type = 2;
else
continue;
tempapp.Name = g_key_file_get_locale_string(gfile, "Desktop Entry", "Name", setlocale(LC_ALL, NULL), NULL); tempapp.Name = g_key_file_get_locale_string(gfile, "Desktop Entry", "Name", setlocale(LC_ALL, NULL), NULL);
if (tempapp.Name==NULL) continue; if (tempapp.Name == NULL)
continue;
tempapp.Categories = g_key_file_get_string(gfile, "Desktop Entry", "Categories", NULL); tempapp.Categories = g_key_file_get_string(gfile, "Desktop Entry", "Categories", NULL);
if (tempapp.Categories==NULL) continue; if (tempapp.Categories == NULL)
continue;
tempapp.Exec = g_key_file_get_string(gfile, "Desktop Entry", "Exec", NULL); tempapp.Exec = g_key_file_get_string(gfile, "Desktop Entry", "Exec", NULL);
if (tempapp.Exec==NULL) continue; if (tempapp.Exec == NULL)
continue;
tempapp.Icon = g_key_file_get_string(gfile, "Desktop Entry", "Icon", NULL); tempapp.Icon = g_key_file_get_string(gfile, "Desktop Entry", "Icon", NULL);
if (tempapp.Icon==NULL) continue; if (tempapp.Icon == NULL)
continue;
tempapp.Pluggable = g_key_file_get_boolean(gfile, "Desktop Entry", "Pluggable", NULL); tempapp.Pluggable = g_key_file_get_boolean(gfile, "Desktop Entry", "Pluggable", NULL);
if (!tempapp.Pluggable) tempapp.Pluggable=g_key_file_get_boolean(gfile,"Desktop Entry", "X-XfcePluggable",NULL); if (!tempapp.Pluggable)
if (tempapp.Pluggable) tempapp.DualPluggable=g_key_file_get_boolean(gfile,"Desktop Entry", "X-UBLPluggable",NULL); tempapp.Pluggable = g_key_file_get_boolean(gfile, "Desktop Entry", "X-XfcePluggable", NULL);
if (tempapp.Pluggable)
tempapp.DualPluggable = g_key_file_get_boolean(gfile, "Desktop Entry", "X-UBLPluggable", NULL);
if (g_key_file_get_boolean(gfile, "Desktop Entry", "X-UBL-SettingsManager-Hidden", NULL) == 0) if (g_key_file_get_boolean(gfile, "Desktop Entry", "X-UBL-SettingsManager-Hidden", NULL) == 0)
if (size==0){ if (size == 0)
{
applist = (apps *)malloc(size + 1 * sizeof(apps)); applist = (apps *)malloc(size + 1 * sizeof(apps));
applist[0].Name = yon_char_new(tempapp.Name); applist[0].Name = yon_char_new(tempapp.Name);
applist[0].Categories = yon_char_new(tempapp.Categories); applist[0].Categories = yon_char_new(tempapp.Categories);
@ -385,7 +577,9 @@ apps *yon_apps_scan_and_parse_desktops(int *sizef){
applist[0].Pluggable = tempapp.Pluggable; applist[0].Pluggable = tempapp.Pluggable;
applist[0].DualPluggable = tempapp.DualPluggable; applist[0].DualPluggable = tempapp.DualPluggable;
size++; size++;
} else { }
else
{
applist = (apps *)realloc(applist, (size + 1) * sizeof(apps)); applist = (apps *)realloc(applist, (size + 1) * sizeof(apps));
applist[size].Name = yon_char_new(tempapp.Name); applist[size].Name = yon_char_new(tempapp.Name);
applist[size].Categories = yon_char_new(tempapp.Categories); applist[size].Categories = yon_char_new(tempapp.Categories);
@ -405,8 +599,8 @@ apps *yon_apps_scan_and_parse_desktops(int *sizef){
return applist; return applist;
}; };
void yon_apps_sort(apps *applist, int size)
void yon_apps_sort(apps *applist,int size){ {
apps tmp; apps tmp;
if (size > 2) if (size > 2)
{ {
@ -414,7 +608,8 @@ void yon_apps_sort(apps *applist,int size){
{ {
for (int j = 1; j < size; j++) for (int j = 1; j < size; j++)
{ {
if (strcmp(applist[j].Name,applist[j-1].Name)<0){ if (strcmp(applist[j].Name, applist[j - 1].Name) < 0)
{
tmp = applist[j]; tmp = applist[j];
applist[j] = applist[j - 1]; applist[j] = applist[j - 1];
applist[j - 1] = tmp; applist[j - 1] = tmp;
@ -424,39 +619,120 @@ void yon_apps_sort(apps *applist,int size){
} }
}; };
apps *yon_apps_get_by_name(apps *applist, char *name, int size)
apps *yon_apps_get_by_name(apps *applist,char *name, int size){ {
for (int i=0;i<size;i++){ for (int i = 0; i < size; i++)
if (strcmp(applist[i].Name,name)==0) return &applist[i]; {
if (strcmp(applist[i].Name, name) == 0)
return &applist[i];
} }
return NULL; return NULL;
}; };
char *yon_config_load(char *command){ config_str yon_config_load(char *command, int *str_len)
{
FILE *output = popen(command, "r"); FILE *output = popen(command, "r");
char **output_strings = NULL; char **output_strings = NULL;
output_strings = malloc(sizeof(char)); output_strings = malloc(sizeof(char));
int i = 0; int i = 0;
char str[1000]; char str[1000];
memset(str, 0, 1000); memset(str, 0, 1000);
while (fgets(str,1000,output)){ while (fgets(str, 1000, output))
{
if (strcmp(str, "") != 0)
{
output_strings = realloc(output_strings, sizeof(char *) * (i + 1)); output_strings = realloc(output_strings, sizeof(char *) * (i + 1));
printf("%s\n", str);
output_strings[i] = NULL;
output_strings[i] = yon_char_new(str); output_strings[i] = yon_char_new(str);
memset(str, 0, 1000); memset(str, 0, 1000);
i++; i++;
} }
} }
if (i>0){
*str_len = i;
return output_strings;
} else{
*str_len=-1;
return NULL;
}
}
int yon_config_save(char *command){
/**[EN]
* int yon_config_save(char *command)
* Saves config with [command]
* [RU]
*/
int yon_config_save(char *command)
{
FILE *output = popen(command, "r"); FILE *output = popen(command, "r");
return 1; return 1;
} }
//terminal-using functions /**[EN]
* char *yon_config_get_parameter(config parameters, int size, char *param)
* Gets parameter from parameter list;
*
* [RU]
*/
char *yon_config_get_parameter(config_str parameters, int size, char *param)
{
if (param[0]==' ')
yon_char_divide_search(param," ",-1);
param=yon_char_divide_search(yon_char_new(param)," ",-1);
char *str = NULL;
for (int j = 0; j < size; j++)
{
char *name = yon_char_divide_search(yon_char_new(parameters[j]), "=", 1);
if (name)
{
if (strcmp(name, param) == 0)
{
str = yon_char_divide_search(yon_char_new(parameters[j]), "\n", 1);
if (strcmp(str, "") != 0 && strcmp(str, "(null)") != 0)
return str;
else
return NULL;
}
}
}
return NULL;
}
/**[EN]
* Parses, modifies and connects string to use it as one of arguments,
* sended to ubconfig.
*
* [RU]
*/
char *yon_config_make_save_parameter_with_multiple_arguments(char *parameter_string, char *config_parameter, char *divider){
char *final="";
int done=0;
char *cur=yon_char_new(parameter_string);
yon_char_divide_search(cur,"=",1);
char *cur_param=NULL;
while (cur_param=yon_char_divide_search(cur,",",1)){
if (done==0){
final=yon_char_get_augumented(final,yon_char_get_augumented(yon_char_get_augumented(config_parameter,"="), yon_char_get_augumented(cur_param,", ")));
done=1;
} else {
final=yon_char_get_augumented(final,yon_char_get_augumented(yon_char_get_augumented(config_parameter,"+="), yon_char_get_augumented(cur_param,", ")));
}
}
if (cur&&strcmp(cur,"")!=0)
if (done==0)
final=yon_char_get_augumented(final,yon_char_get_augumented(yon_char_get_augumented(config_parameter,"="), yon_char_get_augumented(cur,", ")));
else
final=yon_char_get_augumented(final,yon_char_get_augumented(yon_char_get_augumented(config_parameter,"+="), yon_char_get_augumented(cur,", ")));
return final;
}
// terminal-using functions
int yon_launch_app(char *name){ int yon_launch_app(char *name)
{
char *path = name; char *path = name;
thread_output *thread = malloc(sizeof(thread_output)); thread_output *thread = malloc(sizeof(thread_output));
thread->command = path; thread->command = path;
@ -466,8 +742,8 @@ int yon_launch_app(char *name){
return *thread->exitcode; return *thread->exitcode;
}; };
int yon_launch_app_with_arguments(char *name, char *args)
int yon_launch_app_with_arguments(char *name, char *args){ {
char *path = yon_char_get_augumented("/usr/bin/", name); char *path = yon_char_get_augumented("/usr/bin/", name);
path = yon_char_get_augumented(path, " "); path = yon_char_get_augumented(path, " ");
path = yon_char_get_augumented(path, args); path = yon_char_get_augumented(path, args);
@ -479,15 +755,14 @@ int yon_launch_app_with_arguments(char *name, char *args){
return *thread->exitcode; return *thread->exitcode;
}; };
int yon_launch(thread_output *thread)
int yon_launch(thread_output *thread){ {
int a = 0; int a = 0;
a = system(thread->command); a = system(thread->command);
*thread->exitcode = a; *thread->exitcode = a;
return *thread->exitcode; return *thread->exitcode;
} }
// Gtk functions // Gtk functions
#ifdef __GTK_H__ #ifdef __GTK_H__
@ -583,38 +858,76 @@ int yon_launch(thread_output *thread){
// return socket; // return socket;
// }; // };
int yon_dictionary_gtk_pack_start_multiple_widgets(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding){ int yon_gtk_combo_box_fill(GtkWidget *combo, config_str parameters,int size){
for (dictionary *dct=dict->first; dct!=NULL;dct=dct->next){ if (combo&&parameters){
for (int i=0;i<size;i++){
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo),parameters[i]);
}
return 1;
} else
return 0;
}
int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find){
if (combo_box&&text_to_find){
int active=gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
char *str="-1";
for (int i=0;strcmp(str,"")!=0;i++){
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box),i);
str=gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box));
if (!str) return -1;
if (strcmp(text_to_find,str)==0) return i;
}
} return -1;
}
int yon_dictionary_gtk_pack_start_multiple_widgets(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding)
{
if (dict){
for (dictionary *dct = dict->first; dct != NULL; dct = dct->next)
{
gtk_box_pack_start(GTK_BOX(destination), (GtkWidget *)dct->data, expand, fill, padding); gtk_box_pack_start(GTK_BOX(destination), (GtkWidget *)dct->data, expand, fill, padding);
} }
return 1; return 1;
}else return 0;
} }
int yon_dictionary_gtk_pack_end_multiple_widgets(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding){ int yon_dictionary_gtk_pack_end_multiple_widgets(dictionary *dict, GtkWidget *destination, gboolean expand, gboolean fill, int padding)
for (dictionary *dct=dict->first; dct!=NULL;dct=dct->next){ {
for (dictionary *dct = dict->first; dct != NULL; dct = dct->next)
{
gtk_box_pack_end(GTK_BOX(destination), (GtkWidget *)dct->data, expand, fill, padding); gtk_box_pack_end(GTK_BOX(destination), (GtkWidget *)dct->data, expand, fill, padding);
} }
return 1; return 1;
} }
void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path){ void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path)
{
gtk_overlay_add_overlay(GTK_OVERLAY(Overlay), Head); gtk_overlay_add_overlay(GTK_OVERLAY(Overlay), Head);
gtk_image_set_from_file(GTK_IMAGE(Image), image_path); gtk_image_set_from_file(GTK_IMAGE(Image), image_path);
} }
void _yon_ubl_status_box_render(GtkWidget *StatusBox, GtkWidget *StatusIcon, GtkWidget *StatusLabel, char *IconName, char* StatusText, BACKGROUND_IMAGE_TYPE BackgroundClass){ void _yon_ubl_status_box_render(GtkWidget *StatusBox, GtkWidget *StatusIcon, GtkWidget *StatusLabel, char *StatusText, BACKGROUND_IMAGE_TYPE BackgroundClass)
{
GtkIconTheme *ictheme = gtk_icon_theme_get_default(); GtkIconTheme *ictheme = gtk_icon_theme_get_default();
GError *err = NULL; GError *err = NULL;
gtk_image_set_from_pixbuf(GTK_IMAGE(StatusIcon),gtk_icon_theme_load_icon_for_scale(ictheme,IconName,25,1,GTK_ICON_LOOKUP_FORCE_SIZE,&err)); if (err)
if (err){ {
printf("%s\n", err->message); printf("%s\n", err->message);
g_error_free(err); g_error_free(err);
} }
gtk_label_set_text(GTK_LABEL(StatusLabel), StatusText); gtk_label_set_text(GTK_LABEL(StatusLabel), StatusText);
if (BackgroundClass==BACKGROUND_IMAGE_SUCCESS_TYPE){ if (BackgroundClass == BACKGROUND_IMAGE_SUCCESS_TYPE)
{
gtk_style_context_remove_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessError");
gtk_style_context_add_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessOK"); gtk_style_context_add_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessOK");
} else if (BackgroundClass==BACKGROUND_IMAGE_FAIL_TYPE){ gtk_image_set_from_pixbuf(GTK_IMAGE(StatusIcon), gtk_icon_theme_load_icon_for_scale(ictheme, "com.ublinux.ubl-settings-video.checked", 25, 1, GTK_ICON_LOOKUP_FORCE_SIZE, &err));
}
else if (BackgroundClass == BACKGROUND_IMAGE_FAIL_TYPE)
{
gtk_style_context_remove_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessOK");
gtk_style_context_add_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessError"); gtk_style_context_add_class(gtk_widget_get_style_context(StatusBox), "boxInfoMessError");
gtk_image_set_from_pixbuf(GTK_IMAGE(StatusIcon), gtk_icon_theme_load_icon_for_scale(ictheme, "com.ublinux.ubl-settings-video.warning", 25, 1, GTK_ICON_LOOKUP_FORCE_SIZE, &err));
} }
} }
#endif #endif

@ -3,6 +3,7 @@
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
@ -14,41 +15,33 @@
#define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next) #define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next)
#define yon_ubl_set_global_config_load_command(command) config_commands.global_config_load_command=command #define new(type) malloc(sizeof(type))
#define yon_ubl_set_global_config_save_command(command) config_commands.global_config_save_command=command #define new_arr(type,size) malloc(sizeof(type)*size)
#define yon_ubl_set_local_config_load_command(command) config_commands.local_config_load_command=command
#define yon_ubl_set_local_config_save_command(command) config_commands.local_config_save_command=command
#define yon_ubl_set_config_save_data_pointer(command) config_commands.config_save_data = command #define yon_ubl_set_config_save_data_pointer(command) config_commands.config_save_data = command
#define yon_ubl_load_global_config() yon_config_load(config_commands.global_config_load_command) #define yon_ubl_load_global_config(command, size_pointer) yon_config_load(command, size_pointer)
#define yon_ubl_load_local_config() yon_config_load(config_commands.local_config_load_command) #define yon_ubl_load_local_config(command, size_pointer) yon_config_load(command, size_pointer)
#define yon_ubl_save_global_config() yon_config_save(config_commands.global_config_save_command) #define yon_ubl_save_global_config(command) yon_config_save(command)
#define yon_ubl_save_local_config() yon_config_save(config_commands.local_config_save_command) #define yon_ubl_save_local_config(command) yon_config_save(command)
typedef enum
struct config_commands{ {
char *global_config_load_command; #ifdef __GTK_H__
char *global_config_save_command; DICTIONARY_GTK_WIDGETS_TYPE,
char *local_config_load_command; #endif
char *local_config_save_command;
char **config_save_data;
};
typedef enum {
DICTIONARY_ACTION_WIDGETS_TYPE,
DICTIONARY_IVGRAPHICALS_TYPE,
DICTIONARY_OTHER_TYPE DICTIONARY_OTHER_TYPE
} DICT_TYPE; } DICT_TYPE;
typedef struct
typedef struct { {
char *command; char *command;
int *exitcode; int *exitcode;
} thread_output; } thread_output;
typedef struct dictionary { typedef struct dictionary
{
char *key; char *key;
void *data; void *data;
struct dictionary *next; struct dictionary *next;
@ -57,7 +50,8 @@ typedef struct dictionary {
DICT_TYPE data_type; DICT_TYPE data_type;
} dictionary; } dictionary;
typedef struct apps{ typedef struct apps
{
char *Name; char *Name;
int Type; int Type;
char *Categories; char *Categories;
@ -67,9 +61,14 @@ typedef struct apps{
int DualPluggable; int DualPluggable;
} apps; } apps;
typedef char** config_str;
// dictionary functions // dictionary functions
#define yon_dictionary_get_data(dictionary, type) ((type)dictionary->data)
#define yon_dictionary_add_or_create_if_exists_with_data(dict,key,data) if (!dict) dict=yon_dictionary_create_with_data(key,data); \
else dict=yon_dictionary_create_with_data_connected(dict,key,data);
dictionary *yon_dictionary_create_empty(); dictionary *yon_dictionary_create_empty();
dictionary *yon_dictionary_create_conneced(dictionary *targetdict); dictionary *yon_dictionary_create_conneced(dictionary *targetdict);
@ -100,6 +99,8 @@ char *yon_char_get_augumented(char *source, char *append);
char *yon_char_new(char *chr); char *yon_char_new(char *chr);
char *yon_char_unite(char *source, ...);
char *yon_cut(char *source, int size, int startpos); char *yon_cut(char *source, int size, int startpos);
char *yon_char_divide(char *source, int dividepos); char *yon_char_divide(char *source, int dividepos);
@ -108,32 +109,36 @@ char *yon_char_divide_search(char *source, char* dividepos, int delete_divider);
char *yon_char_from_int(int int_to_convert); char *yon_char_from_int(int int_to_convert);
char **yon_char_parse(char *parameters, int *size, char *divider);
char **yon_char_parsed_shrink(char **char_string, int *size, int item_to_delete);
int yon_char_parsed_check_exist(char **parameters, int size, char *param);
// parsing functions // parsing functions
apps *yon_apps_scan_and_parse_desktops(int *sizef); apps *yon_apps_scan_and_parse_desktops(int *sizef);
void yon_apps_sort(apps *applist, int size); void yon_apps_sort(apps *applist, int size);
apps *yon_apps_get_by_name(apps *applist, char *name, int size); apps *yon_apps_get_by_name(apps *applist, char *name, int size);
char *yon_config_load(char *command); config_str yon_config_load(char *command, int *str_len);
int yon_config_save(char *command); int yon_config_save(char *command);
//terminal-using functions char *yon_config_get_parameter(config_str parameters, int size, char *param);
char *yon_config_make_save_parameter_with_multiple_arguments(char *parameter_string, char *config_parameter, char *divider);
// terminal-using functions
int yon_launch_app(char *name); int yon_launch_app(char *name);
int yon_launch_app_with_arguments(char *name, char *args); int yon_launch_app_with_arguments(char *name, char *args);
int yon_launch(thread_output *thread); int yon_launch(thread_output *thread);
// Gtk functions // Gtk functions
@ -142,21 +147,24 @@ int yon_launch(thread_output *thread);
#define yon_gtk_builder_get_widget(obj, obj2) GTK_WIDGET(gtk_builder_get_object(obj, obj2)) #define yon_gtk_builder_get_widget(obj, obj2) GTK_WIDGET(gtk_builder_get_object(obj, obj2))
typedef struct
typedef struct { {
GtkWidget *Icon; GtkWidget *Icon;
GtkWidget *Label; GtkWidget *Label;
GtkWidget *IconView; GtkWidget *IconView;
GtkListStore *List; GtkListStore *List;
} expander_icon_view; } expander_icon_view;
// GtkWidget *yon_gtk_app_chooser_apps_create(); // GtkWidget *yon_gtk_app_chooser_apps_create();
// dictionary *yon_gtk_app_chooser_create(); // dictionary *yon_gtk_app_chooser_create();
// expander_icon_view yon_gtk_icon_view_expander_create(GtkWidget *pack, ...); // expander_icon_view yon_gtk_icon_view_expander_create(GtkWidget *pack, ...);
int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size);
int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find);
GtkWidget *yon_gtk_socket_create_new_with_connect(GtkWidget *container, gpointer data); GtkWidget *yon_gtk_socket_create_new_with_connect(GtkWidget *container, gpointer data);
int yon_gtk_icon_view_hide_empty(dictionary *icon_view_segment); int yon_gtk_icon_view_hide_empty(dictionary *icon_view_segment);
@ -170,8 +178,8 @@ void yon_on_plug_added(GtkSocket* self, gpointer user_data);
void yon_on_plug_removed(GtkSocket *self, gpointer user_data); void yon_on_plug_removed(GtkSocket *self, gpointer user_data);
#endif typedef enum
typedef enum { {
BACKGROUND_IMAGE_SUCCESS_TYPE, BACKGROUND_IMAGE_SUCCESS_TYPE,
BACKGROUND_IMAGE_FAIL_TYPE BACKGROUND_IMAGE_FAIL_TYPE
} BACKGROUND_IMAGE_TYPE; } BACKGROUND_IMAGE_TYPE;
@ -180,9 +188,10 @@ typedef enum {
#define yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) _yon_ubl_status_box_render(GTK_WIDGET(statusbox.gobj()), GTK_WIDGET(statusicon.gobj()), GTK_WIDGET(statuslabel.gobj()), (char *)iconname, (char *)statustext, backgroundclass) #define yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) _yon_ubl_status_box_render(GTK_WIDGET(statusbox.gobj()), GTK_WIDGET(statusicon.gobj()), GTK_WIDGET(statuslabel.gobj()), (char *)iconname, (char *)statustext, backgroundclass)
#else #else
#define yon_ubl_header_setup(overlay, head, image, imag_path) _yon_ubl_header_setup(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path) #define yon_ubl_header_setup(overlay, head, image, imag_path) _yon_ubl_header_setup(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path)
#define yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) _yon_ubl_status_box_render(statusbox, statusicon, statuslabel, iconname, statustext, backgroundclass) #define yon_ubl_status_box_render(statusbox, statusicon, statuslabel, statustext, backgroundclass) _yon_ubl_status_box_render(statusbox, statusicon, statuslabel, statustext, backgroundclass)
#endif #endif
void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path); void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
void _yon_ubl_status_box_render(GtkWidget *StatusBox, GtkWidget *StatusIcon, GtkWidget *StatusLabel, char *IconName, char* StatusText, BACKGROUND_IMAGE_TYPE BackgroundClass); void _yon_ubl_status_box_render(GtkWidget *StatusBox, GtkWidget *StatusIcon, GtkWidget *StatusLabel, char *StatusText, BACKGROUND_IMAGE_TYPE BackgroundClass);
#endif
#endif #endif

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=ubl-settings-video Name=ubl-settings-video
Name[ru]=Настройки Видеоадаптера и дисплея Name[ru]=Настройки видеоадаптера и дисплея
GenericName=ubl-settings-video GenericName=ubl-settings-video
GenericName[ru]=Настройки Видеоадаптера и дисплея GenericName[ru]=Настройки Видеоадаптера и дисплея
Comment=Application for managing video adapter and display settings Comment=Application for managing video adapter and display settings

File diff suppressed because it is too large Load Diff

@ -1,170 +1,204 @@
# SOME DESCRIPTIVE TITLE. # Language translations for ubl-settings-manager package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) 2022, UBTech LLC
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the ubl-settings-manager package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # UBLinux Team <info@ublinux.com>, 2022
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: ubl-settings-manager 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: info@ublinux.com\n"
"POT-Creation-Date: 2023-04-04 17:42+0000\n" "POT-Creation-Date: 2023-04-21 12:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: UBLinux Team <info@ublinux.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
"Language: \n" "Language: Russian\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: source/ubl-settings-video.c:151 #: source/ubl-settings-video.c:26 source/ubl-settings-video.c:223
msgid "About" msgid "Cancel"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:143 #: source/ubl-settings-video.c:27
msgid "Automatically choose and use driver" msgid "Accept"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:153 #: source/ubl-settings-video.c:28 source/ubl-settings-video.c:386
msgid "Change" msgid "Driver"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:131 #: source/ubl-settings-video.c:29
msgid "Configuration method" msgid "Description"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:41 #: source/ubl-settings-video.c:87 source/ubl-settings-video.c:392
msgid "DPMS off" msgid "UBlinux Video Configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:37 #: source/ubl-settings-video.c:89
msgid "Do not switch display off" msgid "Progect Home Page"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:150 #: source/ubl-settings-video.c:90
msgid "Documentation" msgid "Videocard and monitor configuration manager"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:130 #: source/ubl-settings-video.c:215
msgid "Driver" msgid "Monitor: "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:136 #: source/ubl-settings-video.c:216
msgid "Extra" msgid "Resolution (px): "
msgstr "" msgstr ""
#: source/ubl-settings-video.h:16 #: source/ubl-settings-video.c:217
msgid "Failed to load global configuration" msgid "Frequency (Hz): "
msgstr "" msgstr ""
#: source/ubl-settings-video.h:17 #: source/ubl-settings-video.c:218
msgid "Failed to load local configuration" msgid "Rotation: "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:129 #: source/ubl-settings-video.c:220
msgid "Failsafe driver AMD/ATI: " msgid "Main monitor"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:128 #: source/ubl-settings-video.c:221
msgid "Failsafe driver nVidia: " msgid "through parameter line:"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:135 #: source/ubl-settings-video.c:226 source/ubl-settings-video.c:231
msgid "Fix frame gap (nVidia)" #: source/ubl-settings-video.c:233 source/ubl-settings-video.c:236
#: source/ubl-settings-video.c:238 source/ubl-settings-video.c:258
msgid "Default settings"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:35 #: source/ubl-settings-video.c:374
msgid "Frequency (Hz): " msgid "Don't use"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:134 #: source/ubl-settings-video.c:375 source/ubl-settings-video.c:377
msgid "Hybrid graphics" msgid "Off"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:125 #: source/ubl-settings-video.c:376 source/ubl-settings-video.c:378
msgid "Launch programms through (nVidia)" msgid "fbdev"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:138 #: source/ubl-settings-video.c:380
msgid "Load" msgid "1st variant. May cause perfomance drops in video games"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:145 #: source/ubl-settings-video.c:381
msgid "Load from global configuration" msgid "2nd variant. May not work on specific video cards"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:146 #: source/ubl-settings-video.c:382
msgid "Load from local configuration" msgid "Video output configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:39 #: source/ubl-settings-video.c:383
msgid "Main monitor" msgid "Proprietary driver: "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:141 #: source/ubl-settings-video.c:384
msgid "Manual configuration" msgid "Failsafe driver nVidia: "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:132 #: source/ubl-settings-video.c:385
msgid "Failsafe driver AMD/ATI: "
msgstr ""
#: source/ubl-settings-video.c:388
msgid "Monitor configuration" msgid "Monitor configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:33 #: source/ubl-settings-video.c:389
msgid "Monitor: " msgid "Hybrid graphics"
msgstr ""
#: source/ubl-settings-video.c:390
msgid "Fix frame gap (nVidia)"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:142 #: source/ubl-settings-video.c:391
msgid "Extra"
msgstr ""
#: source/ubl-settings-video.c:393
msgid "Load"
msgstr ""
#: source/ubl-settings-video.c:394
msgid "Save"
msgstr ""
#: source/ubl-settings-video.c:396
msgid "On" msgid "On"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:127 #: source/ubl-settings-video.c:397
msgid "Proprietary driver: " msgid "Automatically choose and use driver"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:34 #: source/ubl-settings-video.c:398
msgid "Resolution (px): " msgid "Launch programms through optirun (nVidia): "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:36 #: source/ubl-settings-video.c:399
msgid "Rotation: " msgid "Launch programs through primusun (nVidia): "
msgstr "" msgstr ""
#: source/ubl-settings-video.c:139 #: source/ubl-settings-video.c:400
msgid "Save" msgid "discrete video only (AMD/ATI)"
msgstr ""
#: source/ubl-settings-video.c:402
msgid "Load from global configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:147 #: source/ubl-settings-video.c:403
msgid "Load from local configuration"
msgstr ""
#: source/ubl-settings-video.c:404
msgid "Save to global an local configuration" msgid "Save to global an local configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:148 #: source/ubl-settings-video.c:405
msgid "Save to global configuration" msgid "Save to global configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:149 #: source/ubl-settings-video.c:406
msgid "Save to local configuration" msgid "Save to local configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.h:19 #: source/ubl-settings-video.c:407
msgid "Saving to global configuration Succeeded" msgid "Documentation"
msgstr "" msgstr ""
#: source/ubl-settings-video.h:20 #: source/ubl-settings-video.c:408
msgid "Saving to local configuration Succeeded" msgid "About"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:137 #: source/ubl-settings-video.c:438
msgid "UBlinux Video Configuration" msgid "Configuration has been loaded"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:126 #: source/ubl-settings-video.h:22
msgid "Video output configuration" msgid "Failed to load global configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:133 #: source/ubl-settings-video.h:23
msgid "discrete video only (AMD/ATI)" msgid "Failed to load local configuration"
msgstr "" msgstr ""
#: source/ubl-settings-video.c:40 #: source/ubl-settings-video.h:25
msgid "through parameter line:" msgid "Saving to global configuration Succeeded"
msgstr ""
#: source/ubl-settings-video.h:26
msgid "Saving to local configuration Succeeded"
msgstr "" msgstr ""

@ -1,4 +1,4 @@
# Language translations for ubl-settings-manager package. # Russian translations for ubl-settings-manager package.
# Copyright (C) 2022, UBTech LLC # Copyright (C) 2022, UBTech LLC
# This file is distributed under the same license as the ubl-settings-manager package. # This file is distributed under the same license as the ubl-settings-manager package.
# UBLinux Team <info@ublinux.com>, 2022 # UBLinux Team <info@ublinux.com>, 2022
@ -7,12 +7,12 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ubl-settings-manager 1.0\n" "Project-Id-Version: ubl-settings-manager 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: info@ublinux.com\n"
"POT-Creation-Date: 2023-04-05 10:05+0000\n" "POT-Creation-Date: 2023-04-21 12:33+0000\n"
"PO-Revision-Date: 2023-01-01 00:00+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n"
"Last-Translator: UBLinux Team <info@ublinux.com>\n" "Last-Translator: UBLinux Team <info@ublinux.com>\n"
"Language-Team: UBLinux Team <info@ublinux.com>\n" "Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
"Language: \n" "Language: Russian\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -0,0 +1,8 @@
VERSION_ID:DRV_PAСKAGE:DRV_NAME:DRV_DESCRIPTION:DRV_SUPPORT
:ubm-nvidia-340:nvidia-340:Пакет с модулем драйвера и утилиты NVIDIA 340xx:Драйвер видеокарт nVidia серий 8XXX, 9XXX, 1XX, 2XX, 3XX, 4XX, 5XX, 6XX, 7XX
:ubm-nvidia-390:nvidia-390:Пакет с модулем драйвера и утилиты NVIDIA 390xx:Драйвер видеокарт nVidia серий 4XX, 5XX, 6XX, 7XX, 9XX, 10XX
:ubm-nvidia-430:nvidia-430:Пакет с модулем включает в себя драйвер NVIDIA 430xx и утилиты:Драйвер видеокарт nVidia серий 6XX, 7XX, 9XX, 10XX, 16XX
:ubm-nvidia-470:nvidia-470:Пакет с модулем драйвера и утилиты NVIDIA 470xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
:ubm-nvidia-510:nvidia-510:Пакет с модулем драйвера и утилиты NVIDIA 510xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
:ubm-nvidia-515:nvidia-515:Пакет с модулем драйвера и утилиты NVIDIA 515xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
:ubm-nvidia-optimus:nvidia-optimus:Пакет с модулем включает в себя NVIDIA Optimus:
1 VERSION_ID:DRV_PAСKAGE:DRV_NAME:DRV_DESCRIPTION:DRV_SUPPORT
2 :ubm-nvidia-340:nvidia-340:Пакет с модулем драйвера и утилиты NVIDIA 340xx:Драйвер видеокарт nVidia серий 8XXX, 9XXX, 1XX, 2XX, 3XX, 4XX, 5XX, 6XX, 7XX
3 :ubm-nvidia-390:nvidia-390:Пакет с модулем драйвера и утилиты NVIDIA 390xx:Драйвер видеокарт nVidia серий 4XX, 5XX, 6XX, 7XX, 9XX, 10XX
4 :ubm-nvidia-430:nvidia-430:Пакет с модулем включает в себя драйвер NVIDIA 430xx и утилиты:Драйвер видеокарт nVidia серий 6XX, 7XX, 9XX, 10XX, 16XX
5 :ubm-nvidia-470:nvidia-470:Пакет с модулем драйвера и утилиты NVIDIA 470xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
6 :ubm-nvidia-510:nvidia-510:Пакет с модулем драйвера и утилиты NVIDIA 510xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
7 :ubm-nvidia-515:nvidia-515:Пакет с модулем драйвера и утилиты NVIDIA 515xx:Драйвер видеокарт nVidia серий NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX
8 :ubm-nvidia-optimus:nvidia-optimus:Пакет с модулем включает в себя NVIDIA Optimus:
Loading…
Cancel
Save