Backport Nuri icons work to branch 0.60

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5126 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-12-01 10:19:10 +00:00
parent c1631bf2d6
commit b1e2028551
325 changed files with 843 additions and 140 deletions

View File

@@ -138,17 +138,17 @@ void ElementsCollectionWidget::leaveEvent(QEvent *event)
void ElementsCollectionWidget::setUpAction()
{
m_open_dir = new QAction(QET::Icons::DocumentOpen, tr("Ouvrir le dossier correspondant"), this);
m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this);
m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this);
m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this);
m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this);
m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this);
m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this);
m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this);
m_show_this_dir = new QAction(QET::Icons::ZoomDraw, tr("Afficher uniquement ce dossier"), this);
m_show_all_dir = new QAction(QET::Icons::ZoomOriginal, tr("Afficher tous les dossiers"), this);
m_dir_propertie = new QAction(QET::Icons::Folder, tr("Propriété du dossier"), this);
m_open_dir = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this);
m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this);
m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this);
m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this);
m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this);
m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this);
m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this);
m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this);
m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis, tr("Afficher uniquement ce dossier"), this);
m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this);
m_dir_propertie = new QAction(QET::Icons::FolderProperties, tr("Propriété du dossier"), this);
}
/**
@@ -479,7 +479,7 @@ void ElementsCollectionWidget::showThisDir()
showAndExpandItem(m_showed_index, true, true);
ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index);
if (eci)
eci->setBackground(QBrush(Qt::yellow));
eci->setBackground(QBrush(QColor(255, 204, 0, 255)));
search();
}
else

View File

@@ -138,23 +138,23 @@ void QETElementEditor::setFileName(const QString &fn) {
*/
void QETElementEditor::setupActions() {
new_element = new QAction(QET::Icons::DocumentNew, tr("&Nouveau"), this);
open = new QAction(QET::Icons::DocumentOpen, tr("&Ouvrir"), this);
open_file = new QAction(QET::Icons::DocumentOpen, tr("&Ouvrir depuis un fichier"), this);
open_dxf = new QAction(QET::Icons::DocumentOpen, tr("&Lancer le plugin convertisseur DXF"), this);
open = new QAction(QET::Icons::FolderOpen, tr("&Ouvrir"), this);
open_file = new QAction(QET::Icons::FolderOpen, tr("&Ouvrir depuis un fichier"), this);
open_dxf = new QAction(QET::Icons::RunDxf, tr("&Lancer le plugin convertisseur DXF"), this);
save = new QAction(QET::Icons::DocumentSave, tr("&Enregistrer"), this);
save_as = new QAction(QET::Icons::DocumentSaveAs, tr("Enregistrer sous"), this);
save_as_file = new QAction(QET::Icons::DocumentSaveAs, tr("Enregistrer dans un fichier"), this);
reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger"), this);
quit = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this);
selectall = new QAction(QET::Icons::EditSelectAll, tr("Tout sélectionner"), this);
deselectall = new QAction( tr("Désélectionner tout"), this);
deselectall = new QAction(QET::Icons::EditSelectNone, tr("Désélectionner tout"), this);
cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this);
copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this);
paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), this);
paste_in_area = new QAction(QET::Icons::EditPaste, tr("C&oller dans la zone..."), this);
paste_from_file = new QAction(QET::Icons::XmlTextFile, tr("un fichier"), this);
paste_from_elmt = new QAction(QET::Icons::Element, tr("un élément"), this);
inv_select = new QAction( tr("Inverser la sélection"), this);
inv_select = new QAction(QET::Icons::EditSelectInvert, tr("Inverser la sélection"), this);
edit_delete = new QAction(QET::Icons::EditDelete, tr("&Supprimer"), this);
edit_names = new QAction(QET::Icons::Names, tr("Éditer le nom et les traductions de l'élément"), this);
edit_author = new QAction(QET::Icons::UserInformations, tr("Éditer les informations sur l'auteur"), this);

View File

