Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-17 10:27:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separated Qt4.4 features, so Qt4.3 builds can be done.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-07 19:54:40 +00:00
parent 46f7dd0047
commit 0734fb3e72
4 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
retroshare-gui/src/RetroShare.pro
View File

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools debug CONFIG += qt gui uic qrc resources uitools pluginmgr debug
QT += network xml script QT += network xml script
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare TARGET = RetroShare
@ -76,6 +76,7 @@ macx {
# CONFIG += ppc x86 # CONFIG += ppc x86
LIBS += -Wl,-search_paths_first LIBS += -Wl,-search_paths_first
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lminiupnpc -lz
} }
############################## Common stuff ###################################### ############################## Common stuff ######################################
@ -145,9 +146,9 @@ HEADERS += rshare.h \
gui/HelpDialog.h \ gui/HelpDialog.h \
gui/LogoBar.h \ gui/LogoBar.h \
gui/xprogressbar.h \ gui/xprogressbar.h \
gui/PluginsPage.h \ # gui/PluginsPage.h \
gui/PluginManagerWidget.h \ # gui/PluginManagerWidget.h \
gui/PluginManager.h \ # gui/PluginManager.h \
gui/plugins/PluginInterface.h \ gui/plugins/PluginInterface.h \
gui/im_history/IMHistoryKeeper.h \ gui/im_history/IMHistoryKeeper.h \
gui/im_history/IMHistoryReader.h \ gui/im_history/IMHistoryReader.h \
@ -388,9 +389,9 @@ SOURCES += main.cpp \
gui/HelpDialog.cpp \ gui/HelpDialog.cpp \
gui/LogoBar.cpp \ gui/LogoBar.cpp \
gui/xprogressbar.cpp \ gui/xprogressbar.cpp \
gui/PluginsPage.cpp \ # gui/PluginsPage.cpp \
gui/PluginManagerWidget.cpp \ # gui/PluginManagerWidget.cpp \
gui/PluginManager.cpp \ # gui/PluginManager.cpp \
lang/languagesupport.cpp \ lang/languagesupport.cpp \
util/stringutil.cpp \ util/stringutil.cpp \
util/win32.cpp \ util/win32.cpp \
@ -521,6 +522,24 @@ turtle {
} }
# Shifted Qt4.4 dependancies to here.
# qmake CONFIG=pluginmgr
pluginmgr {
SOURCES += gui/PluginsPage.cpp \
gui/PluginManagerWidget.cpp \
gui/PluginManager.cpp
HEADERS += gui/PluginsPage.h \
gui/PluginManagerWidget.h \
gui/PluginManager.h
DEFINES *= PLUGINMGR
}

3
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -226,9 +226,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages),
createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp));
#ifdef PLUGINMGR
ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages),
createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp));
#endif
/* Create the toolbar */ /* Create the toolbar */
ui.toolBar->addActions(grp->actions()); ui.toolBar->addActions(grp->actions());
ui.toolBar->addSeparator(); ui.toolBar->addSeparator();

68
retroshare-gui/src/gui/SearchDialog.ui
View File

