From 59c5267e241b9c843166566e9d09637bad1d344b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 3 Oct 2016 12:22:29 +0200
Subject: [PATCH] Set up remaining widgets etc in texture viewer

---
 qrenderdoc/Windows/TextureViewer.cpp | 220 ++++++++++++++++++++++++++-
 qrenderdoc/Windows/TextureViewer.h   |  11 ++
 qrenderdoc/Windows/TextureViewer.ui  | 162 ++++++++++++++------
 3 files changed, 344 insertions(+), 49 deletions(-)

diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 884faa5cc..a503e116f 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -47,6 +47,29 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent)
   QObject::connect(ui->zoomOption->lineEdit(), &QLineEdit::returnPressed, this,
                    &TextureViewer::on_zoomOption_returnPressed);
 
+  QObject::connect(ui->depthDisplay, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->stencilDisplay, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->flip_y, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->channelRed, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->channelGreen, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->channelBlue, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->channelAlpha, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->gammaDisplay, &QToolButton::toggled, this,
+                   &TextureViewer::on_channelsWidget_toggled);
+  QObject::connect(ui->channels, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+                   &TextureViewer::on_channelsWidget_selected);
+  QObject::connect(ui->hdrMul, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+                   &TextureViewer::on_channelsWidget_selected);
+  QObject::connect(ui->customShader, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+                   &TextureViewer::on_channelsWidget_selected);
+
   ui->dockarea->addToolWindow(ui->renderContainer, ToolWindowManager::EmptySpace);
   ui->dockarea->setToolWindowProperties(renderContainer, ToolWindowManager::DisallowUserDocking |
                                                              ToolWindowManager::HideCloseButton |
@@ -136,8 +159,8 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent)
   vertical->addWidget(ui->dockarea);
 
   Ui_TextureViewer *u = ui;
-  u->pixelcontextgrid->setAlignment(u->pushButton, Qt::AlignCenter);
-  u->pixelcontextgrid->setAlignment(u->pushButton_2, Qt::AlignCenter);
+  u->pixelcontextgrid->setAlignment(u->pixelHistory, Qt::AlignCenter);
+  u->pixelcontextgrid->setAlignment(u->debugPixelContext, Qt::AlignCenter);
 
   QWidget *statusflowWidget = new QWidget(this);
 
@@ -522,6 +545,179 @@ void TextureViewer::UI_OnTextureSelectionChanged(bool newdraw)
   UI_UpdateTextureDetails();
 }
 
