From e03d808ad366d297a46757967cf428c3a03372f9 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 28 Nov 2008 01:14:58 +0000 Subject: [PATCH] * Fixed sorting in Friends * 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 --- retroshare-gui/src/gui/MainWindow.cpp | 6 +- retroshare-gui/src/gui/PeersDialog.cpp | 1 + retroshare-gui/src/gui/PeersDialog.ui | 3 + .../src/gui/forums/CreateForumMsg.cpp | 15 ++-- .../src/gui/forums/CreateForumMsg.ui | 64 +++++++++++------- retroshare-gui/src/gui/images.qrc | 2 + .../src/gui/images/folder_music.png | Bin 0 -> 736 bytes .../src/gui/images/folder_video.png | Bin 0 -> 715 bytes .../src/gui/images/retrosharelogo32.png | Bin 0 -> 2509 bytes 9 files changed, 58 insertions(+), 33 deletions(-) create mode 100755 retroshare-gui/src/gui/images/folder_music.png create mode 100755 retroshare-gui/src/gui/images/folder_video.png create mode 100755 retroshare-gui/src/gui/images/retrosharelogo32.png diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 4f2b63630..f54775ac2 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -60,9 +60,9 @@ #define FONT QFont(tr("Arial"), 8) /* Images for toolbar icons */ -#define IMAGE_NETWORK ":/images/network32.png" +#define IMAGE_NETWORK ":/images/retrosharelogo1.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_LINKS ":/images/knewsticker24.png" #define IMAGE_FILES ":/images/fileshare24.png" @@ -78,7 +78,7 @@ #define IMAGE_RSM32 ":/images/kdmconfig.png" #define IMAGE_RSM16 ":/images/rsmessenger16.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_COLOR ":/images/highlight.png" #define IMAGE_GAMES ":/images/kgames.png" diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index 4bc715304..f8ee219db 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -154,6 +154,7 @@ PeersDialog::PeersDialog(QWidget *parent) timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat())); timer->start(500); /* half a second */ + ui.peertreeWidget->sortItems( 1, Qt::AscendingOrder ); /* Hide platform specific features */ diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index bb0468b1b..e8dd66b75 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -532,6 +532,9 @@ p, li { white-space: pre-wrap; } false + + false + 24 diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index 6d5e9899a..8933e6eff 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -610,11 +610,11 @@ void CreateForumMsg::setupViewActions() QMenu *menu = new QMenu(tr("&View"), this); 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())); - menu->addAction(a); + menu->addAction(a);*/ } @@ -623,10 +623,11 @@ void CreateForumMsg::setupInsertActions() QMenu *menu = new QMenu(tr("&Insert"), this); 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())); - menu->addAction(a); + menu->addAction(a);*/ + +} -} \ No newline at end of file diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui index 4f4ac40b8..fc5b58262 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui @@ -5,8 +5,8 @@ 0 0 - 533 - 398 + 527 + 410 @@ -20,8 +20,17 @@ + + 2 + + + 1 + + + 6 + @@ -40,6 +49,9 @@ + + 6 + @@ -85,6 +97,12 @@ + + 6 + + + 0 + @@ -102,14 +120,14 @@ - 24 - 24 + 28 + 28 - 24 - 24 + 28 + 28 @@ -127,14 +145,14 @@ - 24 - 24 + 28 + 28 - 24 - 24 + 28 + 28 @@ -152,14 +170,14 @@ - 24 - 24 + 28 + 28 - 24 - 24 + 28 + 28 @@ -177,14 +195,14 @@ - 24 - 24 + 28 + 28 - 24 - 24 + 28 + 28 @@ -199,14 +217,14 @@ - 24 - 24 + 28 + 28 - 24 - 24 + 28 + 28 @@ -255,7 +273,7 @@ 0 0 - 533 + 527 30 diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 46dbcb497..5222bedb2 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -147,6 +147,7 @@ images/folder_yellow.png images/folder_green16.png images/folder_open.png + images/folder_video.png images/forward.png images/friendsfolder24.png images/kgames.png @@ -228,6 +229,7 @@ images/RetroShare16.png images/retrosharelogo1.png images/retrosharelogo2.png + images/retrosharelogo32.png images/rs-2.png images/rsmessenger16.png images/rsmessenger32.png diff --git a/retroshare-gui/src/gui/images/folder_music.png b/retroshare-gui/src/gui/images/folder_music.png new file mode 100755 index 0000000000000000000000000000000000000000..32a6c513496c38060a915d30308d61f778ff46c5 GIT binary patch literal 736 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 Xn0{ypP(r;V00000NkvXXu0mjff+4v` literal 0 HcmV?d00001