Change project directory structure.

Change project directory structure according to application structure.
Change 'nox' configuration option to something more meaningful 'nogui'.
Rename 'Icons' folder to 'icons' (similar to other folders).
Partially add 'nowebui' option support.
Remove QConf project file.
This commit is contained in:
Vladimir Golovnev (Glassez) 2015-01-18 15:13:06 +03:00
commit ff9a281b72
797 changed files with 841 additions and 829 deletions

40
src/app/app.pri Normal file
View file

@ -0,0 +1,40 @@
INCLUDEPATH += $$PWD
usesystemqtsingleapplication {
nogui {
CONFIG += qtsinglecoreapplication
} else {
CONFIG += qtsingleapplication
}
} else {
nogui {
include(qtsingleapplication/qtsinglecoreapplication.pri)
} else {
include(qtsingleapplication/qtsingleapplication.pri)
}
}
!nogui {
macx {
HEADERS += $$PWD/qmacapplication.h
SOURCES += $$PWD/qmacapplication.cpp
}
HEADERS += $$PWD/sessionapplication.h
SOURCES += $$PWD/sessionapplication.cpp
}
HEADERS += $$PWD/application.h
SOURCES += $$PWD/application.cpp
nogui: HEADERS += $$PWD/headlessloader.h
unix: HEADERS += $$PWD/stacktrace.h
strace_win {
HEADERS += $$PWD/stacktrace_win.h
!nogui {
HEADERS += $$PWD/stacktrace_win_dlg.h
FORMS += $$PWD/stacktrace_win_dlg.ui
}
}
SOURCES += $$PWD/main.cpp

View file

@ -404,7 +404,7 @@ void sigabrtHandler(int)
#ifndef DISABLE_GUI
void showSplashScreen()
{
QPixmap splash_img(":/Icons/skin/splash.png");
QPixmap splash_img(":/icons/skin/splash.png");
QPainter painter(&splash_img);
QString version = VERSION;
painter.setPen(QPen(Qt::white));

35
src/core/core.pri Normal file
View file

@ -0,0 +1,35 @@
INCLUDEPATH += $$PWD
unix:!macx:dbus: include(qtnotify/qtnotify.pri)
include(qtlibtorrent/qtlibtorrent.pri)
include(tracker/tracker.pri)
HEADERS += \
$$PWD/misc.h \
$$PWD/fs_utils.h \
$$PWD/downloadthread.h \
$$PWD/torrentpersistentdata.h \
$$PWD/filesystemwatcher.h \
$$PWD/scannedfoldersmodel.h \
$$PWD/qinisettings.h \
$$PWD/smtp.h \
$$PWD/dnsupdater.h \
$$PWD/logger.h \
$$PWD/httptypes.h \
$$PWD/httprequestparser.h \
$$PWD/httpresponsegenerator.h \
$$PWD/preferences.h
SOURCES += \
$$PWD/downloadthread.cpp \
$$PWD/scannedfoldersmodel.cpp \
$$PWD/torrentpersistentdata.cpp \
$$PWD/misc.cpp \
$$PWD/fs_utils.cpp \
$$PWD/smtp.cpp \
$$PWD/dnsupdater.cpp \
$$PWD/logger.cpp \
$$PWD/httprequestparser.cpp \
$$PWD/httpresponsegenerator.cpp \
$$PWD/preferences.cpp

View file

View file

View file

@ -41,42 +41,42 @@ using namespace libtorrent;
namespace {
QIcon get_paused_icon() {
static QIcon cached = QIcon(":/Icons/skin/paused.png");
static QIcon cached = QIcon(":/icons/skin/paused.png");
return cached;
}
QIcon get_queued_icon() {
static QIcon cached = QIcon(":/Icons/skin/queued.png");
static QIcon cached = QIcon(":/icons/skin/queued.png");
return cached;
}
QIcon get_downloading_icon() {
static QIcon cached = QIcon(":/Icons/skin/downloading.png");
static QIcon cached = QIcon(":/icons/skin/downloading.png");
return cached;
}
QIcon get_stalled_downloading_icon() {
static QIcon cached = QIcon(":/Icons/skin/stalledDL.png");
static QIcon cached = QIcon(":/icons/skin/stalledDL.png");
return cached;
}
QIcon get_uploading_icon() {
static QIcon cached = QIcon(":/Icons/skin/uploading.png");
static QIcon cached = QIcon(":/icons/skin/uploading.png");
return cached;
}
QIcon get_stalled_uploading_icon() {
static QIcon cached = QIcon(":/Icons/skin/stalledUP.png");
static QIcon cached = QIcon(":/icons/skin/stalledUP.png");
return cached;
}
QIcon get_checking_icon() {
static QIcon cached = QIcon(":/Icons/skin/checking.png");
static QIcon cached = QIcon(":/icons/skin/checking.png");
return cached;
}
QIcon get_error_icon() {
static QIcon cached = QIcon(":/Icons/skin/error.png");
static QIcon cached = QIcon(":/icons/skin/error.png");
return cached;
}
}

View file

@ -89,7 +89,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/Icons/skin/mascot.png</pixmap>
<pixmap resource="icons.qrc">:/icons/skin/mascot.png</pixmap>
</property>
</widget>
</item>

View file

@ -67,7 +67,7 @@ class about : public QDialog, private Ui::AboutDlg{
"</p></body></html>");
lb_about->setText(aboutText);
// Set icons
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/skin/qbittorrent22.png")));
//Title
lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" " VERSION"</h1></b>"));
// Thanks

BIN
src/gui/geoip/GeoIP.dat Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more