Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact ui

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-15 15:23:26 +03:00
parent 2a2ad69a44
commit 2ab2e47850
35 changed files with 170 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LibServer/Server.qrc
View File

@@ -21,5 +21,6 @@
<file>resources/icons/procedure.png</file>
<file>resources/icons/exchange.png</file>
<file>resources/blankXML/ListSubProc.xml</file>
<file>resources/icons/PngServerRRJ.png</file>
</qresource>
</RCC>

9
LibServer/Systems/assetsmanager.cpp
View File

@@ -287,11 +287,16 @@ void AssetsManager::writeVersionsToFile(QList<StreamingVersionData*> version,boo
SAttribute attribute4;
if(isFirst)
{
attribute3 = {"isChangeable",QString::number(false)};
{
QString author = tr("LLC Constanta-Design");
attribute4 = {"author",author};
ver->setAuthor(author);
if(ver->getViewName() == "base")
attribute3 = {"isChangeable",QString::number(false)};
else
attribute3 = {"isChangeable",QString::number(true)};
}else
{
attribute3 ={"isChangeable",QString::number(ver->getIsChangeable())};

BIN
LibServer/resources/icons/PngServerRRJ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
LibServer/resources/icons/exchange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

15
LibServer/settings/dialogsettingstray.cpp
View File

@@ -300,6 +300,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
QString PasswordPostgres;
DialogAuthorization dlg(this);
dlg.setWindowIcon(QIcon(QStringLiteral(":/resources/icons/PngServerRRJ.png")));
dlg.setWindowTitle(tr("Superuser PostgreSQL authorization"));
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
dlg.setStyleSheet(this->styleSheet());
@@ -343,14 +344,18 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
if(settings->HostName == "localhost")
SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
tr("Possible reasons:") + "\n" +
tr("*superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("*Port is incorrect."));
tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("port is incorrect;") + "\n" +
tr("PostgreSQL is not installed.")
);
else
SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
tr("Possible reasons:") + "\n" +
tr("*superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("*Port is incorrect;") + "\n" +
tr("*file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ".");
tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("port is incorrect;") + "\n" +
tr("file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ";" + "\n" +
tr("PostgreSQL is not installed.")
);
return;
}
}

5
LibServer/settings/dialogsettingstray.ui
View File

@@ -301,8 +301,8 @@
<string>Check DB</string>
</property>
<property name="icon">
<iconset resource="../Server.qrc">
<normaloff>:/resources/icons/checkDB.png</normaloff>:/resources/icons/checkDB.png</iconset>
<iconset resource="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc">
<normaloff>:/resources/icons/editorDB.png</normaloff>:/resources/icons/editorDB.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -365,7 +365,6 @@
</widget>
<resources>
<include location="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc"/>
<include location="../Server.qrc"/>
</resources>
<connections/>
</ui>