kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Title block template editor: added a menu entry to manage logos.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1773 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-05-09 02:31:43 +00:00
parent dd237b148e
commit d42a9ad176
6 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ico/22x22/insert-image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
qelectrotech.qrc
View File

@@ -140,6 +140,7 @@
<file>ico/22x22/go-home.png</file> <file>ico/22x22/go-home.png</file>
<file>ico/22x22/go-up.png</file> <file>ico/22x22/go-up.png</file>
<file>ico/22x22/hotspot.png</file> <file>ico/22x22/hotspot.png</file>
<file>ico/22x22/insert-image.png</file>
<file>ico/22x22/label.png</file> <file>ico/22x22/label.png</file>
<file>ico/22x22/landscape.png</file> <file>ico/22x22/landscape.png</file>
<file>ico/22x22/line.png</file> <file>ico/22x22/line.png</file>

2
sources/qeticons.cpp
View File

@@ -95,6 +95,7 @@ namespace QET {
QIcon Hide; QIcon Hide;
QIcon Home; QIcon Home;
QIcon HotSpot; QIcon HotSpot;
QIcon InsertImage;
QIcon Lower; QIcon Lower;
QIcon MoveFile; QIcon MoveFile;
QIcon Names; QIcon Names;
@@ -297,6 +298,7 @@ void QET::Icons::initIcons() {
Home .addFile(":/ico/16x16/go-home.png"); Home .addFile(":/ico/16x16/go-home.png");
Home .addFile(":/ico/22x22/go-home.png"); Home .addFile(":/ico/22x22/go-home.png");
HotSpot .addFile(":/ico/22x22/hotspot.png"); HotSpot .addFile(":/ico/22x22/hotspot.png");
InsertImage .addFile(":/ico/22x22/insert-image.png");
Lower .addFile(":/ico/22x22/lower.png"); Lower .addFile(":/ico/22x22/lower.png");
MoveFile .addFile(":/ico/16x16/item_move.png"); MoveFile .addFile(":/ico/16x16/item_move.png");
Names .addFile(":/ico/22x22/names.png"); Names .addFile(":/ico/22x22/names.png");

1
sources/qeticons.h
View File

@@ -102,6 +102,7 @@ namespace QET {
extern QIcon Hide; extern QIcon Hide;
extern QIcon Home; extern QIcon Home;
extern QIcon HotSpot; extern QIcon HotSpot;
extern QIcon InsertImage;
extern QIcon Lower; extern QIcon Lower;
extern QIcon MoveFile; extern QIcon MoveFile;
extern QIcon Names; extern QIcon Names;

8
sources/titleblock/qettemplateeditor.cpp
View File

@@ -322,6 +322,7 @@ void QETTitleBlockTemplateEditor::initActions() {
cut_ = new QAction(QET::Icons::EditCut, tr("Co&uper", "menu entry"), this); cut_ = new QAction(QET::Icons::EditCut, tr("Co&uper", "menu entry"), this);
copy_ = new QAction(QET::Icons::EditCopy, tr("Cop&ier", "menu entry"), this); copy_ = new QAction(QET::Icons::EditCopy, tr("Cop&ier", "menu entry"), this);
paste_ = new QAction(QET::Icons::EditPaste, tr("C&oller", "menu entry"), this); paste_ = new QAction(QET::Icons::EditPaste, tr("C&oller", "menu entry"), this);
edit_logos_ = new QAction(QET::Icons::InsertImage, tr("G\351rer les logos", "menu entry"), this);
edit_info_ = new QAction(QET::Icons::UserInformations, tr("\311diter les informations compl\351mentaires", "menu entry"), this); edit_info_ = new QAction(QET::Icons::UserInformations, tr("\311diter les informations compl\351mentaires", "menu entry"), this);
zoom_in_ = new QAction(QET::Icons::ZoomIn, tr("Zoom avant", "menu entry"), this); zoom_in_ = new QAction(QET::Icons::ZoomIn, tr("Zoom avant", "menu entry"), this);
zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re", "menu entry"), this); zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re", "menu entry"), this);
@@ -346,9 +347,10 @@ void QETTitleBlockTemplateEditor::initActions() {
cut_ -> setShortcut(QKeySequence::Cut); cut_ -> setShortcut(QKeySequence::Cut);
copy_ -> setShortcut(QKeySequence::Copy); copy_ -> setShortcut(QKeySequence::Copy);
paste_ -> setShortcut(QKeySequence::Paste); paste_ -> setShortcut(QKeySequence::Paste);
edit_logos_ -> setShortcut(QKeySequence(tr("Ctrl+T", "shortcut to manage embedded logos")));
edit_info_ -> setShortcut(QKeySequence(tr("Ctrl+Y", "shortcut to edit extra information"))); edit_info_ -> setShortcut(QKeySequence(tr("Ctrl+Y", "shortcut to edit extra information")));
merge_cells_ -> setShortcut(QKeySequence(tr("Ctrl+K", "shortcut to merge cells"))); merge_cells_ -> setShortcut(QKeySequence(tr("Ctrl+J", "shortcut to merge cells")));
split_cell_ -> setShortcut(QKeySequence(tr("Ctrl+J", "shortcut to split merged cell"))); split_cell_ -> setShortcut(QKeySequence(tr("Ctrl+K", "shortcut to split merged cell")));
zoom_in_ -> setShortcut(QKeySequence::ZoomIn); zoom_in_ -> setShortcut(QKeySequence::ZoomIn);
zoom_out_ -> setShortcut(QKeySequence::ZoomOut); zoom_out_ -> setShortcut(QKeySequence::ZoomOut);
zoom_fit_ -> setShortcut(QKeySequence(tr("Ctrl+9", "shortcut to enable fit zoom"))); zoom_fit_ -> setShortcut(QKeySequence(tr("Ctrl+9", "shortcut to enable fit zoom")));
@@ -368,6 +370,7 @@ void QETTitleBlockTemplateEditor::initActions() {
connect(zoom_out_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomOut())); connect(zoom_out_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomOut()));
connect(zoom_fit_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomFit())); connect(zoom_fit_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomFit()));
connect(zoom_reset_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomReset())); connect(zoom_reset_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomReset()));
connect(edit_logos_, SIGNAL(triggered()), this, SLOT(editLogos()));
connect(edit_info_, SIGNAL(triggered()), this, SLOT(editTemplateInformation())); connect(edit_info_, SIGNAL(triggered()), this, SLOT(editTemplateInformation()));
connect(add_row_, SIGNAL(triggered()), template_edition_area_view_, SLOT(addRowAtEnd())); connect(add_row_, SIGNAL(triggered()), template_edition_area_view_, SLOT(addRowAtEnd()));
connect(add_col_, SIGNAL(triggered()), template_edition_area_view_, SLOT(addColumnAtEnd())); connect(add_col_, SIGNAL(triggered()), template_edition_area_view_, SLOT(addColumnAtEnd()));
@@ -404,6 +407,7 @@ void QETTitleBlockTemplateEditor::initMenus() {
edit_menu_ -> addAction(merge_cells_); edit_menu_ -> addAction(merge_cells_);
edit_menu_ -> addAction(split_cell_); edit_menu_ -> addAction(split_cell_);
edit_menu_ -> addSeparator(); edit_menu_ -> addSeparator();
edit_menu_ -> addAction(edit_logos_);
edit_menu_ -> addAction(edit_info_); edit_menu_ -> addAction(edit_info_);
display_menu_ -> addAction(zoom_in_); display_menu_ -> addAction(zoom_in_);
display_menu_ -> addAction(zoom_out_); display_menu_ -> addAction(zoom_out_);

2
sources/titleblock/qettemplateeditor.h
View File

@@ -49,7 +49,7 @@ class QETTitleBlockTemplateEditor : public QETMainWindow {
QMenu *file_menu_, *edit_menu_,/* *paste_from_menu_, */*display_menu_,/* *tools_menu_*/; QMenu *file_menu_, *edit_menu_,/* *paste_from_menu_, */*display_menu_,/* *tools_menu_*/;
/// actions /// actions
QAction *new_, *open_, *open_from_file_, *save_, *save_as_, *save_as_file_, *quit_; QAction *new_, *open_, *open_from_file_, *save_, *save_as_, *save_as_file_, *quit_;
QAction *undo_, *redo_, *cut_, *copy_, *paste_, *edit_info_, *add_row_, *add_col_, *merge_cells_, *split_cell_; QAction *undo_, *redo_, *cut_, *copy_, *paste_, *edit_logos_, *edit_info_, *add_row_, *add_col_, *merge_cells_, *split_cell_;
QAction *zoom_in_, *zoom_out_, *zoom_fit_, *zoom_reset_; QAction *zoom_in_, *zoom_out_, *zoom_fit_, *zoom_reset_;
/// Location of the currently edited template /// Location of the currently edited template
TitleBlockTemplateLocation location_; TitleBlockTemplateLocation location_;