diff --git a/src/gui/gui.pri b/src/gui/gui.pri index 40267792d..847373a85 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -41,7 +41,14 @@ HEADERS += \ $$PWD/advancedsettings.h \ $$PWD/shutdownconfirm.h \ $$PWD/torrentmodel.h \ - $$PWD/torrentcreatordlg.h + $$PWD/torrentcreatordlg.h \ + $$PWD/search/searchwidget.h \ + $$PWD/search/searchtab.h \ + $$PWD/search/engineselectdlg.h \ + $$PWD/search/pluginsourcedlg.h \ + $$PWD/search/searchlistdelegate.h \ + $$PWD/search/supportedengines.h \ + $$PWD/search/searchsortmodel.h SOURCES += \ $$PWD/mainwindow.cpp \ @@ -72,7 +79,10 @@ SOURCES += \ $$PWD/options_imp.cpp \ $$PWD/shutdownconfirm.cpp \ $$PWD/torrentmodel.cpp \ - $$PWD/torrentcreatordlg.cpp + $$PWD/torrentcreatordlg.cpp \ + $$PWD/search/searchwidget.cpp \ + $$PWD/search/searchtab.cpp \ + $$PWD/search/engineselectdlg.cpp win32|macx { HEADERS += $$PWD/programupdater.h @@ -94,6 +104,9 @@ FORMS += \ $$PWD/autoexpandabledialog.ui \ $$PWD/statsdialog.ui \ $$PWD/options.ui \ - $$PWD/torrentcreatordlg.ui + $$PWD/torrentcreatordlg.ui \ + $$PWD/search/searchwidget.ui \ + $$PWD/search/engineselectdlg.ui \ + $$PWD/search/pluginsourcedlg.ui RESOURCES += $$PWD/about.qrc diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 953392430..b2c121285 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -53,7 +53,7 @@ #include "torrentcreatordlg.h" #include "downloadfromurldlg.h" #include "addnewtorrentdialog.h" -#include "searchwidget.h" +#include "search/searchwidget.h" #include "rss_imp.h" #include "base/bittorrent/session.h" #include "base/bittorrent/sessionstatus.h" diff --git a/src/searchengine/engineselectdlg.cpp b/src/gui/search/engineselectdlg.cpp similarity index 100% rename from src/searchengine/engineselectdlg.cpp rename to src/gui/search/engineselectdlg.cpp diff --git a/src/searchengine/engineselectdlg.h b/src/gui/search/engineselectdlg.h similarity index 100% rename from src/searchengine/engineselectdlg.h rename to src/gui/search/engineselectdlg.h diff --git a/src/searchengine/engineselectdlg.ui b/src/gui/search/engineselectdlg.ui similarity index 100% rename from src/searchengine/engineselectdlg.ui rename to src/gui/search/engineselectdlg.ui diff --git a/src/searchengine/pluginsourcedlg.h b/src/gui/search/pluginsourcedlg.h similarity index 100% rename from src/searchengine/pluginsourcedlg.h rename to src/gui/search/pluginsourcedlg.h diff --git a/src/searchengine/pluginsourcedlg.ui b/src/gui/search/pluginsourcedlg.ui similarity index 100% rename from src/searchengine/pluginsourcedlg.ui rename to src/gui/search/pluginsourcedlg.ui diff --git a/src/searchengine/searchlistdelegate.h b/src/gui/search/searchlistdelegate.h similarity index 100% rename from src/searchengine/searchlistdelegate.h rename to src/gui/search/searchlistdelegate.h diff --git a/src/searchengine/searchsortmodel.h b/src/gui/search/searchsortmodel.h similarity index 100% rename from src/searchengine/searchsortmodel.h rename to src/gui/search/searchsortmodel.h diff --git a/src/searchengine/searchtab.cpp b/src/gui/search/searchtab.cpp similarity index 100% rename from src/searchengine/searchtab.cpp rename to src/gui/search/searchtab.cpp diff --git a/src/searchengine/searchtab.h b/src/gui/search/searchtab.h similarity index 100% rename from src/searchengine/searchtab.h rename to src/gui/search/searchtab.h diff --git a/src/searchengine/searchwidget.cpp b/src/gui/search/searchwidget.cpp similarity index 100% rename from src/searchengine/searchwidget.cpp rename to src/gui/search/searchwidget.cpp diff --git a/src/searchengine/searchwidget.h b/src/gui/search/searchwidget.h similarity index 100% rename from src/searchengine/searchwidget.h rename to src/gui/search/searchwidget.h diff --git a/src/searchengine/searchwidget.ui b/src/gui/search/searchwidget.ui similarity index 100% rename from src/searchengine/searchwidget.ui rename to src/gui/search/searchwidget.ui diff --git a/src/searchengine/supportedengines.h b/src/gui/search/supportedengines.h similarity index 100% rename from src/searchengine/supportedengines.h rename to src/gui/search/supportedengines.h diff --git a/src/searchengine.qrc b/src/searchengine.qrc new file mode 100644 index 000000000..a3022d37f --- /dev/null +++ b/src/searchengine.qrc @@ -0,0 +1,52 @@ + + + searchengine/nova/fix_encoding.py + searchengine/nova/helpers.py + searchengine/nova/nova2.py + searchengine/nova/nova2dl.py + searchengine/nova/novaprinter.py + searchengine/nova/socks.py + searchengine/nova/engines/btdigg.png + searchengine/nova/engines/btdigg.py + searchengine/nova/engines/demonoid.png + searchengine/nova/engines/demonoid.py + searchengine/nova/engines/extratorrent.png + searchengine/nova/engines/extratorrent.py + searchengine/nova/engines/kickasstorrents.png + searchengine/nova/engines/kickasstorrents.py + searchengine/nova/engines/legittorrents.png + searchengine/nova/engines/legittorrents.py + searchengine/nova/engines/mininova.png + searchengine/nova/engines/mininova.py + searchengine/nova/engines/piratebay.png + searchengine/nova/engines/piratebay.py + searchengine/nova/engines/torrentreactor.png + searchengine/nova/engines/torrentreactor.py + searchengine/nova/engines/torrentz.png + searchengine/nova/engines/torrentz.py + searchengine/nova3/helpers.py + searchengine/nova3/nova2.py + searchengine/nova3/nova2dl.py + searchengine/nova3/novaprinter.py + searchengine/nova3/sgmllib3.py + searchengine/nova3/socks.py + searchengine/nova3/engines/btdigg.png + searchengine/nova3/engines/btdigg.py + searchengine/nova3/engines/demonoid.png + searchengine/nova3/engines/demonoid.py + searchengine/nova3/engines/extratorrent.png + searchengine/nova3/engines/extratorrent.py + searchengine/nova3/engines/kickasstorrents.png + searchengine/nova3/engines/kickasstorrents.py + searchengine/nova3/engines/legittorrents.png + searchengine/nova3/engines/legittorrents.py + searchengine/nova3/engines/mininova.png + searchengine/nova3/engines/mininova.py + searchengine/nova3/engines/piratebay.png + searchengine/nova3/engines/piratebay.py + searchengine/nova3/engines/torrentreactor.png + searchengine/nova3/engines/torrentreactor.py + searchengine/nova3/engines/torrentz.png + searchengine/nova3/engines/torrentz.py + + diff --git a/src/searchengine/search.qrc b/src/searchengine/search.qrc deleted file mode 100644 index a1aa7edc9..000000000 --- a/src/searchengine/search.qrc +++ /dev/null @@ -1,52 +0,0 @@ - - - nova/fix_encoding.py - nova/helpers.py - nova/nova2.py - nova/nova2dl.py - nova/novaprinter.py - nova/socks.py - nova/engines/btdigg.png - nova/engines/btdigg.py - nova/engines/demonoid.png - nova/engines/demonoid.py - nova/engines/extratorrent.png - nova/engines/extratorrent.py - nova/engines/kickasstorrents.png - nova/engines/kickasstorrents.py - nova/engines/legittorrents.png - nova/engines/legittorrents.py - nova/engines/mininova.png - nova/engines/mininova.py - nova/engines/piratebay.png - nova/engines/piratebay.py - nova/engines/torrentreactor.png - nova/engines/torrentreactor.py - nova/engines/torrentz.png - nova/engines/torrentz.py - nova3/helpers.py - nova3/nova2.py - nova3/nova2dl.py - nova3/novaprinter.py - nova3/sgmllib3.py - nova3/socks.py - nova3/engines/btdigg.png - nova3/engines/btdigg.py - nova3/engines/demonoid.png - nova3/engines/demonoid.py - nova3/engines/extratorrent.png - nova3/engines/extratorrent.py - nova3/engines/kickasstorrents.png - nova3/engines/kickasstorrents.py - nova3/engines/legittorrents.png - nova3/engines/legittorrents.py - nova3/engines/mininova.png - nova3/engines/mininova.py - nova3/engines/piratebay.png - nova3/engines/piratebay.py - nova3/engines/torrentreactor.png - nova3/engines/torrentreactor.py - nova3/engines/torrentz.png - nova3/engines/torrentz.py - - diff --git a/src/searchengine/searchengine.pri b/src/searchengine/searchengine.pri deleted file mode 100644 index 9a2812827..000000000 --- a/src/searchengine/searchengine.pri +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDEPATH += $$PWD - -FORMS += $$PWD/searchwidget.ui \ - $$PWD/engineselectdlg.ui \ - $$PWD/pluginsourcedlg.ui - -HEADERS += $$PWD/searchwidget.h \ - $$PWD/searchtab.h \ - $$PWD/engineselectdlg.h \ - $$PWD/pluginsourcedlg.h \ - $$PWD/searchlistdelegate.h \ - $$PWD/supportedengines.h \ - $$PWD/searchsortmodel.h - -SOURCES += $$PWD/searchwidget.cpp \ - $$PWD/searchtab.cpp \ - $$PWD/engineselectdlg.cpp - -RESOURCES += $$PWD/search.qrc diff --git a/src/src.pro b/src/src.pro index 7d87e9f64..b1cd75c7e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -63,16 +63,14 @@ INCLUDEPATH += $$PWD include(app/app.pri) include(base/base.pri) !nowebui: include(webui/webui.pri) -!nogui { - include(gui/gui.pri) - include(searchengine/searchengine.pri) -} +!nogui: include(gui/gui.pri) # Resource files QMAKE_RESOURCE_FLAGS += -compress 9 -threshold 5 RESOURCES += \ icons.qrc \ - lang.qrc + lang.qrc \ + searchengine.qrc # Translations TRANSLATIONS = \