Browse Source

Move Search-related files into Gui.

adaptive-webui-19844
Vladimir Golovnev (Glassez) 9 years ago
parent
commit
8754fd5646
  1. 19
      src/gui/gui.pri
  2. 2
      src/gui/mainwindow.cpp
  3. 0
      src/gui/search/engineselectdlg.cpp
  4. 0
      src/gui/search/engineselectdlg.h
  5. 0
      src/gui/search/engineselectdlg.ui
  6. 0
      src/gui/search/pluginsourcedlg.h
  7. 0
      src/gui/search/pluginsourcedlg.ui
  8. 0
      src/gui/search/searchlistdelegate.h
  9. 0
      src/gui/search/searchsortmodel.h
  10. 0
      src/gui/search/searchtab.cpp
  11. 0
      src/gui/search/searchtab.h
  12. 0
      src/gui/search/searchwidget.cpp
  13. 0
      src/gui/search/searchwidget.h
  14. 0
      src/gui/search/searchwidget.ui
  15. 0
      src/gui/search/supportedengines.h
  16. 52
      src/searchengine.qrc
  17. 52
      src/searchengine/search.qrc
  18. 19
      src/searchengine/searchengine.pri
  19. 8
      src/src.pro

19
src/gui/gui.pri

@ -41,7 +41,14 @@ HEADERS += \ @@ -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 += \ @@ -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 += \ @@ -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

2
src/gui/mainwindow.cpp

@ -53,7 +53,7 @@ @@ -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"

0
src/searchengine/engineselectdlg.cpp → src/gui/search/engineselectdlg.cpp

0
src/searchengine/engineselectdlg.h → src/gui/search/engineselectdlg.h

0
src/searchengine/engineselectdlg.ui → src/gui/search/engineselectdlg.ui

0
src/searchengine/pluginsourcedlg.h → src/gui/search/pluginsourcedlg.h

0
src/searchengine/pluginsourcedlg.ui → src/gui/search/pluginsourcedlg.ui

0
src/searchengine/searchlistdelegate.h → src/gui/search/searchlistdelegate.h

0
src/searchengine/searchsortmodel.h → src/gui/search/searchsortmodel.h

0
src/searchengine/searchtab.cpp → src/gui/search/searchtab.cpp

0
src/searchengine/searchtab.h → src/gui/search/searchtab.h

0
src/searchengine/searchwidget.cpp → src/gui/search/searchwidget.cpp

0
src/searchengine/searchwidget.h → src/gui/search/searchwidget.h

0
src/searchengine/searchwidget.ui → src/gui/search/searchwidget.ui

0
src/searchengine/supportedengines.h → src/gui/search/supportedengines.h

52
src/searchengine.qrc

@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>searchengine/nova/fix_encoding.py</file>
<file>searchengine/nova/helpers.py</file>
<file>searchengine/nova/nova2.py</file>
<file>searchengine/nova/nova2dl.py</file>
<file>searchengine/nova/novaprinter.py</file>
<file>searchengine/nova/socks.py</file>
<file>searchengine/nova/engines/btdigg.png</file>
<file>searchengine/nova/engines/btdigg.py</file>
<file>searchengine/nova/engines/demonoid.png</file>
<file>searchengine/nova/engines/demonoid.py</file>
<file>searchengine/nova/engines/extratorrent.png</file>
<file>searchengine/nova/engines/extratorrent.py</file>
<file>searchengine/nova/engines/kickasstorrents.png</file>
<file>searchengine/nova/engines/kickasstorrents.py</file>
<file>searchengine/nova/engines/legittorrents.png</file>
<file>searchengine/nova/engines/legittorrents.py</file>
<file>searchengine/nova/engines/mininova.png</file>
<file>searchengine/nova/engines/mininova.py</file>
<file>searchengine/nova/engines/piratebay.png</file>
<file>searchengine/nova/engines/piratebay.py</file>
<file>searchengine/nova/engines/torrentreactor.png</file>
<file>searchengine/nova/engines/torrentreactor.py</file>
<file>searchengine/nova/engines/torrentz.png</file>
<file>searchengine/nova/engines/torrentz.py</file>
<file>searchengine/nova3/helpers.py</file>
<file>searchengine/nova3/nova2.py</file>
<file>searchengine/nova3/nova2dl.py</file>
<file>searchengine/nova3/novaprinter.py</file>
<file>searchengine/nova3/sgmllib3.py</file>
<file>searchengine/nova3/socks.py</file>
<file>searchengine/nova3/engines/btdigg.png</file>
<file>searchengine/nova3/engines/btdigg.py</file>
<file>searchengine/nova3/engines/demonoid.png</file>
<file>searchengine/nova3/engines/demonoid.py</file>
<file>searchengine/nova3/engines/extratorrent.png</file>
<file>searchengine/nova3/engines/extratorrent.py</file>
<file>searchengine/nova3/engines/kickasstorrents.png</file>
<file>searchengine/nova3/engines/kickasstorrents.py</file>
<file>searchengine/nova3/engines/legittorrents.png</file>
<file>searchengine/nova3/engines/legittorrents.py</file>
<file>searchengine/nova3/engines/mininova.png</file>
<file>searchengine/nova3/engines/mininova.py</file>
<file>searchengine/nova3/engines/piratebay.png</file>
<file>searchengine/nova3/engines/piratebay.py</file>
<file>searchengine/nova3/engines/torrentreactor.png</file>
<file>searchengine/nova3/engines/torrentreactor.py</file>
<file>searchengine/nova3/engines/torrentz.png</file>
<file>searchengine/nova3/engines/torrentz.py</file>
</qresource>
</RCC>

