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 /utils/themeeditor/gui | |
| parent | bcf51beee7afe2251aee2e98f26934e34b133e7a (diff) | |
| download | rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.zip rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.tar.gz rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.tar.bz2 rockbox-c216100f843d5ec0fba5a4f49907d666a65028b1.tar.xz | |
Theme Editor: Overhauled main window toolbar
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27697 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/gui')
| -rw-r--r-- | utils/themeeditor/gui/editorwindow.cpp | 27 | ||||
| -rw-r--r-- | utils/themeeditor/gui/editorwindow.ui | 43 |
2 files changed, 58 insertions, 12 deletions
diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp index 6bc40fb..48ee76d 100644 --- a/utils/themeeditor/gui/editorwindow.cpp +++ b/utils/themeeditor/gui/editorwindow.cpp @@ -207,6 +207,24 @@ void EditorWindow::setupUI() void EditorWindow::setupMenus() { + /* Adding actions to the toolbar */ + ui->toolBar->addAction(ui->actionNew_Document); + ui->toolBar->addAction(ui->actionOpen_Document); + ui->toolBar->addAction(ui->actionSave_Document); + ui->toolBar->addAction(ui->actionSave_Document_As); + + ui->toolBar->addSeparator(); + ui->toolBar->addAction(ui->actionUndo); + ui->toolBar->addAction(ui->actionRedo); + + ui->toolBar->addSeparator(); + ui->toolBar->addAction(ui->actionCut); + ui->toolBar->addAction(ui->actionCopy); + ui->toolBar->addAction(ui->actionPaste); + + ui->toolBar->addSeparator(); + ui->toolBar->addAction(ui->actionFind_Replace); + /* Connecting panel show actions */ QObject::connect(ui->actionFile_Panel, SIGNAL(triggered()), this, SLOT(showPanel())); @@ -224,8 +242,6 @@ void EditorWindow::setupMenus() this, SLOT(newTab())); QObject::connect(ui->actionNew_Project, SIGNAL(triggered()), this, SLOT(newProject())); - QObject::connect(ui->actionToolbarNew, SIGNAL(triggered()), - this, SLOT(newTab())); QObject::connect(ui->actionClose_Document, SIGNAL(triggered()), this, SLOT(closeCurrent())); @@ -236,15 +252,11 @@ void EditorWindow::setupMenus() this, SLOT(saveCurrent())); QObject::connect(ui->actionSave_Document_As, SIGNAL(triggered()), this, SLOT(saveCurrentAs())); - QObject::connect(ui->actionToolbarSave, SIGNAL(triggered()), - this, SLOT(saveCurrent())); QObject::connect(ui->actionExport_Project, SIGNAL(triggered()), this, SLOT(exportProject())); QObject::connect(ui->actionOpen_Document, SIGNAL(triggered()), this, SLOT(openFile())); - QObject::connect(ui->actionToolbarOpen, SIGNAL(triggered()), - this, SLOT(openFile())); QObject::connect(ui->actionOpen_Project, SIGNAL(triggered()), this, SLOT(openProject())); @@ -409,7 +421,6 @@ void EditorWindow::shiftTab(int index) ui->actionSave_Document->setEnabled(false); ui->actionSave_Document_As->setEnabled(false); ui->actionClose_Document->setEnabled(false); - ui->actionToolbarSave->setEnabled(false); ui->fromTree->setEnabled(false); ui->actionUndo->setEnabled(false); ui->actionRedo->setEnabled(false); @@ -424,7 +435,6 @@ void EditorWindow::shiftTab(int index) ui->actionSave_Document->setEnabled(true); ui->actionSave_Document_As->setEnabled(true); ui->actionClose_Document->setEnabled(true); - ui->actionToolbarSave->setEnabled(true); ui->actionUndo->setEnabled(false); ui->actionRedo->setEnabled(false); ui->actionCut->setEnabled(false); @@ -443,7 +453,6 @@ void EditorWindow::shiftTab(int index) ui->actionSave_Document->setEnabled(true); ui->actionSave_Document_As->setEnabled(true); ui->actionClose_Document->setEnabled(true); - ui->actionToolbarSave->setEnabled(true); ui->fromTree->setEnabled(true); ui->actionUndo->setEnabled(true); diff --git a/utils/themeeditor/gui/editorwindow.ui b/utils/themeeditor/gui/editorwindow.ui index bd74e13..65f6f7e 100644 --- a/utils/themeeditor/gui/editorwindow.ui +++ b/utils/themeeditor/gui/editorwindow.ui @@ -129,9 +129,6 @@ <attribute name="toolBarBreak"> <bool>false</bool> </attribute> - <addaction name="actionToolbarNew"/> - <addaction name="actionToolbarOpen"/> - <addaction name="actionToolbarSave"/> </widget> <widget class="QDockWidget" name="projectDock"> <property name="windowTitle"> @@ -230,6 +227,10 @@ </property> </action> <action name="actionNew_Document"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/document-new.png</normaloff>:/resources/resources/document-new.png</iconset> + </property> <property name="text"> <string>&New Document</string> </property> @@ -238,6 +239,10 @@ </property> </action> <action name="actionOpen_Document"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/document-open.png</normaloff>:/resources/resources/document-open.png</iconset> + </property> <property name="text"> <string>&Open Document</string> </property> @@ -249,6 +254,10 @@ <property name="enabled"> <bool>false</bool> </property> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/document-save.png</normaloff>:/resources/resources/document-save.png</iconset> + </property> <property name="text"> <string>&Save Document</string> </property> @@ -271,6 +280,10 @@ <property name="enabled"> <bool>false</bool> </property> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/document-save-as.png</normaloff>:/resources/resources/document-save-as.png</iconset> + </property> <property name="text"> <string>Save Document &As</string> </property> @@ -334,6 +347,10 @@ </property> </action> <action name="actionUndo"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-undo.png</normaloff>:/resources/resources/edit-undo.png</iconset> + </property> <property name="text"> <string>&Undo</string> </property> @@ -342,6 +359,10 @@ </property> </action> <action name="actionRedo"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-redo.png</normaloff>:/resources/resources/edit-redo.png</iconset> + </property> <property name="text"> <string>&Redo</string> </property> @@ -350,6 +371,10 @@ </property> </action> <action name="actionCut"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-cut.png</normaloff>:/resources/resources/edit-cut.png</iconset> + </property> <property name="text"> <string>C&ut</string> </property> @@ -358,6 +383,10 @@ </property> </action> <action name="actionCopy"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-copy.png</normaloff>:/resources/resources/edit-copy.png</iconset> + </property> <property name="text"> <string>&Copy</string> </property> @@ -366,6 +395,10 @@ </property> </action> <action name="actionPaste"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-paste.png</normaloff>:/resources/resources/edit-paste.png</iconset> + </property> <property name="text"> <string>&Paste</string> </property> @@ -374,6 +407,10 @@ </property> </action> <action name="actionFind_Replace"> + <property name="icon"> + <iconset resource="../resources.qrc"> + <normaloff>:/resources/resources/edit-find-replace.png</normaloff>:/resources/resources/edit-find-replace.png</iconset> + </property> <property name="text"> <string>&Find/Replace</string> </property> |