bugfix: befor change button position

This commit is contained in:
semenov
2024-10-03 10:52:42 +03:00
parent 1d7e6a4622
commit 0a0b327565
8 changed files with 139 additions and 75 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -8,46 +8,48 @@
static const unsigned char qt_resource_data[] = { static const unsigned char qt_resource_data[] = {
// E:/Projects/QT/GUIProj/RRJClient/RRJClient/style.css // E:/Projects/QT/GUIProj/RRJClient/RRJClient/style.css
0x0,0x0,0x2,0x5a, 0x0,0x0,0x2,0x7e,
0x0, 0x0,
0x0,0x9,0x34,0x78,0x9c,0xd5,0x55,0x5b,0x8f,0xa2,0x30,0x18,0x7d,0x37,0xf1,0x3f, 0x0,0xa,0xa7,0x78,0x9c,0xd5,0x56,0x5b,0x6f,0xda,0x30,0x18,0x7d,0x47,0xe2,0x3f,
0x34,0xe3,0x8b,0x93,0xc0,0x8,0x28,0xe3,0xa4,0xbe,0x39,0xbb,0xd9,0x4b,0xc6,0xcd, 0x58,0xe5,0x5,0x24,0x52,0x92,0x0,0x2d,0x32,0x6f,0x74,0xd3,0x2e,0x2a,0xd3,0x50,
0x9a,0xd9,0xec,0x3c,0x17,0x5a,0xe1,0x8b,0xb5,0x35,0x6d,0x89,0x9a,0xcd,0xfe,0xf7, 0xa7,0xf5,0xd9,0x89,0x4d,0xf2,0x9,0x63,0x23,0xdb,0x11,0xa0,0x69,0xff,0x7d,0x6,
0xad,0x88,0xe,0x20,0xba,0x98,0xec,0xcb,0x42,0x2,0x84,0xb6,0xe7,0x9c,0xef,0xde, 0x42,0x9a,0x84,0x40,0x43,0xc5,0xcb,0x88,0x44,0xa2,0xc4,0x3e,0xe7,0xf8,0xbb,0x1c,
0xed,0xcc,0x67,0x4,0xc4,0x1b,0x8,0x2a,0x37,0xdd,0xce,0xaf,0x6e,0x7,0xd9,0x2b, 0xbb,0xd9,0x98,0x4d,0x9,0x88,0x57,0x10,0x54,0xae,0x9b,0x8d,0x3f,0xcd,0x6,0xb2,
0x22,0xf1,0x32,0x51,0x32,0x13,0xd4,0x85,0x15,0x49,0x18,0x46,0x99,0xe2,0x7d,0x3c, 0xbf,0x80,0x84,0x8b,0x48,0xc9,0x44,0x50,0x7,0x96,0x24,0x62,0x18,0x25,0x8a,0xb7,
0x50,0x4c,0xcb,0x4c,0xc5,0x6c,0xf0,0xfa,0xfa,0xd5,0xf5,0x3d,0xef,0x3,0x51,0xcb, 0x71,0x4f,0x31,0x2d,0x13,0x15,0xb2,0xde,0xcb,0xcb,0x77,0xc7,0x73,0xdd,0x4f,0x44,
0x87,0xb5,0x48,0xee,0x27,0x67,0xe7,0xd6,0x52,0x83,0x1,0x29,0x30,0x8a,0x99,0x30, 0x2d,0xee,0x57,0x22,0xea,0x8c,0x4f,0xe6,0xad,0xa4,0x6,0x3,0x52,0x60,0x14,0x32,
0x4c,0xd9,0x1d,0xbf,0xbb,0x9d,0x6e,0x67,0xfe,0x2c,0x57,0x91,0x9c,0xca,0x6d,0x13, 0x61,0x98,0xb2,0x23,0xfe,0x36,0x1b,0xcd,0xc6,0xec,0x49,0x2e,0x3,0x39,0x91,0x9b,
0x59,0x2c,0xb9,0x54,0x18,0xa9,0x24,0xea,0x7,0xde,0xd0,0x9,0x82,0x27,0x27,0x8, 0x2a,0xb2,0x50,0x72,0xa9,0x30,0x52,0x51,0xd0,0xf6,0xdd,0x7e,0xd7,0xf7,0x47,0x5d,
0xc3,0x13,0xba,0x54,0x94,0x29,0x57,0x9b,0x1d,0xb7,0x8a,0x64,0x66,0x34,0x33,0xd5, 0x7f,0x38,0xcc,0xd0,0xa5,0xa2,0x4c,0x39,0xda,0x6c,0xb9,0x55,0x24,0x13,0xa3,0x99,
0x25,0x45,0x28,0x64,0x1a,0xa3,0xe1,0x7a,0x5b,0x2c,0x2c,0xa4,0x30,0xee,0x82,0xac, 0x29,0x7e,0x52,0x84,0x42,0xa2,0x31,0xea,0xaf,0x36,0xe9,0x87,0xb9,0x14,0xc6,0x99,
0x80,0xef,0x30,0xba,0x7b,0x26,0x1c,0x22,0x5,0x77,0xa5,0x45,0x8c,0xfc,0xc7,0xd3, 0x93,0x25,0xf0,0x2d,0x46,0x77,0x4f,0x84,0x43,0xa0,0xe0,0x2e,0xf7,0x11,0x23,0xef,
0xee,0x12,0xff,0x28,0x74,0x9e,0x46,0x8e,0x3f,0xf4,0xee,0x8f,0xca,0x73,0xf5,0xdf, 0x21,0x1b,0x9d,0xe3,0x1f,0xc,0xbb,0xa3,0x41,0xd7,0xeb,0xbb,0x9d,0xa3,0xf2,0xbd,
0x33,0x9d,0x4e,0x33,0x63,0xa4,0xf8,0xef,0xf4,0x97,0xb4,0x63,0xa,0x9a,0x44,0x9c, 0xfa,0x9f,0x89,0x8e,0x27,0x89,0x31,0x52,0xfc,0x77,0xfa,0x73,0xda,0x31,0x5,0x4d,
0xd1,0x2b,0x46,0x70,0x48,0x52,0xf3,0x49,0x91,0x5d,0x15,0x3b,0xb1,0x7f,0x8e,0x80, 0x2,0xce,0xe8,0x85,0x45,0x70,0x88,0x62,0xf3,0x45,0x91,0x6d,0x11,0x3b,0xb2,0x6f,
0x33,0xa6,0xb5,0xcd,0x8e,0xeb,0xc1,0xdc,0xa4,0x60,0xd8,0xe4,0xfc,0x8,0x9a,0xbf, 0x8e,0x80,0x53,0xa6,0xb5,0xad,0x8e,0xcb,0xc9,0x5c,0xc7,0x60,0xd8,0xf8,0x74,0xa,
0x90,0x88,0xf1,0xd3,0xc9,0x16,0x96,0x6,0x5e,0xdd,0xd2,0x88,0x5b,0xbe,0x46,0xf0, 0x9a,0x3d,0x93,0x80,0xf1,0x6c,0x66,0x8d,0x95,0xfa,0x6e,0x79,0xa5,0x1,0xb7,0x7c,
0xa6,0x40,0x55,0x9d,0x1c,0x9c,0xc0,0xd6,0x84,0x52,0x10,0x9,0x46,0xde,0x43,0xc0, 0x95,0xe0,0x55,0x89,0x2a,0x6,0xd9,0xcf,0xc0,0x56,0x84,0x52,0x10,0x11,0x46,0xee,
0x56,0xa7,0xe7,0xf0,0xf8,0x5d,0x6c,0x5b,0x81,0x70,0x37,0x40,0x4d,0x8a,0xd1,0xf8, 0xbd,0xcf,0x96,0xd9,0x7f,0xff,0xf8,0x9c,0xe,0x5b,0x82,0x70,0xd6,0x40,0x4d,0x8c,
0xa0,0xe4,0x40,0xfb,0x2,0x82,0x7d,0xa4,0x60,0xea,0x44,0xad,0x3,0x5d,0x84,0x47, 0xd1,0xe3,0x41,0xc9,0x81,0xf6,0x19,0x4,0xfb,0x4c,0xc1,0x94,0x89,0x6a,0x27,0x3a,
0xc9,0xc4,0x16,0x98,0x9e,0x12,0x55,0x43,0xca,0xb5,0x22,0x2d,0x39,0xd0,0xf3,0xd8, 0x4d,0x8f,0x92,0x91,0x6d,0x30,0x3d,0x21,0xaa,0x84,0xb4,0xd7,0x8a,0xb4,0xe4,0x40,
0x36,0xa0,0xfa,0xc1,0x25,0x3f,0xb5,0x4d,0xa9,0xd0,0xf2,0x45,0x92,0xd3,0xe2,0xaf, 0x4f,0x73,0x5b,0x81,0xea,0xf9,0xe7,0xe2,0x54,0xb7,0xa4,0x86,0x96,0x2f,0x90,0x9c,
0x61,0x5b,0xe3,0xda,0x8d,0xc9,0x59,0x39,0x57,0x75,0x63,0x1c,0xa7,0x99,0x58,0x5e, 0xa6,0x6f,0xd,0xdb,0x18,0xc7,0xe,0x8c,0x4e,0xda,0xb9,0xa8,0x1b,0xe3,0x30,0x4e,
0xf2,0xb8,0xff,0x1e,0xbf,0x56,0x45,0x53,0x34,0x8c,0x94,0xc5,0xcb,0x72,0x8e,0x95, 0xc4,0xe2,0x5c,0xc4,0xbd,0xb7,0xfc,0xd5,0x6a,0x9a,0xd4,0x30,0x62,0x16,0x2e,0xf2,
0xd,0x68,0x5b,0x12,0xd5,0x2c,0x7c,0x3,0x9a,0x30,0xd3,0x83,0x58,0x8a,0xc3,0x67, 0x35,0x96,0x5f,0x40,0xdd,0x96,0x28,0x56,0xe1,0x2b,0xd0,0x88,0x99,0x16,0x84,0x52,
0x5d,0x71,0x73,0xd7,0xfb,0x62,0xf7,0xeb,0xc1,0x9a,0x13,0xc1,0xf2,0xae,0x87,0xbc, 0x1c,0x1e,0xcb,0x8a,0xab,0x5d,0xef,0x9b,0x1d,0xaf,0x7b,0x2b,0x4e,0x4,0xdb,0xbb,
0xe2,0xd6,0x46,0x31,0x13,0xa7,0xc7,0xf7,0x31,0xad,0x2e,0xb5,0xc0,0x9b,0x13,0xdf, 0x1e,0x72,0xd3,0x4b,0x1b,0xc5,0x4c,0x18,0x1f,0xef,0xc7,0xb2,0x3a,0x67,0x81,0x37,
0x1f,0xb7,0xb2,0x27,0x65,0xc4,0x8a,0xaf,0x5b,0x54,0xf7,0xf4,0x3f,0xea,0x4e,0x39, 0x28,0xfc,0xca,0xf5,0xc4,0x8c,0x58,0xf1,0xe5,0x15,0x95,0x23,0x7d,0x23,0x77,0x2a,
0xf3,0x6c,0x67,0x27,0xc7,0xe7,0x9c,0xb6,0x60,0xbf,0xdd,0xb6,0xb6,0xed,0x2b,0x47, 0x30,0x27,0x2b,0x4a,0xc,0x7b,0x8f,0x79,0x97,0x63,0x92,0xe7,0xfe,0x18,0xbf,0xe7,
0xee,0x59,0xe7,0x27,0x99,0xd,0xce,0xf,0x30,0x9c,0xb5,0xe3,0x69,0x74,0xd9,0x1, 0x9e,0x8,0x40,0x1f,0x57,0xe0,0x96,0xbb,0xe8,0x16,0xa,0x6e,0x62,0x6e,0xd5,0x36,
0xed,0x9b,0x34,0xb0,0x80,0x98,0xec,0xc3,0x74,0x83,0xf2,0xc6,0xee,0x73,0x40,0x14, 0x3e,0xdd,0xda,0xcd,0xfa,0xeb,0x3e,0xd3,0x69,0xc2,0xaf,0xa6,0xf2,0x46,0x35,0x77,
0x57,0x11,0x4f,0x3d,0xac,0xde,0x91,0x7b,0xb6,0x23,0xdb,0xc4,0xda,0xfd,0x4,0xb6, 0x8c,0x3d,0x72,0xcb,0xd6,0x7b,0x94,0xd8,0x7e,0xf8,0x5,0x86,0xb3,0x7a,0x3c,0x95,
0x39,0xab,0xfe,0xd1,0x4d,0xd5,0x1f,0x5e,0x29,0xb2,0xaa,0xf,0x9a,0xe9,0x6d,0xd, 0x55,0x7a,0x40,0xfb,0x21,0xd,0xcc,0x21,0x24,0xbb,0xce,0xb8,0x42,0x79,0xa5,0xe1,
0xdb,0x82,0xbb,0x3a,0x1b,0xf6,0x32,0xfc,0xd0,0x77,0xfc,0xf1,0xa3,0x13,0x78,0x7e, 0x1f,0x10,0xc5,0x45,0xc4,0x2c,0xb2,0xe5,0x4d,0xb0,0x65,0x37,0x41,0xdb,0xcb,0xdb,
0x69,0x44,0x5e,0xc2,0x6c,0x31,0x70,0x1a,0x40,0xdf,0x7d,0xfd,0xd7,0x91,0xd6,0xe3, 0xdf,0xc0,0xd6,0x27,0x86,0x3b,0xb8,0xca,0x70,0x87,0x17,0x7c,0xad,0x18,0x83,0x6a,
0x20,0x96,0x6d,0x26,0x33,0xe9,0x7b,0x4e,0x7e,0xdf,0x4f,0x5a,0x47,0x3a,0xe2,0xd9, 0x7a,0x6b,0x9b,0xd6,0xe3,0x2e,0x6e,0xc7,0x3b,0x19,0xde,0xd0,0xeb,0x7a,0x8f,0xf,
0xde,0x6b,0x5,0xeb,0x1f,0xec,0x3,0xa8,0xe, 0xb6,0x66,0xbd,0xdc,0xa9,0xe4,0x1c,0x66,0x8d,0x3d,0xbe,0x2,0xf4,0x2d,0xd6,0xef,
0x9e,0x22,0x5a,0x1c,0xc4,0xa2,0xce,0x61,0x88,0xb4,0xdd,0xee,0xfe,0xea,0x8c,0x6b,
0x67,0x3a,0xe0,0xc9,0x2e,0x6a,0x29,0xeb,0x3f,0xe9,0xd0,0x12,0xb6,
// E:/Projects/QT/GUIProj/RRJClient/RRJClient/resource/SSJ-100.png // E:/Projects/QT/GUIProj/RRJClient/RRJClient/resource/SSJ-100.png
0x0,0xc,0x7c,0xaa, 0x0,0xc,0x7c,0xaa,
0x89, 0x89,
@@ -131746,7 +131748,7 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/style.css // :/style.css
0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
0x0,0x0,0x1,0x92,0x4d,0xb2,0x3a,0x68, 0x0,0x0,0x1,0x92,0x51,0x4d,0x53,0xeb,
// :/resource // :/resource
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x3, 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x3,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -131757,40 +131759,40 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x6e,0x0,0x2,0x0,0x0,0x0,0x7,0x0,0x0,0x0,0x7, 0x0,0x0,0x0,0x6e,0x0,0x2,0x0,0x0,0x0,0x7,0x0,0x0,0x0,0x7,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/resource/SSJ-100Dark.png // :/resource/SSJ-100Dark.png
0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xc,0x7f,0xc, 0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xc,0x7f,0x30,
0x0,0x0,0x1,0x92,0x4d,0x8e,0xd2,0xb0, 0x0,0x0,0x1,0x92,0x4d,0x8e,0xd2,0xb0,
// :/resource/SSJ-100.png // :/resource/SSJ-100.png
0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x5e, 0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x82,
0x0,0x0,0x1,0x92,0x4d,0x0,0xce,0xbb, 0x0,0x0,0x1,0x92,0x4d,0x0,0xce,0xbb,
// :/resource/Icons/setting.png // :/resource/Icons/setting.png
0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xc3,0x8b, 0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xc3,0xaf,
0x0,0x0,0x1,0x92,0x47,0x9,0xdd,0xaa, 0x0,0x0,0x1,0x92,0x47,0x9,0xdd,0xaa,
// :/resource/Icons/settingWhite.png // :/resource/Icons/settingWhite.png
0x0,0x0,0x1,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x77,0x84, 0x0,0x0,0x1,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x77,0xa8,
0x0,0x0,0x1,0x92,0x47,0xc,0xaf,0x4c, 0x0,0x0,0x1,0x92,0x47,0xc,0xaf,0x4c,
// :/resource/Icons/plane.png // :/resource/Icons/plane.png
0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xee,0x9d, 0x0,0x0,0x1,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xee,0xc1,
0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f, 0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f,
// :/resource/Icons/crossInCircle.png // :/resource/Icons/crossInCircle.png
0x0,0x0,0x1,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xf2,0xea, 0x0,0x0,0x1,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xf3,0xe,
0x0,0x0,0x1,0x92,0x4c,0x9f,0x4d,0xc4, 0x0,0x0,0x1,0x92,0x4c,0x9f,0x4d,0xc4,
// :/resource/Icons/whiteCross.png // :/resource/Icons/whiteCross.png
0x0,0x0,0x1,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x61,0xf, 0x0,0x0,0x1,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x61,0x33,
0x0,0x0,0x1,0x92,0x4c,0x9e,0xfa,0x44, 0x0,0x0,0x1,0x92,0x4c,0x9e,0xfa,0x44,
// :/resource/Icons/monitor-display.png // :/resource/Icons/monitor-display.png
0x0,0x0,0x1,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xbd,0xbc, 0x0,0x0,0x1,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0xbd,0xe0,
0x0,0x0,0x1,0x92,0x42,0xfe,0x89,0x26, 0x0,0x0,0x1,0x92,0x42,0xfe,0x89,0x26,
// :/resource/Icons/762.gif // :/resource/Icons/762.gif
0x0,0x0,0x1,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x3a,0x99, 0x0,0x0,0x1,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1f,0x3a,0xbd,
0x0,0x0,0x1,0x92,0x4d,0xb,0xea,0x71, 0x0,0x0,0x1,0x92,0x4d,0xb,0xea,0x71,
// :/resource/Fonts/HelveticaNeue-Medium.ttf // :/resource/Fonts/HelveticaNeue-Medium.ttf
0x0,0x0,0x0,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x16,0xf1,0x69, 0x0,0x0,0x0,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x16,0xf1,0x8d,
0x0,0x0,0x1,0x92,0x42,0xb4,0xbd,0xcd, 0x0,0x0,0x1,0x92,0x42,0xb4,0xbd,0xcd,
// :/resource/Fonts/LiberationSans-Regular.ttf // :/resource/Fonts/LiberationSans-Regular.ttf
0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0xe2,0x9d, 0x0,0x0,0x0,0xee,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0xe2,0xc1,
0x0,0x0,0x1,0x92,0x42,0x25,0xa7,0xdc, 0x0,0x0,0x1,0x92,0x42,0x25,0xa7,0xdc,
// :/resource/Fonts/Kanit Cyrillic.ttf // :/resource/Fonts/Kanit Cyrillic.ttf
0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0x5a,0xdd, 0x0,0x0,0x0,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x19,0x5b,0x1,
0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc, 0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc,
}; };

