Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 21:04:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* removed streching for Remote Directories

Browse Source 
* added icon Label for Messages Toaster
* Set userfriendly Column names for Remote/local Directories to Friends Directories and My Directories
* removed not needed path show in Rank

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-31 01:46:49 +00:00
parent 171a5bef0d
commit fc3fe52518
6 changed files with 157 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -110,28 +110,25 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
l_header->setResizeMode (2, QHeaderView::Interactive); l_header->setResizeMode (2, QHeaderView::Interactive);
l_header->setResizeMode (3, QHeaderView::Interactive); l_header->setResizeMode (3, QHeaderView::Interactive);
l_header->resizeSection ( 0, 210 ); l_header->resizeSection ( 0, 490 );
l_header->resizeSection ( 1, 70 ); l_header->resizeSection ( 1, 70 );
l_header->resizeSection ( 2, 100 ); l_header->resizeSection ( 2, 60 );
l_header->resizeSection ( 3, 100 ); l_header->resizeSection ( 3, 100 );
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * r_header = ui.remoteDirTreeView->header () ; QHeaderView * r_header = ui.remoteDirTreeView->header () ;
#if defined(Q_OS_WIN32)
r_header->setResizeMode (0, QHeaderView::Interactive); r_header->setResizeMode (0, QHeaderView::Interactive);
r_header->setStretchLastSection(true);
#else
r_header->setResizeMode (0, QHeaderView::Stretch);
r_header->setStretchLastSection(false); r_header->setStretchLastSection(false);
#endif
r_header->setResizeMode (1, QHeaderView::Fixed); r_header->setResizeMode (1, QHeaderView::Fixed);
r_header->setResizeMode (2, QHeaderView::Fixed); r_header->setResizeMode (2, QHeaderView::Fixed);
r_header->setResizeMode (3, QHeaderView::Fixed); r_header->setResizeMode (3, QHeaderView::Fixed);
r_header->resizeSection ( 0, 250 ); r_header->resizeSection ( 0, 490 );
r_header->resizeSection ( 1, 70 ); r_header->resizeSection ( 1, 70 );
r_header->resizeSection ( 2, 100 ); r_header->resizeSection ( 2, 60 );
r_header->resizeSection ( 3, 100 ); r_header->resizeSection ( 3, 100 );
l_header->setHighlightSections(false); l_header->setHighlightSections(false);

2
retroshare-gui/src/gui/images.qrc
View File

@ -95,6 +95,7 @@
<file>images/edit-underline.png</file> <file>images/edit-underline.png</file>
<file>images/edit_remove24.png</file> <file>images/edit_remove24.png</file>
<file>images/encrypted16.png</file> <file>images/encrypted16.png</file>
<file>images/encrypted22.png</file>
<file>images/encrypted48.png</file> <file>images/encrypted48.png</file>
<file>images/evolution.png</file> <file>images/evolution.png</file>
<file>images/exit_24x24.png</file> <file>images/exit_24x24.png</file>
@ -138,6 +139,7 @@
<file>images/folder-draft24-hover.png</file> <file>images/folder-draft24-hover.png</file>
<file>images/folder-draft24-pressed.png</file> <file>images/folder-draft24-pressed.png</file>
<file>images/folder-draft24.png</file> <file>images/folder-draft24.png</file>
<file>images/folder_inbox64.png</file>
<file>images/folder-inbox.png</file> <file>images/folder-inbox.png</file>
<file>images/folder-inbox-new.png</file> <file>images/folder-inbox-new.png</file>
<file>images/folder-outbox.png</file> <file>images/folder-outbox.png</file>

BIN
retroshare-gui/src/gui/images/folder_inbox64.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

283
retroshare-gui/src/gui/toaster/MessageToaster.ui
View File

