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

* Fixed sorting in Friends

Browse Source 
* disabled auto scroll for Friends Widgett
* added retroshare own logo for Network icon
* Fixed layouts/margins/spacings of the Create Forum Message Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-11-28 01:14:58 +00:00
parent 74104d71e7
commit e03d808ad3
9 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -60,9 +60,9 @@
#define FONT QFont(tr("Arial"), 8) #define FONT QFont(tr("Arial"), 8)
/* Images for toolbar icons */ /* Images for toolbar icons */
#define IMAGE_NETWORK ":/images/network32.png" #define IMAGE_NETWORK ":/images/retrosharelogo1.png"
#define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_PEERS ":/images/groupchat.png"
#define IMAGE_SEARCH ":/images/filefind.png" #define IMAGE_SEARCH ":/images/filefind.png"
#define IMAGE_TRANSFERS ":/images/ktorrent32.png" #define IMAGE_TRANSFERS ":/images/ktorrent32.png"
#define IMAGE_LINKS ":/images/knewsticker24.png" #define IMAGE_LINKS ":/images/knewsticker24.png"
#define IMAGE_FILES ":/images/fileshare24.png" #define IMAGE_FILES ":/images/fileshare24.png"
@ -78,7 +78,7 @@
#define IMAGE_RSM32 ":/images/kdmconfig.png" #define IMAGE_RSM32 ":/images/kdmconfig.png"
#define IMAGE_RSM16 ":/images/rsmessenger16.png" #define IMAGE_RSM16 ":/images/rsmessenger16.png"
#define IMAGE_CLOSE ":/images/close_normal.png" #define IMAGE_CLOSE ":/images/close_normal.png"
#define IMAGE_SMPLAYER ":/images/smplayer_icon32.png" #define IMAGE_SMPLAYER ":/images/smplayer_icon32.png"
#define IMAGE_BLOCK ":/images/blockdevice.png" #define IMAGE_BLOCK ":/images/blockdevice.png"
#define IMAGE_COLOR ":/images/highlight.png" #define IMAGE_COLOR ":/images/highlight.png"
#define IMAGE_GAMES ":/images/kgames.png" #define IMAGE_GAMES ":/images/kgames.png"

1
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -154,6 +154,7 @@ PeersDialog::PeersDialog(QWidget *parent)
timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat()));
timer->start(500); /* half a second */ timer->start(500); /* half a second */
ui.peertreeWidget->sortItems( 1, Qt::AscendingOrder );
/* Hide platform specific features */ /* Hide platform specific features */

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

@ -532,6 +532,9 @@ p, li { white-space: pre-wrap; }
<property name="acceptDrops" > <property name="acceptDrops" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="autoScroll" >
<bool>false</bool>
</property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
<width>24</width> <width>24</width>

15
retroshare-gui/src/gui/forums/CreateForumMsg.cpp
View File

@ -610,11 +610,11 @@ void CreateForumMsg::setupViewActions()
QMenu *menu = new QMenu(tr("&View"), this); QMenu *menu = new QMenu(tr("&View"), this);
menuBar()->addMenu(menu); menuBar()->addMenu(menu);
QAction *a; //QAction *a;
a = new QAction(QIcon(""), tr("&Contacts Sidebar"), this); /*a = new QAction(QIcon(""), tr("&Contacts Sidebar"), this);
connect(a, SIGNAL(triggered()), this, SLOT(toggleContacts())); connect(a, SIGNAL(triggered()), this, SLOT(toggleContacts()));
menu->addAction(a); menu->addAction(a);*/
} }
@ -623,10 +623,11 @@ void CreateForumMsg::setupInsertActions()
QMenu *menu = new QMenu(tr("&Insert"), this); QMenu *menu = new QMenu(tr("&Insert"), this);
menuBar()->addMenu(menu); menuBar()->addMenu(menu);
QAction *a; //QAction *a;
a = new QAction(QIcon(""), tr("&Image"), this); /*a = new QAction(QIcon(""), tr("&Image"), this);
connect(a, SIGNAL(triggered()), this, SLOT(addImage())); connect(a, SIGNAL(triggered()), this, SLOT(addImage()));
menu->addAction(a); menu->addAction(a);*/
}
}

64
retroshare-gui/src/gui/forums/CreateForumMsg.ui
View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>533</width> <width>527</width>
<height>398</height> <height>410</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -20,8 +20,17 @@
</property> </property>
<widget class="QWidget" name="centralwidget" > <widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>1</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
@ -40,6 +49,9 @@
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
@ -85,6 +97,12 @@
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QComboBox" name="comboStyle" /> <widget class="QComboBox" name="comboStyle" />
</item> </item>
@ -102,14 +120,14 @@
<widget class="QPushButton" name="boldbtn" > <widget class="QPushButton" name="boldbtn" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
@ -127,14 +145,14 @@
<widget class="QPushButton" name="underlinebtn" > <widget class="QPushButton" name="underlinebtn" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
@ -152,14 +170,14 @@
<widget class="QPushButton" name="italicbtn" > <widget class="QPushButton" name="italicbtn" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
@ -177,14 +195,14 @@
<widget class="QPushButton" name="colorbtn" > <widget class="QPushButton" name="colorbtn" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
@ -199,14 +217,14 @@
<widget class="QPushButton" name="textalignmentbtn" > <widget class="QPushButton" name="textalignmentbtn" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>24</width> <width>28</width>
<height>24</height> <height>28</height>
</size> </size>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
@ -255,7 +273,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>533</width> <width>527</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>

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

@ -147,6 +147,7 @@
<file>images/folder_yellow.png</file> <file>images/folder_yellow.png</file>
<file>images/folder_green16.png</file> <file>images/folder_green16.png</file>
<file>images/folder_open.png</file> <file>images/folder_open.png</file>
<file>images/folder_video.png</file>
<file>images/forward.png</file> <file>images/forward.png</file>
<file>images/friendsfolder24.png</file> <file>images/friendsfolder24.png</file>
<file>images/kgames.png</file> <file>images/kgames.png</file>
@ -228,6 +229,7 @@
<file>images/RetroShare16.png</file> <file>images/RetroShare16.png</file>
<file>images/retrosharelogo1.png</file> <file>images/retrosharelogo1.png</file>
<file>images/retrosharelogo2.png</file> <file>images/retrosharelogo2.png</file>
<file>images/retrosharelogo32.png</file>
<file>images/rs-2.png</file> <file>images/rs-2.png</file>
<file>images/rsmessenger16.png</file> <file>images/rsmessenger16.png</file>
<file>images/rsmessenger32.png</file> <file>images/rsmessenger32.png</file>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 736 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB