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

Title block template editor: added icons for row/columns/cells operations.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1512 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-02-17 07:26:46 +00:00
parent caacd177d7
commit 62bb0d2d01
21 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ico/16x16/edit-table-cell-merge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 634 B

BIN
ico/16x16/edit-table-cell-split.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 554 B

BIN
ico/16x16/edit-table-delete-column.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 845 B

BIN
ico/16x16/edit-table-delete-row.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 863 B

BIN
ico/16x16/edit-table-insert-column-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1016 B

BIN
ico/16x16/edit-table-insert-column-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 997 B

BIN
ico/16x16/edit-table-insert-row-above.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 840 B

BIN
ico/16x16/edit-table-insert-row-under.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 929 B

BIN
ico/22x22/edit-table-cell-merge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 880 B

BIN
ico/22x22/edit-table-cell-split.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 813 B

BIN
ico/22x22/edit-table-delete-column.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ico/22x22/edit-table-delete-row.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ico/22x22/edit-table-insert-column-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ico/22x22/edit-table-insert-column-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ico/22x22/edit-table-insert-row-above.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ico/22x22/edit-table-insert-row-under.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

16
qelectrotech.qrc
View File

@@ -36,6 +36,14 @@
<file>ico/16x16/edit-paste.png</file> <file>ico/16x16/edit-paste.png</file>
<file>ico/16x16/edit-redo.png</file> <file>ico/16x16/edit-redo.png</file>
<file>ico/16x16/edit-select-all.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/edit-undo.png</file>
<file>ico/16x16/endline-circle.png</file> <file>ico/16x16/endline-circle.png</file>
<file>ico/16x16/endline-diamond.png</file> <file>ico/16x16/endline-diamond.png</file>
@@ -112,6 +120,14 @@
<file>ico/22x22/edit-paste.png</file> <file>ico/22x22/edit-paste.png</file>
<file>ico/22x22/edit-redo.png</file> <file>ico/22x22/edit-redo.png</file>
<file>ico/22x22/edit-select-all.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/edit-undo.png</file>
<file>ico/22x22/element-delete.png</file> <file>ico/22x22/element-delete.png</file>
<file>ico/22x22/element-edit.png</file> <file>ico/22x22/element-edit.png</file>

24
sources/qeticons.cpp
View File

@@ -62,6 +62,14 @@ namespace QET {
QIcon EditPaste; QIcon EditPaste;
QIcon EditRedo; QIcon EditRedo;
QIcon EditSelectAll; QIcon EditSelectAll;
QIcon EditTableCellMerge;
QIcon EditTableCellSplit;
QIcon EditTableDeleteColumn;
QIcon EditTableDeleteRow;
QIcon EditTableInsertColumnLeft;
QIcon EditTableInsertColumnRight;
QIcon EditTableInsertRowAbove;
QIcon EditTableInsertRowUnder;
QIcon EditUndo; QIcon EditUndo;
QIcon Element; QIcon Element;
QIcon ElementDelete; QIcon ElementDelete;
@@ -219,6 +227,22 @@ void QET::Icons::initIcons() {
EditRedo .addFile(":/ico/22x22/edit-redo.png"); EditRedo .addFile(":/ico/22x22/edit-redo.png");
EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
EditSelectAll .addFile(":/ico/22x22/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/16x16/edit-undo.png");
EditUndo .addFile(":/ico/22x22/edit-undo.png"); EditUndo .addFile(":/ico/22x22/edit-undo.png");
Element .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-element.png"); Element .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-element.png");

8
sources/qeticons.h
View File

@@ -70,6 +70,14 @@ namespace QET {
extern QIcon EditPaste; extern QIcon EditPaste;
extern QIcon EditRedo; extern QIcon EditRedo;
extern QIcon EditSelectAll; 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 EditUndo;
extern QIcon Element; extern QIcon Element;
extern QIcon ElementDelete; extern QIcon ElementDelete;

4
sources/titleblock/qettemplateeditor.cpp
View File

@@ -304,8 +304,8 @@ void QETTitleBlockTemplateEditor::initActions() {
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);
zoom_fit_ = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351", "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); 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); merge_cells_ = new QAction(QET::Icons::EditTableCellMerge, tr("&Fusionner les cellules", "menu entry"), this);
split_cell_ = new QAction( tr("&S\351parer 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); undo_ -> setIcon(QET::Icons::EditUndo);
redo_ -> setIcon(QET::Icons::EditRedo); redo_ -> setIcon(QET::Icons::EditRedo);

19
sources/titleblock/templateview.cpp
View File

@@ -24,6 +24,7 @@
#include "templatecellsset.h" #include "templatecellsset.h"
#include "dimensionwidget.h" #include "dimensionwidget.h"
#include "qetapp.h" #include "qetapp.h"
#include "qeticons.h"
#define ROW_OFFSET 2 #define ROW_OFFSET 2
#define COL_OFFSET 1 #define COL_OFFSET 1
#define DEFAULT_PREVIEW_WIDTH 600 #define DEFAULT_PREVIEW_WIDTH 600
@@ -380,15 +381,15 @@ qreal TitleBlockTemplateView::zoomFactor() const {
Initialize this view (actions, signals/slots connections, etc.) Initialize this view (actions, signals/slots connections, etc.)
*/ */
void TitleBlockTemplateView::init() { void TitleBlockTemplateView::init() {
add_column_before_ = new QAction(tr("Ajouter une colonne (avant)", "context menu"), this); add_column_before_ = new QAction(QET::Icons::EditTableInsertColumnLeft, tr("Ajouter une colonne (avant)", "context menu"), this);
add_row_before_ = new QAction(tr("Ajouter une ligne (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(tr("Ajouter une colonne (apr\350s)", "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(tr("Ajouter une ligne (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_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); 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_column_ = new QAction(QET::Icons::EditTableDeleteColumn, tr("Supprimer cette colonne", "context menu"), this);
delete_row_ = new QAction(tr("Supprimer cette ligne", "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); 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_column_before_, SIGNAL(triggered()), this, SLOT(addColumnBefore()));
connect(add_row_before_, SIGNAL(triggered()), this, SLOT(addRowBefore())); connect(add_row_before_, SIGNAL(triggered()), this, SLOT(addRowBefore()));