devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Made the device configuration menu dockable

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27128 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-06-25 05:49:16 +00:00
parent db50e49f20
commit 0db8bc4664
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
utils/themeeditor/gui/editorwindow.cpp
View file

@ -30,18 +30,27 @@
#include <QGraphicsScene> #include <QGraphicsScene>
EditorWindow::EditorWindow(QWidget *parent) : EditorWindow::EditorWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent), ui(new Ui::EditorWindow), parseTreeSelection(0)
ui(new Ui::EditorWindow),
parseTreeSelection(0)
{ {
ui->setupUi(this); ui->setupUi(this);
prefs = new PreferencesDialog(this); prefs = new PreferencesDialog(this);
project = 0; project = 0;
loadSettings();
setupUI(); setupUI();
loadSettings();
setupMenus(); setupMenus();
} }
EditorWindow::~EditorWindow()
{
delete ui;
delete prefs;
if(project)
delete project;
delete deviceConfig;
delete deviceDock;
}
void EditorWindow::loadTabFromSkinFile(QString fileName) void EditorWindow::loadTabFromSkinFile(QString fileName)
{ {
/* Checking to see if the file is already open */ /* Checking to see if the file is already open */
@ -146,9 +155,13 @@ void EditorWindow::setupUI()
ui->skinPreviewLayout->addWidget(viewer); ui->skinPreviewLayout->addWidget(viewer);
/* Positioning the device settings dialog */ /* Positioning the device settings dialog */
QPoint thisPos = pos(); deviceDock = new QDockWidget(tr("Device Configuration"), this);
deviceConfig.move(thisPos.x() + width() / 4, thisPos.y() + height() / 4); deviceConfig = new DeviceState(deviceDock);
deviceDock->setObjectName("deviceDock");
deviceDock->setWidget(deviceConfig);
deviceDock->setFloating(true);
deviceDock->hide();
} }
void EditorWindow::setupMenus() void EditorWindow::setupMenus()
@ -161,7 +174,7 @@ void EditorWindow::setupMenus()
QObject::connect(ui->actionPreview_Panel, SIGNAL(triggered()), QObject::connect(ui->actionPreview_Panel, SIGNAL(triggered()),
this, SLOT(showPanel())); this, SLOT(showPanel()));
QObject::connect(ui->actionDevice_Configuration, SIGNAL(triggered()), QObject::connect(ui->actionDevice_Configuration, SIGNAL(triggered()),
&deviceConfig, SLOT(show())); deviceDock, SLOT(show()));
/* Connecting the document management actions */ /* Connecting the document management actions */
QObject::connect(ui->actionNew_Document, SIGNAL(triggered()), QObject::connect(ui->actionNew_Document, SIGNAL(triggered()),
@ -483,11 +496,3 @@ void EditorWindow::sizeColumns()
ui->parseTree->resizeColumnToContents(ParseTreeModel::typeColumn); ui->parseTree->resizeColumnToContents(ParseTreeModel::typeColumn);
ui->parseTree->resizeColumnToContents(ParseTreeModel::valueColumn); ui->parseTree->resizeColumnToContents(ParseTreeModel::valueColumn);
} }
EditorWindow::~EditorWindow()
{
delete ui;
delete prefs;
if(project)
delete project;
}

4
utils/themeeditor/gui/editorwindow.h
View file

@ -25,6 +25,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QLabel> #include <QLabel>
#include <QItemSelectionModel> #include <QItemSelectionModel>
#include <QDockWidget>
#include "parsetreemodel.h" #include "parsetreemodel.h"
#include "skinhighlighter.h" #include "skinhighlighter.h"
@ -89,7 +90,8 @@ private:
ProjectModel* project; ProjectModel* project;
QItemSelectionModel* parseTreeSelection; QItemSelectionModel* parseTreeSelection;
SkinViewer* viewer; SkinViewer* viewer;
DeviceState deviceConfig; DeviceState* deviceConfig;
QDockWidget* deviceDock;
}; };
#endif // EDITORWINDOW_H #endif // EDITORWINDOW_H