52
src/searchengine/search.qrc

@ -1,52 +0,0 @@ @@ -1,52 +0,0 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>nova/fix_encoding.py</file>
<file>nova/helpers.py</file>
<file>nova/nova2.py</file>
<file>nova/nova2dl.py</file>
<file>nova/novaprinter.py</file>
<file>nova/socks.py</file>
<file>nova/engines/btdigg.png</file>
<file>nova/engines/btdigg.py</file>
<file>nova/engines/demonoid.png</file>
<file>nova/engines/demonoid.py</file>
<file>nova/engines/extratorrent.png</file>
<file>nova/engines/extratorrent.py</file>
<file>nova/engines/kickasstorrents.png</file>
<file>nova/engines/kickasstorrents.py</file>
<file>nova/engines/legittorrents.png</file>
<file>nova/engines/legittorrents.py</file>
<file>nova/engines/mininova.png</file>
<file>nova/engines/mininova.py</file>
<file>nova/engines/piratebay.png</file>
<file>nova/engines/piratebay.py</file>
<file>nova/engines/torrentreactor.png</file>
<file>nova/engines/torrentreactor.py</file>
<file>nova/engines/torrentz.png</file>
<file>nova/engines/torrentz.py</file>
<file>nova3/helpers.py</file>
<file>nova3/nova2.py</file>
<file>nova3/nova2dl.py</file>
<file>nova3/novaprinter.py</file>
<file>nova3/sgmllib3.py</file>
<file>nova3/socks.py</file>
<file>nova3/engines/btdigg.png</file>
<file>nova3/engines/btdigg.py</file>
<file>nova3/engines/demonoid.png</file>
<file>nova3/engines/demonoid.py</file>
<file>nova3/engines/extratorrent.png</file>
<file>nova3/engines/extratorrent.py</file>
<file>nova3/engines/kickasstorrents.png</file>
<file>nova3/engines/kickasstorrents.py</file>
<file>nova3/engines/legittorrents.png</file>
<file>nova3/engines/legittorrents.py</file>
<file>nova3/engines/mininova.png</file>
<file>nova3/engines/mininova.py</file>
<file>nova3/engines/piratebay.png</file>
<file>nova3/engines/piratebay.py</file>
<file>nova3/engines/torrentreactor.png</file>
<file>nova3/engines/torrentreactor.py</file>
<file>nova3/engines/torrentz.png</file>
<file>nova3/engines/torrentz.py</file>
</qresource>
</RCC>

19
src/searchengine/searchengine.pri

@ -1,19 +0,0 @@ @@ -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

8
src/src.pro

@ -63,16 +63,14 @@ INCLUDEPATH += $$PWD @@ -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 = \

Loading…
Cancel
Save