diff --git a/StaticData/serverHash.xml b/StaticData/serverHash.xml
index 8917c30..f8ea7ba 100644
--- a/StaticData/serverHash.xml
+++ b/StaticData/serverHash.xml
@@ -182,27 +182,18 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/StaticData/settings.xml b/StaticData/settings.xml
index f0893c4..2c76bfe1 100644
--- a/StaticData/settings.xml
+++ b/StaticData/settings.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe
index 736cb8e..af0c9bb 100644
Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ
diff --git a/debug/versionselectwidget.o b/debug/versionselectwidget.o
index cee6e15..872b91e 100644
Binary files a/debug/versionselectwidget.o and b/debug/versionselectwidget.o differ
diff --git a/ui_versionselectwidget.h b/ui_versionselectwidget.h
index 787581d..1a01fe0 100644
--- a/ui_versionselectwidget.h
+++ b/ui_versionselectwidget.h
@@ -11,9 +11,12 @@
#include
#include
+#include
#include
#include
#include
+#include
+#include
#include
QT_BEGIN_NAMESPACE
@@ -21,51 +24,148 @@ QT_BEGIN_NAMESPACE
class Ui_VersionSelectWidget
{
public:
- QPushButton *switchServerVersionButton;
- QLabel *verTitle;
- QLabel *verValue;
+ QWidget *verticalLayoutWidget;
+ QVBoxLayout *actualServerListLayout;
QLabel *verListTitle;
- QLabel *infoViewTitle;
- QLabel *infoValue;
QListWidget *verListView;
+ QWidget *horizontalLayoutWidget;
+ QHBoxLayout *ButtonLayout;
+ QHBoxLayout *horizontalLayout;
QPushButton *createDuplicateButton;
QPushButton *DeleteVersionButton;
+ QPushButton *switchServerVersionButton;
+ QSpacerItem *horizontalSpacer;
+ QWidget *verticalLayoutWidget_2;
+ QVBoxLayout *verticalLayout;
+ QLabel *infoViewTitle;
+ QLabel *infoValue;
+ QSpacerItem *verticalSpacer;
+ QWidget *horizontalLayoutWidget_2;
+ QHBoxLayout *ServerInfoLayout;
+ QLabel *verTitle;
+ QLabel *verValue;
void setupUi(QWidget *VersionSelectWidget)
{
if (VersionSelectWidget->objectName().isEmpty())
VersionSelectWidget->setObjectName(QString::fromUtf8("VersionSelectWidget"));
- VersionSelectWidget->resize(730, 229);
+ VersionSelectWidget->resize(786, 229);
+ QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ sizePolicy.setHorizontalStretch(0);
+ sizePolicy.setVerticalStretch(0);
+ sizePolicy.setHeightForWidth(VersionSelectWidget->sizePolicy().hasHeightForWidth());
+ VersionSelectWidget->setSizePolicy(sizePolicy);
VersionSelectWidget->setAutoFillBackground(false);
- switchServerVersionButton = new QPushButton(VersionSelectWidget);
- switchServerVersionButton->setObjectName(QString::fromUtf8("switchServerVersionButton"));
- switchServerVersionButton->setGeometry(QRect(310, 180, 231, 41));
- verTitle = new QLabel(VersionSelectWidget);
- verTitle->setObjectName(QString::fromUtf8("verTitle"));
- verTitle->setGeometry(QRect(310, 150, 241, 31));
- verValue = new QLabel(VersionSelectWidget);
- verValue->setObjectName(QString::fromUtf8("verValue"));
- verValue->setGeometry(QRect(560, 150, 55, 21));
- verListTitle = new QLabel(VersionSelectWidget);
+ verticalLayoutWidget = new QWidget(VersionSelectWidget);
+ verticalLayoutWidget->setObjectName(QString::fromUtf8("verticalLayoutWidget"));
+ verticalLayoutWidget->setGeometry(QRect(0, 0, 301, 171));
+ actualServerListLayout = new QVBoxLayout(verticalLayoutWidget);
+ actualServerListLayout->setObjectName(QString::fromUtf8("actualServerListLayout"));
+ actualServerListLayout->setContentsMargins(0, 0, 0, 0);
+ verListTitle = new QLabel(verticalLayoutWidget);
verListTitle->setObjectName(QString::fromUtf8("verListTitle"));
- verListTitle->setGeometry(QRect(10, 10, 281, 21));
+ QFont font;
+ font.setFamily(QString::fromUtf8("Calibri"));
+ font.setPointSize(12);
+ verListTitle->setFont(font);
verListTitle->setContextMenuPolicy(Qt::PreventContextMenu);
- infoViewTitle = new QLabel(VersionSelectWidget);
- infoViewTitle->setObjectName(QString::fromUtf8("infoViewTitle"));
- infoViewTitle->setGeometry(QRect(310, 10, 191, 21));
- infoValue = new QLabel(VersionSelectWidget);
- infoValue->setObjectName(QString::fromUtf8("infoValue"));
- infoValue->setGeometry(QRect(310, 40, 401, 101));
- infoValue->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
- verListView = new QListWidget(VersionSelectWidget);
+
+ actualServerListLayout->addWidget(verListTitle);
+
+ verListView = new QListWidget(verticalLayoutWidget);
verListView->setObjectName(QString::fromUtf8("verListView"));
- verListView->setGeometry(QRect(10, 40, 281, 121));
- createDuplicateButton = new QPushButton(VersionSelectWidget);
+
+ actualServerListLayout->addWidget(verListView);
+
+ horizontalLayoutWidget = new QWidget(VersionSelectWidget);
+ horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget"));
+ horizontalLayoutWidget->setGeometry(QRect(0, 180, 781, 41));
+ ButtonLayout = new QHBoxLayout(horizontalLayoutWidget);
+ ButtonLayout->setSpacing(6);
+ ButtonLayout->setObjectName(QString::fromUtf8("ButtonLayout"));
+ ButtonLayout->setContentsMargins(0, 0, 0, 0);
+ horizontalLayout = new QHBoxLayout();
+ horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+ horizontalLayout->setSizeConstraint(QLayout::SetMinimumSize);
+ horizontalLayout->setContentsMargins(-1, -1, 0, -1);
+ createDuplicateButton = new QPushButton(horizontalLayoutWidget);
createDuplicateButton->setObjectName(QString::fromUtf8("createDuplicateButton"));
- createDuplicateButton->setGeometry(QRect(10, 180, 131, 41));
- DeleteVersionButton = new QPushButton(VersionSelectWidget);
+ QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ sizePolicy1.setHorizontalStretch(0);
+ sizePolicy1.setVerticalStretch(0);
+ sizePolicy1.setHeightForWidth(createDuplicateButton->sizePolicy().hasHeightForWidth());
+ createDuplicateButton->setSizePolicy(sizePolicy1);
+ QFont font1;
+ font1.setPointSize(9);
+ createDuplicateButton->setFont(font1);
+
+ horizontalLayout->addWidget(createDuplicateButton);
+
+ DeleteVersionButton = new QPushButton(horizontalLayoutWidget);
DeleteVersionButton->setObjectName(QString::fromUtf8("DeleteVersionButton"));
- DeleteVersionButton->setGeometry(QRect(160, 180, 131, 41));
+ sizePolicy1.setHeightForWidth(DeleteVersionButton->sizePolicy().hasHeightForWidth());
+ DeleteVersionButton->setSizePolicy(sizePolicy1);
+ DeleteVersionButton->setSizeIncrement(QSize(0, 0));
+ DeleteVersionButton->setFont(font1);
+
+ horizontalLayout->addWidget(DeleteVersionButton);
+
+
+ ButtonLayout->addLayout(horizontalLayout);
+
+ switchServerVersionButton = new QPushButton(horizontalLayoutWidget);
+ switchServerVersionButton->setObjectName(QString::fromUtf8("switchServerVersionButton"));
+ sizePolicy1.setHeightForWidth(switchServerVersionButton->sizePolicy().hasHeightForWidth());
+ switchServerVersionButton->setSizePolicy(sizePolicy1);
+ switchServerVersionButton->setFont(font1);
+
+ ButtonLayout->addWidget(switchServerVersionButton);
+
+ horizontalSpacer = new QSpacerItem(180, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+ ButtonLayout->addItem(horizontalSpacer);
+
+ verticalLayoutWidget_2 = new QWidget(VersionSelectWidget);
+ verticalLayoutWidget_2->setObjectName(QString::fromUtf8("verticalLayoutWidget_2"));
+ verticalLayoutWidget_2->setGeometry(QRect(310, 0, 471, 131));
+ verticalLayout = new QVBoxLayout(verticalLayoutWidget_2);
+ verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+ verticalLayout->setSizeConstraint(QLayout::SetDefaultConstraint);
+ verticalLayout->setContentsMargins(0, 0, 0, 0);
+ infoViewTitle = new QLabel(verticalLayoutWidget_2);
+ infoViewTitle->setObjectName(QString::fromUtf8("infoViewTitle"));
+ sizePolicy1.setHeightForWidth(infoViewTitle->sizePolicy().hasHeightForWidth());
+ infoViewTitle->setSizePolicy(sizePolicy1);
+ infoViewTitle->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+ verticalLayout->addWidget(infoViewTitle);
+
+ infoValue = new QLabel(verticalLayoutWidget_2);
+ infoValue->setObjectName(QString::fromUtf8("infoValue"));
+ infoValue->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
+
+ verticalLayout->addWidget(infoValue);
+
+ verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+ verticalLayout->addItem(verticalSpacer);
+
+ horizontalLayoutWidget_2 = new QWidget(VersionSelectWidget);
+ horizontalLayoutWidget_2->setObjectName(QString::fromUtf8("horizontalLayoutWidget_2"));
+ horizontalLayoutWidget_2->setGeometry(QRect(310, 140, 471, 31));
+ ServerInfoLayout = new QHBoxLayout(horizontalLayoutWidget_2);
+ ServerInfoLayout->setObjectName(QString::fromUtf8("ServerInfoLayout"));
+ ServerInfoLayout->setContentsMargins(0, 0, 0, 0);
+ verTitle = new QLabel(horizontalLayoutWidget_2);
+ verTitle->setObjectName(QString::fromUtf8("verTitle"));
+
+ ServerInfoLayout->addWidget(verTitle);
+
+ verValue = new QLabel(horizontalLayoutWidget_2);
+ verValue->setObjectName(QString::fromUtf8("verValue"));
+
+ ServerInfoLayout->addWidget(verValue);
+
retranslateUi(VersionSelectWidget);
@@ -75,14 +175,14 @@ public:
void retranslateUi(QWidget *VersionSelectWidget)
{
VersionSelectWidget->setWindowTitle(QCoreApplication::translate("VersionSelectWidget", "Form", nullptr));
- switchServerVersionButton->setText(QCoreApplication::translate("VersionSelectWidget", "\320\237\320\265\321\200\320\265\320\272\320\273\321\216\321\207\320\270\321\202\321\214 \320\262\320\265\321\200\321\201\320\270\321\216 \321\201\320\265\321\200\320\262\320\265\321\200\320\260", nullptr));
- verTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\320\265\320\272\321\203\321\211\320\260\321\217 \320\262\320\265\321\200\321\201\320\270\321\217 \321\201\320\265\321\200\320\262\320\265\321\200\320\260:", nullptr));
- verValue->setText(QCoreApplication::translate("VersionSelectWidget", "none", nullptr));
verListTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\224\320\276\321\201\321\202\321\203\320\277\320\275\321\213\320\265 \320\262\320\265\321\200\321\201\320\270\320\270 \320\275\320\260 \321\201\320\265\321\200\320\262\320\265\321\200\320\265", nullptr));
- infoViewTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217:", nullptr));
- infoValue->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\321\203\321\202 \320\261\321\203\320\264\320\265\321\202 \320\270\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217 \320\276 \320\262\320\265\321\200\321\201\320\270\320\270...", nullptr));
createDuplicateButton->setText(QCoreApplication::translate("VersionSelectWidget", "\320\241\320\276\320\267\320\264\320\260\321\202\321\214 \320\272\320\276\320\277\320\270\321\216", nullptr));
DeleteVersionButton->setText(QCoreApplication::translate("VersionSelectWidget", "\320\243\320\264\320\260\320\273\320\270\321\202\321\214", nullptr));
+ switchServerVersionButton->setText(QCoreApplication::translate("VersionSelectWidget", "\320\237\320\265\321\200\320\265\320\272\320\273\321\216\321\207\320\270\321\202\321\214 \320\262\320\265\321\200\321\201\320\270\321\216 \321\201\320\265\321\200\320\262\320\265\321\200\320\260", nullptr));
+ infoViewTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217:", nullptr));
+ infoValue->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\321\203\321\202 \320\261\321\203\320\264\320\265\321\202 \320\270\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\321\217 \320\276 \320\262\320\265\321\200\321\201\320\270\320\270...", nullptr));
+ verTitle->setText(QCoreApplication::translate("VersionSelectWidget", "\320\242\320\265\320\272\321\203\321\211\320\260\321\217 \320\262\320\265\321\200\321\201\320\270\321\217 \321\201\320\265\321\200\320\262\320\265\321\200\320\260:", nullptr));
+ verValue->setText(QCoreApplication::translate("VersionSelectWidget", "none", nullptr));
} // retranslateUi
};
diff --git a/versionselectwidget.ui b/versionselectwidget.ui
index 7614254..74f41ee 100644
--- a/versionselectwidget.ui
+++ b/versionselectwidget.ui
@@ -6,135 +6,233 @@
0
0
- 730
+ 786
229
+
+
+ 0
+ 0
+
+
Form
false
-
+
- 310
+ 0
+ 0
+ 301
+ 171
+
+
+
+ -
+
+
+
+ Calibri
+ 12
+
+
+
+ Qt::PreventContextMenu
+
+
+ Доступные версии на сервере
+
+
+
+ -
+
+
+
+
+
+
+
+ 0
180
- 231
+ 781
41
-
- Переключить версию сервера
-
+
+
+ 6
+
+ -
+
+
+ QLayout::SetMinimumSize
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+ Создать копию
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+ Удалить
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+ Переключить версию сервера
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 180
+ 20
+
+
+
+
+
-
+
310
- 150
- 241
+ 0
+ 471
+ 131
+
+
+
+
+ QLayout::SetDefaultConstraint
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Информация:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Тут будет информация о версии...
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+ 310
+ 140
+ 471
31
-
- Текущая версия сервера:
-
-
-
-
-
- 560
- 150
- 55
- 21
-
-
-
- none
-
-
-
-
-
- 10
- 10
- 281
- 21
-
-
-
- Qt::PreventContextMenu
-
-
- Доступные версии на сервере
-
-
-
-
-
- 310
- 10
- 191
- 21
-
-
-
- Информация:
-
-
-
-
-
- 310
- 40
- 401
- 101
-
-
-
- Тут будет информация о версии...
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
-
- 10
- 40
- 281
- 121
-
-
-
-
-
-
- 10
- 180
- 131
- 41
-
-
-
- Создать копию
-
-
-
-
-
- 160
- 180
- 131
- 41
-
-
-
- Удалить
-
+
+ -
+
+
+ Текущая версия сервера:
+
+
+
+ -
+
+
+ none
+
+
+
+