Changed folder structure

filterlineedit.cpp

@@ -26,7 +26,7 @@ FilterLineEdit::FilterLineEdit(QWidget *parent) :
     QLineEdit(parent)
 {
     clearButton = new QToolButton(this);
-    QIcon clearIcon(":/main/resources/edit-clear-locationbar-rtl.png");
+    QIcon clearIcon(":/main/images/edit-clear-locationbar-rtl.png");
     clearButton->setIcon(clearIcon);
     clearButton->setCursor(Qt::ArrowCursor);
     clearButton->setStyleSheet("border:none;padding:0px");

qcma.pro

@@ -13,49 +13,51 @@ TARGET = qcma
 
 TEMPLATE = app
 
-SOURCES += main.cpp \
-    capability.cpp \
-    database.cpp \
-    cmaobject.cpp \
-    cmarootobject.cpp \
-    utils.cpp \
-    mainwidget.cpp \
-    configwidget.cpp \
-    singleapplication.cpp \
-    sforeader.cpp \
-    cmaclient.cpp \
-    cmabroadcast.cpp \
-    avdecoder.cpp \
-    cmaevent.cpp \
-    clientmanager.cpp \
-    backupmanagerform.cpp \
-    backupitem.cpp \
-    confirmdialog.cpp \
-    progressform.cpp \
-    pinform.cpp \
-    filterlineedit.cpp
+SOURCES += src/main.cpp \
+    src/capability.cpp \
+    src/database.cpp \
+    src/cmaobject.cpp \
+    src/cmarootobject.cpp \
+    src/utils.cpp \
+    src/mainwidget.cpp \
+    src/singleapplication.cpp \
+    src/sforeader.cpp \
+    src/cmaclient.cpp \
+    src/cmabroadcast.cpp \
+    src/avdecoder.cpp \
+    src/cmaevent.cpp \
+    src/clientmanager.cpp \
+    filterlineedit.cpp \
+# forms
+    src/forms/backupitem.cpp \
+    src/forms/backupmanagerform.cpp \
+    src/forms/configwidget.cpp \
+    src/forms/confirmdialog.cpp \
+    src/forms/pinform.cpp \
+    src/forms/progressform.cpp
 
 HEADERS += \
-    capability.h \
-    database.h \
-    cmaobject.h \
-    cmarootobject.h \
-    utils.h \
-    mainwidget.h \
-    configwidget.h \
-    singleapplication.h \
-    sforeader.h \
-    cmaclient.h \
-    cmabroadcast.h \
-    avdecoder.h \
-    cmaevent.h \
-    clientmanager.h \
-    backupmanagerform.h \
-    backupitem.h \
-    confirmdialog.h \
-    progressform.h \
-    pinform.h \
-    filterlineedit.h
+    src/capability.h \
+    src/database.h \
+    src/cmaobject.h \
+    src/cmarootobject.h \
+    src/utils.h \
+    src/mainwidget.h \
+    src/singleapplication.h \
+    src/sforeader.h \
+    src/cmaclient.h \
+    src/cmabroadcast.h \
+    src/avdecoder.h \
+    src/cmaevent.h \
+    src/clientmanager.h \
+    filterlineedit.h \
+# forms
+    src/forms/backupitem.h \
+    src/forms/backupmanagerform.h \
+    src/forms/configwidget.h \
+    src/forms/confirmdialog.h \
+    src/forms/pinform.h \
+    src/forms/progressform.h
 
 CONFIG += link_pkgconfig
 PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale
@@ -63,24 +65,25 @@ PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale
 QMAKE_CXXFLAGS += -Wno-write-strings -Wall -D__STDC_CONSTANT_MACROS
 
 RESOURCES += \
-    qcmares.qrc
+    resources/qcmares.qrc
 
 OTHER_FILES += \
-    resources/psp2-updatelist.xml \
-    resources/psv_icon.png \
+    resources/xml/psp2-updatelist.xml \
+    resources/images/psv_icon.png \
     README.md \
-    qcma.desktop \
-    qcma.rc
+    resources/qcma.desktop \
+    resources/qcma.rc
 
 FORMS += \
-    configwidget.ui \
-    backupmanagerform.ui \
-    backupitem.ui \
-    confirmdialog.ui \
-    progressform.ui \
-    pinform.ui
+    src/forms/configwidget.ui \
+    src/forms/backupmanagerform.ui \
+    src/forms/backupitem.ui \
+    src/forms/confirmdialog.ui \
+    src/forms/progressform.ui \
+    src/forms/pinform.ui
 
-TRANSLATIONS += resources/translations/qcma.es.ts \
+TRANSLATIONS += \
+    resources/translations/qcma.es.ts \
     resources/translations/qcma.ja.ts
 
 VERSION = \\\"'0.2.4'\\\"

qcmares.qrc

@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/main">
-        <file>resources/psp2-updatelist.xml</file>
-        <file>resources/psv_icon.png</file>
-        <file>resources/translations/qcma.es.qm</file>
-        <file>resources/translations/qcma.ja.qm</file>
-        <file>resources/psv_icon_16.png</file>
-        <file>resources/qcma.png</file>
-        <file>resources/edit-clear-locationbar-rtl.png</file>
-    </qresource>
-</RCC>

resources/qcmares.qrc

@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/main">
+        <file>xml/psp2-updatelist.xml</file>
+        <file>translations/qcma.es.qm</file>
+        <file>translations/qcma.ja.qm</file>
+	<file>images/psv_icon.png</file>
+        <file>images/psv_icon_16.png</file>
+        <file>images/qcma.png</file>
+        <file>images/edit-clear-locationbar-rtl.png</file>
+    </qresource>
+</RCC>

src/clientmanager.cpp

@@ -18,9 +18,9 @@
  */
 
 #include "clientmanager.h"
-#include "progressform.h"
 #include "cmaclient.h"
 #include "utils.h"
+#include "forms/progressform.h"
 
 #include <vitamtp.h>
 

src/clientmanager.h

@@ -20,9 +20,9 @@
 #ifndef CLIENTMANAGER_H
 #define CLIENTMANAGER_H
 
-#include "pinform.h"
 #include "database.h"
-#include "progressform.h"
+#include "forms/pinform.h"
+#include "forms/progressform.h"
 
 #include <QObject>
 #include <QThread>

src/forms/backupitem.cpp

@@ -19,7 +19,7 @@
 
 #include "backupitem.h"
 #include "ui_backupitem.h"
-#include "utils.h"
+#include "../utils.h"
 
 #include <QDesktopServices>
 #include <QUrl>

src/forms/backupmanagerform.cpp

@@ -19,10 +19,10 @@
 
 #include "backupmanagerform.h"
 #include "ui_backupmanagerform.h"
-#include "cmaobject.h"
-#include "sforeader.h"
+#include "../cmaobject.h"
+#include "../sforeader.h"
 #include "confirmdialog.h"
-#include "utils.h"
+#include "../utils.h"
 #include "filterlineedit.h"
 
 #include <QDebug>

src/forms/backupmanagerform.h

@@ -20,7 +20,7 @@
 #ifndef BACKUPMANAGERFORM_H
 #define BACKUPMANAGERFORM_H
 
-#include "database.h"
+#include "../database.h"
 #include "backupitem.h"
 
 #include <QWidget>

src/mainwidget.cpp

@@ -119,7 +119,7 @@ void MainWidget::showAboutDialog()
     about.setWindowTitle(tr("About QCMA"));
     about.setInformativeText(tr("Copyright (C) 2013  Codestation") + "\n");
     about.setStandardButtons(QMessageBox::Ok);
-    about.setIconPixmap(QPixmap(":/main/resources/qcma.png"));
+    about.setIconPixmap(QPixmap(":/main/images/qcma.png"));
     about.setDefaultButton(QMessageBox::Ok);
 
     // hack to expand the messagebox minimum size
@@ -164,9 +164,9 @@ void MainWidget::createTrayIcon()
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
 #ifndef Q_OS_WIN32
-    trayIcon->setIcon(QIcon(":/main/resources/psv_icon.png"));
+    trayIcon->setIcon(QIcon(":/main/images/psv_icon.png"));
 #else
-    trayIcon->setIcon(QIcon(":/main/resources/psv_icon_16.png"));
+    trayIcon->setIcon(QIcon(":/main/images/psv_icon_16.png"));
 #endif
     trayIcon->show();
     // try to avoid the iconTray Qt bug

src/mainwidget.h

@@ -20,11 +20,11 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
-#include "configwidget.h"
-#include "clientmanager.h"
-#include "backupmanagerform.h"
 #include "cmaclient.h"
-#include "progressform.h"
+#include "clientmanager.h"
+#include "forms/configwidget.h"
+#include "forms/backupmanagerform.h"
+#include "forms/progressform.h"
 
 #include <QAction>
 #include <QWidget>