Binary file not shown.

View File

@@ -56,6 +56,9 @@ void MainWindow::initialize()
emit sigSetConnect(dataParser->getServerSettings(),connectionThread); emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
checkAppAvailable(); checkAppAvailable();
//test
} }
void MainWindow::createObjects() void MainWindow::createObjects()
@@ -526,6 +529,7 @@ void MainWindow::painting()
//exit //exit
QPixmap crossPixmap(":resource/Icons/crossInCircle.png"); QPixmap crossPixmap(":resource/Icons/crossInCircle.png");
QPainter painterCross; QPainter painterCross;
QSize iconSize(30,30);
painter.begin(&crossPixmap); painter.begin(&crossPixmap);
painter.setCompositionMode(QPainter::CompositionMode_SourceIn); painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
@@ -536,6 +540,7 @@ void MainWindow::painting()
crossIcon.addPixmap(crossPixmap,QIcon::Normal,QIcon::Off); crossIcon.addPixmap(crossPixmap,QIcon::Normal,QIcon::Off);
ui->exitButton->setIcon(crossIcon); ui->exitButton->setIcon(crossIcon);
ui->exitButton->setIconSize(iconSize);
//loading //loading

View File

@@ -314,8 +314,8 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>560</y> <y>555</y>
<width>211</width> <width>231</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>
@@ -368,6 +368,12 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>70</width>
<height>50</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Helvetica Cyr Upright-Bold</family> <family>Helvetica Cyr Upright-Bold</family>
@@ -395,7 +401,7 @@
<x>0</x> <x>0</x>
<y>220</y> <y>220</y>
<width>801</width> <width>801</width>
<height>181</height> <height>211</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@@ -458,16 +464,19 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
<height>0</height> <height>190</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>240</width> <width>240</width>
<height>200</height> <height>250</height>
</size> </size>
</property> </property>
<layout class="QVBoxLayout" name="loginLayout"> <layout class="QVBoxLayout" name="loginLayout">
<property name="spacing">
<number>4</number>
</property>
<item> <item>
<widget class="QLabel" name="loginTitle"> <widget class="QLabel" name="loginTitle">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -536,7 +545,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>230</width> <width>230</width>
<height>40</height> <height>35</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
@@ -864,19 +873,34 @@
<widget class="QWidget" name="updateWidget" native="true"> <widget class="QWidget" name="updateWidget" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>10</x>
<y>330</y> <y>330</y>
<width>791</width> <width>781</width>
<height>171</height> <height>171</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="updateListGuideLabel"> <widget class="QLabel" name="updateListGuideLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>500</width> <width>500</width>
<height>20</height> <height>25</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
@@ -930,7 +954,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Загрузить на сервер</string> <string>Выгрузить изменения</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -1030,6 +1054,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="exitButton"> <widget class="QPushButton" name="exitButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
@@ -1038,8 +1068,8 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>30</width> <width>50</width>
<height>30</height> <height>50</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">

