Integrating latest 47acbe8
This commit is contained in:
alexpete
@@ -678,6 +678,12 @@ ColorPicker::ColorPicker(ColorPicker::Configuration configuration, const QString
|
||||
|
||||
initContextMenu(configuration);
|
||||
|
||||
// Add a settings menu button on the slider tab widget
|
||||
QAction* settingsMenuAction = new QAction(QIcon(":/stylesheet/img/UI20/menu-centered.svg"), QObject::tr("Settings"), this);
|
||||
settingsMenuAction->setMenu(m_menu);
|
||||
m_slidersTabWidget->setActionToolBarVisible();
|
||||
m_slidersTabWidget->addAction(settingsMenuAction);
|
||||
|
||||
m_undoAction = new QAction(tr("Undo"), this);
|
||||
m_undoAction->setShortcut(QKeySequence::Undo);
|
||||
m_undoAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
||||
@@ -1260,15 +1266,7 @@ void ColorPicker::paletteContextMenuRequested(QSharedPointer<PaletteCard> palett
|
||||
|
||||
void ColorPicker::quickPaletteContextMenuRequested(const QPoint& point)
|
||||
{
|
||||
QMenu menu;
|
||||
menu.addAction(m_toggleQuickPaletteAction);
|
||||
menu.addSeparator();
|
||||
menu.addAction(m_importPaletteAction);
|
||||
menu.addAction(m_newPaletteAction);
|
||||
menu.addSeparator();
|
||||
menu.addActions(m_swatchSizeGroup->actions());
|
||||
|
||||
menu.exec(point);
|
||||
m_menu->exec(point);
|
||||
}
|
||||
|
||||
QWidget* ColorPicker::makeSeparator(QWidget* parent)
|
||||
|
||||
@@ -22,7 +22,9 @@ AzQtComponents--ColorPicker *
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
AzQtComponents--ColorPicker QToolButton
|
||||
/* Only apply this to direct children QToolButton so it doesn't affect
|
||||
nested ones (e.g. action buttons in the TabWidget) */
|
||||
AzQtComponents--ColorPicker > QToolButton
|
||||
{
|
||||
border: none;
|
||||
max-width: 16px;
|
||||
|
||||
-1
@@ -32,7 +32,6 @@ PaletteCardBase::PaletteCardBase(QSharedPointer<Palette> palette, Internal::Colo
|
||||
mainLayout->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
m_header->setExpandable(true);
|
||||
m_header->setHasContextMenu(true);
|
||||
mainLayout->addWidget(m_header);
|
||||
|
||||
connect(m_paletteView, &PaletteView::selectedColorsChanged, this, [controller](const QVector<AZ::Color>& selectedColors) {
|
||||
|
||||
@@ -129,6 +129,11 @@ AzQtComponents--TabBar.Secondary::tab
|
||||
color: #959595;
|
||||
}
|
||||
|
||||
AzQtComponents--TabBar.Secondary::close-button
|
||||
{
|
||||
image: url(":/stylesheet/img/close_small.svg");
|
||||
}
|
||||
|
||||
AzQtComponents--TabBar.Secondary::tab:hover
|
||||
{
|
||||
background: rgba(255,255,255,0.15);
|
||||
|
||||
+17
-6
@@ -34,21 +34,32 @@ namespace AzQtComponents
|
||||
{
|
||||
QToolButton* actionButton;
|
||||
QActionEvent* actionEvent;
|
||||
QAction* action;
|
||||
|
||||
case QEvent::ActionAdded:
|
||||
actionEvent = static_cast<QActionEvent*>(event);
|
||||
actionButton = new QToolButton(this);
|
||||
actionButton->setIcon(actionEvent->action()->icon());
|
||||
actionButton->setToolTip(actionEvent->action()->text());
|
||||
if (!actionEvent->action()->objectName().isEmpty())
|
||||
action = actionEvent->action();
|
||||
actionButton->setIcon(action->icon());
|
||||
actionButton->setToolTip(action->text());
|
||||
if (!action->objectName().isEmpty())
|
||||
{
|
||||
actionButton->setObjectName(actionEvent->action()->objectName());
|
||||
actionButton->setObjectName(action->objectName());
|
||||
}
|
||||
|
||||
// If the action has a menu, we need to configure the QToolButton appropriately
|
||||
if (action->menu())
|
||||
{
|
||||
actionButton->setAutoRaise(true);
|
||||
actionButton->setPopupMode(QToolButton::InstantPopup);
|
||||
actionButton->setMenu(action->menu());
|
||||
}
|
||||
|
||||
// Forcing styled background to allow using background-color from QSS
|
||||
actionButton->setAttribute(Qt::WA_StyledBackground, true);
|
||||
layout()->addWidget(actionButton);
|
||||
connect(actionButton, &QToolButton::clicked, actionEvent->action(), &QAction::trigger);
|
||||
m_actionButtons[actionEvent->action()] = actionButton;
|
||||
connect(actionButton, &QToolButton::clicked, action, &QAction::trigger);
|
||||
m_actionButtons[action] = actionButton;
|
||||
emit actionsChanged();
|
||||
return true;
|
||||
case QEvent::ActionChanged:
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="12px" height="13px" viewBox="-4 -4 20 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
|
||||
<title>Icons / System / Window Controls / Close</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Tab-/-Selected-hover" transform="translate(-142.000000, -8.000000)" fill="#FFFFFF">
|
||||
<g id="tab">
|
||||
<g id="Icons-/-System-/-Window-Controls-/-Close" transform="translate(140.000000, 6.500000)">
|
||||
<path d="M13.0769231,2 L14,2.92307692 L8.923,8 L14,13.0769231 L13.0769231,14 L8,8.923 L2.92307692,14 L2,13.0769231 L7.076,8 L2,2.92307692 L2.92307692,2 L8,7.076 L13.0769231,2 Z" id="close"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 950 B |
@@ -5,6 +5,7 @@
|
||||
<file>img/WindowShadow.png</file>
|
||||
<file>img/close.svg</file>
|
||||
<file>img/close_x.svg</file>
|
||||
<file>img/close_small.svg</file>
|
||||
<file>img/lock_off.svg</file>
|
||||
<file>img/lock_on.svg</file>
|
||||
<file>img/tag_visibility_off.svg</file>
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <AzQtComponents/Components/Widgets/TabWidget.h>
|
||||
#include <QAction>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
|
||||
#include <QDebug>
|
||||
@@ -29,6 +30,15 @@ TabWidgetPage::TabWidgetPage(QWidget* parent)
|
||||
QAction* action2 = new QAction(QIcon(":/stylesheet/img/table_error.png"), "Action 2", this);
|
||||
QAction* action3 = new QAction(QIcon(":/stylesheet/img/table_error.png"), "Action 3", this);
|
||||
QAction* actionAddTab = new QAction(QIcon(QStringLiteral(":/stylesheet/img/logging/add-filter.svg")), "", this);
|
||||
QAction* actionMenu = new QAction(QIcon(":/stylesheet/img/UI20/menu-centered.svg"), "Action Menu", this);
|
||||
|
||||
// Menu for the action button, including a no-op action to show without icon as well
|
||||
QMenu * menu = new QMenu(this);
|
||||
menu->addAction(action1);
|
||||
menu->addAction(action2);
|
||||
menu->addAction(action3);
|
||||
menu->addAction("Action 4 (No-op)");
|
||||
actionMenu->setMenu(menu);
|
||||
|
||||
connect(action1, &QAction::triggered, this, [this]() {
|
||||
QMessageBox messageBox({}, "Action 1 triggered", "Action 1 has been triggered", QMessageBox::Ok);
|
||||
@@ -59,14 +69,17 @@ TabWidgetPage::TabWidgetPage(QWidget* parent)
|
||||
ui->tabWidget->addAction(action1);
|
||||
ui->tabWidget->addAction(action2);
|
||||
ui->tabWidget->addAction(action3);
|
||||
ui->tabWidget->addAction(actionMenu);
|
||||
|
||||
ui->tabWidget_2->addAction(action1);
|
||||
ui->tabWidget_2->addAction(action2);
|
||||
ui->tabWidget_2->addAction(action3);
|
||||
ui->tabWidget_2->addAction(actionMenu);
|
||||
|
||||
ui->tabWidget_3->addAction(action1);
|
||||
ui->tabWidget_3->addAction(action2);
|
||||
ui->tabWidget_3->addAction(action3);
|
||||
ui->tabWidget_3->addAction(actionMenu);
|
||||
|
||||
ui->tabWidgetBig->addAction(actionAddTab);
|
||||
|
||||
@@ -74,12 +87,14 @@ TabWidgetPage::TabWidgetPage(QWidget* parent)
|
||||
ui->tabWidgetSecondary->addAction(action1);
|
||||
ui->tabWidgetSecondary->addAction(action2);
|
||||
ui->tabWidgetSecondary->addAction(action3);
|
||||
ui->tabWidgetSecondary->addAction(actionMenu);
|
||||
|
||||
AzQtComponents::TabWidget::applySecondaryStyle(ui->tabWidgetSecondaryBorderless, false);
|
||||
connect(ui->tabWidgetSecondaryBorderless, &QTabWidget::tabCloseRequested, ui->tabWidgetSecondaryBorderless, &QTabWidget::removeTab);
|
||||
ui->tabWidgetSecondaryBorderless->addAction(action1);
|
||||
ui->tabWidgetSecondaryBorderless->addAction(action2);
|
||||
ui->tabWidgetSecondaryBorderless->addAction(action3);
|
||||
ui->tabWidgetSecondaryBorderless->addAction(actionMenu);
|
||||
|
||||
auto* removeFirstAction = new QPushButton("Remove first action");
|
||||
auto* removeLastAction = new QPushButton("Remove last action");
|
||||
@@ -245,10 +260,19 @@ connect(action3, &QAction::triggered, this, [this]() {
|
||||
messageBox.exec();
|
||||
});
|
||||
|
||||
// You can also add actions that will trigger drop-down context menus
|
||||
QAction* actionMenu = new QAction(QIcon(":/stylesheet/img/UI20/menu-centered.svg"), "Action Menu", this);
|
||||
QMenu* menu = new QMenu(this);
|
||||
menu->addAction(action1);
|
||||
menu->addAction(action2);
|
||||
menu->addAction(action3);
|
||||
actionMenu->setMenu(menu);
|
||||
|
||||
// Adding the actions to the TabWidget
|
||||
tabWidget->addAction(action1);
|
||||
tabWidget->addAction(action2);
|
||||
tabWidget->addAction(action3);
|
||||
tabWidget->addAction(actionMenu);
|
||||
|
||||
// Removing actions from the TabWidget
|
||||
tabWidget->removeAction(action1);
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>Icons / Hub / Download Copy 5</title>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Screen-1-Copy-80" transform="translate(-425.000000, -251.000000)">
|
||||
<g id="Icons-/-Hub-/-Download-Copy-5" transform="translate(424.573941, 250.098705)">
|
||||
<rect id="Icon-Background" x="0" y="0" width="16" height="16"></rect>
|
||||
<path d="M8,1.33333333 C11.6818983,1.33333333 14.6666667,4.31810167 14.6666667,8 C14.6666667,11.6818983 11.6818983,14.6666667 8,14.6666667 C4.31810167,14.6666667 1.33333333,11.6818983 1.33333333,8 C1.33333333,4.31810167 4.31810167,1.33333333 8,1.33333333 Z M12.0947571,4 L5.96649831,10.1282588 L3.60947571,7.77123617 L2.66666667,8.71404521 L5.96649831,12.0138769 L13.0375661,4.94280904 L12.0947571,4 Z" id="Combined-Shape" fill="#58BC61"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="13px" height="13px" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>Icons / Hub / Download Copy 6</title>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Screen-1-Copy-80" transform="translate(-426.000000, -223.000000)">
|
||||
<g id="Icons-/-Hub-/-Download-Copy-6" transform="translate(424.573941, 221.270476)">
|
||||
<rect id="Icon-Background" x="0" y="0" width="16" height="16"></rect>
|
||||
<polygon id="Combined-Shape" fill="#FFFFFF" transform="translate(8.000000, 6.666667) rotate(-90.000000) translate(-8.000000, -6.666667) " points="5.71883818 7.25925926 8.66666667 10.2436583 8.66666667 12 3.33333333 6.66666667 8.66666667 1.33333333 8.66666667 3.10450362 5.7037037 6.07407407 12.6666667 6.07407407 12.6666667 7.25925926"></polygon>
|
||||
<rect id="Rectangle" fill="#FFFFFF" x="2" y="12.6666667" width="12" height="1.33333333"></rect>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,6 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource prefix="/Notifications">
|
||||
<file alias="checkmark.svg">Notifications/checkmark.svg</file>
|
||||
<file alias="download.svg">Notifications/download.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
@@ -264,6 +264,7 @@ set(FILES
|
||||
Components/Widgets/ColorPicker/Swatch.cpp
|
||||
Components/Widgets/ColorPicker/ColorWarning.h
|
||||
Components/Widgets/ColorPicker/ColorWarning.cpp
|
||||
Images/resources.qrc
|
||||
Utilities/AutoSettingsGroup.h
|
||||
Utilities/ColorUtilities.cpp
|
||||
Utilities/ColorUtilities.h
|
||||
|
||||
Reference in New Issue
Block a user