mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-29 13:20:54 +00:00
Change OrderedListEditor to be a widget, not a dialog
This commit is contained in:
baldurk
+56
-51
@@ -23,49 +23,54 @@
|
||||
******************************************************************************/
|
||||
|
||||
#include "OrderedListEditor.h"
|
||||
#include <QHeaderView>
|
||||
#include <QKeyEvent>
|
||||
#include <QToolButton>
|
||||
#include "Code/QRDUtils.h"
|
||||
#include "Code/Resources.h"
|
||||
#include "ui_OrderedListEditor.h"
|
||||
|
||||
OrderedListEditor::OrderedListEditor(const QString &windowName, const QString &itemName,
|
||||
BrowseMode browse, QWidget *parent)
|
||||
: QDialog(parent), ui(new Ui::OrderedListEditor)
|
||||
OrderedListEditor::OrderedListEditor(const QString &itemName, BrowseMode browse, QWidget *parent)
|
||||
: RDTableWidget(parent)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->list->setFont(Formatter::PreferredFont());
|
||||
|
||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
setFont(Formatter::PreferredFont());
|
||||
|
||||
m_BrowseMode = browse;
|
||||
|
||||
setWindowTitle(windowName);
|
||||
setDragEnabled(true);
|
||||
setDragDropOverwriteMode(false);
|
||||
setDragDropMode(QAbstractItemView::InternalMove);
|
||||
setDefaultDropAction(Qt::MoveAction);
|
||||
setAlternatingRowColors(true);
|
||||
setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
setCornerButtonEnabled(false);
|
||||
|
||||
horizontalHeader()->setHighlightSections(false);
|
||||
horizontalHeader()->setMinimumSectionSize(50);
|
||||
verticalHeader()->setHighlightSections(false);
|
||||
|
||||
if(m_BrowseMode == BrowseMode::None)
|
||||
{
|
||||
ui->list->setColumnCount(1);
|
||||
ui->list->setHorizontalHeaderLabels({itemName});
|
||||
ui->list->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
setColumnCount(1);
|
||||
setHorizontalHeaderLabels({itemName});
|
||||
horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
}
|
||||
else
|
||||
{
|
||||
QStringList labels;
|
||||
labels << itemName << tr("Browse");
|
||||
ui->list->setColumnCount(2);
|
||||
ui->list->setHorizontalHeaderLabels(labels);
|
||||
setColumnCount(2);
|
||||
setHorizontalHeaderLabels(labels);
|
||||
|
||||
ui->list->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
ui->list->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
|
||||
horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
|
||||
}
|
||||
|
||||
QObject::connect(ui->list, &RDTableWidget::keyPress, this, &OrderedListEditor::list_keyPress);
|
||||
QObject::connect(this, &RDTableWidget::cellChanged, this, &OrderedListEditor::cellChanged);
|
||||
}
|
||||
|
||||
OrderedListEditor::~OrderedListEditor()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
QToolButton *OrderedListEditor::makeBrowseButton()
|
||||
@@ -75,24 +80,24 @@ QToolButton *OrderedListEditor::makeBrowseButton()
|
||||
ret->setIcon(Icons::folder_page_white());
|
||||
ret->setAutoRaise(true);
|
||||
|
||||
QObject::connect(ret, &QToolButton::clicked, this, &OrderedListEditor::browse_clicked);
|
||||
QObject::connect(ret, &QToolButton::clicked, this, &OrderedListEditor::browse);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void OrderedListEditor::setItems(const QStringList &strings)
|
||||
{
|
||||
ui->list->setUpdatesEnabled(false);
|
||||
ui->list->clearContents();
|
||||
setUpdatesEnabled(false);
|
||||
clearContents();
|
||||
|
||||
ui->list->setRowCount(strings.count());
|
||||
setRowCount(strings.count());
|
||||
|
||||
for(int i = 0; i < strings.count(); i++)
|
||||
{
|
||||
ui->list->setItem(i, 0, new QTableWidgetItem(strings[i]));
|
||||
setItem(i, 0, new QTableWidgetItem(strings[i]));
|
||||
|
||||
if(m_BrowseMode != BrowseMode::None)
|
||||
ui->list->setCellWidget(i, 1, makeBrowseButton());
|
||||
setCellWidget(i, 1, makeBrowseButton());
|
||||
}
|
||||
|
||||
// if we added any strings above the new item row was automatically
|
||||
@@ -100,28 +105,28 @@ void OrderedListEditor::setItems(const QStringList &strings)
|
||||
if(strings.count() == 0)
|
||||
addNewItemRow();
|
||||
|
||||
ui->list->resizeColumnToContents(0);
|
||||
resizeColumnToContents(0);
|
||||
if(m_BrowseMode != BrowseMode::None)
|
||||
ui->list->resizeColumnToContents(1);
|
||||
resizeColumnToContents(1);
|
||||
|
||||
ui->list->setUpdatesEnabled(true);
|
||||
setUpdatesEnabled(true);
|
||||
}
|
||||
|
||||
void OrderedListEditor::addNewItemRow()
|
||||
{
|
||||
ui->list->insertRow(ui->list->rowCount());
|
||||
insertRow(rowCount());
|
||||
|
||||
QTableWidgetItem *item = new QTableWidgetItem(QString());
|
||||
item->setFlags(item->flags() & ~(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled));
|
||||
ui->list->setItem(ui->list->rowCount() - 1, 0, item);
|
||||
setItem(rowCount() - 1, 0, item);
|
||||
|
||||
if(m_BrowseMode != BrowseMode::None)
|
||||
{
|
||||
item = new QTableWidgetItem(QString());
|
||||
item->setFlags(item->flags() & ~(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled));
|
||||
ui->list->setItem(ui->list->rowCount() - 1, 1, item);
|
||||
setItem(rowCount() - 1, 1, item);
|
||||
|
||||
ui->list->setCellWidget(ui->list->rowCount() - 1, 1, makeBrowseButton());
|
||||
setCellWidget(rowCount() - 1, 1, makeBrowseButton());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,13 +135,13 @@ QStringList OrderedListEditor::getItems()
|
||||
QStringList ret;
|
||||
|
||||
// don't include the last 'new item' entry
|
||||
for(int i = 0; i < ui->list->rowCount() - 1; i++)
|
||||
ret << ui->list->item(i, 0)->text();
|
||||
for(int i = 0; i < rowCount() - 1; i++)
|
||||
ret << item(i, 0)->text();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void OrderedListEditor::on_list_cellChanged(int row, int column)
|
||||
void OrderedListEditor::cellChanged(int row, int column)
|
||||
{
|
||||
// hack :(. Assume this will only be hit on single UI thread.
|
||||
static bool recurse = false;
|
||||
@@ -147,38 +152,36 @@ void OrderedListEditor::on_list_cellChanged(int row, int column)
|
||||
recurse = true;
|
||||
|
||||
// if the last row has something added to it, make a new final row
|
||||
if(row == ui->list->rowCount() - 1)
|
||||
if(row == rowCount() - 1)
|
||||
{
|
||||
if(!ui->list->item(row, column)->data(Qt::DisplayRole).toString().trimmed().isEmpty())
|
||||
if(!item(row, column)->data(Qt::DisplayRole).toString().trimmed().isEmpty())
|
||||
{
|
||||
// enable dragging
|
||||
ui->list->item(row, 0)->setFlags(ui->list->item(row, 0)->flags() |
|
||||
(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled));
|
||||
item(row, 0)->setFlags(item(row, 0)->flags() | (Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled));
|
||||
if(m_BrowseMode != BrowseMode::None)
|
||||
delete ui->list->takeItem(row, 1);
|
||||
delete takeItem(row, 1);
|
||||
|
||||
addNewItemRow();
|
||||
}
|
||||
}
|
||||
|
||||
if(row > 0 && column == 0 &&
|
||||
ui->list->item(row, column)->data(Qt::DisplayRole).toString().trimmed().isEmpty())
|
||||
if(row > 0 && column == 0 && item(row, column)->data(Qt::DisplayRole).toString().trimmed().isEmpty())
|
||||
{
|
||||
ui->list->removeRow(row);
|
||||
removeRow(row);
|
||||
}
|
||||
|
||||
recurse = false;
|
||||
}
|
||||
|
||||
void OrderedListEditor::browse_clicked()
|
||||
void OrderedListEditor::browse()
|
||||
{
|
||||
QWidget *tool = qobject_cast<QWidget *>(QObject::sender());
|
||||
|
||||
if(tool)
|
||||
{
|
||||
for(int i = 0; i < ui->list->rowCount(); i++)
|
||||
for(int i = 0; i < rowCount(); i++)
|
||||
{
|
||||
QWidget *rowButton = ui->list->cellWidget(i, 1);
|
||||
QWidget *rowButton = cellWidget(i, 1);
|
||||
if(rowButton == tool)
|
||||
{
|
||||
QString sel;
|
||||
@@ -188,21 +191,23 @@ void OrderedListEditor::browse_clicked()
|
||||
sel = RDDialog::getOpenFileName(this, tr("Browse for a file"));
|
||||
|
||||
if(!sel.isEmpty())
|
||||
ui->list->item(i, 0)->setText(sel);
|
||||
item(i, 0)->setText(sel);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void OrderedListEditor::list_keyPress(QKeyEvent *event)
|
||||
void OrderedListEditor::keyPressEvent(QKeyEvent *event)
|
||||
{
|
||||
if(event->key() == Qt::Key_Delete)
|
||||
{
|
||||
int row = -1;
|
||||
if(ui->list->selectionModel()->selectedIndexes().count() > 0)
|
||||
row = ui->list->selectionModel()->selectedIndexes()[0].row();
|
||||
if(selectionModel()->selectedIndexes().count() > 0)
|
||||
row = selectionModel()->selectedIndexes()[0].row();
|
||||
|
||||
if(row >= 0)
|
||||
ui->list->removeRow(row);
|
||||
removeRow(row);
|
||||
}
|
||||
|
||||
RDTableWidget::keyPress(event);
|
||||
}
|
||||
+7
-15
@@ -22,14 +22,10 @@
|
||||
* THE SOFTWARE.
|
||||
******************************************************************************/
|
||||
|
||||
#include <QDialog>
|
||||
#pragma once
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class OrderedListEditor;
|
||||
}
|
||||
#include "Widgets/Extended/RDTableWidget.h"
|
||||
|
||||
class RDTreeWidgetItem;
|
||||
class QToolButton;
|
||||
|
||||
enum class BrowseMode
|
||||
@@ -39,28 +35,24 @@ enum class BrowseMode
|
||||
File,
|
||||
};
|
||||
|
||||
class OrderedListEditor : public QDialog
|
||||
class OrderedListEditor : public RDTableWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit OrderedListEditor(const QString &windowName, const QString &itemName, BrowseMode browse,
|
||||
QWidget *parent = 0);
|
||||
explicit OrderedListEditor(const QString &itemName, BrowseMode browse, QWidget *parent = 0);
|
||||
~OrderedListEditor();
|
||||
|
||||
void setItems(const QStringList &strings);
|
||||
QStringList getItems();
|
||||
|
||||
private slots:
|
||||
// automatic slots
|
||||
void on_list_cellChanged(int row, int column);
|
||||
|
||||
// manual slots
|
||||
void browse_clicked();
|
||||
void list_keyPress(QKeyEvent *event);
|
||||
void cellChanged(int row, int column);
|
||||
void browse();
|
||||
|
||||
private:
|
||||
Ui::OrderedListEditor *ui;
|
||||
void keyPressEvent(QKeyEvent *e) override;
|
||||
|
||||
BrowseMode m_BrowseMode;
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>OrderedListEditor</class>
|
||||
<widget class="QDialog" name="OrderedListEditor">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="RDTableWidget" name="list">
|
||||
<property name="dragEnabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="dragDropOverwriteMode">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="dragDropMode">
|
||||
<enum>QAbstractItemView::InternalMove</enum>
|
||||
</property>
|
||||
<property name="defaultDropAction">
|
||||
<enum>Qt::MoveAction</enum>
|
||||
</property>
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::SingleSelection</enum>
|
||||
</property>
|
||||
<property name="selectionBehavior">
|
||||
<enum>QAbstractItemView::SelectRows</enum>
|
||||
</property>
|
||||
<property name="cornerButtonEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<attribute name="horizontalHeaderHighlightSections">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<attribute name="horizontalHeaderMinimumSectionSize">
|
||||
<number>50</number>
|
||||
</attribute>
|
||||
<attribute name="verticalHeaderHighlightSections">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>RDTableWidget</class>
|
||||
<extends>QTableWidget</extends>
|
||||
<header>Widgets/Extended/RDTableWidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>OrderedListEditor</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>199</x>
|
||||
<y>278</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>199</x>
|
||||
<y>149</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>OrderedListEditor</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>199</x>
|
||||
<y>278</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>199</x>
|
||||
<y>149</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "Code/Interface/QRDInterface.h"
|
||||
#include "Code/QRDUtils.h"
|
||||
#include "Styles/StyleData.h"
|
||||
#include "Windows/Dialogs/OrderedListEditor.h"
|
||||
#include "Widgets/OrderedListEditor.h"
|
||||
#include "CaptureDialog.h"
|
||||
#include "ui_SettingsDialog.h"
|
||||
|
||||
@@ -250,18 +250,33 @@ void SettingsDialog::on_AlwaysReplayLocally_toggled(bool checked)
|
||||
// core
|
||||
void SettingsDialog::on_chooseSearchPaths_clicked()
|
||||
{
|
||||
OrderedListEditor listEd(tr("Shader debug info search paths"), tr("Search Path"),
|
||||
BrowseMode::Folder, this);
|
||||
QDialog listEditor;
|
||||
|
||||
listEditor.setWindowTitle(tr("Shader debug info search paths"));
|
||||
listEditor.setWindowFlags(listEditor.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
|
||||
OrderedListEditor list(tr("Search Path"), BrowseMode::Folder);
|
||||
|
||||
QVBoxLayout layout;
|
||||
QDialogButtonBox okCancel;
|
||||
okCancel.setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
|
||||
layout.addWidget(&list);
|
||||
layout.addWidget(&okCancel);
|
||||
|
||||
QObject::connect(&okCancel, &QDialogButtonBox::accepted, &listEditor, &QDialog::accept);
|
||||
QObject::connect(&okCancel, &QDialogButtonBox::rejected, &listEditor, &QDialog::reject);
|
||||
|
||||
listEditor.setLayout(&layout);
|
||||
|
||||
QString setting = m_Ctx.Config().GetConfigSetting("shader.debug.searchPaths");
|
||||
|
||||
listEd.setItems(setting.split(QLatin1Char(';'), QString::SkipEmptyParts));
|
||||
list.setItems(setting.split(QLatin1Char(';'), QString::SkipEmptyParts));
|
||||
|
||||
int res = RDDialog::show(&listEd);
|
||||
int res = RDDialog::show(&listEditor);
|
||||
|
||||
if(res)
|
||||
m_Ctx.Config().SetConfigSetting(lit("shader.debug.searchPaths"),
|
||||
listEd.getItems().join(QLatin1Char(';')));
|
||||
list.getItems().join(QLatin1Char(';')));
|
||||
}
|
||||
|
||||
// texture viewer
|
||||
|
||||
@@ -211,7 +211,7 @@ SOURCES += Code/qrenderdoc.cpp \
|
||||
Windows/StatisticsViewer.cpp \
|
||||
Windows/TimelineBar.cpp \
|
||||
Windows/Dialogs/SettingsDialog.cpp \
|
||||
Windows/Dialogs/OrderedListEditor.cpp \
|
||||
Widgets/OrderedListEditor.cpp \
|
||||
Widgets/Extended/RDTableWidget.cpp \
|
||||
Windows/Dialogs/SuggestRemoteDialog.cpp \
|
||||
Windows/Dialogs/VirtualFileDialog.cpp \
|
||||
@@ -284,7 +284,7 @@ HEADERS += Code/CaptureContext.h \
|
||||
Windows/StatisticsViewer.h \
|
||||
Windows/TimelineBar.h \
|
||||
Windows/Dialogs/SettingsDialog.h \
|
||||
Windows/Dialogs/OrderedListEditor.h \
|
||||
Widgets/OrderedListEditor.h \
|
||||
Widgets/Extended/RDTableWidget.h \
|
||||
Windows/Dialogs/SuggestRemoteDialog.h \
|
||||
Windows/Dialogs/VirtualFileDialog.h \
|
||||
@@ -326,7 +326,6 @@ FORMS += Windows/Dialogs/AboutDialog.ui \
|
||||
Windows/CommentView.ui \
|
||||
Windows/StatisticsViewer.ui \
|
||||
Windows/Dialogs/SettingsDialog.ui \
|
||||
Windows/Dialogs/OrderedListEditor.ui \
|
||||
Windows/Dialogs/SuggestRemoteDialog.ui \
|
||||
Windows/Dialogs/VirtualFileDialog.ui \
|
||||
Windows/Dialogs/RemoteManager.ui \
|
||||
|
||||
@@ -687,6 +687,7 @@
|
||||
<ClCompile Include="Widgets\ResourcePreview.cpp" />
|
||||
<ClCompile Include="Widgets\TextureGoto.cpp" />
|
||||
<ClCompile Include="Widgets\ThumbnailStrip.cpp" />
|
||||
<ClCompile Include="Widgets\OrderedListEditor.cpp" />
|
||||
<ClCompile Include="Code\CaptureContext.cpp" />
|
||||
<ClCompile Include="Styles\RDStyle\RDStyle.cpp" />
|
||||
<ClCompile Include="Styles\StyleData.cpp" />
|
||||
@@ -706,7 +707,6 @@
|
||||
<ClCompile Include="Windows\Dialogs\CaptureDialog.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\LiveCapture.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\EnvironmentEditor.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\OrderedListEditor.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\PerformanceCounterSelection.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\RemoteManager.cpp" />
|
||||
<ClCompile Include="Windows\Dialogs\SettingsDialog.cpp" />
|
||||
@@ -917,7 +917,6 @@
|
||||
<ClInclude Include="$(IntDir)generated\ui_LiveCapture.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_MainWindow.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_EnvironmentEditor.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_OrderedListEditor.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_RemoteManager.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_PerformanceCounterSelection.h" />
|
||||
<ClInclude Include="$(IntDir)generated\ui_PipelineStateViewer.h" />
|
||||
@@ -1091,6 +1090,12 @@
|
||||
<Message>MOC %(Filename).h</Message>
|
||||
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Widgets\OrderedListEditor.h">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe" -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I"$(ProjectDir)." -I"$(SolutionDir)\renderdoc\api\replay" -I"$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore" "%(Fullpath)" -o "$(IntDir)generated\moc_%(Filename).cpp"</Command>
|
||||
<Message>MOC %(Filename).h</Message>
|
||||
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\APIInspector.h">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe" -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I"$(ProjectDir)." -I"$(SolutionDir)\renderdoc\api\replay" -I"$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore" "%(Fullpath)" -o "$(IntDir)generated\moc_%(Filename).cpp"</Command>
|
||||
@@ -1175,12 +1180,6 @@
|
||||
<Message>MOC %(Filename).h</Message>
|
||||
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\OrderedListEditor.h">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe" -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I"$(ProjectDir)." -I"$(SolutionDir)\renderdoc\api\replay" -I"$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore" "%(Fullpath)" -o "$(IntDir)generated\moc_%(Filename).cpp"</Command>
|
||||
<Message>MOC %(Filename).h</Message>
|
||||
<Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\RemoteManager.h">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\moc.exe" -DUNICODE -DWIN32 -DWIN64 -D_WIN32 -D_WIN64 -DRENDERDOC_PLATFORM_WIN32 -DSCINTILLA_QT=1 -DSCI_LEXER=1 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -D_MSC_VER=1900 -I"$(ProjectDir)." -I"$(SolutionDir)\renderdoc\api\replay" -I"$(ProjectDir)3rdparty\qt\$(Platform)\mkspecs/win32-msvc2015" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtWidgets" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtGui" -I"$(ProjectDir)3rdparty\qt\$(Platform)\include\QtCore" "%(Fullpath)" -o "$(IntDir)generated\moc_%(Filename).cpp"</Command>
|
||||
@@ -1428,12 +1427,6 @@
|
||||
<Message>UIC %(Filename).ui</Message>
|
||||
<Outputs>$(IntDir)generated\ui_%(Filename).h</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\OrderedListEditor.ui">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe" "%(Fullpath)" -o "$(IntDir)generated\ui_%(Filename).h"</Command>
|
||||
<Message>UIC %(Filename).ui</Message>
|
||||
<Outputs>$(IntDir)generated\ui_%(Filename).h</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\RemoteManager.ui">
|
||||
<AdditionalInputs>%(Fullpath);$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
|
||||
<Command>"$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe" "%(Fullpath)" -o "$(IntDir)generated\ui_%(Filename).h"</Command>
|
||||
|
||||
@@ -357,8 +357,8 @@
|
||||
<ClCompile Include="Windows\Dialogs\SettingsDialog.cpp">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Windows\Dialogs\OrderedListEditor.cpp">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
<ClCompile Include="Widgets\OrderedListEditor.cpp">
|
||||
<Filter>Widgets</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Widgets\Extended\RDTableWidget.cpp">
|
||||
<Filter>Widgets\Extended</Filter>
|
||||
@@ -947,9 +947,6 @@
|
||||
<ClInclude Include="$(IntDir)generated\ui_MainWindow.h">
|
||||
<Filter>Generated Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(IntDir)generated\ui_OrderedListEditor.h">
|
||||
<Filter>Generated Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(IntDir)generated\ui_PipelineStateViewer.h">
|
||||
<Filter>Generated Files</Filter>
|
||||
</ClInclude>
|
||||
@@ -1145,9 +1142,6 @@
|
||||
<CustomBuild Include="Widgets\ThumbnailStrip.ui">
|
||||
<Filter>Widgets</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\OrderedListEditor.ui">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\SettingsDialog.ui">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
</CustomBuild>
|
||||
@@ -1253,8 +1247,8 @@
|
||||
<CustomBuild Include="Windows\Dialogs\LiveCapture.h">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\Dialogs\OrderedListEditor.h">
|
||||
<Filter>Windows\Dialogs</Filter>
|
||||
<CustomBuild Include="Widgets\OrderedListEditor.h">
|
||||
<Filter>Widgets</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="Windows\PipelineState\PipelineStateViewer.h">
|
||||
<Filter>Windows\PipelineState</Filter>
|
||||
|
||||
Reference in New Issue
Block a user