[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: |
Sun, 25 May 2008 16:35:31 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 08/05/25 16:35:31
Modified files:
src/traverso/dialogs/project: NewProjectDialog.cpp
NewProjectDialog.h
src/traverso : Interface.cpp Interface.h
src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h
Log message:
A progress toolbar was added, which shows the progress when copying
files into the project dir (New Project -> Import Audio files -> Copy
files...). It looks big and ugly, but maybe it can be themed? How about
auto-hide?
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.26&r2=1.27
Patches:
Index: dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- dialogs/project/NewProjectDialog.cpp 23 May 2008 11:10:11 -0000
1.14
+++ dialogs/project/NewProjectDialog.cpp 25 May 2008 16:35:31 -0000
1.15
@@ -37,7 +37,6 @@
#include <QFileInfo>
#include <QFile>
#include <QCheckBox>
-#include <QProgressDialog>
#include <QRadioButton>
#include <QStackedWidget>
#include <QButtonGroup>
@@ -84,7 +83,6 @@
buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
m_converter = new AudioFileCopyConvert();
- m_progressDialog = new QProgressDialog(this);
m_exportSpec = new ExportSpecification;
m_buttonGroup = new QButtonGroup(this);
m_buttonGroup->addButton(radioButtonImport, 0);
@@ -97,8 +95,6 @@
connect(buttonDown, SIGNAL(clicked()), this, SLOT(move_down()));
connect(m_converter, SIGNAL(taskFinished(QString, int, QString)), this,
SLOT(load_file(QString, int, QString)));
- 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)));
}
@@ -260,8 +256,6 @@
void NewProjectDialog::copy_files()
{
- m_progressDialog->show();
-
QList<QFileInfo> list;
QStringList trackNameList;
while(treeWidgetFiles->topLevelItemCount()) {
@@ -329,12 +323,6 @@
}
}
-void NewProjectDialog::show_progress(QString name)
-{
- m_progressDialog->setLabelText(name);
- m_progressDialog->show();
-}
-
void NewProjectDialog::move_up()
{
QList<QTreeWidgetItem*> selection = treeWidgetFiles->selectedItems();
@@ -365,7 +353,6 @@
}
}
-
void NewProjectDialog::move_down()
{
QList<QTreeWidgetItem*> selection = treeWidgetFiles->selectedItems();
@@ -394,5 +381,8 @@
}
}
-
+AudioFileCopyConvert* NewProjectDialog::get_converter()
+{
+ return m_converter;
+}
//eof
Index: dialogs/project/NewProjectDialog.h
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dialogs/project/NewProjectDialog.h 23 May 2008 11:10:11 -0000 1.9
+++ dialogs/project/NewProjectDialog.h 25 May 2008 16:35:31 -0000 1.10
@@ -27,7 +27,6 @@
class AudioFileCopyConvert;
class ExportFormatOptionsWidget;
-class QProgressDialog;
class QButtonGroup;
struct ExportSpecification;
@@ -40,9 +39,10 @@
NewProjectDialog(QWidget* parent = 0);
~NewProjectDialog();
+ AudioFileCopyConvert* get_converter();
+
private:
AudioFileCopyConvert* m_converter;
- QProgressDialog* m_progressDialog;
ExportSpecification* m_exportSpec;
ExportFormatOptionsWidget* m_formatOptionsWidget;
QButtonGroup* m_buttonGroup;
@@ -57,7 +57,6 @@
void add_files();
void remove_files();
void load_file(QString, int, QString);
- void show_progress(QString);
void move_up();
void move_down();
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- Interface.cpp 25 May 2008 14:55:27 -0000 1.148
+++ Interface.cpp 25 May 2008 16:35:31 -0000 1.149
@@ -45,6 +45,7 @@
#include "Plugin.h"
#include "Import.h"
#include "TimeLine.h"
+#include "AudioFileCopyConvert.h"
#include "../sheetcanvas/SheetWidget.h"
@@ -173,6 +174,10 @@
m_sysinfo->setObjectName("System Info Toolbar");
addToolBar(Qt::BottomToolBarArea, m_sysinfo);
+ m_progressBar = new ProgressToolBar(this);
+ m_progressBar->setObjectName("Progress Toolbar");
+ addToolBar(Qt::BottomToolBarArea, m_progressBar);
+
m_projectToolBar = new QToolBar(this);
m_projectToolBar->setObjectName("Project Toolbar");
addToolBar(m_projectToolBar);
@@ -637,6 +642,8 @@
m_viewMenu->addAction(m_sysinfo->toggleViewAction());
m_sysinfo->toggleViewAction()->setText(tr("System Information"));
+ m_viewMenu->addAction(m_progressBar->toggleViewAction());
+ m_progressBar->toggleViewAction()->setText(tr("Progress Bar"));
m_sheetMenu = menuBar()->addMenu(tr("&Sheet"));
m_sheetMenuAction = m_sheetMenu->menuAction();
@@ -1282,6 +1289,9 @@
{
if (! m_newProjectDialog ) {
m_newProjectDialog = new NewProjectDialog(this);
+ AudioFileCopyConvert* m_converter =
m_newProjectDialog->get_converter();
+ connect(m_converter, SIGNAL(taskStarted(QString)),
m_progressBar, SLOT(set_label(QString)));
+ connect(m_converter, SIGNAL(progress(int)), m_progressBar,
SLOT(set_progress(int)));
}
m_newProjectDialog->show();
return 0;
Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Interface.h 24 May 2008 17:24:05 -0000 1.59
+++ Interface.h 25 May 2008 16:35:31 -0000 1.60
@@ -64,6 +64,7 @@
class NewProjectDialog;
class Ui_QuickStartDialog;
class RestoreProjectBackupDialog;
+class ProgressToolBar;
struct MenuData;
class Interface : public QMainWindow
@@ -112,7 +113,6 @@
QDockWidget* AudioSourcesDW;
ResourcesWidget* audiosourcesview;
QDockWidget* correlationMeterDW;
- QDockWidget* transportDW;
CorrelationMeterWidget* correlationMeter;
TransportConsoleWidget* transportConsole;
QDockWidget* spectralMeterDW;
@@ -123,6 +123,7 @@
InsertSilenceDialog* m_insertSilenceDialog;
MarkerDialog* m_markerDialog;
SysInfoToolBar* m_sysinfo;
+ ProgressToolBar* m_progressBar;
BusSelectorDialog* m_busSelector;
NewSheetDialog* m_newSheetDialog;
NewTrackDialog* m_newTrackDialog;
Index: widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- widgets/InfoWidgets.cpp 24 May 2008 17:24:06 -0000 1.63
+++ widgets/InfoWidgets.cpp 25 May 2008 16:35:31 -0000 1.64
@@ -530,4 +530,46 @@
m_rangecolors.append(range);
}
+ProgressToolBar::ProgressToolBar(QWidget* parent)
+ : QToolBar(parent)
+{
+ m_progressBar = new QProgressBar(this);
+ m_label = new QLabel(this);
+ addWidget(m_label);
+ addWidget(m_progressBar);
+ m_progressBar->setEnabled(false);
+ m_label->setEnabled(false);
+}
+
+ProgressToolBar::~ProgressToolBar()
+{
+}
+
+QSize ProgressToolBar::sizeHint() const
+{
+ return QSize(100, SONG_TOOLBAR_HEIGHT);
+}
+
+void ProgressToolBar::set_progress(int i)
+{
+ if (i == m_progressBar->maximum()) {
+ m_progressBar->reset();
+ m_progressBar->setEnabled(false);
+ m_label->setEnabled(false);
+ return;
+ }
+
+ if (!m_progressBar->isEnabled()) {
+ m_progressBar->setEnabled(true);
+ m_label->setEnabled(true);
+ }
+
+ m_progressBar->setValue(i);
+}
+
+void ProgressToolBar::set_label(QString s)
+{
+ m_label->setText(tr("Copying file ") + s);
+}
+
//eof
Index: widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- widgets/InfoWidgets.h 24 May 2008 17:24:06 -0000 1.26
+++ widgets/InfoWidgets.h 25 May 2008 16:35:31 -0000 1.27
@@ -25,6 +25,8 @@
#include <QToolBar>
#include <QTimer>
#include <QFrame>
+#include <QProgressBar>
+#include <QLabel>
class Project;
class Sheet;
@@ -179,6 +181,26 @@
bool m_introunding;
};
+class ProgressToolBar : public QToolBar
+{
+ Q_OBJECT
+
+public:
+ ProgressToolBar(QWidget* parent);
+ ~ProgressToolBar();
+
+public slots:
+ void set_progress(int);
+ void set_label(QString);
+
+protected:
+ QSize sizeHint () const;
+
+private:
+ QProgressBar* m_progressBar;
+ QLabel* m_label;
+};
+
#endif
//eof