@ -510,12 +510,12 @@
<property name="contextMenuPolicy" > <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6" > <layout class="QGridLayout" >
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>4</number> <number>4</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" name="gridLayout_4" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="minimumSize" > <property name="minimumSize" >
@ -591,17 +591,20 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>220</width> <width>235</width>
<height>123</height> <height>131</height>
</rect> </rect>
</property> </property>
<attribute name="label" > <attribute name="label" >
<string>Keyword Search</string> <string>Keyword Search</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" >
<property name="spacing" > <property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
@ -634,8 +637,7 @@ p, li { white-space: pre-wrap; }
<string>Any</string> <string>Any</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeAny.png</iconset>
<normaloff>:/images/FileTypeAny.png</normaloff>:/images/FileTypeAny.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -643,8 +645,7 @@ p, li { white-space: pre-wrap; }
<string>Archive</string> <string>Archive</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeArchive.png</iconset>
<normaloff>:/images/FileTypeArchive.png</normaloff>:/images/FileTypeArchive.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -652,8 +653,7 @@ p, li { white-space: pre-wrap; }
<string>Audio</string> <string>Audio</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeAudio.png</iconset>
<normaloff>:/images/FileTypeAudio.png</normaloff>:/images/FileTypeAudio.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -661,8 +661,7 @@ p, li { white-space: pre-wrap; }
<string>CD-Image</string> <string>CD-Image</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeCDImage.png</iconset>
<normaloff>:/images/FileTypeCDImage.png</normaloff>:/images/FileTypeCDImage.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -670,8 +669,7 @@ p, li { white-space: pre-wrap; }
<string>Document</string> <string>Document</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeDocument.png</iconset>
<normaloff>:/images/FileTypeDocument.png</normaloff>:/images/FileTypeDocument.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -679,8 +677,7 @@ p, li { white-space: pre-wrap; }
<string>Picture</string> <string>Picture</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypePicture.png</iconset>
<normaloff>:/images/FileTypePicture.png</normaloff>:/images/FileTypePicture.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -688,8 +685,7 @@ p, li { white-space: pre-wrap; }
<string>Program</string> <string>Program</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeProgram.png</iconset>
<normaloff>:/images/FileTypeProgram.png</normaloff>:/images/FileTypeProgram.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -697,8 +693,7 @@ p, li { white-space: pre-wrap; }
<string>Video</string> <string>Video</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/FileTypeVideo.png</iconset>
<normaloff>:/images/FileTypeVideo.png</normaloff>:/images/FileTypeVideo.png</iconset>
</property> </property>
</item> </item>
</widget> </widget>
@ -724,17 +719,16 @@ p, li { white-space: pre-wrap; }
<string>Search</string> <string>Search</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/find.png</iconset>
<normaloff>:/images/find.png</normaloff>:/images/find.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<spacer name="horizontalSpacer" > <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" >
<size> <size>
<width>88</width> <width>88</width>
<height>20</height> <height>20</height>
@ -756,7 +750,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item rowspan="2" row="1" column="1" > <item rowspan="2" row="1" column="1" >
<layout class="QGridLayout" name="gridLayout_5" > <layout class="QGridLayout" >
<item row="0" column="0" colspan="4" > <item row="0" column="0" colspan="4" >
<widget class="SearchTreeWidget" name="searchResultWidget" > <widget class="SearchTreeWidget" name="searchResultWidget" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -836,8 +830,7 @@ p, li { white-space: pre-wrap; }
<string>Download</string> <string>Download</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/down_24x24.png</iconset>
<normaloff>:/images/down_24x24.png</normaloff>:/images/down_24x24.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -848,11 +841,11 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<spacer name="horizontalSpacer_2" > <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" >
<size> <size>
<width>158</width> <width>158</width>
<height>31</height> <height>31</height>
@ -904,8 +897,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/advsearch_24x24.png</iconset>
<normaloff>:/images/advsearch_24x24.png</normaloff>:/images/advsearch_24x24.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -943,7 +935,7 @@ p, li { white-space: pre-wrap; }
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>0</number>
</property> </property>
<property name="tabSpacing" > <property name="tabSpacing" stdset="0" >
<number>6</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="page_2" > <widget class="QWidget" name="page_2" >
@ -951,14 +943,14 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>220</width> <width>224</width>
<height>241</height> <height>221</height>
</rect> </rect>
</property> </property>
<attribute name="label" > <attribute name="label" >
<string>Search Activity</string> <string>Search Activity</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QTreeWidget" name="searchSummaryWidget" > <widget class="QTreeWidget" name="searchSummaryWidget" >
<property name="sizePolicy" > <property name="sizePolicy" >

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.h
View File

@ -3,7 +3,7 @@
#include <QWizard> #include <QWizard>
QT_BEGIN_NAMESPACE //QT_BEGIN_NAMESPACE
class QCheckBox; class QCheckBox;
class QLabel; class QLabel;
class QTextEdit; class QTextEdit;
@ -13,7 +13,7 @@ class QVBoxLayout;
class QHBoxLayout; class QHBoxLayout;
class QGroupBox; class QGroupBox;
class QGridLayout; class QGridLayout;
QT_END_NAMESPACE //QT_END_NAMESPACE
const std::string LOCAL_IP = "---LOCAL---"; const std::string LOCAL_IP = "---LOCAL---";
const std::string EXT_IP = "---EXT---"; const std::string EXT_IP = "---EXT---";