diff --git a/ico/22x22/insert-image.png b/ico/22x22/insert-image.png new file mode 100644 index 000000000..e7788ec64 Binary files /dev/null and b/ico/22x22/insert-image.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 346906145..2dcdc5c6c 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -140,6 +140,7 @@ ico/22x22/go-home.png ico/22x22/go-up.png ico/22x22/hotspot.png + ico/22x22/insert-image.png ico/22x22/label.png ico/22x22/landscape.png ico/22x22/line.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 9079f8f87..0f41436a0 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -95,6 +95,7 @@ namespace QET { QIcon Hide; QIcon Home; QIcon HotSpot; + QIcon InsertImage; QIcon Lower; QIcon MoveFile; QIcon Names; @@ -297,6 +298,7 @@ void QET::Icons::initIcons() { Home .addFile(":/ico/16x16/go-home.png"); Home .addFile(":/ico/22x22/go-home.png"); HotSpot .addFile(":/ico/22x22/hotspot.png"); + InsertImage .addFile(":/ico/22x22/insert-image.png"); Lower .addFile(":/ico/22x22/lower.png"); MoveFile .addFile(":/ico/16x16/item_move.png"); Names .addFile(":/ico/22x22/names.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 11d7d8b03..61a840996 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -102,6 +102,7 @@ namespace QET { extern QIcon Hide; extern QIcon Home; extern QIcon HotSpot; + extern QIcon InsertImage; extern QIcon Lower; extern QIcon MoveFile; extern QIcon Names; diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index f481d28a0..aa2e9308c 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -322,6 +322,7 @@ void QETTitleBlockTemplateEditor::initActions() { cut_ = new QAction(QET::Icons::EditCut, tr("Co&uper", "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); + 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); 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); @@ -346,9 +347,10 @@ void QETTitleBlockTemplateEditor::initActions() { cut_ -> setShortcut(QKeySequence::Cut); copy_ -> setShortcut(QKeySequence::Copy); 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"))); - merge_cells_ -> setShortcut(QKeySequence(tr("Ctrl+K", "shortcut to merge cells"))); - split_cell_ -> setShortcut(QKeySequence(tr("Ctrl+J", "shortcut to split merged cell"))); + merge_cells_ -> setShortcut(QKeySequence(tr("Ctrl+J", "shortcut to merge cells"))); + split_cell_ -> setShortcut(QKeySequence(tr("Ctrl+K", "shortcut to split merged cell"))); zoom_in_ -> setShortcut(QKeySequence::ZoomIn); zoom_out_ -> setShortcut(QKeySequence::ZoomOut); 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_fit_, SIGNAL(triggered()), template_edition_area_view_, SLOT(zoomFit())); 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(add_row_, SIGNAL(triggered()), template_edition_area_view_, SLOT(addRowAtEnd())); 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(split_cell_); edit_menu_ -> addSeparator(); + edit_menu_ -> addAction(edit_logos_); edit_menu_ -> addAction(edit_info_); display_menu_ -> addAction(zoom_in_); display_menu_ -> addAction(zoom_out_); diff --git a/sources/titleblock/qettemplateeditor.h b/sources/titleblock/qettemplateeditor.h index de387d0c0..cac1af059 100644 --- a/sources/titleblock/qettemplateeditor.h +++ b/sources/titleblock/qettemplateeditor.h @@ -49,7 +49,7 @@ class QETTitleBlockTemplateEditor : public QETMainWindow { QMenu *file_menu_, *edit_menu_,/* *paste_from_menu_, */*display_menu_,/* *tools_menu_*/; /// actions 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_; /// Location of the currently edited template TitleBlockTemplateLocation location_;