+void TextureViewer::UI_UpdateChannels()
+{
+  FetchTexture *tex = m_Core->GetTexture(m_TexDisplay.texid);
+
+  /*
+  if (tex != NULL && (tex.creationFlags & TextureCreationFlags.SwapBuffer) != 0)
+  {
+    // swapbuffer is always srgb for 8-bit types, linear for 16-bit types
+    gammaDisplay.Enabled = false;
+
+    if (tex.format.compByteWidth == 2 && !tex.format.special)
+      m_TexDisplay.linearDisplayAsGamma = false;
+    else
+      m_TexDisplay.linearDisplayAsGamma = true;
+  }
+  else
+  {
+    if (tex != null && !tex.format.srgbCorrected)
+      gammaDisplay.Enabled = true;
+    else
+      gammaDisplay.Enabled = false;
+
+    m_TexDisplay.linearDisplayAsGamma = !gammaDisplay.Enabled || gammaDisplay.Checked;
+  }
+
+  if (tex != null && tex.format.srgbCorrected)
+    m_TexDisplay.linearDisplayAsGamma = false;
+
+  bool dsv = false;
+  if (tex != null)
+    dsv = ((tex.creationFlags & TextureCreationFlags.DSV) != 0) || (tex.format.compType ==
+  FormatComponentType.Depth);
+
+  if (dsv &&
+    (string)channels.SelectedItem != "Custom")
+  {
+    customRed.Visible = false;
+    customGreen.Visible = false;
+    customBlue.Visible = false;
+    customAlpha.Visible = false;
+    mulLabel.Visible = false;
+    hdrMul.Visible = false;
+    customShader.Visible = false;
+    customCreate.Visible = false;
+    customEdit.Visible = false;
+    customDelete.Visible = false;
+    depthStencilToolstrip.Visible = true;
+
+    backcolorPick.Visible = false;
+    checkerBack.Visible = false;
+
+    mulSep.Visible = false;
+
+    m_TexDisplay.Red = depthDisplay.Checked;
+    m_TexDisplay.Green = stencilDisplay.Checked;
+    m_TexDisplay.Blue = false;
+    m_TexDisplay.Alpha = false;
+
+    m_TexDisplay.HDRMul = -1.0f;
+    if (m_TexDisplay.CustomShader != ResourceId.Null) { m_CurPixelValue = null; m_CurRealValue =
+  null; UI_UpdateStatusText(); }
+    m_TexDisplay.CustomShader = ResourceId.Null;
+  }
+  else if ((string)channels.SelectedItem == "RGBA" || !m_Core.LogLoaded)
+  {
+    customRed.Visible = true;
+    customGreen.Visible = true;
+    customBlue.Visible = true;
+    customAlpha.Visible = true;
+    mulLabel.Visible = false;
+    hdrMul.Visible = false;
+    customShader.Visible = false;
+    customCreate.Visible = false;
+    customEdit.Visible = false;
+    customDelete.Visible = false;
+    depthStencilToolstrip.Visible = false;
+
+    backcolorPick.Visible = true;
+    checkerBack.Visible = true;
+
+    mulSep.Visible = false;
+
+    m_TexDisplay.Red = customRed.Checked;
+    m_TexDisplay.Green = customGreen.Checked;
+    m_TexDisplay.Blue = customBlue.Checked;
+    m_TexDisplay.Alpha = customAlpha.Checked;
+
+    m_TexDisplay.HDRMul = -1.0f;
+    if (m_TexDisplay.CustomShader != ResourceId.Null) { m_CurPixelValue = null; m_CurRealValue =
+  null; UI_UpdateStatusText(); }
+    m_TexDisplay.CustomShader = ResourceId.Null;
+  }
+  else if ((string)channels.SelectedItem == "RGBM")
+  {
+    customRed.Visible = true;
+    customGreen.Visible = true;
+    customBlue.Visible = true;
+    customAlpha.Visible = false;
+    mulLabel.Visible = true;
+    hdrMul.Visible = true;
+    customShader.Visible = false;
+    customCreate.Visible = false;
+    customEdit.Visible = false;
+    customDelete.Visible = false;
+    depthStencilToolstrip.Visible = false;
+
+    backcolorPick.Visible = false;
+    checkerBack.Visible = false;
+
+    mulSep.Visible = true;
+
+    m_TexDisplay.Red = customRed.Checked;
+    m_TexDisplay.Green = customGreen.Checked;
+    m_TexDisplay.Blue = customBlue.Checked;
+    m_TexDisplay.Alpha = false;
+
+    float mul = 32.0f;
+
+    if (!float.TryParse(hdrMul.Text, out mul))
+      hdrMul.Text = mul.ToString();
+
+    m_TexDisplay.HDRMul = mul;
+    if (m_TexDisplay.CustomShader != ResourceId.Null) { m_CurPixelValue = null; m_CurRealValue =
+  null; UI_UpdateStatusText(); }
+    m_TexDisplay.CustomShader = ResourceId.Null;
+  }
+  else if ((string)channels.SelectedItem == "Custom")
+  {
+    customRed.Visible = true;
+    customGreen.Visible = true;
+    customBlue.Visible = true;
+    customAlpha.Visible = true;
+    mulLabel.Visible = false;
+    hdrMul.Visible = false;
+    customShader.Visible = true;
+    customCreate.Visible = true;
+    customEdit.Visible = true;
+    customDelete.Visible = true;
+    depthStencilToolstrip.Visible = false;
+
+    backcolorPick.Visible = false;
+    checkerBack.Visible = false;
+
+    mulSep.Visible = false;
+
+    m_TexDisplay.Red = customRed.Checked;
+    m_TexDisplay.Green = customGreen.Checked;
+    m_TexDisplay.Blue = customBlue.Checked;
+    m_TexDisplay.Alpha = customAlpha.Checked;
+
+    m_TexDisplay.HDRMul = -1.0f;
+
+    m_TexDisplay.CustomShader = ResourceId.Null;
+    if (m_CustomShaders.ContainsKey(customShader.Text.ToUpperInvariant()))
+    {
+      if (m_TexDisplay.CustomShader == ResourceId.Null) { m_CurPixelValue = null; m_CurRealValue =
+  null; UI_UpdateStatusText(); }
+      m_TexDisplay.CustomShader = m_CustomShaders[customShader.Text.ToUpperInvariant()];
+      customDelete.Enabled = customEdit.Enabled = true;
+    }
+    else
+    {
+      customDelete.Enabled = customEdit.Enabled = false;
+    }
+  }
+
+  m_TexDisplay.FlipY = ui->flip_y->isChecked();
+
+  m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { RT_UpdateAndDisplay(); });
+  // m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) { RT_UpdateVisualRange(); });
+  */
+}
+
 void TextureViewer::render_mouseWheel(QWheelEvent *e)
 {
   QPoint cursorPos = e->pos();
@@ -961,3 +1157,23 @@ void TextureViewer::on_zoomOption_returnPressed()
 {
   UI_SetScale(getCurrentZoomValue());
 }
+
+void TextureViewer::on_overlay_currentIndexChanged(int index)
+{
+}
+
+void TextureViewer::on_zoomRange_clicked()
+{
+}
+
+void TextureViewer::on_autoFit_clicked()
+{
+}
+
+void TextureViewer::on_reset01_clicked()
+{
+}
+
+void TextureViewer::on_visualiseRange_clicked()
+{
+}
diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h
index 5361c1fc1..921b2b61e 100644
--- a/qrenderdoc/Windows/TextureViewer.h
+++ b/qrenderdoc/Windows/TextureViewer.h
@@ -37,6 +37,15 @@ private slots:
   void on_zoomOption_currentIndexChanged(int index);
   void on_zoomOption_returnPressed();
 
+  void on_overlay_currentIndexChanged(int index);
+
+  void on_zoomRange_clicked();
+  void on_autoFit_clicked();
+  void on_reset01_clicked();
+  void on_visualiseRange_clicked();
+
+  void on_channelsWidget_toggled(bool checked) { UI_UpdateChannels(); }
+  void on_channelsWidget_selected(int index) { UI_UpdateChannels(); }
 private:
   void RT_FetchCurrentPixel(uint32_t x, uint32_t y, PixelValue &pickValue, PixelValue &realValue);
   void RT_PickPixelsAndUpdate();
@@ -47,6 +56,8 @@ private:
   void UI_UpdateTextureDetails();
   void UI_OnTextureSelectionChanged(bool newdraw);
 
+  void UI_UpdateChannels();
+
   void setFitToWindow(bool checked);
 
   void setCurrentZoomValue(float zoom);
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index 22a6bdd5b..a54bc7ab2 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>591</width>
+    <width>775</width>
     <height>571</height>
    </rect>
   </property>
@@ -82,14 +82,14 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLabel" name="label_5">
+     <widget class="QLabel" name="rangeLabel">
       <property name="text">
        <string>Range</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QLineEdit" name="lineEdit">
+     <widget class="QLineEdit" name="rangeBlack">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
         <horstretch>0</horstretch>
@@ -108,7 +108,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QLineEdit" name="lineEdit_2">
+     <widget class="QLineEdit" name="rangeWhite">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
         <horstretch>0</horstretch>
@@ -127,7 +127,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_16">
+     <widget class="QToolButton" name="zoomRange">
       <property name="text">
        <string/>
       </property>
@@ -141,7 +141,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_18">
+     <widget class="QToolButton" name="autoFit">
       <property name="text">
        <string/>
       </property>
@@ -155,7 +155,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_17">
+     <widget class="QToolButton" name="reset01">
       <property name="text">
        <string>...</string>
       </property>
@@ -169,7 +169,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_3">
+     <widget class="QToolButton" name="visualiseRange">
       <property name="text">
        <string>...</string>
       </property>
@@ -177,6 +177,9 @@
        <iconset resource="../resources.qrc">
         <normaloff>:/Resources/chart_curve.png</normaloff>:/Resources/chart_curve.png</iconset>
       </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
       <property name="autoRaise">
        <bool>true</bool>
       </property>
@@ -207,7 +210,7 @@
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_8">
     <property name="spacing">
-     <number>3</number>
+     <number>2</number>
     </property>
     <property name="leftMargin">
      <number>6</number>
@@ -222,14 +225,18 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLabel" name="label_4">
+     <widget class="QLabel" name="overlayLabel">
       <property name="text">
        <string>Overlay</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_4"/>
+     <widget class="QComboBox" name="overlay">
+      <property name="maxVisibleItems">
+       <number>20</number>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -256,7 +263,7 @@
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_9">
     <property name="spacing">
-     <number>3</number>
+     <number>2</number>
     </property>
     <property name="leftMargin">
      <number>6</number>
@@ -357,9 +364,9 @@
   <widget class="QFrame" name="actionToolbar">
    <property name="geometry">
     <rect>
-     <x>340</x>
+     <x>330</x>
      <y>40</y>
-     <width>101</width>
+     <width>149</width>
      <height>28</height>
     </rect>
    </property>
@@ -377,7 +384,7 @@
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_4">
     <property name="spacing">
-     <number>3</number>
+     <number>2</number>
     </property>
     <property name="leftMargin">
      <number>6</number>
@@ -392,14 +399,14 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLabel" name="label_6">
+     <widget class="QLabel" name="actionLabel">
       <property name="text">
        <string>Actions</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton">
+     <widget class="QToolButton" name="saveTex">
       <property name="text">
        <string/>
       </property>
@@ -413,7 +420,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_2">
+     <widget class="QToolButton" name="texListShow">
       <property name="text">
        <string/>
       </property>
@@ -426,6 +433,34 @@
       </property>
      </widget>
     </item>
+    <item>
+     <widget class="QToolButton" name="viewTexBuffer">
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/Resources/page_white_code.png</normaloff>:/Resources/page_white_code.png</iconset>
+      </property>
+      <property name="autoRaise">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QToolButton" name="texListShow_2">
+      <property name="text">
+       <string/>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/Resources/find.png</normaloff>:/Resources/find.png</iconset>
+      </property>
+      <property name="autoRaise">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QFrame" name="subresourceToolbar">
@@ -433,10 +468,16 @@
     <rect>
      <x>10</x>
      <y>40</y>
-     <width>304</width>
+     <width>299</width>
      <height>28</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="minimumSize">
     <size>
      <width>0</width>
@@ -451,7 +492,7 @@
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_6">
     <property name="spacing">
-     <number>3</number>
+     <number>2</number>
     </property>
     <property name="leftMargin">
      <number>6</number>
@@ -466,7 +507,7 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLabel" name="label_3">
+     <widget class="QLabel" name="subResLabel">
       <property name="text">
        <string>Subresource</string>
       </property>
@@ -480,24 +521,24 @@
      </widget>
     </item>
     <item>
-     <widget class="QLabel" name="label_8">
+     <widget class="QLabel" name="mipLabel">
       <property name="text">
        <string>Mip</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_2"/>
+     <widget class="QComboBox" name="mipLevel"/>
     </item>
     <item>
-     <widget class="QLabel" name="label_9">
+     <widget class="QLabel" name="sliceFaceLabel">
       <property name="text">
        <string>Slice/Face</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_7"/>
+     <widget class="QComboBox" name="sliceFace"/>
     </item>
    </layout>
   </widget>
@@ -506,10 +547,16 @@
     <rect>
      <x>3</x>
      <y>3</y>
-     <width>579</width>
+     <width>701</width>
      <height>28</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="minimumSize">
     <size>
      <width>0</width>
@@ -524,7 +571,7 @@
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_5">
     <property name="spacing">
-     <number>3</number>
+     <number>2</number>
     </property>
     <property name="leftMargin">
      <number>6</number>
@@ -539,28 +586,28 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLabel" name="label">
+     <widget class="QLabel" name="channelLabel">
       <property name="text">
        <string>Channels</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox">
+     <widget class="QComboBox" name="channels">
       <property name="frame">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="Line" name="line_2">
+     <widget class="Line" name="depthStencilSep">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_7">
+     <widget class="QToolButton" name="channelRed">
       <property name="text">
        <string>R</string>
       </property>
@@ -576,7 +623,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_6">
+     <widget class="QToolButton" name="channelGreen">
       <property name="text">
        <string>G</string>
       </property>
@@ -592,7 +639,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_5">
+     <widget class="QToolButton" name="channelBlue">
       <property name="text">
        <string>B</string>
       </property>
@@ -611,7 +658,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_4">
+     <widget class="QToolButton" name="channelAlpha">
       <property name="text">
        <string>A</string>
       </property>
@@ -624,21 +671,21 @@
      </widget>
     </item>
     <item>
-     <widget class="Line" name="line_3">
+     <widget class="Line" name="mulSep">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QLabel" name="label_7">
+     <widget class="QLabel" name="mulLabel">
       <property name="text">
        <string>Mul:</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_5">
+     <widget class="QComboBox" name="hdrMul">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -666,7 +713,28 @@
      </widget>
     </item>
     <item>
-     <widget class="QComboBox" name="comboBox_6">
+     <widget class="Line" name="line_2">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="depthDisplay">
+      <property name="text">
+       <string>Depth</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="stencilDisplay">
+      <property name="text">
+       <string>Stencil</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QComboBox" name="customShader">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
         <horstretch>0</horstretch>
@@ -682,7 +750,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_9">
+     <widget class="QToolButton" name="customCreate">
       <property name="text">
        <string/>
       </property>
@@ -696,7 +764,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_11">
+     <widget class="QToolButton" name="customEdit">
       <property name="text">
        <string/>
       </property>
@@ -710,7 +778,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_8">
+     <widget class="QToolButton" name="customDelete">
       <property name="text">
        <string/>
       </property>
@@ -724,7 +792,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_12">
+     <widget class="QToolButton" name="backcolorPick">
       <property name="text">
        <string/>
       </property>
@@ -741,7 +809,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_10">
+     <widget class="QToolButton" name="checkerBack">
       <property name="text">
        <string/>
       </property>
@@ -761,14 +829,14 @@
      </widget>
     </item>
     <item>
-     <widget class="Line" name="line_4">
+     <widget class="Line" name="gammaSep">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QToolButton" name="toolButton_13">
+     <widget class="QToolButton" name="gammaDisplay">
       <property name="minimumSize">
        <size>
         <width>23</width>
@@ -964,14 +1032,14 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QPushButton" name="pushButton">
+       <widget class="QPushButton" name="pixelHistory">
         <property name="text">
          <string>History</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QPushButton" name="pushButton_2">
+       <widget class="QPushButton" name="debugPixelContext">
         <property name="text">
          <string>Debug</string>
         </property>