diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp index 5eb86506e..9e2057772 100644 --- a/qrenderdoc/Code/CaptureContext.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -59,7 +59,7 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32 qApp->setApplicationVersion(RENDERDOC_GetVersionString()); m_Icon = new QIcon(); - m_Icon->addFile(QStringLiteral(":/Resources/icon.ico"), QSize(), QIcon::Normal, QIcon::Off); + m_Icon->addFile(QStringLiteral(":/icon.ico"), QSize(), QIcon::Normal, QIcon::Off); m_MainWindow = new MainWindow(this); m_MainWindow->show(); diff --git a/qrenderdoc/Resources/resources.qrc b/qrenderdoc/Resources/resources.qrc new file mode 100644 index 000000000..7815e72c3 --- /dev/null +++ b/qrenderdoc/Resources/resources.qrc @@ -0,0 +1,69 @@ + + + 128.png + accept.png + add.png + arrow_in.png + arrow_join.png + arrow_undo.png + asterisk_orange.png + back.png + chart_curve.png + cog.png + cog_go.png + color_wheel.png + connect.png + cross.png + crosshatch.png + delete.png + disconnect.png + down_arrow.png + find.png + fit_window.png + flag_green.png + flip_y.png + folder_page.png + forward.png + glsl.xml + hlsl.xml + hourglass.png + house.png + icon.ico + information.png + new_window.png + page_white_code.png + page_white_database.png + page_white_delete.png + page_white_edit.png + page_white_link.png + plugin_add.png + red_x_16.png + runback.png + runcursor.png + runfwd.png + save.png + stepnext.png + stepprev.png + tick.png + time.png + timeline_marker.png + up_arrow.png + upfolder.png + wand.png + wireframe_mesh.png + wrench.png + zoom.png + topologies/topo_linelist.png + topologies/topo_linelist_adj.png + topologies/topo_linestrip.png + topologies/topo_linestrip_adj.png + topologies/topo_patch.png + topologies/topo_pointlist.png + topologies/topo_trilist.png + topologies/topo_trilist_adj.png + topologies/topo_tristrip.png + topologies/topo_tristrip_adj.png + action.png + action_hover.png + + diff --git a/qrenderdoc/Windows/BufferViewer.ui b/qrenderdoc/Windows/BufferViewer.ui index 366472b7e..0cf42aa53 100644 --- a/qrenderdoc/Windows/BufferViewer.ui +++ b/qrenderdoc/Windows/BufferViewer.ui @@ -173,8 +173,8 @@ true - - :/Resources/cog.png:/Resources/cog.png + + :/cog.png:/cog.png true @@ -196,8 +196,8 @@ - - :/Resources/arrow_undo.png:/Resources/arrow_undo.png + + :/arrow_undo.png:/arrow_undo.png true @@ -213,8 +213,8 @@ - - :/Resources/wand.png:/Resources/wand.png + + :/wand.png:/wand.png true @@ -294,8 +294,8 @@ Highlight Vertices - - :/Resources/asterisk_orange.png:/Resources/asterisk_orange.png + + :/asterisk_orange.png:/asterisk_orange.png true @@ -622,8 +622,8 @@ true - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png false @@ -648,8 +648,8 @@ Sync Views - - :/Resources/arrow_join.png:/Resources/arrow_join.png + + :/arrow_join.png:/arrow_join.png true @@ -784,7 +784,7 @@ - + diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.ui b/qrenderdoc/Windows/ConstantBufferPreviewer.ui index 4f31faa86..0cdca33d1 100644 --- a/qrenderdoc/Windows/ConstantBufferPreviewer.ui +++ b/qrenderdoc/Windows/ConstantBufferPreviewer.ui @@ -153,8 +153,8 @@ - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png true @@ -236,7 +236,7 @@ - + diff --git a/qrenderdoc/Windows/Dialogs/AboutDialog.ui b/qrenderdoc/Windows/Dialogs/AboutDialog.ui index b87fb73ff..0da9be07e 100644 --- a/qrenderdoc/Windows/Dialogs/AboutDialog.ui +++ b/qrenderdoc/Windows/Dialogs/AboutDialog.ui @@ -23,7 +23,7 @@ - :/Resources/128.png + :/128.png @@ -87,7 +87,7 @@ - + diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui index 6a69c971e..c3343780f 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui @@ -322,8 +322,8 @@ Click here to set up Vulkan capture. - - :/Resources/information.png:/Resources/information.png + + :/information.png:/information.png QToolButton::DelayedPopup @@ -728,7 +728,7 @@ Click here to set up Vulkan capture. - + diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp index 0255a3993..f7256f48f 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp @@ -74,7 +74,7 @@ LiveCapture::LiveCapture(CaptureContext *ctx, const QString &hostname, uint32_t setTitle(tr("Connecting..")); ui->connectionStatus->setText(tr("Connecting..")); - ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/hourglass.png"))); + ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/hourglass.png"))); { QToolBar *bottomTools = new QToolBar(this); @@ -932,7 +932,7 @@ void LiveCapture::connectionThreadEntry() GUIInvoke::call([this]() { setTitle("Connection failed"); ui->connectionStatus->setText(tr("Connection failed")); - ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/delete.png"))); + ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/delete.png"))); connectionClosed(); }); @@ -959,7 +959,7 @@ void LiveCapture::connectionThreadEntry() tr("Connection established to %1 [PID %2] (%3)").arg(target).arg(pid).arg(api)); setTitle(QString("%1 [PID %2]").arg(target).arg(pid)); } - ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/connect.png"))); + ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/connect.png"))); }); while(m_Connection && m_Connection->Connected()) @@ -1021,7 +1021,7 @@ void LiveCapture::connectionThreadEntry() tr("Connection established to %1 [PID %2] (%3)").arg(target).arg(pid).arg(api)); setTitle(QString("%1 [PID %2]").arg(target).arg(pid)); } - ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/connect.png"))); + ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/connect.png"))); }); } @@ -1068,7 +1068,7 @@ void LiveCapture::connectionThreadEntry() GUIInvoke::call([this]() { ui->connectionStatus->setText(tr("Connection closed")); - ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/disconnect.png"))); + ui->connectionIcon->setPixmap(QPixmap(QString::fromUtf8(":/disconnect.png"))); ui->numFrames->setEnabled(false); ui->captureDelay->setEnabled(false); diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.ui b/qrenderdoc/Windows/Dialogs/LiveCapture.ui index 4d04fa85d..67b8a84f6 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.ui +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.ui @@ -59,7 +59,7 @@ - :/Resources/hourglass.png + :/hourglass.png @@ -416,7 +416,7 @@ - + diff --git a/qrenderdoc/Windows/Dialogs/OrderedListEditor.cpp b/qrenderdoc/Windows/Dialogs/OrderedListEditor.cpp index c58a6142d..3d3c6a2b7 100644 --- a/qrenderdoc/Windows/Dialogs/OrderedListEditor.cpp +++ b/qrenderdoc/Windows/Dialogs/OrderedListEditor.cpp @@ -67,7 +67,7 @@ QToolButton *OrderedListEditor::makeBrowseButton() { QToolButton *ret = new QToolButton(this); - ret->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/folder_page.png")))); + ret->setIcon(QIcon(QPixmap(QString::fromUtf8(":/folder_page.png")))); ret->setAutoRaise(true); QObject::connect(ret, &QToolButton::clicked, this, &OrderedListEditor::browse_clicked); diff --git a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp index 1254139e6..17573b331 100644 --- a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp @@ -67,7 +67,7 @@ void SuggestRemoteDialog::remotesAdded() tr("the capture locally?")); ui->remote->setEnabled(true); - ui->remote->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/down_arrow.png")))); + ui->remote->setIcon(QIcon(QPixmap(QString::fromUtf8(":/down_arrow.png")))); ui->remote->setText("Remote"); } diff --git a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui index 524d5567a..2d0d66693 100644 --- a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui +++ b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui @@ -126,8 +126,8 @@ always replay locally. Remote - - :/Resources/down_arrow.png:/Resources/down_arrow.png + + :/down_arrow.png:/down_arrow.png @@ -151,7 +151,7 @@ always replay locally. - + diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp index fd866769b..4fba3e5ec 100644 --- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp @@ -50,9 +50,9 @@ public: RemoteFileModel(RenderManager *r, QObject *parent = NULL) : Renderer(*r), QAbstractItemModel(parent) { - makeIconStates(fileIcon, QString::fromUtf8(":/Resources/page_white_database.png")); - makeIconStates(exeIcon, QString::fromUtf8(":/Resources/page_white_code.png")); - makeIconStates(dirIcon, QString::fromUtf8(":/Resources/folder_page.png")); + makeIconStates(fileIcon, QString::fromUtf8(":/page_white_database.png")); + makeIconStates(exeIcon, QString::fromUtf8(":/page_white_code.png")); + makeIconStates(dirIcon, QString::fromUtf8(":/folder_page.png")); Renderer.GetHomeFolder(true, [this](const char *path, const rdctype::array &files) { QString homeDir = QString::fromUtf8(path); diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui index 4d14205ca..ec4e871bb 100644 --- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui +++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui @@ -22,8 +22,8 @@ ... - - :/Resources/back.png:/Resources/back.png + + :/back.png:/back.png @@ -42,8 +42,8 @@ ... - - :/Resources/forward.png:/Resources/forward.png + + :/forward.png:/forward.png @@ -69,8 +69,8 @@ ... - - :/Resources/upfolder.png:/Resources/upfolder.png + + :/upfolder.png:/upfolder.png @@ -249,7 +249,7 @@ - + diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index 504823468..25e47c859 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -77,11 +77,9 @@ EventBrowser::EventBrowser(CaptureContext *ctx, QWidget *parent) ui->findStrip->hide(); ui->bookmarkStrip->hide(); - m_CurrentIcon.addFile(QStringLiteral(":/Resources/flag_green.png"), QSize(), QIcon::Normal, - QIcon::Off); - m_FindIcon.addFile(QStringLiteral(":/Resources/find.png"), QSize(), QIcon::Normal, QIcon::Off); - m_BookmarkIcon.addFile(QStringLiteral(":/Resources/asterisk_orange.png"), QSize(), QIcon::Normal, - QIcon::Off); + m_CurrentIcon.addFile(QStringLiteral(":/flag_green.png"), QSize(), QIcon::Normal, QIcon::Off); + m_FindIcon.addFile(QStringLiteral(":/find.png"), QSize(), QIcon::Normal, QIcon::Off); + m_BookmarkIcon.addFile(QStringLiteral(":/asterisk_orange.png"), QSize(), QIcon::Normal, QIcon::Off); } EventBrowser::~EventBrowser() diff --git a/qrenderdoc/Windows/EventBrowser.ui b/qrenderdoc/Windows/EventBrowser.ui index 4029d9dd1..c68cefcd4 100644 --- a/qrenderdoc/Windows/EventBrowser.ui +++ b/qrenderdoc/Windows/EventBrowser.ui @@ -75,8 +75,8 @@ - - :/Resources/find.png:/Resources/find.png + + :/find.png:/find.png false @@ -95,8 +95,8 @@ - - :/Resources/flag_green.png:/Resources/flag_green.png + + :/flag_green.png:/flag_green.png true @@ -109,8 +109,8 @@ - - :/Resources/time.png:/Resources/time.png + + :/time.png:/time.png true @@ -123,8 +123,8 @@ - - :/Resources/asterisk_orange.png:/Resources/asterisk_orange.png + + :/asterisk_orange.png:/asterisk_orange.png true @@ -170,7 +170,7 @@ - :/Resources/flag_green.png + :/flag_green.png @@ -254,8 +254,8 @@ - - :/Resources/cross.png:/Resources/cross.png + + :/cross.png:/cross.png Esc @@ -292,7 +292,7 @@ - :/Resources/find.png + :/find.png @@ -367,8 +367,8 @@ - - :/Resources/cross.png:/Resources/cross.png + + :/cross.png:/cross.png Esc @@ -384,8 +384,8 @@ - - :/Resources/stepnext.png:/Resources/stepnext.png + + :/stepnext.png:/stepnext.png true @@ -398,8 +398,8 @@ - - :/Resources/stepprev.png:/Resources/stepprev.png + + :/stepprev.png:/stepprev.png true @@ -433,7 +433,7 @@ - :/Resources/asterisk_orange.png + :/asterisk_orange.png @@ -553,7 +553,7 @@ - + diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index 78f645d6d..92f0cd6c5 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -108,7 +108,7 @@ MainWindow::MainWindow(CaptureContext *ctx) : QMainWindow(NULL), ui(new Ui::Main contextChooser = new QToolButton(this); contextChooser->setText(tr("Replay Context: %1").arg("Local")); - contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/house.png")))); + contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/house.png")))); contextChooser->setAutoRaise(true); contextChooser->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); contextChooser->setPopupMode(QToolButton::InstantPopup); @@ -830,7 +830,7 @@ void MainWindow::setLogHasErrors(bool errors) QString filename = QFileInfo(m_Ctx->LogFilename()).fileName(); if(errors) { - QPixmap icon(QString::fromUtf8(":/Resources/delete.png")); + QPixmap icon(QString::fromUtf8(":/delete.png")); QPixmap empty(icon.width(), icon.height()); empty.fill(Qt::transparent); statusIcon->setPixmap(m_messageAlternate ? empty : icon); @@ -846,7 +846,7 @@ void MainWindow::setLogHasErrors(bool errors) } else { - statusIcon->setPixmap(QPixmap(QString::fromUtf8(":/Resources/tick.png"))); + statusIcon->setPixmap(QPixmap(QString::fromUtf8(":/tick.png"))); statusText->setText(tr("%1 loaded. No problems detected.").arg(filename)); } } @@ -898,7 +898,7 @@ void MainWindow::messageCheck() } if(m_Ctx->Renderer()->remote() && !m_Ctx->Renderer()->remote()->ServerRunning) - contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/cross.png")))); + contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/cross.png")))); if(!msgs.empty()) { @@ -923,7 +923,7 @@ void MainWindow::messageCheck() GUIInvoke::call([this]() { if(m_Ctx->Renderer()->remote() && !m_Ctx->Renderer()->remote()->ServerRunning) { - contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/cross.png")))); + contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/cross.png")))); contextChooser->setText(tr("Replay Context: %1").arg("Local")); statusText->setText( tr("Remote server disconnected. To attempt to reconnect please select it again.")); @@ -938,8 +938,8 @@ void MainWindow::FillRemotesMenu(QMenu *menu, bool includeLocalhost) { menu->clear(); - QIcon tick(QPixmap(QString::fromUtf8(":/Resources/tick.png"))); - QIcon cross(QPixmap(QString::fromUtf8(":/Resources/cross.png"))); + QIcon tick(QPixmap(QString::fromUtf8(":/tick.png"))); + QIcon cross(QPixmap(QString::fromUtf8(":/cross.png"))); for(int i = 0; i < m_Ctx->Config.RemoteHosts.count(); i++) { @@ -977,7 +977,7 @@ void MainWindow::FillRemotesMenu(QMenu *menu, bool includeLocalhost) QAction *localContext = new QAction(menu); localContext->setText("Local"); - localContext->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/house.png")))); + localContext->setIcon(QIcon(QPixmap(QString::fromUtf8(":/house.png")))); QObject::connect(localContext, &QAction::triggered, this, &MainWindow::switchContext); localContext->setData(-1); @@ -1037,7 +1037,7 @@ void MainWindow::switchContext() if(!host) { - contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/house.png")))); + contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/house.png")))); contextChooser->setText(tr("Replay Context: %1").arg("Local")); ui->action_Inject_into_Process->setEnabled(true); @@ -1050,8 +1050,8 @@ void MainWindow::switchContext() { contextChooser->setText(tr("Replay Context: %1").arg(host->Hostname)); contextChooser->setIcon(host->ServerRunning - ? QIcon(QPixmap(QString::fromUtf8(":/Resources/connect.png"))) - : QIcon(QPixmap(QString::fromUtf8(":/Resources/disconnect.png")))); + ? QIcon(QPixmap(QString::fromUtf8(":/connect.png"))) + : QIcon(QPixmap(QString::fromUtf8(":/disconnect.png")))); // disable until checking is done contextChooser->setEnabled(false); @@ -1084,14 +1084,13 @@ void MainWindow::switchContext() } GUIInvoke::call([this, host, status]() { - contextChooser->setIcon( - host->ServerRunning && !host->Busy - ? QIcon(QPixmap(QString::fromUtf8(":/Resources/connect.png"))) - : QIcon(QPixmap(QString::fromUtf8(":/Resources/disconnect.png")))); + contextChooser->setIcon(host->ServerRunning && !host->Busy + ? QIcon(QPixmap(QString::fromUtf8(":/connect.png"))) + : QIcon(QPixmap(QString::fromUtf8(":/disconnect.png")))); if(status != eReplayCreate_Success) { - contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/Resources/cross.png")))); + contextChooser->setIcon(QIcon(QPixmap(QString::fromUtf8(":/cross.png")))); contextChooser->setText(tr("Replay Context: %1").arg("Local")); statusText->setText(tr("Connection failed: %1").arg(ToQStr(status))); } diff --git a/qrenderdoc/Windows/MainWindow.ui b/qrenderdoc/Windows/MainWindow.ui index 38ba74f5e..b90b989b8 100644 --- a/qrenderdoc/Windows/MainWindow.ui +++ b/qrenderdoc/Windows/MainWindow.ui @@ -14,8 +14,8 @@ QRenderDoc - - :/Resources/icon.ico:/Resources/icon.ico + + :/icon.ico:/icon.ico @@ -405,7 +405,7 @@ - + diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index f88ebedb4..ebe6d8f3d 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -503,8 +503,8 @@ void D3D11PipelineStateViewer::setViewDetails(QTreeWidgetItem *node, const ViewT void D3D11PipelineStateViewer::addResourceRow(const ViewTag &view, const ShaderResource *shaderInput, RDTreeWidget *resources) { - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); const D3D11PipelineState::ShaderStage::ResourceView &r = view.res; @@ -722,8 +722,8 @@ void D3D11PipelineStateViewer::clearState() ui->csUAVs->clear(); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); ui->fillMode->setText(tr("Solid", "Fill Mode")); ui->cullMode->setText(tr("Front", "Cull Mode")); @@ -771,8 +771,8 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11PipelineState::ShaderSt { ShaderReflection *shaderDetails = stage.ShaderDetails; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); if(stage.Shader == ResourceId()) shader->setText(tr("Unbound Shader")); @@ -1026,11 +1026,11 @@ void D3D11PipelineStateViewer::setState() const D3D11PipelineState &state = m_Ctx->CurD3D11PipelineState; const FetchDrawcall *draw = m_Ctx->CurDrawcall(); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); //////////////////////////////////////////////// // Vertex Input @@ -1210,44 +1210,38 @@ void D3D11PipelineStateViewer::setState() switch(topo) { case eTopology_PointList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_pointlist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_pointlist.png"))); break; case eTopology_LineList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linelist.png"))); break; case eTopology_LineStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linestrip.png"))); break; case eTopology_TriangleList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_trilist.png"))); break; case eTopology_TriangleStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_tristrip.png"))); break; case eTopology_LineList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linelist_adj.png"))); break; case eTopology_LineStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linestrip_adj.png"))); break; case eTopology_TriangleList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_trilist_adj.png"))); break; case eTopology_TriangleStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_tristrip_adj.png"))); break; default: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_patch.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_patch.png"))); break; } diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui index 4958a7ed3..fdd6ed710 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui @@ -73,8 +73,8 @@ Show Disabled Items - - :/Resources/page_white_delete.png:/Resources/page_white_delete.png + + :/page_white_delete.png:/page_white_delete.png true @@ -93,8 +93,8 @@ Show Empty Items - - :/Resources/page_white_database.png:/Resources/page_white_database.png + + :/page_white_database.png:/page_white_database.png true @@ -113,8 +113,8 @@ Export - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png false @@ -422,7 +422,7 @@ - :/Resources/topologies/topo_trilist.png + :/topologies/topo_trilist.png Qt::AlignCenter @@ -450,8 +450,8 @@ - - :/Resources/wireframe_mesh.png:/Resources/wireframe_mesh.png + + :/wireframe_mesh.png:/wireframe_mesh.png @@ -524,8 +524,8 @@ padding: 0px; - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -641,8 +641,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -661,8 +661,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -681,8 +681,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1114,8 +1114,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1134,8 +1134,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1154,8 +1154,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1587,8 +1587,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1607,8 +1607,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1627,8 +1627,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2060,8 +2060,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -2080,8 +2080,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -2100,8 +2100,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2703,7 +2703,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2739,7 +2739,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2803,7 +2803,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2963,7 +2963,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2979,7 +2979,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3005,7 +3005,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3197,8 +3197,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -3217,8 +3217,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -3237,8 +3237,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -3666,7 +3666,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3692,7 +3692,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3934,7 +3934,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3963,7 +3963,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4143,7 +4143,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4411,8 +4411,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -4431,8 +4431,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -4451,8 +4451,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -4506,8 +4506,8 @@ padding: 0px; - - :/Resources/wrench.png:/Resources/wrench.png + + :/wrench.png:/wrench.png true @@ -4979,7 +4979,7 @@ padding: 0px; - + diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 8e30df78f..e2cfa17df 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -564,8 +564,8 @@ void D3D12PipelineStateViewer::addResourceRow(const ViewTag &view, const D3D12PipelineState::ShaderStage *stage, RDTreeWidget *resources) { - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); const D3D12PipelineState::ResourceView &r = view.res; bool uav = view.type == ViewTag::UAV; @@ -815,8 +815,8 @@ void D3D12PipelineStateViewer::clearState() clearShaderState(ui->psShader, ui->psResources, ui->psSamplers, ui->psCBuffers, ui->psUAVs); clearShaderState(ui->csShader, ui->csResources, ui->csSamplers, ui->csCBuffers, ui->csUAVs); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); ui->fillMode->setText(tr("Solid", "Fill Mode")); ui->cullMode->setText(tr("Front", "Cull Mode")); @@ -864,8 +864,8 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12PipelineState::ShaderSt ShaderReflection *shaderDetails = stage.ShaderDetails; const D3D12PipelineState &state = m_Ctx->CurD3D12PipelineState; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); if(stage.Shader == ResourceId()) shader->setText(tr("Unbound Shader")); @@ -1162,11 +1162,11 @@ void D3D12PipelineStateViewer::setState() const D3D12PipelineState &state = m_Ctx->CurD3D12PipelineState; const FetchDrawcall *draw = m_Ctx->CurDrawcall(); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); //////////////////////////////////////////////// // Vertex Input @@ -1251,44 +1251,38 @@ void D3D12PipelineStateViewer::setState() switch(topo) { case eTopology_PointList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_pointlist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_pointlist.png"))); break; case eTopology_LineList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linelist.png"))); break; case eTopology_LineStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linestrip.png"))); break; case eTopology_TriangleList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_trilist.png"))); break; case eTopology_TriangleStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_tristrip.png"))); break; case eTopology_LineList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linelist_adj.png"))); break; case eTopology_LineStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linestrip_adj.png"))); break; case eTopology_TriangleList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_trilist_adj.png"))); break; case eTopology_TriangleStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_tristrip_adj.png"))); break; default: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_patch.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_patch.png"))); break; } diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui index fb2436708..8c43bb7c0 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui @@ -73,8 +73,8 @@ Show Disabled Items - - :/Resources/page_white_delete.png:/Resources/page_white_delete.png + + :/page_white_delete.png:/page_white_delete.png true @@ -93,8 +93,8 @@ Show Empty Items - - :/Resources/page_white_database.png:/Resources/page_white_database.png + + :/page_white_database.png:/page_white_database.png true @@ -113,8 +113,8 @@ Export - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png false @@ -422,7 +422,7 @@ - :/Resources/topologies/topo_trilist.png + :/topologies/topo_trilist.png Qt::AlignCenter @@ -465,8 +465,8 @@ - - :/Resources/wireframe_mesh.png:/Resources/wireframe_mesh.png + + :/wireframe_mesh.png:/wireframe_mesh.png @@ -558,8 +558,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -578,8 +578,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -598,8 +598,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1101,8 +1101,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1121,8 +1121,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1141,8 +1141,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1644,8 +1644,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1664,8 +1664,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1684,8 +1684,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2187,8 +2187,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -2207,8 +2207,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -2227,8 +2227,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2938,7 +2938,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2964,7 +2964,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3102,7 +3102,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3128,7 +3128,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3154,7 +3154,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3396,8 +3396,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -3416,8 +3416,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -3436,8 +3436,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -3935,7 +3935,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3961,7 +3961,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4157,7 +4157,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4186,7 +4186,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4384,7 +4384,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4652,8 +4652,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -4672,8 +4672,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -4692,8 +4692,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -4747,8 +4747,8 @@ padding: 0px; - - :/Resources/wrench.png:/Resources/wrench.png + + :/wrench.png:/wrench.png true @@ -5190,7 +5190,7 @@ padding: 0px; - + diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index d9585fe70..659d7cf2c 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -459,8 +459,8 @@ void GLPipelineStateViewer::clearState() clearShaderState(ui->csShader, ui->csTextures, ui->csSamplers, ui->csUBOs, ui->csSubroutines, ui->csReadWrite); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); ui->fillMode->setText(tr("Solid", "Fill Mode")); ui->cullMode->setText(tr("Front", "Cull Mode")); @@ -520,8 +520,8 @@ void GLPipelineStateViewer::setShaderState(const GLPipelineState::ShaderStage &s const ShaderBindpointMapping &mapping = stage.BindpointMapping; const GLPipelineState &state = m_Ctx->CurGLPipelineState; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); if(stage.Shader == ResourceId()) { @@ -1031,11 +1031,11 @@ void GLPipelineStateViewer::setState() bool showDisabled = ui->showDisabled->isChecked(); bool showEmpty = ui->showEmpty->isChecked(); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); bool usedBindings[128] = {}; @@ -1132,44 +1132,38 @@ void GLPipelineStateViewer::setState() switch(topo) { case eTopology_PointList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_pointlist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_pointlist.png"))); break; case eTopology_LineList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linelist.png"))); break; case eTopology_LineStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linestrip.png"))); break; case eTopology_TriangleList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_trilist.png"))); break; case eTopology_TriangleStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_tristrip.png"))); break; case eTopology_LineList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linelist_adj.png"))); break; case eTopology_LineStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linestrip_adj.png"))); break; case eTopology_TriangleList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_trilist_adj.png"))); break; case eTopology_TriangleStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_tristrip_adj.png"))); break; default: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_patch.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_patch.png"))); break; } diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui index e0da3f239..6a425af29 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui @@ -73,8 +73,8 @@ Show Disabled Items - - :/Resources/page_white_delete.png:/Resources/page_white_delete.png + + :/page_white_delete.png:/page_white_delete.png true @@ -93,8 +93,8 @@ Show Empty Items - - :/Resources/page_white_database.png:/Resources/page_white_database.png + + :/page_white_database.png:/page_white_database.png true @@ -113,8 +113,8 @@ Export - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png false @@ -390,8 +390,8 @@ - - :/Resources/wireframe_mesh.png:/Resources/wireframe_mesh.png + + :/wireframe_mesh.png:/wireframe_mesh.png @@ -452,7 +452,7 @@ - :/Resources/topologies/topo_trilist.png + :/topologies/topo_trilist.png Qt::AlignCenter @@ -553,8 +553,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -573,8 +573,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -593,8 +593,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1121,8 +1121,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1141,8 +1141,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1161,8 +1161,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1689,8 +1689,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1709,8 +1709,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1729,8 +1729,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2257,8 +2257,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -2277,8 +2277,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -2297,8 +2297,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -2633,7 +2633,7 @@ padding: 0px; - :/Resources/tick.png + :/tick.png Qt::AlignCenter @@ -3058,7 +3058,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3246,7 +3246,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3318,7 +3318,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3372,7 +3372,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3595,7 +3595,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3621,7 +3621,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3675,7 +3675,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3737,7 +3737,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3836,8 +3836,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -3856,8 +3856,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -3876,8 +3876,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -4682,7 +4682,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4708,7 +4708,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4734,7 +4734,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -4979,8 +4979,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -4999,8 +4999,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -5019,8 +5019,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -5490,7 +5490,7 @@ padding: 0px; - + diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index ea38901b9..ba3b82b16 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -518,7 +518,7 @@ void VulkanPipelineStateViewer::clearState() clearShaderState(ui->fsShader, ui->fsResources, ui->fsUBOs); clearShaderState(ui->csShader, ui->csResources, ui->csUBOs); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); ui->fillMode->setText(tr("Solid", "Fill Mode")); ui->cullMode->setText(tr("Front", "Cull Mode")); @@ -652,8 +652,8 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails, const ShaderResource *shaderRes = NULL; const BindpointMap *bindMap = NULL; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); bool isrw = false; uint bindPoint = 0; @@ -1032,8 +1032,8 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta const ConstantBlock *cblock = NULL; const BindpointMap *bindMap = NULL; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); uint32_t slot = ~0U; if(shaderDetails != NULL) @@ -1210,8 +1210,8 @@ void VulkanPipelineStateViewer::setShaderState(const VulkanPipelineState::Shader { ShaderReflection *shaderDetails = stage.ShaderDetails; - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); if(stage.Shader == ResourceId()) shader->setText(tr("Unbound Shader")); @@ -1418,11 +1418,11 @@ void VulkanPipelineStateViewer::setState() bool showDisabled = ui->showDisabled->isChecked(); bool showEmpty = ui->showEmpty->isChecked(); - QPixmap tick(QString::fromUtf8(":/Resources/tick.png")); - QPixmap cross(QString::fromUtf8(":/Resources/cross.png")); + QPixmap tick(QString::fromUtf8(":/tick.png")); + QPixmap cross(QString::fromUtf8(":/cross.png")); - QIcon action(QPixmap(QString::fromUtf8(":/Resources/action.png"))); - QIcon action_hover(QPixmap(QString::fromUtf8(":/Resources/action_hover.png"))); + QIcon action(QPixmap(QString::fromUtf8(":/action.png"))); + QIcon action_hover(QPixmap(QString::fromUtf8(":/action_hover.png"))); bool usedBindings[128] = {}; @@ -1498,44 +1498,38 @@ void VulkanPipelineStateViewer::setState() switch(topo) { case eTopology_PointList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_pointlist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_pointlist.png"))); break; case eTopology_LineList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linelist.png"))); break; case eTopology_LineStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_linestrip.png"))); break; case eTopology_TriangleList: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_trilist.png"))); break; case eTopology_TriangleStrip: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_tristrip.png"))); break; case eTopology_LineList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linelist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linelist_adj.png"))); break; case eTopology_LineStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_linestrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_linestrip_adj.png"))); break; case eTopology_TriangleList_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_trilist_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_trilist_adj.png"))); break; case eTopology_TriangleStrip_Adj: ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_tristrip_adj.png"))); + QPixmap(QString::fromUtf8(":/topologies/topo_tristrip_adj.png"))); break; default: - ui->topologyDiagram->setPixmap( - QPixmap(QString::fromUtf8(":/Resources/topologies/topo_patch.png"))); + ui->topologyDiagram->setPixmap(QPixmap(QString::fromUtf8(":/topologies/topo_patch.png"))); break; } diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui index 7208ce807..eaab4d450 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui @@ -73,8 +73,8 @@ Show Disabled Items - - :/Resources/page_white_delete.png:/Resources/page_white_delete.png + + :/page_white_delete.png:/page_white_delete.png true @@ -93,8 +93,8 @@ Show Empty Items - - :/Resources/page_white_database.png:/Resources/page_white_database.png + + :/page_white_database.png:/page_white_database.png true @@ -113,8 +113,8 @@ Export - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png false @@ -390,8 +390,8 @@ - - :/Resources/wireframe_mesh.png:/Resources/wireframe_mesh.png + + :/wireframe_mesh.png:/wireframe_mesh.png @@ -452,7 +452,7 @@ - :/Resources/topologies/topo_trilist.png + :/topologies/topo_trilist.png Qt::AlignCenter @@ -553,8 +553,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -573,8 +573,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -593,8 +593,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -881,8 +881,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -901,8 +901,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -921,8 +921,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1209,8 +1209,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1229,8 +1229,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1249,8 +1249,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1537,8 +1537,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -1557,8 +1557,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -1577,8 +1577,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -1901,7 +1901,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -1993,7 +1993,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2029,7 +2029,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2423,7 +2423,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -2528,8 +2528,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -2548,8 +2548,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -2568,8 +2568,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -3116,7 +3116,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3172,7 +3172,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3198,7 +3198,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3224,7 +3224,7 @@ padding: 0px; - :/Resources/cross.png + :/cross.png Qt::AlignCenter @@ -3469,8 +3469,8 @@ padding: 0px; View - - :/Resources/action.png:/Resources/action.png + + :/action.png:/action.png Qt::ToolButtonTextBesideIcon @@ -3489,8 +3489,8 @@ padding: 0px; Edit - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png Qt::ToolButtonTextBesideIcon @@ -3509,8 +3509,8 @@ padding: 0px; Save - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png Qt::ToolButtonTextBesideIcon @@ -3740,7 +3740,7 @@ padding: 0px; - + diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index bc72599da..f34821d6b 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -401,9 +401,8 @@ public: if(role == Qt::DecorationRole) { QIcon goArrow; - goArrow.addFile(QStringLiteral(":/Resources/action.png"), QSize(), QIcon::Normal, QIcon::Off); - goArrow.addFile(QStringLiteral(":/Resources/action_hover.png"), QSize(), QIcon::Active, - QIcon::Off); + goArrow.addFile(QStringLiteral(":/action.png"), QSize(), QIcon::Normal, QIcon::Off); + goArrow.addFile(QStringLiteral(":/action_hover.png"), QSize(), QIcon::Active, QIcon::Off); return QVariant(goArrow); } } @@ -1513,7 +1512,7 @@ void TextureViewer::SetupTextureTabs() ToolWindowManagerArea *textureTabs = ui->dockarea->areaOf(ui->renderContainer); QIcon tabIcon; - tabIcon.addFile(QStringLiteral(":/Resources/icon.ico"), QSize(), QIcon::Normal, QIcon::Off); + tabIcon.addFile(QStringLiteral(":/icon.ico"), QSize(), QIcon::Normal, QIcon::Off); textureTabs->setTabIcon(0, tabIcon); @@ -1682,8 +1681,7 @@ void TextureViewer::ViewTexture(ResourceId ID, bool focus) lockedContainer->setLayout(ui->renderLayout); QIcon lockedIcon; - lockedIcon.addFile(QStringLiteral(":/Resources/page_white_link.png"), QSize(), QIcon::Normal, - QIcon::Off); + lockedIcon.addFile(QStringLiteral(":/page_white_link.png"), QSize(), QIcon::Normal, QIcon::Off); int idx = textureTabs->indexOf(lockedContainer); @@ -1784,7 +1782,7 @@ void TextureViewer::OpenResourceContextMenu(ResourceId id, const rdctype::array< QAction imageLayout(this); QIcon goArrow; - goArrow.addFile(QStringLiteral(":/Resources/action_hover.png"), QSize(), QIcon::Normal, QIcon::Off); + goArrow.addFile(QStringLiteral(":/action_hover.png"), QSize(), QIcon::Normal, QIcon::Off); openLockedTab.setIcon(goArrow); showDisabled.setChecked(m_ShowDisabled); diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui index 4693c0a48..a3d71bd58 100644 --- a/qrenderdoc/Windows/TextureViewer.ui +++ b/qrenderdoc/Windows/TextureViewer.ui @@ -142,8 +142,8 @@ - - :/Resources/zoom.png:/Resources/zoom.png + + :/zoom.png:/zoom.png true @@ -162,8 +162,8 @@ - - :/Resources/wand.png:/Resources/wand.png + + :/wand.png:/wand.png true @@ -182,8 +182,8 @@ ... - - :/Resources/arrow_undo.png:/Resources/arrow_undo.png + + :/arrow_undo.png:/arrow_undo.png true @@ -202,8 +202,8 @@ ... - - :/Resources/chart_curve.png:/Resources/chart_curve.png + + :/chart_curve.png:/chart_curve.png true @@ -343,8 +343,8 @@ Fit - - :/Resources/fit_window.png:/Resources/fit_window.png + + :/fit_window.png:/fit_window.png true @@ -382,8 +382,8 @@ - - :/Resources/flip_y.png:/Resources/flip_y.png + + :/flip_y.png:/flip_y.png true @@ -445,8 +445,8 @@ - - :/Resources/save.png:/Resources/save.png + + :/save.png:/save.png true @@ -459,8 +459,8 @@ - - :/Resources/page_white_link.png:/Resources/page_white_link.png + + :/page_white_link.png:/page_white_link.png true @@ -473,8 +473,8 @@ - - :/Resources/page_white_code.png:/Resources/page_white_code.png + + :/page_white_code.png:/page_white_code.png true @@ -487,8 +487,8 @@ - - :/Resources/find.png:/Resources/find.png + + :/find.png:/find.png true @@ -800,8 +800,8 @@ - - :/Resources/add.png:/Resources/add.png + + :/add.png:/add.png true @@ -814,8 +814,8 @@ - - :/Resources/page_white_edit.png:/Resources/page_white_edit.png + + :/page_white_edit.png:/page_white_edit.png true @@ -828,8 +828,8 @@ - - :/Resources/delete.png:/Resources/delete.png + + :/delete.png:/delete.png true @@ -842,8 +842,8 @@ - - :/Resources/color_wheel.png:/Resources/color_wheel.png + + :/color_wheel.png:/color_wheel.png true @@ -859,8 +859,8 @@ - - :/Resources/crosshatch.png:/Resources/crosshatch.png + + :/crosshatch.png:/crosshatch.png true @@ -1160,8 +1160,8 @@ - - :/Resources/cross.png:/Resources/cross.png + + :/cross.png:/cross.png true @@ -1236,7 +1236,7 @@ - + diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index 52271d556..61a6b1cb8 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -211,7 +211,7 @@ FORMS += Windows/Dialogs/AboutDialog.ui \ Windows/Dialogs/SuggestRemoteDialog.ui \ Windows/Dialogs/VirtualFileDialog.ui -RESOURCES += resources.qrc +RESOURCES += Resources/resources.qrc # Add ToolWindowManager diff --git a/qrenderdoc/resources.qrc b/qrenderdoc/resources.qrc deleted file mode 100644 index 557f934df..000000000 --- a/qrenderdoc/resources.qrc +++ /dev/null @@ -1,69 +0,0 @@ - - - Resources/128.png - Resources/accept.png - Resources/add.png - Resources/arrow_in.png - Resources/arrow_join.png - Resources/arrow_undo.png - Resources/asterisk_orange.png - Resources/back.png - Resources/chart_curve.png - Resources/cog.png - Resources/cog_go.png - Resources/color_wheel.png - Resources/connect.png - Resources/cross.png - Resources/crosshatch.png - Resources/delete.png - Resources/disconnect.png - Resources/down_arrow.png - Resources/find.png - Resources/fit_window.png - Resources/flag_green.png - Resources/flip_y.png - Resources/folder_page.png - Resources/forward.png - Resources/glsl.xml - Resources/hlsl.xml - Resources/hourglass.png - Resources/house.png - Resources/icon.ico - Resources/information.png - Resources/new_window.png - Resources/page_white_code.png - Resources/page_white_database.png - Resources/page_white_delete.png - Resources/page_white_edit.png - Resources/page_white_link.png - Resources/plugin_add.png - Resources/red_x_16.png - Resources/runback.png - Resources/runcursor.png - Resources/runfwd.png - Resources/save.png - Resources/stepnext.png - Resources/stepprev.png - Resources/tick.png - Resources/time.png - Resources/timeline_marker.png - Resources/up_arrow.png - Resources/upfolder.png - Resources/wand.png - Resources/wireframe_mesh.png - Resources/wrench.png - Resources/zoom.png - Resources/topologies/topo_linelist.png - Resources/topologies/topo_linelist_adj.png - Resources/topologies/topo_linestrip.png - Resources/topologies/topo_linestrip_adj.png - Resources/topologies/topo_patch.png - Resources/topologies/topo_pointlist.png - Resources/topologies/topo_trilist.png - Resources/topologies/topo_trilist_adj.png - Resources/topologies/topo_tristrip.png - Resources/topologies/topo_tristrip_adj.png - Resources/action.png - Resources/action_hover.png - -