[Traverso-commit] traverso/src core/Config.cpp core/ProjectManage...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/23 21:16:46

Modified files:
        src/core       : Config.cpp ProjectManager.cpp 
        src/traverso/dialogs/project: OpenProjectDialog.cpp 
        src/traverso/dialogs/settings: Pages.cpp Pages.h 
        src/traverso/ui: BehaviorConfigPage.ui 

Log message:
        * ask to select a project directory on first start (instead of creating 
an Untitled project in /home/you)
        * Remove default project directory property, as it doesn't make any 
sense (right?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Config.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BehaviorConfigPage.ui?cvsroot=traverso&r1=1.8&r2=1.9

Patches:
Index: core/Config.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Config.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Config.cpp     3 Dec 2007 16:24:20 -0000       1.19
+++ core/Config.cpp     23 Jan 2008 21:16:45 -0000      1.20
@@ -117,11 +117,12 @@
 QVariant Config::get_property( const QString & type, const QString & property, 
QVariant defaultValue )
 {
        QVariant var = defaultValue;
+       QString key = type + ("/") + property;
        
-       if (m_configs.contains(type + ("/") + property)) {
-               var = m_configs.value(type + ("/") + property);
+       if (m_configs.contains(key)) {
+               var = m_configs.value(key);
        } else {
-               m_configs.insert(type + "/" + property, defaultValue);
+               m_configs.insert(key, defaultValue);
        }
        
        return var;

Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- core/ProjectManager.cpp     21 Jan 2008 16:22:14 -0000      1.53
+++ core/ProjectManager.cpp     23 Jan 2008 21:16:45 -0000      1.54
@@ -62,7 +62,7 @@
        
        m_watcher = new QFileSystemWatcher(0);
 
-       QString path = config().get_property("Project", "directory", 
getenv("HOME")).toString();
+       QString path = config().get_property("Project", "directory", 
"").toString();
        set_current_project_dir(path);
        
        cpointer().add_contextitem(this);
@@ -296,18 +296,24 @@
 
 void ProjectManager::start()
 {
-       QString defaultpath = config().get_property("Project", 
"DefaultDirectory", "").toString();
-       QString projects_path = config().get_property("Project", "directory", 
defaultpath).toString();
+       QString projectsPath = config().get_property("Project", "directory", 
"/unknown/directory/").toString();
 
        QDir dir;
-       if ( (projects_path.isEmpty()) || (!dir.exists(projects_path)) ) {
-               if (projects_path.isEmpty()) {
-                       projects_path = QDir::homePath();
+       if ( (projectsPath.isEmpty()) || (!dir.exists(projectsPath)) ) {
+               if (projectsPath.isEmpty()) {
+                       projectsPath = QDir::homePath();
                }
 
                QString newPath = QFileDialog::getExistingDirectory(0,
-                               tr("Choose an existing or create a new Project 
Directory"),
-                                  projects_path );
+                               tr("Choose a directory to store your Projects 
in"),
+                                  projectsPath );
+               
+               if (newPath.isEmpty()) {
+                       QMessageBox::warning( 0, tr("Traverso - Warning"), 
+                                             tr("No directory was selected, to 
retry open the 'Open Project Dialog' and "
+                                                "click 'Select Project 
Directory' button\n"));
+                       return;
+               } 
                
                QFileInfo fi(newPath);
                if (dir.exists(newPath) && !fi.isWritable()) {
@@ -453,6 +459,10 @@
 
 void ProjectManager::set_current_project_dir(const QString & path)
 {
+       if (path.isEmpty()) {
+               return;
+       }
+       
        QDir newdir(path);
        
        config().set_property("Project", "directory", newdir.canonicalPath());

Index: traverso/dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/dialogs/project/OpenProjectDialog.cpp      21 Jan 2008 16:25:17 
-0000      1.15
+++ traverso/dialogs/project/OpenProjectDialog.cpp      23 Jan 2008 21:16:45 
-0000      1.16
@@ -67,7 +67,7 @@
 {
        projectListView->clear();
        
-       QString path = config().get_property("Project", "directory", 
getenv("HOME")).toString();
+       QString path = config().get_property("Project", "directory", 
"none").toString();
 
        QDir dir(path);
 
@@ -235,7 +235,7 @@
 
 void OpenProjectDialog::on_projectDirSelectButton_clicked( )
 {
-       QString path = config().get_property("Project", "directory", 
getenv("HOME")).toString();
+       QString path = config().get_property("Project", "directory", 
"none").toString();
        
        QDir rootDir(path);
        rootDir.cdUp();

Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- traverso/dialogs/settings/Pages.cpp 23 Jan 2008 17:32:23 -0000      1.36
+++ traverso/dialogs/settings/Pages.cpp 23 Jan 2008 21:16:45 -0000      1.37
@@ -458,7 +458,6 @@
 
 void BehaviorPage::save_config()
 {
-       config().set_property("Project", "DefaultDirectory", 
m_configpage->projectDirLineEdit->text());
        config().set_property("Project", "loadLastUsed", 
m_configpage->loadLastProjectCheckBox->isChecked());
        config().set_property("Sheet", "trackCreationCount", 
m_configpage->numberOfTrackSpinBox->value());
        config().set_property("PlayHead", "Follow", 
m_configpage->keepCursorVisibleCheckBox->isChecked());
@@ -478,7 +477,6 @@
 
 void BehaviorPage::load_config()
 {
-       QString dir = config().get_property("Project", "DefaultDirectory", 
getenv("HOME")).toString();
        bool loadLastUsedProject = config().get_property("Project", 
"loadLastUsed", 1).toBool();
        QString oncloseaction = config().get_property("Project", "onclose", 
"save").toString();
        int defaultNumTracks = config().get_property("Sheet", 
"trackCreationCount", 6).toInt();
@@ -486,7 +484,6 @@
        bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag", 
false).toBool();
        bool lockClips = config().get_property("AudioClip", "LockByDefault", 
false).toBool();
        
-       m_configpage->projectDirLineEdit->setText(dir);
        m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);
        m_configpage->numberOfTrackSpinBox->setValue(defaultNumTracks);
        m_configpage->scrollModeComboBox->setCurrentIndex(scrollMode);
@@ -515,7 +512,6 @@
 
 void BehaviorPage::reset_default_config()
 {
-       config().set_property("Project", "DefaultDirectory", getenv("HOME"));
        config().set_property("Project", "loadLastUsed", true);
        config().set_property("Project", "onclose", "save");
        config().set_property("Sheet", "trackCreationCount", 6);
@@ -532,27 +528,10 @@
        : QWidget(parent)
 {
        setupUi(this);
-       QIcon icon = 
QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
-       selectButton->setIcon(icon);
-       
-       connect(selectButton, SIGNAL(clicked()), this, 
SLOT(dirselect_button_clicked()));
-}
-
-void BehaviorConfigPage::dirselect_button_clicked()
-{
-       QString dirName = QFileDialog::getExistingDirectory(this, 
-                               tr("Select default project dir"), 
-                               projectDirLineEdit->text());
-       
-       if (!dirName.isEmpty()) {
-               projectDirLineEdit->setText(dirName);
-       }
 }
 
 
 
-
-
 /****************************************/
 /*            Appearance                */
 /****************************************/
@@ -655,7 +634,6 @@
        connect(themeSelecterCombo, SIGNAL(currentIndexChanged(const QString)), 
this, SLOT(theme_index_changed(const QString)));
        connect(useStylePalletCheckBox, SIGNAL(toggled(bool)), this, 
SLOT(use_selected_styles_pallet_checkbox_toggled(bool)));
        connect(colorAdjustBox, SIGNAL(valueChanged(int)), this, 
SLOT(color_adjustbox_changed(int)));
-       connect(pathSelectButton, SIGNAL(clicked()), this, 
SLOT(dirselect_button_clicked()));
        connect(rectifiedCheckBox, SIGNAL(toggled(bool)), this, 
SLOT(theme_option_changed()));
        connect(mergedCheckBox, SIGNAL(toggled(bool)), this, 
SLOT(theme_option_changed()));
        connect(paintAudioWithOutlineCheckBox, SIGNAL(toggled(bool)), this, 
SLOT(theme_option_changed()));
@@ -696,18 +674,6 @@
        themer()->set_color_adjust_value(value);
 }
 
-void ThemeConfigPage::dirselect_button_clicked()
-{
-       QString dirName = QFileDialog::getExistingDirectory(this, 
-                       tr("Select default project dir"), 
-                          themePathLineEdit->text());
-       
-       if (!dirName.isEmpty()) {
-               themePathLineEdit->setText(dirName);
-               update_theme_combobox(dirName);
-       }
-}
-
 void ThemeConfigPage::update_theme_combobox(const QString& path)
 {
        themeSelecterCombo->clear();

Index: traverso/dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/dialogs/settings/Pages.h   22 Nov 2007 19:11:16 -0000      1.8
+++ traverso/dialogs/settings/Pages.h   23 Jan 2008 21:16:46 -0000      1.9
@@ -109,8 +109,6 @@
        BehaviorConfigPage(QWidget* parent = 0);
 private:
        friend class BehaviorPage;
-private slots:
-       void dirselect_button_clicked();
 };
 
 
@@ -139,7 +137,6 @@
        friend class AppearancePage;
 
 private slots:
-       void dirselect_button_clicked();
        void style_index_changed(const QString& text);
        void theme_index_changed(const QString& theme);
        void use_selected_styles_pallet_checkbox_toggled(bool);

Index: traverso/ui/BehaviorConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BehaviorConfigPage.ui,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/ui/BehaviorConfigPage.ui   7 Jun 2007 04:36:52 -0000       1.8
+++ traverso/ui/BehaviorConfigPage.ui   23 Jan 2008 21:16:46 -0000      1.9
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>318</width>
-    <height>430</height>
+    <width>336</width>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,7 +17,7 @@
     <number>0</number>
    </property>
    <property name="spacing" >
-    <number>6</number>
+    <number>9</number>
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
@@ -32,50 +32,6 @@
        <number>6</number>
       </property>
       <item>
-       <widget class="QCheckBox" name="loadLastProjectCheckBox" >
-        <property name="text" >
-         <string>Load last used project at startup</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="label" >
-          <property name="text" >
-           <string>Default project directory</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QLineEdit" name="projectDirLineEdit" />
-          </item>
-          <item>
-           <widget class="QPushButton" name="selectButton" >
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-      <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
          <number>0</number>
@@ -139,6 +95,13 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QCheckBox" name="loadLastProjectCheckBox" >
+        <property name="text" >
+         <string>Load last used project at startup</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>