Compare commits
	
		
			1 Commits
		
	
	
		
			96a004e029
			...
			50bd5619c5
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 50bd5619c5 | 
@ -123,8 +123,8 @@ void ToolBox::refreshProperties(const Object * object)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ToolBox::refreshShaders(const Object * object)
 | 
					void ToolBox::refreshShaders(const Object * object)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  vertex_.path.setValue(object->getVertexShader().c_str());
 | 
					  vertex_.path.setItem(object->getVertexShader().c_str());
 | 
				
			||||||
  vertex_.editor->setText(object->getVertexShaderSourceCode().c_str());
 | 
					  vertex_.editor->setText(object->getVertexShaderSourceCode().c_str());
 | 
				
			||||||
  fragment_.path.setValue(object->getFragmentShader().c_str());
 | 
					  fragment_.path.setItem(object->getFragmentShader().c_str());
 | 
				
			||||||
  fragment_.editor->setText(object->getFragmentShaderSourceCode().c_str());
 | 
					  fragment_.editor->setText(object->getFragmentShaderSourceCode().c_str());
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -63,9 +63,10 @@ namespace Qtk
 | 
				
			|||||||
                  label(new QLabel(tr(l), parent)),
 | 
					                  label(new QLabel(tr(l), parent)),
 | 
				
			||||||
                  value(new QLabel(tr(v), parent))
 | 
					                  value(new QLabel(tr(v), parent))
 | 
				
			||||||
              {
 | 
					              {
 | 
				
			||||||
 | 
					                value->setText(v);
 | 
				
			||||||
              }
 | 
					              }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              void setValue(const QString & v) { value->setText(v); }
 | 
					              void setItem(const QString & v) { setItem(label->text(), v); }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              void setItem(const QString & l, const QString & v)
 | 
					              void setItem(const QString & l, const QString & v)
 | 
				
			||||||
              {
 | 
					              {
 | 
				
			||||||
@ -160,7 +161,7 @@ namespace Qtk
 | 
				
			|||||||
      class ShaderView final : QWidget
 | 
					      class ShaderView final : QWidget
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
        public:
 | 
					        public:
 | 
				
			||||||
          explicit ShaderView(QWidget * parent,
 | 
					          explicit ShaderView(QWidget * parent = nullptr,
 | 
				
			||||||
                              const char * l = "ShaderView:") :
 | 
					                              const char * l = "ShaderView:") :
 | 
				
			||||||
              layout(new QVBoxLayout(this)), path(parent, l),
 | 
					              layout(new QVBoxLayout(this)), path(parent, l),
 | 
				
			||||||
              editor(new QTextEdit(parent))
 | 
					              editor(new QTextEdit(parent))
 | 
				
			||||||
 | 
				
			|||||||
@ -251,8 +251,6 @@ namespace Qtk
 | 
				
			|||||||
      /**
 | 
					      /**
 | 
				
			||||||
       * Helper to disconnect a QObject connection, only if it's valid.
 | 
					       * Helper to disconnect a QObject connection, only if it's valid.
 | 
				
			||||||
       * If the connection is valid and we fail to disconnect log a message.
 | 
					       * If the connection is valid and we fail to disconnect log a message.
 | 
				
			||||||
       *
 | 
					 | 
				
			||||||
       * @param con QObject connection handle to disconnect.
 | 
					 | 
				
			||||||
       */
 | 
					       */
 | 
				
			||||||
      static void disconnect(const QMetaObject::Connection & con)
 | 
					      static void disconnect(const QMetaObject::Connection & con)
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user