[qet] [1773] Title block template editor: added a menu entry to manage logos.

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 1773
Author:   xavier
Date:     2012-05-09 04:31:43 +0200 (Wed, 09 May 2012)
Log Message:
-----------
Title block template editor: added a menu entry to manage logos.

Modified Paths:
--------------
    trunk/qelectrotech.qrc
    trunk/sources/qeticons.cpp
    trunk/sources/qeticons.h
    trunk/sources/titleblock/qettemplateeditor.cpp
    trunk/sources/titleblock/qettemplateeditor.h

Added Paths:
-----------
    trunk/ico/22x22/insert-image.png

Added: trunk/ico/22x22/insert-image.png
===================================================================
--- trunk/ico/22x22/insert-image.png	                        (rev 0)
+++ trunk/ico/22x22/insert-image.png	2012-05-09 02:31:43 UTC (rev 1773)
@@ -0,0 +1,12 @@
+\x89PNG
+
+
+IHDRĴl;sBIT|d\x88	pHYsvv}Ղ\xCCtEXtSoftwarewww.inkscape.org\x9B\xEE<\x90IDATxڵ\x94]h\E\x86\x9F\xF9Μ\xFD\xC9\xD9ݤ\x89i\x89\xA6BjkS\xCCRD\xA9\x8D\xE2E\x91\x82D\xA1\xD1\xDB\\xE8\x8DD$\xA2\xBD0\x82-\xA2\xE2E\xF1\xAF\x90 \xA9?7\xA5
+\xD6B\\x8B\xA9\x96X\xADEh\xB4I\x93l6ٜ\x9F=g<\xCEb\xD6Ex\x99o8\xCC;\xEF|ge\x8C\xE1\xFF@\x93\xA0b\xF80I\xD2\xD5ı\xE7\xA0\xB3\xB1\xC7\xF5z&\xE3\xA5\xD8\xF3
+\xD0\xD7\xD7w\xE7wgϞ\x82\xA0\xBEI\xB3\xFE]ӠyE\x91\x9F\xCDf\xEFb\xE3\x84\xC0X\xFC\xFE\xF0fy\xF5:,Kh\xDFR6\xE81\xFF\xDD=\x84&\x82\xD0@\x94F\xAC#\xE1\xAFi\x8F\xB5\xBFI\xAB\x98\xB8\xF5\xE5\xFD\x86|tipn\x80\x9Cs\xCB\xF0\xE7,\xF850\x80Jd%\xB1l0W@n\xA2\x81\xAA\xF3Ob\xAC\xE0V\xF6m逰_pu\x8CI̛\xA5\xB6\x83,Ӝ\x98\xD8K\x80\xAB\xA8h\x8B\xEC\xBCB\xB7\x{140741}\xC2e\x98\x9E\x87Zbl\xD6,\xD2`,\xD0.\xDFc\x94\xE2\x93\xF1,˞\xE0U\xE4\xFD\x8B\xF7\xCE\xE3\xEC\xED\xC1\x9C\xAB\xD2\xEAg(M[\x9C\xFE]ӿ\xCDcΕ\xFA-@r\xCA>=\xADL\x9D\xA6\xC4ß\x88 D\xD4j\xF2\xF5,\x91\x9A\xC7\xD2F9D\xA8\xFA*NN\x82\x88\xA0\xA4n\xA2\xA2\x9E\xEB1\xB4ab\xA0\x90\xF2-\xBA:{\xB6[l\xBDQ\x98\xBD\xF0\xF3Ő\x99\x8A\xE0\xFB\xB5UC?\x80\x9D\xBBw\xF3\xE2ȫ캵\x97?\x9D\xE7\xC8\xCF\xD6O`H\x90\xB5\xADp%OU
+xi\x87-ۄ\xBCS#\xDF\xD1ڑ\xA5\xC0\xB5 \xC3B\x94\xA3B\x9E\x91׎\xF3k\xDB\x8F~s\x80\xCAͳ\xBC\xF1\xD6(ccc\xE7\x80+M\xC6
+\xC8\xE5r\xA4\xB4\x8D\x932)M(i"OXXZY\xEDg*\x95^M\xEC8\xBBzw\xF2\xFCW\xCF\xF0Ў)^\xFEv\x98\xEE\xEEn388\xF8\x941\xE6ҺĶm#\xB6Eŵq\x97\x84\xB2\xAF\xC0\xB2ɤ5\xF7\xDC\xDD\xCF\xF8\xF88\xA5R\x890
+\xA9.\xAEК
+(/T\xB1,K\xF9\xBE\xFF%p\xE8q\xA2\x82\xA0\x8DB\xA7\x85|A\xE3\xA4\xD3Q\x8E\xC8\xCAs\xF4\xE81N];EDZ-t\xBDԉ[\x89j\x86\xC5\xC5e\xFA\xDF\xDE\xC1\x83\xB3\x9F^~\xEF^\xE0MU\xF7-\x8B\x8FOLL\x9C\xC3\xA5"\xB2\xAA\xC6CШ\xF5\x88\xE6\x95\xFBC\xDA3
+A\x91\xCB*\xFCP\xB0\xB4)\x9B\x8F\xB9\x8D\xB1\xCE,h\x80\xA9\xA9\xA9偁\x81\xD77{6GGG;\xD4{\xA8c\xE8\x9D1T`HYǟ4\x90\xC1)\xA4ȷ\xA59|\xC7\x80\xF34\xDEe@6\x93\xEB\xBA\xFB\x8D1?V\xFD\xAA\x99\xA9\xCC\xEB	1\xEF\xFE \xA6\xEB\xB9V\xB3\xAC\xAF晘R\xAC>
+\xD0\xE83\x9Bs(f\xEDl!^R\x83\x88\xAA\xAB\x8D"\xA33.\xD0x\xC2\xF5\xB1ؒj\x99<x\xD7A\x8E|\xD4\xC9\xC3}\x8F\x94\xA6$i\xAFW\xFBbM\xC6j\xFF\xF6\xB5\xDF\xFFC\x8A\xB7l\x96\x90nIEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/qelectrotech.qrc
===================================================================
--- trunk/qelectrotech.qrc	2012-05-09 02:31:41 UTC (rev 1772)
+++ trunk/qelectrotech.qrc	2012-05-09 02:31:43 UTC (rev 1773)
@@ -140,6 +140,7 @@
 	<file>ico/22x22/go-home.png</file>
 	<file>ico/22x22/go-up.png</file>
 	<file>ico/22x22/hotspot.png</file>
+	<file>ico/22x22/insert-image.png</file>
 	<file>ico/22x22/label.png</file>
 	<file>ico/22x22/landscape.png</file>
 	<file>ico/22x22/line.png</file>

Modified: trunk/sources/qeticons.cpp
===================================================================
--- trunk/sources/qeticons.cpp	2012-05-09 02:31:41 UTC (rev 1772)
+++ trunk/sources/qeticons.cpp	2012-05-09 02:31:43 UTC (rev 1773)
@@ -95,6 +95,7 @@
 		QIcon Hide;
 		QIcon Home;
 		QIcon HotSpot;
+		QIcon InsertImage;
 		QIcon Lower;
 		QIcon MoveFile;
 		QIcon Names;
@@ -297,6 +298,7 @@
 	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");

Modified: trunk/sources/qeticons.h
===================================================================
--- trunk/sources/qeticons.h	2012-05-09 02:31:41 UTC (rev 1772)
+++ trunk/sources/qeticons.h	2012-05-09 02:31:43 UTC (rev 1773)
@@ -102,6 +102,7 @@
 		extern QIcon Hide;
 		extern QIcon Home;
 		extern QIcon HotSpot;
+		extern QIcon InsertImage;
 		extern QIcon Lower;
 		extern QIcon MoveFile;
 		extern QIcon Names;

Modified: trunk/sources/titleblock/qettemplateeditor.cpp
===================================================================
--- trunk/sources/titleblock/qettemplateeditor.cpp	2012-05-09 02:31:41 UTC (rev 1772)
+++ trunk/sources/titleblock/qettemplateeditor.cpp	2012-05-09 02:31:43 UTC (rev 1773)
@@ -322,6 +322,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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_);

Modified: trunk/sources/titleblock/qettemplateeditor.h
===================================================================
--- trunk/sources/titleblock/qettemplateeditor.h	2012-05-09 02:31:41 UTC (rev 1772)
+++ trunk/sources/titleblock/qettemplateeditor.h	2012-05-09 02:31:43 UTC (rev 1773)
@@ -49,7 +49,7 @@
 	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_;


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/