Merge pull request #305 from flowln/gui_changes

This commit is contained in:
Sefa Eyeoglu 2022-03-20 13:39:12 +01:00 committed by GitHub
commit c8fec556c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -273,8 +273,8 @@ public:
{ {
mainToolBar = TranslatedToolbar(MainWindow); mainToolBar = TranslatedToolbar(MainWindow);
mainToolBar->setObjectName(QStringLiteral("mainToolBar")); mainToolBar->setObjectName(QStringLiteral("mainToolBar"));
mainToolBar->setMovable(false); mainToolBar->setMovable(true);
mainToolBar->setAllowedAreas(Qt::TopToolBarArea); mainToolBar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
mainToolBar->setFloatable(false); mainToolBar->setFloatable(false);
mainToolBar.setWindowTitleId(QT_TRANSLATE_NOOP("MainWindow", "Main Toolbar")); mainToolBar.setWindowTitleId(QT_TRANSLATE_NOOP("MainWindow", "Main Toolbar"));
@ -442,8 +442,8 @@ public:
{ {
newsToolBar = TranslatedToolbar(MainWindow); newsToolBar = TranslatedToolbar(MainWindow);
newsToolBar->setObjectName(QStringLiteral("newsToolBar")); newsToolBar->setObjectName(QStringLiteral("newsToolBar"));
newsToolBar->setMovable(false); newsToolBar->setMovable(true);
newsToolBar->setAllowedAreas(Qt::BottomToolBarArea); newsToolBar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
newsToolBar->setIconSize(QSize(16, 16)); newsToolBar->setIconSize(QSize(16, 16));
newsToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); newsToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
newsToolBar->setFloatable(false); newsToolBar->setFloatable(false);
@ -467,6 +467,7 @@ public:
instanceToolBar->setObjectName(QStringLiteral("instanceToolBar")); instanceToolBar->setObjectName(QStringLiteral("instanceToolBar"));
// disabled until we have an instance selected // disabled until we have an instance selected
instanceToolBar->setEnabled(false); instanceToolBar->setEnabled(false);
instanceToolBar->setMovable(true);
instanceToolBar->setAllowedAreas(Qt::LeftToolBarArea | Qt::RightToolBarArea); instanceToolBar->setAllowedAreas(Qt::LeftToolBarArea | Qt::RightToolBarArea);
instanceToolBar->setToolButtonStyle(Qt::ToolButtonTextOnly); instanceToolBar->setToolButtonStyle(Qt::ToolButtonTextOnly);
instanceToolBar->setFloatable(false); instanceToolBar->setFloatable(false);