alexander/GUI-FreeRDP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Исправлен патч gui.patch

Browse source 
- Добавлено версионирование
This commit is contained in:
Alexander Zhirov 2023-02-16 19:23:41 +03:00
parent 4dea975c45
commit f3f30a4cf8
4 changed files with 73 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
freerdp/client/X11/cli/about.c Normal file
View file

@ -0,0 +1,15 @@
/*
* about.c
*
* Created on: 16 февр. 2023 г.
* Author: alexander
*/
#include "about.h"
char* getAbout()
{
char *about = ""
"GUI FreeRDP\nv1.2.1\nСобрано на основе freerdp v2.9.0";
return about;
}

13
freerdp/client/X11/cli/about.h Normal file
View file

@ -0,0 +1,13 @@
/*
* about.h
*
* Created on: 16 февр. 2023 г.
* Author: alexander
*/
#ifndef CLIENT_X11_CLI_ABOUT_H_
#define CLIENT_X11_CLI_ABOUT_H_
char* getAbout();
#endif /* CLIENT_X11_CLI_ABOUT_H_ */

49
freerdp/client/X11/cli/settings.c
View file

@ -16,6 +16,7 @@
#include "settings.h"
#include "arguments.h"
#include "node_settings.h"
#include "about.h"
void toggleActive(Ihandle *self, char *name)
{
@ -347,21 +348,51 @@ static Ihandle* settingsBoxMonitor()
IupSetInt(ddMonitor, "ACTIVE", getSetParameter(PARAMETER_FULLSCREEN) && !getSetParameter(PARAMETER_MULTIMONITOR));
return IupSetAttributes(
IupFrame(
IupFrame(
IupVbox(
IupSetAttributes(
IupVbox(
IupSetCallbacks(IupSetAttributes(tglFullscreen, "NAME=SETTINGS_TGL_FULLSCREEN, EXPAND=YES, TIP=\"Выполнить подключение на весь экран\""), "ACTION",
(Icallback) settingsTglFullscreen, NULL),
IupSetCallbacks(IupSetAttributes(tglMultimonitor, "NAME=SETTINGS_TGL_MULTIMONITOR, TIP=\"Задействовать все подключенные мониторы\""), "ACTION",
(Icallback) settingsTglMultimonitor, NULL),
IupSetCallbacks(IupSetAttributes(ddMonitor, "NAME=MONITORS, DROPDOWN=YES, EXPAND=YES, TIP=\"Выбрать конкретный монитор для подключения\""), "ACTION",
(Icallback) settingsChooseMonitor, NULL),
NULL)), "TITLE=\"Монитор\", MARGIN=10x10, CGAP=5");
IupSetCallbacks(IupSetAttributes(tglFullscreen, "NAME=SETTINGS_TGL_FULLSCREEN, EXPAND=YES, TIP=\"Выполнить подключение на весь экран\""), "ACTION", (Icallback) settingsTglFullscreen, NULL),
IupSetCallbacks(IupSetAttributes(tglMultimonitor, "NAME=SETTINGS_TGL_MULTIMONITOR, TIP=\"Задействовать все подключенные мониторы\""), "ACTION", (Icallback) settingsTglMultimonitor, NULL),
NULL
), "MARGIN=0x0, GAP=0x0"),
IupSetCallbacks(IupSetAttributes(ddMonitor, "NAME=MONITORS, DROPDOWN=YES, EXPAND=YES, TIP=\"Выбрать конкретный монитор для подключения\""), "ACTION", (Icallback) settingsChooseMonitor, NULL),
NULL)
), "TITLE=\"Монитор\", MARGIN=15x10, GAP=15x0");
}
static Ihandle* settingsBoxAbout()
{
Ihandle *inputAbout;
inputAbout = IupText(NULL);
IupSetAttribute(inputAbout, "READONLY", "YES");
IupSetAttribute(inputAbout, "MULTILINE", "YES");
IupSetAttribute(inputAbout, "SIZE", "160");
IupSetAttribute(inputAbout, "VISIBLELINES", "6");
IupSetAttribute(inputAbout, "PADDING", "5");
IupSetAttribute(inputAbout, "VALUE", getAbout());
return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=10x10");
}
static Ihandle* settingsHorizontalBox()
{
return IupSetAttributes(
IupHbox(IupVbox(settingsBoxCheckbox(), settingsBoxMonitor(), NULL), settingsBoxSecurity(), settingsBoxBitsPerPixel(), NULL), "MARGIN=5x5");
IupHbox(
IupSetAttributes(
IupVbox(settingsBoxCheckbox(), settingsBoxMonitor(), NULL),
"NMARGIN=0x0"
),
IupSetAttributes(
IupVbox(
IupSetAttributes(IupHbox(settingsBoxSecurity(), settingsBoxBitsPerPixel(), NULL), "GAP=10x0"),
settingsBoxAbout(),
NULL),
"MARGIN=0x0"),
NULL), "NMARGIN=10x0, NGAP=10x0"
);
}
/*