| [qet] [1512] Title block template editor: added icons for row/columns/ cells operations. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 1512
Author: xavier
Date: 2012-02-17 08:26:46 +0100 (Fri, 17 Feb 2012)
Log Message:
-----------
Title block template editor: added icons for row/columns/cells operations.
Modified Paths:
--------------
branches/0.3/qelectrotech.qrc
branches/0.3/sources/qeticons.cpp
branches/0.3/sources/qeticons.h
branches/0.3/sources/titleblock/qettemplateeditor.cpp
branches/0.3/sources/titleblock/templateview.cpp
Added Paths:
-----------
branches/0.3/ico/16x16/edit-table-cell-merge.png
branches/0.3/ico/16x16/edit-table-cell-split.png
branches/0.3/ico/16x16/edit-table-delete-column.png
branches/0.3/ico/16x16/edit-table-delete-row.png
branches/0.3/ico/16x16/edit-table-insert-column-left.png
branches/0.3/ico/16x16/edit-table-insert-column-right.png
branches/0.3/ico/16x16/edit-table-insert-row-above.png
branches/0.3/ico/16x16/edit-table-insert-row-under.png
branches/0.3/ico/22x22/edit-table-cell-merge.png
branches/0.3/ico/22x22/edit-table-cell-split.png
branches/0.3/ico/22x22/edit-table-delete-column.png
branches/0.3/ico/22x22/edit-table-delete-row.png
branches/0.3/ico/22x22/edit-table-insert-column-left.png
branches/0.3/ico/22x22/edit-table-insert-column-right.png
branches/0.3/ico/22x22/edit-table-insert-row-above.png
branches/0.3/ico/22x22/edit-table-insert-row-under.png
Added: branches/0.3/ico/16x16/edit-table-cell-merge.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-cell-merge.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-cell-split.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-cell-split.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-delete-column.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-delete-column.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-delete-row.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-delete-row.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-insert-column-left.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-insert-column-left.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-insert-column-right.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-insert-column-right.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-insert-row-above.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-insert-row-above.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/16x16/edit-table-insert-row-under.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/16x16/edit-table-insert-row-under.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-cell-merge.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-cell-merge.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-cell-split.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-cell-split.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-delete-column.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-delete-column.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-delete-row.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-delete-row.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-insert-column-left.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-insert-column-left.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-insert-column-right.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-insert-column-right.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-insert-row-above.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-insert-row-above.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/0.3/ico/22x22/edit-table-insert-row-under.png
===================================================================
(Binary files differ)
Property changes on: branches/0.3/ico/22x22/edit-table-insert-row-under.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/0.3/qelectrotech.qrc
===================================================================
--- branches/0.3/qelectrotech.qrc 2012-02-16 20:50:37 UTC (rev 1511)
+++ branches/0.3/qelectrotech.qrc 2012-02-17 07:26:46 UTC (rev 1512)
@@ -36,6 +36,14 @@
<file>ico/16x16/edit-paste.png</file>
<file>ico/16x16/edit-redo.png</file>
<file>ico/16x16/edit-select-all.png</file>
+ <file>ico/16x16/edit-table-insert-row-above.png</file>
+ <file>ico/16x16/edit-table-insert-column-left.png</file>
+ <file>ico/16x16/edit-table-insert-row-under.png</file>
+ <file>ico/16x16/edit-table-delete-row.png</file>
+ <file>ico/16x16/edit-table-insert-column-right.png</file>
+ <file>ico/16x16/edit-table-delete-column.png</file>
+ <file>ico/16x16/edit-table-cell-split.png</file>
+ <file>ico/16x16/edit-table-cell-merge.png</file>
<file>ico/16x16/edit-undo.png</file>
<file>ico/16x16/endline-circle.png</file>
<file>ico/16x16/endline-diamond.png</file>
@@ -112,6 +120,14 @@
<file>ico/22x22/edit-paste.png</file>
<file>ico/22x22/edit-redo.png</file>
<file>ico/22x22/edit-select-all.png</file>
+ <file>ico/22x22/edit-table-insert-row-above.png</file>
+ <file>ico/22x22/edit-table-insert-column-left.png</file>
+ <file>ico/22x22/edit-table-insert-row-under.png</file>
+ <file>ico/22x22/edit-table-delete-row.png</file>
+ <file>ico/22x22/edit-table-insert-column-right.png</file>
+ <file>ico/22x22/edit-table-delete-column.png</file>
+ <file>ico/22x22/edit-table-cell-split.png</file>
+ <file>ico/22x22/edit-table-cell-merge.png</file>
<file>ico/22x22/edit-undo.png</file>
<file>ico/22x22/element-delete.png</file>
<file>ico/22x22/element-edit.png</file>
Modified: branches/0.3/sources/qeticons.cpp
===================================================================
--- branches/0.3/sources/qeticons.cpp 2012-02-16 20:50:37 UTC (rev 1511)
+++ branches/0.3/sources/qeticons.cpp 2012-02-17 07:26:46 UTC (rev 1512)
@@ -62,6 +62,14 @@
QIcon EditPaste;
QIcon EditRedo;
QIcon EditSelectAll;
+ QIcon EditTableCellMerge;
+ QIcon EditTableCellSplit;
+ QIcon EditTableDeleteColumn;
+ QIcon EditTableDeleteRow;
+ QIcon EditTableInsertColumnLeft;
+ QIcon EditTableInsertColumnRight;
+ QIcon EditTableInsertRowAbove;
+ QIcon EditTableInsertRowUnder;
QIcon EditUndo;
QIcon Element;
QIcon ElementDelete;
@@ -219,6 +227,22 @@
EditRedo .addFile(":/ico/22x22/edit-redo.png");
EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
EditSelectAll .addFile(":/ico/22x22/edit-select-all.png");
+ EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png");
+ EditTableCellMerge .addFile(":ico/22x22/edit-table-cell-merge.png");
+ EditTableCellSplit .addFile(":ico/16x16/edit-table-cell-split.png");
+ EditTableCellSplit .addFile(":ico/22x22/edit-table-cell-split.png");
+ EditTableDeleteColumn .addFile(":ico/16x16/edit-table-delete-column.png");
+ EditTableDeleteColumn .addFile(":ico/22x22/edit-table-delete-column.png");
+ EditTableDeleteRow .addFile(":ico/16x16/edit-table-delete-row.png");
+ EditTableDeleteRow .addFile(":ico/22x22/edit-table-delete-row.png");
+ EditTableInsertColumnLeft .addFile(":ico/16x16/edit-table-insert-column-left.png");
+ EditTableInsertColumnLeft .addFile(":ico/22x22/edit-table-insert-column-left.png");
+ EditTableInsertColumnRight.addFile(":ico/16x16/edit-table-insert-column-right.png");
+ EditTableInsertColumnRight.addFile(":ico/22x22/edit-table-insert-column-right.png");
+ EditTableInsertRowAbove .addFile(":ico/16x16/edit-table-insert-row-above.png");
+ EditTableInsertRowAbove .addFile(":ico/22x22/edit-table-insert-row-above.png");
+ EditTableInsertRowUnder .addFile(":ico/16x16/edit-table-insert-row-under.png");
+ EditTableInsertRowUnder .addFile(":ico/22x22/edit-table-insert-row-under.png");
EditUndo .addFile(":/ico/16x16/edit-undo.png");
EditUndo .addFile(":/ico/22x22/edit-undo.png");
Element .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-element.png");
Modified: branches/0.3/sources/qeticons.h
===================================================================
--- branches/0.3/sources/qeticons.h 2012-02-16 20:50:37 UTC (rev 1511)
+++ branches/0.3/sources/qeticons.h 2012-02-17 07:26:46 UTC (rev 1512)
@@ -70,6 +70,14 @@
extern QIcon EditPaste;
extern QIcon EditRedo;
extern QIcon EditSelectAll;
+ extern QIcon EditTableCellMerge;
+ extern QIcon EditTableCellSplit;
+ extern QIcon EditTableDeleteColumn;
+ extern QIcon EditTableDeleteRow;
+ extern QIcon EditTableInsertColumnLeft;
+ extern QIcon EditTableInsertColumnRight;
+ extern QIcon EditTableInsertRowAbove;
+ extern QIcon EditTableInsertRowUnder;
extern QIcon EditUndo;
extern QIcon Element;
extern QIcon ElementDelete;
Modified: branches/0.3/sources/titleblock/qettemplateeditor.cpp
===================================================================
--- branches/0.3/sources/titleblock/qettemplateeditor.cpp 2012-02-16 20:50:37 UTC (rev 1511)
+++ branches/0.3/sources/titleblock/qettemplateeditor.cpp 2012-02-17 07:26:46 UTC (rev 1512)
@@ -304,8 +304,8 @@
zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re", "menu entry"), this);
zoom_fit_ = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351", "menu entry"), this);
zoom_reset_ = new QAction(QET::Icons::ZoomOriginal, tr("Pas de zoom", "menu entry"), this);
- merge_cells_ = new QAction( tr("&Fusionner les cellules", "menu entry"), this);
- split_cell_ = new QAction( tr("&S\351parer les cellules", "menu entry"), this);
+ merge_cells_ = new QAction(QET::Icons::EditTableCellMerge, tr("&Fusionner les cellules", "menu entry"), this);
+ split_cell_ = new QAction(QET::Icons::EditTableCellSplit, tr("&S\351parer les cellules", "menu entry"), this);
undo_ -> setIcon(QET::Icons::EditUndo);
redo_ -> setIcon(QET::Icons::EditRedo);
Modified: branches/0.3/sources/titleblock/templateview.cpp
===================================================================
--- branches/0.3/sources/titleblock/templateview.cpp 2012-02-16 20:50:37 UTC (rev 1511)
+++ branches/0.3/sources/titleblock/templateview.cpp 2012-02-17 07:26:46 UTC (rev 1512)
@@ -24,6 +24,7 @@
#include "templatecellsset.h"
#include "dimensionwidget.h"
#include "qetapp.h"
+#include "qeticons.h"
#define ROW_OFFSET 2
#define COL_OFFSET 1
#define DEFAULT_PREVIEW_WIDTH 600
@@ -380,15 +381,15 @@
Initialize this view (actions, signals/slots connections, etc.)
*/
void TitleBlockTemplateView::init() {
- add_column_before_ = new QAction(tr("Ajouter une colonne (avant)", "context menu"), this);
- add_row_before_ = new QAction(tr("Ajouter une ligne (avant)", "context menu"), this);
- add_column_after_ = new QAction(tr("Ajouter une colonne (apr\350s)", "context menu"), this);
- add_row_after_ = new QAction(tr("Ajouter une ligne (apr\350s)", "context menu"), this);
- edit_column_dim_ = new QAction(tr("Modifier les dimensions de cette colonne", "context menu"), this);
- edit_row_dim_ = new QAction(tr("Modifier les dimensions de cette ligne", "context menu"), this);
- delete_column_ = new QAction(tr("Supprimer cette colonne", "context menu"), this);
- delete_row_ = new QAction(tr("Supprimer cette ligne", "context menu"), this);
- change_preview_width_ = new QAction(tr("Modifier la largeur de cet aper\347u", "context menu"), this);
+ add_column_before_ = new QAction(QET::Icons::EditTableInsertColumnLeft, tr("Ajouter une colonne (avant)", "context menu"), this);
+ add_row_before_ = new QAction(QET::Icons::EditTableInsertRowAbove, tr("Ajouter une ligne (avant)", "context menu"), this);
+ add_column_after_ = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne (apr\350s)", "context menu"), this);
+ add_row_after_ = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne (apr\350s)", "context menu"), this);
+ edit_column_dim_ = new QAction( tr("Modifier les dimensions de cette colonne", "context menu"), this);
+ edit_row_dim_ = new QAction( tr("Modifier les dimensions de cette ligne", "context menu"), this);
+ delete_column_ = new QAction(QET::Icons::EditTableDeleteColumn, tr("Supprimer cette colonne", "context menu"), this);
+ delete_row_ = new QAction(QET::Icons::EditTableDeleteRow, tr("Supprimer cette ligne", "context menu"), this);
+ change_preview_width_ = new QAction( tr("Modifier la largeur de cet aper\347u", "context menu"), this);
connect(add_column_before_, SIGNAL(triggered()), this, SLOT(addColumnBefore()));
connect(add_row_before_, SIGNAL(triggered()), this, SLOT(addRowBefore()));