Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Cleaned up fonts for MacOSX.

Browse Source 
* made changes to win32.cpp cross-platform.
 * updated rsfiles.h
 * updated version to v0.4.10b




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-08-16 17:10:01 +00:00
parent cf7d072a5b
commit 45f2108fd0
15 changed files with 212 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/ApplicationWindow.ui
View File

@ -478,17 +478,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>

11
retroshare-gui/src/gui/MainWindow.ui
View File

@ -478,17 +478,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>

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

@ -287,6 +287,9 @@ void MessagesDialog::getallrecommended()
for(fit = fnames.begin(), hit = hashes.begin(), sit = sizes.begin();
fit != fnames.end(); fit++, hit++, sit++)
{
std::cerr << "MessagesDialog::getallrecommended() Calling File Request";
std::cerr << std::endl;
rsFiles -> FileRequest(*fit, *hit, *sit, "", 0);
}
}

11
retroshare-gui/src/gui/NetworkDialog.ui
View File

@ -103,17 +103,6 @@ p, li { white-space: pre-wrap; }
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>

59
retroshare-gui/src/gui/PeersDialog.ui
View File

@ -478,17 +478,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
@ -500,12 +489,6 @@
</property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
@ -533,7 +516,7 @@ p, li { white-space: pre-wrap; }
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" >
<size>
<width>201</width>
<height>20</height>
@ -582,26 +565,20 @@ p, li { white-space: pre-wrap; }
</item>
<item row="0" column="1" >
<layout class="QGridLayout" >
<property name="margin" >
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="spacing" >
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" >
<size>
<width>181</width>
<height>20</height>
@ -611,12 +588,6 @@ p, li { white-space: pre-wrap; }
</item>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
@ -670,18 +641,12 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout" >
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" >
<size>
<width>321</width>
<height>20</height>
@ -710,8 +675,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/edit-italic.png</normaloff>:/images/edit-italic.png</iconset>
<iconset resource="images.qrc" >:/images/edit-italic.png</iconset>
</property>
<property name="checkable" >
<bool>true</bool>
@ -739,8 +703,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/edit-underline.png</normaloff>:/images/edit-underline.png</iconset>
<iconset resource="images.qrc" >:/images/edit-underline.png</iconset>
</property>
<property name="checkable" >
<bool>true</bool>
@ -768,8 +731,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/edit-bold.png</normaloff>:/images/edit-bold.png</iconset>
<iconset resource="images.qrc" >:/images/edit-bold.png</iconset>
</property>
<property name="checkable" >
<bool>true</bool>
@ -838,8 +800,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/emoticons/kopete/kopete020.png</normaloff>:/images/emoticons/kopete/kopete020.png</iconset>
<iconset resource="images.qrc" >:/images/emoticons/kopete/kopete020.png</iconset>
</property>
<property name="iconSize" >
<size>
@ -907,7 +868,7 @@ p, li { white-space: pre-wrap; }
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" >
<size>
<width>321</width>
<height>20</height>

40
retroshare-gui/src/gui/Preferences/PreferencesWindow.ui
View File

@ -478,17 +478,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
@ -509,20 +498,26 @@
</property>
<widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>3</number>
</property>
<property name="verticalSpacing" >
<number>3</number>
</property>
<item row="2" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QPushButton" name="cancelprefButton" >
<property name="minimumSize" >
@ -1072,14 +1067,17 @@
</size>
</property>
<attribute name="toolBarArea" >
<number>4</number>
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak" >
<bool>false</bool>
</attribute>
</widget>
</widget>
<customwidgets>
<customwidget>
<class>ConfigPageStack</class>
<extends>QStackedPageWidget</extends>
<extends>QWidget</extends>
<header>gui/Preferences/configpagestack.h</header>
</customwidget>
</customwidgets>

94
retroshare-gui/src/gui/Preferences/ServerDialog.ui
View File

@ -484,17 +484,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
@ -523,7 +512,7 @@
<property name="bottomMargin" >
<number>2</number>
</property>
<item row="1" column="0" >
<item row="0" column="0" >
<layout class="QVBoxLayout" >
<item>
<widget class="QComboBox" name="netModeComboBox" >
@ -592,32 +581,71 @@
<property name="title" >
<string>Server Status And Network Settings</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>4</number>
</property>
<property name="topMargin" >
<number>4</number>
</property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>4</number>
</property>
<item row="0" column="0" >
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_6" >
<layout class="QGridLayout" >
<item rowspan="6" row="0" column="0" >
<widget class="QTextEdit" name="netStatusBox" />
</item>
<item row="0" column="1" >
<widget class="QCheckBox" name="checkBox" >
<property name="text" >
<string>Network Status</string>
<string>Network Okay</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="netStatusBox" />
<item row="1" column="1" >
<widget class="QCheckBox" name="checkBox_6" >
<property name="text" >
<string>UPnP Active</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QCheckBox" name="checkBox_5" >
<property name="text" >
<string>DHT Okay</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QCheckBox" name="checkBox_2" >
<property name="text" >
<string>Found Ext IP Addr</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QCheckBox" name="checkBox_3" >
<property name="text" >
<string>UDP Connections</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QCheckBox" name="checkBox_4" >
<property name="text" >
<string>TCP server</string>
</property>
<property name="checkable" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
@ -694,8 +722,6 @@
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" >

2
retroshare-gui/src/gui/SearchDialog.cpp
View File

@ -227,6 +227,8 @@ void SearchDialog::download()
// call the download
if (item->text(SR_ID_COL) != "Local")
{
std::cerr << "SearchDialog::download() Calling File Request";
std::cerr << std::endl;
rsFiles -> FileRequest((item->text(SR_NAME_COL)).toStdString(),
(item->text(SR_HASH_COL)).toStdString(),
(item->text(SR_SIZE_COL)).toInt(),

11
retroshare-gui/src/gui/SharedFilesDialog.ui
View File

@ -484,17 +484,6 @@
</disabled>
</palette>
</property>
<property name="font" >
<font>
<family>Arial</family>
<pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>

4
retroshare-gui/src/gui/feeds/SubFileItem.cpp
View File

@ -30,6 +30,8 @@
* #define DEBUG_ITEM 1
****/
#define DEBUG_ITEM 1
/*******************************************************************
* SubFileItem fully controls the file transfer from the gui side
*
@ -536,6 +538,8 @@ void SubFileItem::download()
}
// TEMP
std::cerr << "SubFileItem::download() Calling File Request";
std::cerr << std::endl;
rsFiles->FileRequest(mFileName, mFileHash, mFileSize, "", 0);
}

2
retroshare-gui/src/rsiface/RemoteDirModel.cpp
View File

@ -692,6 +692,8 @@ void RemoteDirModel::downloadSelected(QModelIndexList list)
/* only request if it is a file */
if (details.type == DIR_TYPE_FILE)
{
std::cerr << "RemoteDirModel::downloadSelected() Calling File Request";
std::cerr << std::endl;
rsFiles -> FileRequest(details.name, details.hash,
details.count, "", 0);
}

77
retroshare-gui/src/rsiface/rsfiles.h
View File

@ -51,19 +51,22 @@ const uint32_t RS_FILE_CTRL_STREAM_VIDEO = 0x0006;
/************************************
* Used To indicate where to search.
*
* The Order of these is very important,
* it specifies the search order too.
*
*/
const uint32_t RS_FILE_HINTS_MASK = 0x00ff;
const uint32_t RS_FILE_HINTS_MASK = 0x00ffffff;
const uint32_t RS_FILE_HINTS_CACHE = 0x0001;
const uint32_t RS_FILE_HINTS_EXTRA = 0x0002;
const uint32_t RS_FILE_HINTS_LOCAL = 0x0004;
const uint32_t RS_FILE_HINTS_REMOTE = 0x0008;
const uint32_t RS_FILE_HINTS_DOWNLOAD = 0x0010;
const uint32_t RS_FILE_HINTS_UPLOAD = 0x0020;
const uint32_t RS_FILE_HINTS_SPEC_ONLY = 0x1000;
const uint32_t RS_FILE_HINTS_CACHE = 0x00000001;
const uint32_t RS_FILE_HINTS_EXTRA = 0x00000002;
const uint32_t RS_FILE_HINTS_LOCAL = 0x00000004;
const uint32_t RS_FILE_HINTS_REMOTE = 0x00000008;
const uint32_t RS_FILE_HINTS_DOWNLOAD = 0x00000010;
const uint32_t RS_FILE_HINTS_UPLOAD = 0x00000020;
const uint32_t RS_FILE_HINTS_SPEC_ONLY = 0x01000000;
const uint32_t RS_FILE_EXTRA_DELETE = 0x0010;
@ -79,43 +82,27 @@ virtual ~RsFiles() { return; }
/****************************************/
/* download */
/* Required Interfaces ......
*
* 1) Access to downloading / uploading files.
*/
/* get Details of File Transfers */
virtual bool FileDownloads(std::list<std::string> &hashs) = 0;
virtual bool FileUploads(std::list<std::string> &hashs) = 0;
virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info) = 0;
/*
* 2) Control of Downloads.
*
*/
/***
* Control of Downloads.
***/
virtual bool FileRequest(std::string fname, std::string hash,
uint32_t size, std::string dest, uint32_t flags) = 0;
virtual bool FileCancel(std::string hash) = 0;
virtual bool FileControl(std::string hash, uint32_t flags) = 0;
virtual bool FileClearCompleted() = 0;
/***
* Download / Upload Details.
***/
virtual bool FileDownloads(std::list<std::string> &hashs) = 0;
virtual bool FileUploads(std::list<std::string> &hashs) = 0;
virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info) = 0;
/*
* 3) Addition of Extra Files... From File System
* These are Hashed and stored in the 'Hidden Files' section
* which can only be accessed if you know the hash.
*
* FileHash is called to start the hashing process,
* and add the file to the HiddenStore.
*
* FileHashStatus is called to lookup files
* and see if the hashing is completed.
*/
/* Access ftExtraList - Details */
/***
* Extra List Access
***/
virtual bool ExtraFileAdd(std::string fname, std::string hash, uint32_t size,
uint32_t period, uint32_t flags) = 0;
virtual bool ExtraFileRemove(std::string hash, uint32_t flags) = 0;
@ -124,25 +111,25 @@ virtual bool ExtraFileHash(std::string localpath,
virtual bool ExtraFileStatus(std::string localpath, FileInfo &info) = 0;
/*
* 4) Search and Listing Interface
/***
* Directory Listing / Search Interface
*/
/* Directory Listing / Search Interface */
virtual int RequestDirDetails(std::string uid, std::string path, DirDetails &details) = 0;
virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) = 0;
virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results) = 0;
virtual int SearchBoolExp(Expression * exp, std::list<FileDetail> &results) = 0;
/*
* 5) Directory Control / Shared Files Utility Functions.
*/
/***
* Utility Functions.
***/
virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath) = 0;
virtual void ForceDirectoryCheck() = 0;
virtual bool InDirectoryCheck() = 0;
/***
* Directory Control
***/
virtual void setDownloadDirectory(std::string path) = 0;
virtual void setPartialsDirectory(std::string path) = 0;
virtual std::string getDownloadDirectory() = 0;

