Minor bugfixes
[someplayer] / src / directoryview.cpp
index e1e56e3..cc4bfdc 100644 (file)
@@ -36,7 +36,7 @@ DirectoryView::DirectoryView(QWidget *parent) :
        ui->setupUi(this);
        Config config;
        _icons_theme = config.getValue("ui/iconstheme").toString();
-       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav";
+       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav" << "m4a";
        setWindowFlags(windowFlags() | Qt::Window);
        setAttribute(Qt::WA_Maemo5StackedWindow);
        _model = new QStandardItemModel(0, 2, this);
@@ -62,6 +62,7 @@ DirectoryView::DirectoryView(QWidget *parent) :
        connect(ui->addButton, SIGNAL(clicked()), this, SLOT(_add()));
        connect(_tagresolver, SIGNAL(decoded(Track)), this, SLOT(_add_track(Track)));
        connect(_tagresolver, SIGNAL(done()), this, SLOT(_done()));
+       connect(ui->playerButton, SIGNAL(clicked()), this, SLOT(hide()));
        _top_gradient = ui->topWidget->styleSheet();
        _bottom_gradient = ui->bottomWidget->styleSheet();
 }
@@ -119,7 +120,6 @@ void DirectoryView::readDir(QString path, QString pathToScroll) {
        int row = _directories.indexOf(pathToScroll);
        if (row >= 0 && row < _model->rowCount()) {
                QModelIndex id = _model->index(row, 1);
-               qWarning() << "scroll to " << id.row() << id.column() << id.data().toString();
                ui->dirView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        }
 }
@@ -140,7 +140,6 @@ void DirectoryView::_process_click(QModelIndex index) {
                if (index.row() < _directories.count()) {
                        _current_dir = _directories.at(index.row());
                        readDir(_current_dir);
-                       qWarning() << "pushed: " << _current_dir;
                        _nav_history.push(_current_dir);
                        return;
                }
@@ -246,7 +245,7 @@ void DirectoryView::updateIcons() {
        _home();
 }
 
-void DirectoryView::updateGradient() {
+void DirectoryView::checkGradient() {
        Config config;
        if (config.getValue("ui/gradient").toString() == "yes") {
                ui->bottomWidget->setStyleSheet(_bottom_gradient);
@@ -271,9 +270,13 @@ void DirectoryView::lanscapeMode() {
        ui->rverticalLayout->addWidget(ui->addButton);
        ui->rverticalLayout->addItem(ui->rverticalSpacer);
        ui->rverticalLayout->addWidget(ui->selectToggleButton);
+       ui->lverticalWidget->show();
+       ui->rverticalWidget->show();
 }
 
 void DirectoryView::portraitMode() {
+       ui->lverticalWidget->hide();
+       ui->rverticalWidget->hide();
        ui->lverticalLayout->removeItem(ui->lverticalSpacer_0);
        ui->lverticalLayout->removeItem(ui->lverticalSpacer_1);
        ui->rverticalLayout->removeItem(ui->rverticalSpacer);
@@ -294,6 +297,7 @@ void DirectoryView::portraitMode() {
 
 void DirectoryView::updateTranslations() {
        ui->retranslateUi(this);
+       homeScreen();
 }
 
 void DirectoryView::homeScreen() {