Commit ce3eb320 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

ImportController: Trying to improve the UI

parent cdef37f5
......@@ -34,6 +34,7 @@
<file alias="error">resources/images/error.png</file>
<file alias="youtube">resources/images/youtube.png</file>
<file alias="network">resources/images/network.png</file>
<file alias="down">resources/images/down.png</file>
</qresource>
<qresource prefix="/text">
<file>AUTHORS</file>
......
......@@ -57,7 +57,7 @@ ImportController::ImportController(QWidget *parent) :
m_stackNav = new StackViewController( m_ui->stackViewContainer );
m_temporaryMedias = new MediaContainer;
m_mediaListView = new MediaListView( m_stackNav, m_temporaryMedias );
m_tag = new TagWidget( m_ui->tagContainer, 6 );
// m_tag = new TagWidget( m_ui->tagContainer, 6 );
m_filesModel = new QFileSystemModel( this );
m_stackNav->pushViewController( m_mediaListView );
......@@ -109,7 +109,7 @@ ImportController::~ImportController()
{
delete m_ui;
delete m_stackNav;
delete m_tag;
// delete m_tag;
}
void
......@@ -135,7 +135,7 @@ ImportController::clipSelection( Clip* clip )
m_ui->metadataContainer->setWatchedClip( clip );
m_clipRenderer->stop();
m_currentUuid = uuid;
m_tag->clipSelected( clip );
// m_tag->clipSelected( clip );
emit clipSelected( clip );
}
......
......@@ -75,7 +75,7 @@ class ImportController : public QDialog
void importDir( const QString &path );
Ui::ImportController* m_ui;
StackViewController* m_stackNav;
TagWidget* m_tag;
// TagWidget* m_tag;
MediaListView *m_mediaListView;
QFileSystemModel *m_filesModel;
QString m_currentlyWatchedDir;
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1000</width>
<width>1009</width>
<height>700</height>
</rect>
</property>
......@@ -17,123 +17,134 @@
<iconset resource="../../../../ressources.qrc">
<normaloff>:/images/images/vlmc.png</normaloff>:/images/images/vlmc.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="mainLayout">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTreeView" name="treeView"/>
</item>
<item>
<widget class="QPushButton" name="forwardButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../../ressources.qrc">
<normaloff>:/images/forward</normaloff>:/images/forward</iconset>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_9">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QHBoxLayout" name="errorLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<item>
<widget class="QLabel" name="errorLabelImg">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../../ressources.qrc">:/images/error</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="errorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
<widget class="QPushButton" name="forwardButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="textVisible">
<bool>true</bool>
<property name="icon">
<iconset resource="../../../../ressources.qrc">
<normaloff>:/images/down</normaloff>:/images/down</iconset>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="stackViewContainer" native="true">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="maximumSize">
<property name="sizeHint" stdset="0">
<size>
<width>16777215</width>
<height>16777215</height>
<width>40</width>
<height>20</height>
</size>
</property>
<property name="baseSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QHBoxLayout" name="errorLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="PreviewWidget" name="previewContainer" native="true">
<property name="minimumSize">
<size>
<width>328</width>
<height>340</height>
</size>
<widget class="QLabel" name="errorLabelImg">
<property name="text">
<string/>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>340</height>
</size>
<property name="pixmap">
<pixmap resource="../../../../ressources.qrc">:/images/error</pixmap>
</property>
</widget>
</item>
<item>
<widget class="ClipMetadataDisplayer" name="metadataContainer" native="true"/>
</item>
<item>
<widget class="QWidget" name="tagContainer" native="true"/>
<widget class="QLabel" name="errorLabel">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="stackViewContainer" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="PreviewWidget" name="previewContainer" native="true">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>340</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="ClipMetadataDisplayer" name="metadataContainer" native="true"/>
</item>
</layout>
</item>
</layout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment