Add thumbnail strip placeholders

This commit is contained in:
baldurk
2015-07-10 17:54:07 +02:00
parent 87f085d588
commit 45c9bfbc37
2 changed files with 152 additions and 9 deletions
+29 -5
View File
@@ -21,6 +21,7 @@ m_Core(core)
m_Core->AddLogViewer(this);
ui->render->SetOutput(NULL);
ui->pixelContext->SetOutput(NULL);
m_Output = NULL;
QWidget *renderContainer = ui->renderContainer;
@@ -55,19 +56,38 @@ m_Core(core)
ui->dockarea->addToolWindow(lockedTabTest, ref);
ui->dockarea->setToolWindowProperties(lockedTabTest, ToolWindowManager::DisallowUserDocking | ToolWindowManager::HideCloseButton);
ui->dockarea->addToolWindow(ui->resourceThumbs, ToolWindowManager::AreaReference(ToolWindowManager::RightOf, ui->dockarea->areaOf(renderContainer)));
ui->dockarea->setToolWindowProperties(ui->resourceThumbs, ToolWindowManager::HideCloseButton);
ui->dockarea->addToolWindow(ui->targetThumbs, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->dockarea->areaOf(ui->resourceThumbs)));
ui->dockarea->setToolWindowProperties(ui->targetThumbs, ToolWindowManager::HideCloseButton);
// need to add a way to make this less than 50% programmatically
ui->dockarea->addToolWindow(ui->pixelContextLayout, ToolWindowManager::AreaReference(ToolWindowManager::BottomOf, ui->dockarea->areaOf(ui->targetThumbs)));
ui->dockarea->setToolWindowProperties(ui->pixelContextLayout, ToolWindowManager::HideCloseButton);
ui->dockarea->setAllowFloatingWindow(false);
ui->dockarea->setRubberBandLineWidth(50);
renderContainer->setWindowTitle(tr("OM RenderTarget 0 - GBuffer Colour"));
ui->pixelContextLayout->setWindowTitle(tr("Pixel Context"));
ui->targetThumbs->setWindowTitle(tr("OM Targets"));
ui->resourceThumbs->setWindowTitle(tr("PS Resources"));
QVBoxLayout *vertical = new QVBoxLayout(this);
vertical->setSpacing(3);
vertical->setContentsMargins(0, 0, 0, 0);
FlowLayout *flow1 = new FlowLayout(this);
FlowLayout *flow2 = new FlowLayout(this);
QWidget *flow1widget = new QWidget(this);
QWidget *flow2widget = new QWidget(this);
FlowLayout *flow1 = new FlowLayout(flow1widget, 0, 3, 3);
FlowLayout *flow2 = new FlowLayout(flow2widget, 0, 3, 3);
flow1widget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
flow2widget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
flow1->addWidget(ui->channelsToolbar);
flow1->addWidget(ui->subresourceToolbar);
@@ -77,9 +97,13 @@ m_Core(core)
flow2->addWidget(ui->overlayToolbar);
flow2->addWidget(ui->rangeToolbar);
vertical->addItem(flow1);
vertical->addItem(flow2);
vertical->addWidget(flow1widget);
vertical->addWidget(flow2widget);
vertical->addWidget(ui->dockarea);
Ui_TextureViewer *u = ui;
u->pixelcontextgrid->setAlignment(u->pushButton, Qt::AlignCenter);
u->pixelcontextgrid->setAlignment(u->pushButton_2, Qt::AlignCenter);
}
TextureViewer::~TextureViewer()
+123 -4
View File
@@ -22,12 +22,18 @@
<widget class="ToolWindowManager" name="dockarea" native="true">
<property name="geometry">
<rect>
<x>30</x>
<y>430</y>
<x>50</x>
<y>460</y>
<width>119</width>
<height>100</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
@@ -756,8 +762,8 @@
<widget class="QWidget" name="renderContainer" native="true">
<property name="geometry">
<rect>
<x>240</x>
<y>280</y>
<x>290</x>
<y>190</y>
<width>291</width>
<height>241</height>
</rect>
@@ -892,6 +898,119 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pixelContextLayout" native="true">
<property name="geometry">
<rect>
<x>40</x>
<y>240</y>
<width>201</width>
<height>181</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="pixelcontextgrid">
<item row="0" column="0" colspan="2">
<widget class="CustomPaintWidget" name="pixelContext" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>History</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Debug</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QScrollArea" name="resourceThumbs">
<property name="geometry">
<rect>
<x>430</x>
<y>460</y>
<width>120</width>
<height>80</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>118</width>
<height>78</height>
</rect>
</property>
</widget>
</widget>
<widget class="QScrollArea" name="targetThumbs">
<property name="geometry">
<rect>
<x>290</x>
<y>460</y>
<width>120</width>
<height>80</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>118</width>
<height>78</height>
</rect>
</property>
</widget>
</widget>
</widget>
<customwidgets>
<customwidget>