Mercurial > hg > dmlib

changeset 387:e4aad59fb407

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Twiddling on the GUI elements.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 18 Oct 2012 20:11:17 +0300
parents 69ca8a83c25a
children 015f2da65841
files edgui.cpp
diffstat 1 files changed, 35 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/edgui.cpp	Thu Oct 18 20:10:54 2012 +0300
+++ b/edgui.cpp	Thu Oct 18 20:11:17 2012 +0300
@@ -276,7 +276,7 @@
 //
 void DemoEditor::actionControlChanged(QAction *act)
 {
-//    view->setToolMode(act->data().toInt());
+//    demoView->setToolMode(act->data().toInt());
 }
 
 
@@ -446,12 +446,22 @@
         "Pause", CTRL_PAUSE);
 
 
-    QToolBar *toolBarTools = new QToolBar("Player controls", this);
-    toolBarTools->setMovable(false);
-    toolBarTools->setFloatable(false);
-    toolBarTools->setIconSize(QSize(CTRL_ICON_SIZE, CTRL_ICON_SIZE));
-    toolBarTools->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    toolBarTools->addActions(actGroupControls->actions());
+    QToolBar *controlButtons = new QToolBar("Player controls", this);
+    controlButtons->setMovable(false);
+    controlButtons->setFloatable(false);
+    controlButtons->setIconSize(QSize(CTRL_ICON_SIZE, CTRL_ICON_SIZE));
+    controlButtons->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    controlButtons->addActions(actGroupControls->actions());
+
+
+    //
+    // Effects list table
+    //
+    qDebug() << "- Constructing effects list";
+
+    effectTable = new QTableView(this);
+    effectTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    effectTable->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
 
     //
@@ -467,15 +477,28 @@
     QVBoxLayout *sideVBox = new QVBoxLayout(sideVBoxContainer);
     sideVBox->setSpacing(0);
     sideVBox->setContentsMargins(0, 0, 0, 0);
-    sideVBox->addWidget(toolBarTools);
+    sideVBox->addWidget(effectTable);
+    sideVBox->addWidget(controlButtons);
 
-//    view = new MapView();
 
     QWidget *holder = new QWidget();
-    QHBoxLayout *viewSplitter = new QHBoxLayout(holder);
+    QVBoxLayout *verticalSplitter = new QVBoxLayout(holder);
+    QHBoxLayout *horizSplitter = new QHBoxLayout();
+
+
+    timelineScrollBar = new QScrollBar(Qt::Horizontal);
+    timelineWaveform = new WaveformView();
+    demoView = new DemoView(this);
 
-    viewSplitter->addWidget(sideVBoxContainer);
-//    viewSplitter->addWidget(view);
+    verticalSplitter->addLayout(horizSplitter);
+    verticalSplitter->addWidget(timelineWaveform);
+    verticalSplitter->addWidget(timelineScrollBar);
+
+    horizSplitter->addWidget(sideVBoxContainer);
+    horizSplitter->addWidget(demoView);
+
+
+    updateTimelineView();
 
     setCentralWidget(holder);
 }