diff --git a/data/gui/normalStyle.css b/data/gui/normalStyle.css index de48890447027..b61333f6f9e63 100644 --- a/data/gui/normalStyle.css +++ b/data/gui/normalStyle.css @@ -211,8 +211,12 @@ QMenu::item:selected { /* when user selects item using mouse or keyboard */ * Windows */ -QFrame#TitleBar { +QFrame#titleBar { /* Title bar on windows */ + min-width: 16px; + min-height: 25px; + max-height: 25px; + margin: 0; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 rgb(41, 47, 50), stop:1 rgb(31, 33, 36)); } diff --git a/plugins/AngleMeasure/src/gui/AngleMeasureDialog.cpp b/plugins/AngleMeasure/src/gui/AngleMeasureDialog.cpp index d7fab7fdd6ec8..cacdee4e6cecc 100644 --- a/plugins/AngleMeasure/src/gui/AngleMeasureDialog.cpp +++ b/plugins/AngleMeasure/src/gui/AngleMeasureDialog.cpp @@ -58,8 +58,8 @@ void AngleMeasureDialog::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectBoolProperty(ui->panAndSelectCheckBox, "AngleMeasure.flagPanAndSelect"); connectBoolProperty(ui->followCursorCheckBox, "AngleMeasure.flagFollowCursor"); diff --git a/plugins/AngleMeasure/src/gui/angleMeasureDialog.ui b/plugins/AngleMeasure/src/gui/angleMeasureDialog.ui index 174c6194761e6..1bf485fc5ff38 100644 --- a/plugins/AngleMeasure/src/gui/angleMeasureDialog.ui +++ b/plugins/AngleMeasure/src/gui/angleMeasureDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Angle Measure Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Angle Measure Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -458,7 +362,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp b/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp index f322d96f902fb..70ca84c9fe5c6 100644 --- a/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp +++ b/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp @@ -68,8 +68,8 @@ void ArchaeoLinesDialog::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectIntProperty(ui->lineWidthSpinBox, "ArchaeoLines.lineWidth"); diff --git a/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialogLocations.cpp b/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialogLocations.cpp index 9cdb0cda7d04a..9ad3f591e9bd9 100644 --- a/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialogLocations.cpp +++ b/plugins/ArchaeoLines/src/gui/ArchaeoLinesDialogLocations.cpp @@ -60,8 +60,8 @@ void ArchaeoLinesDialogLocations::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); //initialize list model allModel = new QStringListModel(this); diff --git a/plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui b/plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui index 8aaa0725ba718..b38df01ce156c 100644 --- a/plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui +++ b/plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + ArchaeoLines Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - ArchaeoLines Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -930,7 +834,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/ArchaeoLines/src/gui/archaeoLinesDialogLocations.ui b/plugins/ArchaeoLines/src/gui/archaeoLinesDialogLocations.ui index ec5626d189cf5..498e2ab5d99a4 100644 --- a/plugins/ArchaeoLines/src/gui/archaeoLinesDialogLocations.ui +++ b/plugins/ArchaeoLines/src/gui/archaeoLinesDialogLocations.ui @@ -30,168 +30,10 @@ 0 - - - - 16 - 25 - + + + Locations - - - 16777215 - 30 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 75 - false - true - - - - Locations - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -269,7 +111,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Calendars/src/gui/CalendarsDialog.cpp b/plugins/Calendars/src/gui/CalendarsDialog.cpp index f5930cea79522..326de0eaea8ac 100644 --- a/plugins/Calendars/src/gui/CalendarsDialog.cpp +++ b/plugins/Calendars/src/gui/CalendarsDialog.cpp @@ -72,8 +72,8 @@ void CalendarsDialog::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(resetCalendarsSettings())); setAboutHtml(); diff --git a/plugins/Calendars/src/gui/calendarsDialog.ui b/plugins/Calendars/src/gui/calendarsDialog.ui index 9fe2fb355f022..967ef8fa86666 100644 --- a/plugins/Calendars/src/gui/calendarsDialog.ui +++ b/plugins/Calendars/src/gui/calendarsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Calendars Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Calendars Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -1247,7 +1151,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp b/plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp index ac8b4c49330a6..3b15a0ea54f2c 100644 --- a/plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp +++ b/plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp @@ -53,8 +53,8 @@ void EquationOfTimeWindow::createDialogContent() ui->setupUi(dialog); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); ui->checkBoxEnableAtStartup->setChecked(eq->getFlagEnableAtStartup()); connect(ui->checkBoxEnableAtStartup, SIGNAL(clicked(bool)), eq, SLOT(setFlagEnableAtStartup(bool))); diff --git a/plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui b/plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui index 1024d3245505e..14c1322deeb0e 100644 --- a/plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui +++ b/plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui @@ -27,107 +27,11 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Equation of Time - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - - + + + Equation of Time + + @@ -362,7 +266,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp b/plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp index f839bdd340b87..4d9c0e453bc1e 100644 --- a/plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp +++ b/plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp @@ -124,8 +124,8 @@ void ExoplanetsDialog::createDialogContent() connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues())); updateTimer->start(7000); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings())); diff --git a/plugins/Exoplanets/src/gui/exoplanetsDialog.ui b/plugins/Exoplanets/src/gui/exoplanetsDialog.ui index e0374336a7498..986c0da258a48 100644 --- a/plugins/Exoplanets/src/gui/exoplanetsDialog.ui +++ b/plugins/Exoplanets/src/gui/exoplanetsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Exoplanets Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Exoplanets Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -754,7 +658,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/MeteorShowers/src/gui/MSConfigDialog.cpp b/plugins/MeteorShowers/src/gui/MSConfigDialog.cpp index dd1b6d1c14bfe..86bbf12d571d0 100644 --- a/plugins/MeteorShowers/src/gui/MSConfigDialog.cpp +++ b/plugins/MeteorShowers/src/gui/MSConfigDialog.cpp @@ -69,8 +69,8 @@ void MSConfigDialog::createDialogContent() } connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(m_ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(m_ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(m_ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(m_ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(m_ui->bRestoreDefaults, SIGNAL(clicked()), this, SLOT(restoreDefaults())); // General tab diff --git a/plugins/MeteorShowers/src/gui/MSConfigDialog.ui b/plugins/MeteorShowers/src/gui/MSConfigDialog.ui index a61c27b876c86..bf36c86c0d976 100644 --- a/plugins/MeteorShowers/src/gui/MSConfigDialog.ui +++ b/plugins/MeteorShowers/src/gui/MSConfigDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Meteor Showers: Settings - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Meteor Showers: Settings - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -642,11 +546,11 @@ tabs - TitleBar + titleBar - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/MeteorShowers/src/gui/MSSearchDialog.cpp b/plugins/MeteorShowers/src/gui/MSSearchDialog.cpp index 43577de2b0fbe..043ddbccfcdbd 100644 --- a/plugins/MeteorShowers/src/gui/MSSearchDialog.cpp +++ b/plugins/MeteorShowers/src/gui/MSSearchDialog.cpp @@ -70,8 +70,8 @@ void MSSearchDialog::createDialogContent() connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(m_ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(m_ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(m_ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(m_ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(m_ui->searchButton, SIGNAL(clicked()), this, SLOT(searchEvents())); diff --git a/plugins/MeteorShowers/src/gui/MSSearchDialog.ui b/plugins/MeteorShowers/src/gui/MSSearchDialog.ui index 289e3b9436a85..4fd20f3790d27 100644 --- a/plugins/MeteorShowers/src/gui/MSSearchDialog.ui +++ b/plugins/MeteorShowers/src/gui/MSSearchDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Meteor Showers: Search - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Meteor Showers: Search - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -285,7 +189,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/MissingStars/src/gui/MissingStarsDialog.cpp b/plugins/MissingStars/src/gui/MissingStarsDialog.cpp index 586f3373fc176..9651c620cf7b8 100644 --- a/plugins/MissingStars/src/gui/MissingStarsDialog.cpp +++ b/plugins/MissingStars/src/gui/MissingStarsDialog.cpp @@ -69,8 +69,8 @@ void MissingStarsDialog::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); } - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // About tab setAboutHtml(); diff --git a/plugins/MissingStars/src/gui/missingStarsDialog.ui b/plugins/MissingStars/src/gui/missingStarsDialog.ui index 381262b226b24..aa528243a81e9 100644 --- a/plugins/MissingStars/src/gui/missingStarsDialog.ui +++ b/plugins/MissingStars/src/gui/missingStarsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Missing Stars Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Missing Stars Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -163,7 +67,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/NavStars/src/gui/NavStarsWindow.cpp b/plugins/NavStars/src/gui/NavStarsWindow.cpp index 22864ff3e6164..b5b294fd87c3d 100644 --- a/plugins/NavStars/src/gui/NavStarsWindow.cpp +++ b/plugins/NavStars/src/gui/NavStarsWindow.cpp @@ -60,8 +60,8 @@ void NavStarsWindow::createDialogContent() ui->setupUi(dialog); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); populateNavigationalStarsSets(); populateNavigationalStarsSetDescription(); diff --git a/plugins/NavStars/src/gui/navStarsWindow.ui b/plugins/NavStars/src/gui/navStarsWindow.ui index 1f3791f0cf8c7..e3ed8bf82983b 100644 --- a/plugins/NavStars/src/gui/navStarsWindow.ui +++ b/plugins/NavStars/src/gui/navStarsWindow.ui @@ -27,107 +27,11 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Navigational stars - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - - + + + Navigational stars + + @@ -782,7 +686,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Novae/src/gui/NovaeDialog.cpp b/plugins/Novae/src/gui/NovaeDialog.cpp index b5929481c75ff..ca0d74102ebe9 100644 --- a/plugins/Novae/src/gui/NovaeDialog.cpp +++ b/plugins/Novae/src/gui/NovaeDialog.cpp @@ -95,8 +95,8 @@ void NovaeDialog::createDialogContent() connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues())); updateTimer->start(7000); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings())); diff --git a/plugins/Novae/src/gui/novaeDialog.ui b/plugins/Novae/src/gui/novaeDialog.ui index e69d4cca14ce6..7871075ded7bc 100644 --- a/plugins/Novae/src/gui/novaeDialog.ui +++ b/plugins/Novae/src/gui/novaeDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Bright Novae Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Bright Novae Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -331,7 +235,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Observability/src/gui/ObservabilityDialog.cpp b/plugins/Observability/src/gui/ObservabilityDialog.cpp index 0d227c96fff53..aa83f041beaff 100644 --- a/plugins/Observability/src/gui/ObservabilityDialog.cpp +++ b/plugins/Observability/src/gui/ObservabilityDialog.cpp @@ -109,8 +109,8 @@ void ObservabilityDialog::createDialogContent() connect(ui->horizonAltitudeSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateHorizonLabel(int))); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); // TODO: The plug-in should emit a signal when settings are changed. diff --git a/plugins/Observability/src/gui/ObservabilityDialog.ui b/plugins/Observability/src/gui/ObservabilityDialog.ui index 33cbf16dad29c..f803bda5b01f0 100644 --- a/plugins/Observability/src/gui/ObservabilityDialog.ui +++ b/plugins/Observability/src/gui/ObservabilityDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Observability Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Observability Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -438,7 +342,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Oculars/src/gui/OcularDialog.cpp b/plugins/Oculars/src/gui/OcularDialog.cpp index c00b4d5304cb6..8449f30906ceb 100644 --- a/plugins/Oculars/src/gui/OcularDialog.cpp +++ b/plugins/Oculars/src/gui/OcularDialog.cpp @@ -303,8 +303,8 @@ void OcularDialog::createDialogContent() } //Now the rest of the actions. - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectBoolProperty(ui->checkBoxControlPanel, "Oculars.flagGuiPanelEnabled"); connectIntProperty(ui->guiFontSizeSpinBox, "Oculars.guiPanelFontSize"); diff --git a/plugins/Oculars/src/gui/ocularDialog.ui b/plugins/Oculars/src/gui/ocularDialog.ui index 04b2d1d344d8d..3da805e6eb6fe 100644 --- a/plugins/Oculars/src/gui/ocularDialog.ui +++ b/plugins/Oculars/src/gui/ocularDialog.ui @@ -33,103 +33,10 @@ 0 - - - - 0 - 0 - - - - - 16 - 25 - - - - - 16777215 - 25 - + + + Oculars - - QFrame::StyledPanel - - - QFrame::Raised - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Oculars - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -2156,7 +2063,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/OnlineQueries/src/gui/OnlineQueriesDialog.cpp b/plugins/OnlineQueries/src/gui/OnlineQueriesDialog.cpp index b01f6617ca774..d5251ee9f365c 100644 --- a/plugins/OnlineQueries/src/gui/OnlineQueriesDialog.cpp +++ b/plugins/OnlineQueries/src/gui/OnlineQueriesDialog.cpp @@ -80,8 +80,8 @@ void OnlineQueriesDialog::createDialogContent() //hook up retranslate event connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); //connect UI events - connect(ui->closeStelWindow, &QPushButton::clicked, plugin, [=]{ plugin->setEnabled(false);}); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, plugin, [=]{ plugin->setEnabled(false);}); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // Kinetic scrolling and style sheet for output kineticScrollingList << view; diff --git a/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui b/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui index 9aaa46dc5513a..231217af049ae 100644 --- a/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui +++ b/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui @@ -36,121 +36,10 @@ 0 - - - - 16 - 25 - + + + Online Queries - - - 16777215 - 25 - - - - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - false - true - - - - - - - QFrame::StyledPanel - - - 0 - - - Online Queries - - - -1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - Qt::DefaultContextMenu - - - - - - - @@ -337,7 +226,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/PointerCoordinates/src/gui/PointerCoordinatesWindow.cpp b/plugins/PointerCoordinates/src/gui/PointerCoordinatesWindow.cpp index 9d88e17f23071..82a04128c23be 100644 --- a/plugins/PointerCoordinates/src/gui/PointerCoordinatesWindow.cpp +++ b/plugins/PointerCoordinates/src/gui/PointerCoordinatesWindow.cpp @@ -56,8 +56,8 @@ void PointerCoordinatesWindow::createDialogContent() ui->setupUi(dialog); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectBoolProperty(ui->checkBoxEnableAtStartup, "PointerCoordinates.enableAtStartup"); connectBoolProperty(ui->checkBoxShowButton, "PointerCoordinates.showCoordinatesButton"); diff --git a/plugins/PointerCoordinates/src/gui/pointerCoordinatesWindow.ui b/plugins/PointerCoordinates/src/gui/pointerCoordinatesWindow.ui index f6049a04c9eef..f85490ac9ef20 100644 --- a/plugins/PointerCoordinates/src/gui/pointerCoordinatesWindow.ui +++ b/plugins/PointerCoordinates/src/gui/pointerCoordinatesWindow.ui @@ -27,107 +27,11 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Pointer Coordinates - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - - + + + Pointer Coordinates + + @@ -438,7 +342,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Pulsars/src/gui/PulsarsDialog.cpp b/plugins/Pulsars/src/gui/PulsarsDialog.cpp index bc9b94317a579..d89383a879156 100644 --- a/plugins/Pulsars/src/gui/PulsarsDialog.cpp +++ b/plugins/Pulsars/src/gui/PulsarsDialog.cpp @@ -110,8 +110,8 @@ void PulsarsDialog::createDialogContent() connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues())); updateTimer->start(7000); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings())); diff --git a/plugins/Pulsars/src/gui/pulsarsDialog.ui b/plugins/Pulsars/src/gui/pulsarsDialog.ui index c9dd62eb226a4..b6db48fe819e7 100644 --- a/plugins/Pulsars/src/gui/pulsarsDialog.ui +++ b/plugins/Pulsars/src/gui/pulsarsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Pulsars Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Pulsars Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -452,7 +356,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Quasars/src/gui/QuasarsDialog.cpp b/plugins/Quasars/src/gui/QuasarsDialog.cpp index aff0f56553a7c..6b97fa3c06aff 100644 --- a/plugins/Quasars/src/gui/QuasarsDialog.cpp +++ b/plugins/Quasars/src/gui/QuasarsDialog.cpp @@ -96,8 +96,8 @@ void QuasarsDialog::createDialogContent() connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues())); updateTimer->start(7000); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings())); diff --git a/plugins/Quasars/src/gui/quasarsDialog.ui b/plugins/Quasars/src/gui/quasarsDialog.ui index d4fef1b2f609b..c3c27eec34195 100644 --- a/plugins/Quasars/src/gui/quasarsDialog.ui +++ b/plugins/Quasars/src/gui/quasarsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Quasars Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quasars Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -416,7 +320,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/RemoteControl/src/gui/RemoteControlDialog.cpp b/plugins/RemoteControl/src/gui/RemoteControlDialog.cpp index a952a20d03772..71005639ba811 100644 --- a/plugins/RemoteControl/src/gui/RemoteControlDialog.cpp +++ b/plugins/RemoteControl/src/gui/RemoteControlDialog.cpp @@ -67,8 +67,8 @@ void RemoteControlDialog::createDialogContent() connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // TODO Fill other buttons diff --git a/plugins/RemoteControl/src/gui/remoteControlDialog.ui b/plugins/RemoteControl/src/gui/remoteControlDialog.ui index 308f5dfcad204..7b16e42607dc9 100644 --- a/plugins/RemoteControl/src/gui/remoteControlDialog.ui +++ b/plugins/RemoteControl/src/gui/remoteControlDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Remote Control Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Remote Control Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -345,7 +249,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp b/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp index 6daf70faa23dd..42db215cd03d9 100644 --- a/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp +++ b/plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp @@ -68,8 +68,8 @@ void RemoteSyncDialog::createDialogContent() ui->pushButtonDeselectProperties->setText(QChar(0x2190)); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(rs, SIGNAL(stateChanged(RemoteSync::SyncState)), this, SLOT(updateState())); updateState(); diff --git a/plugins/RemoteSync/src/gui/remoteSyncDialog.ui b/plugins/RemoteSync/src/gui/remoteSyncDialog.ui index 41870330d3551..d9931917e9134 100644 --- a/plugins/RemoteSync/src/gui/remoteSyncDialog.ui +++ b/plugins/RemoteSync/src/gui/remoteSyncDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Remote Sync Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Remote Sync Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -607,7 +511,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Satellites/src/gui/SatellitesCommDialog.cpp b/plugins/Satellites/src/gui/SatellitesCommDialog.cpp index f839f7fbd3bf7..7806a8abb90ca 100644 --- a/plugins/Satellites/src/gui/SatellitesCommDialog.cpp +++ b/plugins/Satellites/src/gui/SatellitesCommDialog.cpp @@ -63,8 +63,8 @@ void SatellitesCommDialog::createDialogContent() { ui->setupUi(dialog); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); initListCommunications(); diff --git a/plugins/Satellites/src/gui/SatellitesDialog.cpp b/plugins/Satellites/src/gui/SatellitesDialog.cpp index a63e4fd36d3b2..f62ebe1c9bc46 100644 --- a/plugins/Satellites/src/gui/SatellitesDialog.cpp +++ b/plugins/Satellites/src/gui/SatellitesDialog.cpp @@ -130,8 +130,8 @@ void SatellitesDialog::createDialogContent() ui->tabs->removeTab(ui->tabs->indexOf(ui->iridiumTab)); #endif ui->tabs->setCurrentIndex(0); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); Satellites* plugin = GETSTELMODULE(Satellites); diff --git a/plugins/Satellites/src/gui/SatellitesFilterDialog.cpp b/plugins/Satellites/src/gui/SatellitesFilterDialog.cpp index 06cafc6629d91..cbe6ff5780730 100644 --- a/plugins/Satellites/src/gui/SatellitesFilterDialog.cpp +++ b/plugins/Satellites/src/gui/SatellitesFilterDialog.cpp @@ -52,8 +52,8 @@ void SatellitesFilterDialog::createDialogContent() { ui->setupUi(dialog); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); connectBoolProperty(ui->inclinationCheckBox, "Satellites.flagCFInclination"); diff --git a/plugins/Satellites/src/gui/SatellitesImportDialog.cpp b/plugins/Satellites/src/gui/SatellitesImportDialog.cpp index 1da1107f997f5..498ef786fd61c 100644 --- a/plugins/Satellites/src/gui/SatellitesImportDialog.cpp +++ b/plugins/Satellites/src/gui/SatellitesImportDialog.cpp @@ -96,10 +96,8 @@ void SatellitesImportDialog::createDialogContent() connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); } - connect(ui->closeStelWindow, SIGNAL(clicked()), - this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), - this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->pushButtonGetData, SIGNAL(clicked()), this, SLOT(getData())); diff --git a/plugins/Satellites/src/gui/satellitesCommDialog.ui b/plugins/Satellites/src/gui/satellitesCommDialog.ui index 4fd3d4af86d4d..5b4c7c3590191 100644 --- a/plugins/Satellites/src/gui/satellitesCommDialog.ui +++ b/plugins/Satellites/src/gui/satellitesCommDialog.ui @@ -33,101 +33,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Frequencies - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Frequencies - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -282,7 +191,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Satellites/src/gui/satellitesDialog.ui b/plugins/Satellites/src/gui/satellitesDialog.ui index f20accd668167..e88162d3054c9 100644 --- a/plugins/Satellites/src/gui/satellitesDialog.ui +++ b/plugins/Satellites/src/gui/satellitesDialog.ui @@ -30,100 +30,10 @@ 0 - - - - 530 - 25 - + + + Satellites Configuration - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Satellites Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -1730,7 +1640,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Satellites/src/gui/satellitesFilterDialog.ui b/plugins/Satellites/src/gui/satellitesFilterDialog.ui index 52e596665cf41..4d9f0ba2e985d 100644 --- a/plugins/Satellites/src/gui/satellitesFilterDialog.ui +++ b/plugins/Satellites/src/gui/satellitesFilterDialog.ui @@ -33,101 +33,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Satellites filter - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Satellites filter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -441,7 +350,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Satellites/src/gui/satellitesImportDialog.ui b/plugins/Satellites/src/gui/satellitesImportDialog.ui index 3017339d73000..0ede228942a7e 100644 --- a/plugins/Satellites/src/gui/satellitesImportDialog.ui +++ b/plugins/Satellites/src/gui/satellitesImportDialog.ui @@ -18,106 +18,10 @@ 0 - - - - 0 - 0 - + + + More Satellites - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - More Satellites - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -234,7 +138,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp b/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp index 0fa8dd2224561..650e8afa0ccab 100644 --- a/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp +++ b/plugins/Scenery3d/src/gui/Scenery3dDialog.cpp @@ -94,8 +94,8 @@ void Scenery3dDialog::createDialogContent() ui->comboBoxCubemapMode->setModel(new CubemapModeListModel(ui->comboBoxCubemapMode)); //connect UI events - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->scenery3dListWidget, &QListWidget::currentItemChanged, this, &Scenery3dDialog::scenery3dChanged); //checkboxes can connect directly to manager diff --git a/plugins/Scenery3d/src/gui/StoredViewDialog.cpp b/plugins/Scenery3d/src/gui/StoredViewDialog.cpp index 42c44fbb9cd83..bc79a4129308b 100644 --- a/plugins/Scenery3d/src/gui/StoredViewDialog.cpp +++ b/plugins/Scenery3d/src/gui/StoredViewDialog.cpp @@ -46,8 +46,8 @@ void StoredViewDialog::retranslate() void StoredViewDialog::createDialogContent() { ui->setupUi(dialog); - connect(ui->closeStelWindow, &QPushButton::clicked, this, &StelDialog::close); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); mgr = GETSTELMODULE(Scenery3d); Q_ASSERT(mgr); diff --git a/plugins/Scenery3d/src/gui/scenery3dDialog.ui b/plugins/Scenery3d/src/gui/scenery3dDialog.ui index 55bdb178a7fd7..bd41a452f3d84 100644 --- a/plugins/Scenery3d/src/gui/scenery3dDialog.ui +++ b/plugins/Scenery3d/src/gui/scenery3dDialog.ui @@ -36,186 +36,11 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - false - true - - - - - - - QFrame::StyledPanel - - - 0 - - - 3D Scenery - - - -1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - Qt::DefaultContextMenu - - - - - - - - + + + 3D Scenery + + @@ -789,7 +614,7 @@ li.checked::marker { content: "\2612"; } - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Scenery3d/src/gui/storedViewDialog.ui b/plugins/Scenery3d/src/gui/storedViewDialog.ui index eedb04bdfcfe8..9bd4058d81bb9 100644 --- a/plugins/Scenery3d/src/gui/storedViewDialog.ui +++ b/plugins/Scenery3d/src/gui/storedViewDialog.ui @@ -36,187 +36,11 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 75 - false - true - - - - - - - QFrame::StyledPanel - - - 0 - - - Stored views - - - -1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - Qt::DefaultContextMenu - - - - - - - - + + + Stored views + + @@ -309,7 +133,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp b/plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp index b084eeeb3367a..db33c1e2df369 100644 --- a/plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp +++ b/plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp @@ -53,8 +53,8 @@ void ManualImportWindow::createDialogContent() //Signals connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->LocationBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->lineEditColor, SIGNAL(textChanged(QString)), this, SLOT(parseColorString(QString))); connect(ui->pushButtonSelectColor, SIGNAL(clicked()), this, SLOT(selectColor())); diff --git a/plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp b/plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp index 20b01139ccada..4ed9c5b9b6506 100644 --- a/plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp +++ b/plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp @@ -102,8 +102,8 @@ void MpcImportWindow::createDialogContent() //Signals connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->pushButtonAcquire, SIGNAL(clicked()), this, SLOT(acquireObjectData())); connect(ui->pushButtonAbortDownload, SIGNAL(clicked()), this, SLOT(abortDownload())); diff --git a/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp b/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp index 5f1e431ae0e72..11790104ccf9c 100644 --- a/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp +++ b/plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp @@ -73,8 +73,8 @@ void SolarSystemManagerWindow::createDialogContent() //Signals connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->pushButtonCopyFile, SIGNAL(clicked()), this, SLOT(copyConfiguration())); connect(ui->pushButtonReplaceFile, SIGNAL(clicked()), this, SLOT(replaceConfiguration())); connect(ui->pushButtonAddFile, SIGNAL(clicked()), this, SLOT(addConfiguration())); diff --git a/plugins/SolarSystemEditor/src/gui/manualImportWindow.ui b/plugins/SolarSystemEditor/src/gui/manualImportWindow.ui index 411d631e8ce53..0abfc795ec52a 100644 --- a/plugins/SolarSystemEditor/src/gui/manualImportWindow.ui +++ b/plugins/SolarSystemEditor/src/gui/manualImportWindow.ui @@ -18,106 +18,10 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel + + + Define an object - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Define an object - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -801,7 +705,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui b/plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui index 615080a3ad977..b832fd4079798 100644 --- a/plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui +++ b/plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui @@ -28,107 +28,11 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Import data - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - - + + + Import data + + @@ -693,7 +597,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/SolarSystemEditor/src/gui/solarSystemManagerWindow.ui b/plugins/SolarSystemEditor/src/gui/solarSystemManagerWindow.ui index c846eabae61d0..37b40241f0dce 100644 --- a/plugins/SolarSystemEditor/src/gui/solarSystemManagerWindow.ui +++ b/plugins/SolarSystemEditor/src/gui/solarSystemManagerWindow.ui @@ -27,107 +27,11 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Minor Solar System objects - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - - + + + Minor Solar System objects + + @@ -375,7 +279,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/Supernovae/src/gui/SupernovaeDialog.cpp b/plugins/Supernovae/src/gui/SupernovaeDialog.cpp index 3388568b9e6ee..35957fc84fb77 100644 --- a/plugins/Supernovae/src/gui/SupernovaeDialog.cpp +++ b/plugins/Supernovae/src/gui/SupernovaeDialog.cpp @@ -94,8 +94,8 @@ void SupernovaeDialog::createDialogContent() connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues())); updateTimer->start(7000); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings())); diff --git a/plugins/Supernovae/src/gui/supernovaeDialog.ui b/plugins/Supernovae/src/gui/supernovaeDialog.ui index 063201d010828..0ed1885eadbc8 100644 --- a/plugins/Supernovae/src/gui/supernovaeDialog.ui +++ b/plugins/Supernovae/src/gui/supernovaeDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - + + + Historical Supernovae Plug-in Configuration - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Historical Supernovae Plug-in Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -328,7 +232,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/TelescopeControl/src/gui/SlewDialog.cpp b/plugins/TelescopeControl/src/gui/SlewDialog.cpp index 157c336176970..7dd6bd34d0301 100644 --- a/plugins/TelescopeControl/src/gui/SlewDialog.cpp +++ b/plugins/TelescopeControl/src/gui/SlewDialog.cpp @@ -65,8 +65,8 @@ void SlewDialog::createDialogContent() //Inherited connect connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->radioButtonHMS, SIGNAL(toggled(bool)), this, SLOT(setFormatHMS(bool))); connect(ui->radioButtonDMS, SIGNAL(toggled(bool)), this, SLOT(setFormatDMS(bool))); diff --git a/plugins/TelescopeControl/src/gui/StoredPointsDialog.cpp b/plugins/TelescopeControl/src/gui/StoredPointsDialog.cpp index fb76aed6963ce..395147b0b9207 100644 --- a/plugins/TelescopeControl/src/gui/StoredPointsDialog.cpp +++ b/plugins/TelescopeControl/src/gui/StoredPointsDialog.cpp @@ -52,8 +52,8 @@ void StoredPointsDialog::createDialogContent() ui->setupUi(dialog); //Inherited connect connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->pushButtonAddPoint, SIGNAL(clicked()), this, SLOT(buttonAddPressed())); connect(ui->pushButtonRemovePoint,SIGNAL(clicked()), this, SLOT(buttonRemovePressed())); diff --git a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp index d739d848d2842..0b7898246dc8d 100644 --- a/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp +++ b/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp @@ -144,8 +144,8 @@ void TelescopeConfigurationDialog::createDialogContent() // Inherited connect connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(buttonDiscardPressed())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &TelescopeConfigurationDialog::buttonDiscardPressed); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(dialog, SIGNAL(rejected()), this, SLOT(buttonDiscardPressed())); // Connect: sender, signal, receiver, member @@ -254,7 +254,7 @@ void TelescopeConfigurationDialog::initNewTelescopeConfiguration(int slot) { configuredSlot = slot; initConfigurationDialog(); - ui->stelWindowTitle->setText(q_("Add New Telescope")); + ui->titleBar->setTitle(q_("Add New Telescope")); ui->lineEditTelescopeName->setText(QString("New Telescope %1").arg(QString::number(configuredSlot))); ui->doubleSpinBoxTelescopeDelay->setValue(SECONDS_FROM_MICROSECONDS(TelescopeControl::DEFAULT_DELAY)); @@ -264,7 +264,7 @@ void TelescopeConfigurationDialog::initExistingTelescopeConfiguration(int slot) { configuredSlot = slot; initConfigurationDialog(); - ui->stelWindowTitle->setText(q_("Configure Telescope")); + ui->titleBar->setTitle(q_("Configure Telescope")); // Read the telescope properties QString name; diff --git a/plugins/TelescopeControl/src/gui/TelescopeDialog.cpp b/plugins/TelescopeControl/src/gui/TelescopeDialog.cpp index 3036f75693a91..04b33d3a1a26a 100644 --- a/plugins/TelescopeControl/src/gui/TelescopeDialog.cpp +++ b/plugins/TelescopeControl/src/gui/TelescopeDialog.cpp @@ -110,8 +110,8 @@ void TelescopeDialog::createDialogContent() //Inherited connect connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); //Connect: sender, signal, receiver, method //Page: Telescopes diff --git a/plugins/TelescopeControl/src/gui/slewDialog.ui b/plugins/TelescopeControl/src/gui/slewDialog.ui index b2a31aa4d5c2c..d17fdd506aaf5 100644 --- a/plugins/TelescopeControl/src/gui/slewDialog.ui +++ b/plugins/TelescopeControl/src/gui/slewDialog.ui @@ -42,106 +42,10 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel + + + Slew telescope to - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Slew telescope to - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -489,7 +393,7 @@ margin-bottom:10px; - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/TelescopeControl/src/gui/storedPointsDialog.ui b/plugins/TelescopeControl/src/gui/storedPointsDialog.ui index 8e30bf565ff67..3d26664ffb56a 100644 --- a/plugins/TelescopeControl/src/gui/storedPointsDialog.ui +++ b/plugins/TelescopeControl/src/gui/storedPointsDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - - - - - 0 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel + + + Points - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Points - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -278,7 +182,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui b/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui index 2e2506175014d..2eadc1c38c167 100644 --- a/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui +++ b/plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui @@ -42,100 +42,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel + + + Telescope Configuration - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Telescope Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -958,7 +868,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/plugins/TelescopeControl/src/gui/telescopeDialog.ui b/plugins/TelescopeControl/src/gui/telescopeDialog.ui index 367d062b69711..b5bd59c77adcf 100644 --- a/plugins/TelescopeControl/src/gui/telescopeDialog.ui +++ b/plugins/TelescopeControl/src/gui/telescopeDialog.ui @@ -36,106 +36,10 @@ 0 - - - - 0 - 0 - - - - - 530 - 25 - - - - - 16777215 - 25 - - - - Qt::NoFocus + + + Telescopes - - false - - - QFrame::StyledPanel - - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Telescopes - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -709,7 +613,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/AddRemoveLandscapesDialog.cpp b/src/gui/AddRemoveLandscapesDialog.cpp index c67870d552515..21e28d2940ecc 100644 --- a/src/gui/AddRemoveLandscapesDialog.cpp +++ b/src/gui/AddRemoveLandscapesDialog.cpp @@ -57,8 +57,8 @@ void AddRemoveLandscapesDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->pushButtonBrowseForArchive, SIGNAL(clicked()), this, SLOT(browseForArchiveClicked())); connect(ui->listWidgetUserLandscapes, SIGNAL(currentRowChanged(int)), this, SLOT(updateSidePane(int))); diff --git a/src/gui/AstroCalcCustomStepsDialog.cpp b/src/gui/AstroCalcCustomStepsDialog.cpp index 231a9043d23d4..1b85658d629c8 100644 --- a/src/gui/AstroCalcCustomStepsDialog.cpp +++ b/src/gui/AstroCalcCustomStepsDialog.cpp @@ -52,8 +52,8 @@ void AstroCalcCustomStepsDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); ui->timeStepDoubleSpinBox->setValue(conf->value("astrocalc/custom_time_step", 1.0).toDouble()); connect(ui->timeStepDoubleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(saveTimeStep(double))); diff --git a/src/gui/AstroCalcDialog.cpp b/src/gui/AstroCalcDialog.cpp index 01c7c9ca80589..653ed0bac2bb1 100644 --- a/src/gui/AstroCalcDialog.cpp +++ b/src/gui/AstroCalcDialog.cpp @@ -222,8 +222,8 @@ void AstroCalcDialog::createDialogContent() connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(currentSkyCultureChanged(QString)), this, SLOT(populateCelestialNames(QString))); ui->stackedWidget->setCurrentIndex(0); ui->stackListWidget->setCurrentRow(0); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // prepare default background gradient for all charts. This is used for the outer frame, not the actual chart! QLinearGradient graphBackgroundGradient(QPointF(0, 0), QPointF(0, 1)); diff --git a/src/gui/AstroCalcExtraEphemerisDialog.cpp b/src/gui/AstroCalcExtraEphemerisDialog.cpp index c5cd7d096e3de..b566aca6f9212 100644 --- a/src/gui/AstroCalcExtraEphemerisDialog.cpp +++ b/src/gui/AstroCalcExtraEphemerisDialog.cpp @@ -48,8 +48,8 @@ void AstroCalcExtraEphemerisDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->skipDataCheckBox, SIGNAL(clicked()), this, SLOT(setOptionStatus())); connectBoolProperty(ui->skipDataCheckBox, "SolarSystem.ephemerisSkippedData"); diff --git a/src/gui/AtmosphereDialog.cpp b/src/gui/AtmosphereDialog.cpp index 676389fc50a59..6da3a452cd580 100644 --- a/src/gui/AtmosphereDialog.cpp +++ b/src/gui/AtmosphereDialog.cpp @@ -64,8 +64,8 @@ void AtmosphereDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectDoubleProperty(ui->pressureDoubleSpinBox,"StelSkyDrawer.atmospherePressure"); connectDoubleProperty(ui->temperatureDoubleSpinBox,"StelSkyDrawer.atmosphereTemperature"); diff --git a/src/gui/ConfigurationDialog.cpp b/src/gui/ConfigurationDialog.cpp index 734bbe00cc3b6..6f6ffd79ec458 100644 --- a/src/gui/ConfigurationDialog.cpp +++ b/src/gui/ConfigurationDialog.cpp @@ -168,8 +168,8 @@ void ConfigurationDialog::createDialogContent() connect(appGui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); } - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // Main tab #ifdef ENABLE_NLS diff --git a/src/gui/ConfigureDSOColorsDialog.cpp b/src/gui/ConfigureDSOColorsDialog.cpp index f29db67b325fe..f98d93af7dbe9 100644 --- a/src/gui/ConfigureDSOColorsDialog.cpp +++ b/src/gui/ConfigureDSOColorsDialog.cpp @@ -51,8 +51,8 @@ void ConfigureDSOColorsDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectColorButton(ui->colorDSOLabels, "NebulaMgr.labelsColor", "color/dso_label_color"); connectColorButton(ui->colorDSOMarkers, "NebulaMgr.circlesColor", "color/dso_circle_color"); diff --git a/src/gui/ConfigureOrbitColorsDialog.cpp b/src/gui/ConfigureOrbitColorsDialog.cpp index e6ebcdbe15cdd..4065da5aa1909 100644 --- a/src/gui/ConfigureOrbitColorsDialog.cpp +++ b/src/gui/ConfigureOrbitColorsDialog.cpp @@ -52,8 +52,8 @@ void ConfigureOrbitColorsDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); QString activeColorStyle = StelApp::getInstance().getModule("SolarSystem")->property("orbitColorStyle").toString(); diff --git a/src/gui/ConfigureScreenshotsDialog.cpp b/src/gui/ConfigureScreenshotsDialog.cpp index b917e7df543ad..55bd007a45394 100644 --- a/src/gui/ConfigureScreenshotsDialog.cpp +++ b/src/gui/ConfigureScreenshotsDialog.cpp @@ -49,8 +49,8 @@ void ConfigureScreenshotsDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectBoolProperty(ui->useDateTimeFileMask, "MainView.flagScreenshotDateFileName"); connectStringProperty(ui->maskLineEdit, "MainView.screenShotFileMask"); diff --git a/src/gui/CustomDeltaTEquationDialog.cpp b/src/gui/CustomDeltaTEquationDialog.cpp index ee4467a978efb..cf2a5d15853be 100644 --- a/src/gui/CustomDeltaTEquationDialog.cpp +++ b/src/gui/CustomDeltaTEquationDialog.cpp @@ -65,8 +65,8 @@ void CustomDeltaTEquationDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->lineEditNDot, SIGNAL(textEdited(const QString&)), this, SLOT(setNDot(const QString&))); connect(ui->lineEditYear, SIGNAL(textEdited(const QString&)), this, SLOT(setYear(const QString&))); @@ -123,7 +123,7 @@ void CustomDeltaTEquationDialog::setCoeffC(const QString& v) void CustomDeltaTEquationDialog::setDescription() const { - ui->stelWindowTitle->setText(q_("Custom equation for %1T").arg(QChar(0x0394))); + ui->titleBar->setTitle(q_("Custom equation for %1T").arg(QChar(0x0394))); ui->labelDescription->setText(q_("A typical equation for calculation of %1T looks like:").arg(QChar(0x0394))); ui->labelEquation->setText(QString("ΔT = a + b·u + c·u2,")); ui->labelSubEquation->setText(QString("%1 u = (%2 - y)/100").arg(q_("where"), q_("year"))); diff --git a/src/gui/DateTimeDialog.cpp b/src/gui/DateTimeDialog.cpp index fa470efaad5c6..90a3c16d8b711 100644 --- a/src/gui/DateTimeDialog.cpp +++ b/src/gui/DateTimeDialog.cpp @@ -65,8 +65,8 @@ void DateTimeDialog::createDialogContent() setDateTime(core->getJD()); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectSpinnerEvents(); diff --git a/src/gui/Dialog.cpp b/src/gui/Dialog.cpp index 695cfc876670b..728d64bb59b39 100644 --- a/src/gui/Dialog.cpp +++ b/src/gui/Dialog.cpp @@ -20,22 +20,45 @@ #include #include "Dialog.hpp" +#include #include "StelMainView.hpp" +#include "StelCloseButton.hpp" -void BarFrame::mousePressEvent(QMouseEvent *event) +TitleBar::TitleBar(QWidget* parent) + : QFrame(parent) + , label(new QLabel("unnamed window")) +{ + setFrameStyle(QFrame::StyledPanel); + + const auto layout = new QHBoxLayout(this); + + label->setObjectName("stelWindowTitle"); + label->setAlignment(Qt::AlignCenter); + label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + layout->addWidget(label); + layout->setContentsMargins(0,0,0,0); + + const auto close = new StelCloseButton; + close->setFocusPolicy(Qt::NoFocus); + layout->addWidget(close); + + connect(close, &QAbstractButton::clicked, this, &TitleBar::closeClicked); +} + +void TitleBar::mousePressEvent(QMouseEvent *event) { mousePos = event->pos(); moving = true; } -void BarFrame::mouseReleaseEvent(QMouseEvent *) +void TitleBar::mouseReleaseEvent(QMouseEvent *) { moving = false; QWidget* p = dynamic_cast(QFrame::parent()); emit movedTo(p->pos()); } -void BarFrame::mouseMoveEvent(QMouseEvent *event) +void TitleBar::mouseMoveEvent(QMouseEvent *event) { if (!moving) return; QPoint dpos = event->pos() - mousePos; diff --git a/src/gui/Dialog.hpp b/src/gui/Dialog.hpp index 521b3f237b8b7..880202b56deb4 100644 --- a/src/gui/Dialog.hpp +++ b/src/gui/Dialog.hpp @@ -23,38 +23,41 @@ #include #include +#include #include -//! \class BarFrame +//! \class TitleBar //! A title bar control used in windows derived from StelDialog. //! //! As window classes derived from StelDialog are basic QWidgets, they have no -//! title bar. A BarFrame control needs to be used in each window's design +//! title bar. A TitleBar control needs to be used in each window's design //! to allow the user to move them. //! //! Typically, the frame should contain a centered label displaying the window's //! title and a button for closing the window (connected to the //! StelDialog::close() slot). -//! -//! To use the default Stellarium style for title bars, the BarFrame object of a -//! given window should be named "TitleBar". See the normalStyle.css file for -//! the style sheet description. -class BarFrame : public QFrame + +class TitleBar : public QFrame { -Q_OBJECT + Q_OBJECT + Q_PROPERTY(QString title READ title WRITE setTitle) public: QPoint mousePos; - - BarFrame(QWidget* parent) : QFrame(parent), moving(false) {} - - virtual void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + + TitleBar(QWidget* parent = nullptr); + void setTitle(const QString& title) { label->setText(title); } + QString title() const { return label->text(); } +protected: + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; signals: + void closeClicked(); // should be connected to the StelDialog in createDialogContents() void movedTo(QPoint newPosition); protected: - bool moving; + bool moving = false; + QLabel* label; }; class ResizeFrame : public QFrame @@ -71,5 +74,4 @@ Q_OBJECT virtual void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; }; - #endif // DIALOG_HPP diff --git a/src/gui/GreatRedSpotDialog.cpp b/src/gui/GreatRedSpotDialog.cpp index 3f78e85092b8b..3d9331272f566 100644 --- a/src/gui/GreatRedSpotDialog.cpp +++ b/src/gui/GreatRedSpotDialog.cpp @@ -51,8 +51,8 @@ void GreatRedSpotDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); SolarSystem* ss = GETSTELMODULE(SolarSystem); connectIntProperty(ui->longitudeSpinBox, "SolarSystem.grsLongitude"); diff --git a/src/gui/HelpDialog.cpp b/src/gui/HelpDialog.cpp index d869149e66011..d1f2dfe043943 100644 --- a/src/gui/HelpDialog.cpp +++ b/src/gui/HelpDialog.cpp @@ -99,8 +99,8 @@ void HelpDialog::createDialogContent() connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); ui->stackedWidget->setCurrentIndex(0); ui->stackListWidget->setCurrentRow(0); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); // Kinetic scrolling kineticScrollingList << ui->helpBrowser << ui->aboutBrowser << ui->logBrowser; diff --git a/src/gui/LocationDialog.cpp b/src/gui/LocationDialog.cpp index 86ea976b0e13b..6e3944bec1c55 100644 --- a/src/gui/LocationDialog.cpp +++ b/src/gui/LocationDialog.cpp @@ -131,8 +131,8 @@ void LocationDialog::createDialogContent() this, SLOT(setLocationFromList(const QModelIndex&))); // Connect all the QT signals - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->mapWidget, SIGNAL(positionChanged(double, double, const QColor&)), this, SLOT(setLocationFromMap(double, double, const QColor&)), Qt::UniqueConnection); connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this, SLOT(addCurrentLocationToList())); diff --git a/src/gui/ObsListDialog.cpp b/src/gui/ObsListDialog.cpp index 468a4acdff1b5..dbb741a389860 100644 --- a/src/gui/ObsListDialog.cpp +++ b/src/gui/ObsListDialog.cpp @@ -107,7 +107,7 @@ void ObsListDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); // Standard mode buttons: NewList/EditList/DeleteList connect(ui->newListButton, SIGNAL(clicked()), this, SLOT( newListButtonPressed())); @@ -914,7 +914,7 @@ void ObsListDialog::newListButtonPressed() switchEditMode(true, true); ui->listNameLineEdit->setText(q_("New Observation List")); - ui->stelWindowTitle->setText(q_("Observing list creation mode")); + ui->titleBar->setTitle(q_("Observing list creation mode")); } /* * Slot for editButton @@ -927,7 +927,7 @@ void ObsListDialog::editListButtonPressed() { switchEditMode(true, false); - ui->stelWindowTitle->setText(q_("Observing list editor mode")); + ui->titleBar->setTitle(q_("Observing list editor mode")); } else { @@ -1343,7 +1343,7 @@ void ObsListDialog::switchEditMode(bool enableEditMode, bool newList) isCreationMode=newList; // The Layout classes have no setVisible(bool), we must configure individual buttons! :-( - ui->stelWindowTitle->setText(q_("Observing lists")); + ui->titleBar->setTitle(q_("Observing lists")); //ui->horizontalLayoutCombo->setEnabled(!isEditMode); // disable list selection ui->obsListComboLabel->setVisible(!isEditMode); ui->obsListComboBox->setVisible(!isEditMode); diff --git a/src/gui/ScriptConsole.cpp b/src/gui/ScriptConsole.cpp index 892edb88781c2..ec4fd7bf6ed88 100644 --- a/src/gui/ScriptConsole.cpp +++ b/src/gui/ScriptConsole.cpp @@ -105,8 +105,8 @@ void ScriptConsole::createDialogContent() connect(ui->scriptEdit, SIGNAL(cursorPositionChanged()), this, SLOT(rowColumnChanged())); connect(ui->scriptEdit, SIGNAL(textChanged()), this, SLOT(setDirty())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->loadButton, SIGNAL(clicked()), this, SLOT(loadScript())); connect(ui->saveButton, SIGNAL(clicked()), this, SLOT(saveScript())); connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clearButtonPressed())); diff --git a/src/gui/SearchDialog.cpp b/src/gui/SearchDialog.cpp index f67f9810481d2..df46a0f9071d3 100644 --- a/src/gui/SearchDialog.cpp +++ b/src/gui/SearchDialog.cpp @@ -360,8 +360,8 @@ void SearchDialog::createDialogContent() ui->setupUi(dialog); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); connect(&StelApp::getInstance(), SIGNAL(flagShowDecimalDegreesChanged(bool)), this, SLOT(populateCoordinateAxis())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connect(ui->lineEditSearchSkyObject, SIGNAL(textChanged(const QString&)), this, SLOT(onSearchTextChanged(const QString&))); connect(ui->simbadCooQueryButton, SIGNAL(clicked()), this, SLOT(lookupCoordinates())); connect(GETSTELMODULE(StelObjectMgr), SIGNAL(selectedObjectChanged(StelModule::StelModuleSelectAction)), this, SLOT(clearSimbadText(StelModule::StelModuleSelectAction))); diff --git a/src/gui/ShortcutsDialog.cpp b/src/gui/ShortcutsDialog.cpp index b931ddd2a33e9..2389e41f9c0bd 100644 --- a/src/gui/ShortcutsDialog.cpp +++ b/src/gui/ShortcutsDialog.cpp @@ -292,7 +292,7 @@ void ShortcutsDialog::switchToEditors(const QModelIndex& index) void ShortcutsDialog::createDialogContent() { ui->setupUi(dialog); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); resetModel(); filterModel->setSourceModel(mainModel); diff --git a/src/gui/SkylightDialog.cpp b/src/gui/SkylightDialog.cpp index dba1d6b4d76d8..ddb623bbdc551 100644 --- a/src/gui/SkylightDialog.cpp +++ b/src/gui/SkylightDialog.cpp @@ -42,8 +42,8 @@ void SkylightDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectBoolProperty(ui->checkBox_Schaefer, "Skylight.flagSchaefer"); diff --git a/src/gui/StelDialog.hpp b/src/gui/StelDialog.hpp index 5a7078b0db672..9393b42a15baa 100644 --- a/src/gui/StelDialog.hpp +++ b/src/gui/StelDialog.hpp @@ -53,14 +53,14 @@ class AngleSpinBox; //! The createDialogContent() function itself is called automatically the first //! time setVisible() is called with "true". //! -//! Moving a window is done by dragging its title bar, defined in the BarFrame -//! class. Every derived window class needs a BarFrame object - it +//! Moving a window is done by dragging its title bar, defined in the TitleBar +//! class. Every derived window class needs a TitleBar object - it //! has to be either included in a .ui file, or manually instantiated in //! createDialogContent(). //! //! The screen location of the StelDialog can be stored in config.ini. This requires //! setting dialogName (must be a unique name, should be set in the constructor), -//! and setting a connect() from the BarFrame's movedTo() signal to handleMovedTo() +//! and setting a connect() from the TitleBar's movedTo() signal to handleMovedTo() //! in createDialogContent(). //! If the dialog is called and the stored location is off-screen, the dialog is //! shifted to become visible. diff --git a/src/gui/TonemappingDialog.cpp b/src/gui/TonemappingDialog.cpp index cd40a7e7ccc12..66a56474ffd6d 100644 --- a/src/gui/TonemappingDialog.cpp +++ b/src/gui/TonemappingDialog.cpp @@ -52,8 +52,8 @@ void TonemappingDialog::createDialogContent() //Signals and slots connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); connectDoubleProperty(ui->dalSpinBox, "StelToneReproducer.displayAdaptationLuminance"); connectDoubleProperty(ui->dmSpinBox, "StelToneReproducer.maxDisplayLuminance"); diff --git a/src/gui/ViewDialog.cpp b/src/gui/ViewDialog.cpp index 1d919c7d9b31b..700784fbd2da3 100644 --- a/src/gui/ViewDialog.cpp +++ b/src/gui/ViewDialog.cpp @@ -151,8 +151,8 @@ void ViewDialog::createDialogContent() enableKineticScrolling(gui->getFlagUseKineticScrolling()); connect(gui, SIGNAL(flagUseKineticScrollingChanged(bool)), this, SLOT(enableKineticScrolling(bool))); } - connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); - connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); + connect(ui->titleBar, &TitleBar::closeClicked, this, &StelDialog::close); + connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint))); populateLists(); populateToolTips(); diff --git a/src/gui/addRemoveLandscapesDialog.ui b/src/gui/addRemoveLandscapesDialog.ui index 136b919faea10..aefef357d90d1 100644 --- a/src/gui/addRemoveLandscapesDialog.ui +++ b/src/gui/addRemoveLandscapesDialog.ui @@ -30,106 +30,10 @@ 0 - - - - 0 - 0 - - - - - 400 - 25 - - - - - 16777215 - 30 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel + + + Add/Remove Landscapes - - - 6 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Add/Remove Landscapes - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -358,7 +262,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/astroCalcCustomStepsDialog.ui b/src/gui/astroCalcCustomStepsDialog.ui index 1a4a1f0db951b..c97305dc1e806 100644 --- a/src/gui/astroCalcCustomStepsDialog.ui +++ b/src/gui/astroCalcCustomStepsDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Custom interval - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Custom interval - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -216,7 +125,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/astroCalcDialog.ui b/src/gui/astroCalcDialog.ui index dfc1e3e141d87..0d0b237ad7a89 100644 --- a/src/gui/astroCalcDialog.ui +++ b/src/gui/astroCalcDialog.ui @@ -27,131 +27,10 @@ 0 - - - - 16 - 25 - + + + Astronomical calculations - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 119 - 120 - 120 - - - - - - - - - 119 - 120 - 120 - - - - - - - - - 119 - 120 - 120 - - - - - - - - - - - Astronomical calculations - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -3096,7 +2975,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/astroCalcExtraEphemerisDialog.ui b/src/gui/astroCalcExtraEphemerisDialog.ui index bc3051d96cc1f..5915dd34d0c1f 100644 --- a/src/gui/astroCalcExtraEphemerisDialog.ui +++ b/src/gui/astroCalcExtraEphemerisDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Extra options - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Extra options - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -306,7 +215,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/atmosphereDialog.ui b/src/gui/atmosphereDialog.ui index 6e443f237eacd..a869eb30a905e 100644 --- a/src/gui/atmosphereDialog.ui +++ b/src/gui/atmosphereDialog.ui @@ -33,101 +33,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Atmosphere Details - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Atmosphere Details - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -520,7 +429,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/configurationDialog.ui b/src/gui/configurationDialog.ui index 76e6c95783dd9..10749fec1fe90 100644 --- a/src/gui/configurationDialog.ui +++ b/src/gui/configurationDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - + + + Configuration - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Configuration - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -2824,16 +2733,11 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 - - StelCloseButton - QPushButton -
gui/StelCloseButton.hpp
- saveSettingsAsDefaultPushButton diff --git a/src/gui/configureScreenshotsDialog.ui b/src/gui/configureScreenshotsDialog.ui index 2eaa30ee2e6e2..a09aa27f9eedd 100644 --- a/src/gui/configureScreenshotsDialog.ui +++ b/src/gui/configureScreenshotsDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Screenshots naming - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Screenshots naming - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -185,7 +94,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/customDeltaTEquationDialog.ui b/src/gui/customDeltaTEquationDialog.ui index 7dea23e3c901a..b835be7624cf3 100644 --- a/src/gui/customDeltaTEquationDialog.ui +++ b/src/gui/customDeltaTEquationDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -291,7 +200,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/dateTimeDialogGui.ui b/src/gui/dateTimeDialogGui.ui index bc228716f6803..4a76d40905b68 100644 --- a/src/gui/dateTimeDialogGui.ui +++ b/src/gui/dateTimeDialogGui.ui @@ -30,176 +30,10 @@ 0 - - - - 0 - 0 - + + + Date and Time - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - false - true - - - - Date and Time - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -706,7 +540,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/dsoColorsDialog.ui b/src/gui/dsoColorsDialog.ui index 803ab71309225..2861f4ecce9d7 100644 --- a/src/gui/dsoColorsDialog.ui +++ b/src/gui/dsoColorsDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Color settings - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Color settings - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -665,7 +574,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/greatRedSpotDialog.ui b/src/gui/greatRedSpotDialog.ui index bf42949a7ec6d..c663d17a4c5fc 100644 --- a/src/gui/greatRedSpotDialog.ui +++ b/src/gui/greatRedSpotDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Great Red Spot Details - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Great Red Spot Details - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -259,7 +168,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/helpDialogGui.ui b/src/gui/helpDialogGui.ui index 2bd114e21b04f..90e3a31517a6a 100644 --- a/src/gui/helpDialogGui.ui +++ b/src/gui/helpDialogGui.ui @@ -36,91 +36,10 @@ 0 - - - - 16 - 25 - + + + Help - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Help - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -444,7 +363,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/locationDialogGui.ui b/src/gui/locationDialogGui.ui index d8d10c7035f0f..ce1c31028016e 100644 --- a/src/gui/locationDialogGui.ui +++ b/src/gui/locationDialogGui.ui @@ -30,167 +30,10 @@ 0 - - - - 16 - 25 - + + + Location - - - 16777215 - 30 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - 194 - 194 - 195 - - - - - - - 194 - 194 - 195 - - - - - - - - - false - true - - - - Location - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -859,7 +702,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/obsListDialog.ui b/src/gui/obsListDialog.ui index 16d20b710b231..050580ab8f76a 100644 --- a/src/gui/obsListDialog.ui +++ b/src/gui/obsListDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - + + + Observing lists - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Observing lists - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -548,7 +457,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/orbitColorsDialog.ui b/src/gui/orbitColorsDialog.ui index 456594bdc4b28..ad54c641ea41c 100644 --- a/src/gui/orbitColorsDialog.ui +++ b/src/gui/orbitColorsDialog.ui @@ -24,101 +24,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Color settings - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Color settings - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -533,7 +442,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/scriptConsole.ui b/src/gui/scriptConsole.ui index b98468b224c85..a30e1af033c4a 100644 --- a/src/gui/scriptConsole.ui +++ b/src/gui/scriptConsole.ui @@ -27,107 +27,10 @@ 0 - - - - 16 - 25 - + + + Script console - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Script console - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -618,11 +521,11 @@ frame - TitleBar + titleBar - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/searchDialogGui.ui b/src/gui/searchDialogGui.ui index 29c0ec663bad3..26d3ba4a4f257 100644 --- a/src/gui/searchDialogGui.ui +++ b/src/gui/searchDialogGui.ui @@ -51,100 +51,10 @@ 0 - - - - 16 - 25 - + + + Search window - - - 16777215 - 25 - - - - Qt::NoFocus - - - false - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Search window - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -1302,7 +1212,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/shortcutsDialog.ui b/src/gui/shortcutsDialog.ui index 144335d00c5bc..0d8445d27168a 100644 --- a/src/gui/shortcutsDialog.ui +++ b/src/gui/shortcutsDialog.ui @@ -30,91 +30,10 @@ 0 - - - - 16 - 25 - + + + Keyboard Shortcuts - - - 16777215 - 25 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Keyboard Shortcuts - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - - - - @@ -283,7 +202,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 @@ -307,8 +226,8 @@ - closeStelWindow - clicked() + titleBar + closeClicked() shortcutsDialogForm close() diff --git a/src/gui/skylightDialog.ui b/src/gui/skylightDialog.ui index 751f4afa9ed6f..5d27315d1bbca 100644 --- a/src/gui/skylightDialog.ui +++ b/src/gui/skylightDialog.ui @@ -27,131 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Skylight Details - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 49 - 54 - 59 - - - - - - - - - 49 - 54 - 59 - - - - - - - - - 119 - 120 - 120 - - - - - - - - - - - Skylight Details - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -1833,7 +1712,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/tonemappingDialog.ui b/src/gui/tonemappingDialog.ui index d0da8c93e08b1..80e33b51ff86b 100644 --- a/src/gui/tonemappingDialog.ui +++ b/src/gui/tonemappingDialog.ui @@ -27,101 +27,10 @@ 0 - - - - 16 - 25 - - - - - 16777215 - 25 - - - - QFrame::StyledPanel + + + Tone Mapping Details - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - Tone Mapping Details - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - - - - - @@ -285,7 +194,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1 diff --git a/src/gui/viewDialog.ui b/src/gui/viewDialog.ui index fab0d57a10efd..6837c87470797 100644 --- a/src/gui/viewDialog.ui +++ b/src/gui/viewDialog.ui @@ -30,121 +30,10 @@ 0 - - - - 16 - 25 - + + + View - - - 16777215 - 25 - - - - - - - QFrame::StyledPanel - - - - 0 - - - 0 - - - 4 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - false - true - - - - - - - QFrame::StyledPanel - - - 0 - - - View - - - -1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 16 - 16 - - - - - 16 - 16 - - - - Qt::NoFocus - - - Qt::DefaultContextMenu - - - - - - - @@ -5590,7 +5479,7 @@ - BarFrame + TitleBar QFrame
Dialog.hpp
1