* 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
This commit is contained in:
defnax 2014-01-04 19:54:07 +00:00
parent 4ce8ea73d2
commit 50ebd781e5
7 changed files with 318 additions and 239 deletions

View File

@ -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));

View File

@ -100,6 +100,9 @@
<property name="currentIndex">
<number>0</number>
</property>
<property name="movable">
<bool>false</bool>
</property>
<widget class="QWidget" name="tab">
<attribute name="icon">
<iconset resource="../images.qrc">
@ -108,91 +111,143 @@
<attribute name="title">
<string>Downloads</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QGridLayout" name="gridLayout_2">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTreeView" name="downloadList">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="mouseTracking">
<bool>true</bool>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
</property>
<property name="tabKeyNavigation">
<bool>false</bool>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragEnabled">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::NoDragDrop</enum>
</property>
<property name="alternatingRowColors">
<bool>false</bool>
</property>
<property name="rootIsDecorated">
<bool>true</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="uploadsTab">
<attribute name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/up.png</normaloff>:/images/up.png</iconset>
</attribute>
<attribute name="title">
<string>Uploads</string>
</attribute>
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QTreeView" name="uploadsList">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QTreeView" name="downloadList">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
</property>
<property name="tabKeyNavigation">
<bool>false</bool>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragEnabled">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::NoDragDrop</enum>
</property>
<property name="alternatingRowColors">
<bool>false</bool>
</property>
<property name="rootIsDecorated">
<bool>true</bool>
</property>
<property name="uniformRowHeights">
<bool>true</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
</widget>
<widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex">
<number>0</number>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
</property>
<property name="usesScrollButtons">
<bool>true</bool>
</property>
<property name="documentMode">
<bool>false</bool>
</property>
<property name="tabsClosable">
<bool>false</bool>
</property>
<property name="movable">
<bool>false</bool>
</property>
<widget class="QWidget" name="uploadsTab">
<attribute name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/uploads.png</normaloff>:/images/uploads.png</iconset>
</attribute>
<attribute name="title">
<string>Uploads</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTreeView" name="uploadsList">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>

View File

@ -48,7 +48,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>605</width>
<width>745</width>
<height>332</height>
</rect>
</property>
@ -83,7 +83,7 @@
<item>
<widget class="QPushButton" name="submitPostButton">
<property name="text">
<string>Submit Post</string>
<string>Create Post</string>
</property>
<property name="icon">
<iconset resource="Posted_images.qrc">

View File

@ -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 ");
}

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>553</width>
<height>530</height>
<height>489</height>
</rect>
</property>
<property name="windowTitle">
@ -42,8 +42,8 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" rowspan="2">
<widget class="QFrame" name="progressFrame">
<property name="enabled">
<bool>true</bool>
@ -54,215 +54,230 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connecting to:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="connectId">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Network </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="NetResult">
<property name="text">
<string>Net Result</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connect Status</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="ContactResult">
<property name="text">
<string>Contact Result</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>DHT Startup</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QProgressBar" name="DhtProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="4" column="2">
<widget class="QLabel" name="DhtResult">
<property name="text">
<string>DHT Result</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Peer Lookup</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QProgressBar" name="LookupProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="5" column="2">
<widget class="QLabel" name="LookupResult">
<property name="text">
<string>Peer Result</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>UDP Setup</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QProgressBar" name="UdpProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="2" column="2">
<item row="6" column="2">
<widget class="QLabel" name="UdpResult">
<property name="text">
<string>UDP Result</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QProgressBar" name="DhtProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QProgressBar" name="LookupProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QProgressBar" name="UdpProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="connectId">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>118</red>
<green>116</green>
<blue>108</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="NetResult">
<property name="text">
<string>Net Result</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="ContactResult">
<property name="text">
<string>Contact Result</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="statusIcon">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="statusTitle">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="statusIcon">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>1</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="statusTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>5</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<item row="2" column="0">
<widget class="QTextBrowser" name="textBrowser">
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@ -277,7 +292,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">

View File

@ -450,6 +450,9 @@
<file>images/mimetypes/pdf.png</file>
<file>images/mimetypes/rscollection-16.png</file>
<file>images/mimetypes/patch.png</file>
<file>images/mimetypes/source_c.png</file>
<file>images/mimetypes/source_cpp.png</file>
<file>images/mimetypes/source_h.png</file>
<file>images/view-certificate-copy-32.png</file>
<file>images/view-certificate-export-32.png</file>
<file>images/textedit/textbold.png</file>

View File

@ -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;