Move resource files

3rdparty/gnome/gnome.qrc

@@ -0,0 +1,64 @@
+<RCC>
+    <qresource prefix="/">
+        <file>16x16/application-exit.png</file>
+        <file>16x16/document-new.png</file>
+        <file>16x16/document-open.png</file>
+        <file>16x16/document-properties.png</file>
+        <file>16x16/document-save.png</file>
+        <file>16x16/edit-copy.png</file>
+        <file>16x16/edit-cut.png</file>
+        <file>16x16/edit-find.png</file>
+        <file>16x16/edit-find-replace.png</file>
+        <file>16x16/edit-paste.png</file>
+        <file>16x16/edit-redo.png</file>
+        <file>16x16/edit-undo.png</file>
+        <file>16x16/format-text-bold.png</file>
+        <file>16x16/format-text-italic.png</file>
+        <file>16x16/format-text-strikethrough.png</file>
+        <file>16x16/go-down.png</file>
+        <file>16x16/go-next.png</file>
+        <file>16x16/go-previous.png</file>
+        <file>16x16/go-up.png</file>
+        <file>16x16/insert-image.png</file>
+        <file>16x16/insert-link.png</file>
+        <file>16x16/insert-object.png</file>
+        <file>16x16/insert-text.png</file>
+        <file>16x16/list-add.png</file>
+        <file>16x16/list-remove.png</file>
+        <file>16x16/preferences-desktop.png</file>
+        <file>16x16/window-close.png</file>
+        <file>16x16/zoom-in.png</file>
+        <file>16x16/zoom-original.png</file>
+        <file>16x16/zoom-out.png</file>
+        <file>24x24/application-exit.png</file>
+        <file>24x24/document-new.png</file>
+        <file>24x24/document-open.png</file>
+        <file>24x24/document-properties.png</file>
+        <file>24x24/document-save.png</file>
+        <file>24x24/edit-copy.png</file>
+        <file>24x24/edit-cut.png</file>
+        <file>24x24/edit-find.png</file>
+        <file>24x24/edit-find-replace.png</file>
+        <file>24x24/edit-paste.png</file>
+        <file>24x24/edit-redo.png</file>
+        <file>24x24/edit-undo.png</file>
+        <file>24x24/format-text-bold.png</file>
+        <file>24x24/format-text-italic.png</file>
+        <file>24x24/format-text-strikethrough.png</file>
+        <file>24x24/go-down.png</file>
+        <file>24x24/go-next.png</file>
+        <file>24x24/go-previous.png</file>
+        <file>24x24/go-up.png</file>
+        <file>24x24/insert-image.png</file>
+        <file>24x24/insert-link.png</file>
+        <file>24x24/insert-object.png</file>
+        <file>24x24/insert-text.png</file>
+        <file>24x24/list-add.png</file>
+        <file>24x24/list-remove.png</file>
+        <file>24x24/preferences-desktop.png</file>
+        <file>24x24/window-close.png</file>
+        <file>24x24/zoom-in.png</file>
+        <file>24x24/zoom-original.png</file>
+        <file>24x24/zoom-out.png</file>
+    </qresource>
+</RCC>

CMakeLists.txt

