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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/04 00:08:22

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

Log message:
        * Further improved menubar layout, well, that's the idea
        * new project using template almost works
        * separation of open/create project dialog

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- InfoWidgets.cpp     3 Apr 2007 21:25:25 -0000       1.7
+++ InfoWidgets.cpp     4 Apr 2007 00:08:22 -0000       1.8
@@ -642,27 +642,12 @@
        m_follow->setDefaultAction(m_followAct);
        m_follow->setFocusPolicy(Qt::NoFocus);
        
-       m_addNew = new QPushButton(tr("Add new..."), this);
-       m_addNew->setFocusPolicy(Qt::NoFocus);
-       m_addNew->setToolTip(tr("Create new Song or Track"));
-       m_addNew->setMaximumHeight(22);
-       
        m_record = new QPushButton(tr("Record"));
        m_record->setFocusPolicy(Qt::NoFocus);
        m_record->setEnabled(false);
        m_record->setIcon(find_pixmap(":/redled-16"));
        m_record->setMaximumHeight(22);
        
-       QMenu* menu = new QMenu;
-
-       QAction* action = menu->addAction("Track");
-       connect(action, SIGNAL(triggered()), this, SLOT(add_new_track()));
-       
-       action = menu->addAction("Song");
-       connect(action, SIGNAL(triggered()), this, SLOT(add_new_song()));
-       
-       m_addNew->setMenu(menu);
-       
        connect(m_snapAct, SIGNAL(triggered(bool)), this, 
SLOT(snap_state_changed(bool)));
        connect(m_followAct, SIGNAL(triggered(bool)), this, 
SLOT(follow_state_changed(bool)));
        connect(&config(), SIGNAL(configChanged()), this, 
SLOT(update_follow_state()));
@@ -685,7 +670,6 @@
                lay->addWidget(m_snap);
                lay->addWidget(m_follow);
                lay->addWidget(m_selector);
-               lay->addWidget(m_addNew);
                
                setLayout(lay);
                lay->setMargin(0);
@@ -698,7 +682,6 @@
                lay->addWidget(m_record);
                lay->addWidget(m_snap);
                lay->addWidget(m_follow);
-               lay->addWidget(m_addNew);
                lay->addWidget(m_selector);
                
                lay->setMargin(0);
@@ -743,16 +726,6 @@
        config().save();
 }
 
-
-void SongInfo::add_new_song()
-{
-       Interface::instance()->show_newsong_dialog();
-}
-
-void SongInfo::add_new_track()
-{
-}
-
 QSize SongInfo::sizeHint() const
 {
        if (m_orientation == Qt::Horizontal) {

Index: InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- InfoWidgets.h       3 Apr 2007 21:25:25 -0000       1.5
+++ InfoWidgets.h       4 Apr 2007 00:08:22 -0000       1.6
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005-2006 Remon Sijrier 
+    Copyright (C) 2005-2007 Remon Sijrier 
  
     This file is part of Traverso
  
@@ -217,8 +217,6 @@
        void snap_state_changed(bool state);
        void update_follow_state();
        void follow_state_changed(bool state);
-       void add_new_song();
-       void add_new_track();
        
 private:
        PlayHeadInfo*   m_playhead;
@@ -227,7 +225,6 @@
        QAction*        m_snapAct;
        QToolButton*    m_follow;
        QAction*        m_followAct;
-       QPushButton*    m_addNew;
        QPushButton*    m_record;
 };