diff options
Diffstat (limited to 'utils/themeeditor/editorwindow.cpp')
-rw-r--r-- | utils/themeeditor/editorwindow.cpp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/editorwindow.cpp index 91e099ebf7..8e81829a41 100644 --- a/utils/themeeditor/editorwindow.cpp +++ b/utils/themeeditor/editorwindow.cpp | |||
@@ -32,6 +32,7 @@ EditorWindow::EditorWindow(QWidget *parent) : | |||
32 | ui(new Ui::EditorWindow) | 32 | ui(new Ui::EditorWindow) |
33 | { | 33 | { |
34 | ui->setupUi(this); | 34 | ui->setupUi(this); |
35 | prefs = new PreferencesDialog(this); | ||
35 | loadSettings(); | 36 | loadSettings(); |
36 | setupUI(); | 37 | setupUI(); |
37 | setupMenus(); | 38 | setupMenus(); |
@@ -43,7 +44,7 @@ void EditorWindow::loadSettings() | |||
43 | QSettings settings; | 44 | QSettings settings; |
44 | 45 | ||
45 | /* Main Window location */ | 46 | /* Main Window location */ |
46 | settings.beginGroup("MainWindow"); | 47 | settings.beginGroup("EditorWindow"); |
47 | QSize size = settings.value("size").toSize(); | 48 | QSize size = settings.value("size").toSize(); |
48 | QPoint pos = settings.value("position").toPoint(); | 49 | QPoint pos = settings.value("position").toPoint(); |
49 | QByteArray state = settings.value("state").toByteArray(); | 50 | QByteArray state = settings.value("state").toByteArray(); |
@@ -65,7 +66,7 @@ void EditorWindow::saveSettings() | |||
65 | QSettings settings; | 66 | QSettings settings; |
66 | 67 | ||
67 | /* Saving window and panel positions */ | 68 | /* Saving window and panel positions */ |
68 | settings.beginGroup("MainWindow"); | 69 | settings.beginGroup("EditorWindow"); |
69 | settings.setValue("position", pos()); | 70 | settings.setValue("position", pos()); |
70 | settings.setValue("size", size()); | 71 | settings.setValue("size", size()); |
71 | settings.setValue("state", saveState()); | 72 | settings.setValue("state", saveState()); |
@@ -89,6 +90,10 @@ void EditorWindow::setupUI() | |||
89 | QObject::connect(ui->fromTree, SIGNAL(pressed()), | 90 | QObject::connect(ui->fromTree, SIGNAL(pressed()), |
90 | this, SLOT(updateCurrent())); | 91 | this, SLOT(updateCurrent())); |
91 | 92 | ||
93 | /* Connecting the preferences dialog */ | ||
94 | QObject::connect(ui->actionPreferences, SIGNAL(triggered()), | ||
95 | prefs, SLOT(exec())); | ||
96 | |||
92 | } | 97 | } |
93 | 98 | ||
94 | void EditorWindow::setupMenus() | 99 | void EditorWindow::setupMenus() |
@@ -124,15 +129,23 @@ void EditorWindow::setupMenus() | |||
124 | 129 | ||
125 | } | 130 | } |
126 | 131 | ||
127 | 132 | void EditorWindow::addTab(SkinDocument *doc) | |
128 | void EditorWindow::newTab() | ||
129 | { | 133 | { |
130 | SkinDocument* doc = new SkinDocument; | ||
131 | ui->editorTabs->addTab(doc, doc->getTitle()); | 134 | ui->editorTabs->addTab(doc, doc->getTitle()); |
132 | 135 | ||
133 | /* Connecting to title change events */ | 136 | /* Connecting to title change events */ |
134 | QObject::connect(doc, SIGNAL(titleChanged(QString)), | 137 | QObject::connect(doc, SIGNAL(titleChanged(QString)), |
135 | this, SLOT(tabTitleChanged(QString))); | 138 | this, SLOT(tabTitleChanged(QString))); |
139 | |||
140 | /* Connecting to settings change events */ | ||
141 | doc->connectPrefs(prefs); | ||
142 | } | ||
143 | |||
144 | |||
145 | void EditorWindow::newTab() | ||
146 | { | ||
147 | SkinDocument* doc = new SkinDocument; | ||
148 | addTab(doc); | ||
136 | } | 149 | } |
137 | 150 | ||
138 | void EditorWindow::shiftTab(int index) | 151 | void EditorWindow::shiftTab(int index) |
@@ -208,10 +221,7 @@ void EditorWindow::openFile() | |||
208 | 221 | ||
209 | /* Adding a new document for each file name */ | 222 | /* Adding a new document for each file name */ |
210 | SkinDocument* doc = new SkinDocument(current); | 223 | SkinDocument* doc = new SkinDocument(current); |
211 | ui->editorTabs->addTab(doc, doc->getTitle()); | 224 | addTab(doc); |
212 | |||
213 | QObject::connect(doc, SIGNAL(titleChanged(QString)), | ||
214 | this, SLOT(tabTitleChanged(QString))); | ||
215 | 225 | ||
216 | /* And setting the new default directory */ | 226 | /* And setting the new default directory */ |
217 | current.chop(current.length() - current.lastIndexOf('/') - 1); | 227 | current.chop(current.length() - current.lastIndexOf('/') - 1); |
@@ -270,4 +280,5 @@ void EditorWindow::updateCurrent() | |||
270 | EditorWindow::~EditorWindow() | 280 | EditorWindow::~EditorWindow() |
271 | { | 281 | { |
272 | delete ui; | 282 | delete ui; |
283 | delete prefs; | ||
273 | } | 284 | } |