@@ -24,8 +24,12 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 file( GLOB FB2_HEAD source/*.h       )
 file( GLOB FB2_SRCS source/*.cpp     )
 file( GLOB FB2_UIS  source/*.ui      )
-file( GLOB FB2_RES  source/res/*.qrc )
-file( GLOB FB2_TS   source/ts/*.ts   )
+file( GLOB FB2_TSS  source/ts/*.ts   )
+
+set(FB2_RES
+    3rdparty/gnome/gnome.qrc
+    source/res/fb2edit.qrc
+)
 
 set(CMAKE_IN_SOURCE_BUILD TRUE)
 
@@ -35,10 +39,9 @@ include(${QT_USE_FILE})
 qt4_wrap_ui(UI_HEADERS ${FB2_UIS})
 qt4_wrap_cpp(MOC_SRCS ${FB2_HEAD})
 qt4_add_resources(RCC_SRCS ${FB2_RES})
-qt4_create_translation(QM_FILES ${FB2_TS})
-#QT4_CREATE_TRANSLATION(LangSrcs ${Lang_files})
+qt4_create_translation(QMS_FILES ${FB2_TSS})
 include_directories(${CMAKE_BINARY_DIR} ${QSCINTILLA_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIRS})
-add_executable(fb2edit ${FB2_SRCS} ${FB2_HEAD} ${MOC_SRCS} ${RCC_SRCS} ${QM_FILES})
+add_executable(fb2edit ${FB2_SRCS} ${FB2_HEAD} ${MOC_SRCS} ${RCC_SRCS} ${QMS_FILES})
 target_link_libraries(fb2edit ${QT_LIBRARIES} ${QSCINTILLA_LIBRARIES} ${LIBXML2_LIBRARIES})
 
 set(LINUX_DESKTOP_FILE desktop/fb2edit.desktop)

fb2edit.pro

@@ -21,6 +21,7 @@ SOURCES = \
     source/fb2xml2.cpp
 
 RESOURCES = \
+    3rdparty/gnome/gnome.qrc \
     source/res/fb2edit.qrc
 
 TARGET = fb2edit

source/fb2main.cpp

@@ -201,8 +201,8 @@ void Fb2MainWindow::documentWasModified()
 QIcon Fb2MainWindow::icon(const QString &name)
 {
     QIcon icon;
-    icon.addFile(QString(":/24/%1.png").arg(name), QSize(24,24));
-    icon.addFile(QString(":/16/%1.png").arg(name), QSize(16,16));
+    icon.addFile(QString(":/24x24/%1.png").arg(name), QSize(24,24));
+    icon.addFile(QString(":/16x24/%1.png").arg(name), QSize(16,16));
     return QIcon::fromTheme(name, icon);
 }
 

source/res/fb2edit.qrc

@@ -1,69 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file>16/application-exit.png</file>
-        <file>16/document-new.png</file>
-        <file>16/document-open.png</file>
-        <file>16/document-properties.png</file>
-        <file>16/document-save.png</file>
-        <file>16/edit-copy.png</file>
-        <file>16/edit-cut.png</file>
-        <file>16/edit-find.png</file>
-        <file>16/edit-find-replace.png</file>
-        <file>16/edit-paste.png</file>
-        <file>16/edit-redo.png</file>
-        <file>16/edit-undo.png</file>
-        <file>16/format-text-bold.png</file>
-        <file>16/format-text-italic.png</file>
-        <file>16/format-text-strikethrough.png</file>
-        <file>16/format-text-subscript.png</file>
-        <file>16/format-text-superscript.png</file>
-        <file>16/go-down.png</file>
-        <file>16/go-next.png</file>
-        <file>16/go-previous.png</file>
-        <file>16/go-up.png</file>
-        <file>16/insert-image.png</file>
-        <file>16/insert-link.png</file>
-        <file>16/insert-object.png</file>
-        <file>16/insert-text.png</file>
-        <file>16/list-add.png</file>
-        <file>16/list-remove.png</file>
-        <file>16/preferences-desktop.png</file>
-        <file>16/window-close.png</file>
-        <file>16/zoom-in.png</file>
-        <file>16/zoom-original.png</file>
-        <file>16/zoom-out.png</file>
-        <file>24/application-exit.png</file>
-        <file>24/document-new.png</file>
-        <file>24/document-open.png</file>
-        <file>24/document-properties.png</file>
-        <file>24/document-save.png</file>
-        <file>24/edit-copy.png</file>
-        <file>24/edit-cut.png</file>
-        <file>24/edit-find.png</file>
-        <file>24/edit-find-replace.png</file>
-        <file>24/edit-paste.png</file>
-        <file>24/edit-redo.png</file>
-        <file>24/edit-undo.png</file>
-        <file>24/format-text-bold.png</file>
-        <file>24/format-text-italic.png</file>
-        <file>24/format-text-strikethrough.png</file>
-        <file>24/format-text-subscript.png</file>
-        <file>24/format-text-superscript.png</file>
-        <file>24/go-down.png</file>
-        <file>24/go-next.png</file>
-        <file>24/go-previous.png</file>
-        <file>24/go-up.png</file>
-        <file>24/insert-image.png</file>
-        <file>24/insert-link.png</file>
-        <file>24/insert-object.png</file>
-        <file>24/insert-text.png</file>
-        <file>24/list-add.png</file>
-        <file>24/list-remove.png</file>
-        <file>24/preferences-desktop.png</file>
-        <file>24/window-close.png</file>
-        <file>24/zoom-in.png</file>
-        <file>24/zoom-original.png</file>
-        <file>24/zoom-out.png</file>
+        <file>16x16/format-text-subscript.png</file>
+        <file>16x16/format-text-superscript.png</file>
+        <file>24x24/format-text-subscript.png</file>
+        <file>24x24/format-text-superscript.png</file>
         <file>blank.fb2</file>
         <file>style.css</file>
         <file alias="ts/ru.qm">../ts/ru.qm</file>