Changeset 488

Timestamp:

09/17/08 08:31:35 (5 years ago)

Author:

wolke

Message:

code clean up

Location:

branches/audiofilebrowser/gui/src/AudioFileBrowser

Files:

• AudioFileBrowser.cpp (modified) (6 diffs)
• AudioFileBrowser.h (modified) (2 diffs)
• AudioFileBrowser_UI.ui (modified) (4 diffs)

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -26 +26 @@
 #include "InstrumentEditor/InstrumentEditor.h"
 #include "SampleWaveDisplay.h"
-
-#include <hydrogen/LocalFileMng.h>
+#include "../widgets/Button.h"
+
 #include <hydrogen/h2_exception.h>
 #include <hydrogen/Preferences.h>
-#include <hydrogen/hydrogen.h>
 #include <hydrogen/sample.h>
-//#include <hydrogen/sampler/Sampler.h>
 #include <hydrogen/audio_engine.h>
 
-#include "../widgets/Button.h"
-
 #include <QTreeWidget>
-#include <QDomDocument>
 #include <QMessageBox>
-#include <QHeaderView>
-#include <QFileDialog>
-#include <vector>
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
 
 using namespace H2Core;
@@ -61 +50 @@
         installEventFilter(this);
 
-        QDir lastsampleDirectory =  Preferences::getInstance()->__lastsampleDirectory;
-
 
         model = new QDirModel();
@@ -72 +59 @@
         openBTN->setEnabled( false );
 
-//      namelabel->setText(model->headerData());
         tree = new QTreeView(treeView);
         tree->setModel(model);
@@ -87 +73 @@
         m_pSampleWaveDisplay->move( 3, 3 );
 
-        connect(tree, SIGNAL(clicked(const QModelIndex&)), SLOT(clicked(const QModelIndex&)));
-        connect(pathLineEdit, SIGNAL( returnPressed() ), SLOT( updateModelIndex( ) ));
+        connect( tree, SIGNAL( clicked( const QModelIndex&) ), SLOT( clicked( const QModelIndex&) ) );
+        connect( pathLineEdit, SIGNAL( returnPressed() ), SLOT( updateModelIndex() ) );
 
 //      QTimer *timer = new QTimer( this );
@@ -125 +111 @@
         QString onlypath = path;
         if (name != ""){
-                onlypath = path.replace( name, "");
+                onlypath = path.replace( name, "" );
         }
                 
-        name = name.left('.');
+        name = name.left( '.' );
 
         QString message = "Name: " + name;
-        filelineedit->setText(path2);
-        pathLineEdit->setText(onlypath);
+        filelineedit->setText( path2 );
+        pathLineEdit->setText( onlypath );
 
 
@@ -151 +137 @@
                                 m_pNBytesLable->setText( trUtf8( "Size: %1 bytes" ).arg( pNewSample->get_size() / 2 ) );
                                 m_pSamplerateLable->setText( trUtf8( "Samplerate: %1" ).arg( pNewSample->get_sample_rate() ) );
-                                float sec = (float)(pNewSample->get_n_frames() / (float)pNewSample->get_sample_rate());
+                                float sec = ( float )( pNewSample->get_n_frames() / (float)pNewSample->get_sample_rate() );
                                 QString qsec = "";
-                                qsec.sprintf("%2.2f",sec);
+                                qsec.sprintf( "%2.2f", sec );
                                 m_pLengthLable->setText( trUtf8( "Samplelength: " ) + qsec + trUtf8( " s" ) );
 

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.h

@@ -25 +25 @@
 
 #include "config.h"
+#include "ui_AudioFileBrowser_UI.h"
+#include "InstrumentEditor/InstrumentEditor.h"
 
 #include <QDialog>
-#include "ui_AudioFileBrowser_UI.h"
 #include <hydrogen/Object.h>
 #include <hydrogen/Preferences.h>
-#include <hydrogen/hydrogen.h>
-#include "InstrumentEditor/InstrumentEditor.h"
+
 
 class Button;
@@ -55 +55 @@
                 void on_cancelBTN_clicked();
                 void on_openBTN_clicked();
-                void clicked(const QModelIndex& index);
+                void clicked( const QModelIndex& index );
                 void on_m_pPlayBtn_clicked();
                 void updateModelIndex();

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser_UI.ui

@@ -167 +167 @@
    </property>
   </widget>
-  <widget class="QWidget" name="" >
+  <widget class="QWidget" name="layoutWidget" >
    <property name="geometry" >
     <rect>
@@ -173 +173 @@
      <y>10</y>
      <width>801</width>
-     <height>27</height>
+     <height>28</height>
     </rect>
    </property>
@@ -187 +187 @@
      </widget>
     </item>
+    <item>
+     <widget class="QPushButton" name="m_pPathHometoolButton" >
+      <property name="text" >
+       <string>Home</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
@@ -192 +199 @@
  <tabstops>
   <tabstop>pathLineEdit</tabstop>
-  <tabstop>m_pPathUptoolButton</tabstop>
   <tabstop>treeView</tabstop>
   <tabstop>filelineedit</tabstop>