View File

@@ -91,7 +91,7 @@ QWidget#iconWidget
QLabel QLabel
{ {
font-family: "Calibri"; font-family: "Calibri";
font: 17px; font: 20px;
color: white; color: white;
} }
@@ -102,10 +102,31 @@ QWidget#headerWidget
border-radius: 3px; border-radius: 3px;
} }
QWidget#updateWidget
{
background-color: rgba(203,228,255,255);
border-style: outset;
border-radius: 10px;
}
QWidget #updateWidget
{
background-color: rgba(203,228,255,200);
border-style: outset;
border-radius: 10px;
}
QWidget #updateWidget QLabel
{
font-family: "Calibri";
font: 20px;
color: rgb(45,84,130);
}
MyWinHeader#headerLabel MyWinHeader#headerLabel
{ {
font-family: "Calibri"; font-family: "Calibri";
font: 16px; font: 18px;
color: rgb(45,84,130); color: rgb(45,84,130);
} }

View File

@@ -219,7 +219,7 @@ public:
settingsButton->setIconSize(QSize(30, 30)); settingsButton->setIconSize(QSize(30, 30));
LanguageWidget = new QWidget(centralwidget); LanguageWidget = new QWidget(centralwidget);
LanguageWidget->setObjectName(QString::fromUtf8("LanguageWidget")); LanguageWidget->setObjectName(QString::fromUtf8("LanguageWidget"));
LanguageWidget->setGeometry(QRect(0, 560, 211, 30)); LanguageWidget->setGeometry(QRect(0, 555, 231, 30));
horizontalLayout_2 = new QHBoxLayout(LanguageWidget); horizontalLayout_2 = new QHBoxLayout(LanguageWidget);
horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
horizontalLayout_2->setContentsMargins(-1, 0, -1, 0); horizontalLayout_2->setContentsMargins(-1, 0, -1, 0);
@@ -245,6 +245,7 @@ public:
sizePolicy1.setHeightForWidth(languageComboBox->sizePolicy().hasHeightForWidth()); sizePolicy1.setHeightForWidth(languageComboBox->sizePolicy().hasHeightForWidth());
languageComboBox->setSizePolicy(sizePolicy1); languageComboBox->setSizePolicy(sizePolicy1);
languageComboBox->setMinimumSize(QSize(70, 0)); languageComboBox->setMinimumSize(QSize(70, 0));
languageComboBox->setMaximumSize(QSize(70, 50));
QFont font3; QFont font3;
font3.setFamily(QString::fromUtf8("Helvetica Cyr Upright-Bold")); font3.setFamily(QString::fromUtf8("Helvetica Cyr Upright-Bold"));
font3.setBold(true); font3.setBold(true);
@@ -255,7 +256,7 @@ public:
horizontalWidget = new QWidget(centralwidget); horizontalWidget = new QWidget(centralwidget);
horizontalWidget->setObjectName(QString::fromUtf8("horizontalWidget")); horizontalWidget->setObjectName(QString::fromUtf8("horizontalWidget"));
horizontalWidget->setGeometry(QRect(0, 220, 801, 181)); horizontalWidget->setGeometry(QRect(0, 220, 801, 211));
horizontalLayout = new QHBoxLayout(horizontalWidget); horizontalLayout = new QHBoxLayout(horizontalWidget);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
horizontalLayout->setSizeConstraint(QLayout::SetDefaultConstraint); horizontalLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
@@ -279,9 +280,10 @@ public:
loginLayoutWidget->setObjectName(QString::fromUtf8("loginLayoutWidget")); loginLayoutWidget->setObjectName(QString::fromUtf8("loginLayoutWidget"));
sizePolicy3.setHeightForWidth(loginLayoutWidget->sizePolicy().hasHeightForWidth()); sizePolicy3.setHeightForWidth(loginLayoutWidget->sizePolicy().hasHeightForWidth());
loginLayoutWidget->setSizePolicy(sizePolicy3); loginLayoutWidget->setSizePolicy(sizePolicy3);
loginLayoutWidget->setMinimumSize(QSize(250, 0)); loginLayoutWidget->setMinimumSize(QSize(250, 190));
loginLayoutWidget->setMaximumSize(QSize(240, 200)); loginLayoutWidget->setMaximumSize(QSize(240, 250));
loginLayout = new QVBoxLayout(loginLayoutWidget); loginLayout = new QVBoxLayout(loginLayoutWidget);
loginLayout->setSpacing(4);
loginLayout->setObjectName(QString::fromUtf8("loginLayout")); loginLayout->setObjectName(QString::fromUtf8("loginLayout"));
loginTitle = new QLabel(loginLayoutWidget); loginTitle = new QLabel(loginLayoutWidget);
loginTitle->setObjectName(QString::fromUtf8("loginTitle")); loginTitle->setObjectName(QString::fromUtf8("loginTitle"));
@@ -313,7 +315,7 @@ public:
loginButton = new QPushButton(loginLayoutWidget); loginButton = new QPushButton(loginLayoutWidget);
loginButton->setObjectName(QString::fromUtf8("loginButton")); loginButton->setObjectName(QString::fromUtf8("loginButton"));
loginButton->setMinimumSize(QSize(230, 40)); loginButton->setMinimumSize(QSize(230, 35));
loginButton->setProperty("isGreen", QVariant(true)); loginButton->setProperty("isGreen", QVariant(true));
loginLayout->addWidget(loginButton); loginLayout->addWidget(loginButton);
@@ -444,12 +446,14 @@ public:
updateWidget = new QWidget(centralwidget); updateWidget = new QWidget(centralwidget);
updateWidget->setObjectName(QString::fromUtf8("updateWidget")); updateWidget->setObjectName(QString::fromUtf8("updateWidget"));
updateWidget->setGeometry(QRect(0, 330, 791, 171)); updateWidget->setGeometry(QRect(10, 330, 781, 171));
verticalLayout_10 = new QVBoxLayout(updateWidget); verticalLayout_10 = new QVBoxLayout(updateWidget);
verticalLayout_10->setSpacing(6);
verticalLayout_10->setObjectName(QString::fromUtf8("verticalLayout_10")); verticalLayout_10->setObjectName(QString::fromUtf8("verticalLayout_10"));
verticalLayout_10->setContentsMargins(5, 5, 0, 0);
updateListGuideLabel = new QLabel(updateWidget); updateListGuideLabel = new QLabel(updateWidget);
updateListGuideLabel->setObjectName(QString::fromUtf8("updateListGuideLabel")); updateListGuideLabel->setObjectName(QString::fromUtf8("updateListGuideLabel"));
updateListGuideLabel->setMinimumSize(QSize(500, 20)); updateListGuideLabel->setMinimumSize(QSize(500, 25));
updateListGuideLabel->setMaximumSize(QSize(16777215, 20)); updateListGuideLabel->setMaximumSize(QSize(16777215, 20));
QFont font5; QFont font5;
font5.setFamily(QString::fromUtf8("Calibri")); font5.setFamily(QString::fromUtf8("Calibri"));
@@ -513,8 +517,10 @@ public:
exitButton = new QPushButton(headerWidget); exitButton = new QPushButton(headerWidget);
exitButton->setObjectName(QString::fromUtf8("exitButton")); exitButton->setObjectName(QString::fromUtf8("exitButton"));
sizePolicy1.setHeightForWidth(exitButton->sizePolicy().hasHeightForWidth());
exitButton->setSizePolicy(sizePolicy1);
exitButton->setMinimumSize(QSize(30, 30)); exitButton->setMinimumSize(QSize(30, 30));
exitButton->setMaximumSize(QSize(30, 30)); exitButton->setMaximumSize(QSize(50, 50));
headerLayout->addWidget(exitButton); headerLayout->addWidget(exitButton);
@@ -562,7 +568,7 @@ public:
inlineTextDebug->setText(QString()); inlineTextDebug->setText(QString());
updateListGuideLabel->setText(QCoreApplication::translate("MainWindow", "\320\225\321\201\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217 \320\262 \320\273\320\276\320\272\320\260\320\273\321\214\320\275\321\213\321\205 \321\204\320\260\320\271\320\273\320\260\321\205", nullptr)); updateListGuideLabel->setText(QCoreApplication::translate("MainWindow", "\320\225\321\201\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217 \320\262 \320\273\320\276\320\272\320\260\320\273\321\214\320\275\321\213\321\205 \321\204\320\260\320\271\320\273\320\260\321\205", nullptr));
updateActionListLabel->setText(QCoreApplication::translate("MainWindow", "TextLabel", nullptr)); updateActionListLabel->setText(QCoreApplication::translate("MainWindow", "TextLabel", nullptr));
loadToServerButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\263\321\200\321\203\320\267\320\270\321\202\321\214 \320\275\320\260 \321\201\320\265\321\200\320\262\320\265\321\200", nullptr)); loadToServerButton->setText(QCoreApplication::translate("MainWindow", "\320\222\321\213\320\263\321\200\321\203\320\267\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr));
undoChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\236\321\202\320\274\320\265\320\275\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr)); undoChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\236\321\202\320\274\320\265\320\275\320\270\321\202\321\214 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\321\217", nullptr));
startWithCurrentChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\321\202\320\270\321\202\321\214 \320\261\320\265\320\267 \320\276\321\202\320\277\321\200\320\260\320\262\320\272\320\270", nullptr)); startWithCurrentChangesButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\321\202\320\270\321\202\321\214 \320\261\320\265\320\267 \320\276\321\202\320\277\321\200\320\260\320\262\320\272\320\270", nullptr));
headerLabel->setText(QCoreApplication::translate("MainWindow", "\320\242\321\200\320\265\320\275\320\260\320\266\320\265\321\200 \320\277\321\200\320\276\321\206\320\265\320\264\321\203\321\200 \321\202\320\265\321\205\320\275\320\270\321\207\320\265\321\201\320\272\320\276\320\263\320\276 \320\276\320\261\321\201\320\273\321\203\320\266\320\270\320\262\320\260\320\275\320\270\321\217 \321\201\320\260\320\274\320\276\320\273\320\265\321\202\320\260 RRJ-95NEW-100", nullptr)); headerLabel->setText(QCoreApplication::translate("MainWindow", "\320\242\321\200\320\265\320\275\320\260\320\266\320\265\321\200 \320\277\321\200\320\276\321\206\320\265\320\264\321\203\321\200 \321\202\320\265\321\205\320\275\320\270\321\207\320\265\321\201\320\272\320\276\320\263\320\276 \320\276\320\261\321\201\320\273\321\203\320\266\320\270\320\262\320\260\320\275\320\270\321\217 \321\201\320\260\320\274\320\276\320\273\320\265\321\202\320\260 RRJ-95NEW-100", nullptr));