@ -10,22 +10,10 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
@ -37,152 +25,12 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="2" >
<widget class="QPushButton" name="closeButton" >
<property name="minimumSize" >
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/close-down.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="flat" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>225</width>
<height>22</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="pixmaplabel" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>119</width>
<height>56</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="messageButton" >
<property name="text" >
<string>New Message</string>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >:/images/folder-inbox.png</iconset>
</property>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>119</width>
<height>56</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0" > <item row="2" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
@ -190,7 +38,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>111</width> <width>111</width>
<height>21</height> <height>21</height>
@ -210,7 +58,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>
@ -225,7 +73,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>366</width> <width>366</width>
<height>91</height> <height>91</height>
@ -233,7 +81,124 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item row="0" column="2" >
<widget class="QPushButton" name="closeButton" >
<property name="minimumSize" >
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >
<normaloff>:/images/close-down.png</normaloff>:/images/close-down.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="flat" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>225</width>
<height>22</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="pixmaplabel" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" 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="messageButton" >
<property name="minimumSize" >
<size>
<width>88</width>
<height>0</height>
</size>
</property>
<property name="styleSheet" >
<string notr="true" >font: bold;
</string>
</property>
<property name="text" >
<string>New Message</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>119</width>
<height>56</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../images.qrc" >:/images/folder_inbox64.png</pixmap>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="margin" >
<number>6</number>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
<zorder></zorder>
</widget> </widget>
</item> </item>
</layout> </layout>

42
retroshare-gui/src/gui/toaster/OnlineToaster.cpp
View File

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "OnlineToaster.h" #include "OnlineToaster.h"
#include "ui_OnlineToaster.h" #include "ui_OnlineToaster.h"
@ -24,30 +24,30 @@
#include "QtToaster.h" #include "QtToaster.h"
#include <QtGui/QtGui> #include <QtGui/QtGui>
OnlineToaster::OnlineToaster() OnlineToaster::OnlineToaster()
: QObject(NULL) { : QObject(NULL) {
_onlineToasterWidget = new QWidget(NULL); _onlineToasterWidget = new QWidget(NULL);
_ui = new Ui::OnlineToaster(); _ui = new Ui::OnlineToaster();
_ui->setupUi(_onlineToasterWidget); _ui->setupUi(_onlineToasterWidget);
connect(_ui->messageButton, SIGNAL(clicked()), SLOT(chatButtonSlot())); connect(_ui->messageButton, SIGNAL(clicked()), SLOT(chatButtonSlot()));
connect(_ui->closeButton, SIGNAL(clicked()), SLOT(close())); connect(_ui->closeButton, SIGNAL(clicked()), SLOT(close()));
_toaster = new QtToaster(_onlineToasterWidget, _ui->windowFrame); _toaster = new QtToaster(_onlineToasterWidget, _ui->windowFrame);
_toaster->setTimeOnTop(5000); _toaster->setTimeOnTop(5000);
} }
OnlineToaster::~OnlineToaster() { OnlineToaster::~OnlineToaster() {
delete _ui; delete _ui;
} }
void OnlineToaster::setMessage(const QString & message) { void OnlineToaster::setMessage(const QString & message) {
_ui->messageLabel->setText(message); _ui->messageLabel->setText(message);
} }
void OnlineToaster::setPixmap(const QPixmap & pixmap) { void OnlineToaster::setPixmap(const QPixmap & pixmap) {
_ui->pixmaplabel->setPixmap(pixmap); _ui->pixmaplabel->setPixmap(pixmap);
@ -56,12 +56,12 @@ void OnlineToaster::setPixmap(const QPixmap & pixmap) {
void OnlineToaster::show() { void OnlineToaster::show() {
_toaster->show(); _toaster->show();
} }
void OnlineToaster::close() { void OnlineToaster::close() {
_toaster->close(); _toaster->close();
} }
void OnlineToaster::chatButtonSlot() { void OnlineToaster::chatButtonSlot() {
chatButtonClicked(); chatButtonClicked();
close(); close();
} }

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

@ -429,8 +429,8 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
} }
break; break;
case 2: case 2:
//return QString(""); return QString("");
return QString::fromStdString(details.path); //return QString::fromStdString(details.path);
break; break;
default: default:
@ -479,11 +479,11 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
case 0: case 0:
if (RemoteMode) if (RemoteMode)
{ {
return QString("Remote Directories"); return QString("Friends Directories");
} }
else else
{ {
return QString("Local Directories"); return QString("My Directories");
} }
break; break;
case 1: case 1: