[Traverso-commit] traverso/src/traverso/widgets InfoWidgets.cpp I...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/29 10:52:18

Modified files:
        src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h 

Log message:
        * when mouse hovers Driver Info area, show that it is a PushButton, 
change pushbuttons tooltip to a somewhat more descriptive one
        * Set the current loaded Sheet in the Sheet selector combobox (top 
right)
        * place memory icon _between_ the read/write buffer status indicators, 
hopefully that makes it clear what they mean....

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.20&r2=1.21

Patches:
Index: InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- InfoWidgets.cpp     21 Jan 2008 16:22:18 -0000      1.54
+++ InfoWidgets.cpp     29 Jan 2008 10:52:18 -0000      1.55
@@ -96,8 +96,8 @@
        
        QHBoxLayout* lay = new QHBoxLayout(this);
        lay->addSpacing(6);
-       lay->addWidget(m_icon);
        lay->addWidget(m_readBufferStatus);
+       lay->addWidget(m_icon);
        lay->addWidget(m_writeBufferStatus);
        lay->addWidget(m_cpuUsage);
        lay->setMargin(0);
@@ -145,7 +145,7 @@
 {
        m_driver = new QPushButton();
        m_driver->setIcon(find_pixmap(":/driver"));
-       m_driver->setToolTip(tr("Click to configure audiodevice"));
+       m_driver->setToolTip(tr("Change Audio Device settings"));
        m_driver->setFlat(true);
        m_driver->setFocusPolicy(Qt::NoFocus);
        
@@ -189,6 +189,7 @@
                        xruns;
        
        m_driver->setText(text);
+       updateGeometry();
 }
 
 void DriverInfo::update_xrun_info( )
@@ -199,12 +200,20 @@
 
 QSize DriverInfo::sizeHint() const
 {
-       if (xrunCount > 0) {
-               return QSize(240, SONG_TOOLBAR_HEIGHT);
-       }
-       return QSize(200, SONG_TOOLBAR_HEIGHT);
+       return QSize(m_driver->width(), SONG_TOOLBAR_HEIGHT);
+}
+
+void DriverInfo::enterEvent(QEvent * event)
+{
+       m_driver->setFlat(false);
+}
+
+void DriverInfo::leaveEvent(QEvent * event)
+{
+       m_driver->setFlat(true);
 }
 
+
 void DriverInfo::show_driver_config_widget( )
 {
        if (! driverConfigWidget) {
@@ -642,10 +651,16 @@
        connect(m_project, SIGNAL(sheetRemoved(Sheet*)), this, 
SLOT(sheet_selector_sheet_removed(Sheet*)));
        connect(m_project, SIGNAL(currentSheetChanged(Sheet*)), this, 
SLOT(sheet_selector_change_index_to(Sheet*)));
        connect(m_project, SIGNAL(currentSheetChanged(Sheet*)), this, 
SLOT(set_sheet(Sheet*)));
+       connect(m_project, SIGNAL(projectLoadFinished()), this, 
SLOT(project_load_finished()));
        
        sheet_selector_update_sheets();
 }
 
+void SheetInfo::project_load_finished()
+{
+       sheet_selector_change_index_to(m_project->get_current_sheet());
+}
+
 void SheetInfo::set_sheet(Sheet* sheet)
 {
        m_sheet = sheet;
@@ -802,7 +817,9 @@
        }
        
        int index = m_sheetselectbox->findData(sheet->get_id());
+       if (index >= 0) {
        m_sheetselectbox->setCurrentIndex(index);
+       }
 }
 
 
@@ -928,4 +945,3 @@
 }
 
 //eof
-

Index: InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- InfoWidgets.h       21 Jan 2008 16:22:18 -0000      1.20
+++ InfoWidgets.h       29 Jan 2008 10:52:18 -0000      1.21
@@ -98,6 +98,8 @@
 
 protected:
        QSize sizeHint () const;
+       void enterEvent ( QEvent * event );
+       void leaveEvent ( QEvent * event );
 
 private:
         QTimer         updateTimer;
@@ -200,6 +202,7 @@
        void sheet_selector_update_sheets();
        void sheet_selector_change_index_to(Sheet* sheet);
        void sheet_selector_index_changed(int index);
+       void project_load_finished();
        
 private:
        PlayHeadInfo*   m_playhead;