diff --git a/.gitignore b/.gitignore index 3df5b3b..596c592 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ qcma.pro.user* -*.qm +*.qm \ No newline at end of file diff --git a/README.md b/README.md index c177091..1a3e314 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ QCMA ==== -QCMA is an cross-platform application to provide a Open Source implementation +QCMA is a cross-platform application to provide a Open Source implementation of the original Content Manager Assistant that comes with the PS Vita. QCMA is meant to be compatible with Linux, Windows and MAC OS X. ## Features -The aim of this project is to provide a implementation that is on par with the +The aim of this project is to provide an implementation that is on par with the official CMA and also offer some features missing in the original one. #### Implemented features missing in OpenCMA (Yifan Lu CLI application) @@ -23,11 +23,11 @@ official CMA and also offer some features missing in the original one. * Complete categories for music. * SQLite backend for database. -## Planned features +#### Planned features * **UPNP bridge**: connect an existing UPNP server to interface with the Vita using the wireless streaming feature. -#### Dependencies +## Dependencies * [Qt 4.x or 5.x](http://qt-project.org/) * [VitaMTP](https://github.com/yifanlu/VitaMTP). Use my @@ -42,7 +42,7 @@ Check the GitHub repo here: https://github.com/codestation/qcma #### I want to contribute Contact me on [GitHub](https://github.com/codestation/) -#### Thanks to +## Thanks to [Yifan Lu](https://github.com/yifanlu/vitamtp/) - for the vitamtp library and the reference implementation of OpenCMA. diff --git a/debian/changelog b/build/debian/changelog similarity index 100% rename from debian/changelog rename to build/debian/changelog diff --git a/debian/compat b/build/debian/compat similarity index 100% rename from debian/compat rename to build/debian/compat diff --git a/debian/control b/build/debian/control similarity index 100% rename from debian/control rename to build/debian/control diff --git a/debian/copyright b/build/debian/copyright similarity index 100% rename from debian/copyright rename to build/debian/copyright diff --git a/debian/docs b/build/debian/docs similarity index 100% rename from debian/docs rename to build/debian/docs diff --git a/debian/rules b/build/debian/rules similarity index 100% rename from debian/rules rename to build/debian/rules diff --git a/debian/source/format b/build/debian/source/format similarity index 100% rename from debian/source/format rename to build/debian/source/format diff --git a/build/rpmbuild/VitaMTP.spec b/build/rpmbuild/VitaMTP.spec new file mode 100644 index 0000000..4a79706 --- /dev/null +++ b/build/rpmbuild/VitaMTP.spec @@ -0,0 +1,68 @@ +# +# VitaMTP spec file +# + +Name: libvitamtp2 +Summary: Low-level Vita communication library +License: GPL-3.0 +Release: 2 +Version: 2.1.0 +URL: https://github.com/codestation/VitaMTP +Source: https://github.com/codestation/VitaMTP.git +Prefix: /usr +Group: System/Libraries + +%package devel +Summary: Low-level Vita communication library - development files +Group: Development/Libraries/C and C++ +Requires: libvitamtp2 == 2.1.0 + +%description +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + +%description devel +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. +This package contains only the files necessary for development. + +%changelog +* Tue Nov 05 2013 codestation - 2.1.0 +- Added new CMA version. + +%prep +rm -rf $RPM_SOURCE_DIR/libvitamtp2 +git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2 +cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2 +%setup -n libvitamtp2 -DT + +%build +./autogen.sh +./configure --prefix=/usr --disable-opencma +make + +%install +make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}/lib/udev/rules.d +cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +/lib/udev/rules.d/80-psvita.rules +/usr/lib/libvitamtp.la +/usr/lib/libvitamtp.so.2 +/usr/lib/libvitamtp.so.2.0.0 + +%files devel +%defattr(-,root,root,-) +/usr/include/vitamtp.h +/usr/lib/libvitamtp.a +/usr/lib/libvitamtp.so +/usr/lib/pkgconfig/libvitamtp.pc \ No newline at end of file diff --git a/build/rpmbuild/VitaMTP64.spec b/build/rpmbuild/VitaMTP64.spec new file mode 100644 index 0000000..b149cbc --- /dev/null +++ b/build/rpmbuild/VitaMTP64.spec @@ -0,0 +1,68 @@ +# +# VitaMTP spec file +# + +Name: libvitamtp2 +Summary: Low-level Vita communication library +License: GPL-3.0 +Release: 2 +Version: 2.1.0 +URL: https://github.com/codestation/VitaMTP +Source: https://github.com/codestation/VitaMTP.git +Prefix: /usr +Group: System/Libraries + +%package devel +Summary: Low-level Vita communication library - development files +Group: Development/Libraries/C and C++ +Requires: libvitamtp2 == 2.1.0 + +%description +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + +%description devel +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. +This package contains only the files necessary for development. + +%changelog +* Tue Nov 05 2013 codestation - 2.1.0 +- Added new CMA version. + +%prep +rm -rf $RPM_SOURCE_DIR/libvitamtp2 +git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2 +cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2 +%setup -n libvitamtp2 -DT + +%build +./autogen.sh +./configure --prefix=/usr --disable-opencma +make + +%install +make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}/lib/udev/rules.d +cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +/lib/udev/rules.d/80-psvita.rules +/usr/lib64/libvitamtp.la +/usr/lib64/libvitamtp.so.2 +/usr/lib64/libvitamtp.so.2.0.0 + +%files devel +%defattr(-,root,root,-) +/usr/include/vitamtp.h +/usr/lib64/libvitamtp.a +/usr/lib64/libvitamtp.so +/usr/lib64/pkgconfig/libvitamtp.pc \ No newline at end of file diff --git a/build/rpmbuild/qcma.spec b/build/rpmbuild/qcma.spec new file mode 100644 index 0000000..0e10df4 --- /dev/null +++ b/build/rpmbuild/qcma.spec @@ -0,0 +1,42 @@ +# +# qcma spec file +# + +Name: qcma +Summary: PSVita Content Manager Assistant +License: GPL-3.0 +Release: 1 +Version: 0.2.4 +URL: https://github.com/codestation/qcma +Source: https://github.com/codestation/qcma.git +Prefix: /usr +Group: Productivity/File utilities + +%description +QCMA is an cross-platform application to provide a Open Source implementation +of the original Content Manager Assistant that comes with the PS Vita. QCMA +is meant to be compatible with Linux, Windows and MAC OS X. + +%changelog +* Tue Nov 06 2013 codestation - 0.2.4 +- QCMA in WiFi mode is compatible with FW 3.00. + +%prep +rm -rf $RPM_SOURCE_DIR/qcma +git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma +cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma +%setup -n qcma -DT + +%build +lrelease qcma.pro +qmake PREFIX=/usr +make + +%install +make INSTALL_ROOT=%{buildroot} install + +%files +%defattr(-,root,root,-) +/usr/bin/qcma +/usr/share/applications/qcma/qcma.desktop +/usr/share/icons/hicolor/64x64/apps/qcma.png \ No newline at end of file diff --git a/build/rpmbuild/qcma64.spec b/build/rpmbuild/qcma64.spec new file mode 100644 index 0000000..0e10df4 --- /dev/null +++ b/build/rpmbuild/qcma64.spec @@ -0,0 +1,42 @@ +# +# qcma spec file +# + +Name: qcma +Summary: PSVita Content Manager Assistant +License: GPL-3.0 +Release: 1 +Version: 0.2.4 +URL: https://github.com/codestation/qcma +Source: https://github.com/codestation/qcma.git +Prefix: /usr +Group: Productivity/File utilities + +%description +QCMA is an cross-platform application to provide a Open Source implementation +of the original Content Manager Assistant that comes with the PS Vita. QCMA +is meant to be compatible with Linux, Windows and MAC OS X. + +%changelog +* Tue Nov 06 2013 codestation - 0.2.4 +- QCMA in WiFi mode is compatible with FW 3.00. + +%prep +rm -rf $RPM_SOURCE_DIR/qcma +git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma +cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma +%setup -n qcma -DT + +%build +lrelease qcma.pro +qmake PREFIX=/usr +make + +%install +make INSTALL_ROOT=%{buildroot} install + +%files +%defattr(-,root,root,-) +/usr/bin/qcma +/usr/share/applications/qcma/qcma.desktop +/usr/share/icons/hicolor/64x64/apps/qcma.png \ No newline at end of file diff --git a/qcma.pro b/qcma.pro index 34e7ebc..39554d9 100644 --- a/qcma.pro +++ b/qcma.pro @@ -13,74 +13,79 @@ 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 \ + src/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 \ + src/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 + +INCLUDEPATH += src/ CONFIG += link_pkgconfig 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 \ - README.md \ - qcma.desktop \ + resources/xml/psp2-updatelist.xml \ + resources/images/psv_icon.png \ + resources/images/psv_icon_16.png \ + resources/images/qcma.png \ + resources/qcma.desktop \ 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'\\\" diff --git a/qcmares.qrc b/qcmares.qrc index 7e5a977..b9e6c18 100644 --- a/qcmares.qrc +++ b/qcmares.qrc @@ -1,11 +1,11 @@ - resources/psp2-updatelist.xml - resources/psv_icon.png + resources/xml/psp2-updatelist.xml resources/translations/qcma.es.qm resources/translations/qcma.ja.qm - resources/psv_icon_16.png - resources/qcma.png - resources/edit-clear-locationbar-rtl.png + resources/images/psv_icon.png + resources/images/psv_icon_16.png + resources/images/qcma.png + resources/images/edit-clear-locationbar-rtl.png diff --git a/resources/edit-clear-locationbar-rtl.png b/resources/images/edit-clear-locationbar-rtl.png similarity index 100% rename from resources/edit-clear-locationbar-rtl.png rename to resources/images/edit-clear-locationbar-rtl.png diff --git a/resources/psv_icon.png b/resources/images/psv_icon.png similarity index 100% rename from resources/psv_icon.png rename to resources/images/psv_icon.png diff --git a/resources/psv_icon_16.png b/resources/images/psv_icon_16.png similarity index 100% rename from resources/psv_icon_16.png rename to resources/images/psv_icon_16.png diff --git a/resources/qcma.icns b/resources/images/qcma.icns similarity index 100% rename from resources/qcma.icns rename to resources/images/qcma.icns diff --git a/resources/qcma.ico b/resources/images/qcma.ico similarity index 100% rename from resources/qcma.ico rename to resources/images/qcma.ico diff --git a/resources/qcma.png b/resources/images/qcma.png similarity index 100% rename from resources/qcma.png rename to resources/images/qcma.png diff --git a/qcma.desktop b/resources/qcma.desktop similarity index 94% rename from qcma.desktop rename to resources/qcma.desktop index 66cdeb5..2ffd664 100644 --- a/qcma.desktop +++ b/resources/qcma.desktop @@ -5,7 +5,7 @@ GenericName=Content Manager Assistant GenericName[es]=Asistente del Gestor de Contenido Comment=Content Manager Assistant for the PS Vita Comment[es]=Asistente del Gestor de Contenido para PS Vita -Icon=qcma.png +Icon=images/qcma.png Name=QCMA Path= StartupNotify=false diff --git a/resources/psp2-updatelist.xml b/resources/xml/psp2-updatelist.xml similarity index 100% rename from resources/psp2-updatelist.xml rename to resources/xml/psp2-updatelist.xml diff --git a/avdecoder.cpp b/src/avdecoder.cpp similarity index 100% rename from avdecoder.cpp rename to src/avdecoder.cpp diff --git a/avdecoder.h b/src/avdecoder.h similarity index 100% rename from avdecoder.h rename to src/avdecoder.h diff --git a/capability.cpp b/src/capability.cpp similarity index 100% rename from capability.cpp rename to src/capability.cpp diff --git a/capability.h b/src/capability.h similarity index 100% rename from capability.h rename to src/capability.h diff --git a/clientmanager.cpp b/src/clientmanager.cpp similarity index 99% rename from clientmanager.cpp rename to src/clientmanager.cpp index 881d20e..e43e7a3 100644 --- a/clientmanager.cpp +++ b/src/clientmanager.cpp @@ -18,9 +18,9 @@ */ #include "clientmanager.h" -#include "progressform.h" #include "cmaclient.h" #include "utils.h" +#include "forms/progressform.h" #include diff --git a/clientmanager.h b/src/clientmanager.h similarity index 96% rename from clientmanager.h rename to src/clientmanager.h index c5cff10..9ff8792 100644 --- a/clientmanager.h +++ b/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 #include diff --git a/cmabroadcast.cpp b/src/cmabroadcast.cpp similarity index 100% rename from cmabroadcast.cpp rename to src/cmabroadcast.cpp diff --git a/cmabroadcast.h b/src/cmabroadcast.h similarity index 100% rename from cmabroadcast.h rename to src/cmabroadcast.h diff --git a/cmaclient.cpp b/src/cmaclient.cpp similarity index 100% rename from cmaclient.cpp rename to src/cmaclient.cpp diff --git a/cmaclient.h b/src/cmaclient.h similarity index 100% rename from cmaclient.h rename to src/cmaclient.h diff --git a/cmaevent.cpp b/src/cmaevent.cpp similarity index 99% rename from cmaevent.cpp rename to src/cmaevent.cpp index f08abc7..b70aa54 100644 --- a/cmaevent.cpp +++ b/src/cmaevent.cpp @@ -478,7 +478,7 @@ void CmaEvent::vitaEventSendHttpObjectFromURL(vita_event_t *event, int eventId) if(!file.open(QIODevice::ReadOnly)) { if(basename == "psp2-updatelist.xml") { qDebug("Found request for update list. Sending cached data"); - QFile res(":/main/resources/psp2-updatelist.xml"); + QFile res(":/main/resources/xml/psp2-updatelist.xml"); res.open(QIODevice::ReadOnly); data = res.readAll(); } else { diff --git a/cmaevent.h b/src/cmaevent.h similarity index 100% rename from cmaevent.h rename to src/cmaevent.h diff --git a/cmaobject.cpp b/src/cmaobject.cpp similarity index 100% rename from cmaobject.cpp rename to src/cmaobject.cpp diff --git a/cmaobject.h b/src/cmaobject.h similarity index 100% rename from cmaobject.h rename to src/cmaobject.h diff --git a/cmarootobject.cpp b/src/cmarootobject.cpp similarity index 100% rename from cmarootobject.cpp rename to src/cmarootobject.cpp diff --git a/cmarootobject.h b/src/cmarootobject.h similarity index 100% rename from cmarootobject.h rename to src/cmarootobject.h diff --git a/database.cpp b/src/database.cpp similarity index 100% rename from database.cpp rename to src/database.cpp diff --git a/database.h b/src/database.h similarity index 100% rename from database.h rename to src/database.h diff --git a/filterlineedit.cpp b/src/filterlineedit.cpp similarity index 96% rename from filterlineedit.cpp rename to src/filterlineedit.cpp index 8d23741..0119926 100644 --- a/filterlineedit.cpp +++ b/src/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/resources/images/edit-clear-locationbar-rtl.png"); clearButton->setIcon(clearIcon); clearButton->setCursor(Qt::ArrowCursor); clearButton->setStyleSheet("border:none;padding:0px"); diff --git a/filterlineedit.h b/src/filterlineedit.h similarity index 100% rename from filterlineedit.h rename to src/filterlineedit.h diff --git a/backupitem.cpp b/src/forms/backupitem.cpp similarity index 100% rename from backupitem.cpp rename to src/forms/backupitem.cpp diff --git a/backupitem.h b/src/forms/backupitem.h similarity index 100% rename from backupitem.h rename to src/forms/backupitem.h diff --git a/backupitem.ui b/src/forms/backupitem.ui similarity index 100% rename from backupitem.ui rename to src/forms/backupitem.ui diff --git a/backupmanagerform.cpp b/src/forms/backupmanagerform.cpp similarity index 100% rename from backupmanagerform.cpp rename to src/forms/backupmanagerform.cpp diff --git a/backupmanagerform.h b/src/forms/backupmanagerform.h similarity index 100% rename from backupmanagerform.h rename to src/forms/backupmanagerform.h diff --git a/backupmanagerform.ui b/src/forms/backupmanagerform.ui similarity index 100% rename from backupmanagerform.ui rename to src/forms/backupmanagerform.ui diff --git a/configwidget.cpp b/src/forms/configwidget.cpp similarity index 100% rename from configwidget.cpp rename to src/forms/configwidget.cpp diff --git a/configwidget.h b/src/forms/configwidget.h similarity index 100% rename from configwidget.h rename to src/forms/configwidget.h diff --git a/configwidget.ui b/src/forms/configwidget.ui similarity index 100% rename from configwidget.ui rename to src/forms/configwidget.ui diff --git a/confirmdialog.cpp b/src/forms/confirmdialog.cpp similarity index 100% rename from confirmdialog.cpp rename to src/forms/confirmdialog.cpp diff --git a/confirmdialog.h b/src/forms/confirmdialog.h similarity index 100% rename from confirmdialog.h rename to src/forms/confirmdialog.h diff --git a/confirmdialog.ui b/src/forms/confirmdialog.ui similarity index 100% rename from confirmdialog.ui rename to src/forms/confirmdialog.ui diff --git a/pinform.cpp b/src/forms/pinform.cpp similarity index 100% rename from pinform.cpp rename to src/forms/pinform.cpp diff --git a/pinform.h b/src/forms/pinform.h similarity index 100% rename from pinform.h rename to src/forms/pinform.h diff --git a/pinform.ui b/src/forms/pinform.ui similarity index 100% rename from pinform.ui rename to src/forms/pinform.ui diff --git a/progressform.cpp b/src/forms/progressform.cpp similarity index 100% rename from progressform.cpp rename to src/forms/progressform.cpp diff --git a/progressform.h b/src/forms/progressform.h similarity index 100% rename from progressform.h rename to src/forms/progressform.h diff --git a/progressform.ui b/src/forms/progressform.ui similarity index 100% rename from progressform.ui rename to src/forms/progressform.ui diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mainwidget.cpp b/src/mainwidget.cpp similarity index 96% rename from mainwidget.cpp rename to src/mainwidget.cpp index efd08b3..fbe4bc5 100644 --- a/mainwidget.cpp +++ b/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/resources/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/resources/images/psv_icon.png")); #else - trayIcon->setIcon(QIcon(":/main/resources/psv_icon_16.png")); + trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_16.png")); #endif trayIcon->show(); // try to avoid the iconTray Qt bug diff --git a/mainwidget.h b/src/mainwidget.h similarity index 94% rename from mainwidget.h rename to src/mainwidget.h index 696b250..d877a1e 100644 --- a/mainwidget.h +++ b/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 #include diff --git a/sforeader.cpp b/src/sforeader.cpp similarity index 100% rename from sforeader.cpp rename to src/sforeader.cpp diff --git a/sforeader.h b/src/sforeader.h similarity index 100% rename from sforeader.h rename to src/sforeader.h diff --git a/singleapplication.cpp b/src/singleapplication.cpp similarity index 100% rename from singleapplication.cpp rename to src/singleapplication.cpp diff --git a/singleapplication.h b/src/singleapplication.h similarity index 100% rename from singleapplication.h rename to src/singleapplication.h diff --git a/utils.cpp b/src/utils.cpp similarity index 100% rename from utils.cpp rename to src/utils.cpp diff --git a/utils.h b/src/utils.h similarity index 100% rename from utils.h rename to src/utils.h