Browse files

调整代码结构,增加logo

  • Loading branch information...
1 parent bbffa7f commit 0ae9d42963be79456f2c7e8d022ec5b50e4d14db @iptton iptton committed Apr 1, 2012
View
27 Rythem.pro
@@ -15,47 +15,46 @@ SOURCES += main.cpp\
mainwindow.cpp \
qiddlerpipetablemodel.cpp \
qnetworkproxyfactoryexendforpac.cpp \
- rywinhttp.cpp \
bytearray.cpp \
websocketserver.cpp \
websocketclient.cpp \
connectionmonitorwsserver.cpp \
qirulesettingsdialog.cpp\
- ryproxyserver.cpp \
- rypipedata.cpp \
- ryconnection.cpp \
composer.cpp \
rypipetableview.cpp\
waterfallwindow.cpp \
rule/ryruleproject.cpp \
rule/ryrule.cpp \
rule/ryrulegroup.cpp \
rule/ryrulemanager.cpp \
- rule/ryrulereplacecontent.cpp
+ rule/ryrulereplacecontent.cpp \
+ proxy/rywinhttp.cpp \
+ proxy/ryproxyserver.cpp \
+ proxy/rypipedata.cpp \
+ proxy/ryconnection.cpp
mac:SOURCES -= qiwinhttp.cpp
HEADERS += mainwindow.h \
qiddlerpipetablemodel.h \
qnetworkproxyfactoryexendforpac.h \
- rywinhttp.h \
- rypipedata.h \
bytearray.h \
websocketserver.h \
websocketclient.h \
connectionmonitorwsserver.h \
qirulesettingsdialog.h \
- ryproxyserver.h \
- rypipedata.h \
- ryconnection.h \
composer.h \
rypipetableview.h \
waterfallwindow.h \
rule/ryruleproject.h \
rule/ryrule.h \
rule/ryrulegroup.h \
rule/ryrulemanager.h \
- rule/ryrulereplacecontent.h
+ rule/ryrulereplacecontent.h \
+ proxy/rywinhttp.h \
+ proxy/ryproxyserver.h \
+ proxy/rypipedata.h \
+ proxy/ryconnection.h
win32:HEADERS += zlib/zutil.h \
zlib/zlib.h \
zlib/zconf.h \
@@ -68,9 +67,9 @@ win32:HEADERS += zlib/zutil.h \
zlib/deflate.h \
zlib/crc32.h
-mac:HEADERS -= rywinhttp.h
+mac:HEADERS -= proxy/rywinhttp.h
-mac:SOURCES -= rywinhttp.cpp
+mac:SOURCES -= proxy/rywinhttp.cpp
FORMS += mainwindow.ui \
rule_config.ui \
@@ -116,3 +115,5 @@ CONFIG(release){
#DEFINES -= DEBUGTOFILE
#message("release")
}
+
+ICON = logo.png
View
2 composer.h
@@ -3,7 +3,7 @@
#include <QWidget>
#include <QTcpSocket>
-#include "rypipedata.h"
+#include "proxy/rypipedata.h"
namespace Ui {
class Composer;
View
2 connectionmonitorwsserver.h
@@ -2,7 +2,7 @@
#define CONNECTIONMONITORWSSERVER_H
#include <QtCore>
#include "websocketserver.h"
-#include "rypipedata.h"
+#include "proxy/rypipedata.h"
//this class is for monitoring proxy connection and forward changes of them via websocket to client(s)
class ConnectionMonitorWSServer : public WebSocketServer
View
1 httpfiles.qrc
@@ -41,5 +41,6 @@
</qresource>
<qresource prefix="/static">
<file>static/icloud_64.png</file>
+ <file>logo.png</file>
</qresource>
</RCC>
View
BIN logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
5 main.cpp
@@ -11,8 +11,8 @@
#include "rule/ryrulemanager.h"
-#include "ryproxyserver.h"
-#include "rypipedata.h"
+#include "proxy/ryproxyserver.h"
+#include "proxy/rypipedata.h"
#include <QThread>
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
a.setQuitOnLastWindowClosed(false);
+ a.setWindowIcon(QIcon(":/static/logo.png"));
appPath = qApp->applicationDirPath();
View
8 mainwindow.cpp
@@ -3,8 +3,8 @@
#include "waterfallwindow.h"
#include <QTcpServer>
-#include "rypipedata.h"
-#include "ryproxyserver.h"
+#include "proxy/rypipedata.h"
+#include "proxy/ryproxyserver.h"
#include <QSettings>
#include <QVariant>
#include <QUrl>
@@ -16,7 +16,7 @@
#ifdef Q_WS_WIN32
#include "wininet.h"
#include "winnetwk.h"
-#include "rywinhttp.h"
+#include "proxy/rywinhttp.h"
#endif
#ifdef Q_WS_MAC
#include <CoreFoundation/CoreFoundation.h>
@@ -177,6 +177,8 @@ MainWindow::MainWindow(QWidget *parent) :
ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->tableView->setColumnWidth(0,30);
ui->tableView->setColumnWidth(1,30);
+ ui->tableView->setColumnWidth(2,50);
+ ui->tableView->setColumnWidth(3,50);
ui->tableView->verticalHeader()->setDefaultSectionSize(20);
ui->tableView->verticalHeader()->hide();
ui->tableView->setSortingEnabled(true);
View
4 mainwindow.h
@@ -3,7 +3,7 @@
#include <QMainWindow>
#include "qiddlerpipetablemodel.h"
-#include "rypipedata.h"
+#include "proxy/rypipedata.h"
#include <QSettings>
#include <QWebFrame>
#include <QFileDialog>
@@ -13,7 +13,7 @@
#include <QScriptValue>
#include "rule/ryrulemanager.h"
-#include "ryproxyserver.h"
+#include "proxy/ryproxyserver.h"
#include <QScriptEngine>
View
6 mainwindow.ui
@@ -13,6 +13,10 @@
<property name="windowTitle">
<string>Rythem</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normaloff>logo.png</normaloff>logo.png</iconset>
+ </property>
<widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -142,7 +146,7 @@
<x>0</x>
<y>0</y>
<width>818</width>
- <height>23</height>
+ <height>22</height>
</rect>
</property>
</widget>
View
0 ryconnection.cpp → proxy/ryconnection.cpp
File renamed without changes.
View
0 ryconnection.h → proxy/ryconnection.h
File renamed without changes.
View
0 rypipedata.cpp → proxy/rypipedata.cpp
File renamed without changes.
View
0 rypipedata.h → proxy/rypipedata.h
File renamed without changes.
View
0 ryproxyserver.cpp → proxy/ryproxyserver.cpp
File renamed without changes.
View
0 ryproxyserver.h → proxy/ryproxyserver.h
File renamed without changes.
View
0 rywinhttp.cpp → proxy/rywinhttp.cpp
File renamed without changes.
View
0 rywinhttp.h → proxy/rywinhttp.h
File renamed without changes.
View
2 qiddlerpipetablemodel.cpp
@@ -1,5 +1,5 @@
#include "qiddlerpipetablemodel.h"
-#include "rypipedata.h"
+#include "proxy/rypipedata.h"
#include <QVector>
#include <QStringList>
#include <QDebug>
View
2 qiddlerpipetablemodel.h
@@ -5,7 +5,7 @@
#include <QVector>
#include <QMap>
#include <QSharedPointer>
-#include "rypipedata.h"
+#include "proxy/rypipedata.h"
class QiddlerPipeTableModel : public QAbstractTableModel
{
Q_OBJECT
View
2 waterfallwindow.h
@@ -4,7 +4,7 @@
#include <QMainWindow>
#include <QtCore>
#include <QCloseEvent>
-#include <rypipedata.h>
+#include <proxy/rypipedata.h>
namespace Ui {
class WaterfallWindow;

0 comments on commit 0ae9d42

Please sign in to comment.