@@ -43,19 +43,19 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
elements_panel = new ElementsPanel(this);
// initialise les actions
open_directory = new QAction(QET::Icons::DocumentOpen, tr("Ouvrir le dossier correspondant"), this);
copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this);
prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this);
prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this);
prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this);
prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this);
prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this);
prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this);
prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this);
prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this);
prj_move_diagram_upx10 = new QAction(QET::Icons::GoUp, tr("Remonter ce folio x10"), this);
prj_move_diagram_top = new QAction(QET::Icons::GoUp, tr("Remonter ce folio au debut"), this);
prj_move_diagram_downx10 = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio x10"), this);
open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this);
copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this);
prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this);
prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this);
prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this);
prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this);
prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this);
prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this);
prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this);
prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this);
prj_move_diagram_upx10 = new QAction(QET::Icons::GoUpDouble, tr("Remonter ce folio x10"), this);
prj_move_diagram_top = new QAction(QET::Icons::GoTop, tr("Remonter ce folio au debut"), this);
prj_move_diagram_downx10 = new QAction(QET::Icons::GoDownDouble, tr("Abaisser ce folio x10"), this);
tbt_add = new QAction(QET::Icons::TitleBlock, tr("Nouveau modèle"), this);
tbt_edit = new QAction(QET::Icons::TitleBlock, tr("Éditer ce modèle"), this);
tbt_remove = new QAction(QET::Icons::TitleBlock, tr("Supprimer ce modèle"), this);

View File

@@ -387,7 +387,7 @@ void ProjectView::addDiagram(DiagramView *diagram_view)
return;
// Add new tab for the diagram
m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title());
m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title());
diagram_view->setFrameStyle(QFrame::Plain | QFrame::NoFrame);
m_diagram_view_list << diagram_view;

View File

