diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-03 18:42:36 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-03 18:42:36 +0000 |
commit | 88160b6e271f3d948e80e414f06a9506c98bb9a9 (patch) | |
tree | bd678ab3d623a53c30e3080dc6298527dcd78097 /utils/themeeditor | |
parent | 3f44f1c151fd47689719676f40fdda58a2ac837f (diff) | |
download | rockbox-88160b6e271f3d948e80e414f06a9506c98bb9a9.tar.gz rockbox-88160b6e271f3d948e80e414f06a9506c98bb9a9.zip |
Theme Editor: Refactored main window init code, moved parse tree into dock widget
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26519 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor')
-rw-r--r-- | utils/themeeditor/editorwindow.cpp | 32 | ||||
-rw-r--r-- | utils/themeeditor/editorwindow.h | 7 | ||||
-rw-r--r-- | utils/themeeditor/editorwindow.ui | 41 |
3 files changed, 58 insertions, 22 deletions
diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/editorwindow.cpp index ada9ecd137..e06f0d8937 100644 --- a/utils/themeeditor/editorwindow.cpp +++ b/utils/themeeditor/editorwindow.cpp | |||
@@ -29,33 +29,51 @@ EditorWindow::EditorWindow(QWidget *parent) : | |||
29 | ui(new Ui::EditorWindow) | 29 | ui(new Ui::EditorWindow) |
30 | { | 30 | { |
31 | ui->setupUi(this); | 31 | ui->setupUi(this); |
32 | loadSettings(); | ||
33 | setupUI(); | ||
34 | setupMenus(); | ||
35 | } | ||
32 | 36 | ||
37 | void EditorWindow::loadSettings() | ||
38 | { | ||
39 | /* When there are settings to load, they'll be loaded here */ | ||
40 | } | ||
41 | |||
42 | void EditorWindow::setupUI() | ||
43 | { | ||
33 | /* Establishing the parse tree */ | 44 | /* Establishing the parse tree */ |
34 | tree = new ParseTreeModel(ui->code->document()->toPlainText().toAscii()); | 45 | tree = new ParseTreeModel(ui->codeEdit->document()->toPlainText(). |
46 | toAscii()); | ||
35 | ui->parseTree->setModel(tree); | 47 | ui->parseTree->setModel(tree); |
36 | 48 | ||
37 | /* Setting up the syntax highlighter */ | 49 | /* Setting up the syntax highlighter */ |
38 | highlighter = new SkinHighlighter(QColor(0,255,0), QColor(255,0,0), | 50 | highlighter = new SkinHighlighter(QColor(0,255,0), QColor(255,0,0), |
39 | QColor(0,0,255), QColor(150,150,150), | 51 | QColor(0,0,255), QColor(150,150,150), |
40 | ui->code->document()); | 52 | ui->codeEdit->document()); |
41 | 53 | ||
42 | /* Connecting the buttons */ | 54 | /* Connecting the buttons */ |
43 | QObject::connect(ui->code, SIGNAL(cursorPositionChanged()), | 55 | QObject::connect(ui->codeEdit, SIGNAL(cursorPositionChanged()), |
44 | this, SLOT(updateTree())); | 56 | this, SLOT(codeChanged())); |
45 | QObject::connect(ui->fromTree, SIGNAL(pressed()), | 57 | QObject::connect(ui->fromTree, SIGNAL(pressed()), |
46 | this, SLOT(updateCode())); | 58 | this, SLOT(updateCode())); |
59 | |||
60 | } | ||
61 | |||
62 | void EditorWindow::setupMenus() | ||
63 | { | ||
64 | /* When there are menus to setup, they'll be set up here */ | ||
47 | } | 65 | } |
48 | 66 | ||
49 | void EditorWindow::updateTree() | 67 | void EditorWindow::codeChanged() |
50 | { | 68 | { |
51 | tree->changeTree(ui->code->document()->toPlainText().toAscii()); | 69 | tree->changeTree(ui->codeEdit->document()->toPlainText().toAscii()); |
52 | ui->parseTree->expandAll(); | 70 | ui->parseTree->expandAll(); |
53 | } | 71 | } |
54 | 72 | ||
55 | void EditorWindow::updateCode() | 73 | void EditorWindow::updateCode() |
56 | { | 74 | { |
57 | tree->genCode(); | 75 | tree->genCode(); |
58 | ui->code->document()->setPlainText(tree->genCode()); | 76 | ui->codeEdit->document()->setPlainText(tree->genCode()); |
59 | } | 77 | } |
60 | 78 | ||
61 | EditorWindow::~EditorWindow() | 79 | EditorWindow::~EditorWindow() |
diff --git a/utils/themeeditor/editorwindow.h b/utils/themeeditor/editorwindow.h index a13bd4b6bb..f37cfcbf29 100644 --- a/utils/themeeditor/editorwindow.h +++ b/utils/themeeditor/editorwindow.h | |||
@@ -39,9 +39,14 @@ public: | |||
39 | 39 | ||
40 | private slots: | 40 | private slots: |
41 | void updateCode(); | 41 | void updateCode(); |
42 | void updateTree(); | 42 | void codeChanged(); |
43 | 43 | ||
44 | private: | 44 | private: |
45 | /* Setup functions */ | ||
46 | void loadSettings(); | ||
47 | void setupUI(); | ||
48 | void setupMenus(); | ||
49 | |||
45 | Ui::EditorWindow *ui; | 50 | Ui::EditorWindow *ui; |
46 | ParseTreeModel* tree; | 51 | ParseTreeModel* tree; |
47 | SkinHighlighter* highlighter; | 52 | SkinHighlighter* highlighter; |
diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/editorwindow.ui index ca69a21c77..a85ef62155 100644 --- a/utils/themeeditor/editorwindow.ui +++ b/utils/themeeditor/editorwindow.ui | |||
@@ -16,26 +16,16 @@ | |||
16 | <widget class="QWidget" name="centralwidget"> | 16 | <widget class="QWidget" name="centralwidget"> |
17 | <layout class="QHBoxLayout" name="horizontalLayout"> | 17 | <layout class="QHBoxLayout" name="horizontalLayout"> |
18 | <item> | 18 | <item> |
19 | <layout class="QVBoxLayout" name="verticalLayout_2"> | 19 | <layout class="QVBoxLayout" name="verticalLayout"> |
20 | <item> | ||
21 | <widget class="QTreeView" name="parseTree"/> | ||
22 | </item> | ||
23 | <item> | 20 | <item> |
24 | <widget class="QPushButton" name="fromTree"> | 21 | <widget class="QPlainTextEdit" name="codeEdit"> |
25 | <property name="text"> | 22 | <property name="lineWrapMode"> |
26 | <string>Update Code</string> | 23 | <enum>QPlainTextEdit::NoWrap</enum> |
27 | </property> | 24 | </property> |
28 | </widget> | 25 | </widget> |
29 | </item> | 26 | </item> |
30 | </layout> | 27 | </layout> |
31 | </item> | 28 | </item> |
32 | <item> | ||
33 | <layout class="QVBoxLayout" name="verticalLayout"> | ||
34 | <item> | ||
35 | <widget class="QPlainTextEdit" name="code"/> | ||
36 | </item> | ||
37 | </layout> | ||
38 | </item> | ||
39 | </layout> | 29 | </layout> |
40 | </widget> | 30 | </widget> |
41 | <widget class="QMenuBar" name="menubar"> | 31 | <widget class="QMenuBar" name="menubar"> |
@@ -56,6 +46,29 @@ | |||
56 | <addaction name="menuFile"/> | 46 | <addaction name="menuFile"/> |
57 | </widget> | 47 | </widget> |
58 | <widget class="QStatusBar" name="statusbar"/> | 48 | <widget class="QStatusBar" name="statusbar"/> |
49 | <widget class="QDockWidget" name="outputDock"> | ||
50 | <attribute name="dockWidgetArea"> | ||
51 | <number>2</number> | ||
52 | </attribute> | ||
53 | <widget class="QWidget" name="dockWidgetContents"> | ||
54 | <layout class="QVBoxLayout" name="verticalLayout_3"> | ||
55 | <item> | ||
56 | <layout class="QVBoxLayout" name="verticalLayout_2"> | ||
57 | <item> | ||
58 | <widget class="QTreeView" name="parseTree"/> | ||
59 | </item> | ||
60 | <item> | ||
61 | <widget class="QPushButton" name="fromTree"> | ||
62 | <property name="text"> | ||
63 | <string>Update Code</string> | ||
64 | </property> | ||
65 | </widget> | ||
66 | </item> | ||
67 | </layout> | ||
68 | </item> | ||
69 | </layout> | ||
70 | </widget> | ||
71 | </widget> | ||
59 | <action name="actionQuit"> | 72 | <action name="actionQuit"> |
60 | <property name="text"> | 73 | <property name="text"> |
61 | <string>Quit</string> | 74 | <string>Quit</string> |