From 50ebd781e5500a3013d7552bbf23f8ee7c0efa96 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 4 Jan 2014 19:54:07 +0000 Subject: [PATCH] * Corrected the layout of the Connect Progress Dialog * Added few more file type icons for "cpp", "h" nd "c" * Corrected some strings * Moved Uploads to Downloads Tab. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/FileTransfer/TransfersDialog.cpp | 4 +- .../src/gui/FileTransfer/TransfersDialog.ui | 213 +++++++----- .../src/gui/Posted/PostedListDialog.ui | 4 +- retroshare-gui/src/gui/common/FilesDefs.cpp | 8 +- .../src/gui/connect/ConnectProgressDialog.ui | 323 +++++++++--------- retroshare-gui/src/gui/images.qrc | 3 + .../src/gui/unfinished/ApplicationWindow.cpp | 2 +- 7 files changed, 318 insertions(+), 239 deletions(-) diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index f8a332852..d1ef4b82e 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -551,7 +551,7 @@ void TransfersDialog::processSettings(bool bLoad) ULHeader->restoreState(Settings->value("uploadList").toByteArray()); // state of splitter -// ui.splitter->restoreState(Settings->value("Splitter").toByteArray()); + ui.splitter->restoreState(Settings->value("Splitter").toByteArray()); setShowDLSizeColumn(Settings->value("showDLSizeColumn", !ui.downloadList->isColumnHidden(COLUMN_SIZE)).toBool()); setShowDLCompleteColumn(Settings->value("showDLCompleteColumn", !ui.downloadList->isColumnHidden(COLUMN_COMPLETED)).toBool()); @@ -579,7 +579,7 @@ void TransfersDialog::processSettings(bool bLoad) Settings->setValue("uploadList", ULHeader->saveState()); // state of splitter -// Settings->setValue("Splitter", ui.splitter->saveState()); + Settings->setValue("Splitter", ui.splitter->saveState()); Settings->setValue("showDLSizeColumn", !ui.downloadList->isColumnHidden(COLUMN_SIZE)); Settings->setValue("showDLCompleteColumn", !ui.downloadList->isColumnHidden(COLUMN_COMPLETED)); diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index 8d5085efb..1f633cf17 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -100,6 +100,9 @@ 0 + + false + @@ -108,91 +111,143 @@ Downloads - + + + 6 + + + 0 + 0 - - - - - 9 - + + + + + 0 + 0 + - - true + + + 0 + 0 + - - Qt::CustomContextMenu - - - QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - false - - - false - - - false - - - QAbstractItemView::NoDragDrop - - - false - - - true - - - true - - - true - - - false - - - true - - - false - - - - - - - - - :/images/up.png:/images/up.png - - - Uploads - - - - 0 - - - 0 - - - - - - 9 - - - - Qt::CustomContextMenu - - - true + + Qt::Vertical + + + + 0 + 0 + + + + + 9 + + + + true + + + Qt::CustomContextMenu + + + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + false + + + false + + + false + + + QAbstractItemView::NoDragDrop + + + false + + + true + + + true + + + true + + + false + + + true + + + false + + + + + 0 + + + Qt::ElideNone + + + true + + + false + + + false + + + false + + + + + :/images/uploads.png:/images/uploads.png + + + Uploads + + + + 0 + + + + + + 0 + 0 + + + + + 9 + + + + Qt::CustomContextMenu + + + true + + + + + + diff --git a/retroshare-gui/src/gui/Posted/PostedListDialog.ui b/retroshare-gui/src/gui/Posted/PostedListDialog.ui index 917dc9602..bfd409c56 100644 --- a/retroshare-gui/src/gui/Posted/PostedListDialog.ui +++ b/retroshare-gui/src/gui/Posted/PostedListDialog.ui @@ -48,7 +48,7 @@ 0 0 - 605 + 745 332 @@ -83,7 +83,7 @@ - Submit Post + Create Post diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp index 61a277ca1..7c4fc9140 100644 --- a/retroshare-gui/src/gui/common/FilesDefs.cpp +++ b/retroshare-gui/src/gui/common/FilesDefs.cpp @@ -47,7 +47,7 @@ static QString getInfoFromFilename(const QString& filename, bool anyForUnknown, return image ? ":/images/FileTypeProgram.png" : QApplication::translate("FilesDefs", "Program"); } else if (ext == "iso" || ext == "nrg" || ext == "mdf" || ext == "img" || ext == "dmg" || ext == "bin" || ext == "uif") { return image ? ":/images/FileTypeCDImage.png" : QApplication::translate("FilesDefs", "CD/DVD-Image"); - } else if (ext == "txt" || ext == "cpp" || ext == "c" || ext == "h" || ext == "ui" || + } else if (ext == "txt" || ext == "ui" || ext == "doc" || ext == "rtf" || ext == "sxw" || ext == "xls" || ext == "pps" || ext == "xml" || ext == "nfo" || ext == "reg" || ext == "sxc" || ext == "odt" || ext == "ods" || ext == "dot" || ext == "ppt" || ext == "css" || ext == "crt" || ext == "html" || ext == "htm" || ext == "php") { @@ -62,6 +62,12 @@ static QString getInfoFromFilename(const QString& filename, bool anyForUnknown, return image ? ":/images/FileTypeAny.png" : QApplication::translate("FilesDefs", "Nintendo DS Rom"); } else if (ext == "patch" || ext == "diff") { return image ? ":/images/mimetypes/patch.png" : QApplication::translate("FilesDefs", "Patch"); + } else if (ext == "cpp") { + return image ? ":/images/mimetypes/source_cpp.png" : QApplication::translate("FilesDefs", "C++"); + } else if (ext == "h") { + return image ? ":/images/mimetypes/source_h.png" : QApplication::translate("FilesDefs", "Header"); + } else if (ext == "c") { + return image ? ":/images/mimetypes/source_c.png" : QApplication::translate("FilesDefs", "C "); } diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui index e1fc3ad73..bf043357c 100644 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui @@ -7,7 +7,7 @@ 0 0 553 - 530 + 489 @@ -42,8 +42,8 @@ QFrame::Raised - - + + true @@ -54,215 +54,230 @@ QFrame::Raised - - - - + + + + + + + 75 + true + + Connecting to: - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 13 - - - - - - - + + + + 75 + true + + Network - - - - Net Result - - - - + + + + 75 + true + + Connect Status - - - - Contact Result - - - - - - - - - Qt::Vertical - - - - 20 - 13 - - - - - - - + + + + 75 + true + + DHT Startup - - - - 24 - - - - + DHT Result - + + + + 75 + true + + Peer Lookup - - - - 24 - - - - + Peer Result - + + + + 75 + true + + UDP Setup - - - - 24 - - - - + UDP Result + + + + 24 + + + + + + + 24 + + + + + + + 24 + + + + + + + + + + + + 0 + 0 + 127 + + + + + + + + + 0 + 0 + 127 + + + + + + + + + 118 + 116 + 108 + + + + + + + + + 9 + 75 + true + + + + TextLabel + + + + + + + Net Result + + + + + + + Contact Result + + + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + - - - - - - - 0 - 0 - - - - - 1 - 0 - - - - - - - - - - - - 0 - 0 - - - - - 5 - 0 - - - - - 75 - true - - - - - - - - - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -277,7 +292,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index dab6a797f..01ea99e68 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -450,6 +450,9 @@ images/mimetypes/pdf.png images/mimetypes/rscollection-16.png images/mimetypes/patch.png + images/mimetypes/source_c.png + images/mimetypes/source_cpp.png + images/mimetypes/source_h.png images/view-certificate-copy-32.png images/view-certificate-export-32.png images/textedit/textbold.png diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp index 3b71ee84d..21f088fd8 100644 --- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp +++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp @@ -109,7 +109,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags) #ifdef RS_USE_PHOTOSHARE PhotoShare *photoShare = NULL; ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages), - createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp)); + createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp)); #endif PostedDialog *postedDialog = NULL;