diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-08-04 17:56:00 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-08-04 17:56:00 +0000 |
commit | c216100f843d5ec0fba5a4f49907d666a65028b1 (patch) | |
tree | 9fedee2560e123381ea87259744fb6ae13385136 | |
parent | bcf51beee7afe2251aee2e98f26934e34b133e7a (diff) | |
download | rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.tar.gz rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.zip |
Theme Editor: Overhauled main window toolbar
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27697 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | utils/themeeditor/gui/editorwindow.cpp | 27 | ||||
-rw-r--r-- | utils/themeeditor/gui/editorwindow.ui | 43 | ||||
-rw-r--r-- | utils/themeeditor/resources.qrc | 7 | ||||
-rw-r--r-- | utils/themeeditor/resources/COPYING | 9 | ||||
-rw-r--r-- | utils/themeeditor/resources/document-save-as.png | bin | 0 -> 1837 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-copy.png | bin | 0 -> 723 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-cut.png | bin | 0 -> 2087 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-find-replace.png | bin | 0 -> 2104 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-paste.png | bin | 0 -> 1027 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-redo.png | bin | 0 -> 1502 bytes | |||
-rw-r--r-- | utils/themeeditor/resources/edit-undo.png | bin | 0 -> 1601 bytes | |||
-rw-r--r-- | utils/themeeditor/themeeditor.pro | 9 |
12 files changed, 78 insertions, 17 deletions
diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp index 6bc40fbff6..48ee76d11c 100644 --- a/utils/themeeditor/gui/editorwindow.cpp +++ b/utils/themeeditor/gui/editorwindow.cpp | |||
@@ -207,6 +207,24 @@ void EditorWindow::setupUI() | |||
207 | 207 | ||
208 | void EditorWindow::setupMenus() | 208 | void EditorWindow::setupMenus() |
209 | { | 209 | { |
210 | /* Adding actions to the toolbar */ | ||
211 | ui->toolBar->addAction(ui->actionNew_Document); | ||
212 | ui->toolBar->addAction(ui->actionOpen_Document); | ||
213 | ui->toolBar->addAction(ui->actionSave_Document); | ||
214 | ui->toolBar->addAction(ui->actionSave_Document_As); | ||
215 | |||
216 | ui->toolBar->addSeparator(); | ||
217 | ui->toolBar->addAction(ui->actionUndo); | ||
218 | ui->toolBar->addAction(ui->actionRedo); | ||
219 | |||
220 | ui->toolBar->addSeparator(); | ||
221 | ui->toolBar->addAction(ui->actionCut); | ||
222 | ui->toolBar->addAction(ui->actionCopy); | ||
223 | ui->toolBar->addAction(ui->actionPaste); | ||
224 | |||
225 | ui->toolBar->addSeparator(); | ||
226 | ui->toolBar->addAction(ui->actionFind_Replace); | ||
227 | |||
210 | /* Connecting panel show actions */ | 228 | /* Connecting panel show actions */ |
211 | QObject::connect(ui->actionFile_Panel, SIGNAL(triggered()), | 229 | QObject::connect(ui->actionFile_Panel, SIGNAL(triggered()), |
212 | this, SLOT(showPanel())); | 230 | this, SLOT(showPanel())); |
@@ -224,8 +242,6 @@ void EditorWindow::setupMenus() | |||
224 | this, SLOT(newTab())); | 242 | this, SLOT(newTab())); |
225 | QObject::connect(ui->actionNew_Project, SIGNAL(triggered()), | 243 | QObject::connect(ui->actionNew_Project, SIGNAL(triggered()), |
226 | this, SLOT(newProject())); | 244 | this, SLOT(newProject())); |
227 | QObject::connect(ui->actionToolbarNew, SIGNAL(triggered()), | ||
228 | this, SLOT(newTab())); | ||
229 | 245 | ||
230 | QObject::connect(ui->actionClose_Document, SIGNAL(triggered()), | 246 | QObject::connect(ui->actionClose_Document, SIGNAL(triggered()), |
231 | this, SLOT(closeCurrent())); | 247 | this, SLOT(closeCurrent())); |
@@ -236,15 +252,11 @@ void EditorWindow::setupMenus() | |||
236 | this, SLOT(saveCurrent())); | 252 | this, SLOT(saveCurrent())); |
237 | QObject::connect(ui->actionSave_Document_As, SIGNAL(triggered()), | 253 | QObject::connect(ui->actionSave_Document_As, SIGNAL(triggered()), |
238 | this, SLOT(saveCurrentAs())); | 254 | this, SLOT(saveCurrentAs())); |
239 | QObject::connect(ui->actionToolbarSave, SIGNAL(triggered()), | ||
240 | this, SLOT(saveCurrent())); | ||
241 | QObject::connect(ui->actionExport_Project, SIGNAL(triggered()), | 255 | QObject::connect(ui->actionExport_Project, SIGNAL(triggered()), |
242 | this, SLOT(exportProject())); | 256 | this, SLOT(exportProject())); |
243 | 257 | ||
244 | QObject::connect(ui->actionOpen_Document, SIGNAL(triggered()), | 258 | QObject::connect(ui->actionOpen_Document, SIGNAL(triggered()), |
245 | this, SLOT(openFile())); | 259 | this, SLOT(openFile())); |
246 | QObject::connect(ui->actionToolbarOpen, SIGNAL(triggered()), | ||
247 | this, SLOT(openFile())); | ||
248 | 260 | ||
249 | QObject::connect(ui->actionOpen_Project, SIGNAL(triggered()), | 261 | QObject::connect(ui->actionOpen_Project, SIGNAL(triggered()), |
250 | this, SLOT(openProject())); | 262 | this, SLOT(openProject())); |
@@ -409,7 +421,6 @@ void EditorWindow::shiftTab(int index) | |||
409 | ui->actionSave_Document->setEnabled(false); | 421 | ui->actionSave_Document->setEnabled(false); |
410 | ui->actionSave_Document_As->setEnabled(false); | 422 | ui->actionSave_Document_As->setEnabled(false); |
411 | ui->actionClose_Document->setEnabled(false); | 423 | ui->actionClose_Document->setEnabled(false); |
412 | ui->actionToolbarSave->setEnabled(false); | ||
413 | ui->fromTree->setEnabled(false); | 424 | ui->fromTree->setEnabled(false); |
414 | ui->actionUndo->setEnabled(false); | 425 | ui->actionUndo->setEnabled(false); |
415 | ui->actionRedo->setEnabled(false); | 426 | ui->actionRedo->setEnabled(false); |
@@ -424,7 +435,6 @@ void EditorWindow::shiftTab(int index) | |||
424 | ui->actionSave_Document->setEnabled(true); | 435 | ui->actionSave_Document->setEnabled(true); |
425 | ui->actionSave_Document_As->setEnabled(true); | 436 | ui->actionSave_Document_As->setEnabled(true); |
426 | ui->actionClose_Document->setEnabled(true); | 437 | ui->actionClose_Document->setEnabled(true); |
427 | ui->actionToolbarSave->setEnabled(true); | ||
428 | ui->actionUndo->setEnabled(false); | 438 | ui->actionUndo->setEnabled(false); |
429 | ui->actionRedo->setEnabled(false); | 439 | ui->actionRedo->setEnabled(false); |
430 | ui->actionCut->setEnabled(false); | 440 | ui->actionCut->setEnabled(false); |
@@ -443,7 +453,6 @@ void EditorWindow::shiftTab(int index) | |||
443 | ui->actionSave_Document->setEnabled(true); | 453 | ui->actionSave_Document->setEnabled(true); |
444 | ui->actionSave_Document_As->setEnabled(true); | 454 | ui->actionSave_Document_As->setEnabled(true); |
445 | ui->actionClose_Document->setEnabled(true); | 455 | ui->actionClose_Document->setEnabled(true); |
446 | ui->actionToolbarSave->setEnabled(true); | ||
447 | ui->fromTree->setEnabled(true); | 456 | ui->fromTree->setEnabled(true); |
448 | 457 | ||
449 | ui->actionUndo->setEnabled(true); | 458 | ui->actionUndo->setEnabled(true); |
diff --git a/utils/themeeditor/gui/editorwindow.ui b/utils/themeeditor/gui/editorwindow.ui index bd74e1369e..65f6f7e528 100644 --- a/utils/themeeditor/gui/editorwindow.ui +++ b/utils/themeeditor/gui/editorwindow.ui | |||
@@ -129,9 +129,6 @@ | |||
129 | <attribute name="toolBarBreak"> | 129 | <attribute name="toolBarBreak"> |
130 | <bool>false</bool> | 130 | <bool>false</bool> |
131 | </attribute> | 131 | </attribute> |
132 | <addaction name="actionToolbarNew"/> | ||
133 | <addaction name="actionToolbarOpen"/> | ||
134 | <addaction name="actionToolbarSave"/> | ||
135 | </widget> | 132 | </widget> |
136 | <widget class="QDockWidget" name="projectDock"> | 133 | <widget class="QDockWidget" name="projectDock"> |
137 | <property name="windowTitle"> | 134 | <property name="windowTitle"> |
@@ -230,6 +227,10 @@ | |||
230 | </property> | 227 | </property> |
231 | </action> | 228 | </action> |
232 | <action name="actionNew_Document"> | 229 | <action name="actionNew_Document"> |
230 | <property name="icon"> | ||
231 | <iconset resource="../resources.qrc"> | ||
232 | <normaloff>:/resources/resources/document-new.png</normaloff>:/resources/resources/document-new.png</iconset> | ||
233 | </property> | ||
233 | <property name="text"> | 234 | <property name="text"> |
234 | <string>&New Document</string> | 235 | <string>&New Document</string> |
235 | </property> | 236 | </property> |
@@ -238,6 +239,10 @@ | |||
238 | </property> | 239 | </property> |
239 | </action> | 240 | </action> |
240 | <action name="actionOpen_Document"> | 241 | <action name="actionOpen_Document"> |
242 | <property name="icon"> | ||
243 | <iconset resource="../resources.qrc"> | ||
244 | <normaloff>:/resources/resources/document-open.png</normaloff>:/resources/resources/document-open.png</iconset> | ||
245 | </property> | ||
241 | <property name="text"> | 246 | <property name="text"> |
242 | <string>&Open Document</string> | 247 | <string>&Open Document</string> |
243 | </property> | 248 | </property> |
@@ -249,6 +254,10 @@ | |||
249 | <property name="enabled"> | 254 | <property name="enabled"> |
250 | <bool>false</bool> | 255 | <bool>false</bool> |
251 | </property> | 256 | </property> |
257 | <property name="icon"> | ||
258 | <iconset resource="../resources.qrc"> | ||
259 | <normaloff>:/resources/resources/document-save.png</normaloff>:/resources/resources/document-save.png</iconset> | ||
260 | </property> | ||
252 | <property name="text"> | 261 | <property name="text"> |
253 | <string>&Save Document</string> | 262 | <string>&Save Document</string> |
254 | </property> | 263 | </property> |
@@ -271,6 +280,10 @@ | |||
271 | <property name="enabled"> | 280 | <property name="enabled"> |
272 | <bool>false</bool> | 281 | <bool>false</bool> |
273 | </property> | 282 | </property> |
283 | <property name="icon"> | ||
284 | <iconset resource="../resources.qrc"> | ||
285 | <normaloff>:/resources/resources/document-save-as.png</normaloff>:/resources/resources/document-save-as.png</iconset> | ||
286 | </property> | ||
274 | <property name="text"> | 287 | <property name="text"> |
275 | <string>Save Document &As</string> | 288 | <string>Save Document &As</string> |
276 | </property> | 289 | </property> |
@@ -334,6 +347,10 @@ | |||
334 | </property> | 347 | </property> |
335 | </action> | 348 | </action> |
336 | <action name="actionUndo"> | 349 | <action name="actionUndo"> |
350 | <property name="icon"> | ||
351 | <iconset resource="../resources.qrc"> | ||
352 | <normaloff>:/resources/resources/edit-undo.png</normaloff>:/resources/resources/edit-undo.png</iconset> | ||
353 | </property> | ||
337 | <property name="text"> | 354 | <property name="text"> |
338 | <string>&Undo</string> | 355 | <string>&Undo</string> |
339 | </property> | 356 | </property> |
@@ -342,6 +359,10 @@ | |||
342 | </property> | 359 | </property> |
343 | </action> | 360 | </action> |
344 | <action name="actionRedo"> | 361 | <action name="actionRedo"> |
362 | <property name="icon"> | ||
363 | <iconset resource="../resources.qrc"> | ||
364 | <normaloff>:/resources/resources/edit-redo.png</normaloff>:/resources/resources/edit-redo.png</iconset> | ||
365 | </property> | ||
345 | <property name="text"> | 366 | <property name="text"> |
346 | <string>&Redo</string> | 367 | <string>&Redo</string> |
347 | </property> | 368 | </property> |
@@ -350,6 +371,10 @@ | |||
350 | </property> | 371 | </property> |
351 | </action> | 372 | </action> |
352 | <action name="actionCut"> | 373 | <action name="actionCut"> |
374 | <property name="icon"> | ||
375 | <iconset resource="../resources.qrc"> | ||
376 | <normaloff>:/resources/resources/edit-cut.png</normaloff>:/resources/resources/edit-cut.png</iconset> | ||
377 | </property> | ||
353 | <property name="text"> | 378 | <property name="text"> |
354 | <string>C&ut</string> | 379 | <string>C&ut</string> |
355 | </property> | 380 | </property> |
@@ -358,6 +383,10 @@ | |||
358 | </property> | 383 | </property> |
359 | </action> | 384 | </action> |
360 | <action name="actionCopy"> | 385 | <action name="actionCopy"> |
386 | <property name="icon"> | ||
387 | <iconset resource="../resources.qrc"> | ||
388 | <normaloff>:/resources/resources/edit-copy.png</normaloff>:/resources/resources/edit-copy.png</iconset> | ||
389 | </property> | ||
361 | <property name="text"> | 390 | <property name="text"> |
362 | <string>&Copy</string> | 391 | <string>&Copy</string> |
363 | </property> | 392 | </property> |
@@ -366,6 +395,10 @@ | |||
366 | </property> | 395 | </property> |
367 | </action> | 396 | </action> |
368 | <action name="actionPaste"> | 397 | <action name="actionPaste"> |
398 | <property name="icon"> | ||
399 | <iconset resource="../resources.qrc"> | ||
400 | <normaloff>:/resources/resources/edit-paste.png</normaloff>:/resources/resources/edit-paste.png</iconset> | ||
401 | </property> | ||
369 | <property name="text"> | 402 | <property name="text"> |
370 | <string>&Paste</string> | 403 | <string>&Paste</string> |
371 | </property> | 404 | </property> |
@@ -374,6 +407,10 @@ | |||
374 | </property> | 407 | </property> |
375 | </action> | 408 | </action> |
376 | <action name="actionFind_Replace"> | 409 | <action name="actionFind_Replace"> |
410 | <property name="icon"> | ||
411 | <iconset resource="../resources.qrc"> | ||
412 | <normaloff>:/resources/resources/edit-find-replace.png</normaloff>:/resources/resources/edit-find-replace.png</iconset> | ||
413 | </property> | ||
377 | <property name="text"> | 414 | <property name="text"> |
378 | <string>&Find/Replace</string> | 415 | <string>&Find/Replace</string> |
379 | </property> | 416 | </property> |
diff --git a/utils/themeeditor/resources.qrc b/utils/themeeditor/resources.qrc index c00953a3c0..9290ca9b48 100644 --- a/utils/themeeditor/resources.qrc +++ b/utils/themeeditor/resources.qrc | |||
@@ -16,6 +16,13 @@ | |||
16 | <file>resources/cursor.png</file> | 16 | <file>resources/cursor.png</file> |
17 | <file>resources/lines.png</file> | 17 | <file>resources/lines.png</file> |
18 | <file alias="tagdb">resources/tagdb</file> | 18 | <file alias="tagdb">resources/tagdb</file> |
19 | <file>resources/document-save-as.png</file> | ||
20 | <file>resources/edit-redo.png</file> | ||
21 | <file>resources/edit-undo.png</file> | ||
22 | <file>resources/edit-copy.png</file> | ||
23 | <file>resources/edit-cut.png</file> | ||
24 | <file>resources/edit-paste.png</file> | ||
25 | <file>resources/edit-find-replace.png</file> | ||
19 | </qresource> | 26 | </qresource> |
20 | <qresource prefix="/render"> | 27 | <qresource prefix="/render"> |
21 | <file alias="scenebg.png">resources/render/scenebg.png</file> | 28 | <file alias="scenebg.png">resources/render/scenebg.png</file> |
diff --git a/utils/themeeditor/resources/COPYING b/utils/themeeditor/resources/COPYING index 3d9e7e72f0..14c27fa030 100644 --- a/utils/themeeditor/resources/COPYING +++ b/utils/themeeditor/resources/COPYING | |||
@@ -1,7 +1,8 @@ | |||
1 | The files ffwd.png, rwnd.png, play.png, pause.png, document-new.png, | 1 | The files edit-cut.png, edit-copy.png, edit-paste.png, edit-find-replace.png, |
2 | document-open.png, and document-save.png came from | 2 | edit-undo.png, edit-redo.png, ffwd.png, rwnd.png, play.png, pause.png, |
3 | the Tango Desktop Project (http://www.tango.freedesktop.org) and are in | 3 | document-new.png, document-open.png, document-save-as.png, and document-save.png |
4 | the public domain. | 4 | came from the Tango Desktop Project (http://www.tango.freedesktop.org) and are |
5 | in the public domain. | ||
5 | 6 | ||
6 | The files zoomin.png, zoomout.png, and zoomeven.png came from the Tango Project | 7 | The files zoomin.png, zoomout.png, and zoomeven.png came from the Tango Project |
7 | with modifications by Robert Bieber, also in the public domain. | 8 | with modifications by Robert Bieber, also in the public domain. |
diff --git a/utils/themeeditor/resources/document-save-as.png b/utils/themeeditor/resources/document-save-as.png new file mode 100644 index 0000000000..5c9f6b343b --- /dev/null +++ b/utils/themeeditor/resources/document-save-as.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-copy.png b/utils/themeeditor/resources/edit-copy.png new file mode 100644 index 0000000000..3348ee08fd --- /dev/null +++ b/utils/themeeditor/resources/edit-copy.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-cut.png b/utils/themeeditor/resources/edit-cut.png new file mode 100644 index 0000000000..217663b19c --- /dev/null +++ b/utils/themeeditor/resources/edit-cut.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-find-replace.png b/utils/themeeditor/resources/edit-find-replace.png new file mode 100644 index 0000000000..0f1b117ff7 --- /dev/null +++ b/utils/themeeditor/resources/edit-find-replace.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-paste.png b/utils/themeeditor/resources/edit-paste.png new file mode 100644 index 0000000000..dd429ced62 --- /dev/null +++ b/utils/themeeditor/resources/edit-paste.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-redo.png b/utils/themeeditor/resources/edit-redo.png new file mode 100644 index 0000000000..3eb7b05c84 --- /dev/null +++ b/utils/themeeditor/resources/edit-redo.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/resources/edit-undo.png b/utils/themeeditor/resources/edit-undo.png new file mode 100644 index 0000000000..61b2ce9a53 --- /dev/null +++ b/utils/themeeditor/resources/edit-undo.png | |||
Binary files differ | |||
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro index da5fe4156b..d3d8b1d080 100644 --- a/utils/themeeditor/themeeditor.pro +++ b/utils/themeeditor/themeeditor.pro | |||
@@ -175,7 +175,14 @@ OTHER_FILES += README \ | |||
175 | quazip/README.ROCKBOX \ | 175 | quazip/README.ROCKBOX \ |
176 | quazip/LICENSE.GPL \ | 176 | quazip/LICENSE.GPL \ |
177 | qtfindreplacedialog/dialogs.pro \ | 177 | qtfindreplacedialog/dialogs.pro \ |
178 | resources/tagdb | 178 | resources/tagdb \ |
179 | resources/document-save-as.png \ | ||
180 | resources/edit-undo.png \ | ||
181 | resources/edit-redo.png \ | ||
182 | resources/edit-paste.png \ | ||
183 | resources/edit-cut.png \ | ||
184 | resources/edit-copy.png \ | ||
185 | resources/edit-find-replace.png | ||
179 | FORMS += gui/editorwindow.ui \ | 186 | FORMS += gui/editorwindow.ui \ |
180 | gui/preferencesdialog.ui \ | 187 | gui/preferencesdialog.ui \ |
181 | gui/configdocument.ui \ | 188 | gui/configdocument.ui \ |