From 025147effbee00db8bae931b3ef3df25052e0d96 Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Fri, 16 Jul 2010 20:47:23 +0000 Subject: Theme Editor: Added target database, now populates combo box in new project dialog but otherwise not used yet git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27450 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/gui/editorwindow.h | 1 + utils/themeeditor/gui/newprojectdialog.cpp | 11 +++++++++++ utils/themeeditor/gui/newprojectdialog.h | 3 +++ utils/themeeditor/gui/newprojectdialog.ui | 10 ++-------- 4 files changed, 17 insertions(+), 8 deletions(-) (limited to 'utils/themeeditor/gui') diff --git a/utils/themeeditor/gui/editorwindow.h b/utils/themeeditor/gui/editorwindow.h index 5bfa795714..55e18732d0 100644 --- a/utils/themeeditor/gui/editorwindow.h +++ b/utils/themeeditor/gui/editorwindow.h @@ -35,6 +35,7 @@ #include "skinviewer.h" #include "devicestate.h" #include "skintimer.h" +#include "targetdata.h" class ProjectModel; class TabContent; diff --git a/utils/themeeditor/gui/newprojectdialog.cpp b/utils/themeeditor/gui/newprojectdialog.cpp index 50a8bc4631..0df3250c5b 100644 --- a/utils/themeeditor/gui/newprojectdialog.cpp +++ b/utils/themeeditor/gui/newprojectdialog.cpp @@ -21,6 +21,7 @@ #include "newprojectdialog.h" #include "ui_newprojectdialog.h" +#include "targetdata.h" #include #include @@ -42,6 +43,13 @@ NewProjectDialog::NewProjectDialog(QWidget *parent) : settings.endGroup(); + /* Populating the target box */ + TargetData targets; + for(int i = 0; i < targets.count(); i++) + { + ui->targetBox->insertItem(i, QIcon(), targets.name(i), targets.id(i)); + } + /* Connecting the browse button */ QObject::connect(ui->browseButton, SIGNAL(clicked()), this, SLOT(browse())); @@ -56,6 +64,8 @@ void NewProjectDialog::accept() { status.name = ui->nameBox->text(); status.path = ui->locationBox->text(); + status.target = ui->targetBox->itemData(ui->targetBox->currentIndex()) + .toString(); status.sbs = ui->sbsBox->isChecked(); status.wps = ui->wpsBox->isChecked(); status.fms = ui->fmsBox->isChecked(); @@ -77,6 +87,7 @@ void NewProjectDialog::reject() { ui->nameBox->setText(status.name); ui->locationBox->setText(status.path); + ui->targetBox->setCurrentIndex(0); ui->sbsBox->setChecked(status.sbs); ui->wpsBox->setChecked(status.wps); ui->fmsBox->setChecked(status.fms); diff --git a/utils/themeeditor/gui/newprojectdialog.h b/utils/themeeditor/gui/newprojectdialog.h index c59607c53f..6a54a133bc 100644 --- a/utils/themeeditor/gui/newprojectdialog.h +++ b/utils/themeeditor/gui/newprojectdialog.h @@ -35,6 +35,7 @@ public: { QString name; QString path; + QString target; bool sbs; bool wps; bool fms; @@ -46,6 +47,7 @@ public: { name = ""; path = ""; + target = ""; sbs = true; wps = true; fms = false; @@ -63,6 +65,7 @@ public: { name = other.name; path = other.path; + target = other.target; sbs = other.sbs; wps = other.wps; fms = other.fms; diff --git a/utils/themeeditor/gui/newprojectdialog.ui b/utils/themeeditor/gui/newprojectdialog.ui index f6e2dcc139..86292119c7 100644 --- a/utils/themeeditor/gui/newprojectdialog.ui +++ b/utils/themeeditor/gui/newprojectdialog.ui @@ -63,18 +63,12 @@ Target: - comboBox + targetBox - - - - Not Yet Available - - - + -- cgit v1.2.3