[Traverso-commit] traverso/src/traverso dialogs/project/NewProjec...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    08/05/25 20:14:48

Modified files:
        src/traverso/dialogs/project: NewProjectDialog.cpp 
                                      NewProjectDialog.h 
        src/traverso   : Interface.cpp 
        src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h 

Log message:
        Some tweaks to the progress toolbar. Still not optimal... suggestions 
are welcome

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.149&r2=1.150
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.27&r2=1.28

Patches:
Index: dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- dialogs/project/NewProjectDialog.cpp        25 May 2008 16:35:31 -0000      
1.15
+++ dialogs/project/NewProjectDialog.cpp        25 May 2008 20:14:46 -0000      
1.16
@@ -256,6 +256,8 @@
 
 void NewProjectDialog::copy_files()
 {
+       emit number_of_files(treeWidgetFiles->topLevelItemCount());
+
        QList<QFileInfo> list;
        QStringList trackNameList;
        while(treeWidgetFiles->topLevelItemCount()) {

Index: dialogs/project/NewProjectDialog.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- dialogs/project/NewProjectDialog.h  25 May 2008 16:35:31 -0000      1.10
+++ dialogs/project/NewProjectDialog.h  25 May 2008 20:14:46 -0000      1.11
@@ -62,6 +62,7 @@
 
 signals:
        void loadFile(QString, int, QString);
+       void number_of_files(int);
 };
 
 #endif

Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- Interface.cpp       25 May 2008 16:35:31 -0000      1.149
+++ Interface.cpp       25 May 2008 20:14:47 -0000      1.150
@@ -177,6 +177,7 @@
        m_progressBar = new ProgressToolBar(this);
        m_progressBar->setObjectName("Progress Toolbar");
        addToolBar(Qt::BottomToolBarArea, m_progressBar);
+       m_progressBar->hide();
 
        m_projectToolBar = new QToolBar(this);
        m_projectToolBar->setObjectName("Project Toolbar");
@@ -642,9 +643,6 @@
        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();
 
@@ -1292,6 +1290,7 @@
                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)));
+               connect(m_newProjectDialog, SIGNAL(number_of_files(int)), 
m_progressBar, SLOT(set_num_files(int)));
        }
        m_newProjectDialog->show();
        return 0;

Index: widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- widgets/InfoWidgets.cpp     25 May 2008 16:35:31 -0000      1.64
+++ widgets/InfoWidgets.cpp     25 May 2008 20:14:47 -0000      1.65
@@ -534,34 +534,38 @@
        : QToolBar(parent)
 {
        m_progressBar = new QProgressBar(this);
-       m_label = new QLabel(this);
-       addWidget(m_label);
+       m_progressBar->setMinimumWidth(800);
        addWidget(m_progressBar);
        m_progressBar->setEnabled(false);
-       m_label->setEnabled(false);
-}
+       filecount = 1;
+       filenum = 1;
 
-ProgressToolBar::~ProgressToolBar()
-{
+       QString style = "QProgressBar {border: 2px solid grey;border-radius: 
5px; height: 10px; width 300px; text-align: center;}" 
+"QProgressBar::chunk {background-color: qlineargradient(x1: 0, y1: 0, x2: 1.0, 
y2: 1.0,stop: 0 white, stop: 1 navy);}";
+
+        m_progressBar->setStyleSheet(style);
 }
 
-QSize ProgressToolBar::sizeHint() const
+ProgressToolBar::~ProgressToolBar()
 {
-       return QSize(100, SONG_TOOLBAR_HEIGHT);
 }
 
 void ProgressToolBar::set_progress(int i)
 {
        if (i == m_progressBar->maximum()) {
+               if (filenum == filecount) {
+                       hide();
                m_progressBar->reset();
                m_progressBar->setEnabled(false);
-               m_label->setEnabled(false);
                return;
+               } else {
+                       ++filenum;
+               }
        }
 
        if (!m_progressBar->isEnabled()) {
                m_progressBar->setEnabled(true);
-               m_label->setEnabled(true);
+               show();
        }
 
        m_progressBar->setValue(i);
@@ -569,7 +573,14 @@
 
 void ProgressToolBar::set_label(QString s)
 {
-       m_label->setText(tr("Copying file ") + s);
+       Q_UNUSED(s);
+       m_progressBar->setFormat(tr("Importing file %1 of %2: 
%p%").arg(filenum).arg(filecount));
+}
+
+void ProgressToolBar::set_num_files(int i)
+{
+       filecount = i;
+       filenum = 1;
 }
 
 //eof

Index: widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- widgets/InfoWidgets.h       25 May 2008 16:35:31 -0000      1.27
+++ widgets/InfoWidgets.h       25 May 2008 20:14:48 -0000      1.28
@@ -26,7 +26,6 @@
 #include <QTimer>
 #include <QFrame>
 #include <QProgressBar>
-#include <QLabel>
 
 class Project;
 class Sheet;
@@ -192,13 +191,12 @@
 public slots:
        void set_progress(int);
        void set_label(QString);
-
-protected:
-       QSize sizeHint () const;
+       void set_num_files(int);
 
 private:
        QProgressBar*   m_progressBar;
-       QLabel*         m_label;
+       int             filecount;
+       int             filenum;
 };
 
 #endif