@@ -289,11 +289,11 @@ void QETDiagramEditor::setUpActions()
infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this);
infos_diagram -> setShortcut( QKeySequence( tr("Ctrl+L") ) );
prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this);
prj_edit_prop = new QAction(QET::Icons::ProjectProperties, tr("Propriétés du projet"), this);
prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this);
prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le folio"), this);
prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this);
prj_diagramList = new QAction(QET::Icons::listDrawings, tr("Ajouter un sommaire"), this);
prj_diagramList = new QAction(QET::Icons::TableOfContent, tr("Ajouter un sommaire"), this);
prj_nomenclature = new QAction(QET::Icons::DocumentSpreadsheet, tr("Exporter une nomenclature"), this);
prj_terminalBloc = new QAction(QET::Icons::TerminalStrip, tr("Lancer le plugin de creation de bornier"), this);
tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this);
@@ -349,9 +349,9 @@ void QETDiagramEditor::setUpActions()
//Selections Actions (related to a selected item)
delete_selection = m_selection_actions_group.addAction( QET::Icons::EditDelete, tr("Supprimer") );
rotate_selection = m_selection_actions_group.addAction( QET::Icons::ObjectRotateRight, tr("Pivoter") );
rotate_selection = m_selection_actions_group.addAction( QET::Icons::TransformRotate, tr("Pivoter") );
rotate_texts = m_selection_actions_group.addAction( QET::Icons::ObjectRotateRight, tr("Orienter les textes") );
find_element = m_selection_actions_group.addAction( tr("Retrouver dans le panel") );
find_element = m_selection_actions_group.addAction( QET::Icons::ZoomDraw, tr("Retrouver dans le panel") );
edit_selection = m_selection_actions_group.addAction( QET::Icons::ElementEdit, tr("Éditer l'item sélectionné") );
delete_selection -> setShortcut( QKeySequence::Delete);
@@ -373,9 +373,9 @@ void QETDiagramEditor::setUpActions()
connect(&m_selection_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::selectionGroupTriggered);
//Select Action
QAction *select_all = m_select_actions_group.addAction( QET::Icons::EditSelectAll, tr("Tout sélectionner") );
QAction *select_nothing = m_select_actions_group.addAction( tr("Désélectionner tout") );
QAction *select_invert = m_select_actions_group.addAction( tr("Inverser la sélection") );
QAction *select_all = m_select_actions_group.addAction( QET::Icons::EditSelectAll, tr("Tout sélectionner") );
QAction *select_nothing = m_select_actions_group.addAction( QET::Icons::EditSelectNone, tr("Désélectionner tout") );
QAction *select_invert = m_select_actions_group.addAction( QET::Icons::EditSelectInvert, tr("Inverser la sélection") );
select_all -> setShortcut(QKeySequence::SelectAll);
select_nothing -> setShortcut(QKeySequence::Deselect);
@@ -623,7 +623,7 @@ void QETDiagramEditor::setUpMenu() {
// menu Affichage
QMenu *projects_view_mode = menu_affichage -> addMenu(tr("Afficher les projets"));
QMenu *projects_view_mode = menu_affichage -> addMenu(QET::Icons::ConfigureToolbars, tr("Afficher les projets"));
projects_view_mode -> setTearOffEnabled(true);
projects_view_mode -> addAction(windowed_view_mode);
projects_view_mode -> addAction(tabbed_view_mode);

View File

@@ -33,6 +33,7 @@ namespace QET {
QIcon BringForward;
QIcon Cancel;
QIcon Conductor;
QIcon ConductorEdit;
QIcon ConductorSettings;
QIcon Configure;
QIcon ConfigureToolbars;
@@ -67,6 +68,8 @@ namespace QET {
QIcon EditRedo;
QIcon EditRename;
QIcon EditSelectAll;
QIcon EditSelectInvert;
QIcon EditSelectNone;
QIcon EditTableCellMerge;
QIcon EditTableCellSplit;
QIcon EditTableDeleteColumn;
@@ -81,7 +84,8 @@ namespace QET {
QIcon ElementDelete;
QIcon ElementEdit;
QIcon ElementNew;
QIcon EndLineCircle;
QIcon ElementSmall;
QIcon EndLineCircle;
QIcon EndLineDiamond;
QIcon EndLineNone;
QIcon EndLineSimple;
@@ -91,11 +95,19 @@ namespace QET {
QIcon FolderDelete;
QIcon FolderEdit;
QIcon FolderNew;
QIcon FolderOnlyThis;
QIcon FolderOpen;
QIcon FolderProperties;
QIcon FolderShowAll;
QIcon Forbidden;
QIcon FullScreenEnter;
QIcon FullScreenExit;
QIcon GoDown;
QIcon GoUp;
QIcon GoBottom;
QIcon GoDown;
QIcon GoDownDouble;
QIcon GoTop;
QIcon GoUp;
QIcon GoUpDouble;
QIcon Ground;
QIcon Grid;
QIcon Hide;
@@ -134,6 +146,7 @@ namespace QET {
QIcon Projects;
QIcon ProjectFile;
QIcon ProjectFileGP;
QIcon ProjectProperties;
QIcon QETIcon;
QIcon QETLogo;
QIcon QETOxygenLogo;
@@ -141,13 +154,18 @@ namespace QET {
QIcon Raise;
QIcon Remove;
QIcon Restore;
QIcon RunDxf;
QIcon SendBackward;
QIcon Settings;
QIcon SinglePage;
QIcon South;
QIcon Start;
QIcon Terminal;
QIcon TableOfContent;
QIcon Terminal;
QIcon TitleBlock;
QIcon TitleBlockBottom;
QIcon TitleBlockRight;
QIcon TransformRotate;
QIcon UserInformations;
QIcon ViewFitWidth;
QIcon ViewFitWindow;
@@ -192,6 +210,7 @@ namespace QET {
QIcon QETVideo;
QIcon super;
QIcon sub;
QIcon textGroup;
}
}
@@ -219,21 +238,25 @@ void QET::Icons::initIcons() {
ArrowRightDouble .addFile(":/ico/22x22/arrow-right-double.png");
Autoconnect .addFile(":/ico/22x22/autoconnect.png");
BringForward .addFile(":/ico/22x22/bring_forward.png");
Cancel .addFile(":/ico/16x16/item_cancel.png");
Conductor .addFile(":/ico/22x22/conductor.png");
ConductorSettings .addFile(":/ico/22x22/conductor2.png");
Cancel .addFile(":/ico/16x16/item-cancel.png");
ConductorEdit .addFile(":/ico/16x16/conductor-edit.png");
ConductorSettings .addFile(":/ico/16x16/conductor-reset.png");
ConductorSettings .addFile(":/ico/22x22/conductor2.png");
Configure .addFile(":/ico/16x16/configure.png");
Configure .addFile(":/ico/22x22/configure.png");
ConfigureToolbars .addFile(":/ico/16x16/configure-toolbars.png");
ConfigureToolbars .addFile(":/ico/22x22/configure-toolbars.png");
IC_CopyFile .addFile(":/ico/16x16/item_copy.png");
DefaultConductor .addFile(":/ico/22x22/conductor3.png");
DiagramAdd .addFile(":/ico/22x22/diagram_add.png");
IC_CopyFile .addFile(":/ico/16x16/item-copy.png");
DiagramAdd .addFile(":/ico/16x16/folio-new.png");
DiagramAdd .addFile(":/ico/22x22/diagram_add.png");
Diagram .addFile(":/ico/16x16/diagram.png");
Diagram .addFile(":/ico/diagram.png");
DiagramBg .addFile(":/ico/22x22/diagram_bg.png");
DiagramDelete .addFile(":/ico/22x22/diagram_del.png");
DiagramDelete .addFile(":/ico/16x16/folio-delete.png");
DiagramDelete .addFile(":/ico/22x22/diagram_del.png");
DialogCancel .addFile(":/ico/16x16/dialog-cancel.png");
DialogCancel .addFile(":/ico/22x22/dialog-cancel.png");
DialogInformation .addFile(":/ico/16x16/folio-properties.png");
DialogInformation .addFile(":/ico/22x22/dialog-information.png");
DialogOk .addFile(":/ico/16x16/dialog-ok.png");
DialogOk .addFile(":/ico/22x22/dialog-ok.png");
@@ -241,7 +264,7 @@ void QET::Icons::initIcons() {
DocumentClose .addFile(":/ico/22x22/document-close.png");
DocumentExport .addFile(":/ico/16x16/document-export.png");
DocumentExport .addFile(":/ico/22x22/document-export.png");
DocumentSpreadsheet .addFile(":/ico/22x22/qelectrotab-into.png");
DocumentSpreadsheet .addFile(":/ico/16x16/export-csv.png");
DocumentExport .addFile(":/ico/128x128/document-export.png");
DocumentImport .addFile(":/ico/16x16/document-import.png");
DocumentImport .addFile(":/ico/22x22/document-import.png");
@@ -289,10 +312,12 @@ void QET::Icons::initIcons() {
EditRedo .addFile(":/ico/16x16/edit-redo.png");
EditRedo .addFile(":/ico/22x22/edit-redo.png");
}
EditRename .addFile(":/ico/16x16/edit-rename.png");
EditRename .addFile(":/ico/22x22/edit-rename.png");
EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
EditSelectAll .addFile(":/ico/22x22/edit-select-all.png");
EditRename .addFile(":/ico/16x16/edit-rename.png");
EditRename .addFile(":/ico/22x22/edit-rename.png");
EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
EditSelectAll .addFile(":/ico/22x22/edit-select-all.png");
EditSelectInvert .addFile(":/ico/16x16/edit-select-invert.png");
EditSelectNone .addFile(":/ico/16x16/edit-select-none.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");
@@ -316,33 +341,49 @@ void QET::Icons::initIcons() {
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");
Element .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-element.png");
Element .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-element.png");
ElementDelete .addFile(":/ico/22x22/element-delete.png");
Element .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-element.png");
Element .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-element.png");
Element .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-element.png");
ElementDelete .addFile(":/ico/16x16/element-delete.png");
ElementDelete .addFile(":/ico/22x22/element-delete.png");
ElementEdit .addFile(":/ico/16x16/element-edit.png");
ElementEdit .addFile(":/ico/22x22/element-edit.png");
ElementNew .addFile(":/ico/16x16/element-new.png");
ElementNew .addFile(":/ico/22x22/element-new.png");
EndLineCircle .addFile(":/ico/16x16/endline-circle.png");
ElementSmall .addFile(":/ico/16x16/element.png");
EndLineCircle .addFile(":/ico/16x16/endline-circle.png");
EndLineDiamond .addFile(":/ico/16x16/endline-diamond.png");
EndLineNone .addFile(":/ico/16x16/endline-none.png");
EndLineSimple .addFile(":/ico/16x16/endline-simple.png");
EndLineTriangle .addFile(":/ico/16x16/endline-triangle.png");
EPS .addFile(":/ico/32x32/image-x-eps.png");
Folder .addFile(":/ico/16x16/folder.png");
FolderDelete .addFile(":/ico/16x16/folder-delete.png");
FolderDelete .addFile(":/ico/22x22/folder-delete.png");
FolderEdit .addFile(":/ico/16x16/folder-edit.png");
FolderEdit .addFile(":/ico/22x22/folder-edit.png");
FolderNew .addFile(":/ico/16x16/folder-new.png");
FolderNew .addFile(":/ico/22x22/folder-new.png");
FolderOnlyThis .addFile(":/ico/16x16/folder-only-this.png");
FolderOpen .addFile(":/ico/16x16/folder-open.png");
FolderOpen .addFile(":/ico/22x22/folder-open.png");
FolderProperties .addFile(":/ico/16x16/folder-properties.png");
FolderShowAll .addFile(":/ico/16x16/folder-show-all.png");
Forbidden .addFile(":/ico/16x16/user-busy.png");
FullScreenEnter .addFile(":/ico/16x16/view-fullscreen.png");
FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png");
FullScreenExit .addFile(":/ico/16x16/view-restore.png");
FullScreenExit .addFile(":/ico/22x22/view-restore.png");
GoBottom .addFile(":/ico/16x16/go-bottom.png");
GoDown .addFile(":/ico/16x16/go-down.png");
GoDown .addFile(":/ico/22x22/go-down.png");
GoDownDouble .addFile(":/ico/16x16/go-down-double.png");
GoTop .addFile(":/ico/16x16/go-top.png");
GoUp .addFile(":/ico/16x16/go-up.png");
GoUp .addFile(":/ico/22x22/go-up.png");
GoUpDouble .addFile(":/ico/16x16/go-up-double.png");
Ground .addFile(":/ico/16x16/ground.png");
Grid .addFile(":/ico/16x16/grid.png");
Grid .addFile(":/ico/22x22/grid.png");
Hide .addFile(":/ico/16x16/masquer.png");
Home .addFile(":/ico/16x16/go-home.png");
@@ -350,12 +391,13 @@ void QET::Icons::initIcons() {
HotSpot .addFile(":/ico/22x22/hotspot.png");
InsertImage .addFile(":/ico/22x22/insert-image.png");
Lower .addFile(":/ico/22x22/lower.png");
IC_MoveFile .addFile(":/ico/16x16/item_move.png");
IC_MoveFile .addFile(":/ico/16x16/item-move.png");
Names .addFile(":/ico/22x22/names.png");
Neutral .addFile(":/ico/16x16/neutral.png");
NewDiagram .addFile(":/ico/128x128/diagram.png");
North .addFile(":/ico/16x16/north.png");
ObjectLocked .addFile(":/ico/22x22/object-locked.png");
ObjectRotateRight .addFile(":/ico/16x16/object-rotate-right.png");
ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png");
ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png");
Orientations .addFile(":/ico/16x16/orientations.png");
@@ -365,6 +407,7 @@ void QET::Icons::initIcons() {
PartLine .addFile(":/ico/22x22/line.png");
PartPolygon .addFile(":/ico/22x22/polygon.png");
PartRectangle .addFile(":/ico/22x22/rectangle.png");
PartSelect .addFile(":/ico/16x16/select.png");
PartSelect .addFile(":/ico/22x22/select.png");
PartText .addFile(":/ico/22x22/text.png");
PartTextField .addFile(":/ico/22x22/textfield.png");
@@ -377,46 +420,55 @@ void QET::Icons::initIcons() {
PrintPortrait .addFile(":/ico/22x22/portrait.png");
PrintTwoPages .addFile(":/ico/22x22/two_pages.png");
Projects .addFile(":/ico/128x128/project.png");
ProjectClose .addFile(":/ico/16x16/project-WH-close.png");
ProjectClose .addFile(":/ico/22x22/project-WH-close.png");
ProjectNew .addFile(":/ico/16x16/project-WH-new.png");
ProjectNew .addFile(":/ico/22x22/project-WH-new.png");
ProjectFile .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-project.png");
ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png");
ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png");
QETDonate .addFile(":/ico/16x16/help-donate.svg.png");
QETDownload .addFile(":/ico/16x16/edit-download.svg.png");
ProjectClose .addFile(":/ico/16x16/project-close.png");
ProjectClose .addFile(":/ico/22x22/project-close.png");
ProjectNew .addFile(":/ico/16x16/project-new.png");
ProjectNew .addFile(":/ico/22x22/project-new.png");
ProjectFile .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-project.png");
ProjectFile .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-project.png");
ProjectFile .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-project.png");
ProjectProperties .addFile(":/ico/16x16/project-properties.png");
QETDonate .addFile(":/ico/16x16/help-donate.png");
QETDownload .addFile(":/ico/16x16/edit-download.png");
QETIcon .addFile(":/ico/256x256/qelectrotech.png");
ProjectFileGP .addFile(":/ico/16x16/project-WH.png");
ProjectFileGP .addFile(":/ico/16x16/project.png");
QETLogo .addFile(":/ico/16x16/qet.png");
QETManual .addFile(":/ico/16x16/help-contents.svg.png");
QETManual .addFile(":/ico/16x16/help-contents.png");
QETLogo .addFile(":/ico/256x256/qet.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/128x128/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/16x16/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/22x22/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/256x256/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/32x32/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/48x48/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/oxygen-icons/64x64/apps/qelectrotech.png");
QETVideo .addFile(":/ico/16x16/kdenlive-show-video.svg.png");
QtLogo .addFile(":/ico/32x32/qt.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/128x128/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/16x16/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/22x22/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/256x256/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/32x32/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/48x48/apps/qelectrotech.png");
QETOxygenLogo .addFile(":/ico/breeze-icons/64x64/apps/qelectrotech.png");
QETVideo .addFile(":/ico/16x16/kdenlive-show-video.png");
QtLogo .addFile(":/ico/16x16/qt.png");
Raise .addFile(":/ico/22x22/raise.png");
Remove .addFile(":/ico/16x16/list-remove.png");
Remove .addFile(":/ico/22x22/list-remove.png");
resize_image .addFile(":/ico/22x22/transform-scale.png");
Restore .addFile(":/ico/22x22/restaurer.png");
RunDxf .addFile(":/ico/16x16/run-dxf.png");
SendBackward .addFile(":/ico/22x22/send_backward.png");
Settings .addFile(":/ico/128x128/settings.png");
SinglePage .addFile(":/ico/22x22/single_page.png");
South .addFile(":/ico/16x16/south.png");
Start .addFile(":/ico/22x22/start.png");
Terminal .addFile(":/ico/22x22/terminal.png");
TitleBlock .addFile(":/ico/16x16/label.png");
TableOfContent .addFile(":/ico/16x16/table-of-content.png");
Terminal .addFile(":/ico/22x22/terminal.png");
TerminalStrip .addFile(":/ico/16x16/terminalstrip.png");
TerminalStrip .addFile(":/ico/22x22/terminalstrip.png");
TitleBlock .addFile(":/ico/16x16/label.png");
TitleBlock .addFile(":/ico/22x22/label.png");
TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png");
TitleBlockRight .addFile(":/ico/22x22/titleblock-right.png");
TransformRotate .addFile(":/ico/16x16/transform-rotate.png");
UserInformations .addFile(":/ico/16x16/preferences-desktop-user.png");
UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png");
ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png");
ViewFitWindow .addFile(":/ico/22x22/view_fit_window.png");
ViewFitWindow .addFile(":/ico/22x22/view-fit-window.png");
ViewMove .addFile(":/ico/16x16/move.png");
ViewMove .addFile(":/ico/22x22/move.png");
if (rtl) {
ViewRefresh.addPixmap(QPixmap(":/ico/16x16/view-refresh.png").transformed(reverse));
@@ -463,7 +515,7 @@ void QET::Icons::initIcons() {
translation .addFile(":/ico/22x22/applications-development-translation.png");
listDrawings .addFile(":/ico/48x48/view-pim-journal.png");
AutoNum .addFile(":/ico/128x128/plasmagik.png");
TerminalStrip .addFile(":/ico/22x22/terminalstrip.png");
sub .addFile(":/ico/22x22/format-text-subscript.svg.png");
super .addFile(":/ico/22x22/format-text-superscript.svg.png");
sub .addFile(":/ico/22x22/format-text-subscript.png");
super .addFile(":/ico/22x22/format-text-superscript.png");
textGroup .addFile(":/ico/breeze-icons/scalable/actions/16/object-group.svg");
}

View File

@@ -40,6 +40,7 @@ namespace QET {
extern QIcon BringForward;
extern QIcon Cancel;
extern QIcon Conductor;
extern QIcon ConductorEdit;
extern QIcon ConductorSettings;
extern QIcon Configure;
extern QIcon ConfigureToolbars;
@@ -74,6 +75,8 @@ namespace QET {
extern QIcon EditRedo;
extern QIcon EditRename;
extern QIcon EditSelectAll;
extern QIcon EditSelectInvert;
extern QIcon EditSelectNone;
extern QIcon EditTableCellMerge;
extern QIcon EditTableCellSplit;
extern QIcon EditTableDeleteColumn;
@@ -98,11 +101,19 @@ namespace QET {
extern QIcon FolderDelete;
extern QIcon FolderEdit;
extern QIcon FolderNew;
extern QIcon FolderOnlyThis;
extern QIcon FolderOpen;
extern QIcon FolderProperties;
extern QIcon FolderShowAll;
extern QIcon Forbidden;
extern QIcon FullScreenEnter;
extern QIcon FullScreenExit;
extern QIcon GoDown;
extern QIcon GoUp;
extern QIcon GoBottom;
extern QIcon GoDown;
extern QIcon GoDownDouble;
extern QIcon GoTop;
extern QIcon GoUp;
extern QIcon GoUpDouble;
extern QIcon Ground;
extern QIcon Grid;
extern QIcon Hide;
@@ -142,6 +153,7 @@ namespace QET {
extern QIcon ProjectFile;
extern QIcon ProjectFileGP;
extern QIcon ProjectNew;
extern QIcon ProjectProperties;
extern QIcon Projects;
extern QIcon QETIcon;
extern QIcon QETLogo;
@@ -149,14 +161,19 @@ namespace QET {
extern QIcon QtLogo;
extern QIcon Raise;
extern QIcon Remove;
extern QIcon Restore;
extern QIcon SendBackward;
extern QIcon Restore;
extern QIcon RunDxf;
extern QIcon SendBackward;
extern QIcon Settings;
extern QIcon SinglePage;
extern QIcon South;
extern QIcon Start;
extern QIcon Terminal;
extern QIcon TableOfContent;
extern QIcon Terminal;
extern QIcon TitleBlock;
extern QIcon TitleBlockBottom;
extern QIcon TitleBlockRight;
extern QIcon TransformRotate;
extern QIcon UserInformations;
extern QIcon ViewFitWidth;
extern QIcon ViewFitWindow;
@@ -201,6 +218,7 @@ namespace QET {
extern QIcon QETVideo;
extern QIcon super;
extern QIcon sub;
extern QIcon textGroup;
}
}
#endif

View File

@@ -503,13 +503,13 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
// Superscript and subscript buttons
m_valign_sup_action = createCheckableAction(
QIcon(":/ico/22x22/format-text-superscript.svg.png"),
QIcon(":/ico/22x22/format-text-superscript.png"),
tr("Superscript"),
this, SLOT(setVAlignSuper(bool)), this);
addAction(m_valign_sup_action);
m_valign_sub_action = createCheckableAction(
QIcon(":/ico/22x22/format-text-subscript.svg.png"),
QIcon(":/ico/22x22/format-text-subscript.png"),
tr("Subscript"),
this, SLOT(setVAlignSub(bool)), this);
addAction(m_valign_sub_action);

View File

@@ -55,29 +55,73 @@
</item>
<item>
<widget class="QComboBox" name="m_display_at_cb">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affiche le cartouche en bas (horizontalement) ou à droite (verticalement) du folio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<item>
<property name="text">
<string>en bas</string>
<string notr="true"> </string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/22x22/titleblock-bottom.png</normaloff>:/ico/22x22/titleblock-bottom.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>à droite </string>
<string notr="true"> </string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/22x22/titleblock-right.png</normaloff>:/ico/22x22/titleblock-right.png</iconset>
</property>
</item>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_tbt_pb">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/label.png</normaloff>:/ico/16x16/label.png</iconset>
<normaloff>:/ico/22x22/edit-rename.png</normaloff>:/ico/22x22/edit-rename.png</iconset>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="flat">
<bool>false</bool>