[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/project/NewProjec...
From: |
Nicola Doebelin |
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/project/NewProjec... |
Date: |
Thu, 22 May 2008 16:40:05 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 08/05/22 16:40:05
Modified files:
src/traverso/dialogs/project: NewProjectDialog.cpp
NewProjectDialog.h
src/traverso/ui: NewProjectDialog.ui
Log message:
* new layout of the NewProjectDialog
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewProjectDialog.ui?cvsroot=traverso&r1=1.7&r2=1.8
Patches:
Index: dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dialogs/project/NewProjectDialog.cpp 22 May 2008 15:14:17 -0000
1.11
+++ dialogs/project/NewProjectDialog.cpp 22 May 2008 16:40:03 -0000
1.12
@@ -37,6 +37,9 @@
#include <QFile>
#include <QCheckBox>
#include <QProgressDialog>
+#include <QRadioButton>
+#include <QStackedWidget>
+#include <QButtonGroup>
#include <Config.h>
#include "Export.h"
@@ -72,6 +75,9 @@
m_converter = new AudioFileCopyConvert();
m_progressDialog = new QProgressDialog(this);
m_exportSpec = new ExportSpecification;
+ m_buttonGroup = new QButtonGroup(this);
+ m_buttonGroup->addButton(radioButtonImport, 0);
+ m_buttonGroup->addButton(radioButtonEmpty, 1);
connect(useTemplateCheckBox, SIGNAL(stateChanged (int)), this,
SLOT(use_template_checkbox_state_changed(int)));
connect(pushButtonAddFiles, SIGNAL(clicked()), this, SLOT(add_files()));
@@ -79,6 +85,7 @@
connect(m_converter, SIGNAL(taskFinished(QString, int)), this,
SLOT(load_file(QString, int)));
connect(m_converter, SIGNAL(taskStarted(QString)), this,
SLOT(show_progress(QString)));
connect(m_converter, SIGNAL(progress(int)), m_progressDialog,
SLOT(setValue(int)));
+ connect(m_buttonGroup, SIGNAL(buttonClicked(int)), stackedWidget,
SLOT(setCurrentIndex(int)));
}
NewProjectDialog::~ NewProjectDialog( )
Index: dialogs/project/NewProjectDialog.h
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- dialogs/project/NewProjectDialog.h 22 May 2008 15:14:17 -0000 1.6
+++ dialogs/project/NewProjectDialog.h 22 May 2008 16:40:03 -0000 1.7
@@ -28,6 +28,7 @@
class AudioFileCopyConvert;
class ExportFormatOptionsWidget;
class QProgressDialog;
+class QButtonGroup;
struct ExportSpecification;
@@ -44,6 +45,7 @@
QProgressDialog* m_progressDialog;
ExportSpecification* m_exportSpec;
ExportFormatOptionsWidget* m_formatOptionsWidget;
+ QButtonGroup* m_buttonGroup;
void load_all_files();
void copy_files();
Index: ui/NewProjectDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/NewProjectDialog.ui,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ui/NewProjectDialog.ui 22 May 2008 11:28:35 -0000 1.7
+++ ui/NewProjectDialog.ui 22 May 2008 16:40:05 -0000 1.8
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>358</width>
- <height>443</height>
+ <width>414</width>
+ <height>454</height>
</rect>
</property>
<property name="windowTitle" >
@@ -14,23 +14,8 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
<widget class="QLabel" name="label_2_2" >
<property name="minimumSize" >
<size>
@@ -43,7 +28,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1" >
<widget class="QLineEdit" name="newProjectName" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -53,26 +38,7 @@
</property>
</widget>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
+ <item row="1" column="0" >
<widget class="QLabel" name="label" >
<property name="minimumSize" >
<size>
@@ -85,7 +51,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1" >
<widget class="QTextEdit" name="descriptionTextEdit" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -101,26 +67,7 @@
</property>
</widget>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
+ <item row="2" column="0" >
<widget class="QLabel" name="label_3_2" >
<property name="minimumSize" >
<size>
@@ -133,7 +80,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="2" column="1" >
<widget class="QLineEdit" name="newProjectEngineer" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
@@ -146,14 +93,38 @@
</layout>
</item>
<item>
- <widget class="QTabWidget" name="tabWidget" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QRadioButton" name="radioButtonImport" >
+ <property name="text" >
+ <string>Import Audio Files</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioButtonEmpty" >
+ <property name="text" >
+ <string>Empty Project</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
- <widget class="QWidget" name="tab_2" >
- <attribute name="title" >
+ <widget class="QWidget" name="page" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
<string>Import Audio Files</string>
- </attribute>
+ </property>
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" >
@@ -187,6 +158,8 @@
</layout>
</item>
<item>
+ <layout class="QHBoxLayout" >
+ <item>
<widget class="QTreeWidget" name="treeWidgetFiles" >
<property name="selectionMode" >
<enum>QAbstractItemView::ExtendedSelection</enum>
@@ -209,6 +182,8 @@
</column>
</widget>
</item>
+ </layout>
+ </item>
<item>
<widget class="QCheckBox" name="checkBoxCopy" >
<property name="text" >
@@ -218,10 +193,16 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_2" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
<string>Empty Project</string>
- </attribute>
+ </property>
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" >
@@ -249,7 +230,7 @@
</sizepolicy>
</property>
<property name="text" >
- <string>Sheet count</string>
+ <string>Number of Sheets</string>
</property>
</widget>
</item>
@@ -370,6 +351,9 @@
</item>
</layout>
</widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
<item>
@@ -394,7 +378,7 @@
<hints>
<hint type="sourcelabel" >
<x>252</x>
- <y>438</y>
+ <y>591</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
@@ -410,7 +394,7 @@
<hints>
<hint type="sourcelabel" >
<x>268</x>
- <y>438</y>
+ <y>591</y>
</hint>
<hint type="destinationlabel" >
<x>286</x>