colorvalue can be setu up, slot for titlewidget

svn path=/branches/KDE4/; revision=1931

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ab47485cf225e503e332a0cb1e52fc8ebc6821b..5a5000a6761155c4ced528de5b4b771a07084987 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/constval_ui.ui
   widgets/listval_ui.ui
   widgets/boolval_ui.ui
+  widgets/colorval_ui.ui
 )
  
 set(kdenlive_SRCS 

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 483d4a87742eafc50a70f1d88d78fe9199604127..1d36e385e6874b4ee60cea9f3493afb0547d2c41 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -27,6 +27,7 @@
 #include "ui_constval_ui.h"
 #include "ui_listval_ui.h"
 #include "ui_boolval_ui.h"
+#include "ui_colorval_ui.h"
 #include "complexparameter.h"
 
 EffectStackEdit::EffectStackEdit(QFrame* frame,QWidget *parent): QObject(parent)
@@ -128,6 +129,17 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d,int ,int){
                        pl->setupParam(d,0,100);
                        vbox->addWidget(pl);
                        items.append(pl);
+               }else if (type=="color"){
+                       Ui::Colorval_UI *cval=new Ui::Colorval_UI;
+                       cval->setupUi(toFillin);
+                       bool ok;
+                       cval->kcolorbutton->setColor (value.toUInt(&ok,16));
+                       kDebug() << value.toUInt(&ok,16);
+                       
+                       connect (cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT (collectAllParameters()));
+                       cval->label->setText(na.toElement().text() );
+                       valueItems[paramName]=cval;
+                       uiItems.append(cval);
                }else{
                        delete toFillin;
                        toFillin=NULL;
@@ -140,6 +152,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d,int ,int){
        }
 }
 void EffectStackEdit::collectAllParameters(){
+       kDebug() << "cklicked";
        QDomNodeList namenode = params.elementsByTagName("parameter");
 
        for (int i=0;i< namenode.count() ;i++){
@@ -150,14 +163,18 @@ void EffectStackEdit::collectAllParameters(){
                if (type=="double" || type=="constant"){
                        QSlider* slider=((Ui::Constval_UI*)valueItems[na.toElement().text()])->horizontalSlider;
                        setValue=QString::number(slider->value());
-               }
+               }else 
                if (type=="list"){
                        KComboBox *box=((Ui::Listval_UI*)valueItems[na.toElement().text()])->list;
                        setValue=box->currentText();
-               }
+               }else 
                if (type=="bool"){
                        QCheckBox *box=((Ui::Boolval_UI*)valueItems[na.toElement().text()])->checkBox;
                        setValue=box->checkState() == Qt::Checked ? "1" :"0" ;
+               }else
+               if (type=="color"){
+                       KColorButton *color=((Ui::Colorval_UI*)valueItems[na.toElement().text()])->kcolorbutton;
+                       setValue.sprintf("0x%08x",color->color().rgba());
                }
                if (!setValue.isEmpty()){
                        pa.attributes().namedItem("value").setNodeValue(setValue);

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 2c0938d2556f8ffcc3096474a129ca81ab454c41..c641dc5c4567cb624c6434362a9783370a145754 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -76,11 +76,11 @@ void MyThread::init(KUrl url, QString target, double frame, double frameLength,
                Mlt::Producer m_producer(prof, m_url.path().toAscii().data());
                
 
-               /*TODO if (KdenliveSettings::normaliseaudiothumbs()) {*/
+               /*TODO if (KdenliveSettings::normaliseaudiothumbs()) {
                    Mlt::Filter m_convert(prof,"volume");
                    m_convert.set("gain", "normalise");
                    m_producer.attach(m_convert);
-               //}
+               }
 
                /*TODO if (qApp->mainWidget()) 
                    QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(-1, 10005));

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index e4a11250d18febe8db6c1599034942cbd8f3b96f..0fd598b089df0c7a87770ec3f329f16ebb3506b8 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -42,6 +42,7 @@
 #include "ui_colorclip_ui.h"
 
 #include "definitions.h"
+#include "titlewidget.h"
 
 #include <QtGui>
 
@@ -70,6 +71,9 @@ ProjectList::ProjectList(QWidget *parent)
 
   QAction *addColorClip = addMenu->addAction (KIcon("document-new"), i18n("Add Color Clip"));
   connect(addColorClip, SIGNAL(triggered()), this, SLOT(slotAddColorClip()));
+       
+       QAction *addTitleClip = addMenu->addAction (KIcon("document-new"), i18n("Add Title Clip"));
+       connect(addTitleClip, SIGNAL(triggered()), this, SLOT(slotAddTitleClip()));
 
   m_deleteAction = m_toolbar->addAction (KIcon("edit-delete"), i18n("Delete Clip"));
   connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(slotRemoveClip()));
@@ -97,6 +101,7 @@ ProjectList::ProjectList(QWidget *parent)
   m_menu = new QMenu();        
   m_menu->addAction(addClipButton);
   m_menu->addAction(addColorClip);
+  m_menu->addAction(addTitleClip);
   m_menu->addAction(m_editAction);
   m_menu->addAction(m_deleteAction);
   m_menu->addAction(addFolderButton);
@@ -336,6 +341,26 @@ void ProjectList::slotAddColorClip()
   delete dia;
 }
 
+void ProjectList::slotAddTitleClip()
+{
+#if 0
+       if (!m_commandStack) kDebug()<<"!!!!!!!!!!!!!!!!  NO CMD STK";
+       //QDialog *dia = new QDialog;
+       
+       TitleWidget *dia_ui = new TitleWidget();
+       //dia_ui->setupUi(dia);
+       //dia_ui->clip_name->setText(i18n("Title Clip"));
+       //dia_ui->clip_duration->setText(KdenliveSettings::color_duration());
+       if (dia_ui->exec() == QDialog::Accepted)
+       {
+               //QString color = dia_ui->clip_color->color().name();
+               //color = color.replace(0, 1, "0x") + "ff";
+               //m_doc->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), QString::null);
+       }
+       delete dia_ui;
+       //delete dia;
+#endif
+}
 void ProjectList::setDocument(KdenliveDoc *doc)
 {
   m_fps = doc->fps();

diff --git a/src/projectlist.h b/src/projectlist.h
index c54c69b3c17d5a9a0d68fe68e39a5558af210eb8..35a69d4e1c7f5ff30e03b6afd8149c09e652f561 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -28,7 +28,7 @@
 
 #include <KUndoStack>
 #include <KTreeWidgetSearchLine>
-#include <KExtendableItemDelegate>
+#include "kextendableitemdelegate.h"
 
 #include "definitions.h"
 #include "kdenlivedoc.h"
@@ -143,6 +143,7 @@ class ProjectList : public QWidget
     void slotEditClip();
     void slotClipSelected();
     void slotAddColorClip();
+    void slotAddTitleClip();
     void slotEditClip(QTreeWidgetItem *, int);
     void slotContextMenu( const QPoint &pos, QTreeWidgetItem * );
     void slotAddFolder();

diff --git a/src/widgets/colorval_ui.ui b/src/widgets/colorval_ui.ui
new file mode 100644 (file)
index 0000000..cd393e4
--- /dev/null
+++ b/src/widgets/colorval_ui.ui
@@ -0,0 +1,61 @@
+<ui version="4.0" >
+ <class>Colorval_UI</class>
+ <widget class="QWidget" name="Colorval_UI" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>128</width>
+    <height>60</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" >
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>TextLabel</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="KColorButton" name="kcolorbutton" />
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>