diff --git a/src/ui/v800main.ui b/src/ui/v800main.ui
index d5d0763..81e773a 100755
--- a/src/ui/v800main.ui
+++ b/src/ui/v800main.ui
@@ -6,8 +6,8 @@
0
0
- 452
- 386
+ 599
+ 494
@@ -16,6 +16,9 @@
-
+
+ -1
+
-
@@ -27,15 +30,12 @@
-
-
-
-
-
- Include
-Raw
-Output
-
-
-
+
+ -1
+
+
+ QLayout::SetDefaultConstraint
+
-
@@ -58,13 +58,23 @@ Sessions
+ -
+
+
+ Include
+Raw
+Output
+
+
+
-
ArrowCursor
- Browse V800...
+ Browse
+V800...
diff --git a/src/usb/v800usb.cpp b/src/usb/v800usb.cpp
index e1b5b20..7579155 100755
--- a/src/usb/v800usb.cpp
+++ b/src/usb/v800usb.cpp
@@ -99,32 +99,35 @@ void V800usb::get_all_sessions()
for(dates_iter = 0; dates_iter < dates.length(); dates_iter++)
{
times.clear();
- times = get_v800_data(QString(tr("%1/%2E/")).arg(tr(V800_ROOT_DIR)).arg(dates[dates_iter]));
-
- for(times_iter = 0; times_iter < times.length(); times_iter++)
+ if(dates[dates_iter].contains(tr("/")))
{
- files.clear();
- files = get_v800_data(QString(tr("%1/%2/E/%3/00/")).arg(tr(V800_ROOT_DIR)).arg(dates[dates_iter]).arg(times[times_iter]));
+ times = get_v800_data(QString(tr("%1/%2E/")).arg(tr(V800_ROOT_DIR)).arg(dates[dates_iter]));
- for(files_iter = 0; files_iter < files.length(); files_iter++)
+ for(times_iter = 0; times_iter < times.length(); times_iter++)
{
- if(QString(files[files_iter]).compare(tr("ROUTE.GZB")) == 0)
+ files.clear();
+ files = get_v800_data(QString(tr("%1/%2/E/%3/00/")).arg(tr(V800_ROOT_DIR)).arg(dates[dates_iter]).arg(times[times_iter]));
+
+ for(files_iter = 0; files_iter < files.length(); files_iter++)
{
- session_exists = true;
- break;
+ if(QString(files[files_iter]).compare(tr("ROUTE.GZB")) == 0)
+ {
+ session_exists = true;
+ break;
+ }
}
- }
- if(session_exists)
- {
- QString date(dates[dates_iter]);
- QString time(times[times_iter]);
+ if(session_exists)
+ {
+ QString date(dates[dates_iter]);
+ QString time(times[times_iter]);
- QString combined((QString(tr("%1%2")).arg(date).arg(time)));
- QDateTime session_time = QDateTime::fromString(combined, tr("yyyyMMdd/HHmmss/"));
+ QString combined((QString(tr("%1%2")).arg(date).arg(time)));
+ QDateTime session_time = QDateTime::fromString(combined, tr("yyyyMMdd/HHmmss/"));
- sessions.append(session_time.toString(Qt::TextDate));
- session_exists = false;
+ sessions.append(session_time.toString(Qt::TextDate));
+ session_exists = false;
+ }
}
}
}
@@ -267,7 +270,7 @@ QList V800usb::get_v800_data(QString request, bool debug)
}
else
{
- qDebug("Unknown file type!");
+ qDebug("Unknown file type! -> %s", request.toUtf8().constData());
}
}
else
diff --git a/src/widgets/v800main.cpp b/src/widgets/v800main.cpp
index b9d3ef3..9e6c769 100755
--- a/src/widgets/v800main.cpp
+++ b/src/widgets/v800main.cpp
@@ -25,13 +25,20 @@ V800Main::V800Main(QWidget *parent) :
connect(this, SIGNAL(get_sessions(QList, QString, bool)), usb, SLOT(get_sessions(QList, QString, bool)));
+ new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_A), this, SLOT(handle_advanced_shortcut()));
+
connect(usb_thread, SIGNAL(started()), usb, SLOT(start()));
usb_thread->start();
ui->setupUi(this);
+ ui->verticalLayout->setAlignment(Qt::AlignTop);
+ ui->verticalLayout->setSpacing(20);
ui->exerciseTree->setColumnCount(1);
ui->exerciseTree->setHeaderLabel(tr("Session"));
+ ui->fsBtn->setVisible(false);
+ ui->rawChk->setVisible(false);
+
disable_all();
this->show();
@@ -96,6 +103,21 @@ void V800Main::handle_sessions_done()
enable_all();
}
+void V800Main::handle_advanced_shortcut()
+{
+ if(ui->fsBtn->isVisible())
+ ui->fsBtn->setVisible(false);
+ else
+ ui->fsBtn->setVisible(true);
+
+ if(ui->rawChk->isVisible())
+ ui->rawChk->setVisible(false);
+ else
+ ui->rawChk->setVisible(true);
+
+ qDebug("Do advanced stuff");
+}
+
void V800Main::enable_all()
{
ui->exerciseTree->setEnabled(true);
@@ -171,5 +193,6 @@ void V800Main::on_uncheckBtn_clicked()
void V800Main::on_fsBtn_clicked()
{
V800fs *fs = new V800fs(usb);
+ fs->setWindowModality(Qt::WindowModal);
fs->show();
}
diff --git a/src/widgets/v800main.h b/src/widgets/v800main.h
index a881063..a22b0fd 100755
--- a/src/widgets/v800main.h
+++ b/src/widgets/v800main.h
@@ -28,6 +28,7 @@ private slots:
void handle_all_sessions(QList sessions);
void handle_session_done();
void handle_sessions_done();
+ void handle_advanced_shortcut();
void on_downloadBtn_clicked();
void on_checkBtn_clicked();