[vlmc-devel] commit: Adding icons for toolbar actions ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Jul 19 23:57:57 2010 +0200| [78d5c6771854509e8a7430e45778c40dfa1d0219] | committer: Hugo Beauzée-Luyssen 

Adding icons for toolbar actions

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=78d5c6771854509e8a7430e45778c40dfa1d0219
---

 resources.qrc                            |    8 ++++++
 resources/images/configure.png           |  Bin 1288 -> 2171 bytes
 resources/images/fullscreen.png          |  Bin 0 -> 472 bytes
 resources/images/import.png              |  Bin 0 -> 1244 bytes
 resources/images/newproject.png          |  Bin 0 -> 1410 bytes
 resources/images/openproject.png         |  Bin 0 -> 1088 bytes
 resources/images/project-preferences.png |  Bin 0 -> 1231 bytes
 resources/images/render-file.png         |  Bin 0 -> 1645 bytes
 resources/images/save-as.png             |  Bin 0 -> 2152 bytes
 resources/images/save.png                |  Bin 0 -> 1263 bytes
 src/Gui/ui/MainWindow.ui                 |   41 +++++++++++++++++++++++++++---
 11 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/resources.qrc b/resources.qrc
index e54e3b3..02c7eb2 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -37,6 +37,14 @@
         <file alias="down">resources/images/down.png</file>
         <file alias="ok">resources/images/ok.png</file>
         <file alias="ko">resources/images/ko.png</file>
+        <file alias="newproject">resources/images/newproject.png</file>
+        <file alias="openproject">resources/images/openproject.png</file>
+        <file alias="save">resources/images/save.png</file>
+        <file alias="save-as">resources/images/save-as.png</file>
+        <file alias="import">resources/images/import.png</file>
+        <file alias="render-file">resources/images/render-file.png</file>
+        <file alias="project-preferences">resources/images/project-preferences.png</file>
+        <file alias="fullscreen">resources/images/fullscreen.png</file>
     </qresource>
     <qresource prefix="/text">
         <file>AUTHORS</file>
diff --git a/resources/images/configure.png b/resources/images/configure.png
index 3c38e96..2afbd23 100644
Binary files a/resources/images/configure.png and b/resources/images/configure.png differ
diff --git a/resources/images/fullscreen.png b/resources/images/fullscreen.png
new file mode 100644
index 0000000..e7758fe
Binary files /dev/null and b/resources/images/fullscreen.png differ
diff --git a/resources/images/import.png b/resources/images/import.png
new file mode 100644
index 0000000..6680f24
Binary files /dev/null and b/resources/images/import.png differ
diff --git a/resources/images/newproject.png b/resources/images/newproject.png
new file mode 100644
index 0000000..3d0f5cc
Binary files /dev/null and b/resources/images/newproject.png differ
diff --git a/resources/images/openproject.png b/resources/images/openproject.png
new file mode 100644
index 0000000..7422ad3
Binary files /dev/null and b/resources/images/openproject.png differ
diff --git a/resources/images/project-preferences.png b/resources/images/project-preferences.png
new file mode 100644
index 0000000..ba8c98c
Binary files /dev/null and b/resources/images/project-preferences.png differ
diff --git a/resources/images/render-file.png b/resources/images/render-file.png
new file mode 100644
index 0000000..c3c95cd
Binary files /dev/null and b/resources/images/render-file.png differ
diff --git a/resources/images/save-as.png b/resources/images/save-as.png
new file mode 100644
index 0000000..9695a56
Binary files /dev/null and b/resources/images/save-as.png differ
diff --git a/resources/images/save.png b/resources/images/save.png
new file mode 100644
index 0000000..7fa489c
Binary files /dev/null and b/resources/images/save.png differ
diff --git a/src/Gui/ui/MainWindow.ui b/src/Gui/ui/MainWindow.ui
index cbb2f15..d889bb9 100644
--- a/src/Gui/ui/MainWindow.ui
+++ b/src/Gui/ui/MainWindow.ui
@@ -92,7 +92,7 @@
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>VLMC Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -161,6 +161,10 @@
    </property>
   </action>
   <action name="actionNew_Project">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/newproject</normaloff>:/images/newproject</iconset>
+   </property>
    <property name="text">
     <string>&amp;New Project</string>
    </property>
@@ -172,11 +176,19 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/fullscreen</normaloff>:/images/fullscreen</iconset>
+   </property>
    <property name="text">
     <string>&amp;Fullscreen</string>
    </property>
   </action>
   <action name="actionRender">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/render-file</normaloff>:/images/render-file</iconset>
+   </property>
    <property name="text">
     <string>&amp;To a file</string>
    </property>
@@ -188,16 +200,28 @@
    </property>
   </action>
   <action name="actionLoad_Project">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/openproject</normaloff>:/images/openproject</iconset>
+   </property>
    <property name="text">
     <string>&amp;Load Project</string>
    </property>
   </action>
   <action name="actionSave">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/save</normaloff>:/images/save</iconset>
+   </property>
    <property name="text">
     <string>&amp;Save</string>
    </property>
   </action>
   <action name="actionImport">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/import</normaloff>:/images/import</iconset>
+   </property>
    <property name="text">
     <string>&amp;Import</string>
    </property>
@@ -217,12 +241,13 @@
    </property>
   </action>
   <action name="actionProject_Preferences">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/project-preferences</normaloff>:/images/project-preferences</iconset>
+   </property>
    <property name="text">
     <string>Proj&amp;ect Preferences</string>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+P</string>
-   </property>
   </action>
   <action name="actionProject_Wizard">
    <property name="text">
@@ -230,6 +255,10 @@
    </property>
   </action>
   <action name="actionSave_As">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/save-as</normaloff>:/images/save-as</iconset>
+   </property>
    <property name="text">
     <string>Save &amp;As</string>
    </property>
@@ -263,6 +292,10 @@
    </property>
   </action>
   <action name="actionShare_On_Youtube">
+   <property name="icon">
+    <iconset resource="../../../resources.qrc">
+     <normaloff>:/images/youtube</normaloff>:/images/youtube</iconset>
+   </property>
    <property name="text">
     <string>Share on &amp;Youtube</string>
    </property>