From 843168bb62d191cf85128cf6a857aee5a20e29dc Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Fri, 20 Nov 2009 08:20:05 +0000 Subject: [PATCH] - Move ui files to their own folder --- src/GUI.h | 2 +- src/downloadfromurldlg.h | 2 +- src/engineselectdlg.cpp | 2 +- src/engineselectdlg.h | 2 +- src/feeddownloader.h | 2 +- src/{pluginSource.h => pluginsource.h} | 2 +- src/propertieswidget.h | 2 +- src/src.pro | 40 +++++++++---------- src/torrentadditiondlg.h | 2 +- src/trackersadditiondlg.h | 2 +- src/{ => ui}/about.ui | 0 src/{ => ui}/bandwidth_limit.ui | 0 src/{ => ui}/confirmdeletiondlg.ui | 0 src/{ => ui}/console.ui | 0 src/{ => ui}/createtorrent.ui | 0 .../downloadfromurldlg.ui} | 0 src/{engineSelect.ui => ui/engineselect.ui} | 0 .../feeddownloader.ui} | 0 src/{ => ui}/login.ui | 0 src/{MainWindow.ui => ui/mainwindow.ui} | 0 src/{ => ui}/options.ui | 0 src/{ => ui}/peer.ui | 0 src/{pluginSource.ui => ui/pluginsource.ui} | 0 src/{ => ui}/preview.ui | 0 .../propertieswidget.ui} | 0 src/{ => ui}/rss.ui | 0 src/{ => ui}/search.ui | 0 .../torrentadditiondlg.ui} | 0 .../trackersadditiondlg.ui} | 0 29 files changed, 29 insertions(+), 29 deletions(-) rename src/{pluginSource.h => pluginsource.h} (98%) rename src/{ => ui}/about.ui (100%) rename src/{ => ui}/bandwidth_limit.ui (100%) rename src/{ => ui}/confirmdeletiondlg.ui (100%) rename src/{ => ui}/console.ui (100%) rename src/{ => ui}/createtorrent.ui (100%) rename src/{downloadFromURL.ui => ui/downloadfromurldlg.ui} (100%) rename src/{engineSelect.ui => ui/engineselect.ui} (100%) rename src/{FeedDownloader.ui => ui/feeddownloader.ui} (100%) rename src/{ => ui}/login.ui (100%) rename src/{MainWindow.ui => ui/mainwindow.ui} (100%) rename src/{ => ui}/options.ui (100%) rename src/{ => ui}/peer.ui (100%) rename src/{pluginSource.ui => ui/pluginsource.ui} (100%) rename src/{ => ui}/preview.ui (100%) rename src/{propertiesWidget.ui => ui/propertieswidget.ui} (100%) rename src/{ => ui}/rss.ui (100%) rename src/{ => ui}/search.ui (100%) rename src/{addTorrentDialog.ui => ui/torrentadditiondlg.ui} (100%) rename src/{trackersAdd.ui => ui/trackersadditiondlg.ui} (100%) diff --git a/src/GUI.h b/src/GUI.h index 18c9c475d..e1f9414e6 100644 --- a/src/GUI.h +++ b/src/GUI.h @@ -34,7 +34,7 @@ #include #include #include -#include "ui_MainWindow.h" +#include "ui_mainwindow.h" #include "qtorrenthandle.h" class Bittorrent; diff --git a/src/downloadfromurldlg.h b/src/downloadfromurldlg.h index 49934f45f..9006bf899 100644 --- a/src/downloadfromurldlg.h +++ b/src/downloadfromurldlg.h @@ -37,7 +37,7 @@ #include #include #include -#include "ui_downloadFromURL.h" +#include "ui_downloadfromurldlg.h" class downloadFromURL : public QDialog, private Ui::downloadFromURL{ Q_OBJECT diff --git a/src/engineselectdlg.cpp b/src/engineselectdlg.cpp index 803a91b0b..db65a9956 100644 --- a/src/engineselectdlg.cpp +++ b/src/engineselectdlg.cpp @@ -32,7 +32,7 @@ #include "downloadthread.h" #include "misc.h" #include "ico.h" -#include "pluginSource.h" +#include "pluginsource.h" #include #include #include diff --git a/src/engineselectdlg.h b/src/engineselectdlg.h index d5c19cc1c..5e499d3e7 100644 --- a/src/engineselectdlg.h +++ b/src/engineselectdlg.h @@ -31,7 +31,7 @@ #ifndef ENGINE_SELECT_DLG_H #define ENGINE_SELECT_DLG_H -#include "ui_engineSelect.h" +#include "ui_engineselect.h" #include "supportedengines.h" class downloadThread; diff --git a/src/feeddownloader.h b/src/feeddownloader.h index 171cf0de1..15fb77241 100644 --- a/src/feeddownloader.h +++ b/src/feeddownloader.h @@ -45,7 +45,7 @@ #include #include "bittorrent.h" -#include "ui_FeedDownloader.h" +#include "ui_feeddownloader.h" class FeedFilter: public QHash { private: diff --git a/src/pluginSource.h b/src/pluginsource.h similarity index 98% rename from src/pluginSource.h rename to src/pluginsource.h index 44c1b1abe..514a3ea71 100644 --- a/src/pluginSource.h +++ b/src/pluginsource.h @@ -32,7 +32,7 @@ #define PLUGIN_SOURCE_H #include -#include "ui_pluginSource.h" +#include "ui_pluginsource.h" class pluginSourceDlg: public QDialog, private Ui::pluginSourceDlg { Q_OBJECT diff --git a/src/propertieswidget.h b/src/propertieswidget.h index fb40a6e05..b7bd9a7a3 100644 --- a/src/propertieswidget.h +++ b/src/propertieswidget.h @@ -32,7 +32,7 @@ #define PROPERTIESWIDGET_H #include -#include "ui_propertiesWidget.h" +#include "ui_propertieswidget.h" #include "qtorrenthandle.h" diff --git a/src/src.pro b/src/src.pro index d76d858fe..93c871aa9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -161,7 +161,7 @@ HEADERS += GUI.h \ speedlimitdlg.h \ qtorrenthandle.h \ engineselectdlg.h \ - pluginSource.h \ + pluginsource.h \ qgnomelook.h \ realprogressbar.h \ realprogressbarthread.h \ @@ -197,25 +197,25 @@ HEADERS += GUI.h \ deletionconfirmationdlg.h \ statusbar.h \ trackerlist.h -FORMS += MainWindow.ui \ - options.ui \ - about.ui \ - createtorrent.ui \ - preview.ui \ - login.ui \ - downloadFromURL.ui \ - addTorrentDialog.ui \ - search.ui \ - rss.ui \ - bandwidth_limit.ui \ - engineSelect.ui \ - pluginSource.ui \ - trackersAdd.ui \ - console.ui \ - FeedDownloader.ui \ - propertiesWidget.ui \ - peer.ui \ - confirmdeletiondlg.ui +FORMS += ui/mainwindow.ui \ + ui/options.ui \ + ui/about.ui \ + ui/createtorrent.ui \ + ui/preview.ui \ + ui/login.ui \ + ui/downloadfromurldlg.ui \ + ui/torrentadditiondlg.ui \ + ui/search.ui \ + ui/rss.ui \ + ui/bandwidth_limit.ui \ + ui/engineselect.ui \ + ui/pluginsource.ui \ + ui/trackersadditiondlg.ui \ + ui/console.ui \ + ui/feeddownloader.ui \ + ui/propertieswidget.ui \ + ui/peer.ui \ + ui/confirmdeletiondlg.ui SOURCES += GUI.cpp \ main.cpp \ options_imp.cpp \ diff --git a/src/torrentadditiondlg.h b/src/torrentadditiondlg.h index 42f606d98..1c7a7bcc6 100644 --- a/src/torrentadditiondlg.h +++ b/src/torrentadditiondlg.h @@ -45,7 +45,7 @@ #include "bittorrent.h" #include "misc.h" #include "proplistdelegate.h" -#include "ui_addTorrentDialog.h" +#include "ui_torrentadditiondlg.h" #include "torrentpersistentdata.h" #include "torrentfilesmodel.h" diff --git a/src/trackersadditiondlg.h b/src/trackersadditiondlg.h index 3c8a355b5..a4f4ce280 100644 --- a/src/trackersadditiondlg.h +++ b/src/trackersadditiondlg.h @@ -33,7 +33,7 @@ #include #include -#include "ui_trackersAdd.h" +#include "ui_trackersadditiondlg.h" class TrackersAdditionDlg : public QDialog, private Ui::TrackersAdditionDlg{ Q_OBJECT diff --git a/src/about.ui b/src/ui/about.ui similarity index 100% rename from src/about.ui rename to src/ui/about.ui diff --git a/src/bandwidth_limit.ui b/src/ui/bandwidth_limit.ui similarity index 100% rename from src/bandwidth_limit.ui rename to src/ui/bandwidth_limit.ui diff --git a/src/confirmdeletiondlg.ui b/src/ui/confirmdeletiondlg.ui similarity index 100% rename from src/confirmdeletiondlg.ui rename to src/ui/confirmdeletiondlg.ui diff --git a/src/console.ui b/src/ui/console.ui similarity index 100% rename from src/console.ui rename to src/ui/console.ui diff --git a/src/createtorrent.ui b/src/ui/createtorrent.ui similarity index 100% rename from src/createtorrent.ui rename to src/ui/createtorrent.ui diff --git a/src/downloadFromURL.ui b/src/ui/downloadfromurldlg.ui similarity index 100% rename from src/downloadFromURL.ui rename to src/ui/downloadfromurldlg.ui diff --git a/src/engineSelect.ui b/src/ui/engineselect.ui similarity index 100% rename from src/engineSelect.ui rename to src/ui/engineselect.ui diff --git a/src/FeedDownloader.ui b/src/ui/feeddownloader.ui similarity index 100% rename from src/FeedDownloader.ui rename to src/ui/feeddownloader.ui diff --git a/src/login.ui b/src/ui/login.ui similarity index 100% rename from src/login.ui rename to src/ui/login.ui diff --git a/src/MainWindow.ui b/src/ui/mainwindow.ui similarity index 100% rename from src/MainWindow.ui rename to src/ui/mainwindow.ui diff --git a/src/options.ui b/src/ui/options.ui similarity index 100% rename from src/options.ui rename to src/ui/options.ui diff --git a/src/peer.ui b/src/ui/peer.ui similarity index 100% rename from src/peer.ui rename to src/ui/peer.ui diff --git a/src/pluginSource.ui b/src/ui/pluginsource.ui similarity index 100% rename from src/pluginSource.ui rename to src/ui/pluginsource.ui diff --git a/src/preview.ui b/src/ui/preview.ui similarity index 100% rename from src/preview.ui rename to src/ui/preview.ui diff --git a/src/propertiesWidget.ui b/src/ui/propertieswidget.ui similarity index 100% rename from src/propertiesWidget.ui rename to src/ui/propertieswidget.ui diff --git a/src/rss.ui b/src/ui/rss.ui similarity index 100% rename from src/rss.ui rename to src/ui/rss.ui diff --git a/src/search.ui b/src/ui/search.ui similarity index 100% rename from src/search.ui rename to src/ui/search.ui diff --git a/src/addTorrentDialog.ui b/src/ui/torrentadditiondlg.ui similarity index 100% rename from src/addTorrentDialog.ui rename to src/ui/torrentadditiondlg.ui diff --git a/src/trackersAdd.ui b/src/ui/trackersadditiondlg.ui similarity index 100% rename from src/trackersAdd.ui rename to src/ui/trackersadditiondlg.ui