ui: Fixes for source group ui
* added final icons * fixed inconsistent names on copy * fixed files list for cdb groups not updated
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 578 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 832 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 518 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
@@ -221,10 +221,15 @@ QCheckBox:disabled {
|
||||
color: black;
|
||||
}
|
||||
|
||||
#project_menu QListWidget::item:disabled, #project_menu #general_button:disabled {
|
||||
background: white;
|
||||
color: gray;
|
||||
}
|
||||
|
||||
#project_menu #action_button {
|
||||
background: white;
|
||||
border: none;
|
||||
color: white;
|
||||
margin: 5px;
|
||||
margin: 5px 5px 3px;
|
||||
padding: 1px;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ void QtIconButton::setColor(QColor color)
|
||||
|
||||
void QtIconButton::enterEvent(QEvent *event)
|
||||
{
|
||||
if (m_hoveredIconPath.size())
|
||||
if (m_hoveredIconPath.size() && isEnabled())
|
||||
{
|
||||
setIconFromPath(m_hoveredIconPath);
|
||||
}
|
||||
|
||||
@@ -152,16 +152,16 @@ void QtProjectWizzard::populateWindow(QWidget* widget)
|
||||
buttonsLayout->setSpacing(0);
|
||||
|
||||
QPushButton* addButton = new QtIconButton(
|
||||
(ResourcePaths::getGuiPath().str() + "window/plus.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/plus_hover.png").c_str());
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_add.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_add_hover.png").c_str());
|
||||
|
||||
m_removeButton = new QtIconButton(
|
||||
(ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str());
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_delete.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_delete_hover.png").c_str());
|
||||
|
||||
m_duplicateButton = new QtIconButton(
|
||||
(ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str());
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_copy.png").c_str(),
|
||||
(ResourcePaths::getGuiPath().str() + "window/source_group_copy_hover.png").c_str());
|
||||
|
||||
addButton->setIconSize(QSize(20, 20));
|
||||
m_removeButton->setIconSize(QSize(20, 20));
|
||||
@@ -182,11 +182,8 @@ void QtProjectWizzard::populateWindow(QWidget* widget)
|
||||
connect(m_removeButton, SIGNAL(clicked()), this, SLOT(removeSelectedSourceGroup()));
|
||||
connect(m_duplicateButton, SIGNAL(clicked()), this, SLOT(duplicateSelectedSourceGroup()));
|
||||
|
||||
buttonsLayout->addStretch();
|
||||
buttonsLayout->addWidget(addButton);
|
||||
buttonsLayout->addStretch();
|
||||
buttonsLayout->addWidget(m_removeButton);
|
||||
buttonsLayout->addStretch();
|
||||
buttonsLayout->addWidget(m_duplicateButton);
|
||||
buttonsLayout->addStretch();
|
||||
|
||||
@@ -523,7 +520,7 @@ void QtProjectWizzard::removeSelectedSourceGroup()
|
||||
|
||||
void QtProjectWizzard::duplicateSelectedSourceGroup()
|
||||
{
|
||||
if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0)
|
||||
if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0 || !canExitContent())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -134,7 +134,6 @@ void QtProjectWizzardContent::filesButtonClicked()
|
||||
std::thread([&](){
|
||||
std::vector<std::string> fileNames = getFileNames();
|
||||
m_showFilesFunctor(fileNames);
|
||||
|
||||
}).detach();
|
||||
}
|
||||
|
||||
|
||||
@@ -79,6 +79,8 @@ void QtProjectWizzardContentCDBSource::load()
|
||||
|
||||
std::vector<std::string> QtProjectWizzardContentCDBSource::getFileNames() const
|
||||
{
|
||||
const_cast<QtProjectWizzardContentCDBSource*>(this)->load();
|
||||
|
||||
return m_fileNames;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user