Skip to content
Snippets Groups Projects
Commit d25b3f58 authored by BIOUD Youcef's avatar BIOUD Youcef
Browse files

Merge branch 'youcef' into 'dev'

# Conflicts:
#   IHM_Retouche_Photo/mainwindow.ui
parents 8ad1f92e a4d99bf0
Branches
No related tags found
1 merge request!1Dev
......@@ -319,13 +319,6 @@
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="ColorWindow">
<property name="text">
<string>Open Color Picker (Ctrl+Shift+C)</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="_toolbox">
<property name="sizePolicy">
......@@ -474,6 +467,30 @@
<addaction name="_menuHelp"/>
</widget>
<widget class="QStatusBar" name="_statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="enabled">
<bool>true</bool>
</property>
<property name="windowTitle">
<string>toolBar</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="separator"/>
<addaction name="_actionNouveau"/>
<addaction name="_action_enregistrer"/>
<addaction name="separator"/>
<addaction name="_actionEnregistrer_sous"/>
<addaction name="_actionFermer"/>
<addaction name="actionZoom_avant"/>
</widget>
<action name="_action_new">
<property name="icon">
<iconset resource="ressource.qrc">
......@@ -880,6 +897,78 @@
<string>Ctrl+Shift+O</string>
</property>
</action>
<action name="_action_enregistrer">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save.png</iconset>
</property>
<property name="text">
<string>Enregistrer</string>
</property>
<property name="toolTip">
<string>Enregistrer</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="_actionEnregistrer_sous">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save-as.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save-as.png</iconset>
</property>
<property name="text">
<string>Enregistrer sous</string>
</property>
<property name="toolTip">
<string>Enregistrer sous</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+S</string>
</property>
</action>
<action name="_actionNouveau">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-new.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-new.png</iconset>
</property>
<property name="text">
<string>Nouveau</string>
</property>
<property name="toolTip">
<string>Nouveau</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
</property>
</action>
<action name="_actionFermer">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-close.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-close.png</iconset>
</property>
<property name="text">
<string>Fermer</string>
</property>
<property name="toolTip">
<string>Fermer</string>
</property>
<property name="shortcut">
<string>Del</string>
</property>
</action>
<action name="actionZoom_avant">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/zoom-in.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/zoom-in.png</iconset>
</property>
<property name="text">
<string>Zoom avant</string>
</property>
<property name="toolTip">
<string>Zoom avant</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>_imageTabs</tabstop>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment