diff --git a/retroshare-gui/src/gui/ApplicationWindow.ui b/retroshare-gui/src/gui/ApplicationWindow.ui index a7500d215..83ddcb38d 100644 --- a/retroshare-gui/src/gui/ApplicationWindow.ui +++ b/retroshare-gui/src/gui/ApplicationWindow.ui @@ -478,17 +478,6 @@ - - - Arial - 10 - 50 - false - false - false - false - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui index 4c4507932..8e4846dcc 100644 --- a/retroshare-gui/src/gui/MainWindow.ui +++ b/retroshare-gui/src/gui/MainWindow.ui @@ -478,17 +478,6 @@ - - - Arial - 10 - 50 - false - false - false - false - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index c6eb19d99..1648657b0 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -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); } } diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 530d07cf0..0c3fb85da 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -103,17 +103,6 @@ p, li { white-space: pre-wrap; } 0 - - - Arial - 8 - 50 - false - false - false - false - - Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index 47e1c1672..bb0468b1b 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -478,17 +478,6 @@ - - - Arial - 8 - 50 - false - false - false - false - - Qt::NoContextMenu @@ -500,12 +489,6 @@ - - 0 - - - 6 - @@ -533,7 +516,7 @@ p, li { white-space: pre-wrap; } Qt::Horizontal - + 201 20 @@ -582,26 +565,20 @@ p, li { white-space: pre-wrap; } - + 0 - + 0 - - 0 - - - 6 - Qt::Horizontal - + 181 20 @@ -611,12 +588,6 @@ p, li { white-space: pre-wrap; } - - 0 - - - 6 - @@ -670,18 +641,12 @@ p, li { white-space: pre-wrap; } - - 0 - - - 6 - Qt::Horizontal - + 321 20 @@ -710,8 +675,7 @@ p, li { white-space: pre-wrap; } - - :/images/edit-italic.png:/images/edit-italic.png + :/images/edit-italic.png true @@ -739,8 +703,7 @@ p, li { white-space: pre-wrap; } - - :/images/edit-underline.png:/images/edit-underline.png + :/images/edit-underline.png true @@ -768,8 +731,7 @@ p, li { white-space: pre-wrap; } - - :/images/edit-bold.png:/images/edit-bold.png + :/images/edit-bold.png true @@ -838,8 +800,7 @@ p, li { white-space: pre-wrap; } - - :/images/emoticons/kopete/kopete020.png:/images/emoticons/kopete/kopete020.png + :/images/emoticons/kopete/kopete020.png @@ -907,7 +868,7 @@ p, li { white-space: pre-wrap; } Qt::Horizontal - + 321 20 diff --git a/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui b/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui index cc6aeb3f1..7b3e6a2b6 100644 --- a/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui +++ b/retroshare-gui/src/gui/Preferences/PreferencesWindow.ui @@ -478,17 +478,6 @@ - - - Arial - 10 - 50 - false - false - false - false - - Qt::NoContextMenu @@ -509,20 +498,26 @@ - + 6 - + + 6 + + + 6 + + + 6 + + + 3 + + 3 - - 0 - - - 6 - @@ -1072,14 +1067,17 @@ - 4 + TopToolBarArea + + + false ConfigPageStack - QStackedPageWidget + QWidget
gui/Preferences/configpagestack.h
 diff --git a/retroshare-gui/src/gui/Preferences/ServerDialog.ui b/retroshare-gui/src/gui/Preferences/ServerDialog.ui index e6d05726b..c9dc577e9 100644 --- a/retroshare-gui/src/gui/Preferences/ServerDialog.ui +++ b/retroshare-gui/src/gui/Preferences/ServerDialog.ui @@ -484,17 +484,6 @@ - - - Arial - 8 - 50 - false - false - false - false - - Qt::NoContextMenu @@ -523,7 +512,7 @@ 2 - + @@ -592,104 +581,141 @@ Server Status And Network Settings - - - 4 - - - 4 - - - 4 - - - 4 - - - + + + + + + + + + + Network Okay + + + false + + + + + + + UPnP Active + + + false + + + + + + + DHT Okay + + + false + + + + + + + Found Ext IP Addr + + + false + + + + + + + UDP Connections + + + false + + + + + + + TCP server + + + false + + + + + + + - + - + - Network Status + Local Address - + + + External Address + + - - - - - - - Local Address - - - - - - - External Address - - - - + + + - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - - - - - - - Port: - - - - - - - 0 - - - 65535 - - - 7812 - - - - + + + + Port: + + + + + + + 0 + + + 65535 + + + 7812 + + + + + + + + + + Port: + + + + + + + 0 + + + 65535 + + + 7812 + + diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp index 19205fd88..7d27b7e36 100644 --- a/retroshare-gui/src/gui/SearchDialog.cpp +++ b/retroshare-gui/src/gui/SearchDialog.cpp @@ -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(), diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index adf23714d..f8f4374e8 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -484,17 +484,6 @@ - - - Arial - 8 - 50 - false - false - false - false - - Qt::NoContextMenu diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp index 04741af04..028c7df15 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp +++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp @@ -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); } diff --git a/retroshare-gui/src/rsiface/RemoteDirModel.cpp b/retroshare-gui/src/rsiface/RemoteDirModel.cpp index 0bcf07c9b..db2d19e78 100644 --- a/retroshare-gui/src/rsiface/RemoteDirModel.cpp +++ b/retroshare-gui/src/rsiface/RemoteDirModel.cpp @@ -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); } diff --git a/retroshare-gui/src/rsiface/rsfiles.h b/retroshare-gui/src/rsiface/rsfiles.h index 936f2e4de..0daca7d35 100644 --- a/retroshare-gui/src/rsiface/rsfiles.h +++ b/retroshare-gui/src/rsiface/rsfiles.h @@ -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 &hashs) = 0; -virtual bool FileUploads(std::list &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 &hashs) = 0; +virtual bool FileUploads(std::list &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 keywords, std::list &results) = 0; virtual int SearchBoolExp(Expression * exp, std::list &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; diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsversion.cpp index f73f07142..c5783526e 100644 --- a/retroshare-gui/src/util/rsversion.cpp +++ b/retroshare-gui/src/util/rsversion.cpp @@ -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" diff --git a/retroshare-gui/src/util/win32.cpp b/retroshare-gui/src/util/win32.cpp index 55af41b1b..5d2a87ac6 100644 --- a/retroshare-gui/src/util/win32.cpp +++ b/retroshare-gui/src/util/win32.cpp @@ -20,6 +20,13 @@ * Boston, MA 02110-1301, USA. ****************************************************************/ +#ifdef WIN32 + +#define WIN32_LEAN_AND_MEAN +#include + +#endif + #if 0 #include #include @@ -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. */ diff --git a/retroshare-gui/src/util/win32.h b/retroshare-gui/src/util/win32.h index 4196de8ea..5b0dcdca3 100644 --- a/retroshare-gui/src/util/win32.h +++ b/retroshare-gui/src/util/win32.h @@ -24,8 +24,6 @@ #ifndef _WIN32_H #define _WIN32_H -#define WIN32_LEAN_AND_MEAN -#include #include #include