[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/viewplugins/glsl
From:       Tom Burdick <tburdi1 () uic ! edu>
Date:       2007-08-28 2:51:01
Message-ID: 1188269461.683660.18655.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 705489 by tburdick:

fixed up the dialog box

 M  +5 -4      dlg_glsl.cc  
 M  +39 -11    wdg_glsl.ui  


--- trunk/koffice/krita/plugins/viewplugins/glsl/dlg_glsl.cc #705488:705489
@@ -73,12 +73,13 @@
     m_d->scrollArea = new QScrollArea;
     m_d->scrollArea->setBackgroundRole(QPalette::Dark);
 
-    vbox->addWidget( m_d->scrollArea );
-    m_d->page->grpPreview->setLayout( vbox );
 
-    m_d->glslview = new KisGlslWidget(m_d->view->activeLayer()->paintDevice(), \
m_d->scrollArea); +
+    m_d->glslview = new KisGlslWidget(m_d->view->activeLayer()->paintDevice());
     m_d->glslview->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-    m_d->scrollArea->setWidget(m_d->glslview);
+    //m_d->scrollArea->setWidget(m_d->glslview);
+    vbox->addWidget( m_d->glslview);
+    m_d->page->grpPreview->setLayout( vbox );
     
     if(!m_d->glslview->isValidGLSL()) {
         close();
--- trunk/koffice/krita/plugins/viewplugins/glsl/wdg_glsl.ui #705488:705489
@@ -87,7 +87,20 @@
         <number>6</number>
        </property>
        <item row="0" column="0" >
-        <widget class="QTextEdit" name="fragmentText" />
+        <widget class="KTextEdit" name="fragmentText" >
+         <property name="html" >
+          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" \
/>&lt;style type="text/css"> +p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; \
font-weight:400; font-style:normal;"> +&lt;p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">#extension GL_ARB_texture_rectangle : enable&lt;/p> +&lt;p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p> +&lt;p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">uniform sampler2DRect image;&lt;/p> +&lt;p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p> +&lt;p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">void main() {&lt;/p> +&lt;p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">    gl_FragColor = texture2DRect(image, \
gl_TexCoord[0].st);&lt;/p> +&lt;p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">}&lt;/p>&lt;/body>&lt;/html></string> +         </property>
+        </widget>
        </item>
       </layout>
      </widget>
@@ -95,16 +108,24 @@
       <attribute name="title" >
        <string>&amp;Vertex Shader</string>
       </attribute>
-      <widget class="QTextEdit" name="vertexText" >
-       <property name="geometry" >
-        <rect>
-         <x>9</x>
-         <y>9</y>
-         <width>487</width>
-         <height>310</height>
-        </rect>
-       </property>
-      </widget>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="KTextEdit" name="vertexText" >
+         <property name="autoFormatting" >
+          <set>QTextEdit::AutoNone</set>
+         </property>
+         <property name="html" >
+          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" \
/>&lt;style type="text/css"> +p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; \
font-weight:400; font-style:normal;"> +&lt;p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">void main() {&lt;/p> +&lt;p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">    gl_TexCoord[0] = gl_MultiTexCoord0;&lt;/p> +&lt;p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">    gl_Position = ftransform();&lt;/p> +&lt;p \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">}&lt;/p>&lt;/body>&lt;/html></string> +         \
</property> +        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
@@ -221,6 +242,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header>ktextedit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>


[prev in list] [next in list] [prev in thread] [next in thread]