2
retroshare-gui/src/util/rsversion.cpp
View File

@ -23,7 +23,7 @@
//#define USE_SVN_VERSIONS 1
#define VERSION "0.4.10a"
#define VERSION "0.4.10b"
#if USE_SVN_VERSIONS
#include "svn_revision.h"

15
retroshare-gui/src/util/win32.cpp
View File

@ -20,6 +20,13 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#if 0
#include <windows.h>
#include <shlobj.h>
@ -63,6 +70,7 @@ win32_get_folder_location(int folder, QString defaultPath)
QString
win32_registry_get_key_value(QString keyLocation, QString keyName)
{
#ifdef WIN32
HKEY key;
char data[255] = {0};
DWORD size = sizeof(data);
@ -81,12 +89,16 @@ win32_registry_get_key_value(QString keyLocation, QString keyName)
RegCloseKey(key);
return QString(data);
#else
return QString();
#endif
}
/** Creates and/or sets the key to the specified value */
void
win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyValue)
{
#ifdef WIN32
HKEY key;
/* Open the key for writing (opens new key if it doesn't exist */
@ -108,12 +120,14 @@ win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyVa
/* Close the key */
RegCloseKey(key);
#endif
}
/** Removes the key from the registry if it exists */
void
win32_registry_remove_key(QString keyLocation, QString keyName)
{
#ifdef WIN32
HKEY key;
/* Open the key for writing (opens new key if it doesn't exist */
@ -127,6 +141,7 @@ win32_registry_remove_key(QString keyLocation, QString keyName)
/* Close anything that was opened */
RegCloseKey(key);
#endif
}
/** Gets the location of the user's %PROGRAMFILES% folder. */

2
retroshare-gui/src/util/win32.h
View File

@ -24,8 +24,6 @@
#ifndef _WIN32_H
#define _WIN32_H
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <QHash>
#include <QString>